gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] [gnunet] branch master updated (d7aa2a805 -> 324f6168c)


From: gnunet
Subject: [GNUnet-SVN] [gnunet] branch master updated (d7aa2a805 -> 324f6168c)
Date: Mon, 04 Jun 2018 23:32:11 +0200

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

grothoff pushed a change to branch master
in repository gnunet.

    from d7aa2a805 use DEBUG_KX for new core log messages
     new 9b6534a8e fix typo in Makefile.am
     new 5eb8efafe script was removed
     new eec5a96f4 fix a few disting issues
     new 324f6168c testcase cleanup

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 contrib/Makefile.am                  |    3 +-
 po/de.po                             | 2720 +++++++++++++++++---------------
 po/es.po                             | 2789 +++++++++++++++++----------------
 po/fr.po                             | 2649 ++++++++++++++++---------------
 po/sv.po                             | 2821 +++++++++++++++++----------------
 po/vi.po                             | 2839 ++++++++++++++++++----------------
 po/zh_CN.po                          | 2655 ++++++++++++++++---------------
 src/datacache/test_datacache_quota.c |   39 +-
 src/transport/Makefile.am            |   10 +-
 9 files changed, 8735 insertions(+), 7790 deletions(-)

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 8e07a5d8c..56fcb9aea 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -61,9 +61,8 @@ EXTRA_DIST = \
  scripts/gnunet-chk.py.in \
  scripts/removetrailingwhitespace.py.in \
  scripts/pydiffer.py.in \
- scripts/gnunet-gns-import.sh \
  packages/nix/default.nix \
- packages/nix/gnunet-dex.nix \
+ packages/nix/gnunet-dev.nix \
  3rdparty/Windows/openvpn-tap32/tapw32/tap0901.sys \
  3rdparty/Windows/openvpn-tap32/tapw32/tap0901.cat \
  3rdparty/Windows/openvpn-tap32/tapw32/OemWin2k.inf \
diff --git a/po/de.po b/po/de.po
index 83c07c935..05e56b0d4 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: address@hidden"
-"POT-Creation-Date: 2018-01-02 02:33+0100\n"
+"POT-Creation-Date: 2018-06-04 23:27+0200\n"
 "PO-Revision-Date: 2015-03-08 16:16+0100\n"
 "Last-Translator: Mario Blättermann <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -235,7 +235,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3824
+#: src/transport/plugin_transport_tcp.c:3825
 #: src/transport/tcp_service_legacy.c:576
 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
 #: src/util/service.c:643
@@ -244,14 +244,14 @@ msgid "Require valid port number for service `%s' in 
configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176
-#: src/transport/tcp_service_legacy.c:613 src/util/client.c:505
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506
 #: src/util/service.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
-#: src/transport/tcp_service_legacy.c:617 src/util/client.c:510
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511
 #: src/util/service.c:687
 #, c-format
 msgid "Using `%s' instead\n"
@@ -353,131 +353,14 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939
-msgid "solver to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945
-#: src/ats-tests/gnunet-solver-eval.c:950
-msgid "experiment to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3306
-msgid "print logging"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3311
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3316
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:304
-#, 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:314
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:359
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:451
-#, fuzzy, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
-
-#: src/ats/plugin_ats_mlp.c:1274
-msgid "Problem size too large, cannot allocate memory!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1869
-#, fuzzy, c-format
-msgid "Adding address for peer `%s' multiple times\n"
-msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
-
-#: src/ats/plugin_ats_mlp.c:1913
-#, fuzzy, c-format
-msgid "Updating address property for peer `%s' %p not added before\n"
-msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
-
-#: src/ats/plugin_ats_mlp.c:2475
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
-#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
-#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
-#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
-#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
-#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
-#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
-
-#: src/ats/plugin_ats_mlp.c:2670
-#, c-format
-msgid ""
-"Adjusting inconsistent outbound quota configuration for network `%s', is "
-"%llu must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2679
-#, c-format
-msgid ""
-"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
-"must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2689
-#, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2698
-#, c-format
-msgid ""
-"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
-msgstr ""
+#: src/ats-tests/ats-testing-log.c:837
+msgid "Stop logging\n"
+msgstr "Protokollierung stoppen\n"
 
-#: src/ats/plugin_ats_proportional.c:1164
+#: src/ats-tests/ats-testing-log.c:892
 #, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr " gconfig\tGTK Konfiguration\n"
+msgid "Start logging `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
 
 #: src/ats-tests/ats-testing.c:422
 #, c-format
@@ -489,15 +372,6 @@ msgstr ""
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/ats-tests/ats-testing-log.c:837
-msgid "Stop logging\n"
-msgstr "Protokollierung stoppen\n"
-
-#: src/ats-tests/ats-testing-log.c:892
-#, fuzzy, c-format
-msgid "Start logging `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
-
 #: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
@@ -505,6 +379,15 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
+#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294
+msgid "solver to use"
+msgstr ""
+
+#: src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299
+msgid "experiment to use"
+msgstr ""
+
 #: src/ats-tool/gnunet-ats.c:307
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -622,6 +505,123 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3306
+msgid "print logging"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3311
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3316
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:304
+#, 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:314
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:359
+#, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:451
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
+#: src/ats/plugin_ats_mlp.c:1274
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1869
+#, fuzzy, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
+
+#: src/ats/plugin_ats_mlp.c:1913
+#, fuzzy, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
+
+#: src/ats/plugin_ats_mlp.c:2475
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
+#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
+#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
+#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
+#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
+
+#: src/ats/plugin_ats_mlp.c:2670
+#, c-format
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2679
+#, c-format
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2689
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2698
+#, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_proportional.c:1164
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f\n"
+msgstr " gconfig\tGTK Konfiguration\n"
+
 #: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
@@ -762,292 +762,292 @@ msgstr ""
 msgid "be more verbose (print received values)"
 msgstr "Ausführlicherer Modus (empfangene Werte ausgeben)"
 
-#: src/conversation/conversation_api.c:513
-#: src/conversation/conversation_api_call.c:490
+#: src/conversation/conversation_api.c:515
+#: src/conversation/conversation_api_call.c:494
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:269
+#: src/conversation/gnunet-conversation-test.c:119
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:145
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:210
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:270
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:294
+#: src/conversation/gnunet-conversation.c:295
 #, fuzzy, c-format
 msgid "Call from `%s' terminated\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/conversation/gnunet-conversation.c:329
+#: src/conversation/gnunet-conversation.c:330
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:334
+#: src/conversation/gnunet-conversation.c:335
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:352
+#: src/conversation/gnunet-conversation.c:353
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:367
+#: src/conversation/gnunet-conversation.c:368
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Telefon konnte nicht eingerichtet werden (interner Fehler)\n"
 
-#: src/conversation/gnunet-conversation.c:379
+#: src/conversation/gnunet-conversation.c:380
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:401
+#: src/conversation/gnunet-conversation.c:404
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:408
+#: src/conversation/gnunet-conversation.c:411
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/conversation/gnunet-conversation.c:415
+#: src/conversation/gnunet-conversation.c:418
 #, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "»%s« konnte nicht aufgelöst werden\n"
 
-#: src/conversation/gnunet-conversation.c:423
+#: src/conversation/gnunet-conversation.c:426
 #, fuzzy, c-format
 msgid "Call to `%s' terminated\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/conversation/gnunet-conversation.c:432
+#: src/conversation/gnunet-conversation.c:435
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:438
+#: src/conversation/gnunet-conversation.c:441
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:443
+#: src/conversation/gnunet-conversation.c:446
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:512
+#: src/conversation/gnunet-conversation.c:517
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Unbekannter Befehl »%s«\n"
 
-#: src/conversation/gnunet-conversation.c:528
-#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:533
+#: src/conversation/gnunet-conversation.c:547
 #, fuzzy, c-format
 msgid "Ego `%s' not available\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/conversation/gnunet-conversation.c:535
-#: src/conversation/gnunet-conversation.c:592
+#: src/conversation/gnunet-conversation.c:540
+#: src/conversation/gnunet-conversation.c:596
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:550
-#: src/conversation/gnunet-conversation.c:605
+#: src/conversation/gnunet-conversation.c:555
+#: src/conversation/gnunet-conversation.c:609
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:560
+#: src/conversation/gnunet-conversation.c:565
 msgid "Call recipient missing.\n"
 msgstr "Anzurufender Teilnehmer fehlt.\n"
 
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:620
 msgid "There is no incoming call to accept here!\n"
 msgstr "Es gibt keinen eingehenden Anruf, der angenommen werden könnte!\n"
 
-#: src/conversation/gnunet-conversation.c:633
+#: src/conversation/gnunet-conversation.c:637
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 "Es gibt keinen eingehenden Anruf »%s«, der jetzt angenommen werden könnte!\n"
 
-#: src/conversation/gnunet-conversation.c:663
+#: src/conversation/gnunet-conversation.c:668
 msgid "We currently do not have an address.\n"
 msgstr "Derzeit keine Adresse vorhanden.\n"
 
-#: src/conversation/gnunet-conversation.c:686
+#: src/conversation/gnunet-conversation.c:692
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:691
+#: src/conversation/gnunet-conversation.c:697
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:697
-#: src/conversation/gnunet-conversation.c:721
+#: src/conversation/gnunet-conversation.c:703
+#: src/conversation/gnunet-conversation.c:727
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:702
+#: src/conversation/gnunet-conversation.c:708
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:711
+#: src/conversation/gnunet-conversation.c:717
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:716
+#: src/conversation/gnunet-conversation.c:722
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:735
+#: src/conversation/gnunet-conversation.c:741
 msgid "Calls waiting:\n"
 msgstr "Anruf wartet:\n"
 
-#: src/conversation/gnunet-conversation.c:741
+#: src/conversation/gnunet-conversation.c:747
 #, c-format
 msgid "#%u: `%s'\n"
 msgstr "#%u: »%s«\n"
 
-#: src/conversation/gnunet-conversation.c:769
-#: src/conversation/gnunet-conversation.c:784
+#: src/conversation/gnunet-conversation.c:776
+#: src/conversation/gnunet-conversation.c:791
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:817
-#: src/conversation/gnunet-conversation.c:833
+#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:840
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:840
+#: src/conversation/gnunet-conversation.c:847
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:849
+#: src/conversation/gnunet-conversation.c:856
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:866
+#: src/conversation/gnunet-conversation.c:873
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:901
+#: src/conversation/gnunet-conversation.c:908
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:909
+#: src/conversation/gnunet-conversation.c:916
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:926
+#: src/conversation/gnunet-conversation.c:933
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:952
+#: src/conversation/gnunet-conversation.c:959
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:954
+#: src/conversation/gnunet-conversation.c:961
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:956
+#: src/conversation/gnunet-conversation.c:963
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:958
+#: src/conversation/gnunet-conversation.c:965
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:960
+#: src/conversation/gnunet-conversation.c:967
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:962
+#: src/conversation/gnunet-conversation.c:969
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:964
+#: src/conversation/gnunet-conversation.c:971
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:966
+#: src/conversation/gnunet-conversation.c:973
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
 
-#: src/conversation/gnunet-conversation.c:968
+#: src/conversation/gnunet-conversation.c:975
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1172
+#: src/conversation/gnunet-conversation.c:1191
 #, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1185
+#: src/conversation/gnunet-conversation.c:1204
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym `%s' wurde gelöscht.\n"
 
-#: src/conversation/gnunet-conversation.c:1220
+#: src/conversation/gnunet-conversation.c:1242
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 
-#: src/conversation/gnunet-conversation.c:1244
+#: src/conversation/gnunet-conversation.c:1266
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/conversation/gnunet-conversation.c:1273
-msgid "sets the NAME of the ego to use for the phone (and name resolution)"
-msgstr ""
-
-#: src/conversation/gnunet-conversation.c:1279
-msgid "sets the LINE to use for the phone"
-msgstr ""
-
-#: src/conversation/gnunet-conversation.c:1306
-msgid "Enables having a conversation with other GNUnet users."
+#: src/conversation/gnunet-conversation.c:1295
+msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:119
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:145
-#, c-format
-msgid ""
-"\n"
-"We are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
+
+#: src/conversation/gnunet-conversation.c:1300
+msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:210
-#, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
+#: src/conversation/gnunet-conversation.c:1329
+msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet_gst.c:622
 #: src/conversation/gnunet-helper-audio-playback-gst.c:361
+#: src/conversation/gnunet_gst.c:622
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr "Fehler beim Lesen aus STDIN: %d %s\n"
@@ -1288,143 +1288,153 @@ msgstr ""
 msgid "Core service of `%s' ready.\n"
 msgstr "Dienst »%s« wird neu gestartet.\n"
 
-#: src/core/gnunet-service-core_kx.c:566
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:626
+#: src/core/gnunet-service-core_kx.c:677
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:728
+#: src/core/gnunet-service-core_kx.c:779
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:778
+#: src/core/gnunet-service-core_kx.c:829
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:840
+#: src/core/gnunet-service-core_kx.c:891
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:874
+#: src/core/gnunet-service-core_kx.c:925
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:941
+#: src/core/gnunet-service-core_kx.c:992
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:948
+#: src/core/gnunet-service-core_kx.c:1005
+#, fuzzy
+msgid "# duplicate ephemeral keys ignored"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/core/gnunet-service-core_kx.c:1040
 #, fuzzy
-msgid "# ephemeral keys received"
+msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:987
+#: src/core/gnunet-service-core_kx.c:1054
 #, c-format
 msgid ""
-"Ephemeral key message from peer `%s' rejected as its validity range does not "
-"match our system time (%llu not in [%llu,%llu]).\n"
+"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match "
+"our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:998
+#: src/core/gnunet-service-core_kx.c:1060
+#, fuzzy
+msgid "# EPHEMERAL_KEY messages rejected due to time"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/core/gnunet-service-core_kx.c:1080
 #, fuzzy
-msgid "# EPHEMERAL_KEY messages received"
+msgid "# valid ephemeral keys received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1094
+#: src/core/gnunet-service-core_kx.c:1180
 #: src/transport/gnunet-service-transport_validation.c:1128
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1103
+#: src/core/gnunet-service-core_kx.c:1189
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1161
+#: src/core/gnunet-service-core_kx.c:1248
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1187
+#: src/core/gnunet-service-core_kx.c:1274
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1200
+#: src/core/gnunet-service-core_kx.c:1287
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1264
+#: src/core/gnunet-service-core_kx.c:1351
 #: src/transport/gnunet-service-transport_validation.c:1461
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1271
+#: src/core/gnunet-service-core_kx.c:1358
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1363
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1311
+#: src/core/gnunet-service-core_kx.c:1398
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1349
+#: src/core/gnunet-service-core_kx.c:1436
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1360
+#: src/core/gnunet-service-core_kx.c:1447
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_kx.c:1367
+#: src/core/gnunet-service-core_kx.c:1454
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/core/gnunet-service-core_kx.c:1642
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1529
+#: src/core/gnunet-service-core_kx.c:1650
 #, 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:1532
+#: src/core/gnunet-service-core_kx.c:1653
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1593
-#: src/core/gnunet-service-core_kx.c:1619
+#: src/core/gnunet-service-core_kx.c:1742
+#: src/core/gnunet-service-core_kx.c:1768
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1606
+#: src/core/gnunet-service-core_kx.c:1755
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1648
+#: src/core/gnunet-service-core_kx.c:1797
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1656
+#: src/core/gnunet-service-core_kx.c:1805
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
@@ -1433,11 +1443,11 @@ msgstr "# Bytes entschlüsselt"
 #: src/core/gnunet-service-core_sessions.c:350
 #: src/dht/gnunet-service-dht_neighbours.c:733
 #: src/dht/gnunet-service-dht_neighbours.c:795
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520
-#: src/topology/gnunet-daemon-topology.c:612
-#: src/topology/gnunet-daemon-topology.c:714
-#: src/transport/gnunet-service-transport_neighbours.c:719
-#: src/transport/gnunet-service-transport_neighbours.c:727
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522
+#: src/topology/gnunet-daemon-topology.c:617
+#: src/topology/gnunet-daemon-topology.c:719
+#: src/transport/gnunet-service-transport_neighbours.c:721
+#: src/transport/gnunet-service-transport_neighbours.c:729
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
 
@@ -1466,54 +1476,185 @@ msgstr "# Bytes empfangen über TCP"
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:119 src/datacache/datacache.c:294
+#: src/credential/credential_misc.c:88
+#, fuzzy, c-format
+msgid "Unable to parse CRED record string `%s'\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888
+#: src/namestore/plugin_rest_namestore.c:1022
+#, fuzzy, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr "`%s': unbekannter Dienst: %s\n"
+
+#: src/credential/gnunet-credential.c:280
+#: src/credential/gnunet-credential.c:434
+#, c-format
+msgid "Issuer public key `%s' is not well-formed\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:361
+#: src/credential/gnunet-credential.c:423
+#, fuzzy, c-format
+msgid "Issuer public key not well-formed\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/credential/gnunet-credential.c:372
+#: src/credential/gnunet-credential.c:444
+#, fuzzy, c-format
+msgid "Failed to connect to CREDENTIAL\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/credential/gnunet-credential.c:379
+#, c-format
+msgid "You must provide issuer the attribute\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:387
+#, fuzzy, c-format
+msgid "ego required\n"
+msgstr "Gültiger Typ ist erforderlich\n"
+
+#: src/credential/gnunet-credential.c:403
+#, c-format
+msgid "Subject public key needed\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:414
+#, c-format
+msgid "Subject public key `%s' is not well-formed\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:451
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:504
+#, fuzzy, c-format
+msgid "Issuer ego required\n"
+msgstr "Gültiger Typ ist erforderlich\n"
+
+#: src/credential/gnunet-credential.c:516
+#, c-format
+msgid "Please specify name to lookup, subject key and issuer key!\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:536
+msgid "create credential"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:540
+msgid "verify credential against attribute"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:545
+#, fuzzy
+msgid "The public key of the subject to lookup the credential for"
+msgstr "Die Priorität des Inhalts angeben"
+
+#: src/credential/gnunet-credential.c:550
+msgid "The name of the credential presented by the subject"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:555
+msgid "The public key of the authority to verify the credential against"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:560
+msgid "The ego to use"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:565
+msgid "The issuer attribute to verify against or to issue"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:570
+msgid "The time to live for the credential"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:574
+msgid "collect credentials"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:588
+#, fuzzy
+msgid "GNUnet credential resolver tool"
+msgstr "GNUnet Netzwerk Topologie tracen."
+
+#: src/credential/gnunet-service-credential.c:1138
+#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184
+#, fuzzy, c-format
+msgid "Failed to connect to GNS\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/credential/gnunet-service-credential.c:1144
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
+#: src/namestore/gnunet-namestore.c:914
+#: src/namestore/plugin_rest_namestore.c:1035
+#, fuzzy, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/credential/plugin_gnsrecord_credential.c:186
+#, fuzzy, c-format
+msgid "Unable to parse ATTR record string `%s'\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669
+#, fuzzy
+msgid "GNS REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/datacache/datacache.c:119 src/datacache/datacache.c:311
 #: src/datastore/gnunet-service-datastore.c:757
 msgid "# bytes stored"
 msgstr "# gespeicherte Bytes"
 
-#: src/datacache/datacache.c:123 src/datacache/datacache.c:298
+#: src/datacache/datacache.c:123 src/datacache/datacache.c:315
 msgid "# items stored"
 msgstr "# gespeicherte Objekte"
 
-#: src/datacache/datacache.c:202
+#: src/datacache/datacache.c:206
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:213
+#: src/datacache/datacache.c:217
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/datacache/datacache.c:329
+#: src/datacache/datacache.c:344
 msgid "# requests received"
 msgstr "# Anfragen empfangen"
 
-#: src/datacache/datacache.c:339
+#: src/datacache/datacache.c:354
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/datacache.c:367
+#: src/datacache/datacache.c:384
 #, fuzzy
 msgid "# requests for random value received"
 msgstr "# Anfragen empfangen"
 
-#: src/datacache/datacache.c:399
+#: src/datacache/datacache.c:416
 #, fuzzy
 msgid "# proximity search requests received"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/datacache/plugin_datacache_heap.c:466
+#: src/datacache/plugin_datacache_heap.c:550
 msgid "Heap datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:113
-#: src/datacache/plugin_datacache_sqlite.c:122
+#: src/datacache/plugin_datacache_sqlite.c:118
+#: src/datacache/plugin_datacache_sqlite.c:127
 #: src/datastore/plugin_datastore_mysql.c:892
 #: src/datastore/plugin_datastore_sqlite.c:58
-#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92
-#: src/mysql/mysql.c:42 src/mysql/mysql.c:49
-#: src/namecache/plugin_namecache_sqlite.c:53
+#: src/datastore/plugin_datastore_sqlite.c:66
+#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80
+#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49
+#: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_sqlite.c:53
 #: src/peerstore/plugin_peerstore_sqlite.c:52
 #: src/psycstore/plugin_psycstore_mysql.c:62
@@ -1522,16 +1663,17 @@ msgstr ""
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:735 src/include/gnunet_common.h:744
+#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "»%s« schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:817
-#: src/datastore/plugin_datastore_sqlite.c:456
-#: src/namecache/plugin_namecache_sqlite.c:296
-#: src/namestore/plugin_namestore_sqlite.c:355
+#: src/datacache/plugin_datacache_sqlite.c:862
+#: src/datastore/plugin_datastore_sqlite.c:508
+#: src/identity-provider/plugin_identity_provider_sqlite.c:336
+#: src/namecache/plugin_namecache_sqlite.c:329
+#: src/namestore/plugin_namestore_sqlite.c:264
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1831,7 +1973,7 @@ msgid "MySQL statement run failure"
 msgstr ""
 
 #: src/datastore/plugin_datastore_mysql.c:410
-#: src/datastore/plugin_datastore_sqlite.c:626
+#: src/datastore/plugin_datastore_sqlite.c:678
 #, fuzzy
 msgid "Data too large"
 msgstr "Anzahl der Werte"
@@ -1870,32 +2012,34 @@ msgid "`%s' failed at %s:%u with error: %s"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:271
-#: src/namecache/plugin_namecache_sqlite.c:194
-#: src/namestore/plugin_namestore_sqlite.c:222
+#: src/identity-provider/plugin_identity_provider_sqlite.c:212
+#: src/namecache/plugin_namecache_sqlite.c:209
+#: src/namestore/plugin_namestore_sqlite.c:205
 #: src/peerstore/plugin_peerstore_sqlite.c:535
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:577
+#: src/datastore/plugin_datastore_sqlite.c:629
 msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1259
+#: src/datastore/plugin_datastore_sqlite.c:1322
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1293
+#: src/datastore/plugin_datastore_sqlite.c:1356
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1337
-#: src/namecache/plugin_namecache_sqlite.c:603
-#: src/namestore/plugin_namestore_sqlite.c:802
+#: src/datastore/plugin_datastore_sqlite.c:1400
+#: src/identity-provider/plugin_identity_provider_sqlite.c:711
+#: src/namecache/plugin_namecache_sqlite.c:640
+#: src/namestore/plugin_namestore_sqlite.c:754
 msgid "Sqlite database running\n"
 msgstr "Sqlite-Datenbank läuft\n"
 
@@ -1903,155 +2047,103 @@ msgstr "Sqlite-Datenbank läuft\n"
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:157
+#: src/dht/gnunet-dht-get.c:158
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
+#: src/dht/gnunet-dht-get.c:159
+#, c-format
+msgid "Result %d, type %d:\n"
+msgstr ""
+
 #: src/dht/gnunet-dht-get.c:204
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257
 msgid "Failed to connect to DHT service!\n"
 msgstr "Verbindung zum DHT-Dienst ist fehlgeschlagen!\n"
 
-#: src/dht/gnunet-dht-get.c:218
+#: src/dht/gnunet-dht-get.c:219
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:222
+#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307
+#: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:251
+#: src/dht/gnunet-dht-get.c:253
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304
+#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:264
+#: src/dht/gnunet-dht-get.c:263
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227
+#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:283
+#: src/dht/gnunet-dht-get.c:280
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:310
+#: src/dht/gnunet-dht-monitor.c:319
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344
-#: src/nse/gnunet-nse-profiler.c:871
+#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372
+#: src/nse/gnunet-nse-profiler.c:878
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:328
+#: src/dht/gnunet-dht-monitor.c:337
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:253
-#, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1188
-#, fuzzy
-msgid "number of peers to start"
-msgstr "Anzahl an Durchläufen"
-
-#: src/dht/gnunet_dht_profiler.c:1194
-msgid ""
-"maximum number of times we try to search for successor circle formation (0 "
-"for R5N)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853
-#: src/testbed/gnunet-testbed-profiler.c:304
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1206
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1212
-msgid "delay to start doing PUTs (default: 1 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1218
-msgid "delay to start doing GETs (default: 5 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1223
-msgid "replication degree for DHT PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1230
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1248
-msgid "Measure quality and performance of the DHT service."
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:120
-msgid "PUT request sent with key"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:123
-msgid "Timeout sending PUT request!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:126
-msgid "PUT request not confirmed!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:156
+#: src/dht/gnunet-dht-put.c:134
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:163
-#, c-format
-msgid "Could not connect to %s service!\n"
+#: src/dht/gnunet-dht-put.c:142
+#, fuzzy
+msgid "Could not connect to DHT service!\n"
 msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
 
-#: src/dht/gnunet-dht-put.c:174
+#: src/dht/gnunet-dht-put.c:153
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-put.c:188
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:216
+#: src/dht/gnunet-dht-put.c:193
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:233
+#: src/dht/gnunet-dht-put.c:207
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:238
+#: src/dht/gnunet-dht-put.c:211
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:244
+#: src/dht/gnunet-dht-put.c:216
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:262
+#: src/dht/gnunet-dht-put.c:233
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
@@ -2060,77 +2152,77 @@ msgstr ""
 msgid "# GET requests from clients injected"
 msgstr "# gap Anfragen mit taktischer Entscheidung: nicht Antworten"
 
-#: src/dht/gnunet-service-dht_clients.c:485
+#: src/dht/gnunet-service-dht_clients.c:483
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:624
+#: src/dht/gnunet-service-dht_clients.c:616
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:850
+#: src/dht/gnunet-service-dht_clients.c:842
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Die `%s' Anfrage, die vom Client empfangen wurde, ist beschädigt.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1035
+#: src/dht/gnunet-service-dht_clients.c:1027
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1050
+#: src/dht/gnunet-service-dht_clients.c:1042
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1096
+#: src/dht/gnunet-service-dht_clients.c:1088
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1103
+#: src/dht/gnunet-service-dht_clients.c:1095
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1181
+#: src/dht/gnunet-service-dht_clients.c:1173
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:72
+#: src/dht/gnunet-service-dht_datacache.c:73
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:82
+#: src/dht/gnunet-service-dht_datacache.c:83
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:198
+#: src/dht/gnunet-service-dht_datacache.c:202
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:210
+#: src/dht/gnunet-service-dht_datacache.c:214
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:216
+#: src/dht/gnunet-service-dht_datacache.c:220
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:222
+#: src/dht/gnunet-service-dht_datacache.c:226
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-dht_datacache.c:238
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:242
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:273
+#: src/dht/gnunet-service-dht_datacache.c:277
 msgid "# GET requests given to datacache"
 msgstr ""
 
@@ -2271,16 +2363,63 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/plugin_block_dht.c:187
+#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
+#, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:949
+#, fuzzy
+msgid "number of peers to start"
+msgstr "Anzahl an Durchläufen"
+
+#: src/dht/gnunet_dht_profiler.c:954
+msgid "number of PUTs to perform per peer"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
+#: src/testbed/gnunet-testbed-profiler.c:304
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:964
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:969
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:974
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:979
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:984
+msgid "chance that a peer is selected at random for PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:989
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1009
+msgid "Measure quality and performance of the DHT service."
+msgstr ""
+
+#: src/dht/plugin_block_dht.c:189
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/dht/plugin_block_dht.c:194
+#: src/dht/plugin_block_dht.c:198
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:204
+#: src/dht/plugin_block_dht.c:209
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2290,34 +2429,29 @@ msgstr ""
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:818
+#: src/dns/dnsparser.c:823
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:176
+#: src/dns/dnsstub.c:233
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382
-#, fuzzy, c-format
-msgid "Failed to send DNS request to %s\n"
-msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
-
-#: src/dns/dnsstub.c:298
+#: src/dns/dnsstub.c:364
 #, c-format
-msgid "Sent DNS request to %s\n"
+msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/dnsstub.c:367
-#, c-format
-msgid "Configured DNS exit `%s' is not working / valid.\n"
-msgstr ""
+#: src/dns/dnsstub.c:511
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s: %s\n"
+msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
 
-#: src/dns/dnsstub.c:437
+#: src/dns/dnsstub.c:517
 #, c-format
-msgid "Received DNS response that is too small (%u bytes)"
+msgid "Sent DNS request to %s\n"
 msgstr ""
 
 #: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
@@ -2344,48 +2478,48 @@ msgstr ""
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:608
+#: src/dns/gnunet-service-dns.c:610
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:738
+#: src/dns/gnunet-service-dns.c:740
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:813
+#: src/dns/gnunet-service-dns.c:815
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:928
+#: src/dns/gnunet-service-dns.c:930
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:944
+#: src/dns/gnunet-service-dns.c:946
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:953
+#: src/dns/gnunet-service-dns.c:955
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:963
+#: src/dns/gnunet-service-dns.c:965
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:965
+#: src/dns/gnunet-service-dns.c:967
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1032
+#: src/dns/gnunet-service-dns.c:1034
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569
+#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1090
+#: src/dns/gnunet-service-dns.c:1092
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
@@ -2395,214 +2529,214 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/exit/gnunet-daemon-exit.c:961
+#: src/exit/gnunet-daemon-exit.c:960
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1062
+#: src/exit/gnunet-daemon-exit.c:1061
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1341
+#: src/exit/gnunet-daemon-exit.c:1340
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573
-#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702
-#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954
-#: src/exit/gnunet-daemon-exit.c:2208
+#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572
+#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701
+#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953
+#: src/exit/gnunet-daemon-exit.c:2207
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1468
+#: src/exit/gnunet-daemon-exit.c:1467
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1576
+#: src/exit/gnunet-daemon-exit.c:1575
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1616
+#: src/exit/gnunet-daemon-exit.c:1615
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1705
+#: src/exit/gnunet-daemon-exit.c:1704
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1789
+#: src/exit/gnunet-daemon-exit.c:1788
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:1826
+#: src/exit/gnunet-daemon-exit.c:1825
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1957
+#: src/exit/gnunet-daemon-exit.c:1956
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280
-#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828
+#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279
+#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828
 #: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339
-#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887
+#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338
+#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887
 #: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2211
+#: src/exit/gnunet-daemon-exit.c:2210
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985
+#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985
 #: src/vpn/gnunet-service-vpn.c:2096
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875
+#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875
 #: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069
+#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/exit/gnunet-daemon-exit.c:2523
+#: src/exit/gnunet-daemon-exit.c:2522
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2542
+#: src/exit/gnunet-daemon-exit.c:2541
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/exit/gnunet-daemon-exit.c:2720
+#: src/exit/gnunet-daemon-exit.c:2719
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2728
+#: src/exit/gnunet-daemon-exit.c:2727
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2802
+#: src/exit/gnunet-daemon-exit.c:2801
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2874
+#: src/exit/gnunet-daemon-exit.c:2873
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2922
+#: src/exit/gnunet-daemon-exit.c:2921
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2936
+#: src/exit/gnunet-daemon-exit.c:2935
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2962
+#: src/exit/gnunet-daemon-exit.c:2961
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr "IPv4-Paketoptionen empfangen, werden ignoriert.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2989
+#: src/exit/gnunet-daemon-exit.c:2988
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3035
+#: src/exit/gnunet-daemon-exit.c:3034
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3043
+#: src/exit/gnunet-daemon-exit.c:3042
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256
+#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Option »%s« für Domain »%s« ist nicht korrekt formatiert!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278
+#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3319
+#: src/exit/gnunet-daemon-exit.c:3318
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346
+#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3358
+#: src/exit/gnunet-daemon-exit.c:3357
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3503
+#: src/exit/gnunet-daemon-exit.c:3501
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3511
+#: src/exit/gnunet-daemon-exit.c:3509
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3518
+#: src/exit/gnunet-daemon-exit.c:3516
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3524
+#: src/exit/gnunet-daemon-exit.c:3522
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3694
+#: src/exit/gnunet-daemon-exit.c:3690
 msgid "Must be a number"
 msgstr "Muss eine Zahl sein"
 
-#: src/exit/gnunet-daemon-exit.c:3809
+#: src/exit/gnunet-daemon-exit.c:3805
 #, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204
+#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3970
+#: src/exit/gnunet-daemon-exit.c:3966
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2736,64 +2870,64 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/fs_download.c:309
+#: src/fs/fs_download.c:310
 #, fuzzy
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr "Rekursiver Download des Verzeichnisses `%s' bei %llu von %llu Bytes.\n"
 
-#: src/fs/fs_download.c:334
+#: src/fs/fs_download.c:335
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:346
+#: src/fs/fs_download.c:347
 #, fuzzy, c-format
 msgid ""
 "Failed to access full directroy contents of `%s' for recursive download\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/fs/fs_download.c:533 src/fs/fs_download.c:545
+#: src/fs/fs_download.c:534 src/fs/fs_download.c:546
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:955
+#: src/fs/fs_download.c:956
 #, fuzzy, c-format
 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:1046
+#: src/fs/fs_download.c:1047
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1074
+#: src/fs/fs_download.c:1075
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1098
+#: src/fs/fs_download.c:1099
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1110
+#: src/fs/fs_download.c:1111
 #, 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:1120
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1219
+#: src/fs/fs_download.c:1220
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1884
+#: src/fs/fs_download.c:1885
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -2917,12 +3051,12 @@ msgstr "Verbindung zu gnunetd konnte nicht hergestellt 
werden.\n"
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
 
-#: src/fs/fs_search.c:809 src/fs/fs_search.c:879
+#: src/fs/fs_search.c:822 src/fs/fs_search.c:892
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_search.c:966
+#: src/fs/fs_search.c:979
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2976,96 +3110,96 @@ msgstr "Es konnte keine Verbindung mit gnunetd 
hergestellt werden."
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_uri.c:223
+#: src/fs/fs_uri.c:234
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:282
+#: src/fs/fs_uri.c:293
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:300
+#: src/fs/fs_uri.c:311
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:307
+#: src/fs/fs_uri.c:318
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:377
+#: src/fs/fs_uri.c:388
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:418
+#: src/fs/fs_uri.c:429
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:433
+#: src/fs/fs_uri.c:444
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:512
+#: src/fs/fs_uri.c:523
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:527
+#: src/fs/fs_uri.c:538
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:537
+#: src/fs/fs_uri.c:548
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545
+#: src/fs/fs_uri.c:556
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:553
+#: src/fs/fs_uri.c:564
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:559
+#: src/fs/fs_uri.c:570
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:565
+#: src/fs/fs_uri.c:576
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:574
+#: src/fs/fs_uri.c:585
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:580
+#: src/fs/fs_uri.c:591
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
+#: src/fs/fs_uri.c:597
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:609
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:632
+#: src/fs/fs_uri.c:643
 #, fuzzy
 msgid "invalid argument"
 msgstr "Ungültiges Argument »%s«\n"
 
-#: src/fs/fs_uri.c:644
+#: src/fs/fs_uri.c:655
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075
+#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1081
+#: src/fs/fs_uri.c:1092
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3105,19 +3239,19 @@ msgstr "Sie dürfen nur eine Datei zum Deindizieren 
angeben.\n"
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad LEVEL an Sender-Anonymität festlegen"
 
-#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949
+#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962
+#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -3164,106 +3298,97 @@ msgstr "Dateiformat fehlerhaft (kein GNUnet 
Verzeichnis?)\n"
 msgid "Display contents of a GNUnet directory"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/gnunet-download.c:137
+#: src/fs/gnunet-download.c:139
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/gnunet-download.c:147
+#: src/fs/gnunet-download.c:149
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/gnunet-download.c:157
+#: src/fs/gnunet-download.c:158
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:179
+#: src/fs/gnunet-download.c:184
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/fs/gnunet-download.c:194
+#: src/fs/gnunet-download.c:201
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
+#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295
 #: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:246
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726
+#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:264
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:273
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
+#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870
 #: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
 
-#: src/fs/gnunet-download.c:311
+#: src/fs/gnunet-download.c:344
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319
+#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:322
+#: src/fs/gnunet-download.c:354
 msgid "write the file to FILENAME"
 msgstr "Die Datei in DATEINAME schreiben"
 
-#: src/fs/gnunet-download.c:328
+#: src/fs/gnunet-download.c:359
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:334
+#: src/fs/gnunet-download.c:364
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:339
+#: src/fs/gnunet-download.c:368
 msgid "download a GNUnet directory recursively"
 msgstr "Das GNUnet-Verzeichnis rekursiv herunterladen"
 
-#: src/fs/gnunet-download.c:356
+#: src/fs/gnunet-download.c:386
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:119
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:130
-#, fuzzy
-msgid "Special file-sharing operations"
-msgstr "Alle Optionen anzeigen"
-
 #: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
@@ -3280,6 +3405,15 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
+#: src/fs/gnunet-fs.c:119
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:130
+#, fuzzy
+msgid "Special file-sharing operations"
+msgstr "Alle Optionen anzeigen"
+
 #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -3416,7 +3550,7 @@ msgstr "Option `%s' macht keinen Sinn ohne die Option 
`%s'.\n"
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Die Option »%s« ergibt keinen Sinn ohne die Option »%s«.\n"
 
-#: src/fs/gnunet-publish.c:916
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3424,7 +3558,7 @@ msgstr ""
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:923
+#: src/fs/gnunet-publish.c:919
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3432,13 +3566,13 @@ msgstr ""
 "Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der "
 "obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-publish.c:930
+#: src/fs/gnunet-publish.c:925
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
 "setzen"
 
-#: src/fs/gnunet-publish.c:935
+#: src/fs/gnunet-publish.c:930
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3446,7 +3580,7 @@ msgstr ""
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet-Datenbank)"
 
-#: src/fs/gnunet-publish.c:942
+#: src/fs/gnunet-publish.c:937
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3454,32 +3588,32 @@ msgstr ""
 "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlicht "
 "werden soll. (nur für das Einfügen in Namensräume)"
 
-#: src/fs/gnunet-publish.c:955
+#: src/fs/gnunet-publish.c:950
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "Die Datei unter dem Pseudonym NAME veröffentlichen (platziert die Datei in "
 "einem Namensraum)"
 
-#: src/fs/gnunet-publish.c:968
+#: src/fs/gnunet-publish.c:960
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:975
+#: src/fs/gnunet-publish.c:966
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "Die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in "
 "Namensräume)"
 
-#: src/fs/gnunet-publish.c:982
+#: src/fs/gnunet-publish.c:973
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:998
+#: src/fs/gnunet-publish.c:989
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3555,7 +3689,7 @@ msgid "FS service is lacking HOSTKEY configuration 
setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
 #: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355
-#: src/topology/gnunet-daemon-topology.c:1203
+#: src/topology/gnunet-daemon-topology.c:1202
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
@@ -3605,7 +3739,7 @@ msgstr "# verschlüsselter PING Nachrichten empfangen"
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343
+#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345
 msgid "# P2P searches active"
 msgstr ""
 
@@ -3656,21 +3790,21 @@ msgstr ""
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1239
+#: src/fs/gnunet-service-fs_cp.c:1241
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1295
+#: src/fs/gnunet-service-fs_cp.c:1297
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1339
+#: src/fs/gnunet-service-fs_cp.c:1341
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1706
+#: src/fs/gnunet-service-fs_cp.c:1708
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -3894,6 +4028,10 @@ msgstr "Auf die Namespace Informationen konnte nicht 
zugegriffen werden.\n"
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
+#: src/gns/gns_tld_api.c:276
+msgid "Expected a base32-encoded public zone key\n"
+msgstr ""
+
 #: src/gns/gnunet-bcd.c:127
 #, fuzzy, c-format
 msgid "Refusing `%s' request to HTTP server\n"
@@ -3919,133 +4057,67 @@ msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
 #: src/gns/gnunet-bcd.c:535
-msgid "GNUnet HTTP server to create business cards"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:238
-msgid "Failed to pack DNS response into UDP packet!\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:408
-#, c-format
-msgid "Cannot parse DNS request from %s\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:424
-#, fuzzy, c-format
-msgid "Received malformed DNS request from %s\n"
-msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
-
-#: src/gns/gnunet-dns2gns.c:432
-#, fuzzy, c-format
-msgid "Received unsupported DNS request from %s\n"
-msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n"
-
-#: src/gns/gnunet-dns2gns.c:711
-msgid "No ego configured for `dns2gns` subsystem\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:739
-#, fuzzy
-msgid "No DNS server specified!\n"
-msgstr "Keine Schlüsselwörter angegeben!\n"
-
-#: src/gns/gnunet-dns2gns.c:760
-#, fuzzy
-msgid "No valid GNS zone specified!\n"
-msgstr "Keine Schlüsselwörter angegeben!\n"
-
-#: src/gns/gnunet-dns2gns.c:784
-msgid "IP of recursive DNS resolver to use (required)"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:790
-msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:796
-msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:802
-msgid "UDP port to listen on for inbound DNS requests; default: 2853"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:808
-msgid "Public key of the GNS zone to use (overrides default)"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:826
-msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
+msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:252
-#, c-format
-msgid "Please specify name to lookup!\n"
+#: src/gns/gnunet-dns2gns.c:203
+msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:276
+#: src/gns/gnunet-dns2gns.c:404
 #, c-format
-msgid "Ego for `%s' not found, cannot perform lookup.\n"
+msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701
-#: src/gns/plugin_rest_gns.c:422
-#, c-format
-msgid ""
-"Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
-"gns-import.sh?\n"
-msgstr ""
+#: src/gns/gnunet-dns2gns.c:420
+#, fuzzy, c-format
+msgid "Received malformed DNS request from %s\n"
+msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727
+#: src/gns/gnunet-dns2gns.c:428
 #, fuzzy, c-format
-msgid "Failed to connect to GNS\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+msgid "Received unsupported DNS request from %s\n"
+msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n"
 
-#: src/gns/gnunet-gns.c:374
-#, c-format
-msgid "Public key `%s' is not well-formed\n"
-msgstr ""
+#: src/gns/gnunet-dns2gns.c:587
+#, fuzzy
+msgid "No DNS server specified!\n"
+msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-gns.c:428
-msgid "Lookup a record for the given name"
+#: src/gns/gnunet-dns2gns.c:687
+msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:434
-#, fuzzy
-msgid "Specify the type of the record to lookup"
-msgstr "Die Priorität des Inhalts angeben"
-
-#: src/gns/gnunet-gns.c:440
-msgid "Specify timeout for the lookup"
+#: src/gns/gnunet-dns2gns.c:692
+msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:445
-msgid "No unneeded output"
+#: src/gns/gnunet-dns2gns.c:709
+msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:451
-msgid "Specify the public key of the zone to lookup the record in"
+#: src/gns/gnunet-gns-benchmark.c:582
+msgid "how long to wait between queries"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:457
-msgid "Specify the name of the ego of the zone to lookup the record in"
+#: src/gns/gnunet-gns-benchmark.c:587
+msgid "how long to wait for an answer"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:476
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "GNUnet Netzwerk Topologie tracen."
+#: src/gns/gnunet-gns-benchmark.c:591
+msgid "look for GNS2DNS records instead of ANY"
+msgstr ""
 
 #: src/gns/gnunet-gns-helper-service-w32.c:602
 msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
 
+#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422
+msgid ""
+"Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
+"gns-import.sh?\n"
+msgstr ""
+
 #: src/gns/gnunet-gns-helper-service-w32.c:739
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
@@ -4056,230 +4128,239 @@ msgid "This program will import some GNS authorities 
into your GNS namestore."
 msgstr ""
 
 #: src/gns/gnunet-gns-proxy.c:109
-#: src/hostlist/gnunet-daemon-hostlist_client.c:569
-#: src/hostlist/gnunet-daemon-hostlist_client.c:787
-#: src/hostlist/gnunet-daemon-hostlist_client.c:793
-#: src/hostlist/gnunet-daemon-hostlist_client.c:845
-#: src/hostlist/gnunet-daemon-hostlist_client.c:854
-#: src/hostlist/gnunet-daemon-hostlist_client.c:965
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1060
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1065
+#: src/hostlist/gnunet-daemon-hostlist_client.c:535
+#: src/hostlist/gnunet-daemon-hostlist_client.c:753
+#: src/hostlist/gnunet-daemon-hostlist_client.c:759
+#: src/hostlist/gnunet-daemon-hostlist_client.c:811
+#: src/hostlist/gnunet-daemon-hostlist_client.c:820
+#: src/hostlist/gnunet-daemon-hostlist_client.c:931
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
 #: src/transport/plugin_transport_http_client.c:598
 #: src/transport/plugin_transport_http_client.c:616
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "»%s« schlug fehl bei %s:%d mit dem Fehler: »%s«.\n"
 
-#: src/gns/gnunet-gns-proxy.c:887
-#, c-format
-msgid "Unsupported CURL SSL backend %d\n"
-msgstr ""
-
 #: src/gns/gnunet-gns-proxy.c:910
 #, fuzzy, c-format
+msgid "Unsupported CURL TLS backend %d\n"
+msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
+
+#: src/gns/gnunet-gns-proxy.c:933
+#, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:956
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:946
+#: src/gns/gnunet-gns-proxy.c:969
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/gns/gnunet-gns-proxy.c:961
+#: src/gns/gnunet-gns-proxy.c:984
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:971
+#: src/gns/gnunet-gns-proxy.c:994
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:995
+#: src/gns/gnunet-gns-proxy.c:1018
 #, c-format
-msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgid "TLS certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1104
+#: src/gns/gnunet-gns-proxy.c:1132
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1709
+#: src/gns/gnunet-gns-proxy.c:1868
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2172
+#: src/gns/gnunet-gns-proxy.c:2364
 #, 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:2202
+#: src/gns/gnunet-gns-proxy.c:2394
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2375
+#: src/gns/gnunet-gns-proxy.c:2573
 #, 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:2394 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2716
+#: src/gns/gnunet-gns-proxy.c:2925
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2745
+#: src/gns/gnunet-gns-proxy.c:2954
 #, 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:2763 src/gns/gnunet-gns-proxy.c:2792
-msgid "SSL connection to plain IPv4 address requested\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:2842
+#: src/gns/gnunet-gns-proxy.c:3035
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3177 src/gns/gnunet-service-gns.c:403
-#, c-format
-msgid "No ego configured for `%s`\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:3238
+#: src/gns/gnunet-gns-proxy.c:3316
 #, fuzzy, c-format
-msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
+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:3281
+#: src/gns/gnunet-gns-proxy.c:3443
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3287
+#: src/gns/gnunet-gns-proxy.c:3448
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3312
+#: src/gns/gnunet-gns-proxy.c:3473
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:442
+#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:238
+#, fuzzy
+msgid "Specify the type of the record to lookup"
+msgstr "Die Priorität des Inhalts angeben"
+
+#: src/gns/gnunet-gns.c:242
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:258
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "GNUnet Netzwerk Topologie tracen."
+
+#: src/gns/gnunet-service-gns.c:513
+#, fuzzy
+msgid "Properly base32-encoded public key required"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/gns/gnunet-service-gns.c:549
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns.c:461
-#: src/zonemaster/gnunet-service-zonemaster.c:742
+#: src/gns/gnunet-service-gns.c:568
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
+#: src/zonemaster/gnunet-service-zonemaster.c:875
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:263
+#: src/gns/gnunet-service-gns_interceptor.c:259
 #, fuzzy
 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:370
+#: src/gns/gnunet-service-gns_interceptor.c:366
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:641
+#: src/gns/gnunet-service-gns_resolver.c:713
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:652
+#: src/gns/gnunet-service-gns_resolver.c:724
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:844
+#: src/gns/gnunet-service-gns_resolver.c:927
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:986
+#: src/gns/gnunet-service-gns_resolver.c:1102
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1347
+#: src/gns/gnunet-service-gns_resolver.c:1796
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1865
+#: src/gns/gnunet-service-gns_resolver.c:1839
+msgid "GNS lookup failed (zero records found)\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:2253
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1889
+#: src/gns/gnunet-service-gns_resolver.c:2276
 #, 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:2171
+#: src/gns/gnunet-service-gns_resolver.c:2563
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2318
-#, c-format
-msgid "Hostname `%s' is not well-formed, resolution fails\n"
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:203
+#: src/gns/plugin_gnsrecord_gns.c:181
 #, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:232
+#: src/gns/plugin_gnsrecord_gns.c:212
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:253
+#: src/gns/plugin_gnsrecord_gns.c:233
 #, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:276
+#: src/gns/plugin_gnsrecord_gns.c:258
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/plugin_gnsrecord_gns.c:312
+#: src/gns/plugin_gnsrecord_gns.c:294
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/plugin_gnsrecord_gns.c:360
-#, fuzzy, c-format
-msgid "Unable to parse REVERSE record string `%s'\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
-
 #: src/gns/plugin_rest_gns.c:384
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:668
-#, fuzzy
-msgid "GNS REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
 #: src/gnsrecord/plugin_gnsrecord_dns.c:359
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4447,155 +4528,155 @@ msgstr ""
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:371
+#: src/hostlist/gnunet-daemon-hostlist_client.c:349
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:392
-#: src/hostlist/gnunet-daemon-hostlist_client.c:437
+#: src/hostlist/gnunet-daemon-hostlist_client.c:370
+#: src/hostlist/gnunet-daemon-hostlist_client.c:403
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:395
-#: src/hostlist/gnunet-daemon-hostlist_client.c:440
+#: src/hostlist/gnunet-daemon-hostlist_client.c:373
+#: src/hostlist/gnunet-daemon-hostlist_client.c:406
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:413
+#: src/hostlist/gnunet-daemon-hostlist_client.c:391
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:695
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1441
+#: src/hostlist/gnunet-daemon-hostlist_client.c:661
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:725
+#: src/hostlist/gnunet-daemon-hostlist_client.c:691
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:768
+#: src/hostlist/gnunet-daemon-hostlist_client.c:734
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:862
 #, 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:910
+#: src/hostlist/gnunet-daemon-hostlist_client.c:876
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:930
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, 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:936
+#: src/hostlist/gnunet-daemon-hostlist_client.c:902
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:944
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:997
+#: src/hostlist/gnunet-daemon-hostlist_client.c:963
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1005
+#: src/hostlist/gnunet-daemon-hostlist_client.c:971
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1132
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1698
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1098
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1665
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1141
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1107
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1200
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1221
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1166
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1187
 #, fuzzy
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
 #, 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:1392
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
 #, 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:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
 #, 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:1435
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1438
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1484
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
 #, 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:1491
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
 #, 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:1515
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1532
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1527
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1595
 #: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1657
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1624
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1671
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1638
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1651
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4614,7 +4695,7 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_server.c:531
 #: src/peerinfo-tool/gnunet-peerinfo.c:385
 #: src/peerinfo-tool/gnunet-peerinfo.c:534
-#: src/topology/gnunet-daemon-topology.c:857
+#: src/topology/gnunet-daemon-topology.c:862
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -4711,6 +4792,71 @@ msgstr "»%s« ist keine gültige IP-Adresse.\n"
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
+#: src/identity-provider/gnunet-idp.c:424
+#, fuzzy
+msgid "Ego is required\n"
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
+
+#: src/identity-provider/gnunet-idp.c:432
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:440
+#, fuzzy
+msgid "Requesting party key is required!\n"
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
+
+#: src/identity-provider/gnunet-idp.c:463
+msgid "Add attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:469
+msgid "Attribute value"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:474
+msgid "Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:479
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:483
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:488
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:493
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:498
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:503
+msgid "Type of attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:508
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/identity-provider/identity_provider_api.c:436
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
+#: src/identity-provider/plugin_rest_identity_provider.c:1230
+#: src/identity-provider/plugin_rest_openid_connect.c:2147
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
 #: src/identity/gnunet-identity.c:179
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
@@ -4798,33 +4944,10 @@ 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:967
+#: src/identity/plugin_rest_identity.c:968
 msgid "Identity REST API initialized\n"
 msgstr ""
 
-#: src/identity-provider/gnunet-identity-token.c:66
-#, fuzzy
-msgid "Option `-t' is required\n"
-msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
-
-#: src/identity-provider/gnunet-identity-token.c:77
-#, fuzzy, c-format
-msgid "Token `%s' is malformed\n"
-msgstr "Schlüssel »%s« ist gültig\n"
-
-#: src/identity-provider/gnunet-identity-token.c:166
-msgid "GNUid token"
-msgstr ""
-
-#: src/identity-provider/gnunet-identity-token.c:171
-msgid "Print token contents"
-msgstr ""
-
-#: src/identity-provider/plugin_rest_identity_provider.c:1166
-#, fuzzy
-msgid "Identity Token REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
 #: src/json/json.c:119
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -4854,7 +4977,7 @@ msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 msgid "No records found for `%s'"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4874,7 +4997,7 @@ msgstr "Ungültiger Parameter: `%s'\n"
 msgid "You must specify a name\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4883,7 +5006,7 @@ msgstr ""
 msgid "spezifies the public key of the zone to look in"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
@@ -4897,285 +5020,291 @@ msgstr ""
 msgid "Error communicating with namecache service"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/namecache/plugin_namecache_flat.c:119
-#: src/namecache/plugin_namecache_flat.c:253
-#: src/namestore/plugin_namestore_flat.c:179
-#: src/namestore/plugin_namestore_flat.c:375
+#: src/namecache/plugin_namecache_flat.c:121
+#: src/namecache/plugin_namecache_flat.c:255
+#: src/namestore/plugin_namestore_flat.c:150
+#: src/namestore/plugin_namestore_flat.c:385
 #: src/peerstore/plugin_peerstore_flat.c:379
 #: src/peerstore/plugin_peerstore_flat.c:538
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/namecache/plugin_namecache_flat.c:130
-#: src/namestore/plugin_namestore_flat.c:190
+#: src/namecache/plugin_namecache_flat.c:132
+#: src/namestore/plugin_namestore_flat.c:161
 #: src/peerstore/plugin_peerstore_flat.c:394
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/namecache/plugin_namecache_flat.c:149
-#: src/namestore/plugin_namestore_flat.c:203
+#: src/namecache/plugin_namecache_flat.c:151
+#: src/namestore/plugin_namestore_flat.c:174
 #: src/peerstore/plugin_peerstore_flat.c:406
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/namecache/plugin_namecache_flat.c:408
+#: src/namecache/plugin_namecache_flat.c:410
 #, fuzzy
 msgid "flat plugin running\n"
 msgstr "Sqlite-Datenbank läuft\n"
 
-#: src/namestore/gnunet-namestore.c:301
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:547
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:567
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:598
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:678
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:736
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:754
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:790
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:799
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1019
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1045
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1092
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1130
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:313
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:562
+#: src/namestore/gnunet-namestore.c:343
+#: src/namestore/plugin_rest_namestore.c:572
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:571
+#: src/namestore/gnunet-namestore.c:350
+#: src/namestore/plugin_rest_namestore.c:581
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527
-#: src/namestore/gnunet-namestore.c:535
+#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561
-#: src/namestore/gnunet-namestore.c:573
+#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
-#: src/namestore/plugin_rest_namestore.c:597
+#: src/namestore/gnunet-namestore.c:677
+#, c-format
+msgid ""
+"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:810
+#: src/namestore/plugin_rest_namestore.c:607
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:739
+#: src/namestore/gnunet-namestore.c:851
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:776
-#: src/namestore/plugin_rest_namestore.c:1004
-#, fuzzy, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr "`%s': unbekannter Dienst: %s\n"
-
-#: src/namestore/gnunet-namestore.c:791
+#: src/namestore/gnunet-namestore.c:903
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:802
-#: src/namestore/gnunet-namestore-fcfsd.c:1034
-#: src/namestore/plugin_rest_namestore.c:1017
-#, fuzzy
-msgid "Failed to connect to namestore\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819
-#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861
-#: src/namestore/gnunet-namestore.c:915
+#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973
+#: src/namestore/gnunet-namestore.c:1027
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820
-#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863
+#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932
+#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:829
-#: src/namestore/plugin_rest_namestore.c:671
+#: src/namestore/gnunet-namestore.c:941
+#: src/namestore/plugin_rest_namestore.c:684
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/namestore/gnunet-namestore.c:851
-#: src/namestore/plugin_rest_namestore.c:689
-#: src/namestore/plugin_rest_namestore.c:729
+#: src/namestore/gnunet-namestore.c:963
+#: src/namestore/plugin_rest_namestore.c:704
+#: src/namestore/plugin_rest_namestore.c:746
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
 
-#: src/namestore/gnunet-namestore.c:896
+#: src/namestore/gnunet-namestore.c:1008
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1028
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:950
+#: src/namestore/gnunet-namestore.c:1071
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/namestore/gnunet-namestore.c:1100
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1014
+#: src/namestore/gnunet-namestore.c:1135
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1051
-#: src/namestore/plugin_rest_namestore.c:1047
+#: src/namestore/gnunet-namestore.c:1175
+#: src/namestore/plugin_rest_namestore.c:1065
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1108
-#: src/namestore/plugin_rest_namestore.c:1143
+#: src/namestore/gnunet-namestore.c:1239
+#: src/namestore/plugin_rest_namestore.c:1161
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1137
+#: src/namestore/gnunet-namestore.c:1264
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1142
+#: src/namestore/gnunet-namestore.c:1268
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1147
+#: src/namestore/gnunet-namestore.c:1272
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1153
+#: src/namestore/gnunet-namestore.c:1277
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1282
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1164
+#: src/namestore/gnunet-namestore.c:1286
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1176
+#: src/namestore/gnunet-namestore.c:1296
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1184
+#: src/namestore/gnunet-namestore.c:1301
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1190
+#: src/namestore/gnunet-namestore.c:1306
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1196
+#: src/namestore/gnunet-namestore.c:1311
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1201
+#: src/namestore/gnunet-namestore.c:1315
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1206
+#: src/namestore/gnunet-namestore.c:1319
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1212
+#: src/namestore/gnunet-namestore.c:1324
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:508
-#, fuzzy, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:535
-#, fuzzy, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:555
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:585
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:662
+#: src/namestore/gnunet-service-namestore.c:750
 #, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:718
-#, fuzzy, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:734
-#, fuzzy, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:770
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:778
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:974
-msgid "No ego configured for `fcfsd` subsystem\n"
+msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1000
-#, fuzzy
-msgid "Failed to start HTTP server\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1042
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1074
-msgid "GNU Name System First Come First Serve name registration service"
+#: src/namestore/gnunet-zoneimport.c:2035
+msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:615
-#, c-format
-msgid "Failed to replicate block in namecache: %s\n"
+#: src/namestore/gnunet-zoneimport.c:2040
+msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
-#: src/namestore/namestore_api.c:379
+#: src/namestore/namestore_api.c:391
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:656
+#: src/namestore/plugin_namestore_flat.c:767
 #, fuzzy
 msgid "flat file database running\n"
 msgstr "Sqlite-Datenbank läuft\n"
 
-#: src/namestore/plugin_rest_namestore.c:1188
+#: src/namestore/plugin_namestore_sqlite.c:218
+#: src/namestore/plugin_namestore_sqlite.c:229
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/namestore/plugin_rest_namestore.c:1206
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -5205,11 +5334,11 @@ msgstr "# Freunde in Konfiguration"
 msgid "section name providing the configuration for the adapter"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447
+#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453
 msgid "use TCP"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452
+#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458
 msgid "use UDP"
 msgstr ""
 
@@ -5388,58 +5517,58 @@ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/nat/gnunet-nat.c:425
+#: src/nat/gnunet-nat.c:431
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:431
+#: src/nat/gnunet-nat.c:437
 msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:437
+#: src/nat/gnunet-nat.c:443
 msgid ""
 "name of configuration section to find additional options, such as manual "
 "host punching data"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:442
+#: src/nat/gnunet-nat.c:448
 msgid "enable STUN processing"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:457
+#: src/nat/gnunet-nat.c:463
 msgid "watch for connection reversal requests"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:469
+#: src/nat/gnunet-nat.c:475
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1335
+#: src/nat/gnunet-service-nat.c:1339
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1345
+#: src/nat/gnunet-service-nat.c:1349
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1361
+#: src/nat/gnunet-service-nat.c:1365
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1372
+#: src/nat/gnunet-service-nat.c:1376
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1837
+#: src/nat/gnunet-service-nat.c:1841
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/nat/gnunet-service-nat.c:1910
+#: src/nat/gnunet-service-nat.c:1914
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5463,98 +5592,41 @@ msgstr "Kommando `%s' wurde nicht gefunden!\n"
 #: src/nat/gnunet-service-nat_mini.c:656
 #, fuzzy
 msgid "`upnpc' command not found\n"
-msgstr "Kommando `%s' wurde nicht gefunden!\n"
-
-#: src/nse/gnunet-nse.c:122
-msgid "Show network size estimates from NSE service."
-msgstr ""
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nse/gnunet-nse-profiler.c:842
+#: src/nse/gnunet-nse-profiler.c:849
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:847
+#: src/nse/gnunet-nse-profiler.c:854
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:859
+#: src/nse/gnunet-nse-profiler.c:866
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:866
+#: src/nse/gnunet-nse-profiler.c:873
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:877
+#: src/nse/gnunet-nse-profiler.c:884
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:886
+#: src/nse/gnunet-nse-profiler.c:893
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:840 src/util/gnunet-scrypt.c:276
-msgid "Value is too large.\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:178
-#, fuzzy, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Verfügbare(r) Transport(e): %s\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:310
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:331
-#: src/peerinfo/gnunet-service-peerinfo.c:362
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:446
-msgid "# peers known"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:489
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-"Die Datei »%s« im Verzeichnis »%s« entspricht nicht der Namenskonvention. "
-"Die Datei wurde entfernt.\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:655
-#, fuzzy, c-format
-msgid "Scanning directory `%s'\n"
-msgstr "==> Verzeichnis `%s':\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:663
-#, fuzzy, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1080
-#, fuzzy, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr "==> Verzeichnis `%s':\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1409
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
+#: src/nse/gnunet-nse.c:122
+msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1422
-msgid "Skipping import of included HELLOs\n"
+#: src/nse/gnunet-service-nse.c:1534
+#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
+msgid "Value is too large.\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:220
-#, fuzzy
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
-
 #: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
@@ -5645,6 +5717,63 @@ msgstr "Teste Transport(e) %s\n"
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
+#: src/peerinfo/gnunet-service-peerinfo.c:178
+#, fuzzy, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Verfügbare(r) Transport(e): %s\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:313
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:334
+#: src/peerinfo/gnunet-service-peerinfo.c:365
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:449
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:492
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+"Die Datei »%s« im Verzeichnis »%s« entspricht nicht der Namenskonvention. "
+"Die Datei wurde entfernt.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:659
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "==> Verzeichnis `%s':\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:667
+#, fuzzy, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1100
+#, fuzzy, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "==> Verzeichnis `%s':\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1438
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1451
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:220
+#, fuzzy
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
+
 #: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
@@ -5951,11 +6080,11 @@ msgstr ""
 msgid "Search string `%s' is too long!\n"
 msgstr "Dienst »%s« läuft nicht\n"
 
-#: src/rest/gnunet-rest-server.c:790
+#: src/rest/gnunet-rest-server.c:927
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:807
+#: src/rest/gnunet-rest-server.c:944
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "GNUnet Netzwerk Topologie tracen."
@@ -6086,19 +6215,22 @@ msgid "# revocation set unions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
 #: src/revocation/gnunet-service-revocation.c:525
-#: src/revocation/gnunet-service-revocation.c:773
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:864
+#: src/revocation/gnunet-service-revocation.c:867
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/rps/gnunet-rps.c:146
+#: src/rps/gnunet-rps.c:203
 msgid "Seed a PeerID"
 msgstr ""
 
+#: src/rps/gnunet-rps.c:207
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
 #: src/scalarproduct/gnunet-scalarproduct.c:220
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
@@ -6154,10 +6286,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -6534,14 +6666,14 @@ msgstr ""
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:247
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:249
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46
-#: src/testing/testing.c:288 src/util/gnunet-ecc.c:306
+#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6611,6 +6743,17 @@ msgstr ""
 msgid "%.s Unknown result code."
 msgstr ""
 
+#: src/testbed/gnunet-testbed-profiler.c:289
+msgid "tolerate COUNT number of continious timeout failures"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:294
+msgid ""
+"run profiler in non-interactive mode where upon testbed setup the profiler "
+"does not wait for a keystroke but continues to run until a termination "
+"signal is received"
+msgstr ""
+
 #: src/testbed/gnunet_testbed_mpi_spawn.c:118
 #, fuzzy
 msgid "Waiting for child to exit.\n"
@@ -6623,17 +6766,6 @@ msgstr ""
 msgid "Spawning process `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:289
-msgid "tolerate COUNT number of continious timeout failures"
-msgstr ""
-
-#: src/testbed/gnunet-testbed-profiler.c:294
-msgid ""
-"run profiler in non-interactive mode where upon testbed setup the profiler "
-"does not wait for a keystroke but continues to run until a termination "
-"signal is received"
-msgstr ""
-
 #: src/testbed/testbed_api.c:410
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
@@ -6855,81 +6987,77 @@ msgstr "»%s« konnte nicht gestartet werden: %s\n"
 msgid "Failed to load configuration from %s\n"
 msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
 
-#: src/topology/friends.c:106
+#: src/topology/friends.c:126
 #, fuzzy, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
 
-#: src/topology/friends.c:160
+#: src/topology/friends.c:180
 #, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:225
+#: src/topology/gnunet-daemon-topology.c:230
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:339
+#: src/topology/gnunet-daemon-topology.c:344
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/topology/gnunet-daemon-topology.c:533
+#: src/topology/gnunet-daemon-topology.c:538
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/topology/gnunet-daemon-topology.c:635
-#: src/topology/gnunet-daemon-topology.c:721
+#: src/topology/gnunet-daemon-topology.c:640
+#: src/topology/gnunet-daemon-topology.c:726
 msgid "# friends connected"
 msgstr "# verbundener Freunde"
 
-#: src/topology/gnunet-daemon-topology.c:918
+#: src/topology/gnunet-daemon-topology.c:923
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:951
+#: src/topology/gnunet-daemon-topology.c:956
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:958
+#: src/topology/gnunet-daemon-topology.c:963
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:980
+#: src/topology/gnunet-daemon-topology.c:985
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:983
+#: src/topology/gnunet-daemon-topology.c:988
 msgid "# friends in configuration"
 msgstr "# Freunde in Konfiguration"
 
-#: src/topology/gnunet-daemon-topology.c:990
+#: src/topology/gnunet-daemon-topology.c:995
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:1001
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1059
+#: src/topology/gnunet-daemon-topology.c:1054
 #: src/transport/plugin_transport_wlan.c:1517
 msgid "# HELLO messages received"
 msgstr "# HELLO-Meldungen empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1233
+#: src/topology/gnunet-daemon-topology.c:1232
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:141
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport.c:448
 msgid "# messages dropped due to slow client"
 msgstr ""
@@ -6974,211 +7102,215 @@ msgstr ""
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:804
+#: src/transport/gnunet-service-transport_neighbours.c:806
 #, fuzzy
 msgid "# session creation failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1053
 msgid "# DISCONNECT messages sent"
 msgstr "# DISCONNECT-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1168
+#: src/transport/gnunet-service-transport_neighbours.c:1176
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1764
+#: src/transport/gnunet-service-transport_neighbours.c:1324
+#: src/transport/gnunet-service-transport_neighbours.c:1785
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1316
+#: src/transport/gnunet-service-transport_neighbours.c:1329
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1322
+#: src/transport/gnunet-service-transport_neighbours.c:1335
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1395
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1458
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1494
+#: src/transport/gnunet-service-transport_neighbours.c:1515
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1502
+#: src/transport/gnunet-service-transport_neighbours.c:1523
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1512
+#: src/transport/gnunet-service-transport_neighbours.c:1533
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1557
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1566
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1574
+#: src/transport/gnunet-service-transport_neighbours.c:1595
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1583
+#: src/transport/gnunet-service-transport_neighbours.c:1604
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1588
+#: src/transport/gnunet-service-transport_neighbours.c:1609
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1615
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1661
+#: src/transport/gnunet-service-transport_neighbours.c:1682
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1695
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1710
+#: src/transport/gnunet-service-transport_neighbours.c:1731
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1830
+#: src/transport/gnunet-service-transport_neighbours.c:1854
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1850
+#: src/transport/gnunet-service-transport_neighbours.c:1874
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1889
+#: src/transport/gnunet-service-transport_neighbours.c:1913
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# DISCONNECT-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1906
+#: src/transport/gnunet-service-transport_neighbours.c:1930
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1936
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2001
+#: src/transport/gnunet-service-transport_neighbours.c:2028
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Fehler beim Senden der `%s' Nachricht an gnunetd\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2055
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2072
+#: src/transport/gnunet-service-transport_neighbours.c:2099
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2233
+#: src/transport/gnunet-service-transport_neighbours.c:2262
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2238
+#: src/transport/gnunet-service-transport_neighbours.c:2267
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2623
+#: src/transport/gnunet-service-transport_neighbours.c:2654
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3105
+#: src/transport/gnunet-service-transport_neighbours.c:3139
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# SESSION_ACK-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3113
+#: src/transport/gnunet-service-transport_neighbours.c:3147
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3131
-#: src/transport/gnunet-service-transport_neighbours.c:3155
+#: src/transport/gnunet-service-transport_neighbours.c:3165
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3167
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3192
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3205
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3377
+#: src/transport/gnunet-service-transport_neighbours.c:3412
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# CONNECT_ACK-Meldungen empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3413
+#: src/transport/gnunet-service-transport_neighbours.c:3448
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3501
+#: src/transport/gnunet-service-transport_neighbours.c:3536
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3508
+#: src/transport/gnunet-service-transport_neighbours.c:3543
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3548
+#: src/transport/gnunet-service-transport_neighbours.c:3583
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3555
+#: src/transport/gnunet-service-transport_neighbours.c:3590
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3566
+#: src/transport/gnunet-service-transport_neighbours.c:3601
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3700
+#: src/transport/gnunet-service-transport_neighbours.c:3736
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -7295,6 +7427,47 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_validation.c:1627
+msgid "# HELLOs given to peerinfo"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:219
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:617
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:621
+#, fuzzy
+msgid "receive data from peer"
+msgstr "# Bytes des Typs %d empfangen"
+
+#: src/transport/gnunet-transport-profiler.c:626
+msgid "iterations"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:631
+#, fuzzy
+msgid "number of messages to send"
+msgstr "Anzahl an Durchläufen"
+
+#: src/transport/gnunet-transport-profiler.c:636
+msgid "message size to use"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:641
+#: src/transport/gnunet-transport.c:1462
+msgid "peer identity"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:652
+#: src/transport/gnunet-transport.c:1482
+msgid "Direct access to transport service."
+msgstr "Direkter Zugriff auf den Transportdienst"
+
 #: src/transport/gnunet-transport.c:413
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7427,11 +7600,6 @@ msgstr ""
 msgid "do not resolve hostnames"
 msgstr "Keine Rechnernamen auflösen"
 
-#: src/transport/gnunet-transport.c:1462
-#: src/transport/gnunet-transport-profiler.c:641
-msgid "peer identity"
-msgstr ""
-
 #: src/transport/gnunet-transport.c:1466
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7440,43 +7608,11 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1482
-#: src/transport/gnunet-transport-profiler.c:652
-msgid "Direct access to transport service."
-msgstr "Direkter Zugriff auf den Transportdienst"
-
-#: src/transport/gnunet-transport-profiler.c:219
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:617
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:621
-#, fuzzy
-msgid "receive data from peer"
-msgstr "# Bytes des Typs %d empfangen"
-
-#: src/transport/gnunet-transport-profiler.c:626
-msgid "iterations"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:631
-#, fuzzy
-msgid "number of messages to send"
-msgstr "Anzahl an Durchläufen"
-
-#: src/transport/gnunet-transport-profiler.c:636
-msgid "message size to use"
-msgstr ""
-
 #: src/transport/plugin_transport_http_client.c:1474
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3526
-#: src/transport/plugin_transport_tcp.c:3890
-#: src/transport/plugin_transport_tcp.c:3897
+#: src/transport/plugin_transport_tcp.c:3891
+#: src/transport/plugin_transport_tcp.c:3898
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7545,7 +7681,7 @@ msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2901
-#: src/transport/plugin_transport_udp.c:3622
+#: src/transport/plugin_transport_udp.c:3623
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7657,7 +7793,7 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1730
 #: src/transport/plugin_transport_tcp.c:1954
 #: src/transport/plugin_transport_tcp.c:3137
-#: src/transport/plugin_transport_tcp.c:4013
+#: src/transport/plugin_transport_tcp.c:4014
 msgid "# TCP sessions active"
 msgstr "# aktive TCP-Sitzungen"
 
@@ -7695,117 +7831,117 @@ msgstr ""
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:3408
+#: src/transport/plugin_transport_tcp.c:3409
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:3459
-#: src/transport/plugin_transport_tcp.c:3517
+#: src/transport/plugin_transport_tcp.c:3460
+#: src/transport/plugin_transport_tcp.c:3518
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/transport/plugin_transport_tcp.c:3463
+#: src/transport/plugin_transport_tcp.c:3464
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# verbundener Knoten"
 
-#: src/transport/plugin_transport_tcp.c:3469
+#: src/transport/plugin_transport_tcp.c:3470
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3471
+#: src/transport/plugin_transport_tcp.c:3472
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3511
+#: src/transport/plugin_transport_tcp.c:3512
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3521
+#: src/transport/plugin_transport_tcp.c:3522
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3840
+#: src/transport/plugin_transport_tcp.c:3841
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten des Dienstes.\n"
 
-#: src/transport/plugin_transport_tcp.c:4001
+#: src/transport/plugin_transport_tcp.c:4002
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "TCP-Transportdienst wartet auf Port %llu\n"
 
-#: src/transport/plugin_transport_tcp.c:4005
+#: src/transport/plugin_transport_tcp.c:4006
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4009
+#: src/transport/plugin_transport_tcp.c:4010
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:168
-#, fuzzy
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:548
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:565
-#, fuzzy, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-
-#: src/transport/plugin_transport_udp.c:3366
+#: src/transport/plugin_transport_udp.c:3367
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3380
+#: src/transport/plugin_transport_udp.c:3381
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3698
-#: src/transport/plugin_transport_udp.c:3797
+#: src/transport/plugin_transport_udp.c:3699
+#: src/transport/plugin_transport_udp.c:3798
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
-#: src/transport/plugin_transport_udp.c:3716
+#: src/transport/plugin_transport_udp.c:3717
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3807
+#: src/transport/plugin_transport_udp.c:3808
 msgid "Failed to open UDP sockets\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
-#: src/transport/plugin_transport_udp.c:3878
-#: src/transport/plugin_transport_udp.c:3892
+#: src/transport/plugin_transport_udp.c:3879
+#: src/transport/plugin_transport_udp.c:3893
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3924
+#: src/transport/plugin_transport_udp.c:3925
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/transport/plugin_transport_udp.c:3951
+#: src/transport/plugin_transport_udp.c:3952
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/transport/plugin_transport_udp.c:4015
+#: src/transport/plugin_transport_udp.c:4016
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
+#: src/transport/plugin_transport_udp_broadcasting.c:168
+#, fuzzy
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:548
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:565
+#, fuzzy, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
 #: src/transport/plugin_transport_unix.c:1403
 #, c-format
 msgid "Cannot create path to `%s'\n"
@@ -7919,7 +8055,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2346
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -7976,7 +8112,7 @@ msgstr ""
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517
 #: src/util/service.c:1378
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
@@ -7995,19 +8131,19 @@ msgstr "Benutzer/Gruppe kann nicht zu »%s« geändert 
werden: %s\n"
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:255
+#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279
 #: src/util/service.c:1790
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:272
+#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299
 #: src/util/service.c:1801
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:267
+#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292
 #: src/util/service.c:1807
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
@@ -8018,61 +8154,61 @@ msgstr "Konfigurationsdatei `%s' konnte nicht geparst 
werden.\n"
 msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/util/bio.c:177 src/util/bio.c:185
+#: src/util/bio.c:181 src/util/bio.c:189
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/bio.c:187
+#: src/util/bio.c:191
 msgid "End of file"
 msgstr "Dateiende"
 
-#: src/util/bio.c:244
+#: src/util/bio.c:248
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:254
+#: src/util/bio.c:258
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:300
+#: src/util/bio.c:306
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:314
+#: src/util/bio.c:328
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:911
+#: src/util/client.c:914
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1132
+#: src/util/common_logging.c:259 src/util/common_logging.c:1146
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1130
+#: src/util/common_logging.c:261 src/util/common_logging.c:1144
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1128
+#: src/util/common_logging.c:263 src/util/common_logging.c:1142
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1126
+#: src/util/common_logging.c:265 src/util/common_logging.c:1140
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1124
+#: src/util/common_logging.c:267 src/util/common_logging.c:1138
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/common_logging.c:269 src/util/common_logging.c:1134
+#: src/util/common_logging.c:269 src/util/common_logging.c:1148
 msgid "NONE"
 msgstr ""
 
@@ -8081,26 +8217,26 @@ msgstr ""
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1135
+#: src/util/common_logging.c:1149
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1326
+#: src/util/common_logging.c:1442
 msgid "unknown address"
 msgstr "Unbekannte Adresse"
 
-#: src/util/common_logging.c:1368
+#: src/util/common_logging.c:1484
 msgid "invalid address"
 msgstr "Ungültige Adresse"
 
-#: src/util/common_logging.c:1386
+#: src/util/common_logging.c:1502
 #, 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:1407
+#: src/util/common_logging.c:1523
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8113,88 +8249,88 @@ msgstr ""
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/configuration.c:355
+#: src/util/configuration.c:363
 #, fuzzy, c-format
 msgid "Error while reading file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/util/configuration.c:1034
+#: src/util/configuration.c:1051
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1153
+#: src/util/configuration.c:1170
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1186
+#: src/util/configuration.c:1203
 #, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1254
+#: src/util/configuration.c:1271
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:531
+#: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:810
+#: src/util/crypto_ecc.c:836
 #, fuzzy, c-format
 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:860
+#: src/util/crypto_ecc.c:886
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/util/crypto_ecc.c:934
+#: src/util/crypto_ecc.c:960
 #, 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.c:991
+#: src/util/crypto_ecc.c:1017
 #, fuzzy, c-format
 msgid "EdDSA 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:122 src/util/crypto_ecc_setup.c:161
-#: src/util/crypto_ecc_setup.c:279 src/util/crypto_ecc_setup.c:317
+#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165
+#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/util/crypto_ecc_setup.c:128 src/util/crypto_ecc_setup.c:284
+#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
 
-#: src/util/crypto_ecc_setup.c:165 src/util/crypto_ecc_setup.c:322
+#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:195 src/util/crypto_ecc_setup.c:352
+#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:356
+#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:415
+#: src/util/crypto_ecc_setup.c:471
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
@@ -8205,12 +8341,12 @@ msgid "libgcrypt has not the expected version (version 
%s is required).\n"
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/crypto_rsa.c:835
+#: src/util/crypto_rsa.c:834
 #, fuzzy, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/util/crypto_rsa.c:1166
+#: src/util/crypto_rsa.c:1165
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
@@ -8285,11 +8421,11 @@ msgstr "Verwenden Sie --help, um eine Liste der 
Optionen zu erhalten.\n"
 msgid "Missing mandatory option `%s'.\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/util/getopt_helpers.c:68
+#: src/util/getopt_helpers.c:70
 msgid "print the version number"
 msgstr ""
 
-#: src/util/getopt_helpers.c:111
+#: src/util/getopt_helpers.c:115
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8297,94 +8433,100 @@ msgstr ""
 "Argumente, die für lange Optionen zwingend sind, sind auch für kurze "
 "Optionen zwingend.\n"
 
-#: src/util/getopt_helpers.c:199
+#: src/util/getopt_helpers.c:203
 msgid "print this help"
 msgstr ""
 
-#: src/util/getopt_helpers.c:274
+#: src/util/getopt_helpers.c:281
 msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt_helpers.c:410
+#: src/util/getopt_helpers.c:422
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:488
+#: src/util/getopt_helpers.c:502
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:510
+#: src/util/getopt_helpers.c:524
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740
+#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758
+#: src/util/getopt_helpers.c:825
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n"
 
-#: src/util/getopt_helpers.c:610
+#: src/util/getopt_helpers.c:626
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
 
-#: src/util/getopt_helpers.c:675
+#: src/util/getopt_helpers.c:692
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
 
-#: src/util/getopt_helpers.c:823
+#: src/util/getopt_helpers.c:832
+#, fuzzy, c-format
+msgid "You must pass a number below %u to the `%s' option.\n"
+msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n"
+
+#: src/util/getopt_helpers.c:918
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:124
+#: src/util/gnunet-config.c:134
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
 
-#: src/util/gnunet-config.c:137
+#: src/util/gnunet-config.c:147
 #, c-format
 msgid "--section argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:140
+#: src/util/gnunet-config.c:150
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:191
+#: src/util/gnunet-config.c:201
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:229
+#: src/util/gnunet-config.c:240
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:234
+#: src/util/gnunet-config.c:245
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:239
+#: src/util/gnunet-config.c:250
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:244
+#: src/util/gnunet-config.c:255
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:248
+#: src/util/gnunet-config.c:259
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "GNUnet Konfiguration"
 
-#: src/util/gnunet-config.c:252
+#: src/util/gnunet-config.c:263
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:265
+#: src/util/gnunet-config.c:276
 msgid "Manipulate GNUnet configuration files"
 msgstr "GNUnet-Konfigurationsdateien bearbeiten"
 
@@ -8428,62 +8570,62 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:288
+#: src/util/gnunet-ecc.c:290
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/util/gnunet-ecc.c:299
+#: src/util/gnunet-ecc.c:305
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:321
+#: src/util/gnunet-ecc.c:334
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/util/gnunet-ecc.c:372
+#: src/util/gnunet-ecc.c:391
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:456
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:442
+#: src/util/gnunet-ecc.c:461
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:447
+#: src/util/gnunet-ecc.c:466
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:451
+#: src/util/gnunet-ecc.c:470
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:455
+#: src/util/gnunet-ecc.c:474
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:459
+#: src/util/gnunet-ecc.c:478
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:463
+#: src/util/gnunet-ecc.c:482
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:479
+#: src/util/gnunet-ecc.c:498
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:150
+#: src/util/gnunet-resolver.c:168
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:161
+#: src/util/gnunet-resolver.c:179
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
@@ -8562,40 +8704,40 @@ msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei 
%s:%d.\n"
 msgid "Error writing to `%s': %s\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/util/network.c:137
+#: src/util/network.c:136
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1793 src/util/network.c:1977
+#: src/util/network.c:1795 src/util/network.c:1979
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:501
+#: src/util/os_installation.c:509
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:873
+#: src/util/os_installation.c:881
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/util/os_installation.c:913
+#: src/util/os_installation.c:922
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
 
-#: src/util/os_installation.c:944
+#: src/util/os_installation.c:953
 #, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/os_installation.c:954
+#: src/util/os_installation.c:963
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8627,7 +8769,7 @@ msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:223
+#: src/util/resolver_api.c:224
 #, fuzzy, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
@@ -8636,23 +8778,23 @@ msgstr ""
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/util/resolver_api.c:827
+#: src/util/resolver_api.c:851
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/resolver_api.c:840
+#: src/util/resolver_api.c:864
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1024
+#: src/util/resolver_api.c:1048
 #, fuzzy
 msgid "Resolver not configured correctly.\n"
 msgstr "Standarddienst »%s« ist nicht korrekt eingerichtet!\n"
 
-#: src/util/resolver_api.c:1110 src/util/resolver_api.c:1133
-#: src/util/resolver_api.c:1147
+#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157
+#: src/util/resolver_api.c:1171
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
@@ -8662,7 +8804,7 @@ msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/service.c:2091
+#: src/util/service.c:2093
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8737,63 +8879,63 @@ msgstr "Tage"
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1270
+#: src/util/strings.c:1272
 msgid "IPv6 address did not start with `['\n"
 msgstr "IPv6-Adresse beginnt nicht mit »[«\n"
 
-#: src/util/strings.c:1278
+#: src/util/strings.c:1280
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr "IPv6-Adresse enthält kein »:« zur Abtrennung der Portnummer\n"
 
-#: src/util/strings.c:1284
+#: src/util/strings.c:1286
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr "IPv6-Adresse enthält kein »]« vor »:« zur Abtrennung der Portnummer\n"
 
-#: src/util/strings.c:1291
+#: src/util/strings.c:1293
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr "IPv6-Adresse enthält keine gültige Portnummer nach dem letzten »:«\n"
 
-#: src/util/strings.c:1300
+#: src/util/strings.c:1302
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 
-#: src/util/strings.c:1572 src/util/strings.c:1588
+#: src/util/strings.c:1574 src/util/strings.c:1590
 msgid "Port not in range\n"
 msgstr "Port außerhalb des Bereichs\n"
 
-#: src/util/strings.c:1597
+#: src/util/strings.c:1599
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1680 src/util/strings.c:1711 src/util/strings.c:1759
-#: src/util/strings.c:1780
+#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761
+#: src/util/strings.c:1782
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: »%s«\n"
 
-#: src/util/strings.c:1737
+#: src/util/strings.c:1739
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ungültige Netzwerk-Notation ('/%d ist nicht gültig in IPv4 CIDR)."
 
-#: src/util/strings.c:1789
+#: src/util/strings.c:1791
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/strings.c:1841
+#: src/util/strings.c:1843
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ungültige Netzwerk-Notation (endet nicht mit »;«: »%s«)\n"
 
-#: src/util/strings.c:1891
+#: src/util/strings.c:1893
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/strings.c:1922
+#: src/util/strings.c:1924
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
@@ -8972,27 +9114,39 @@ msgstr "Dienst wird über UDP angeboten"
 msgid "Setup tunnels via VPN."
 msgstr "Tunnel über VPN einrichten."
 
-#: src/zonemaster/gnunet-service-zonemaster.c:706
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
+#: src/zonemaster/gnunet-service-zonemaster.c:838
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/include/gnunet_common.h:689 src/include/gnunet_common.h:696
-#: src/include/gnunet_common.h:706 src/include/gnunet_common.h:714
+#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773
+#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/include/gnunet_common.h:726
+#: src/include/gnunet_common.h:803
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n"
 
-#: src/include/gnunet_common.h:753 src/include/gnunet_common.h:762
+#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
+#~ msgid "Could not connect to %s service!\n"
+#~ msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
+
+#, fuzzy
+#~ msgid "No valid GNS zone specified!\n"
+#~ msgstr "Keine Schlüsselwörter angegeben!\n"
+
+#, fuzzy
+#~ msgid "Token `%s' is malformed\n"
+#~ msgstr "Schlüssel »%s« ist gültig\n"
+
 #, fuzzy
 #~ msgid "Failed to create indices\n"
 #~ msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
@@ -9033,10 +9187,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. 
Fehler: %s\n"
 #~ msgstr "Ausführliche Ausgabe"
 
 #, fuzzy
-#~ msgid "Specify the public key of the zone to reverse lookup a name for"
-#~ msgstr "Die Priorität des Inhalts angeben"
-
-#, fuzzy
 #~ msgid "# UPDATE requests executed"
 #~ msgstr "# dht Anfragen weitergeleitet"
 
@@ -9404,10 +9554,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. 
Fehler: %s\n"
 #~ msgid "Unknown operator: %c\n"
 #~ msgstr "Unbekannte Operation `%s'\n"
 
-#, fuzzy
-#~ msgid "valid public key required"
-#~ msgstr "# Bytes empfangen über TCP"
-
 #~ msgid "Failed to create or access directory for log file `%s'\n"
 #~ msgstr ""
 #~ "Anlegen des Verzeichnisses oder Zugriff darauf für Protokolldatei »%s« "
diff --git a/po/es.po b/po/es.po
index 3cb43da26..b6fee1713 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2018-01-02 02:33+0100\n"
+"POT-Creation-Date: 2018-06-04 23:27+0200\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -244,7 +244,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3824
+#: src/transport/plugin_transport_tcp.c:3825
 #: src/transport/tcp_service_legacy.c:576
 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
 #: src/util/service.c:643
@@ -255,7 +255,7 @@ msgstr ""
 "configuración!\n"
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176
-#: src/transport/tcp_service_legacy.c:613 src/util/client.c:505
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506
 #: src/util/service.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
@@ -263,7 +263,7 @@ msgstr ""
 "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n"
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
-#: src/transport/tcp_service_legacy.c:617 src/util/client.c:510
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511
 #: src/util/service.c:687
 #, c-format
 msgid "Using `%s' instead\n"
@@ -376,150 +376,14 @@ msgstr "El servicio «%s» finalizó con estado %s/%d, se 
reiniciará en %llu ms
 msgid "Initiating shutdown as requested by client.\n"
 msgstr "Iniciando apagado bajo petición del cliente.\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-"No se pudieron cargar las cuotas para la red «%s»:  «%s», asignando el ancho "
-"de banda predeterminado %llu\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
-"de banda predeterminado %llu\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
-"de banda predeterminado %llu\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939
-#, fuzzy
-msgid "solver to use"
-msgstr "valor a establecer"
-
-#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945
-#: src/ats-tests/gnunet-solver-eval.c:950
-msgid "experiment to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3306
-#, fuzzy
-msgid "print logging"
-msgstr "Iniciando descarga «%s».\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:3311
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3316
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:304
-#, fuzzy, c-format
-msgid ""
-"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-"No se pudieron cargar las cuotas para la red «%s»:  «%s», asignando el ancho "
-"de banda predeterminado %llu\n"
-
-# Miguel: "Inbound" lo he traducido como entrada en todo el texto.
-#: src/ats/gnunet-service-ats_plugins.c:314
-#, 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:359
-#, fuzzy, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-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:451
-#, fuzzy, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "¡No se puede inicializar el resolvedor!\n"
-
-#: src/ats/plugin_ats_mlp.c:1274
-msgid "Problem size too large, cannot allocate memory!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1869
-#, fuzzy, c-format
-msgid "Adding address for peer `%s' multiple times\n"
-msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
-
-#: src/ats/plugin_ats_mlp.c:1913
-#, fuzzy, c-format
-msgid "Updating address property for peer `%s' %p not added before\n"
-msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
-
-#: src/ats/plugin_ats_mlp.c:2475
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
-#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
-#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
-#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
-#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
-#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
-#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "Se produjo un fallo al cargar la configuración de %s\n"
-
-#: src/ats/plugin_ats_mlp.c:2670
-#, fuzzy, c-format
-msgid ""
-"Adjusting inconsistent outbound quota configuration for network `%s', is "
-"%llu must be at least %llu\n"
-msgstr ""
-"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
-"de banda predeterminado %llu\n"
-
-#: src/ats/plugin_ats_mlp.c:2679
-#, fuzzy, c-format
-msgid ""
-"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
-"must be at least %llu\n"
+#: src/ats-tests/ats-testing-log.c:837
+msgid "Stop logging\n"
 msgstr ""
-"No hay configuración de cuota de entrada para la red '%s', asignando el "
-"ancho de banda predeterminado (%llu)\n"
-
-# Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/plugin_ats_mlp.c:2689
-#, fuzzy, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
-
-# Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/plugin_ats_mlp.c:2698
-#, fuzzy, c-format
-msgid ""
-"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
-msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
-#: src/ats/plugin_ats_proportional.c:1164
+#: src/ats-tests/ats-testing-log.c:892
 #, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr "Se produjo un fallo al cargar la configuración de %s\n"
+msgid "Start logging `%s'\n"
+msgstr "Iniciando descarga «%s».\n"
 
 #: src/ats-tests/ats-testing.c:422
 #, c-format
@@ -531,15 +395,6 @@ msgstr ""
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/ats-tests/ats-testing-log.c:837
-msgid "Stop logging\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing-log.c:892
-#, fuzzy, c-format
-msgid "Start logging `%s'\n"
-msgstr "Iniciando descarga «%s».\n"
-
 #: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
@@ -547,6 +402,16 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
+#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294
+#, fuzzy
+msgid "solver to use"
+msgstr "valor a establecer"
+
+#: src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299
+msgid "experiment to use"
+msgstr ""
+
 # Miguel: ¿Como podría traducir "resolutions" y "resolve"?
 # Son difíciles de no calcar, puesto que no conozco como expresar
 # el concepto de obtener una dirección a partir de un nombre
@@ -681,6 +546,141 @@ msgstr "salida prolija (incluye las propiedades de 
direcciones del ATS)"
 msgid "Print information about ATS state"
 msgstr "Imprime información acerca del estado del ATS"
 
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+"No se pudieron cargar las cuotas para la red «%s»:  «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:3306
+#, fuzzy
+msgid "print logging"
+msgstr "Iniciando descarga «%s».\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:3311
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3316
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:304
+#, fuzzy, c-format
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+"No se pudieron cargar las cuotas para la red «%s»:  «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
+
+# Miguel: "Inbound" lo he traducido como entrada en todo el texto.
+#: src/ats/gnunet-service-ats_plugins.c:314
+#, 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:359
+#, fuzzy, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+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:451
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "¡No se puede inicializar el resolvedor!\n"
+
+#: src/ats/plugin_ats_mlp.c:1274
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1869
+#, fuzzy, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
+
+#: src/ats/plugin_ats_mlp.c:1913
+#, fuzzy, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
+
+#: src/ats/plugin_ats_mlp.c:2475
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
+#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
+#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
+#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
+#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Se produjo un fallo al cargar la configuración de %s\n"
+
+#: src/ats/plugin_ats_mlp.c:2670
+#, fuzzy, c-format
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
+msgstr ""
+"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
+
+#: src/ats/plugin_ats_mlp.c:2679
+#, fuzzy, c-format
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
+msgstr ""
+"No hay configuración de cuota de entrada para la red '%s', asignando el "
+"ancho de banda predeterminado (%llu)\n"
+
+# Miguel: "Outbound" lo he traducido como salida en todo el texto.
+#: src/ats/plugin_ats_mlp.c:2689
+#, fuzzy, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
+
+# Miguel: "Outbound" lo he traducido como salida en todo el texto.
+#: src/ats/plugin_ats_mlp.c:2698
+#, fuzzy, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
+
+#: src/ats/plugin_ats_proportional.c:1164
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f\n"
+msgstr "Se produjo un fallo al cargar la configuración de %s\n"
+
 #: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
@@ -825,295 +825,295 @@ msgstr ""
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:513
-#: src/conversation/conversation_api_call.c:490
+#: src/conversation/conversation_api.c:515
+#: src/conversation/conversation_api_call.c:494
 #, fuzzy
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/conversation/gnunet-conversation.c:269
+#: src/conversation/gnunet-conversation-test.c:119
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:145
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:210
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:270
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:294
+#: src/conversation/gnunet-conversation.c:295
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:329
+#: src/conversation/gnunet-conversation.c:330
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:334
+#: src/conversation/gnunet-conversation.c:335
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:352
+#: src/conversation/gnunet-conversation.c:353
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:367
+#: src/conversation/gnunet-conversation.c:368
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
 
-#: src/conversation/gnunet-conversation.c:379
+#: src/conversation/gnunet-conversation.c:380
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:401
+#: src/conversation/gnunet-conversation.c:404
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:408
+#: src/conversation/gnunet-conversation.c:411
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/conversation/gnunet-conversation.c:415
+#: src/conversation/gnunet-conversation.c:418
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 
-#: src/conversation/gnunet-conversation.c:423
+#: src/conversation/gnunet-conversation.c:426
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:432
+#: src/conversation/gnunet-conversation.c:435
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:438
+#: src/conversation/gnunet-conversation.c:441
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:443
+#: src/conversation/gnunet-conversation.c:446
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:512
+#: src/conversation/gnunet-conversation.c:517
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Comando desconocido «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:528
-#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:533
+#: src/conversation/gnunet-conversation.c:547
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:535
-#: src/conversation/gnunet-conversation.c:592
+#: src/conversation/gnunet-conversation.c:540
+#: src/conversation/gnunet-conversation.c:596
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:550
-#: src/conversation/gnunet-conversation.c:605
+#: src/conversation/gnunet-conversation.c:555
+#: src/conversation/gnunet-conversation.c:609
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:560
+#: src/conversation/gnunet-conversation.c:565
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:620
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:633
+#: src/conversation/gnunet-conversation.c:637
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:663
+#: src/conversation/gnunet-conversation.c:668
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:686
+#: src/conversation/gnunet-conversation.c:692
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:691
+#: src/conversation/gnunet-conversation.c:697
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:697
-#: src/conversation/gnunet-conversation.c:721
+#: src/conversation/gnunet-conversation.c:703
+#: src/conversation/gnunet-conversation.c:727
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:702
+#: src/conversation/gnunet-conversation.c:708
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:711
+#: src/conversation/gnunet-conversation.c:717
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "Detectada dirección de la red interna «%s».\n"
 
-#: src/conversation/gnunet-conversation.c:716
+#: src/conversation/gnunet-conversation.c:722
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:735
+#: src/conversation/gnunet-conversation.c:741
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:741
+#: src/conversation/gnunet-conversation.c:747
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Par «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:769
-#: src/conversation/gnunet-conversation.c:784
+#: src/conversation/gnunet-conversation.c:776
+#: src/conversation/gnunet-conversation.c:791
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:817
-#: src/conversation/gnunet-conversation.c:833
+#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:840
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:840
+#: src/conversation/gnunet-conversation.c:847
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:849
+#: src/conversation/gnunet-conversation.c:856
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:866
+#: src/conversation/gnunet-conversation.c:873
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:901
+#: src/conversation/gnunet-conversation.c:908
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:909
+#: src/conversation/gnunet-conversation.c:916
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:926
+#: src/conversation/gnunet-conversation.c:933
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:952
+#: src/conversation/gnunet-conversation.c:959
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:954
+#: src/conversation/gnunet-conversation.c:961
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:956
+#: src/conversation/gnunet-conversation.c:963
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:958
+#: src/conversation/gnunet-conversation.c:965
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:960
+#: src/conversation/gnunet-conversation.c:967
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:962
+#: src/conversation/gnunet-conversation.c:969
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:964
+#: src/conversation/gnunet-conversation.c:971
 #, fuzzy
 msgid "Use `/status' to print status information"
 msgstr "ser prolijo (imprime información de progreso)"
 
-#: src/conversation/gnunet-conversation.c:966
+#: src/conversation/gnunet-conversation.c:973
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Use «/quit» para finalizar «gnunet-chat»"
 
-#: src/conversation/gnunet-conversation.c:968
+#: src/conversation/gnunet-conversation.c:975
 msgid "Use `/help command' to get help for a specific command"
 msgstr "Use «/help comando» para obtener ayuda sobre un comando específico"
 
-#: src/conversation/gnunet-conversation.c:1172
+#: src/conversation/gnunet-conversation.c:1191
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:1185
+#: src/conversation/gnunet-conversation.c:1204
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "El pseudónimo '%s' fue borrado.\n"
 
-#: src/conversation/gnunet-conversation.c:1220
+#: src/conversation/gnunet-conversation.c:1242
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Debes especificar un fichero a inspeccionar.\n"
 
-#: src/conversation/gnunet-conversation.c:1244
+#: src/conversation/gnunet-conversation.c:1266
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Se produjo un fallo al iniciar el proceso «gnunet-peerinfo».\n"
 
-#: src/conversation/gnunet-conversation.c:1273
-msgid "sets the NAME of the ego to use for the phone (and name resolution)"
+#: src/conversation/gnunet-conversation.c:1295
+msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1279
+#: src/conversation/gnunet-conversation.c:1300
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1306
+#: src/conversation/gnunet-conversation.c:1329
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:119
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:145
-#, c-format
-msgid ""
-"\n"
-"We are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:210
-#, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
-msgstr ""
-
-#: src/conversation/gnunet_gst.c:622
 #: src/conversation/gnunet-helper-audio-playback-gst.c:361
+#: src/conversation/gnunet_gst.c:622
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1368,137 +1368,147 @@ msgstr ""
 msgid "Core service of `%s' ready.\n"
 msgstr "El servicio principal de «%4s» está listo.\n"
 
-#: src/core/gnunet-service-core_kx.c:566
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes encrypted"
 msgstr "# bytes cifrados"
 
-#: src/core/gnunet-service-core_kx.c:626
+#: src/core/gnunet-service-core_kx.c:677
 msgid "# bytes decrypted"
 msgstr "# bytes descifrados"
 
-#: src/core/gnunet-service-core_kx.c:728
+#: src/core/gnunet-service-core_kx.c:779
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:778
+#: src/core/gnunet-service-core_kx.c:829
 msgid "# key exchanges initiated"
 msgstr "# intercambio de claves iniciados"
 
-#: src/core/gnunet-service-core_kx.c:840
+#: src/core/gnunet-service-core_kx.c:891
 msgid "# key exchanges stopped"
 msgstr "# intercambio de claves parados"
 
-#: src/core/gnunet-service-core_kx.c:874
+#: src/core/gnunet-service-core_kx.c:925
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:941
+#: src/core/gnunet-service-core_kx.c:992
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:948
+#: src/core/gnunet-service-core_kx.c:1005
 #, fuzzy
-msgid "# ephemeral keys received"
+msgid "# duplicate ephemeral keys ignored"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_kx.c:987
+#: src/core/gnunet-service-core_kx.c:1040
+#, fuzzy
+msgid "# EPHEMERAL_KEYs rejected (bad signature)"
+msgstr "# mensajes «SET_KEY» descifrados"
+
+#: src/core/gnunet-service-core_kx.c:1054
 #, c-format
 msgid ""
-"Ephemeral key message from peer `%s' rejected as its validity range does not "
-"match our system time (%llu not in [%llu,%llu]).\n"
+"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match "
+"our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:998
+#: src/core/gnunet-service-core_kx.c:1060
+#, fuzzy
+msgid "# EPHEMERAL_KEY messages rejected due to time"
+msgstr "# mensajes «SET_KEY» descifrados"
+
+#: src/core/gnunet-service-core_kx.c:1080
 #, fuzzy
-msgid "# EPHEMERAL_KEY messages received"
-msgstr "# mensajes «SET_KEY» descifrados"
+msgid "# valid ephemeral keys received"
+msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1094
+#: src/core/gnunet-service-core_kx.c:1180
 #: src/transport/gnunet-service-transport_validation.c:1128
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1103
+#: src/core/gnunet-service-core_kx.c:1189
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/core/gnunet-service-core_kx.c:1161
+#: src/core/gnunet-service-core_kx.c:1248
 msgid "# PONG messages created"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:1187
+#: src/core/gnunet-service-core_kx.c:1274
 msgid "# sessions terminated by timeout"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1200
+#: src/core/gnunet-service-core_kx.c:1287
 msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
 
-#: src/core/gnunet-service-core_kx.c:1264
+#: src/core/gnunet-service-core_kx.c:1351
 #: src/transport/gnunet-service-transport_validation.c:1461
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1271
+#: src/core/gnunet-service-core_kx.c:1358
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1363
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/core/gnunet-service-core_kx.c:1311
+#: src/core/gnunet-service-core_kx.c:1398
 msgid "# PONG messages decrypted"
 msgstr "# mensajes PONG descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1349
+#: src/core/gnunet-service-core_kx.c:1436
 msgid "# session keys confirmed via PONG"
 msgstr "# claves de sesión confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1360
+#: src/core/gnunet-service-core_kx.c:1447
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/core/gnunet-service-core_kx.c:1367
+#: src/core/gnunet-service-core_kx.c:1454
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/core/gnunet-service-core_kx.c:1642
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1529
+#: src/core/gnunet-service-core_kx.c:1650
 #, 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:1532
+#: src/core/gnunet-service-core_kx.c:1653
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1593
-#: src/core/gnunet-service-core_kx.c:1619
+#: src/core/gnunet-service-core_kx.c:1742
+#: src/core/gnunet-service-core_kx.c:1768
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1606
+#: src/core/gnunet-service-core_kx.c:1755
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1648
+#: src/core/gnunet-service-core_kx.c:1797
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1656
+#: src/core/gnunet-service-core_kx.c:1805
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
@@ -1506,11 +1516,11 @@ msgstr "# bytes de «payload» descifrados"
 #: src/core/gnunet-service-core_sessions.c:350
 #: src/dht/gnunet-service-dht_neighbours.c:733
 #: src/dht/gnunet-service-dht_neighbours.c:795
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520
-#: src/topology/gnunet-daemon-topology.c:612
-#: src/topology/gnunet-daemon-topology.c:714
-#: src/transport/gnunet-service-transport_neighbours.c:719
-#: src/transport/gnunet-service-transport_neighbours.c:727
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522
+#: src/topology/gnunet-daemon-topology.c:617
+#: src/topology/gnunet-daemon-topology.c:719
+#: src/transport/gnunet-service-transport_neighbours.c:721
+#: src/transport/gnunet-service-transport_neighbours.c:729
 msgid "# peers connected"
 msgstr "# pares conectados"
 
@@ -1537,55 +1547,188 @@ msgstr "# mapas de tipos recibidos"
 msgid "# updates to my type map"
 msgstr "# actualizaciones de mi mapa de tipos"
 
-#: src/datacache/datacache.c:119 src/datacache/datacache.c:294
+#: src/credential/credential_misc.c:88
+#, fuzzy, c-format
+msgid "Unable to parse CRED record string `%s'\n"
+msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
+
+#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888
+#: src/namestore/plugin_rest_namestore.c:1022
+#, fuzzy, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr "'%s': servicio desconocido: %s\n"
+
+#: src/credential/gnunet-credential.c:280
+#: src/credential/gnunet-credential.c:434
+#, fuzzy, c-format
+msgid "Issuer public key `%s' is not well-formed\n"
+msgstr "El bloque del tipo %u está mal formado\n"
+
+#: src/credential/gnunet-credential.c:361
+#: src/credential/gnunet-credential.c:423
+#, fuzzy, c-format
+msgid "Issuer public key not well-formed\n"
+msgstr "El bloque del tipo %u está mal formado\n"
+
+#: src/credential/gnunet-credential.c:372
+#: src/credential/gnunet-credential.c:444
+#, fuzzy, c-format
+msgid "Failed to connect to CREDENTIAL\n"
+msgstr "Se produjo un fallo al conectar con GNS\n"
+
+#: src/credential/gnunet-credential.c:379
+#, c-format
+msgid "You must provide issuer the attribute\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:387
+#, fuzzy, c-format
+msgid "ego required\n"
+msgstr "Tipo requerido\n"
+
+#: src/credential/gnunet-credential.c:403
+#, c-format
+msgid "Subject public key needed\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:414
+#, fuzzy, c-format
+msgid "Subject public key `%s' is not well-formed\n"
+msgstr "El bloque del tipo %u está mal formado\n"
+
+#: src/credential/gnunet-credential.c:451
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:504
+#, fuzzy, c-format
+msgid "Issuer ego required\n"
+msgstr "Tipo requerido\n"
+
+#: src/credential/gnunet-credential.c:516
+#, c-format
+msgid "Please specify name to lookup, subject key and issuer key!\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:536
+msgid "create credential"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:540
+msgid "verify credential against attribute"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:545
+#, fuzzy
+msgid "The public key of the subject to lookup the credential for"
+msgstr "Especificar el tipo del registro a buscar"
+
+#: src/credential/gnunet-credential.c:550
+msgid "The name of the credential presented by the subject"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:555
+#, fuzzy
+msgid "The public key of the authority to verify the credential against"
+msgstr "Especificar el tipo del registro a buscar"
+
+#: src/credential/gnunet-credential.c:560
+#, fuzzy
+msgid "The ego to use"
+msgstr "tamaño del mensaje"
+
+#: src/credential/gnunet-credential.c:565
+msgid "The issuer attribute to verify against or to issue"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:570
+msgid "The time to live for the credential"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:574
+msgid "collect credentials"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:588
+#, fuzzy
+msgid "GNUnet credential resolver tool"
+msgstr "Herramienta de acceso GNUnet GNS"
+
+#: src/credential/gnunet-service-credential.c:1138
+#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184
+#, c-format
+msgid "Failed to connect to GNS\n"
+msgstr "Se produjo un fallo al conectar con GNS\n"
+
+#: src/credential/gnunet-service-credential.c:1144
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
+#: src/namestore/gnunet-namestore.c:914
+#: src/namestore/plugin_rest_namestore.c:1035
+#, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
+
+#: src/credential/plugin_gnsrecord_credential.c:186
+#, fuzzy, c-format
+msgid "Unable to parse ATTR record string `%s'\n"
+msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
+
+#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669
+#, fuzzy
+msgid "GNS REST API initialized\n"
+msgstr "Conexión fallida\n"
+
+#: src/datacache/datacache.c:119 src/datacache/datacache.c:311
 #: src/datastore/gnunet-service-datastore.c:757
 msgid "# bytes stored"
 msgstr "# bytes almacenados"
 
-#: src/datacache/datacache.c:123 src/datacache/datacache.c:298
+#: src/datacache/datacache.c:123 src/datacache/datacache.c:315
 msgid "# items stored"
 msgstr "# elementos almacenados"
 
-#: src/datacache/datacache.c:202
+#: src/datacache/datacache.c:206
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr "Cargando el módulo de la cache de datos «%s»\n"
 
-#: src/datacache/datacache.c:213
+#: src/datacache/datacache.c:217
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 "Se produjo un fallo al cargar el módulo de la cache de datos para «%s»\n"
 
-#: src/datacache/datacache.c:329
+#: src/datacache/datacache.c:344
 msgid "# requests received"
 msgstr "# peticiones recibidas"
 
-#: src/datacache/datacache.c:339
+#: src/datacache/datacache.c:354
 msgid "# requests filtered by bloom filter"
 msgstr "# peticiones filtradas por el «bloomfilter»"
 
-#: src/datacache/datacache.c:367
+#: src/datacache/datacache.c:384
 #, fuzzy
 msgid "# requests for random value received"
 msgstr "# peticiones recibidas"
 
-#: src/datacache/datacache.c:399
+#: src/datacache/datacache.c:416
 #, fuzzy
 msgid "# proximity search requests received"
 msgstr "# búsquedas de clientes recibidas"
 
-#: src/datacache/plugin_datacache_heap.c:466
+#: src/datacache/plugin_datacache_heap.c:550
 msgid "Heap datacache running\n"
 msgstr "Caché de datos de montículo (heap) ejecutándose\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:113
-#: src/datacache/plugin_datacache_sqlite.c:122
+#: src/datacache/plugin_datacache_sqlite.c:118
+#: src/datacache/plugin_datacache_sqlite.c:127
 #: src/datastore/plugin_datastore_mysql.c:892
 #: src/datastore/plugin_datastore_sqlite.c:58
-#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92
-#: src/mysql/mysql.c:42 src/mysql/mysql.c:49
-#: src/namecache/plugin_namecache_sqlite.c:53
+#: src/datastore/plugin_datastore_sqlite.c:66
+#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80
+#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49
+#: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_sqlite.c:53
 #: src/peerstore/plugin_peerstore_sqlite.c:52
 #: src/psycstore/plugin_psycstore_mysql.c:62
@@ -1594,16 +1737,17 @@ msgstr "Caché de datos de montículo (heap) 
ejecutándose\n"
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:735 src/include/gnunet_common.h:744
+#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» falló en %s: %d con el error: %s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:817
-#: src/datastore/plugin_datastore_sqlite.c:456
-#: src/namecache/plugin_namecache_sqlite.c:296
-#: src/namestore/plugin_namestore_sqlite.c:355
+#: src/datacache/plugin_datacache_sqlite.c:862
+#: src/datastore/plugin_datastore_sqlite.c:508
+#: src/identity-provider/plugin_identity_provider_sqlite.c:336
+#: src/namecache/plugin_namecache_sqlite.c:329
+#: src/namestore/plugin_namestore_sqlite.c:264
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 "Se intentó cerrar sqlite sin finalizar todas las sentencias preparadas.\n"
@@ -1911,7 +2055,7 @@ msgid "MySQL statement run failure"
 msgstr ""
 
 #: src/datastore/plugin_datastore_mysql.c:410
-#: src/datastore/plugin_datastore_sqlite.c:626
+#: src/datastore/plugin_datastore_sqlite.c:678
 #, fuzzy
 msgid "Data too large"
 msgstr "número de valores"
@@ -1949,26 +2093,27 @@ msgid "`%s' failed at %s:%u with error: %s"
 msgstr "«%s» falló en %s:%u con el error: %s"
 
 #: src/datastore/plugin_datastore_sqlite.c:271
-#: src/namecache/plugin_namecache_sqlite.c:194
-#: src/namestore/plugin_namestore_sqlite.c:222
+#: src/identity-provider/plugin_identity_provider_sqlite.c:212
+#: src/namecache/plugin_namecache_sqlite.c:209
+#: src/namestore/plugin_namestore_sqlite.c:205
 #: src/peerstore/plugin_peerstore_sqlite.c:535
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Imposible inicializar SQLite: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:577
+#: src/datastore/plugin_datastore_sqlite.c:629
 msgid "sqlite bind failure"
 msgstr ""
 
 # to should be too, i think
-#: src/datastore/plugin_datastore_sqlite.c:1259
+#: src/datastore/plugin_datastore_sqlite.c:1322
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 "la versión de sqlite es muy antigua para determinar el tamaño, se asume "
 "cero\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1293
+#: src/datastore/plugin_datastore_sqlite.c:1356
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
@@ -1977,9 +2122,10 @@ msgstr ""
 "Usando la utilización de páginas de sqlite para estimar el «payload» (%llu "
 "páginas de %llu bytes de tamaño)\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1337
-#: src/namecache/plugin_namecache_sqlite.c:603
-#: src/namestore/plugin_namestore_sqlite.c:802
+#: src/datastore/plugin_datastore_sqlite.c:1400
+#: src/identity-provider/plugin_identity_provider_sqlite.c:711
+#: src/namecache/plugin_namecache_sqlite.c:640
+#: src/namestore/plugin_namestore_sqlite.c:754
 msgid "Sqlite database running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
 
@@ -1987,7 +2133,7 @@ msgstr "Base de datos sqlite ejecutándose\n"
 msgid "Template database running\n"
 msgstr "Base de datos de plantilla ejecutándose\n"
 
-#: src/dht/gnunet-dht-get.c:157
+#: src/dht/gnunet-dht-get.c:158
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -1996,152 +2142,100 @@ msgstr ""
 "Resultado %d, tipo %d:\n"
 "%.*s\n"
 
+#: src/dht/gnunet-dht-get.c:159
+#, fuzzy, c-format
+msgid "Result %d, type %d:\n"
+msgstr ""
+"Resultado %d, tipo %d:\n"
+"%.*s\n"
+
 #: src/dht/gnunet-dht-get.c:204
 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:210 src/dht/gnunet-dht-monitor.c:248
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257
 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:218
+#: src/dht/gnunet-dht-get.c:219
 msgid "Issueing DHT GET with key"
 msgstr "Enviando un «GET» DHT con clave"
 
-#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:222
+#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307
+#: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr "la clave de búsqueda"
 
-#: src/dht/gnunet-dht-get.c:251
+#: src/dht/gnunet-dht-get.c:253
 msgid "how many parallel requests (replicas) to create"
 msgstr "cuantas peticiones paralelas (réplicas) crear"
 
-#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304
+#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313
 msgid "the type of data to look for"
 msgstr "el tipo de datos a buscar"
 
-#: src/dht/gnunet-dht-get.c:264
+#: src/dht/gnunet-dht-get.c:263
 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:269 src/dht/gnunet-dht-put.c:227
+#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202
 msgid "use DHT's demultiplex everywhere option"
 msgstr "opción para usar el demultiplexado de la DHT siempre"
 
-#: src/dht/gnunet-dht-get.c:283
+#: src/dht/gnunet-dht-get.c:280
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 "Iniciando una peticion «GET» a la DHT de GNUnet, imprimiendo resultados."
 
-#: src/dht/gnunet-dht-monitor.c:310
+#: src/dht/gnunet-dht-monitor.c:319
 msgid "how long should the monitor command run"
 msgstr "cuanto tiempo debe ejecutarse el comando de monitorización"
 
-#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344
-#: src/nse/gnunet-nse-profiler.c:871
+#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372
+#: src/nse/gnunet-nse-profiler.c:878
 msgid "be verbose (print progress information)"
 msgstr "ser prolijo (imprime información de progreso)"
 
-#: src/dht/gnunet-dht-monitor.c:328
+#: src/dht/gnunet-dht-monitor.c:337
 msgid "Prints all packets that go through the DHT."
 msgstr "Imprime todos los paquetes que pasan por la DHT."
 
-#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:253
-#, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "El número máximo de conexiones es %u\n"
-
-#: src/dht/gnunet_dht_profiler.c:1188
-msgid "number of peers to start"
-msgstr "número de pares para empezar"
-
-#: src/dht/gnunet_dht_profiler.c:1194
-msgid ""
-"maximum number of times we try to search for successor circle formation (0 "
-"for R5N)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853
-#: src/testbed/gnunet-testbed-profiler.c:304
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-"nombre del fichero con la información de acceso usada para la batería de "
-"pruebas"
-
-#: src/dht/gnunet_dht_profiler.c:1206
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1212
-msgid "delay to start doing PUTs (default: 1 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1218
-msgid "delay to start doing GETs (default: 5 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1223
-msgid "replication degree for DHT PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1230
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1248
-#, fuzzy
-msgid "Measure quality and performance of the DHT service."
-msgstr "Medir la calidad y rendimiento del servicio NSE."
-
-#: src/dht/gnunet-dht-put.c:120
-msgid "PUT request sent with key"
-msgstr "Petición «PUT» enviada con clave"
-
-#: src/dht/gnunet-dht-put.c:123
-msgid "Timeout sending PUT request!\n"
-msgstr "¡Expiró el plazo enviando una petición «PUT»!\n"
-
-#: src/dht/gnunet-dht-put.c:126
-msgid "PUT request not confirmed!\n"
-msgstr "¡Petición «PUT» no confirmada!\n"
-
-#: src/dht/gnunet-dht-put.c:156
+#: src/dht/gnunet-dht-put.c:134
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr "¡Se deben proveer «KEY» y «DATA» para una subida a la DHT!\n"
 
-#: src/dht/gnunet-dht-put.c:163
-#, c-format
-msgid "Could not connect to %s service!\n"
+#: src/dht/gnunet-dht-put.c:142
+#, fuzzy
+msgid "Could not connect to DHT service!\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/dht/gnunet-dht-put.c:174
+#: src/dht/gnunet-dht-put.c:153
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr "¡Iniciando petición de subida para «%s» con datos «%s»!\n"
 
-#: src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-put.c:188
 msgid "the data to insert under the key"
 msgstr "los datos a insertar bajo la clave"
 
-#: src/dht/gnunet-dht-put.c:216
+#: src/dht/gnunet-dht-put.c:193
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr "cuanto tiempo almacenar esta entrada en la DHT (en segundos)"
 
-#: src/dht/gnunet-dht-put.c:233
+#: src/dht/gnunet-dht-put.c:207
 msgid "how many replicas to create"
 msgstr "cuantas réplicas crear"
 
-#: src/dht/gnunet-dht-put.c:238
+#: src/dht/gnunet-dht-put.c:211
 #, fuzzy
 msgid "use DHT's record route option"
 msgstr "opción para usar el demultiplexado de la DHT siempre"
 
-#: src/dht/gnunet-dht-put.c:244
+#: src/dht/gnunet-dht-put.c:216
 msgid "the type to insert data as"
 msgstr "el tipo de datos a insertar"
 
-#: src/dht/gnunet-dht-put.c:262
+#: src/dht/gnunet-dht-put.c:233
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 "Inicianco una petición «PUT» a la DHT de GNUnet para insertar «DATA» bajo "
@@ -2151,78 +2245,78 @@ msgstr ""
 msgid "# GET requests from clients injected"
 msgstr "# peticiones «GET» inyectadas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:485
+#: src/dht/gnunet-service-dht_clients.c:483
 msgid "# PUT requests received from clients"
 msgstr "# peticiones «PUT» recibidas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:624
+#: src/dht/gnunet-service-dht_clients.c:616
 msgid "# GET requests received from clients"
 msgstr "# peticiones «GET» recibidas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:850
+#: src/dht/gnunet-service-dht_clients.c:842
 msgid "# GET STOP requests received from clients"
 msgstr "# peticiones «GET STOP» recibidas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:1035
+#: src/dht/gnunet-service-dht_clients.c:1027
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 "# Coincidencias de clave, diferencias de tipo en la respuesta (REPLY) del "
 "cliente (CLIENT)"
 
-#: src/dht/gnunet-service-dht_clients.c:1050
+#: src/dht/gnunet-service-dht_clients.c:1042
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 "# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) omitidas"
 
-#: src/dht/gnunet-service-dht_clients.c:1096
+#: src/dht/gnunet-service-dht_clients.c:1088
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr "¡Tipo de bloque no soportado (%u) en la petición!\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1103
+#: src/dht/gnunet-service-dht_clients.c:1095
 msgid "# RESULTS queued for clients"
 msgstr "# Resultados (RESULTS) encolados para clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:1181
+#: src/dht/gnunet-service-dht_clients.c:1173
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 "# Respuestas (REPLIES) ignoradas para clientes (CLIENTS) (sin coincidencia)"
 
-#: src/dht/gnunet-service-dht_datacache.c:72
+#: src/dht/gnunet-service-dht_datacache.c:73
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "¡Petición %s recibida, pero no tiene caché de datos!\n"
 
-#: src/dht/gnunet-service-dht_datacache.c:82
+#: src/dht/gnunet-service-dht_datacache.c:83
 msgid "# ITEMS stored in datacache"
 msgstr "# Elementos (ITEMS) almacenados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:198
+#: src/dht/gnunet-service-dht_datacache.c:202
 msgid "# Good RESULTS found in datacache"
 msgstr "# Buenos resultados (RESULTS) encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:210
+#: src/dht/gnunet-service-dht_datacache.c:214
 msgid "# Duplicate RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) duplicados encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:216
+#: src/dht/gnunet-service-dht_datacache.c:220
 msgid "# Invalid RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) no válidos encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:222
+#: src/dht/gnunet-service-dht_datacache.c:226
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) irrelevantes encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-dht_datacache.c:238
 msgid "# Unsupported RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) no soportados encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:242
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr "¡Tipo de bloque no soportado (%u) en respuesta local!\n"
 
-#: src/dht/gnunet-service-dht_datacache.c:273
+#: src/dht/gnunet-service-dht_datacache.c:277
 msgid "# GET requests given to datacache"
 msgstr "# Peticiones «GET» realizadas a la caché de datos"
 
@@ -2360,16 +2454,65 @@ msgstr "# Entradas añadidas a la tabla de 
encaminamiento"
 msgid "# DHT requests combined"
 msgstr "# Peticiones a la DHT combinadas"
 
-#: src/dht/plugin_block_dht.c:187
+#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
+#, fuzzy, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "El número máximo de conexiones es %u\n"
+
+#: src/dht/gnunet_dht_profiler.c:949
+msgid "number of peers to start"
+msgstr "número de pares para empezar"
+
+#: src/dht/gnunet_dht_profiler.c:954
+msgid "number of PUTs to perform per peer"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
+#: src/testbed/gnunet-testbed-profiler.c:304
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+"nombre del fichero con la información de acceso usada para la batería de "
+"pruebas"
+
+#: src/dht/gnunet_dht_profiler.c:964
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:969
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:974
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:979
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:984
+msgid "chance that a peer is selected at random for PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:989
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1009
+#, fuzzy
+msgid "Measure quality and performance of the DHT service."
+msgstr "Medir la calidad y rendimiento del servicio NSE."
+
+#: src/dht/plugin_block_dht.c:189
 #, c-format
 msgid "Block not of type %u\n"
 msgstr "El bloque no es del tipo %u\n"
 
-#: src/dht/plugin_block_dht.c:194
+#: src/dht/plugin_block_dht.c:198
 msgid "Size mismatch for block\n"
 msgstr "Discrepancias de tamaños para el bloque\n"
 
-#: src/dht/plugin_block_dht.c:204
+#: src/dht/plugin_block_dht.c:209
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
@@ -2381,38 +2524,33 @@ msgstr ""
 "Se produjo un fallo al convertir el nombre en formato DNS IDNA «%s» a UTF-8: "
 "%s\n"
 
-#: src/dns/dnsparser.c:818
+#: src/dns/dnsparser.c:823
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
 "Se produjo un fallo al convertir el nombre en UTF-8 «%s» al formato DNS "
 "IDNA: %s\n"
 
-#: src/dns/dnsstub.c:176
+#: src/dns/dnsstub.c:233
 #, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "No se pudo asociar con ningún puerto: %s\n"
 
-#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382
+#: src/dns/dnsstub.c:364
 #, c-format
-msgid "Failed to send DNS request to %s\n"
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr "Recibida respuesta DNS demasiado pequeña (%u bytes)"
+
+#: src/dns/dnsstub.c:511
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s: %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/dns/dnsstub.c:298
+#: src/dns/dnsstub.c:517
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Petición DNS enviada a %s\n"
 
-#: src/dns/dnsstub.c:367
-#, c-format
-msgid "Configured DNS exit `%s' is not working / valid.\n"
-msgstr "La salida DNS configurada «%s» no funciona o no es válida.\n"
-
-#: src/dns/dnsstub.c:437
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr "Recibida respuesta DNS demasiado pequeña (%u bytes)"
-
 #: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS queries"
 msgstr "sólo monitorizar consultas DNS"
@@ -2437,48 +2575,48 @@ msgstr "Cambiar las respuestas DNS apuntando a 
cualquier otro lado."
 msgid "# DNS requests answered via TUN interface"
 msgstr "# Peticiones DNS contestadas vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:608
+#: src/dns/gnunet-service-dns.c:610
 msgid "# DNS exit failed (failed to open socket)"
 msgstr "# Salidas DNS fallidas (se produjo un fallo al abrir el «socket»)"
 
-#: src/dns/gnunet-service-dns.c:738
+#: src/dns/gnunet-service-dns.c:740
 msgid "# External DNS response discarded (no matching request)"
 msgstr "# Respuestas DNS externas descartadas (ninguna petición coincidente)"
 
-#: src/dns/gnunet-service-dns.c:813
+#: src/dns/gnunet-service-dns.c:815
 msgid "# Client response discarded (no matching request)"
 msgstr "# Respuestas de cliente descartadas (ninguna petición coincidente)"
 
-#: src/dns/gnunet-service-dns.c:928
+#: src/dns/gnunet-service-dns.c:930
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr "Recibido paquete UDP IPv4 mal formado en interfaz TUN.\n"
 
-#: src/dns/gnunet-service-dns.c:944
+#: src/dns/gnunet-service-dns.c:946
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr "Recibido paquete UDP IPv6 mal formado en interfaz TUN.\n"
 
-#: src/dns/gnunet-service-dns.c:953
+#: src/dns/gnunet-service-dns.c:955
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr "Se obtuvo un paquete no-IP con %u bytes y protocolo %u de TUN\n"
 
-#: src/dns/gnunet-service-dns.c:963
+#: src/dns/gnunet-service-dns.c:965
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:965
+#: src/dns/gnunet-service-dns.c:967
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr "# Paquetes UDP no-DNS recibidos vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:1032
+#: src/dns/gnunet-service-dns.c:1034
 msgid "# DNS requests received via TUN interface"
 msgstr "# Peticiones DNS recibidas vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569
+#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "se necesita una dirección IPv4 o IPv6 válida\n"
 
-#: src/dns/gnunet-service-dns.c:1090
+#: src/dns/gnunet-service-dns.c:1092
 #, fuzzy, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n"
@@ -2488,177 +2626,177 @@ msgstr "«%s» debe ser instalado con SUID, se niega a 
arrancar\n"
 msgid "Print information about DV state"
 msgstr "Imprime información acerca del estado del ATS"
 
-#: src/exit/gnunet-daemon-exit.c:961
+#: src/exit/gnunet-daemon-exit.c:960
 msgid "# TCP packets sent via TUN"
 msgstr "# Paquetes TCP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1062
+#: src/exit/gnunet-daemon-exit.c:1061
 msgid "# ICMP packets sent via TUN"
 msgstr "# Paquetes ICMP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1341
+#: src/exit/gnunet-daemon-exit.c:1340
 msgid "# UDP packets sent via TUN"
 msgstr "# Paquetes UDP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573
-#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702
-#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954
-#: src/exit/gnunet-daemon-exit.c:2208
+#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572
+#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701
+#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953
+#: src/exit/gnunet-daemon-exit.c:2207
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# Bytes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1468
+#: src/exit/gnunet-daemon-exit.c:1467
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# Peticiones de salida IP por UDP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:1576
+#: src/exit/gnunet-daemon-exit.c:1575
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# Peticiones de servicio UDP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:1616
+#: src/exit/gnunet-daemon-exit.c:1615
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# Peticiones de creaciones de servicio TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:1705
+#: src/exit/gnunet-daemon-exit.c:1704
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# Peticiones de creación de salida IP por TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:1789
+#: src/exit/gnunet-daemon-exit.c:1788
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# Peticiones de datos (DATA) TCP omitidas (no hay sesión)"
 
-#: src/exit/gnunet-daemon-exit.c:1826
+#: src/exit/gnunet-daemon-exit.c:1825
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# Peticiones de datos TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:1957
+#: src/exit/gnunet-daemon-exit.c:1956
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# Peticiones de salida IP por ICMP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280
-#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828
+#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279
+#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828
 #: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339
-#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887
+#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338
+#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887
 #: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:2211
+#: src/exit/gnunet-daemon-exit.c:2210
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# Peticiones de servicio ICMP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985
+#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985
 #: src/vpn/gnunet-service-vpn.c:2096
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr "# Paquetes ICMPv4 omitidos (imposible atravesar v6)"
 
-#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875
+#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875
 #: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr "# Paquetes ICMPv6 omitidos (imposible atravesar v4)"
 
-#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069
+#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# Túneles interiores MESH creados"
 
-#: src/exit/gnunet-daemon-exit.c:2523
+#: src/exit/gnunet-daemon-exit.c:2522
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr "Hay registros de servicios duplicados para «%s:%u»\n"
 
-#: src/exit/gnunet-daemon-exit.c:2542
+#: src/exit/gnunet-daemon-exit.c:2541
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr "# Bytes transmitidos vía túneles MESH"
 
-#: src/exit/gnunet-daemon-exit.c:2720
+#: src/exit/gnunet-daemon-exit.c:2719
 msgid "# ICMP packets dropped (not allowed)"
 msgstr "# Paquetes ICMP omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:2728
+#: src/exit/gnunet-daemon-exit.c:2727
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr "Paquete ICMP omitido, no hay información de conexiones coincidente\n"
 
-#: src/exit/gnunet-daemon-exit.c:2802
+#: src/exit/gnunet-daemon-exit.c:2801
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr "Paquete UDP omitido, no hay información de conexiones coincidente\n"
 
-#: src/exit/gnunet-daemon-exit.c:2874
+#: src/exit/gnunet-daemon-exit.c:2873
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr "Paquete TCP omitido, no hay información de conexiones coincidente\n"
 
-#: src/exit/gnunet-daemon-exit.c:2922
+#: src/exit/gnunet-daemon-exit.c:2921
 msgid "# Packets received from TUN"
 msgstr "# Paquetes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:2936
+#: src/exit/gnunet-daemon-exit.c:2935
 msgid "# Bytes received from TUN"
 msgstr "# Bytes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:2962
+#: src/exit/gnunet-daemon-exit.c:2961
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr "Opciones de paquete IPv4 recibidas.  Ignoradas.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2989
+#: src/exit/gnunet-daemon-exit.c:2988
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 "Recibido paquete IPv4 con cabecera «next» no soportada %u.  Ignorado.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3035
+#: src/exit/gnunet-daemon-exit.c:3034
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 "Recibido paquete IPv6 con cabecera «next» no soportada %d.  Ignorado.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3043
+#: src/exit/gnunet-daemon-exit.c:3042
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr "Recibido paquete de protocolo desconocido %u.  Ignorado.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256
+#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Las opción «%s» o «%s» es necesaria.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278
+#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3319
+#: src/exit/gnunet-daemon-exit.c:3318
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 "¡No se encontraron direcciones para el nombre de máquina «%s» del servicio "
 "«%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346
+#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr "¡Servicio «%s» configurado para IPv4, pero IPv4 está deshabilitado!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3358
+#: src/exit/gnunet-daemon-exit.c:3357
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 "¡No se encontraron direcciones IP para el nombre de máquina «%s» del "
 "servicio «%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3503
+#: src/exit/gnunet-daemon-exit.c:3501
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
@@ -2666,7 +2804,7 @@ msgstr ""
 "Este sistema no soporta IPv4, se deshabilitarán las funciones IPv4 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3511
+#: src/exit/gnunet-daemon-exit.c:3509
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
@@ -2674,7 +2812,7 @@ msgstr ""
 "Este sistema no soporta IPv6, se deshabilitarán las funciones IPv6 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3518
+#: src/exit/gnunet-daemon-exit.c:3516
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
@@ -2682,7 +2820,7 @@ msgstr ""
 "No se puede habilitar salida IPv4 pero se deshabilita IPv4 sobre interfaz "
 "TUN, se usará ENABLE_IPv4=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3524
+#: src/exit/gnunet-daemon-exit.c:3522
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
@@ -2690,20 +2828,20 @@ msgstr ""
 "No se pudo habilitar la salida IPv6 pero se deshabilita IPv6 sobre interfaz "
 "TUN, se usará ENABLE_IPv6=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3694
+#: src/exit/gnunet-daemon-exit.c:3690
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3809
+#: src/exit/gnunet-daemon-exit.c:3805
 #, fuzzy, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n"
 
-#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204
+#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204
 msgid "No useful service enabled.  Exiting.\n"
 msgstr "Ningún servicio útil habilitado.  Saliendo.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3970
+#: src/exit/gnunet-daemon-exit.c:3966
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr "Demonio a ejecutar para obtener un nodo de salida IP para la VPN"
 
@@ -2839,7 +2977,7 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "No hay coincidencia con «MAGIC».  Esto no es un directorio GNUnet.\n"
 
-#: src/fs/fs_download.c:309
+#: src/fs/fs_download.c:310
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
@@ -2847,12 +2985,12 @@ msgstr ""
 "Las descargas recursivas de directorios mayores de 4GB no están soportadas "
 "en sistemas de 32 bits\n"
 
-#: src/fs/fs_download.c:334
+#: src/fs/fs_download.c:335
 msgid "Directory too large for system address space\n"
 msgstr ""
 "Directorio demasiado grande para el espacio de direccionamiento del sistema\n"
 
-#: src/fs/fs_download.c:346
+#: src/fs/fs_download.c:347
 #, fuzzy, c-format
 msgid ""
 "Failed to access full directroy contents of `%s' for recursive download\n"
@@ -2860,19 +2998,19 @@ msgstr ""
 "Se produjo un fallo al crear el directorio para la descarga recursiva de "
 "«%s»\n"
 
-#: src/fs/fs_download.c:533 src/fs/fs_download.c:545
+#: src/fs/fs_download.c:534 src/fs/fs_download.c:546
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Se produjo un fallo al abrir «%s» para escritura"
 
-#: src/fs/fs_download.c:955
+#: src/fs/fs_download.c:956
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 "Se produjo un fallo al crear el directorio para la descarga recursiva de "
 "«%s»\n"
 
-#: src/fs/fs_download.c:1046
+#: src/fs/fs_download.c:1047
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
@@ -2881,33 +3019,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:1074
+#: src/fs/fs_download.c:1075
 msgid "internal error decrypting content"
 msgstr "error interno descifrando el contenido"
 
-#: src/fs/fs_download.c:1098
+#: src/fs/fs_download.c:1099
 #, 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:1110
+#: src/fs/fs_download.c:1111
 #, 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:1120
 #, 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:1219
+#: src/fs/fs_download.c:1220
 msgid "internal error decoding tree"
 msgstr "error interno decodificando árbol"
 
-#: src/fs/fs_download.c:1884
+#: src/fs/fs_download.c:1885
 msgid "Invalid URI"
 msgstr "URI no válida"
 
@@ -3029,12 +3167,12 @@ msgstr "No se pudo conectar con el almacén de datos."
 msgid "Internal error."
 msgstr "Error interno."
 
-#: src/fs/fs_search.c:809 src/fs/fs_search.c:879
+#: src/fs/fs_search.c:822 src/fs/fs_search.c:892
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Se produjo un fallo al procesar la URI: %s\n"
 
-#: src/fs/fs_search.c:966
+#: src/fs/fs_search.c:979
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3088,108 +3226,108 @@ msgid "Failed to compute hash of file."
 msgstr "Se produjo un fallo al calcular el hash del fichero."
 
 # Cadena erronea, corregida en SVN.
-#: src/fs/fs_uri.c:223
+#: src/fs/fs_uri.c:234
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "'%' debe ser seguido por un número hexadecimal"
 
-#: src/fs/fs_uri.c:282
+#: src/fs/fs_uri.c:293
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:300
+#: src/fs/fs_uri.c:311
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:307
+#: src/fs/fs_uri.c:318
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:377
+#: src/fs/fs_uri.c:388
 #, fuzzy
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:418
+#: src/fs/fs_uri.c:429
 #, fuzzy
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr "URI CHK mal formada"
 
-#: src/fs/fs_uri.c:433
+#: src/fs/fs_uri.c:444
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:512
+#: src/fs/fs_uri.c:523
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:527
+#: src/fs/fs_uri.c:538
 #, fuzzy
 msgid "LOC URI malformed (no CHK)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:537
+#: src/fs/fs_uri.c:548
 #, fuzzy
 msgid "LOC URI malformed (missing LOC)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:545
+#: src/fs/fs_uri.c:556
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
 
-#: src/fs/fs_uri.c:553
+#: src/fs/fs_uri.c:564
 #, fuzzy
 msgid "LOC URI malformed (could not decode public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
 
-#: src/fs/fs_uri.c:559
+#: src/fs/fs_uri.c:570
 #, fuzzy
 msgid "LOC URI malformed (could not find signature)"
 msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
 
-#: src/fs/fs_uri.c:565
+#: src/fs/fs_uri.c:576
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
 
-#: src/fs/fs_uri.c:574
+#: src/fs/fs_uri.c:585
 #, fuzzy
 msgid "LOC URI malformed (could not decode signature)"
 msgstr "URI SKS mal formada (no se pudo decodificar la firma)"
 
-#: src/fs/fs_uri.c:580
+#: src/fs/fs_uri.c:591
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
 
-#: src/fs/fs_uri.c:586
+#: src/fs/fs_uri.c:597
 #, fuzzy
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:609
 #, fuzzy
 msgid "LOC URI malformed (signature failed validation)"
 msgstr "URI SKS mal formada (se produjo un fallo al validar la firma)"
 
-#: src/fs/fs_uri.c:632
+#: src/fs/fs_uri.c:643
 #, fuzzy
 msgid "invalid argument"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/fs/fs_uri.c:644
+#: src/fs/fs_uri.c:655
 msgid "Unrecognized URI type"
 msgstr "Tipo de URI no reconocido"
 
-#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075
+#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/fs/fs_uri.c:1081
+#: src/fs/fs_uri.c:1092
 msgid "Number of double-quotes not balanced!\n"
 msgstr "¡Número de comillas dobles no balanceado!\n"
 
@@ -3231,20 +3369,20 @@ msgstr ""
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del emisor"
 
-#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 "deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
 
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909
 msgid "do not use libextractor to add keywords or metadata"
 msgstr "no usar libextractor para añadir palabras clave o metadatos"
 
-#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949
+#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944
 msgid "specify the priority of the content"
 msgstr "especificar la prioridad del contenido"
 
-#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962
+#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956
 msgid "set the desired replication LEVEL"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
@@ -3289,16 +3427,16 @@ msgstr "«%s» no es un directorio GNUnet\n"
 msgid "Display contents of a GNUnet directory"
 msgstr "Muestra los contenidos de un directorio GNUnet"
 
-#: src/fs/gnunet-download.c:137
+#: src/fs/gnunet-download.c:139
 #, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Iniciando descarga «%s».\n"
 
-#: src/fs/gnunet-download.c:147
+#: src/fs/gnunet-download.c:149
 msgid "<unknown time>"
 msgstr "<tiempo desconocido>"
 
-#: src/fs/gnunet-download.c:157
+#: src/fs/gnunet-download.c:158
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
@@ -3307,74 +3445,74 @@ msgstr ""
 "Descargando «%s» en %llu/%llu (%s restantes, %s/s). El bloque tardó %s en "
 "descargarse\n"
 
-#: src/fs/gnunet-download.c:179
+#: src/fs/gnunet-download.c:184
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Error descargando: %s.\n"
 
-#: src/fs/gnunet-download.c:194
+#: src/fs/gnunet-download.c:201
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Finalizada descarga «%s» (%s/s).\n"
 
-#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
+#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295
 #: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Estado inesperado: %d\n"
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:246
 msgid "You need to specify a URI argument.\n"
 msgstr "Tiene que especificar una URI como parámetro.\n"
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726
+#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Se produjo un fallo al procesar la URI: %s\n"
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:264
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr "Sólo URI «CHK» o «LOC» soportadas.\n"
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:273
 msgid "Target filename must be specified.\n"
 msgstr "El nombre de fichero de destino debe ser especificado.\n"
 
-#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
+#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870
 #: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "No se pudo inicializar el subsistema «%s».\n"
 
-#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del receptor"
 
-#: src/fs/gnunet-download.c:311
+#: src/fs/gnunet-download.c:344
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "borra descargas incompletas (cuando fueron abortadas con CTRL-C="
 
-#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319
+#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr "únicamente buscar en el par local (no buscar en la red P2P)"
 
-#: src/fs/gnunet-download.c:322
+#: src/fs/gnunet-download.c:354
 msgid "write the file to FILENAME"
 msgstr "escribe los datos al nombre del fichero proporcionado (FILENAME)"
 
-#: src/fs/gnunet-download.c:328
+#: src/fs/gnunet-download.c:359
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr "establece el número máximo de descargas paralelas permitido"
 
-#: src/fs/gnunet-download.c:334
+#: src/fs/gnunet-download.c:364
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr "establece el número máximo de peticiones de bloque paralelas permitido"
 
-#: src/fs/gnunet-download.c:339
+#: src/fs/gnunet-download.c:368
 msgid "download a GNUnet directory recursively"
 msgstr "descarga un directorio de GNUnet recursivamente"
 
-#: src/fs/gnunet-download.c:356
+#: src/fs/gnunet-download.c:386
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -3382,14 +3520,6 @@ msgstr ""
 "Descargar ficheros de GNUnet usando una URI GNUnet CHK o LOC (gnunet://fs/"
 "chk/...)"
 
-#: src/fs/gnunet-fs.c:119
-msgid "print a list of all indexed files"
-msgstr "imprimir una lista de todos los ficheros indexados"
-
-#: src/fs/gnunet-fs.c:130
-msgid "Special file-sharing operations"
-msgstr "Operaciones especiales de compartición de ficheros"
-
 #: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr "ejecuta el experimento con «COUNT» pares"
@@ -3410,6 +3540,14 @@ msgstr ""
 "ejecuta una batería de pruebas para medir el rendimiento de la compartición "
 "de ficheros"
 
+#: src/fs/gnunet-fs.c:119
+msgid "print a list of all indexed files"
+msgstr "imprimir una lista de todos los ficheros indexados"
+
+#: src/fs/gnunet-fs.c:130
+msgid "Special file-sharing operations"
+msgstr "Operaciones especiales de compartición de ficheros"
+
 #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -3544,7 +3682,7 @@ msgstr "La opción «%s» es obligatoria cuando se usa la 
opción «%s».\n"
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "La opción «%s» no tiene sentido sin la opción «%s».\n"
 
-#: src/fs/gnunet-publish.c:916
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3552,7 +3690,7 @@ msgstr ""
 "imprimir una lista de las palabras clave extraídas que podrían ser usadas, "
 "pero sin realizar la subida"
 
-#: src/fs/gnunet-publish.c:923
+#: src/fs/gnunet-publish.c:919
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3560,11 +3698,11 @@ msgstr ""
 "añadir una palabra clave adicional para el fichero del nivel más alto o el "
 "directorio (esta opción puede ser especificada varias veces)"
 
-#: src/fs/gnunet-publish.c:930
+#: src/fs/gnunet-publish.c:925
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "establece los metadatos para el tipo TYPE dado al valor VALUE dado"
 
-#: src/fs/gnunet-publish.c:935
+#: src/fs/gnunet-publish.c:930
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3572,7 +3710,7 @@ msgstr ""
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "cifrada en la base de datos de GNUnet)"
 
-#: src/fs/gnunet-publish.c:942
+#: src/fs/gnunet-publish.c:937
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3580,13 +3718,13 @@ msgstr ""
 "especificar la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio de nombres únicamente)"
 
-#: src/fs/gnunet-publish.c:955
+#: src/fs/gnunet-publish.c:950
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publicar los ficheros bajo el seudónimo NAME (coloca el fichero en el "
 "espacio)"
 
-#: src/fs/gnunet-publish.c:968
+#: src/fs/gnunet-publish.c:960
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
@@ -3594,14 +3732,14 @@ msgstr ""
 "únicamente simular el proceso pero no publicar nada realmente (útil para "
 "calcular URI)"
 
-#: src/fs/gnunet-publish.c:975
+#: src/fs/gnunet-publish.c:966
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "establece la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:982
+#: src/fs/gnunet-publish.c:973
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3609,7 +3747,7 @@ msgstr ""
 "URI a ser publicada (puede ser usado en vez de pasar un fichero para añadir "
 "claves con el fichero con la URI respectiva)"
 
-#: src/fs/gnunet-publish.c:998
+#: src/fs/gnunet-publish.c:989
 msgid "Publish a file or directory on GNUnet"
 msgstr "Publicar un fichero o un directorio en GNUnet"
 
@@ -3688,7 +3826,7 @@ msgstr ""
 "(HOSTKEY).  Saliendo.\n"
 
 #: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355
-#: src/topology/gnunet-daemon-topology.c:1203
+#: src/topology/gnunet-daemon-topology.c:1202
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Se produjo un fallo al conectar con el servicio «%s».\n"
@@ -3738,7 +3876,7 @@ msgstr "# mensajes de detención de migración recibidos"
 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:723 src/fs/gnunet-service-fs_cp.c:1343
+#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345
 msgid "# P2P searches active"
 msgstr "# busquedas P2P activas"
 
@@ -3786,20 +3924,20 @@ msgstr "# peticiones «GET» recibidas (de otros pares)"
 msgid "# requests dropped due to missing reverse route"
 msgstr "# peticiones omitidas debido a falta de ruta inversa"
 
-#: src/fs/gnunet-service-fs_cp.c:1239
+#: src/fs/gnunet-service-fs_cp.c:1241
 #, 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:1295
+#: src/fs/gnunet-service-fs_cp.c:1297
 msgid "# requests dropped due TTL underflow"
 msgstr "# peticiones omitidas debido a expiración del TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1339
+#: src/fs/gnunet-service-fs_cp.c:1341
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes de búsqueda P2P recibidos y procesados"
 
-#: src/fs/gnunet-service-fs_cp.c:1706
+#: src/fs/gnunet-service-fs_cp.c:1708
 msgid "# migration stop messages sent"
 msgstr "# mensajes de detención de migración enviados"
 
@@ -4015,6 +4153,10 @@ msgstr "No se pudo empezar la operación de 
desindexado.\n"
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr "Desindexa un fichero previamente indexado con «gnunet-publish»."
 
+#: src/gns/gns_tld_api.c:276
+msgid "Expected a base32-encoded public zone key\n"
+msgstr ""
+
 #: src/gns/gnunet-bcd.c:127
 #, fuzzy, c-format
 msgid "Refusing `%s' request to HTTP server\n"
@@ -4044,137 +4186,69 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:238
+#: src/gns/gnunet-dns2gns.c:203
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 "¡Se produjo un fallo al empaquetar una respuesta DNS en un paquete UDP!\n"
 
-#: src/gns/gnunet-dns2gns.c:408
+#: src/gns/gnunet-dns2gns.c:404
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "No se puede procesar la petición DNS de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:424
+#: src/gns/gnunet-dns2gns.c:420
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Recibida petición DNS mal formada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:432
+#: src/gns/gnunet-dns2gns.c:428
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Recibida petición DNS no soportada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:711
-msgid "No ego configured for `dns2gns` subsystem\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:739
+#: src/gns/gnunet-dns2gns.c:587
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/gns/gnunet-dns2gns.c:760
-#, fuzzy
-msgid "No valid GNS zone specified!\n"
-msgstr "¡Ninguna palabra clave especificada!\n"
-
-#: src/gns/gnunet-dns2gns.c:784
+#: src/gns/gnunet-dns2gns.c:687
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr "IP del resolvedor recursivo DNS a usar (requerido)"
 
-#: src/gns/gnunet-dns2gns.c:790
-msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
-msgstr ""
-"Sufijo FCFS autoritativo a usar (opcional); predeterminado: fcfs.zkey.eu"
-
-#: src/gns/gnunet-dns2gns.c:796
-msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
-msgstr "Sufijo DNS autoritativo a usar (opcional); predeterminado: zkey.eu"
-
-#: src/gns/gnunet-dns2gns.c:802
+#: src/gns/gnunet-dns2gns.c:692
 #, fuzzy
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 "Puerto UDP en el que escuchar para peticiones DNS entrantes; predeterminado: "
 "53"
 
-#: src/gns/gnunet-dns2gns.c:808
-msgid "Public key of the GNS zone to use (overrides default)"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:826
+#: src/gns/gnunet-dns2gns.c:709
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)"
 
-#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
+#: src/gns/gnunet-gns-benchmark.c:582
+msgid "how long to wait between queries"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:252
-#, c-format
-msgid "Please specify name to lookup!\n"
+#: src/gns/gnunet-gns-benchmark.c:587
+#, fuzzy
+msgid "how long to wait for an answer"
+msgstr "¿cuánto tiempo se debe ejecutar? 0 = para siempre"
+
+#: src/gns/gnunet-gns-benchmark.c:591
+msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:276
-#, c-format
-msgid "Ego for `%s' not found, cannot perform lookup.\n"
+#: src/gns/gnunet-gns-helper-service-w32.c:602
+msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701
-#: src/gns/plugin_rest_gns.c:422
-#, c-format
+#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727
-#, c-format
-msgid "Failed to connect to GNS\n"
-msgstr "Se produjo un fallo al conectar con GNS\n"
-
-#: src/gns/gnunet-gns.c:374
-#, c-format
-msgid "Public key `%s' is not well-formed\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:428
-msgid "Lookup a record for the given name"
-msgstr "Buscar el registro para el nombre dado"
-
-#: src/gns/gnunet-gns.c:434
-msgid "Specify the type of the record to lookup"
-msgstr "Especificar el tipo del registro a buscar"
-
-#: src/gns/gnunet-gns.c:440
-#, fuzzy
-msgid "Specify timeout for the lookup"
-msgstr "Especificar el tipo del registro a buscar"
-
-#: src/gns/gnunet-gns.c:445
-msgid "No unneeded output"
-msgstr "Sin salida innecesaria"
-
-#: src/gns/gnunet-gns.c:451
-#, fuzzy
-msgid "Specify the public key of the zone to lookup the record in"
-msgstr "Especificar el tipo del registro a buscar"
-
-#: src/gns/gnunet-gns.c:457
-#, fuzzy
-msgid "Specify the name of the ego of the zone to lookup the record in"
-msgstr "Especificar el tipo del registro a buscar"
-
-#: src/gns/gnunet-gns.c:476
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "Herramienta de acceso GNUnet GNS"
-
-#: src/gns/gnunet-gns-helper-service-w32.c:602
-msgid "Not ready to process requests, lacking ego data\n"
-msgstr ""
-
 #: src/gns/gnunet-gns-helper-service-w32.c:739
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
@@ -4185,232 +4259,239 @@ msgid "This program will import some GNS authorities 
into your GNS namestore."
 msgstr ""
 
 #: src/gns/gnunet-gns-proxy.c:109
-#: src/hostlist/gnunet-daemon-hostlist_client.c:569
-#: src/hostlist/gnunet-daemon-hostlist_client.c:787
-#: src/hostlist/gnunet-daemon-hostlist_client.c:793
-#: src/hostlist/gnunet-daemon-hostlist_client.c:845
-#: src/hostlist/gnunet-daemon-hostlist_client.c:854
-#: src/hostlist/gnunet-daemon-hostlist_client.c:965
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1060
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1065
+#: src/hostlist/gnunet-daemon-hostlist_client.c:535
+#: src/hostlist/gnunet-daemon-hostlist_client.c:753
+#: src/hostlist/gnunet-daemon-hostlist_client.c:759
+#: src/hostlist/gnunet-daemon-hostlist_client.c:811
+#: src/hostlist/gnunet-daemon-hostlist_client.c:820
+#: src/hostlist/gnunet-daemon-hostlist_client.c:931
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
 #: src/transport/plugin_transport_http_client.c:598
 #: src/transport/plugin_transport_http_client.c:616
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
 
-#: src/gns/gnunet-gns-proxy.c:887
+#: src/gns/gnunet-gns-proxy.c:910
 #, fuzzy, c-format
-msgid "Unsupported CURL SSL backend %d\n"
+msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:933
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:956
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
 
-#: src/gns/gnunet-gns-proxy.c:946
+#: src/gns/gnunet-gns-proxy.c:969
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/gns/gnunet-gns-proxy.c:961
+#: src/gns/gnunet-gns-proxy.c:984
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:971
+#: src/gns/gnunet-gns-proxy.c:994
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:995
+#: src/gns/gnunet-gns-proxy.c:1018
 #, c-format
-msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgid "TLS certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1104
+#: src/gns/gnunet-gns-proxy.c:1132
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1709
+#: src/gns/gnunet-gns-proxy.c:1868
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:2172
+#: src/gns/gnunet-gns-proxy.c:2364
 #, 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:2202
+#: src/gns/gnunet-gns-proxy.c:2394
 #, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "No se pudo importar el certificado %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:2375
+#: src/gns/gnunet-gns-proxy.c:2573
 #, 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:2394 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658
 #, 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:2716
+#: src/gns/gnunet-gns-proxy.c:2925
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2745
+#: src/gns/gnunet-gns-proxy.c:2954
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2763 src/gns/gnunet-gns-proxy.c:2792
-msgid "SSL connection to plain IPv4 address requested\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:2842
+#: src/gns/gnunet-gns-proxy.c:3035
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3177 src/gns/gnunet-service-gns.c:403
-#, fuzzy, c-format
-msgid "No ego configured for `%s`\n"
-msgstr ""
-"Ningún puerto fue configurado para el módulo «%s», no se puede probar\n"
-
-#: src/gns/gnunet-gns-proxy.c:3238
+#: src/gns/gnunet-gns-proxy.c:3316
 #, fuzzy, c-format
-msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
+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:3281
+#: src/gns/gnunet-gns-proxy.c:3443
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3287
+#: src/gns/gnunet-gns-proxy.c:3448
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3312
+#: src/gns/gnunet-gns-proxy.c:3473
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
-#: src/gns/gnunet-service-gns.c:442
+#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+msgid "Lookup a record for the given name"
+msgstr "Buscar el registro para el nombre dado"
+
+#: src/gns/gnunet-gns.c:238
+msgid "Specify the type of the record to lookup"
+msgstr "Especificar el tipo del registro a buscar"
+
+#: src/gns/gnunet-gns.c:242
+msgid "No unneeded output"
+msgstr "Sin salida innecesaria"
+
+#: src/gns/gnunet-gns.c:258
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "Herramienta de acceso GNUnet GNS"
+
+#: src/gns/gnunet-service-gns.c:513
+#, fuzzy
+msgid "Properly base32-encoded public key required"
+msgstr "Tipo requerido\n"
+
+#: src/gns/gnunet-service-gns.c:549
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/gns/gnunet-service-gns.c:461
-#: src/zonemaster/gnunet-service-zonemaster.c:742
+#: src/gns/gnunet-service-gns.c:568
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
+#: src/zonemaster/gnunet-service-zonemaster.c:875
 msgid "Could not connect to DHT!\n"
 msgstr "¡No se pudo conectar a la DHT!\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:263
+#: src/gns/gnunet-service-gns_interceptor.c:259
 #, fuzzy
 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:370
+#: src/gns/gnunet-service-gns_interceptor.c:366
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio GNS!\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:641
+#: src/gns/gnunet-service-gns_resolver.c:713
 #, fuzzy, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:652
+#: src/gns/gnunet-service-gns_resolver.c:724
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:844
+#: src/gns/gnunet-service-gns_resolver.c:927
 #, 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:986
+#: src/gns/gnunet-service-gns_resolver.c:1102
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1347
+#: src/gns/gnunet-service-gns_resolver.c:1796
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1865
+#: src/gns/gnunet-service-gns_resolver.c:1839
+msgid "GNS lookup failed (zero records found)\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:2253
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1889
+#: src/gns/gnunet-service-gns_resolver.c:2276
 #, 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:2171
+#: src/gns/gnunet-service-gns_resolver.c:2563
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2318
-#, c-format
-msgid "Hostname `%s' is not well-formed, resolution fails\n"
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:203
+#: src/gns/plugin_gnsrecord_gns.c:181
 #, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "No se pudo procesar el registro PKEY «%s»\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:232
+#: src/gns/plugin_gnsrecord_gns.c:212
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "No se pudo procesar el registro SOA «%s»\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:253
+#: src/gns/plugin_gnsrecord_gns.c:233
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr ""
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:276
+#: src/gns/plugin_gnsrecord_gns.c:258
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:312
+#: src/gns/plugin_gnsrecord_gns.c:294
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:360
-#, fuzzy, c-format
-msgid "Unable to parse REVERSE record string `%s'\n"
-msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
-
 #: src/gns/plugin_rest_gns.c:384
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:668
-#, fuzzy
-msgid "GNS REST API initialized\n"
-msgstr "Conexión fallida\n"
-
 #: src/gnsrecord/plugin_gnsrecord_dns.c:359
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4599,36 +4680,36 @@ msgstr "proveer un servidor de listas de máquinas"
 msgid "GNUnet hostlist server and client"
 msgstr "Servidor y cliente GNUnet de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:371
+#: src/hostlist/gnunet-daemon-hostlist_client.c:349
 msgid "# bytes downloaded from hostlist servers"
 msgstr "# bytes descargados de servidores de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:392
-#: src/hostlist/gnunet-daemon-hostlist_client.c:437
+#: src/hostlist/gnunet-daemon-hostlist_client.c:370
+#: src/hostlist/gnunet-daemon-hostlist_client.c:403
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# «HELLO» no válidos descargados de servidores de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:395
-#: src/hostlist/gnunet-daemon-hostlist_client.c:440
+#: src/hostlist/gnunet-daemon-hostlist_client.c:373
+#: src/hostlist/gnunet-daemon-hostlist_client.c:406
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Mensaje «%s» no válido recibido de la lista de máquinas en «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:413
+#: src/hostlist/gnunet-daemon-hostlist_client.c:391
 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:695
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1441
+#: src/hostlist/gnunet-daemon-hostlist_client.c:661
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
 msgid "# advertised hostlist URIs"
 msgstr "# URI de listas de máquinas anunciadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:725
+#: src/hostlist/gnunet-daemon-hostlist_client.c:691
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr "# URI anunciadas «%s» descargadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:768
+#: src/hostlist/gnunet-daemon-hostlist_client.c:734
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
@@ -4637,120 +4718,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:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:862
 #, 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:910
+#: src/hostlist/gnunet-daemon-hostlist_client.c:876
 #, 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:930
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, 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:936
+#: src/hostlist/gnunet-daemon-hostlist_client.c:902
 #, 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:944
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, 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:997
+#: src/hostlist/gnunet-daemon-hostlist_client.c:963
 #, 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:1005
+#: src/hostlist/gnunet-daemon-hostlist_client.c:971
 msgid "# hostlist downloads initiated"
 msgstr "# descargas de listas de máquinas iniciadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1132
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1698
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1098
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1665
 msgid "# milliseconds between hostlist downloads"
 msgstr "# milisegundos entre descargas de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1141
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1107
 #, 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:1200
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1221
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1166
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1187
 msgid "# active connections"
 msgstr "# conexiones activas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
 #, 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:1392
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
 #, 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:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
 #, 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:1435
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 #, 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:1438
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
 msgid "# hostlist URIs read from file"
 msgstr "# URI de listas de máquinas leídas de fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1484
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
 #, 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:1491
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
 #, 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:1515
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1532
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
 #, 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:1527
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
 msgid "# hostlist URIs written to file"
 msgstr "# URI de listas de máquinas escritas a fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1595
 #: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1657
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1624
 msgid "Learning is enabled on this peer\n"
 msgstr "El aprendizaje está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1671
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1638
 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:1684
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1651
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4770,7 +4851,7 @@ msgstr "direcciones expiradas encontradas"
 #: src/hostlist/gnunet-daemon-hostlist_server.c:531
 #: src/peerinfo-tool/gnunet-peerinfo.c:385
 #: src/peerinfo-tool/gnunet-peerinfo.c:534
-#: src/topology/gnunet-daemon-topology.c:857
+#: src/topology/gnunet-daemon-topology.c:862
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
@@ -4873,6 +4954,71 @@ msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 "No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n"
 
+#: src/identity-provider/gnunet-idp.c:424
+#, fuzzy
+msgid "Ego is required\n"
+msgstr "Las opción «%s» o «%s» es necesaria.\n"
+
+#: src/identity-provider/gnunet-idp.c:432
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:440
+#, fuzzy
+msgid "Requesting party key is required!\n"
+msgstr "el parámetro --section es necesario\n"
+
+#: src/identity-provider/gnunet-idp.c:463
+msgid "Add attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:469
+msgid "Attribute value"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:474
+msgid "Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:479
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:483
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:488
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:493
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:498
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:503
+msgid "Type of attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:508
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/identity-provider/identity_provider_api.c:436
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "El almacén de nombres no pudo añadir el registro\n"
+
+#: src/identity-provider/plugin_rest_identity_provider.c:1230
+#: src/identity-provider/plugin_rest_openid_connect.c:2147
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr "Conexión fallida\n"
+
 #: src/identity/gnunet-identity.c:179
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
@@ -4967,34 +5113,11 @@ 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:967
+#: src/identity/plugin_rest_identity.c:968
 #, fuzzy
 msgid "Identity REST API initialized\n"
 msgstr "Conexión fallida\n"
 
-#: src/identity-provider/gnunet-identity-token.c:66
-#, fuzzy
-msgid "Option `-t' is required\n"
-msgstr "Las opción «%s» o «%s» es necesaria.\n"
-
-#: src/identity-provider/gnunet-identity-token.c:77
-#, fuzzy, c-format
-msgid "Token `%s' is malformed\n"
-msgstr "El bloque del tipo %u está mal formado\n"
-
-#: src/identity-provider/gnunet-identity-token.c:166
-msgid "GNUid token"
-msgstr ""
-
-#: src/identity-provider/gnunet-identity-token.c:171
-msgid "Print token contents"
-msgstr ""
-
-#: src/identity-provider/plugin_rest_identity_provider.c:1166
-#, fuzzy
-msgid "Identity Token REST API initialized\n"
-msgstr "Conexión fallida\n"
-
 #: src/json/json.c:119
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -5024,7 +5147,7 @@ msgstr "No se pudo acceder al fichero «%s»: %s\n"
 msgid "No records found for `%s'"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr "\tRegistro corrupto o no soportado del tipo %u\n"
@@ -5044,7 +5167,7 @@ msgstr "Parámetro no válido «%s»\n"
 msgid "You must specify a name\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291
 msgid "name of the record to add/delete/display"
 msgstr "nombre del registro a añadir/borrar/mostrar"
 
@@ -5053,7 +5176,7 @@ msgstr "nombre del registro a añadir/borrar/mostrar"
 msgid "spezifies the public key of the zone to look in"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343
 msgid "GNUnet zone manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
 
@@ -5068,292 +5191,299 @@ msgstr "El almacén de nombres no pudo añadir el 
registro"
 msgid "Error communicating with namecache service"
 msgstr "Error al comunicar con el servicio ARM.\n"
 
-#: src/namecache/plugin_namecache_flat.c:119
-#: src/namecache/plugin_namecache_flat.c:253
-#: src/namestore/plugin_namestore_flat.c:179
-#: src/namestore/plugin_namestore_flat.c:375
+#: src/namecache/plugin_namecache_flat.c:121
+#: src/namecache/plugin_namecache_flat.c:255
+#: src/namestore/plugin_namestore_flat.c:150
+#: src/namestore/plugin_namestore_flat.c:385
 #: src/peerstore/plugin_peerstore_flat.c:379
 #: src/peerstore/plugin_peerstore_flat.c:538
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "Imposible inicializar SQLite: %s.\n"
 
-#: src/namecache/plugin_namecache_flat.c:130
-#: src/namestore/plugin_namestore_flat.c:190
+#: src/namecache/plugin_namecache_flat.c:132
+#: src/namestore/plugin_namestore_flat.c:161
 #: src/peerstore/plugin_peerstore_flat.c:394
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr "Se produjo un fallo al crear los índices\n"
 
-#: src/namecache/plugin_namecache_flat.c:149
-#: src/namestore/plugin_namestore_flat.c:203
+#: src/namecache/plugin_namecache_flat.c:151
+#: src/namestore/plugin_namestore_flat.c:174
 #: src/peerstore/plugin_peerstore_flat.c:406
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
 msgstr "Se produjo un fallo al crear los índices\n"
 
-#: src/namecache/plugin_namecache_flat.c:408
+#: src/namecache/plugin_namecache_flat.c:410
 #, fuzzy
 msgid "flat plugin running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
 
-#: src/namestore/gnunet-namestore.c:301
+# form??
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "Forma de valor no soportada «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:547
+#, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:567
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:598
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr "Encontrado nombre «%s» para la clave dada\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:678
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr "Encontrados %u registros para el dominio «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:736
+#, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "Se produjo un fallo al crear la página para «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:754
+#, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:790
+msgid "Domain name must not contain `.'\n"
+msgstr "El nombre de dominio no puede contener «.»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:799
+msgid "Domain name must not contain `+'\n"
+msgstr "El nombre de dominio no puede contener «+»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1019
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1045
+msgid "Failed to start HTTP server\n"
+msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1092
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Se produjo un fallo al conectar con GNS\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1130
+#, fuzzy
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
+
+#: src/namestore/gnunet-namestore.c:313
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr "No se pudo añadir el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:562
+#: src/namestore/gnunet-namestore.c:343
+#: src/namestore/plugin_rest_namestore.c:572
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:571
+#: src/namestore/gnunet-namestore.c:350
+#: src/namestore/plugin_rest_namestore.c:581
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527
-#: src/namestore/gnunet-namestore.c:535
+#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561
-#: src/namestore/gnunet-namestore.c:573
+#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
-#: src/namestore/plugin_rest_namestore.c:597
+#: src/namestore/gnunet-namestore.c:677
+#, c-format
+msgid ""
+"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:810
+#: src/namestore/plugin_rest_namestore.c:607
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:739
+#: src/namestore/gnunet-namestore.c:851
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:776
-#: src/namestore/plugin_rest_namestore.c:1004
-#, fuzzy, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr "'%s': servicio desconocido: %s\n"
-
-#: src/namestore/gnunet-namestore.c:791
+#: src/namestore/gnunet-namestore.c:903
 #, c-format
 msgid "No options given\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/namestore/gnunet-namestore.c:802
-#: src/namestore/gnunet-namestore-fcfsd.c:1034
-#: src/namestore/plugin_rest_namestore.c:1017
-msgid "Failed to connect to namestore\n"
-msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
-
-#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819
-#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861
-#: src/namestore/gnunet-namestore.c:915
+#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973
+#: src/namestore/gnunet-namestore.c:1027
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820
-#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863
+#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932
+#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975
 msgid "add"
 msgstr "añadir"
 
-#: src/namestore/gnunet-namestore.c:829
-#: src/namestore/plugin_rest_namestore.c:671
+#: src/namestore/gnunet-namestore.c:941
+#: src/namestore/plugin_rest_namestore.c:684
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:851
-#: src/namestore/plugin_rest_namestore.c:689
-#: src/namestore/plugin_rest_namestore.c:729
+#: src/namestore/gnunet-namestore.c:963
+#: src/namestore/plugin_rest_namestore.c:704
+#: src/namestore/plugin_rest_namestore.c:746
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "Valor «%s» no válido para el tipo de registro «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:896
+#: src/namestore/gnunet-namestore.c:1008
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1028
 msgid "del"
 msgstr "borrar"
 
-#: src/namestore/gnunet-namestore.c:950
+#: src/namestore/gnunet-namestore.c:1071
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/namestore/gnunet-namestore.c:1100
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1014
+#: src/namestore/gnunet-namestore.c:1135
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1051
-#: src/namestore/plugin_rest_namestore.c:1047
+#: src/namestore/gnunet-namestore.c:1175
+#: src/namestore/plugin_rest_namestore.c:1065
 #, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1108
-#: src/namestore/plugin_rest_namestore.c:1143
+#: src/namestore/gnunet-namestore.c:1239
+#: src/namestore/plugin_rest_namestore.c:1161
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/namestore/gnunet-namestore.c:1137
+#: src/namestore/gnunet-namestore.c:1264
 msgid "add record"
 msgstr "añadir registro"
 
-#: src/namestore/gnunet-namestore.c:1142
+#: src/namestore/gnunet-namestore.c:1268
 msgid "delete record"
 msgstr "borrar registro"
 
-#: src/namestore/gnunet-namestore.c:1147
+#: src/namestore/gnunet-namestore.c:1272
 msgid "display records"
 msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore.c:1153
+#: src/namestore/gnunet-namestore.c:1277
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 "tiempo de expiración del registro a usar (únicamente para añadir), nunca "
 "(\"never\") es posible"
 
-#: src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1282
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
-#: src/namestore/gnunet-namestore.c:1164
+#: src/namestore/gnunet-namestore.c:1286
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/namestore/gnunet-namestore.c:1176
+#: src/namestore/gnunet-namestore.c:1296
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "establece las preferencias para el par dado"
 
-#: src/namestore/gnunet-namestore.c:1184
+#: src/namestore/gnunet-namestore.c:1301
 msgid "type of the record to add/delete/display"
 msgstr "tipo del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:1190
+#: src/namestore/gnunet-namestore.c:1306
 msgid "URI to import into our zone"
 msgstr "URI a importar a nuestra zona"
 
-#: src/namestore/gnunet-namestore.c:1196
+#: src/namestore/gnunet-namestore.c:1311
 msgid "value of the record to add/delete"
 msgstr "valor del registro a añadir/borrar"
 
-#: src/namestore/gnunet-namestore.c:1201
+#: src/namestore/gnunet-namestore.c:1315
 msgid "create or list public record"
 msgstr "crear o listar registros públicos"
 
-#: src/namestore/gnunet-namestore.c:1206
+#: src/namestore/gnunet-namestore.c:1319
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1212
+#: src/namestore/gnunet-namestore.c:1324
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "nombre de la sección a la que acceder"
 
-# form??
-#: src/namestore/gnunet-namestore-fcfsd.c:508
-#, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "Forma de valor no soportada «%s»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:535
-#, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
+#: src/namestore/gnunet-service-namestore.c:750
+#, fuzzy, c-format
+msgid "Failed to replicate block in namecache: %s\n"
+msgstr "Se produjo un fallo al crear el espacio de nombres «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:555
-msgid "Error when mapping zone to name\n"
+#: src/namestore/gnunet-zoneimport.c:2035
+msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:585
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr "Encontrado nombre «%s» para la clave dada\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:662
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr "Encontrados %u registros para el dominio «%s»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:718
-#, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr "Se produjo un fallo al crear la página para «%s»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:734
-#, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:770
-msgid "Domain name must not contain `.'\n"
-msgstr "El nombre de dominio no puede contener «.»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:778
-msgid "Domain name must not contain `+'\n"
-msgstr "El nombre de dominio no puede contener «+»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:974
-msgid "No ego configured for `fcfsd` subsystem\n"
+#: src/namestore/gnunet-zoneimport.c:2040
+msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1000
-msgid "Failed to start HTTP server\n"
-msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1042
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "Se produjo un fallo al conectar con GNS\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1074
-#, fuzzy
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
-
-#: src/namestore/gnunet-service-namestore.c:615
-#, fuzzy, c-format
-msgid "Failed to replicate block in namecache: %s\n"
-msgstr "Se produjo un fallo al crear el espacio de nombres «%s»\n"
-
-#: src/namestore/namestore_api.c:379
+#: src/namestore/namestore_api.c:391
 #, fuzzy
 msgid "Namestore failed to store record\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/namestore/plugin_namestore_flat.c:656
+#: src/namestore/plugin_namestore_flat.c:767
 #, fuzzy
 msgid "flat file database running\n"
 msgstr "Base de datos de plantilla ejecutándose\n"
 
-#: src/namestore/plugin_rest_namestore.c:1188
+#: src/namestore/plugin_namestore_sqlite.c:218
+#: src/namestore/plugin_namestore_sqlite.c:229
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
+
+#: src/namestore/plugin_rest_namestore.c:1206
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -5382,11 +5512,11 @@ msgstr "Configuración de GNUnet"
 msgid "section name providing the configuration for the adapter"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447
+#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453
 msgid "use TCP"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452
+#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458
 msgid "use UDP"
 msgstr ""
 
@@ -5574,62 +5704,62 @@ msgstr ""
 "Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para "
 "pruebas NAT: %s\n"
 
-#: src/nat/gnunet-nat.c:425
+#: src/nat/gnunet-nat.c:431
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:431
+#: src/nat/gnunet-nat.c:437
 msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:437
+#: src/nat/gnunet-nat.c:443
 msgid ""
 "name of configuration section to find additional options, such as manual "
 "host punching data"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:442
+#: src/nat/gnunet-nat.c:448
 msgid "enable STUN processing"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:457
+#: src/nat/gnunet-nat.c:463
 #, fuzzy
 msgid "watch for connection reversal requests"
 msgstr "# pares desconectados debido a petición externa"
 
-#: src/nat/gnunet-nat.c:469
+#: src/nat/gnunet-nat.c:475
 #, fuzzy
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
 
-#: src/nat/gnunet-service-nat.c:1335
+#: src/nat/gnunet-service-nat.c:1339
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1345
+#: src/nat/gnunet-service-nat.c:1349
 #, fuzzy, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 "Puerto inválido \"%s\" en la especificación de la lista local, probando el "
 "puerto %d.\n"
 
-#: src/nat/gnunet-service-nat.c:1361
+#: src/nat/gnunet-service-nat.c:1365
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1372
+#: src/nat/gnunet-service-nat.c:1376
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1837
+#: src/nat/gnunet-service-nat.c:1841
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Colección detenida.\n"
 
-#: src/nat/gnunet-service-nat.c:1910
+#: src/nat/gnunet-service-nat.c:1914
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5653,99 +5783,40 @@ msgstr "comando «external-ip» no encontrado\n"
 msgid "`upnpc' command not found\n"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nse/gnunet-nse.c:122
-#, fuzzy
-msgid "Show network size estimates from NSE service."
-msgstr "# Estimaciones del tamaño de red recibidas"
-
-#: src/nse/gnunet-nse-profiler.c:842
+#: src/nse/gnunet-nse-profiler.c:849
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "límite al número de conexiones a servicios NSE, 0 para ilimitadas"
 
-#: src/nse/gnunet-nse-profiler.c:847
+#: src/nse/gnunet-nse-profiler.c:854
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 "nombre del fichero para escribir información y estadísticas de la conexión"
 
-#: src/nse/gnunet-nse-profiler.c:859
-msgid "name of the file for writing the main results"
-msgstr "nombre del fichero en el que escribir los resultados principales"
-
 #: src/nse/gnunet-nse-profiler.c:866
-msgid "Number of peers to run in each round, separated by commas"
-msgstr "Número de pares a ejecutar en cada ronda, separados por comas"
-
-#: src/nse/gnunet-nse-profiler.c:877
-msgid "delay between rounds"
-msgstr "retraso entre rondas"
-
-#: src/nse/gnunet-nse-profiler.c:886
-msgid "Measure quality and performance of the NSE service."
-msgstr "Medir la calidad y rendimiento del servicio NSE."
-
-#: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:840 src/util/gnunet-scrypt.c:276
-msgid "Value is too large.\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:178
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Eliminando dirección de transporte «%s»\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:310
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:331
-#: src/peerinfo/gnunet-service-peerinfo.c:362
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:446
-msgid "# peers known"
-msgstr "# pares conocidos"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:489
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-"El fichero «%s» en el directorio «%s» no sigue la convención de nombres. "
-"Eliminado.\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:655
-#, fuzzy, c-format
-msgid "Scanning directory `%s'\n"
-msgstr "Escaneando directorio «%s».\n"
+msgid "name of the file for writing the main results"
+msgstr "nombre del fichero en el que escribir los resultados principales"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:663
-#, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr "¡Aún no se han encontrado pares en «%s»!\n"
+#: src/nse/gnunet-nse-profiler.c:873
+msgid "Number of peers to run in each round, separated by commas"
+msgstr "Número de pares a ejecutar en cada ronda, separados por comas"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1080
-#, fuzzy, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr "Escaneando directorio «%s».\n"
+#: src/nse/gnunet-nse-profiler.c:884
+msgid "delay between rounds"
+msgstr "retraso entre rondas"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1409
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr "Importando HELLO de «%s»\n"
+#: src/nse/gnunet-nse-profiler.c:893
+msgid "Measure quality and performance of the NSE service."
+msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1422
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
+#: src/nse/gnunet-nse.c:122
+#, fuzzy
+msgid "Show network size estimates from NSE service."
+msgstr "# Estimaciones del tamaño de red recibidas"
 
-# Miguel: "Failed to receive" también aquí está traducido como
-# "no se obtuvo respuesta" por claridad.
-#: src/peerinfo/peerinfo_api.c:220
-msgid "Failed to receive response from `PEERINFO' service."
+#: src/nse/gnunet-service-nse.c:1534
+#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
+msgid "Value is too large.\n"
 msgstr ""
-"No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
@@ -5836,6 +5907,65 @@ msgstr "Cargando el módulo de transporte «%s»\n"
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
+#: src/peerinfo/gnunet-service-peerinfo.c:178
+#, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Eliminando dirección de transporte «%s»\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:313
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:334
+#: src/peerinfo/gnunet-service-peerinfo.c:365
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:449
+msgid "# peers known"
+msgstr "# pares conocidos"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:492
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+"El fichero «%s» en el directorio «%s» no sigue la convención de nombres. "
+"Eliminado.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:659
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "Escaneando directorio «%s».\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:667
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr "¡Aún no se han encontrado pares en «%s»!\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1100
+#, fuzzy, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "Escaneando directorio «%s».\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1438
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr "Importando HELLO de «%s»\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1451
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
+
+# Miguel: "Failed to receive" también aquí está traducido como
+# "no se obtuvo respuesta" por claridad.
+#: src/peerinfo/peerinfo_api.c:220
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr ""
+"No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
+
 #: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
@@ -6148,12 +6278,12 @@ msgstr "El servicio «%s» no está ejecutandose\n"
 msgid "Search string `%s' is too long!\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/rest/gnunet-rest-server.c:790
+#: src/rest/gnunet-rest-server.c:927
 #, fuzzy
 msgid "listen on specified port (default: 7776)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/rest/gnunet-rest-server.c:807
+#: src/rest/gnunet-rest-server.c:944
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Herramienta de acceso GNUnet GNS"
@@ -6290,19 +6420,22 @@ msgid "# revocation set unions completed"
 msgstr "# transmisiones de fragmentos completadas"
 
 #: src/revocation/gnunet-service-revocation.c:525
-#: src/revocation/gnunet-service-revocation.c:773
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:864
+#: src/revocation/gnunet-service-revocation.c:867
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "No se pudo conectar con el almacén de datos."
 
-#: src/rps/gnunet-rps.c:146
+#: src/rps/gnunet-rps.c:203
 msgid "Seed a PeerID"
 msgstr ""
 
+#: src/rps/gnunet-rps.c:207
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
 #: src/scalarproduct/gnunet-scalarproduct.c:220
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
@@ -6358,10 +6491,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "Conexión fallida (¿bug?)\n"
@@ -6742,14 +6875,14 @@ msgstr ""
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:247
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:249
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46
-#: src/testing/testing.c:288 src/util/gnunet-ecc.c:306
+#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr "El fichero de máquinas no tiene el formato correcto: %s\n"
@@ -6823,16 +6956,6 @@ msgstr "Petición ignorada porque el ARM se está 
apagando.\n"
 msgid "%.s Unknown result code."
 msgstr "Código de respuesta del ARM desconocido.\n"
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:118
-#, fuzzy
-msgid "Waiting for child to exit.\n"
-msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:241
-#, fuzzy, c-format
-msgid "Spawning process `%s'\n"
-msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
-
 #: src/testbed/gnunet-testbed-profiler.c:289
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr "tolerar un número «COUNT» de continuas expiraciones de plazo"
@@ -6844,6 +6967,16 @@ msgid ""
 "signal is received"
 msgstr ""
 
+#: src/testbed/gnunet_testbed_mpi_spawn.c:118
+#, fuzzy
+msgid "Waiting for child to exit.\n"
+msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
+
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
+#, fuzzy, c-format
+msgid "Spawning process `%s'\n"
+msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
+
 #: src/testbed/testbed_api.c:410
 #, c-format
 msgid "Adding host %u failed with error: %s\n"
@@ -7085,62 +7218,62 @@ msgstr "Se produjo un fallo al arrancar «%s»: %s\n"
 msgid "Failed to load configuration from %s\n"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
 
-#: src/topology/friends.c:106
+#: src/topology/friends.c:126
 #, fuzzy, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr ""
 "Error de sintaxis en el fichero de la lista negra en el desplazamiento %llu, "
 "omitiendo bytes «%s».\n"
 
-#: src/topology/friends.c:160
+#: src/topology/friends.c:180
 #, fuzzy, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr "«gnunet-arm» o «ssh» no parecen terminar.\n"
 
-#: src/topology/gnunet-daemon-topology.c:225
+#: src/topology/gnunet-daemon-topology.c:230
 msgid "# peers blacklisted"
 msgstr "# pares en la lista negra"
 
-#: src/topology/gnunet-daemon-topology.c:339
+#: src/topology/gnunet-daemon-topology.c:344
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# peticiones de conexión requeridas al servicio de transporte"
 
 # gossiped??
-#: src/topology/gnunet-daemon-topology.c:533
+#: src/topology/gnunet-daemon-topology.c:538
 msgid "# HELLO messages gossipped"
 msgstr "# Mensajes «HELLO» rumoreados"
 
-#: src/topology/gnunet-daemon-topology.c:635
-#: src/topology/gnunet-daemon-topology.c:721
+#: src/topology/gnunet-daemon-topology.c:640
+#: src/topology/gnunet-daemon-topology.c:726
 msgid "# friends connected"
 msgstr "# amigos conectados"
 
-#: src/topology/gnunet-daemon-topology.c:918
+#: src/topology/gnunet-daemon-topology.c:923
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 "¡Se produjo un fallo al conectar con el servicio principal, no se puede "
 "gestionar la topología!\n"
 
-#: src/topology/gnunet-daemon-topology.c:951
+#: src/topology/gnunet-daemon-topology.c:956
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr "Me he encontrado «%s» en mi lista de amigos (inútil, ignorado)\n"
 
-#: src/topology/gnunet-daemon-topology.c:958
+#: src/topology/gnunet-daemon-topology.c:963
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr "Encontrado amigo «%s» en la configuración\n"
 
-#: src/topology/gnunet-daemon-topology.c:980
+#: src/topology/gnunet-daemon-topology.c:985
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:983
+#: src/topology/gnunet-daemon-topology.c:988
 msgid "# friends in configuration"
 msgstr "# amigos en configuración"
 
-#: src/topology/gnunet-daemon-topology.c:990
+#: src/topology/gnunet-daemon-topology.c:995
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
@@ -7148,26 +7281,22 @@ msgstr ""
 "Menos amigos especificados que los requeridos por el contador mínimo de "
 "amigos. Sólo me conectaré a amigos.\n"
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:1001
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 "Más conexiones amistosas requeridas que el número objetivo total de "
 "conexiones.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1059
+#: src/topology/gnunet-daemon-topology.c:1054
 #: src/transport/plugin_transport_wlan.c:1517
 msgid "# HELLO messages received"
 msgstr "# mensajes «HELLO» recibidos"
 
-#: src/topology/gnunet-daemon-topology.c:1233
+#: src/topology/gnunet-daemon-topology.c:1232
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:141
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport.c:448
 msgid "# messages dropped due to slow client"
 msgstr "# mensajes omitidos debido a un cliente lento"
@@ -7216,220 +7345,224 @@ msgstr ""
 "El servicio de transporte carece de opciones de configuración de clave.  "
 "Saliendo.\n"
 
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr "# refrescos de mi «HELLO»"
 
-#: src/transport/gnunet-service-transport_neighbours.c:804
+#: src/transport/gnunet-service-transport_neighbours.c:806
 #, fuzzy
 msgid "# session creation failed"
 msgstr "# sesiones wlan creadas"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1053
 msgid "# DISCONNECT messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1168
+#: src/transport/gnunet-service-transport_neighbours.c:1176
 msgid "# disconnects due to quota of 0"
 msgstr "# desconexiones debido a una cuota de 0"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1764
+#: src/transport/gnunet-service-transport_neighbours.c:1324
+#: src/transport/gnunet-service-transport_neighbours.c:1785
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes en la cola de mensajes para otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1316
+#: src/transport/gnunet-service-transport_neighbours.c:1329
 msgid "# messages transmitted to other peers"
 msgstr "# mensajes transmitidos a otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1322
+#: src/transport/gnunet-service-transport_neighbours.c:1335
 msgid "# transmission failures for messages to other peers"
 msgstr "# fallos de transmisión en mensajes a otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1395
 msgid "# messages timed out while in transport queue"
 msgstr "# mensajes expirados mientras estaban en la cola de transporte"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1458
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1494
+#: src/transport/gnunet-service-transport_neighbours.c:1515
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# Mensajes «KEEPALIVE» descartados (par desconocido)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1502
+#: src/transport/gnunet-service-transport_neighbours.c:1523
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes «KEEPALIVE» descartados (no hay sesión)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1512
+#: src/transport/gnunet-service-transport_neighbours.c:1533
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1557
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1566
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "# Mensajes «KEEPALIVE_RESPONSE» descartados (no esperado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1574
+#: src/transport/gnunet-service-transport_neighbours.c:1595
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1583
+#: src/transport/gnunet-service-transport_neighbours.c:1604
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1588
+#: src/transport/gnunet-service-transport_neighbours.c:1609
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1615
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1661
+#: src/transport/gnunet-service-transport_neighbours.c:1682
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# mensajes descartados debido a la falta de registro vecinal"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1695
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 msgid "# bandwidth quota violations by other peers"
 msgstr "# violaciones de la cuota de ancho de banda por otros pares"
 
 # throttling?
-#: src/transport/gnunet-service-transport_neighbours.c:1710
+#: src/transport/gnunet-service-transport_neighbours.c:1731
 msgid "# ms throttling suggested"
 msgstr "# ms de impulso sugeridos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1830
+#: src/transport/gnunet-service-transport_neighbours.c:1854
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr ""
 "Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
 "«%s»\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1850
+#: src/transport/gnunet-service-transport_neighbours.c:1874
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1889
+#: src/transport/gnunet-service-transport_neighbours.c:1913
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1906
+#: src/transport/gnunet-service-transport_neighbours.c:1930
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1936
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2001
+#: src/transport/gnunet-service-transport_neighbours.c:2028
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2055
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2072
+#: src/transport/gnunet-service-transport_neighbours.c:2099
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2233
+#: src/transport/gnunet-service-transport_neighbours.c:2262
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2238
+#: src/transport/gnunet-service-transport_neighbours.c:2267
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2623
+#: src/transport/gnunet-service-transport_neighbours.c:2654
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3105
+#: src/transport/gnunet-service-transport_neighbours.c:3139
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# mensajes SET QUOTA recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3113
+#: src/transport/gnunet-service-transport_neighbours.c:3147
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3131
-#: src/transport/gnunet-service-transport_neighbours.c:3155
+#: src/transport/gnunet-service-transport_neighbours.c:3165
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3167
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (esperando en el ATS)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3192
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3205
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3377
+#: src/transport/gnunet-service-transport_neighbours.c:3412
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3413
+#: src/transport/gnunet-service-transport_neighbours.c:3448
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3501
+#: src/transport/gnunet-service-transport_neighbours.c:3536
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3508
+#: src/transport/gnunet-service-transport_neighbours.c:3543
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3548
+#: src/transport/gnunet-service-transport_neighbours.c:3583
 #, fuzzy
 msgid "# disconnect messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3555
+#: src/transport/gnunet-service-transport_neighbours.c:3590
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3566
+#: src/transport/gnunet-service-transport_neighbours.c:3601
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3700
+#: src/transport/gnunet-service-transport_neighbours.c:3736
 msgid "# disconnected from peer upon explicit request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
@@ -7552,6 +7685,50 @@ msgstr "# Mensajes PONG omitidos, firma expirada"
 msgid "# validations succeeded"
 msgstr "# revalidaciones de direcciones iniciadas"
 
+#: src/transport/gnunet-service-transport_validation.c:1627
+#, fuzzy
+msgid "# HELLOs given to peerinfo"
+msgstr "# «HELLO» obtenidos de «peerinfo»"
+
+#: src/transport/gnunet-transport-profiler.c:219
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:617
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:621
+#, fuzzy
+msgid "receive data from peer"
+msgstr "# respuestas recibidas de otros pares"
+
+#: src/transport/gnunet-transport-profiler.c:626
+#, fuzzy
+msgid "iterations"
+msgstr "Otras configuraciones"
+
+#: src/transport/gnunet-transport-profiler.c:631
+#, fuzzy
+msgid "number of messages to send"
+msgstr "número de mensajes a usar por iteración"
+
+#: src/transport/gnunet-transport-profiler.c:636
+#, fuzzy
+msgid "message size to use"
+msgstr "tamaño del mensaje"
+
+#: src/transport/gnunet-transport-profiler.c:641
+#: src/transport/gnunet-transport.c:1462
+msgid "peer identity"
+msgstr "identidad del par"
+
+#: src/transport/gnunet-transport-profiler.c:652
+#: src/transport/gnunet-transport.c:1482
+msgid "Direct access to transport service."
+msgstr "Acceso directo al servicio de transporte."
+
 #: src/transport/gnunet-transport.c:413
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7695,11 +7872,6 @@ msgstr ""
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
-#: src/transport/gnunet-transport.c:1462
-#: src/transport/gnunet-transport-profiler.c:641
-msgid "peer identity"
-msgstr "identidad del par"
-
 #: src/transport/gnunet-transport.c:1466
 #, fuzzy
 msgid "monitor plugin sessions"
@@ -7709,45 +7881,11 @@ msgstr "# sesiones wlan pendientes"
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr "enviar data para prueba a otro par (hasta CTRL-C)"
 
-#: src/transport/gnunet-transport.c:1482
-#: src/transport/gnunet-transport-profiler.c:652
-msgid "Direct access to transport service."
-msgstr "Acceso directo al servicio de transporte."
-
-#: src/transport/gnunet-transport-profiler.c:219
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:617
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:621
-#, fuzzy
-msgid "receive data from peer"
-msgstr "# respuestas recibidas de otros pares"
-
-#: src/transport/gnunet-transport-profiler.c:626
-#, fuzzy
-msgid "iterations"
-msgstr "Otras configuraciones"
-
-#: src/transport/gnunet-transport-profiler.c:631
-#, fuzzy
-msgid "number of messages to send"
-msgstr "número de mensajes a usar por iteración"
-
-#: src/transport/gnunet-transport-profiler.c:636
-#, fuzzy
-msgid "message size to use"
-msgstr "tamaño del mensaje"
-
 #: src/transport/plugin_transport_http_client.c:1474
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3526
-#: src/transport/plugin_transport_tcp.c:3890
-#: src/transport/plugin_transport_tcp.c:3897
+#: src/transport/plugin_transport_tcp.c:3891
+#: src/transport/plugin_transport_tcp.c:3898
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7826,7 +7964,7 @@ msgid "Found %u addresses to report to NAT service\n"
 msgstr "Encontradas %u direcciones para comunicar al servicio NAT\n"
 
 #: src/transport/plugin_transport_http_server.c:2901
-#: src/transport/plugin_transport_udp.c:3622
+#: src/transport/plugin_transport_udp.c:3623
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n"
 
@@ -7941,7 +8079,7 @@ msgstr "Longitud de dirección inesperada: %u bytes\n"
 #: src/transport/plugin_transport_tcp.c:1730
 #: src/transport/plugin_transport_tcp.c:1954
 #: src/transport/plugin_transport_tcp.c:3137
-#: src/transport/plugin_transport_tcp.c:4013
+#: src/transport/plugin_transport_tcp.c:4014
 msgid "# TCP sessions active"
 msgstr "# Sesiones TCP activas"
 
@@ -7978,73 +8116,56 @@ msgstr "# peticiones de desconexión del servicio de 
transporte por TCP"
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
 
-#: src/transport/plugin_transport_tcp.c:3408
+#: src/transport/plugin_transport_tcp.c:3409
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:3459
-#: src/transport/plugin_transport_tcp.c:3517
+#: src/transport/plugin_transport_tcp.c:3460
+#: src/transport/plugin_transport_tcp.c:3518
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# conexiones «stream» activas"
 
-#: src/transport/plugin_transport_tcp.c:3463
+#: src/transport/plugin_transport_tcp.c:3464
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# Pares conectados"
 
-#: src/transport/plugin_transport_tcp.c:3469
+#: src/transport/plugin_transport_tcp.c:3470
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3471
+#: src/transport/plugin_transport_tcp.c:3472
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3511
+#: src/transport/plugin_transport_tcp.c:3512
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3521
+#: src/transport/plugin_transport_tcp.c:3522
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
-#: src/transport/plugin_transport_tcp.c:3840
+#: src/transport/plugin_transport_tcp.c:3841
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
 
-#: src/transport/plugin_transport_tcp.c:4001
+#: src/transport/plugin_transport_tcp.c:4002
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "Transporte TCP escuchando en el puerto %llu\n"
 
-#: src/transport/plugin_transport_tcp.c:4005
+#: src/transport/plugin_transport_tcp.c:4006
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n"
 
-#: src/transport/plugin_transport_tcp.c:4009
+#: src/transport/plugin_transport_tcp.c:4010
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr "El transporte TCP anuncia que está en el puerto %llu\n"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:168
-#, fuzzy
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:548
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:565
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr ""
-"Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el "
-"«socket» en el puerto %d\n"
-
-#: src/transport/plugin_transport_udp.c:3366
+#: src/transport/plugin_transport_udp.c:3367
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
@@ -8053,7 +8174,7 @@ msgstr ""
 "UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, "
 "compruebe su configuración de red\n"
 
-#: src/transport/plugin_transport_udp.c:3380
+#: src/transport/plugin_transport_udp.c:3381
 #, fuzzy
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
@@ -8063,41 +8184,58 @@ msgstr ""
 "configuración de red y deshabilite IPv6 si su conexión carece de una "
 "dirección IPv6 global\n"
 
-#: src/transport/plugin_transport_udp.c:3698
-#: src/transport/plugin_transport_udp.c:3797
+#: src/transport/plugin_transport_udp.c:3699
+#: src/transport/plugin_transport_udp.c:3798
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:3716
+#: src/transport/plugin_transport_udp.c:3717
 #, fuzzy
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n"
 
-#: src/transport/plugin_transport_udp.c:3807
+#: src/transport/plugin_transport_udp.c:3808
 msgid "Failed to open UDP sockets\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:3878
-#: src/transport/plugin_transport_udp.c:3892
+#: src/transport/plugin_transport_udp.c:3879
+#: src/transport/plugin_transport_udp.c:3893
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3924
+#: src/transport/plugin_transport_udp.c:3925
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/transport/plugin_transport_udp.c:3951
+#: src/transport/plugin_transport_udp.c:3952
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "«%s» no es una dirección IP válida.\n"
 
-#: src/transport/plugin_transport_udp.c:4015
+#: src/transport/plugin_transport_udp.c:4016
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "Se produjo un fallo al crear una nueva firma"
 
+#: src/transport/plugin_transport_udp_broadcasting.c:168
+#, fuzzy
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:548
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:565
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+"Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el "
+"«socket» en el puerto %d\n"
+
 #: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
@@ -8217,7 +8355,7 @@ msgstr ""
 "El código de procesado para el mensaje del tipo %u no llamó a "
 "«GNUNET_SERVER_receive_done» después de %s\n"
 
-#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2346
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr "Familia de direcciones %d desconocida\n"
@@ -8279,7 +8417,7 @@ msgstr ""
 msgid "Service process failed to report status\n"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
-#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517
 #: src/util/service.c:1378
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
@@ -8298,19 +8436,19 @@ msgstr "Imposible cambiar el usuario/grupo a «%s»: %s\n"
 msgid "do daemonize (detach from terminal)"
 msgstr "demonizar (desasociar del terminal)"
 
-#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:255
+#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279
 #: src/util/service.c:1790
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:272
+#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299
 #: src/util/service.c:1801
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:267
+#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292
 #: src/util/service.c:1807
 #, c-format
 msgid "Could not access configuration file `%s'\n"
@@ -8321,61 +8459,61 @@ msgstr "No se pudo acceder al fichero de configuración 
«%s»\n"
 msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/util/bio.c:177 src/util/bio.c:185
+#: src/util/bio.c:181 src/util/bio.c:189
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Error leyendo «%s»: %s"
 
-#: src/util/bio.c:187
+#: src/util/bio.c:191
 msgid "End of file"
 msgstr "Fin del fichero"
 
-#: src/util/bio.c:244
+#: src/util/bio.c:248
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr "Se produjo un error leyendo la cadena «%s»"
 
-#: src/util/bio.c:254
+#: src/util/bio.c:258
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr "La cadena «%s» es mayor de lo permitido (%u > %u)"
 
-#: src/util/bio.c:300
+#: src/util/bio.c:306
 #, 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:314
+#: src/util/bio.c:328
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr "Se produjo un fallo al deserializar los metadatos «%s»"
 
-#: src/util/client.c:911
+#: src/util/client.c:914
 #, 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"
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1132
+#: src/util/common_logging.c:259 src/util/common_logging.c:1146
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1130
+#: src/util/common_logging.c:261 src/util/common_logging.c:1144
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1128
+#: src/util/common_logging.c:263 src/util/common_logging.c:1142
 msgid "MESSAGE"
 msgstr "MENSAJE"
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1126
+#: src/util/common_logging.c:265 src/util/common_logging.c:1140
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1124
+#: src/util/common_logging.c:267 src/util/common_logging.c:1138
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/common_logging.c:269 src/util/common_logging.c:1134
+#: src/util/common_logging.c:269 src/util/common_logging.c:1148
 msgid "NONE"
 msgstr "NINGUNO"
 
@@ -8384,24 +8522,24 @@ msgstr "NINGUNO"
 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:1135
+#: src/util/common_logging.c:1149
 msgid "INVALID"
 msgstr "NO VÁLIDO"
 
-#: src/util/common_logging.c:1326
+#: src/util/common_logging.c:1442
 msgid "unknown address"
 msgstr "dirección desconocida"
 
-#: src/util/common_logging.c:1368
+#: src/util/common_logging.c:1484
 msgid "invalid address"
 msgstr "dirección no válida"
 
-#: src/util/common_logging.c:1386
+#: src/util/common_logging.c:1502
 #, 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:1407
+#: src/util/common_logging.c:1523
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8414,12 +8552,12 @@ msgstr ""
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Error de sintaxis en la línea %u mientras se deserializaba\n"
 
-#: src/util/configuration.c:355
+#: src/util/configuration.c:363
 #, fuzzy, c-format
 msgid "Error while reading file `%s'\n"
 msgstr "Error decodificando clave %u\n"
 
-#: src/util/configuration.c:1034
+#: src/util/configuration.c:1051
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8428,24 +8566,24 @@ msgstr ""
 "El valor de configuración «%s» para «%s» de la sección «%s» no está dentro "
 "de las opciones legales\n"
 
-#: src/util/configuration.c:1153
+#: src/util/configuration.c:1170
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1186
+#: src/util/configuration.c:1203
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
 
-#: src/util/configuration.c:1254
+#: src/util/configuration.c:1271
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:531
+#: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -8454,43 +8592,43 @@ msgstr ""
 "El tamaño del fichero en disco es incorrecto para este «Bloom "
 "filter» (esperado %llu, tiene %llu)\n"
 
-#: src/util/crypto_ecc.c:810
+#: src/util/crypto_ecc.c:836
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "El firmado ECC falló en %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:860
+#: src/util/crypto_ecc.c:886
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "El firmado ECC falló en %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:934
+#: src/util/crypto_ecc.c:960
 #, 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.c:991
+#: src/util/crypto_ecc.c:1017
 #, fuzzy, c-format
 msgid "EdDSA 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:122 src/util/crypto_ecc_setup.c:161
-#: src/util/crypto_ecc_setup.c:279 src/util/crypto_ecc_setup.c:317
+#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165
+#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355
 #, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "No se pudo bloquear el fichero «%s»: %s...\n"
 
-#: src/util/crypto_ecc_setup.c:128 src/util/crypto_ecc_setup.c:284
+#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Generando una clave privada nueva.  Esto puede tomar un tiempo.\n"
 
-#: src/util/crypto_ecc_setup.c:165 src/util/crypto_ecc_setup.c:322
+#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 "Esto puede estar bien si alguien está actualmente generando una clave "
 "privada.\n"
 
-#: src/util/crypto_ecc_setup.c:195 src/util/crypto_ecc_setup.c:352
+#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
@@ -8498,13 +8636,13 @@ msgstr ""
 "Cuando se intentaba leer el fichero de claves «%s» se encontraron %u bytes "
 "pero al menos %u son necesarios.\n"
 
-#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:356
+#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 "Esto puede ser correcto si alguien está actualmente generando una clave de "
 "máquina.\n"
 
-#: src/util/crypto_ecc_setup.c:415
+#: src/util/crypto_ecc_setup.c:471
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "No se pudo acceder a la clave de máquina.\n"
@@ -8514,12 +8652,12 @@ msgstr "No se pudo acceder a la clave de máquina.\n"
 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"
 
-#: src/util/crypto_rsa.c:835
+#: src/util/crypto_rsa.c:834
 #, fuzzy, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "El firmado ECC falló en %s:%d: %s\n"
 
-#: src/util/crypto_rsa.c:1166
+#: src/util/crypto_rsa.c:1165
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
@@ -8594,11 +8732,11 @@ msgstr "Use %s para obtener una lista de opciones.\n"
 msgid "Missing mandatory option `%s'.\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
 
-#: src/util/getopt_helpers.c:68
+#: src/util/getopt_helpers.c:70
 msgid "print the version number"
 msgstr "imprime el número de versión"
 
-#: src/util/getopt_helpers.c:111
+#: src/util/getopt_helpers.c:115
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8606,94 +8744,100 @@ msgstr ""
 "Los parámetros obligatorios para las opciones largas también lo son para sus "
 "versiones cortas.\n"
 
-#: src/util/getopt_helpers.c:199
+#: src/util/getopt_helpers.c:203
 msgid "print this help"
 msgstr "imprime esta ayuda"
 
-#: src/util/getopt_helpers.c:274
+#: src/util/getopt_helpers.c:281
 msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt_helpers.c:410
+#: src/util/getopt_helpers.c:422
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:488
+#: src/util/getopt_helpers.c:502
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:510
+#: src/util/getopt_helpers.c:524
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "crear ficheros de configuración únicos"
 
-#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740
+#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758
+#: src/util/getopt_helpers.c:825
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Tienes que introducir un número en la opción «%s».\n"
 
-#: src/util/getopt_helpers.c:610
+#: src/util/getopt_helpers.c:626
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
 
-#: src/util/getopt_helpers.c:675
+#: src/util/getopt_helpers.c:692
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
 
-#: src/util/getopt_helpers.c:823
+#: src/util/getopt_helpers.c:832
+#, fuzzy, c-format
+msgid "You must pass a number below %u to the `%s' option.\n"
+msgstr "Tienes que introducir un número en la opción «%s».\n"
+
+#: src/util/getopt_helpers.c:918
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:124
+#: src/util/gnunet-config.c:134
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
 
-#: src/util/gnunet-config.c:137
+#: src/util/gnunet-config.c:147
 #, c-format
 msgid "--section argument is required\n"
 msgstr "el parámetro --section es necesario\n"
 
-#: src/util/gnunet-config.c:140
+#: src/util/gnunet-config.c:150
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:191
+#: src/util/gnunet-config.c:201
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr "el parámetro --option es necesario para establecer un valor\n"
 
-#: src/util/gnunet-config.c:229
+#: src/util/gnunet-config.c:240
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 "obtener la opción del valor como un nombre de fichero (con expansión del $)"
 
-#: src/util/gnunet-config.c:234
+#: src/util/gnunet-config.c:245
 msgid "name of the section to access"
 msgstr "nombre de la sección a la que acceder"
 
-#: src/util/gnunet-config.c:239
+#: src/util/gnunet-config.c:250
 msgid "name of the option to access"
 msgstr "nombre de la opción a la que acceder"
 
-#: src/util/gnunet-config.c:244
+#: src/util/gnunet-config.c:255
 msgid "value to set"
 msgstr "valor a establecer"
 
-#: src/util/gnunet-config.c:248
+#: src/util/gnunet-config.c:259
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "Falta configuración sobre las opciones de claves.\n"
 
-#: src/util/gnunet-config.c:252
+#: src/util/gnunet-config.c:263
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:265
+#: src/util/gnunet-config.c:276
 msgid "Manipulate GNUnet configuration files"
 msgstr "Manipular ficheros de configuración de GNUnet"
 
@@ -8735,64 +8879,64 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:288
+#: src/util/gnunet-ecc.c:290
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "El fichero de máquinas %s no fue encontrado\n"
 
-#: src/util/gnunet-ecc.c:299
+#: src/util/gnunet-ecc.c:305
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "El archivo de amigos «%s» está vacío.\n"
 
-#: src/util/gnunet-ecc.c:321
+#: src/util/gnunet-ecc.c:334
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "¡No se puede leer el fichero de claves de máquina!\n"
 
-#: src/util/gnunet-ecc.c:372
+#: src/util/gnunet-ecc.c:391
 msgid "No hostkey file specified on command line\n"
 msgstr "No se ha especificado la clave de máquina en la línea de comandos\n"
 
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:456
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:442
+#: src/util/gnunet-ecc.c:461
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:447
+#: src/util/gnunet-ecc.c:466
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr "crea «COUNT» pares de claves pública-privada (para pruebas)"
 
-#: src/util/gnunet-ecc.c:451
+#: src/util/gnunet-ecc.c:470
 msgid "print the public key in ASCII format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:455
+#: src/util/gnunet-ecc.c:474
 #, fuzzy
 msgid "print the private key in ASCII format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:459
+#: src/util/gnunet-ecc.c:478
 #, fuzzy
 msgid "print the public key in HEX format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:463
+#: src/util/gnunet-ecc.c:482
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:479
+#: src/util/gnunet-ecc.c:498
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
-#: src/util/gnunet-resolver.c:150
+#: src/util/gnunet-resolver.c:168
 msgid "perform a reverse lookup"
 msgstr "realizar una búsqueda inversa"
 
-#: src/util/gnunet-resolver.c:161
+#: src/util/gnunet-resolver.c:179
 msgid "Use build-in GNUnet stub resolver"
 msgstr "Utilizar el resolvedor interno para pruebas de GNUnet"
 
@@ -8874,12 +9018,12 @@ msgstr ""
 msgid "Error writing to `%s': %s\n"
 msgstr "Error escribiendo a «%s»: %s\n"
 
-#: src/util/network.c:137
+#: src/util/network.c:136
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr "Imposible acortar la ruta unix «%s» manteniendo el nombre único\n"
 
-#: src/util/network.c:1793 src/util/network.c:1977
+#: src/util/network.c:1795 src/util/network.c:1979
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8887,7 +9031,7 @@ msgstr ""
 "¡Error lógico interno fatal, el proceso está colgado en «%s» (abortar con "
 "CTRL-C)!\n"
 
-#: src/util/os_installation.c:501
+#: src/util/os_installation.c:509
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
@@ -8896,22 +9040,22 @@ msgstr ""
 "No se pudo determinar la ruta de instalación de %s.  Establezca la variable "
 "de entorno «%s».\n"
 
-#: src/util/os_installation.c:873
+#: src/util/os_installation.c:881
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "¡No se pudo encontrar el programa llamado «%s» en PATH!\n"
 
-#: src/util/os_installation.c:913
+#: src/util/os_installation.c:922
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
 
-#: src/util/os_installation.c:944
+#: src/util/os_installation.c:953
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "«%s» falló para el puerto %d (%s).\n"
 
-#: src/util/os_installation.c:954
+#: src/util/os_installation.c:963
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8941,7 +9085,7 @@ msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:223
+#: src/util/resolver_api.c:224
 #, fuzzy, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
@@ -8950,12 +9094,12 @@ msgstr ""
 "¡Se debe especificar «%s» o una dirección numérica IP para «%s» de «%s» en "
 "la configuración!\n"
 
-#: src/util/resolver_api.c:827
+#: src/util/resolver_api.c:851
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Expiración de plazo intentando resolver el nombre de máquina «%s».\n"
 
-#: src/util/resolver_api.c:840
+#: src/util/resolver_api.c:864
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "Expiración de plazo intentando resolver la dirección IP «%s».\n"
@@ -8963,13 +9107,13 @@ msgstr "Expiración de plazo intentando resolver la 
dirección IP «%s».\n"
 # Miguel: He traducido "default" por "predeterminado", la locución
 # "por defecto" no tiene sentido en sitios como este y he tratado
 # de ser consistente.
-#: src/util/resolver_api.c:1024
+#: src/util/resolver_api.c:1048
 #, fuzzy
 msgid "Resolver not configured correctly.\n"
 msgstr "¡El servicio predeterminado «%s» no está configurado correctamente!\n"
 
-#: src/util/resolver_api.c:1110 src/util/resolver_api.c:1133
-#: src/util/resolver_api.c:1147
+#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157
+#: src/util/resolver_api.c:1171
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr ""
@@ -8980,7 +9124,7 @@ msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/service.c:2091
+#: src/util/service.c:2093
 #, fuzzy, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9059,67 +9203,67 @@ msgstr "días"
 msgid "end of time"
 msgstr "fin del plazo"
 
-#: src/util/strings.c:1270
+#: src/util/strings.c:1272
 msgid "IPv6 address did not start with `['\n"
 msgstr "La dirección IPv6 no empezaba con «[»\n"
 
-#: src/util/strings.c:1278
+#: src/util/strings.c:1280
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr "La dirección IPv6 contenía «:» para separar el número de puerto\n"
 
-#: src/util/strings.c:1284
+#: src/util/strings.c:1286
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 "La dirección IPv6 contenía «]» antes de «:» para separar el número de "
 "puerto\n"
 
-#: src/util/strings.c:1291
+#: src/util/strings.c:1293
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 "La dirección IPv6 contenía un número de puerto válido después del último "
 "«:»\n"
 
-#: src/util/strings.c:1300
+#: src/util/strings.c:1302
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Dirección IPv6 «%s» no válida: %s\n"
 
-#: src/util/strings.c:1572 src/util/strings.c:1588
+#: src/util/strings.c:1574 src/util/strings.c:1590
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1597
+#: src/util/strings.c:1599
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/util/strings.c:1680 src/util/strings.c:1711 src/util/strings.c:1759
-#: src/util/strings.c:1780
+#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761
+#: src/util/strings.c:1782
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: «%s»\n"
 
-#: src/util/strings.c:1737
+#: src/util/strings.c:1739
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Notación de red no válida («/%d» no es válido en IPv4 CIDR)."
 
-#: src/util/strings.c:1789
+#: src/util/strings.c:1791
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/util/strings.c:1841
+#: src/util/strings.c:1843
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Notación de red no válida (no termina con «;»: «%s»)\n"
 
-#: src/util/strings.c:1891
+#: src/util/strings.c:1893
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Formato «%s» erroneo para máscara de red\n"
 
-#: src/util/strings.c:1922
+#: src/util/strings.c:1924
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato «%s» erroneo para red\n"
@@ -9300,26 +9444,70 @@ msgstr "el servicio es ofrecido vía UDP"
 msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
 
-#: src/zonemaster/gnunet-service-zonemaster.c:706
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
+#: src/zonemaster/gnunet-service-zonemaster.c:838
 msgid "Failed to connect to the namestore!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/include/gnunet_common.h:689 src/include/gnunet_common.h:696
-#: src/include/gnunet_common.h:706 src/include/gnunet_common.h:714
+#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773
+#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Aserción fallida en %s:%d.\n"
 
-#: src/include/gnunet_common.h:726
+#: src/include/gnunet_common.h:803
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Violación externa del protocolo detectada en %s:%d.\n"
 
-#: src/include/gnunet_common.h:753 src/include/gnunet_common.h:762
+#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 
+#~ msgid "PUT request sent with key"
+#~ msgstr "Petición «PUT» enviada con clave"
+
+#~ msgid "Timeout sending PUT request!\n"
+#~ msgstr "¡Expiró el plazo enviando una petición «PUT»!\n"
+
+#~ msgid "PUT request not confirmed!\n"
+#~ msgstr "¡Petición «PUT» no confirmada!\n"
+
+#~ msgid "Could not connect to %s service!\n"
+#~ msgstr "¡No se pudo conectar al servicio %s!\n"
+
+#~ msgid "Configured DNS exit `%s' is not working / valid.\n"
+#~ msgstr "La salida DNS configurada «%s» no funciona o no es válida.\n"
+
+#, fuzzy
+#~ msgid "No valid GNS zone specified!\n"
+#~ msgstr "¡Ninguna palabra clave especificada!\n"
+
+#~ msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
+#~ msgstr ""
+#~ "Sufijo FCFS autoritativo a usar (opcional); predeterminado: fcfs.zkey.eu"
+
+#~ msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+#~ msgstr "Sufijo DNS autoritativo a usar (opcional); predeterminado: zkey.eu"
+
+#, fuzzy
+#~ msgid "Specify timeout for the lookup"
+#~ msgstr "Especificar el tipo del registro a buscar"
+
+#, fuzzy
+#~ msgid "Specify the name of the ego of the zone to lookup the record in"
+#~ msgstr "Especificar el tipo del registro a buscar"
+
+#, fuzzy
+#~ msgid "No ego configured for `%s`\n"
+#~ msgstr ""
+#~ "Ningún puerto fue configurado para el módulo «%s», no se puede probar\n"
+
+#, fuzzy
+#~ msgid "Token `%s' is malformed\n"
+#~ msgstr "El bloque del tipo %u está mal formado\n"
+
 #~ msgid "Failed to create indices\n"
 #~ msgstr "Se produjo un fallo al crear los índices\n"
 
@@ -10016,10 +10204,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #~ msgid "Insufficient space for publishing: %s"
 #~ msgstr "Espacio insuficiente para publicar: %s"
 
-#, fuzzy
-#~ msgid "valid public key required"
-#~ msgstr "Tipo requerido\n"
-
 #~ msgid "Failed to create or access directory for log file `%s'\n"
 #~ msgstr ""
 #~ "Se produjo un fallo al crear o acceder al directorio para el fichero de "
@@ -11845,9 +12029,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #~ "Usuario desconocido «%s». Asegurese de especificar su sufíjo numérico, en "
 #~ "el caso de que lo haya.\n"
 
-#~ msgid "how long to execute? 0 = forever"
-#~ msgstr "¿cuánto tiempo se debe ejecutar? 0 = para siempre"
-
 #~ msgid "Lookup a record using GNS (NOT IMPLEMENTED)"
 #~ msgstr "Busca un registro usando GNS (NO IMPLEMENTADO)"
 
diff --git a/po/fr.po b/po/fr.po
index e8cb28897..9789dc314 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: address@hidden"
-"POT-Creation-Date: 2018-01-02 02:33+0100\n"
+"POT-Creation-Date: 2018-06-04 23:27+0200\n"
 "PO-Revision-Date: 2015-12-24 01:20+0100\n"
 "Last-Translator: Stéphane  Aulery <address@hidden>\n"
 "Language-Team: French <address@hidden>\n"
@@ -230,7 +230,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3824
+#: src/transport/plugin_transport_tcp.c:3825
 #: src/transport/tcp_service_legacy.c:576
 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
 #: src/util/service.c:643
@@ -239,14 +239,14 @@ msgid "Require valid port number for service `%s' in 
configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176
-#: src/transport/tcp_service_legacy.c:613 src/util/client.c:505
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506
 #: src/util/service.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
-#: src/transport/tcp_service_legacy.c:617 src/util/client.c:510
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511
 #: src/util/service.c:687
 #, c-format
 msgid "Using `%s' instead\n"
@@ -348,131 +348,14 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939
-msgid "solver to use"
-msgstr "solveur utilisé"
-
-#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945
-#: src/ats-tests/gnunet-solver-eval.c:950
-msgid "experiment to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3306
-msgid "print logging"
-msgstr "afficher le journal"
-
-#: src/ats/gnunet-ats-solver-eval.c:3311
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3316
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:304
-#, 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:314
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:359
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:451
-#, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1274
-msgid "Problem size too large, cannot allocate memory!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1869
-#, c-format
-msgid "Adding address for peer `%s' multiple times\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1913
-#, c-format
-msgid "Updating address property for peer `%s' %p not added before\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2475
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
-#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
-#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
-#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
-#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
-#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
-#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "fornat invalide : « %s »\n"
-
-#: src/ats/plugin_ats_mlp.c:2670
-#, c-format
-msgid ""
-"Adjusting inconsistent outbound quota configuration for network `%s', is "
-"%llu must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2679
-#, c-format
-msgid ""
-"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
-"must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2689
-#, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr ""
+#: src/ats-tests/ats-testing-log.c:837
+msgid "Stop logging\n"
+msgstr "Arrêter la journalisation\n"
 
-#: src/ats/plugin_ats_mlp.c:2698
+#: src/ats-tests/ats-testing-log.c:892
 #, c-format
-msgid ""
-"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1164
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr "fornat invalide : « %s »\n"
+msgid "Start logging `%s'\n"
+msgstr "Démarrer la journalisation « %s »\n"
 
 #: src/ats-tests/ats-testing.c:422
 #, c-format
@@ -484,15 +367,6 @@ msgstr ""
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:837
-msgid "Stop logging\n"
-msgstr "Arrêter la journalisation\n"
-
-#: src/ats-tests/ats-testing-log.c:892
-#, c-format
-msgid "Start logging `%s'\n"
-msgstr "Démarrer la journalisation « %s »\n"
-
 #: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
@@ -500,6 +374,15 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
+#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294
+msgid "solver to use"
+msgstr "solveur utilisé"
+
+#: src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299
+msgid "experiment to use"
+msgstr ""
+
 #: src/ats-tool/gnunet-ats.c:307
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -615,6 +498,123 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr ""
 
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3306
+msgid "print logging"
+msgstr "afficher le journal"
+
+#: src/ats/gnunet-ats-solver-eval.c:3311
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3316
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:304
+#, 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:314
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:359
+#, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:451
+#, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1274
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1869
+#, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1913
+#, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2475
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
+#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
+#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
+#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
+#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/ats/plugin_ats_mlp.c:2670
+#, c-format
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2679
+#, c-format
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2689
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2698
+#, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_proportional.c:1164
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f\n"
+msgstr "fornat invalide : « %s »\n"
+
 #: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
@@ -748,288 +748,288 @@ msgstr ""
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:513
-#: src/conversation/conversation_api_call.c:490
+#: src/conversation/conversation_api.c:515
+#: src/conversation/conversation_api_call.c:494
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:269
+#: src/conversation/gnunet-conversation-test.c:119
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:145
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:210
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:270
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:294
+#: src/conversation/gnunet-conversation.c:295
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:329
+#: src/conversation/gnunet-conversation.c:330
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:334
+#: src/conversation/gnunet-conversation.c:335
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:352
+#: src/conversation/gnunet-conversation.c:353
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:367
+#: src/conversation/gnunet-conversation.c:368
 msgid "Failed to setup phone (internal error)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:379
+#: src/conversation/gnunet-conversation.c:380
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:401
+#: src/conversation/gnunet-conversation.c:404
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:408
+#: src/conversation/gnunet-conversation.c:411
 #, c-format
 msgid "Connection established to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:415
+#: src/conversation/gnunet-conversation.c:418
 #, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Résolution de « %s » échouée\n"
 
-#: src/conversation/gnunet-conversation.c:423
+#: src/conversation/gnunet-conversation.c:426
 #, fuzzy, c-format
 msgid "Call to `%s' terminated\n"
 msgstr "Appel terminé\n"
 
-#: src/conversation/gnunet-conversation.c:432
+#: src/conversation/gnunet-conversation.c:435
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:438
+#: src/conversation/gnunet-conversation.c:441
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:443
+#: src/conversation/gnunet-conversation.c:446
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:512
+#: src/conversation/gnunet-conversation.c:517
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Commande « %s » inconnue\n"
 
-#: src/conversation/gnunet-conversation.c:528
-#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:533
+#: src/conversation/gnunet-conversation.c:547
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:535
-#: src/conversation/gnunet-conversation.c:592
+#: src/conversation/gnunet-conversation.c:540
+#: src/conversation/gnunet-conversation.c:596
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:550
-#: src/conversation/gnunet-conversation.c:605
+#: src/conversation/gnunet-conversation.c:555
+#: src/conversation/gnunet-conversation.c:609
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:560
+#: src/conversation/gnunet-conversation.c:565
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:620
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:633
+#: src/conversation/gnunet-conversation.c:637
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:663
+#: src/conversation/gnunet-conversation.c:668
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:686
+#: src/conversation/gnunet-conversation.c:692
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:691
+#: src/conversation/gnunet-conversation.c:697
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:697
-#: src/conversation/gnunet-conversation.c:721
+#: src/conversation/gnunet-conversation.c:703
+#: src/conversation/gnunet-conversation.c:727
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:702
+#: src/conversation/gnunet-conversation.c:708
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:711
+#: src/conversation/gnunet-conversation.c:717
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:716
+#: src/conversation/gnunet-conversation.c:722
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:735
+#: src/conversation/gnunet-conversation.c:741
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:741
+#: src/conversation/gnunet-conversation.c:747
 #, c-format
 msgid "#%u: `%s'\n"
 msgstr "#%u : « %s »\n"
 
-#: src/conversation/gnunet-conversation.c:769
-#: src/conversation/gnunet-conversation.c:784
+#: src/conversation/gnunet-conversation.c:776
+#: src/conversation/gnunet-conversation.c:791
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:817
-#: src/conversation/gnunet-conversation.c:833
+#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:840
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:840
+#: src/conversation/gnunet-conversation.c:847
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:849
+#: src/conversation/gnunet-conversation.c:856
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:866
+#: src/conversation/gnunet-conversation.c:873
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:901
+#: src/conversation/gnunet-conversation.c:908
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:909
+#: src/conversation/gnunet-conversation.c:916
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:926
+#: src/conversation/gnunet-conversation.c:933
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:952
+#: src/conversation/gnunet-conversation.c:959
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:954
+#: src/conversation/gnunet-conversation.c:961
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:956
+#: src/conversation/gnunet-conversation.c:963
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:958
+#: src/conversation/gnunet-conversation.c:965
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:960
+#: src/conversation/gnunet-conversation.c:967
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:962
+#: src/conversation/gnunet-conversation.c:969
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:964
+#: src/conversation/gnunet-conversation.c:971
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:966
+#: src/conversation/gnunet-conversation.c:973
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:968
+#: src/conversation/gnunet-conversation.c:975
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1172
+#: src/conversation/gnunet-conversation.c:1191
 #, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1185
+#: src/conversation/gnunet-conversation.c:1204
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1220
+#: src/conversation/gnunet-conversation.c:1242
 msgid "You must specify the NAME of an ego to use\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1244
+#: src/conversation/gnunet-conversation.c:1266
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1273
-msgid "sets the NAME of the ego to use for the phone (and name resolution)"
+#: src/conversation/gnunet-conversation.c:1295
+msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1279
+#: src/conversation/gnunet-conversation.c:1300
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1306
+#: src/conversation/gnunet-conversation.c:1329
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:119
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:145
-#, c-format
-msgid ""
-"\n"
-"We are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:210
-#, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
-msgstr ""
-
-#: src/conversation/gnunet_gst.c:622
 #: src/conversation/gnunet-helper-audio-playback-gst.c:361
+#: src/conversation/gnunet_gst.c:622
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1264,127 +1264,135 @@ msgstr ""
 msgid "Core service of `%s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:566
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:626
+#: src/core/gnunet-service-core_kx.c:677
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:728
+#: src/core/gnunet-service-core_kx.c:779
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:778
+#: src/core/gnunet-service-core_kx.c:829
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:840
+#: src/core/gnunet-service-core_kx.c:891
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:874
+#: src/core/gnunet-service-core_kx.c:925
 msgid "# PING messages transmitted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:941
+#: src/core/gnunet-service-core_kx.c:992
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:948
-msgid "# ephemeral keys received"
+#: src/core/gnunet-service-core_kx.c:1005
+msgid "# duplicate ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:987
+#: src/core/gnunet-service-core_kx.c:1040
+msgid "# EPHEMERAL_KEYs rejected (bad signature)"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1054
 #, c-format
 msgid ""
-"Ephemeral key message from peer `%s' rejected as its validity range does not "
-"match our system time (%llu not in [%llu,%llu]).\n"
+"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match "
+"our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:998
-msgid "# EPHEMERAL_KEY messages received"
+#: src/core/gnunet-service-core_kx.c:1060
+msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1094
+#: src/core/gnunet-service-core_kx.c:1080
+msgid "# valid ephemeral keys received"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1180
 #: src/transport/gnunet-service-transport_validation.c:1128
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1103
+#: src/core/gnunet-service-core_kx.c:1189
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1161
+#: src/core/gnunet-service-core_kx.c:1248
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1187
+#: src/core/gnunet-service-core_kx.c:1274
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1200
+#: src/core/gnunet-service-core_kx.c:1287
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1264
+#: src/core/gnunet-service-core_kx.c:1351
 #: src/transport/gnunet-service-transport_validation.c:1461
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1271
+#: src/core/gnunet-service-core_kx.c:1358
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1363
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1311
+#: src/core/gnunet-service-core_kx.c:1398
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1349
+#: src/core/gnunet-service-core_kx.c:1436
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1360
+#: src/core/gnunet-service-core_kx.c:1447
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1367
+#: src/core/gnunet-service-core_kx.c:1454
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/core/gnunet-service-core_kx.c:1642
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1529
+#: src/core/gnunet-service-core_kx.c:1650
 #, 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:1532
+#: src/core/gnunet-service-core_kx.c:1653
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1593
-#: src/core/gnunet-service-core_kx.c:1619
+#: src/core/gnunet-service-core_kx.c:1742
+#: src/core/gnunet-service-core_kx.c:1768
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1606
+#: src/core/gnunet-service-core_kx.c:1755
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1648
+#: src/core/gnunet-service-core_kx.c:1797
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1656
+#: src/core/gnunet-service-core_kx.c:1805
 msgid "# bytes of payload decrypted"
 msgstr ""
 
@@ -1392,11 +1400,11 @@ msgstr ""
 #: src/core/gnunet-service-core_sessions.c:350
 #: src/dht/gnunet-service-dht_neighbours.c:733
 #: src/dht/gnunet-service-dht_neighbours.c:795
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520
-#: src/topology/gnunet-daemon-topology.c:612
-#: src/topology/gnunet-daemon-topology.c:714
-#: src/transport/gnunet-service-transport_neighbours.c:719
-#: src/transport/gnunet-service-transport_neighbours.c:727
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522
+#: src/topology/gnunet-daemon-topology.c:617
+#: src/topology/gnunet-daemon-topology.c:719
+#: src/transport/gnunet-service-transport_neighbours.c:721
+#: src/transport/gnunet-service-transport_neighbours.c:729
 msgid "# peers connected"
 msgstr ""
 
@@ -1421,52 +1429,180 @@ msgstr ""
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:119 src/datacache/datacache.c:294
+#: src/credential/credential_misc.c:88
+#, c-format
+msgid "Unable to parse CRED record string `%s'\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888
+#: src/namestore/plugin_rest_namestore.c:1022
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:280
+#: src/credential/gnunet-credential.c:434
+#, c-format
+msgid "Issuer public key `%s' is not well-formed\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:361
+#: src/credential/gnunet-credential.c:423
+#, c-format
+msgid "Issuer public key not well-formed\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:372
+#: src/credential/gnunet-credential.c:444
+#, fuzzy, c-format
+msgid "Failed to connect to CREDENTIAL\n"
+msgstr "Impossible d’ouvrir « %s ».\n"
+
+#: src/credential/gnunet-credential.c:379
+#, c-format
+msgid "You must provide issuer the attribute\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:387
+#, c-format
+msgid "ego required\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:403
+#, c-format
+msgid "Subject public key needed\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:414
+#, c-format
+msgid "Subject public key `%s' is not well-formed\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:451
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:504
+#, c-format
+msgid "Issuer ego required\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:516
+#, c-format
+msgid "Please specify name to lookup, subject key and issuer key!\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:536
+msgid "create credential"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:540
+msgid "verify credential against attribute"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:545
+msgid "The public key of the subject to lookup the credential for"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:550
+msgid "The name of the credential presented by the subject"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:555
+msgid "The public key of the authority to verify the credential against"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:560
+msgid "The ego to use"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:565
+msgid "The issuer attribute to verify against or to issue"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:570
+msgid "The time to live for the credential"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:574
+msgid "collect credentials"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:588
+msgid "GNUnet credential resolver tool"
+msgstr ""
+
+#: src/credential/gnunet-service-credential.c:1138
+#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184
+#, c-format
+msgid "Failed to connect to GNS\n"
+msgstr ""
+
+#: src/credential/gnunet-service-credential.c:1144
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
+#: src/namestore/gnunet-namestore.c:914
+#: src/namestore/plugin_rest_namestore.c:1035
+#, c-format
+msgid "Failed to connect to namestore\n"
+msgstr ""
+
+#: src/credential/plugin_gnsrecord_credential.c:186
+#, fuzzy, c-format
+msgid "Unable to parse ATTR record string `%s'\n"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669
+msgid "GNS REST API initialized\n"
+msgstr ""
+
+#: src/datacache/datacache.c:119 src/datacache/datacache.c:311
 #: src/datastore/gnunet-service-datastore.c:757
 msgid "# bytes stored"
 msgstr ""
 
-#: src/datacache/datacache.c:123 src/datacache/datacache.c:298
+#: src/datacache/datacache.c:123 src/datacache/datacache.c:315
 msgid "# items stored"
 msgstr ""
 
-#: src/datacache/datacache.c:202
+#: src/datacache/datacache.c:206
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:213
+#: src/datacache/datacache.c:217
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:329
+#: src/datacache/datacache.c:344
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:339
+#: src/datacache/datacache.c:354
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/datacache.c:367
+#: src/datacache/datacache.c:384
 msgid "# requests for random value received"
 msgstr ""
 
-#: src/datacache/datacache.c:399
+#: src/datacache/datacache.c:416
 msgid "# proximity search requests received"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:466
+#: src/datacache/plugin_datacache_heap.c:550
 msgid "Heap datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:113
-#: src/datacache/plugin_datacache_sqlite.c:122
+#: src/datacache/plugin_datacache_sqlite.c:118
+#: src/datacache/plugin_datacache_sqlite.c:127
 #: src/datastore/plugin_datastore_mysql.c:892
 #: src/datastore/plugin_datastore_sqlite.c:58
-#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92
-#: src/mysql/mysql.c:42 src/mysql/mysql.c:49
-#: src/namecache/plugin_namecache_sqlite.c:53
+#: src/datastore/plugin_datastore_sqlite.c:66
+#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80
+#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49
+#: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_sqlite.c:53
 #: src/peerstore/plugin_peerstore_sqlite.c:52
 #: src/psycstore/plugin_psycstore_mysql.c:62
@@ -1475,16 +1611,17 @@ msgstr ""
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:735 src/include/gnunet_common.h:744
+#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:817
-#: src/datastore/plugin_datastore_sqlite.c:456
-#: src/namecache/plugin_namecache_sqlite.c:296
-#: src/namestore/plugin_namestore_sqlite.c:355
+#: src/datacache/plugin_datacache_sqlite.c:862
+#: src/datastore/plugin_datastore_sqlite.c:508
+#: src/identity-provider/plugin_identity_provider_sqlite.c:336
+#: src/namecache/plugin_namecache_sqlite.c:329
+#: src/namestore/plugin_namestore_sqlite.c:264
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1770,7 +1907,7 @@ msgid "MySQL statement run failure"
 msgstr ""
 
 #: src/datastore/plugin_datastore_mysql.c:410
-#: src/datastore/plugin_datastore_sqlite.c:626
+#: src/datastore/plugin_datastore_sqlite.c:678
 msgid "Data too large"
 msgstr ""
 
@@ -1807,32 +1944,34 @@ msgid "`%s' failed at %s:%u with error: %s"
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:271
-#: src/namecache/plugin_namecache_sqlite.c:194
-#: src/namestore/plugin_namestore_sqlite.c:222
+#: src/identity-provider/plugin_identity_provider_sqlite.c:212
+#: src/namecache/plugin_namecache_sqlite.c:209
+#: src/namestore/plugin_namestore_sqlite.c:205
 #: src/peerstore/plugin_peerstore_sqlite.c:535
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:577
+#: src/datastore/plugin_datastore_sqlite.c:629
 msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1259
+#: src/datastore/plugin_datastore_sqlite.c:1322
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1293
+#: src/datastore/plugin_datastore_sqlite.c:1356
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1337
-#: src/namecache/plugin_namecache_sqlite.c:603
-#: src/namestore/plugin_namestore_sqlite.c:802
+#: src/datastore/plugin_datastore_sqlite.c:1400
+#: src/identity-provider/plugin_identity_provider_sqlite.c:711
+#: src/namecache/plugin_namecache_sqlite.c:640
+#: src/namestore/plugin_namestore_sqlite.c:754
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -1840,7 +1979,7 @@ msgstr ""
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:157
+#: src/dht/gnunet-dht-get.c:158
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -1849,148 +1988,98 @@ msgstr ""
 "Resultat %d, type %d :\n"
 "%.*s\n"
 
+#: src/dht/gnunet-dht-get.c:159
+#, fuzzy, c-format
+msgid "Result %d, type %d:\n"
+msgstr ""
+"Resultat %d, type %d :\n"
+"%.*s\n"
+
 #: src/dht/gnunet-dht-get.c:204
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257
 msgid "Failed to connect to DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:218
+#: src/dht/gnunet-dht-get.c:219
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:222
+#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307
+#: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:251
+#: src/dht/gnunet-dht-get.c:253
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304
+#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:264
+#: src/dht/gnunet-dht-get.c:263
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227
+#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:283
+#: src/dht/gnunet-dht-get.c:280
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:310
+#: src/dht/gnunet-dht-monitor.c:319
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344
-#: src/nse/gnunet-nse-profiler.c:871
+#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372
+#: src/nse/gnunet-nse-profiler.c:878
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:328
+#: src/dht/gnunet-dht-monitor.c:337
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:253
-#, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1188
-#, fuzzy
-msgid "number of peers to start"
-msgstr "nombre de valeurs"
-
-#: src/dht/gnunet_dht_profiler.c:1194
-msgid ""
-"maximum number of times we try to search for successor circle formation (0 "
-"for R5N)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853
-#: src/testbed/gnunet-testbed-profiler.c:304
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1206
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1212
-msgid "delay to start doing PUTs (default: 1 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1218
-msgid "delay to start doing GETs (default: 5 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1223
-msgid "replication degree for DHT PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1230
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1248
-msgid "Measure quality and performance of the DHT service."
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:120
-msgid "PUT request sent with key"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:123
-msgid "Timeout sending PUT request!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:126
-msgid "PUT request not confirmed!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:156
+#: src/dht/gnunet-dht-put.c:134
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:163
-#, c-format
-msgid "Could not connect to %s service!\n"
-msgstr ""
+#: src/dht/gnunet-dht-put.c:142
+#, fuzzy
+msgid "Could not connect to DHT service!\n"
+msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/dht/gnunet-dht-put.c:174
+#: src/dht/gnunet-dht-put.c:153
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-put.c:188
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:216
+#: src/dht/gnunet-dht-put.c:193
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:233
+#: src/dht/gnunet-dht-put.c:207
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:238
+#: src/dht/gnunet-dht-put.c:211
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:244
+#: src/dht/gnunet-dht-put.c:216
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:262
+#: src/dht/gnunet-dht-put.c:233
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
@@ -1998,74 +2087,74 @@ msgstr ""
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:485
+#: src/dht/gnunet-service-dht_clients.c:483
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:624
+#: src/dht/gnunet-service-dht_clients.c:616
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:850
+#: src/dht/gnunet-service-dht_clients.c:842
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1035
+#: src/dht/gnunet-service-dht_clients.c:1027
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1050
+#: src/dht/gnunet-service-dht_clients.c:1042
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1096
+#: src/dht/gnunet-service-dht_clients.c:1088
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1103
+#: src/dht/gnunet-service-dht_clients.c:1095
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1181
+#: src/dht/gnunet-service-dht_clients.c:1173
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:72
+#: src/dht/gnunet-service-dht_datacache.c:73
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:82
+#: src/dht/gnunet-service-dht_datacache.c:83
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:198
+#: src/dht/gnunet-service-dht_datacache.c:202
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:210
+#: src/dht/gnunet-service-dht_datacache.c:214
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:216
+#: src/dht/gnunet-service-dht_datacache.c:220
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:222
+#: src/dht/gnunet-service-dht_datacache.c:226
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-dht_datacache.c:238
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:242
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:273
+#: src/dht/gnunet-service-dht_datacache.c:277
 msgid "# GET requests given to datacache"
 msgstr ""
 
@@ -2193,16 +2282,63 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:187
+#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
+#, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:949
+#, fuzzy
+msgid "number of peers to start"
+msgstr "nombre de valeurs"
+
+#: src/dht/gnunet_dht_profiler.c:954
+msgid "number of PUTs to perform per peer"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
+#: src/testbed/gnunet-testbed-profiler.c:304
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:964
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:969
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:974
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:979
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:984
+msgid "chance that a peer is selected at random for PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:989
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1009
+msgid "Measure quality and performance of the DHT service."
+msgstr ""
+
+#: src/dht/plugin_block_dht.c:189
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:194
+#: src/dht/plugin_block_dht.c:198
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:204
+#: src/dht/plugin_block_dht.c:209
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2212,34 +2348,29 @@ msgstr ""
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:818
+#: src/dns/dnsparser.c:823
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:176
+#: src/dns/dnsstub.c:233
 #, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382
-#, c-format
-msgid "Failed to send DNS request to %s\n"
-msgstr ""
-
-#: src/dns/dnsstub.c:298
+#: src/dns/dnsstub.c:364
 #, c-format
-msgid "Sent DNS request to %s\n"
+msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/dnsstub.c:367
-#, c-format
-msgid "Configured DNS exit `%s' is not working / valid.\n"
-msgstr ""
+#: src/dns/dnsstub.c:511
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/dns/dnsstub.c:437
+#: src/dns/dnsstub.c:517
 #, c-format
-msgid "Received DNS response that is too small (%u bytes)"
+msgid "Sent DNS request to %s\n"
 msgstr ""
 
 #: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
@@ -2266,48 +2397,48 @@ msgstr ""
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:608
+#: src/dns/gnunet-service-dns.c:610
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:738
+#: src/dns/gnunet-service-dns.c:740
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:813
+#: src/dns/gnunet-service-dns.c:815
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:928
+#: src/dns/gnunet-service-dns.c:930
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:944
+#: src/dns/gnunet-service-dns.c:946
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:953
+#: src/dns/gnunet-service-dns.c:955
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:963
+#: src/dns/gnunet-service-dns.c:965
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:965
+#: src/dns/gnunet-service-dns.c:967
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1032
+#: src/dns/gnunet-service-dns.c:1034
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569
+#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1090
+#: src/dns/gnunet-service-dns.c:1092
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
@@ -2316,198 +2447,198 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:961
+#: src/exit/gnunet-daemon-exit.c:960
 msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1062
+#: src/exit/gnunet-daemon-exit.c:1061
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1341
+#: src/exit/gnunet-daemon-exit.c:1340
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573
-#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702
-#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954
-#: src/exit/gnunet-daemon-exit.c:2208
+#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572
+#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701
+#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953
+#: src/exit/gnunet-daemon-exit.c:2207
 msgid "# Bytes received from CADET"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1468
+#: src/exit/gnunet-daemon-exit.c:1467
 msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1576
+#: src/exit/gnunet-daemon-exit.c:1575
 msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1616
+#: src/exit/gnunet-daemon-exit.c:1615
 msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1705
+#: src/exit/gnunet-daemon-exit.c:1704
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1789
+#: src/exit/gnunet-daemon-exit.c:1788
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1826
+#: src/exit/gnunet-daemon-exit.c:1825
 msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1957
+#: src/exit/gnunet-daemon-exit.c:1956
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280
-#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828
+#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279
+#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828
 #: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339
-#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887
+#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338
+#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887
 #: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2211
+#: src/exit/gnunet-daemon-exit.c:2210
 msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985
+#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985
 #: src/vpn/gnunet-service-vpn.c:2096
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875
+#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875
 #: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069
+#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068
 msgid "# Inbound CADET channels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2523
+#: src/exit/gnunet-daemon-exit.c:2522
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2542
+#: src/exit/gnunet-daemon-exit.c:2541
 msgid "# Messages transmitted via cadet channels"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2720
+#: src/exit/gnunet-daemon-exit.c:2719
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2728
+#: src/exit/gnunet-daemon-exit.c:2727
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2802
+#: src/exit/gnunet-daemon-exit.c:2801
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2874
+#: src/exit/gnunet-daemon-exit.c:2873
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2922
+#: src/exit/gnunet-daemon-exit.c:2921
 msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2936
+#: src/exit/gnunet-daemon-exit.c:2935
 msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2962
+#: src/exit/gnunet-daemon-exit.c:2961
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2989
+#: src/exit/gnunet-daemon-exit.c:2988
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3035
+#: src/exit/gnunet-daemon-exit.c:3034
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3043
+#: src/exit/gnunet-daemon-exit.c:3042
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256
+#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278
+#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3319
+#: src/exit/gnunet-daemon-exit.c:3318
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346
+#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3358
+#: src/exit/gnunet-daemon-exit.c:3357
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3503
+#: src/exit/gnunet-daemon-exit.c:3501
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3511
+#: src/exit/gnunet-daemon-exit.c:3509
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3518
+#: src/exit/gnunet-daemon-exit.c:3516
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3524
+#: src/exit/gnunet-daemon-exit.c:3522
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3694
+#: src/exit/gnunet-daemon-exit.c:3690
 msgid "Must be a number"
 msgstr "Doit être un nombre"
 
-#: src/exit/gnunet-daemon-exit.c:3809
+#: src/exit/gnunet-daemon-exit.c:3805
 #, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204
+#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3970
+#: src/exit/gnunet-daemon-exit.c:3966
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2633,63 +2764,63 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:309
+#: src/fs/fs_download.c:310
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:334
+#: src/fs/fs_download.c:335
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:346
+#: src/fs/fs_download.c:347
 #, c-format
 msgid ""
 "Failed to access full directroy contents of `%s' for recursive download\n"
 msgstr ""
 
-#: src/fs/fs_download.c:533 src/fs/fs_download.c:545
+#: src/fs/fs_download.c:534 src/fs/fs_download.c:546
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr ""
 
-#: src/fs/fs_download.c:955
+#: src/fs/fs_download.c:956
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1046
+#: src/fs/fs_download.c:1047
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1074
+#: src/fs/fs_download.c:1075
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1098
+#: src/fs/fs_download.c:1099
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1110
+#: src/fs/fs_download.c:1111
 #, 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:1120
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1219
+#: src/fs/fs_download.c:1220
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1884
+#: src/fs/fs_download.c:1885
 msgid "Invalid URI"
 msgstr "URI invalide"
 
@@ -2802,12 +2933,12 @@ msgstr ""
 msgid "Internal error."
 msgstr "Erreur interne."
 
-#: src/fs/fs_search.c:809 src/fs/fs_search.c:879
+#: src/fs/fs_search.c:822 src/fs/fs_search.c:892
 #, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_search.c:966
+#: src/fs/fs_search.c:979
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2854,93 +2985,93 @@ msgstr ""
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/fs_uri.c:223
+#: src/fs/fs_uri.c:234
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:282
+#: src/fs/fs_uri.c:293
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:300
+#: src/fs/fs_uri.c:311
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:307
+#: src/fs/fs_uri.c:318
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:377
+#: src/fs/fs_uri.c:388
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:418
+#: src/fs/fs_uri.c:429
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:433
+#: src/fs/fs_uri.c:444
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:512
+#: src/fs/fs_uri.c:523
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:527
+#: src/fs/fs_uri.c:538
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:537
+#: src/fs/fs_uri.c:548
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545
+#: src/fs/fs_uri.c:556
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:553
+#: src/fs/fs_uri.c:564
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:559
+#: src/fs/fs_uri.c:570
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:565
+#: src/fs/fs_uri.c:576
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:574
+#: src/fs/fs_uri.c:585
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:580
+#: src/fs/fs_uri.c:591
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
+#: src/fs/fs_uri.c:597
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:609
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:632
+#: src/fs/fs_uri.c:643
 #, fuzzy
 msgid "invalid argument"
 msgstr "Argument invalide « %s »\n"
 
-#: src/fs/fs_uri.c:644
+#: src/fs/fs_uri.c:655
 msgid "Unrecognized URI type"
 msgstr "Type d’URI non reconnu"
 
-#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075
+#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1081
+#: src/fs/fs_uri.c:1092
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2980,19 +3111,19 @@ msgstr ""
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949
+#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962
+#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -3037,101 +3168,93 @@ msgstr ""
 msgid "Display contents of a GNUnet directory"
 msgstr ""
 
-#: src/fs/gnunet-download.c:137
+#: src/fs/gnunet-download.c:139
 #, c-format
 msgid "Starting download `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:147
+#: src/fs/gnunet-download.c:149
 msgid "<unknown time>"
 msgstr ""
 
-#: src/fs/gnunet-download.c:157
+#: src/fs/gnunet-download.c:158
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:179
+#: src/fs/gnunet-download.c:184
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:194
+#: src/fs/gnunet-download.c:201
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
+#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295
 #: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:246
 msgid "You need to specify a URI argument.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726
+#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:264
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:273
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
+#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870
 #: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:311
+#: src/fs/gnunet-download.c:344
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319
+#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:322
+#: src/fs/gnunet-download.c:354
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:328
+#: src/fs/gnunet-download.c:359
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:334
+#: src/fs/gnunet-download.c:364
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:339
-msgid "download a GNUnet directory recursively"
-msgstr ""
-
-#: src/fs/gnunet-download.c:356
-msgid ""
-"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
-"chk/...)"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:119
-msgid "print a list of all indexed files"
+#: src/fs/gnunet-download.c:368
+msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:130
-msgid "Special file-sharing operations"
+#: src/fs/gnunet-download.c:386
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
 msgstr ""
 
 #: src/fs/gnunet-fs-profiler.c:211
@@ -3150,6 +3273,14 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
+#: src/fs/gnunet-fs.c:119
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:130
+msgid "Special file-sharing operations"
+msgstr ""
+
 #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -3279,56 +3410,56 @@ msgstr ""
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:916
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:923
+#: src/fs/gnunet-publish.c:919
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:930
+#: src/fs/gnunet-publish.c:925
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:935
+#: src/fs/gnunet-publish.c:930
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:942
+#: src/fs/gnunet-publish.c:937
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:955
+#: src/fs/gnunet-publish.c:950
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:968
+#: src/fs/gnunet-publish.c:960
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:975
+#: src/fs/gnunet-publish.c:966
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:982
+#: src/fs/gnunet-publish.c:973
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:998
+#: src/fs/gnunet-publish.c:989
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3400,7 +3531,7 @@ msgid "FS service is lacking HOSTKEY configuration 
setting.  Exiting.\n"
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355
-#: src/topology/gnunet-daemon-topology.c:1203
+#: src/topology/gnunet-daemon-topology.c:1202
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr ""
@@ -3444,7 +3575,7 @@ msgstr ""
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343
+#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345
 msgid "# P2P searches active"
 msgstr ""
 
@@ -3492,19 +3623,19 @@ msgstr ""
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1239
+#: src/fs/gnunet-service-fs_cp.c:1241
 msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1295
+#: src/fs/gnunet-service-fs_cp.c:1297
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1339
+#: src/fs/gnunet-service-fs_cp.c:1341
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1706
+#: src/fs/gnunet-service-fs_cp.c:1708
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3712,6 +3843,10 @@ msgstr ""
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
+#: src/gns/gns_tld_api.c:276
+msgid "Expected a base32-encoded public zone key\n"
+msgstr ""
+
 #: src/gns/gnunet-bcd.c:127
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
@@ -3740,126 +3875,63 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:238
+#: src/gns/gnunet-dns2gns.c:203
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:408
+#: src/gns/gnunet-dns2gns.c:404
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:424
+#: src/gns/gnunet-dns2gns.c:420
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:432
+#: src/gns/gnunet-dns2gns.c:428
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:711
-msgid "No ego configured for `dns2gns` subsystem\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:739
+#: src/gns/gnunet-dns2gns.c:587
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:760
-msgid "No valid GNS zone specified!\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:784
+#: src/gns/gnunet-dns2gns.c:687
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:790
-msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:796
-msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:802
+#: src/gns/gnunet-dns2gns.c:692
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:808
-msgid "Public key of the GNS zone to use (overrides default)"
+#: src/gns/gnunet-dns2gns.c:709
+msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:826
-msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
+#: src/gns/gnunet-gns-benchmark.c:582
+msgid "how long to wait between queries"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
+#: src/gns/gnunet-gns-benchmark.c:587
+msgid "how long to wait for an answer"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:252
-#, c-format
-msgid "Please specify name to lookup!\n"
+#: src/gns/gnunet-gns-benchmark.c:591
+msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:276
-#, c-format
-msgid "Ego for `%s' not found, cannot perform lookup.\n"
+#: src/gns/gnunet-gns-helper-service-w32.c:602
+msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701
-#: src/gns/plugin_rest_gns.c:422
-#, c-format
+#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727
-#, c-format
-msgid "Failed to connect to GNS\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:374
-#, c-format
-msgid "Public key `%s' is not well-formed\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:428
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:434
-msgid "Specify the type of the record to lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:440
-msgid "Specify timeout for the lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:445
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:451
-msgid "Specify the public key of the zone to lookup the record in"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:457
-msgid "Specify the name of the ego of the zone to lookup the record in"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:476
-msgid "GNUnet GNS resolver tool"
-msgstr ""
-
-#: src/gns/gnunet-gns-helper-service-w32.c:602
-msgid "Not ready to process requests, lacking ego data\n"
-msgstr ""
-
 #: src/gns/gnunet-gns-helper-service-w32.c:739
 #, c-format
 msgid "Failed to connect to identity service\n"
@@ -3870,223 +3942,230 @@ msgid "This program will import some GNS authorities 
into your GNS namestore."
 msgstr ""
 
 #: src/gns/gnunet-gns-proxy.c:109
-#: src/hostlist/gnunet-daemon-hostlist_client.c:569
-#: src/hostlist/gnunet-daemon-hostlist_client.c:787
-#: src/hostlist/gnunet-daemon-hostlist_client.c:793
-#: src/hostlist/gnunet-daemon-hostlist_client.c:845
-#: src/hostlist/gnunet-daemon-hostlist_client.c:854
-#: src/hostlist/gnunet-daemon-hostlist_client.c:965
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1060
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1065
+#: src/hostlist/gnunet-daemon-hostlist_client.c:535
+#: src/hostlist/gnunet-daemon-hostlist_client.c:753
+#: src/hostlist/gnunet-daemon-hostlist_client.c:759
+#: src/hostlist/gnunet-daemon-hostlist_client.c:811
+#: src/hostlist/gnunet-daemon-hostlist_client.c:820
+#: src/hostlist/gnunet-daemon-hostlist_client.c:931
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
 #: src/transport/plugin_transport_http_client.c:598
 #: src/transport/plugin_transport_http_client.c:616
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:887
+#: src/gns/gnunet-gns-proxy.c:910
 #, c-format
-msgid "Unsupported CURL SSL backend %d\n"
+msgid "Unsupported CURL TLS backend %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:933
 #, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:956
 #, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:946
+#: src/gns/gnunet-gns-proxy.c:969
 #, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:961
+#: src/gns/gnunet-gns-proxy.c:984
 #, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:971
+#: src/gns/gnunet-gns-proxy.c:994
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:995
+#: src/gns/gnunet-gns-proxy.c:1018
 #, c-format
-msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgid "TLS certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1104
+#: src/gns/gnunet-gns-proxy.c:1132
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1709
+#: src/gns/gnunet-gns-proxy.c:1868
 #, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2172
+#: src/gns/gnunet-gns-proxy.c:2364
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2202
+#: src/gns/gnunet-gns-proxy.c:2394
 #, c-format
 msgid "Unable to import certificate %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2375
+#: src/gns/gnunet-gns-proxy.c:2573
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2394 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2716
+#: src/gns/gnunet-gns-proxy.c:2925
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2745
+#: src/gns/gnunet-gns-proxy.c:2954
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2763 src/gns/gnunet-gns-proxy.c:2792
-msgid "SSL connection to plain IPv4 address requested\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:2842
+#: src/gns/gnunet-gns-proxy.c:3035
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3177 src/gns/gnunet-service-gns.c:403
-#, c-format
-msgid "No ego configured for `%s`\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:3238
+#: src/gns/gnunet-gns-proxy.c:3316
 #, c-format
-msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
+msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3281
+#: src/gns/gnunet-gns-proxy.c:3443
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3287
+#: src/gns/gnunet-gns-proxy.c:3448
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3312
+#: src/gns/gnunet-gns-proxy.c:3473
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:442
+#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:238
+msgid "Specify the type of the record to lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:242
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:258
+msgid "GNUnet GNS resolver tool"
+msgstr ""
+
+#: src/gns/gnunet-service-gns.c:513
+msgid "Properly base32-encoded public key required"
+msgstr ""
+
+#: src/gns/gnunet-service-gns.c:549
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:461
-#: src/zonemaster/gnunet-service-zonemaster.c:742
+#: src/gns/gnunet-service-gns.c:568
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
+#: src/zonemaster/gnunet-service-zonemaster.c:875
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:263
+#: src/gns/gnunet-service-gns_interceptor.c:259
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:370
+#: src/gns/gnunet-service-gns_interceptor.c:366
 msgid "Failed to connect to the DNS service!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:641
+#: src/gns/gnunet-service-gns_resolver.c:713
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:652
+#: src/gns/gnunet-service-gns_resolver.c:724
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:844
+#: src/gns/gnunet-service-gns_resolver.c:927
 msgid "Failed to parse DNS response\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:986
+#: src/gns/gnunet-service-gns_resolver.c:1102
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1347
+#: src/gns/gnunet-service-gns_resolver.c:1796
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1865
+#: src/gns/gnunet-service-gns_resolver.c:1839
+msgid "GNS lookup failed (zero records found)\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:2253
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1889
+#: src/gns/gnunet-service-gns_resolver.c:2276
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2171
+#: src/gns/gnunet-service-gns_resolver.c:2563
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2318
-#, c-format
-msgid "Hostname `%s' is not well-formed, resolution fails\n"
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:203
+#: src/gns/plugin_gnsrecord_gns.c:181
 #, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:232
+#: src/gns/plugin_gnsrecord_gns.c:212
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:253
+#: src/gns/plugin_gnsrecord_gns.c:233
 #, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:276
+#: src/gns/plugin_gnsrecord_gns.c:258
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:312
+#: src/gns/plugin_gnsrecord_gns.c:294
 #, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:360
-#, c-format
-msgid "Unable to parse REVERSE record string `%s'\n"
-msgstr ""
-
 #: src/gns/plugin_rest_gns.c:384
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:668
-msgid "GNS REST API initialized\n"
-msgstr ""
-
 #: src/gnsrecord/plugin_gnsrecord_dns.c:359
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4251,150 +4330,150 @@ msgstr ""
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:371
+#: src/hostlist/gnunet-daemon-hostlist_client.c:349
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:392
-#: src/hostlist/gnunet-daemon-hostlist_client.c:437
+#: src/hostlist/gnunet-daemon-hostlist_client.c:370
+#: src/hostlist/gnunet-daemon-hostlist_client.c:403
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:395
-#: src/hostlist/gnunet-daemon-hostlist_client.c:440
+#: src/hostlist/gnunet-daemon-hostlist_client.c:373
+#: src/hostlist/gnunet-daemon-hostlist_client.c:406
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:413
+#: src/hostlist/gnunet-daemon-hostlist_client.c:391
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:695
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1441
+#: src/hostlist/gnunet-daemon-hostlist_client.c:661
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:725
+#: src/hostlist/gnunet-daemon-hostlist_client.c:691
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:768
+#: src/hostlist/gnunet-daemon-hostlist_client.c:734
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:862
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:910
+#: src/hostlist/gnunet-daemon-hostlist_client.c:876
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:930
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:936
+#: src/hostlist/gnunet-daemon-hostlist_client.c:902
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:944
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:997
+#: src/hostlist/gnunet-daemon-hostlist_client.c:963
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1005
+#: src/hostlist/gnunet-daemon-hostlist_client.c:971
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1132
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1698
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1098
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1665
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1141
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1107
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1200
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1221
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1166
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1187
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1435
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1438
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1484
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1515
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1532
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1527
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1595
 #: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1657
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1624
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1671
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1638
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1651
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4412,7 +4491,7 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_server.c:531
 #: src/peerinfo-tool/gnunet-peerinfo.c:385
 #: src/peerinfo-tool/gnunet-peerinfo.c:534
-#: src/topology/gnunet-daemon-topology.c:857
+#: src/topology/gnunet-daemon-topology.c:862
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
@@ -4506,6 +4585,68 @@ msgstr ""
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
+#: src/identity-provider/gnunet-idp.c:424
+msgid "Ego is required\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:432
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:440
+msgid "Requesting party key is required!\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:463
+msgid "Add attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:469
+msgid "Attribute value"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:474
+msgid "Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:479
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:483
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:488
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:493
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:498
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:503
+msgid "Type of attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:508
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/identity-provider/identity_provider_api.c:436
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/identity-provider/plugin_rest_identity_provider.c:1230
+#: src/identity-provider/plugin_rest_openid_connect.c:2147
+msgid "Identity Provider REST API initialized\n"
+msgstr ""
+
 #: src/identity/gnunet-identity.c:179
 #, c-format
 msgid "Failed to create ego: %s\n"
@@ -4593,31 +4734,10 @@ msgstr ""
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
-#: src/identity/plugin_rest_identity.c:967
+#: src/identity/plugin_rest_identity.c:968
 msgid "Identity REST API initialized\n"
 msgstr ""
 
-#: src/identity-provider/gnunet-identity-token.c:66
-msgid "Option `-t' is required\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-identity-token.c:77
-#, c-format
-msgid "Token `%s' is malformed\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-identity-token.c:166
-msgid "GNUid token"
-msgstr ""
-
-#: src/identity-provider/gnunet-identity-token.c:171
-msgid "Print token contents"
-msgstr ""
-
-#: src/identity-provider/plugin_rest_identity_provider.c:1166
-msgid "Identity Token REST API initialized\n"
-msgstr ""
-
 #: src/json/json.c:119
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -4647,7 +4767,7 @@ msgstr ""
 msgid "No records found for `%s'"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4667,7 +4787,7 @@ msgstr "fornat invalide : « %s »\n"
 msgid "You must specify a name\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4675,7 +4795,7 @@ msgstr ""
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
@@ -4687,280 +4807,287 @@ msgstr ""
 msgid "Error communicating with namecache service"
 msgstr ""
 
-#: src/namecache/plugin_namecache_flat.c:119
-#: src/namecache/plugin_namecache_flat.c:253
-#: src/namestore/plugin_namestore_flat.c:179
-#: src/namestore/plugin_namestore_flat.c:375
+#: src/namecache/plugin_namecache_flat.c:121
+#: src/namecache/plugin_namecache_flat.c:255
+#: src/namestore/plugin_namestore_flat.c:150
+#: src/namestore/plugin_namestore_flat.c:385
 #: src/peerstore/plugin_peerstore_flat.c:379
 #: src/peerstore/plugin_peerstore_flat.c:538
 #, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr ""
 
-#: src/namecache/plugin_namecache_flat.c:130
-#: src/namestore/plugin_namestore_flat.c:190
+#: src/namecache/plugin_namecache_flat.c:132
+#: src/namestore/plugin_namestore_flat.c:161
 #: src/peerstore/plugin_peerstore_flat.c:394
 #, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr ""
 
-#: src/namecache/plugin_namecache_flat.c:149
-#: src/namestore/plugin_namestore_flat.c:203
+#: src/namecache/plugin_namecache_flat.c:151
+#: src/namestore/plugin_namestore_flat.c:174
 #: src/peerstore/plugin_peerstore_flat.c:406
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
 msgstr "Résolution de « %s » échouée\n"
 
-#: src/namecache/plugin_namecache_flat.c:408
+#: src/namecache/plugin_namecache_flat.c:410
 msgid "flat plugin running\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:301
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:547
+#, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:567
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:598
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:678
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:736
+#, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:754
+#, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:790
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:799
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1019
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1045
+msgid "Failed to start HTTP server\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1092
+msgid "Failed to connect to identity\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1130
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:313
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:562
+#: src/namestore/gnunet-namestore.c:343
+#: src/namestore/plugin_rest_namestore.c:572
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:571
+#: src/namestore/gnunet-namestore.c:350
+#: src/namestore/plugin_rest_namestore.c:581
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527
-#: src/namestore/gnunet-namestore.c:535
+#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561
-#: src/namestore/gnunet-namestore.c:573
+#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
-#: src/namestore/plugin_rest_namestore.c:597
+#: src/namestore/gnunet-namestore.c:677
 #, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
+msgid ""
+"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:739
+#: src/namestore/gnunet-namestore.c:810
+#: src/namestore/plugin_rest_namestore.c:607
 #, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
+msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:776
-#: src/namestore/plugin_rest_namestore.c:1004
+#: src/namestore/gnunet-namestore.c:851
 #, c-format
-msgid "Ego `%s' not known to identity service\n"
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:791
+#: src/namestore/gnunet-namestore.c:903
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:802
-#: src/namestore/gnunet-namestore-fcfsd.c:1034
-#: src/namestore/plugin_rest_namestore.c:1017
-msgid "Failed to connect to namestore\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819
-#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861
-#: src/namestore/gnunet-namestore.c:915
+#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973
+#: src/namestore/gnunet-namestore.c:1027
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820
-#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863
+#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932
+#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975
 msgid "add"
 msgstr "ajouter"
 
-#: src/namestore/gnunet-namestore.c:829
-#: src/namestore/plugin_rest_namestore.c:671
+#: src/namestore/gnunet-namestore.c:941
+#: src/namestore/plugin_rest_namestore.c:684
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:851
-#: src/namestore/plugin_rest_namestore.c:689
-#: src/namestore/plugin_rest_namestore.c:729
+#: src/namestore/gnunet-namestore.c:963
+#: src/namestore/plugin_rest_namestore.c:704
+#: src/namestore/plugin_rest_namestore.c:746
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:896
+#: src/namestore/gnunet-namestore.c:1008
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1028
 msgid "del"
 msgstr "supprimer"
 
-#: src/namestore/gnunet-namestore.c:950
+#: src/namestore/gnunet-namestore.c:1071
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/namestore/gnunet-namestore.c:1100
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI invalide « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:1014
+#: src/namestore/gnunet-namestore.c:1135
 #, c-format
 msgid "Invalid nick `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1051
-#: src/namestore/plugin_rest_namestore.c:1047
+#: src/namestore/gnunet-namestore.c:1175
+#: src/namestore/plugin_rest_namestore.c:1065
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1108
-#: src/namestore/plugin_rest_namestore.c:1143
+#: src/namestore/gnunet-namestore.c:1239
+#: src/namestore/plugin_rest_namestore.c:1161
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1137
+#: src/namestore/gnunet-namestore.c:1264
 msgid "add record"
 msgstr "ajouter un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1142
+#: src/namestore/gnunet-namestore.c:1268
 msgid "delete record"
 msgstr "suprimer un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1147
+#: src/namestore/gnunet-namestore.c:1272
 msgid "display records"
 msgstr "afficher les enregistrements"
 
-#: src/namestore/gnunet-namestore.c:1153
+#: src/namestore/gnunet-namestore.c:1277
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1282
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1164
+#: src/namestore/gnunet-namestore.c:1286
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1176
+#: src/namestore/gnunet-namestore.c:1296
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1184
+#: src/namestore/gnunet-namestore.c:1301
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1190
+#: src/namestore/gnunet-namestore.c:1306
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1196
+#: src/namestore/gnunet-namestore.c:1311
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1201
-msgid "create or list public record"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1206
-msgid ""
-"create shadow record (only valid if all other records of the same type have "
-"expired"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1212
-msgid "name of the ego controlling the zone"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:508
-#, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:535
-#, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:555
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:585
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:662
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:718
-#, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:734
-#, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:770
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:778
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:974
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1000
-msgid "Failed to start HTTP server\n"
+#: src/namestore/gnunet-namestore.c:1315
+msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1042
-msgid "Failed to connect to identity\n"
+#: src/namestore/gnunet-namestore.c:1319
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1074
-msgid "GNU Name System First Come First Serve name registration service"
+#: src/namestore/gnunet-namestore.c:1324
+msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:615
+#: src/namestore/gnunet-service-namestore.c:750
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:379
+#: src/namestore/gnunet-zoneimport.c:2035
+msgid "size to use for the main hash map"
+msgstr ""
+
+#: src/namestore/gnunet-zoneimport.c:2040
+msgid "minimum expiration time we assume for imported records"
+msgstr ""
+
+#: src/namestore/namestore_api.c:391
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:656
+#: src/namestore/plugin_namestore_flat.c:767
 msgid "flat file database running\n"
 msgstr ""
 
-#: src/namestore/plugin_rest_namestore.c:1188
+#: src/namestore/plugin_namestore_sqlite.c:218
+#: src/namestore/plugin_namestore_sqlite.c:229
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/namestore/plugin_rest_namestore.c:1206
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
@@ -4987,11 +5114,11 @@ msgstr "fornat invalide : « %s »\n"
 msgid "section name providing the configuration for the adapter"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447
+#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453
 msgid "use TCP"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452
+#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458
 msgid "use UDP"
 msgstr ""
 
@@ -5161,57 +5288,57 @@ msgstr "Résolution de « %s » échouée : %s\n"
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/nat/gnunet-nat.c:425
+#: src/nat/gnunet-nat.c:431
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:431
+#: src/nat/gnunet-nat.c:437
 msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:437
+#: src/nat/gnunet-nat.c:443
 msgid ""
 "name of configuration section to find additional options, such as manual "
 "host punching data"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:442
+#: src/nat/gnunet-nat.c:448
 msgid "enable STUN processing"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:457
+#: src/nat/gnunet-nat.c:463
 msgid "watch for connection reversal requests"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:469
+#: src/nat/gnunet-nat.c:475
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1335
+#: src/nat/gnunet-service-nat.c:1339
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1345
+#: src/nat/gnunet-service-nat.c:1349
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1361
+#: src/nat/gnunet-service-nat.c:1365
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1372
+#: src/nat/gnunet-service-nat.c:1376
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1837
+#: src/nat/gnunet-service-nat.c:1841
 msgid "Connection reversal request failed\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1910
+#: src/nat/gnunet-service-nat.c:1914
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5235,91 +5362,37 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:122
-msgid "Show network size estimates from NSE service."
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:842
+#: src/nse/gnunet-nse-profiler.c:849
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:847
+#: src/nse/gnunet-nse-profiler.c:854
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:859
+#: src/nse/gnunet-nse-profiler.c:866
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:866
+#: src/nse/gnunet-nse-profiler.c:873
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:877
+#: src/nse/gnunet-nse-profiler.c:884
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:886
+#: src/nse/gnunet-nse-profiler.c:893
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:840 src/util/gnunet-scrypt.c:276
-msgid "Value is too large.\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:178
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:310
-#, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:331
-#: src/peerinfo/gnunet-service-peerinfo.c:362
-#, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:446
-msgid "# peers known"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:489
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:655
-#, c-format
-msgid "Scanning directory `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:663
-#, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1080
-#, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1409
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1422
-msgid "Skipping import of included HELLOs\n"
+#: src/nse/gnunet-nse.c:122
+msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:220
-msgid "Failed to receive response from `PEERINFO' service."
+#: src/nse/gnunet-service-nse.c:1534
+#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
+msgid "Value is too large.\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:239
@@ -5411,6 +5484,60 @@ msgstr ""
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr ""
 
+#: src/peerinfo/gnunet-service-peerinfo.c:178
+#, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:313
+#, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:334
+#: src/peerinfo/gnunet-service-peerinfo.c:365
+#, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:449
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:492
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:659
+#, c-format
+msgid "Scanning directory `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:667
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1100
+#, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1438
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1451
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:220
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr ""
+
 #: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
@@ -5696,11 +5823,11 @@ msgstr ""
 msgid "Search string `%s' is too long!\n"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:790
+#: src/rest/gnunet-rest-server.c:927
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:807
+#: src/rest/gnunet-rest-server.c:944
 msgid "GNUnet REST server"
 msgstr ""
 
@@ -5826,18 +5953,21 @@ msgid "# revocation set unions completed"
 msgstr ""
 
 #: src/revocation/gnunet-service-revocation.c:525
-#: src/revocation/gnunet-service-revocation.c:773
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:864
+#: src/revocation/gnunet-service-revocation.c:867
 msgid "Could not open revocation database file!"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:146
+#: src/rps/gnunet-rps.c:203
 msgid "Seed a PeerID"
 msgstr ""
 
+#: src/rps/gnunet-rps.c:207
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
 #: src/scalarproduct/gnunet-scalarproduct.c:220
 msgid "You must specify at least one message ID to check!\n"
 msgstr ""
@@ -5892,10 +6022,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
 msgid "Connect to CADET failed\n"
 msgstr ""
 
@@ -6264,14 +6394,14 @@ msgstr ""
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:247
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:249
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46
-#: src/testing/testing.c:288 src/util/gnunet-ecc.c:306
+#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6341,15 +6471,6 @@ msgstr ""
 msgid "%.s Unknown result code."
 msgstr "%.s Code d'erreur inconnu"
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:118
-msgid "Waiting for child to exit.\n"
-msgstr ""
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:241
-#, c-format
-msgid "Spawning process `%s'\n"
-msgstr ""
-
 #: src/testbed/gnunet-testbed-profiler.c:289
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
@@ -6361,6 +6482,15 @@ msgid ""
 "signal is received"
 msgstr ""
 
+#: src/testbed/gnunet_testbed_mpi_spawn.c:118
+msgid "Waiting for child to exit.\n"
+msgstr ""
+
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
+#, c-format
+msgid "Spawning process `%s'\n"
+msgstr ""
+
 #: src/testbed/testbed_api.c:410
 #, c-format
 msgid "Adding host %u failed with error: %s\n"
@@ -6579,79 +6709,75 @@ msgstr ""
 msgid "Failed to load configuration from %s\n"
 msgstr ""
 
-#: src/topology/friends.c:106
+#: src/topology/friends.c:126
 #, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr ""
 
-#: src/topology/friends.c:160
+#: src/topology/friends.c:180
 #, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:225
+#: src/topology/gnunet-daemon-topology.c:230
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:339
+#: src/topology/gnunet-daemon-topology.c:344
 msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:533
+#: src/topology/gnunet-daemon-topology.c:538
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:635
-#: src/topology/gnunet-daemon-topology.c:721
+#: src/topology/gnunet-daemon-topology.c:640
+#: src/topology/gnunet-daemon-topology.c:726
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:918
+#: src/topology/gnunet-daemon-topology.c:923
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:951
+#: src/topology/gnunet-daemon-topology.c:956
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:958
+#: src/topology/gnunet-daemon-topology.c:963
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:980
+#: src/topology/gnunet-daemon-topology.c:985
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:983
+#: src/topology/gnunet-daemon-topology.c:988
 msgid "# friends in configuration"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:990
+#: src/topology/gnunet-daemon-topology.c:995
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:1001
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1059
+#: src/topology/gnunet-daemon-topology.c:1054
 #: src/transport/plugin_transport_wlan.c:1517
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1233
+#: src/topology/gnunet-daemon-topology.c:1232
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:141
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport.c:448
 msgid "# messages dropped due to slow client"
 msgstr ""
@@ -6696,195 +6822,199 @@ msgstr ""
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:804
+#: src/transport/gnunet-service-transport_neighbours.c:806
 #, fuzzy
 msgid "# session creation failed"
 msgstr "# Session TCP active"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1053
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1168
+#: src/transport/gnunet-service-transport_neighbours.c:1176
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1764
+#: src/transport/gnunet-service-transport_neighbours.c:1324
+#: src/transport/gnunet-service-transport_neighbours.c:1785
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1316
+#: src/transport/gnunet-service-transport_neighbours.c:1329
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1322
+#: src/transport/gnunet-service-transport_neighbours.c:1335
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1395
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1458
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1494
+#: src/transport/gnunet-service-transport_neighbours.c:1515
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1502
+#: src/transport/gnunet-service-transport_neighbours.c:1523
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1512
+#: src/transport/gnunet-service-transport_neighbours.c:1533
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1557
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1566
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1574
+#: src/transport/gnunet-service-transport_neighbours.c:1595
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1583
+#: src/transport/gnunet-service-transport_neighbours.c:1604
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1588
+#: src/transport/gnunet-service-transport_neighbours.c:1609
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1615
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1661
+#: src/transport/gnunet-service-transport_neighbours.c:1682
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1695
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1710
+#: src/transport/gnunet-service-transport_neighbours.c:1731
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1830
+#: src/transport/gnunet-service-transport_neighbours.c:1854
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Résolution de « %s » échouée\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1850
+#: src/transport/gnunet-service-transport_neighbours.c:1874
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1889
+#: src/transport/gnunet-service-transport_neighbours.c:1913
 msgid "# SYN messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1906
+#: src/transport/gnunet-service-transport_neighbours.c:1930
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1936
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2001
+#: src/transport/gnunet-service-transport_neighbours.c:2028
 #, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2055
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 msgid "# SYN_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2072
+#: src/transport/gnunet-service-transport_neighbours.c:2099
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2233
+#: src/transport/gnunet-service-transport_neighbours.c:2262
 msgid "# SYN messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2238
+#: src/transport/gnunet-service-transport_neighbours.c:2267
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2623
+#: src/transport/gnunet-service-transport_neighbours.c:2654
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3105
+#: src/transport/gnunet-service-transport_neighbours.c:3139
 msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3113
+#: src/transport/gnunet-service-transport_neighbours.c:3147
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3131
-#: src/transport/gnunet-service-transport_neighbours.c:3155
+#: src/transport/gnunet-service-transport_neighbours.c:3165
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3167
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3192
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3205
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3377
+#: src/transport/gnunet-service-transport_neighbours.c:3412
 msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3413
+#: src/transport/gnunet-service-transport_neighbours.c:3448
 msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3501
+#: src/transport/gnunet-service-transport_neighbours.c:3536
 msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3508
+#: src/transport/gnunet-service-transport_neighbours.c:3543
 msgid "# QUOTA messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3548
+#: src/transport/gnunet-service-transport_neighbours.c:3583
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3555
+#: src/transport/gnunet-service-transport_neighbours.c:3590
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3566
+#: src/transport/gnunet-service-transport_neighbours.c:3601
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3700
+#: src/transport/gnunet-service-transport_neighbours.c:3736
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -6997,6 +7127,46 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_validation.c:1627
+msgid "# HELLOs given to peerinfo"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:219
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:617
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:621
+msgid "receive data from peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:626
+msgid "iterations"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:631
+#, fuzzy
+msgid "number of messages to send"
+msgstr "nombre de valeurs"
+
+#: src/transport/gnunet-transport-profiler.c:636
+msgid "message size to use"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:641
+#: src/transport/gnunet-transport.c:1462
+msgid "peer identity"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:652
+#: src/transport/gnunet-transport.c:1482
+msgid "Direct access to transport service."
+msgstr ""
+
 #: src/transport/gnunet-transport.c:413
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7125,11 +7295,6 @@ msgstr ""
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1462
-#: src/transport/gnunet-transport-profiler.c:641
-msgid "peer identity"
-msgstr ""
-
 #: src/transport/gnunet-transport.c:1466
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7138,42 +7303,11 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1482
-#: src/transport/gnunet-transport-profiler.c:652
-msgid "Direct access to transport service."
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:219
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:617
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:621
-msgid "receive data from peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:626
-msgid "iterations"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:631
-#, fuzzy
-msgid "number of messages to send"
-msgstr "nombre de valeurs"
-
-#: src/transport/gnunet-transport-profiler.c:636
-msgid "message size to use"
-msgstr ""
-
 #: src/transport/plugin_transport_http_client.c:1474
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3526
-#: src/transport/plugin_transport_tcp.c:3890
-#: src/transport/plugin_transport_tcp.c:3897
+#: src/transport/plugin_transport_tcp.c:3891
+#: src/transport/plugin_transport_tcp.c:3898
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7242,7 +7376,7 @@ msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2901
-#: src/transport/plugin_transport_udp.c:3622
+#: src/transport/plugin_transport_udp.c:3623
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7349,7 +7483,7 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1730
 #: src/transport/plugin_transport_tcp.c:1954
 #: src/transport/plugin_transport_tcp.c:3137
-#: src/transport/plugin_transport_tcp.c:4013
+#: src/transport/plugin_transport_tcp.c:4014
 msgid "# TCP sessions active"
 msgstr "# Session TCP active"
 
@@ -7386,114 +7520,114 @@ msgstr ""
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3408
+#: src/transport/plugin_transport_tcp.c:3409
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3459
-#: src/transport/plugin_transport_tcp.c:3517
+#: src/transport/plugin_transport_tcp.c:3460
+#: src/transport/plugin_transport_tcp.c:3518
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# Session TCP active"
 
-#: src/transport/plugin_transport_tcp.c:3463
+#: src/transport/plugin_transport_tcp.c:3464
 msgid "# TCP server connect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3469
+#: src/transport/plugin_transport_tcp.c:3470
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3471
+#: src/transport/plugin_transport_tcp.c:3472
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3511
+#: src/transport/plugin_transport_tcp.c:3512
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3521
+#: src/transport/plugin_transport_tcp.c:3522
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3840
+#: src/transport/plugin_transport_tcp.c:3841
 msgid "Failed to start service.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4001
+#: src/transport/plugin_transport_tcp.c:4002
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4005
+#: src/transport/plugin_transport_tcp.c:4006
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4009
+#: src/transport/plugin_transport_tcp.c:4010
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:168
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:548
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:565
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp.c:3366
+#: src/transport/plugin_transport_udp.c:3367
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3380
+#: src/transport/plugin_transport_udp.c:3381
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3698
-#: src/transport/plugin_transport_udp.c:3797
+#: src/transport/plugin_transport_udp.c:3699
+#: src/transport/plugin_transport_udp.c:3798
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/transport/plugin_transport_udp.c:3716
+#: src/transport/plugin_transport_udp.c:3717
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3807
+#: src/transport/plugin_transport_udp.c:3808
 msgid "Failed to open UDP sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3878
-#: src/transport/plugin_transport_udp.c:3892
+#: src/transport/plugin_transport_udp.c:3879
+#: src/transport/plugin_transport_udp.c:3893
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3924
+#: src/transport/plugin_transport_udp.c:3925
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "adresse invalide"
 
-#: src/transport/plugin_transport_udp.c:3951
+#: src/transport/plugin_transport_udp.c:3952
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "adresse invalide"
 
-#: src/transport/plugin_transport_udp.c:4015
+#: src/transport/plugin_transport_udp.c:4016
 msgid "Failed to create UDP network sockets\n"
 msgstr ""
 
+#: src/transport/plugin_transport_udp_broadcasting.c:168
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:548
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:565
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+
 #: src/transport/plugin_transport_unix.c:1403
 #, c-format
 msgid "Cannot create path to `%s'\n"
@@ -7598,7 +7732,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2346
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -7655,7 +7789,7 @@ msgstr ""
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517
 #: src/util/service.c:1378
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
@@ -7674,18 +7808,18 @@ msgstr ""
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:255
+#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279
 #: src/util/service.c:1790
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:272
+#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299
 #: src/util/service.c:1801
 msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:267
+#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292
 #: src/util/service.c:1807
 #, c-format
 msgid "Could not access configuration file `%s'\n"
@@ -7696,61 +7830,61 @@ msgstr ""
 msgid "Bad mask: %d\n"
 msgstr "Masque érroné : %d\n"
 
-#: src/util/bio.c:177 src/util/bio.c:185
+#: src/util/bio.c:181 src/util/bio.c:189
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Erreur de lecture : « %s » : %s"
 
-#: src/util/bio.c:187
+#: src/util/bio.c:191
 msgid "End of file"
 msgstr "Fin de fichier"
 
-#: src/util/bio.c:244
+#: src/util/bio.c:248
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:254
+#: src/util/bio.c:258
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:300
+#: src/util/bio.c:306
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:314
+#: src/util/bio.c:328
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:911
+#: src/util/client.c:914
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1132
+#: src/util/common_logging.c:259 src/util/common_logging.c:1146
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1130
+#: src/util/common_logging.c:261 src/util/common_logging.c:1144
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1128
+#: src/util/common_logging.c:263 src/util/common_logging.c:1142
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1126
+#: src/util/common_logging.c:265 src/util/common_logging.c:1140
 msgid "WARNING"
 msgstr "AVERTISSEMENT"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1124
+#: src/util/common_logging.c:267 src/util/common_logging.c:1138
 msgid "ERROR"
 msgstr "ERREUR"
 
-#: src/util/common_logging.c:269 src/util/common_logging.c:1134
+#: src/util/common_logging.c:269 src/util/common_logging.c:1148
 msgid "NONE"
 msgstr "AUCUN"
 
@@ -7759,24 +7893,24 @@ msgstr "AUCUN"
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1135
+#: src/util/common_logging.c:1149
 msgid "INVALID"
 msgstr "INVALIDE"
 
-#: src/util/common_logging.c:1326
+#: src/util/common_logging.c:1442
 msgid "unknown address"
 msgstr "adresse inconnue"
 
-#: src/util/common_logging.c:1368
+#: src/util/common_logging.c:1484
 msgid "invalid address"
 msgstr "adresse invalide"
 
-#: src/util/common_logging.c:1386
+#: src/util/common_logging.c:1502
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1407
+#: src/util/common_logging.c:1523
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -7787,87 +7921,87 @@ msgstr ""
 msgid "Syntax error while deserializing in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:355
+#: src/util/configuration.c:363
 #, fuzzy, c-format
 msgid "Error while reading file `%s'\n"
 msgstr "Erreur de lecture : « %s » : %s"
 
-#: src/util/configuration.c:1034
+#: src/util/configuration.c:1051
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1153
+#: src/util/configuration.c:1170
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1186
+#: src/util/configuration.c:1203
 #, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1254
+#: src/util/configuration.c:1271
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:531
+#: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:810
+#: src/util/crypto_ecc.c:836
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:860
+#: src/util/crypto_ecc.c:886
 #, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:934
+#: src/util/crypto_ecc.c:960
 #, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:991
+#: src/util/crypto_ecc.c:1017
 #, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:122 src/util/crypto_ecc_setup.c:161
-#: src/util/crypto_ecc_setup.c:279 src/util/crypto_ecc_setup.c:317
+#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165
+#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355
 #, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:128 src/util/crypto_ecc_setup.c:284
+#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:165 src/util/crypto_ecc_setup.c:322
+#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:195 src/util/crypto_ecc_setup.c:352
+#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:356
+#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:415
+#: src/util/crypto_ecc_setup.c:471
 msgid "Could not load peer's private key\n"
 msgstr ""
 
@@ -7876,12 +8010,12 @@ msgstr ""
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:835
+#: src/util/crypto_rsa.c:834
 #, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1166
+#: src/util/crypto_rsa.c:1165
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
@@ -7956,102 +8090,108 @@ msgstr ""
 msgid "Missing mandatory option `%s'.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:68
+#: src/util/getopt_helpers.c:70
 msgid "print the version number"
 msgstr ""
 
-#: src/util/getopt_helpers.c:111
+#: src/util/getopt_helpers.c:115
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:199
+#: src/util/getopt_helpers.c:203
 msgid "print this help"
 msgstr ""
 
-#: src/util/getopt_helpers.c:274
+#: src/util/getopt_helpers.c:281
 msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt_helpers.c:410
+#: src/util/getopt_helpers.c:422
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:488
+#: src/util/getopt_helpers.c:502
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:510
+#: src/util/getopt_helpers.c:524
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740
+#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758
+#: src/util/getopt_helpers.c:825
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:610
+#: src/util/getopt_helpers.c:626
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:675
+#: src/util/getopt_helpers.c:692
 #, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:823
+#: src/util/getopt_helpers.c:832
+#, c-format
+msgid "You must pass a number below %u to the `%s' option.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:918
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:124
+#: src/util/gnunet-config.c:134
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/util/gnunet-config.c:137
+#: src/util/gnunet-config.c:147
 #, c-format
 msgid "--section argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:140
+#: src/util/gnunet-config.c:150
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:191
+#: src/util/gnunet-config.c:201
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:229
+#: src/util/gnunet-config.c:240
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:234
+#: src/util/gnunet-config.c:245
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:239
+#: src/util/gnunet-config.c:250
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:244
+#: src/util/gnunet-config.c:255
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:248
+#: src/util/gnunet-config.c:259
 msgid "print available configuration sections"
 msgstr ""
 
-#: src/util/gnunet-config.c:252
+#: src/util/gnunet-config.c:263
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:265
+#: src/util/gnunet-config.c:276
 msgid "Manipulate GNUnet configuration files"
 msgstr ""
 
@@ -8093,62 +8233,62 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:288
+#: src/util/gnunet-ecc.c:290
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:299
+#: src/util/gnunet-ecc.c:305
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:321
+#: src/util/gnunet-ecc.c:334
 #, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:372
+#: src/util/gnunet-ecc.c:391
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:456
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:442
+#: src/util/gnunet-ecc.c:461
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:447
+#: src/util/gnunet-ecc.c:466
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:451
+#: src/util/gnunet-ecc.c:470
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:455
+#: src/util/gnunet-ecc.c:474
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:459
+#: src/util/gnunet-ecc.c:478
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:463
+#: src/util/gnunet-ecc.c:482
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:479
+#: src/util/gnunet-ecc.c:498
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:150
+#: src/util/gnunet-resolver.c:168
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:161
+#: src/util/gnunet-resolver.c:179
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
@@ -8227,40 +8367,40 @@ msgstr ""
 msgid "Error writing to `%s': %s\n"
 msgstr ""
 
-#: src/util/network.c:137
+#: src/util/network.c:136
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1793 src/util/network.c:1977
+#: src/util/network.c:1795 src/util/network.c:1979
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:501
+#: src/util/os_installation.c:509
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:873
+#: src/util/os_installation.c:881
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/os_installation.c:913
+#: src/util/os_installation.c:922
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
 
-#: src/util/os_installation.c:944
+#: src/util/os_installation.c:953
 #, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/os_installation.c:954
+#: src/util/os_installation.c:963
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8290,29 +8430,29 @@ msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:223
+#: src/util/resolver_api.c:224
 #, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
 "resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:827
+#: src/util/resolver_api.c:851
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:840
+#: src/util/resolver_api.c:864
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1024
+#: src/util/resolver_api.c:1048
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1110 src/util/resolver_api.c:1133
-#: src/util/resolver_api.c:1147
+#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157
+#: src/util/resolver_api.c:1171
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
@@ -8322,7 +8462,7 @@ msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/service.c:2091
+#: src/util/service.c:2093
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8397,63 +8537,63 @@ msgstr "jours"
 msgid "end of time"
 msgstr "fin du temps"
 
-#: src/util/strings.c:1270
+#: src/util/strings.c:1272
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1278
+#: src/util/strings.c:1280
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1284
+#: src/util/strings.c:1286
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1291
+#: src/util/strings.c:1293
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1300
+#: src/util/strings.c:1302
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
 
-#: src/util/strings.c:1572 src/util/strings.c:1588
+#: src/util/strings.c:1574 src/util/strings.c:1590
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1597
+#: src/util/strings.c:1599
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1680 src/util/strings.c:1711 src/util/strings.c:1759
-#: src/util/strings.c:1780
+#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761
+#: src/util/strings.c:1782
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1737
+#: src/util/strings.c:1739
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/strings.c:1789
+#: src/util/strings.c:1791
 #, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/util/strings.c:1841
+#: src/util/strings.c:1843
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/strings.c:1891
+#: src/util/strings.c:1893
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/strings.c:1922
+#: src/util/strings.c:1924
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
@@ -8622,22 +8762,23 @@ msgstr ""
 msgid "Setup tunnels via VPN."
 msgstr "Configurer des tunnels via VPN."
 
-#: src/zonemaster/gnunet-service-zonemaster.c:706
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
+#: src/zonemaster/gnunet-service-zonemaster.c:838
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:689 src/include/gnunet_common.h:696
-#: src/include/gnunet_common.h:706 src/include/gnunet_common.h:714
+#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773
+#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:726
+#: src/include/gnunet_common.h:803
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:753 src/include/gnunet_common.h:762
+#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
@@ -8723,10 +8864,6 @@ msgstr ""
 #~ msgid "Failed to start resolver!\n"
 #~ msgstr "Échec du démarrage de %s\n"
 
-#, fuzzy
-#~ msgid "Failed to start NAT test for plugin `%s'\n"
-#~ msgstr "Résolution de « %s » échouée\n"
-
 #~ msgid "Benchmarking done\n"
 #~ msgstr "Benchmark terminé\n"
 
diff --git a/po/sv.po b/po/sv.po
index fe9022990..e7f91eb35 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: address@hidden"
-"POT-Creation-Date: 2018-01-02 02:33+0100\n"
+"POT-Creation-Date: 2018-06-04 23:27+0200\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -236,7 +236,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3824
+#: src/transport/plugin_transport_tcp.c:3825
 #: src/transport/tcp_service_legacy.c:576
 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
 #: src/util/service.c:643
@@ -245,14 +245,14 @@ msgid "Require valid port number for service `%s' in 
configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176
-#: src/transport/tcp_service_legacy.c:613 src/util/client.c:505
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506
 #: src/util/service.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
-#: src/transport/tcp_service_legacy.c:617 src/util/client.c:510
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511
 #: src/util/service.c:687
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
@@ -355,132 +355,14 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939
-msgid "solver to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945
-#: src/ats-tests/gnunet-solver-eval.c:950
-msgid "experiment to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3306
-#, fuzzy
-msgid "print logging"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:3311
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3316
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:304
-#, 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:314
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:359
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:451
-#, fuzzy, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "Kunde inte initiera SQLite.\n"
-
-#: src/ats/plugin_ats_mlp.c:1274
-msgid "Problem size too large, cannot allocate memory!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1869
-#, fuzzy, c-format
-msgid "Adding address for peer `%s' multiple times\n"
-msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
-
-#: src/ats/plugin_ats_mlp.c:1913
-#, fuzzy, c-format
-msgid "Updating address property for peer `%s' %p not added before\n"
-msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
-
-#: src/ats/plugin_ats_mlp.c:2475
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
-#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
-#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
-#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
-#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
-#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
-#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
-
-#: src/ats/plugin_ats_mlp.c:2670
-#, c-format
-msgid ""
-"Adjusting inconsistent outbound quota configuration for network `%s', is "
-"%llu must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2679
-#, c-format
-msgid ""
-"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
-"must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2689
-#, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2698
-#, c-format
-msgid ""
-"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+#: src/ats-tests/ats-testing-log.c:837
+msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1164
+#: src/ats-tests/ats-testing-log.c:892
 #, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+msgid "Start logging `%s'\n"
+msgstr "Startade samling \"%s\".\n"
 
 #: src/ats-tests/ats-testing.c:422
 #, c-format
@@ -492,15 +374,6 @@ msgstr ""
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/ats-tests/ats-testing-log.c:837
-msgid "Stop logging\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing-log.c:892
-#, fuzzy, c-format
-msgid "Start logging `%s'\n"
-msgstr "Startade samling \"%s\".\n"
-
 #: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
@@ -508,6 +381,15 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
+#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294
+msgid "solver to use"
+msgstr ""
+
+#: src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299
+msgid "experiment to use"
+msgstr ""
+
 #: src/ats-tool/gnunet-ats.c:307
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -629,6 +511,124 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
 
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3306
+#, fuzzy
+msgid "print logging"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:3311
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3316
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:304
+#, 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:314
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:359
+#, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:451
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
+#: src/ats/plugin_ats_mlp.c:1274
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1869
+#, fuzzy, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
+
+#: src/ats/plugin_ats_mlp.c:1913
+#, fuzzy, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
+
+#: src/ats/plugin_ats_mlp.c:2475
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
+#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
+#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
+#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
+#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/ats/plugin_ats_mlp.c:2670
+#, c-format
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2679
+#, c-format
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2689
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2698
+#, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_proportional.c:1164
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
 #: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
@@ -772,292 +772,292 @@ msgstr ""
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:513
-#: src/conversation/conversation_api_call.c:490
+#: src/conversation/conversation_api.c:515
+#: src/conversation/conversation_api_call.c:494
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:269
+#: src/conversation/gnunet-conversation-test.c:119
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:145
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:210
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:270
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:294
+#: src/conversation/gnunet-conversation.c:295
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:329
+#: src/conversation/gnunet-conversation.c:330
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:334
+#: src/conversation/gnunet-conversation.c:335
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:352
+#: src/conversation/gnunet-conversation.c:353
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:367
+#: src/conversation/gnunet-conversation.c:368
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/conversation/gnunet-conversation.c:379
+#: src/conversation/gnunet-conversation.c:380
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:401
+#: src/conversation/gnunet-conversation.c:404
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:408
+#: src/conversation/gnunet-conversation.c:411
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/conversation/gnunet-conversation.c:415
+#: src/conversation/gnunet-conversation.c:418
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/conversation/gnunet-conversation.c:423
+#: src/conversation/gnunet-conversation.c:426
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:432
+#: src/conversation/gnunet-conversation.c:435
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:438
+#: src/conversation/gnunet-conversation.c:441
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:443
+#: src/conversation/gnunet-conversation.c:446
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:512
+#: src/conversation/gnunet-conversation.c:517
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/conversation/gnunet-conversation.c:528
-#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:533
+#: src/conversation/gnunet-conversation.c:547
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:535
-#: src/conversation/gnunet-conversation.c:592
+#: src/conversation/gnunet-conversation.c:540
+#: src/conversation/gnunet-conversation.c:596
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:550
-#: src/conversation/gnunet-conversation.c:605
+#: src/conversation/gnunet-conversation.c:555
+#: src/conversation/gnunet-conversation.c:609
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:560
+#: src/conversation/gnunet-conversation.c:565
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:620
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:633
+#: src/conversation/gnunet-conversation.c:637
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:663
+#: src/conversation/gnunet-conversation.c:668
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:686
+#: src/conversation/gnunet-conversation.c:692
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:691
+#: src/conversation/gnunet-conversation.c:697
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:697
-#: src/conversation/gnunet-conversation.c:721
+#: src/conversation/gnunet-conversation.c:703
+#: src/conversation/gnunet-conversation.c:727
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:702
+#: src/conversation/gnunet-conversation.c:708
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:711
+#: src/conversation/gnunet-conversation.c:717
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:716
+#: src/conversation/gnunet-conversation.c:722
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:735
+#: src/conversation/gnunet-conversation.c:741
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:741
+#: src/conversation/gnunet-conversation.c:747
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/conversation/gnunet-conversation.c:769
-#: src/conversation/gnunet-conversation.c:784
+#: src/conversation/gnunet-conversation.c:776
+#: src/conversation/gnunet-conversation.c:791
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:817
-#: src/conversation/gnunet-conversation.c:833
+#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:840
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:840
+#: src/conversation/gnunet-conversation.c:847
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:849
+#: src/conversation/gnunet-conversation.c:856
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:866
+#: src/conversation/gnunet-conversation.c:873
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:901
+#: src/conversation/gnunet-conversation.c:908
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:909
+#: src/conversation/gnunet-conversation.c:916
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:926
+#: src/conversation/gnunet-conversation.c:933
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:952
+#: src/conversation/gnunet-conversation.c:959
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:954
+#: src/conversation/gnunet-conversation.c:961
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:956
+#: src/conversation/gnunet-conversation.c:963
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:958
+#: src/conversation/gnunet-conversation.c:965
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:960
+#: src/conversation/gnunet-conversation.c:967
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:962
+#: src/conversation/gnunet-conversation.c:969
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:964
+#: src/conversation/gnunet-conversation.c:971
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:966
+#: src/conversation/gnunet-conversation.c:973
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "tillåter klienter att fastställa gnunetds konfiguration"
 
-#: src/conversation/gnunet-conversation.c:968
+#: src/conversation/gnunet-conversation.c:975
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1172
+#: src/conversation/gnunet-conversation.c:1191
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/conversation/gnunet-conversation.c:1185
+#: src/conversation/gnunet-conversation.c:1204
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym \"%s\" togs bort.\n"
 
-#: src/conversation/gnunet-conversation.c:1220
+#: src/conversation/gnunet-conversation.c:1242
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/conversation/gnunet-conversation.c:1244
+#: src/conversation/gnunet-conversation.c:1266
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/conversation/gnunet-conversation.c:1273
-msgid "sets the NAME of the ego to use for the phone (and name resolution)"
+#: src/conversation/gnunet-conversation.c:1295
+msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1279
+#: src/conversation/gnunet-conversation.c:1300
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1306
+#: src/conversation/gnunet-conversation.c:1329
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:119
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:145
-#, c-format
-msgid ""
-"\n"
-"We are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:210
-#, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
-msgstr ""
-
-#: src/conversation/gnunet_gst.c:622
 #: src/conversation/gnunet-helper-audio-playback-gst.c:361
+#: src/conversation/gnunet_gst.c:622
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1310,240 +1310,383 @@ msgstr "GNUnet-konfiguration"
 msgid "Core service of `%s' ready.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/core/gnunet-service-core_kx.c:566
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/core/gnunet-service-core_kx.c:626
+#: src/core/gnunet-service-core_kx.c:677
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:728
+#: src/core/gnunet-service-core_kx.c:779
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:778
+#: src/core/gnunet-service-core_kx.c:829
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:840
+#: src/core/gnunet-service-core_kx.c:891
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:874
+#: src/core/gnunet-service-core_kx.c:925
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:941
+#: src/core/gnunet-service-core_kx.c:992
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:948
+#: src/core/gnunet-service-core_kx.c:1005
 #, fuzzy
-msgid "# ephemeral keys received"
+msgid "# duplicate ephemeral keys ignored"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:987
+#: src/core/gnunet-service-core_kx.c:1040
+#, fuzzy
+msgid "# EPHEMERAL_KEYs rejected (bad signature)"
+msgstr "# PING-meddelanden skapade"
+
+#: src/core/gnunet-service-core_kx.c:1054
 #, c-format
 msgid ""
-"Ephemeral key message from peer `%s' rejected as its validity range does not "
-"match our system time (%llu not in [%llu,%llu]).\n"
+"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match "
+"our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:998
+#: src/core/gnunet-service-core_kx.c:1060
 #, fuzzy
-msgid "# EPHEMERAL_KEY messages received"
+msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1094
+#: src/core/gnunet-service-core_kx.c:1080
+#, fuzzy
+msgid "# valid ephemeral keys received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/core/gnunet-service-core_kx.c:1180
 #: src/transport/gnunet-service-transport_validation.c:1128
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1103
+#: src/core/gnunet-service-core_kx.c:1189
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1161
+#: src/core/gnunet-service-core_kx.c:1248
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1187
+#: src/core/gnunet-service-core_kx.c:1274
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1200
+#: src/core/gnunet-service-core_kx.c:1287
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1264
+#: src/core/gnunet-service-core_kx.c:1351
 #: src/transport/gnunet-service-transport_validation.c:1461
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1271
+#: src/core/gnunet-service-core_kx.c:1358
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1363
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1311
+#: src/core/gnunet-service-core_kx.c:1398
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1349
+#: src/core/gnunet-service-core_kx.c:1436
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1360
+#: src/core/gnunet-service-core_kx.c:1447
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
 
-#: src/core/gnunet-service-core_kx.c:1367
+#: src/core/gnunet-service-core_kx.c:1454
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1521
-#, fuzzy
-msgid "# DATA message dropped (out of order)"
-msgstr "# byte kastade via UDP (utgående)"
+#: src/core/gnunet-service-core_kx.c:1642
+#, fuzzy
+msgid "# DATA message dropped (out of order)"
+msgstr "# byte kastade via UDP (utgående)"
+
+#: src/core/gnunet-service-core_kx.c:1650
+#, 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:1653
+#, fuzzy
+msgid "# sessions terminated by key expiration"
+msgstr "# byte kastade via TCP (utgående)"
+
+#: src/core/gnunet-service-core_kx.c:1742
+#: src/core/gnunet-service-core_kx.c:1768
+#, fuzzy
+msgid "# bytes dropped (duplicates)"
+msgstr "# byte kastade via UDP (utgående)"
+
+#: src/core/gnunet-service-core_kx.c:1755
+#, fuzzy
+msgid "# bytes dropped (out of sequence)"
+msgstr "# byte kastade via UDP (utgående)"
+
+#: src/core/gnunet-service-core_kx.c:1797
+#, fuzzy
+msgid "# bytes dropped (ancient message)"
+msgstr "# byte kastade via UDP (utgående)"
+
+#: src/core/gnunet-service-core_kx.c:1805
+#, fuzzy
+msgid "# bytes of payload decrypted"
+msgstr "# byte dekrypterade"
+
+#: src/core/gnunet-service-core_sessions.c:260
+#: src/core/gnunet-service-core_sessions.c:350
+#: src/dht/gnunet-service-dht_neighbours.c:733
+#: src/dht/gnunet-service-dht_neighbours.c:795
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522
+#: src/topology/gnunet-daemon-topology.c:617
+#: src/topology/gnunet-daemon-topology.c:719
+#: src/transport/gnunet-service-transport_neighbours.c:721
+#: src/transport/gnunet-service-transport_neighbours.c:729
+#, fuzzy
+msgid "# peers connected"
+msgstr "# av anslutna parter"
+
+#: src/core/gnunet-service-core_sessions.c:296
+msgid "# type map refreshes sent"
+msgstr ""
+
+#: src/core/gnunet-service-core_sessions.c:416
+#, fuzzy
+msgid "# outdated typemap confirmations received"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/core/gnunet-service-core_sessions.c:433
+#, fuzzy
+msgid "# valid typemap confirmations received"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/core/gnunet-service-core_typemap.c:169
+#: src/core/gnunet-service-core_typemap.c:181
+#, fuzzy
+msgid "# type maps received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/core/gnunet-service-core_typemap.c:212
+msgid "# updates to my type map"
+msgstr ""
+
+#: src/credential/credential_misc.c:88
+#, fuzzy, c-format
+msgid "Unable to parse CRED record string `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888
+#: src/namestore/plugin_rest_namestore.c:1022
+#, fuzzy, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr "\"%s\": okänd tjänst: %s\n"
+
+#: src/credential/gnunet-credential.c:280
+#: src/credential/gnunet-credential.c:434
+#, fuzzy, c-format
+msgid "Issuer public key `%s' is not well-formed\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/credential/gnunet-credential.c:361
+#: src/credential/gnunet-credential.c:423
+#, fuzzy, c-format
+msgid "Issuer public key not well-formed\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/credential/gnunet-credential.c:372
+#: src/credential/gnunet-credential.c:444
+#, fuzzy, c-format
+msgid "Failed to connect to CREDENTIAL\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/credential/gnunet-credential.c:379
+#, c-format
+msgid "You must provide issuer the attribute\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:387
+#, c-format
+msgid "ego required\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:403
+#, c-format
+msgid "Subject public key needed\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:414
+#, fuzzy, c-format
+msgid "Subject public key `%s' is not well-formed\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/credential/gnunet-credential.c:451
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:504
+#, c-format
+msgid "Issuer ego required\n"
+msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1529
+#: src/credential/gnunet-credential.c:516
 #, c-format
-msgid ""
-"Session to peer `%s' went down due to key expiration (should not happen)\n"
+msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1532
-#, fuzzy
-msgid "# sessions terminated by key expiration"
-msgstr "# byte kastade via TCP (utgående)"
+#: src/credential/gnunet-credential.c:536
+msgid "create credential"
+msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1593
-#: src/core/gnunet-service-core_kx.c:1619
-#, fuzzy
-msgid "# bytes dropped (duplicates)"
-msgstr "# byte kastade via UDP (utgående)"
+#: src/credential/gnunet-credential.c:540
+msgid "verify credential against attribute"
+msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1606
+#: src/credential/gnunet-credential.c:545
 #, fuzzy
-msgid "# bytes dropped (out of sequence)"
-msgstr "# byte kastade via UDP (utgående)"
+msgid "The public key of the subject to lookup the credential for"
+msgstr "ange prioritet för innehållet"
 
-#: src/core/gnunet-service-core_kx.c:1648
-#, fuzzy
-msgid "# bytes dropped (ancient message)"
-msgstr "# byte kastade via UDP (utgående)"
+#: src/credential/gnunet-credential.c:550
+msgid "The name of the credential presented by the subject"
+msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1656
+#: src/credential/gnunet-credential.c:555
 #, fuzzy
-msgid "# bytes of payload decrypted"
-msgstr "# byte dekrypterade"
+msgid "The public key of the authority to verify the credential against"
+msgstr "ange prioritet för innehållet"
 
-#: src/core/gnunet-service-core_sessions.c:260
-#: src/core/gnunet-service-core_sessions.c:350
-#: src/dht/gnunet-service-dht_neighbours.c:733
-#: src/dht/gnunet-service-dht_neighbours.c:795
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520
-#: src/topology/gnunet-daemon-topology.c:612
-#: src/topology/gnunet-daemon-topology.c:714
-#: src/transport/gnunet-service-transport_neighbours.c:719
-#: src/transport/gnunet-service-transport_neighbours.c:727
+#: src/credential/gnunet-credential.c:560
 #, fuzzy
-msgid "# peers connected"
-msgstr "# av anslutna parter"
+msgid "The ego to use"
+msgstr "meddelandestorlek"
 
-#: src/core/gnunet-service-core_sessions.c:296
-msgid "# type map refreshes sent"
+#: src/credential/gnunet-credential.c:565
+msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:416
-#, fuzzy
-msgid "# outdated typemap confirmations received"
-msgstr "Kunde inte spara konfiguration!"
+#: src/credential/gnunet-credential.c:570
+msgid "The time to live for the credential"
+msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:433
-#, fuzzy
-msgid "# valid typemap confirmations received"
-msgstr "Kunde inte spara konfiguration!"
+#: src/credential/gnunet-credential.c:574
+msgid "collect credentials"
+msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:181
+#: src/credential/gnunet-credential.c:588
 #, fuzzy
-msgid "# type maps received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+msgid "GNUnet credential resolver tool"
+msgstr "Spåra GNUnets nätverkstopologi."
 
-#: src/core/gnunet-service-core_typemap.c:212
-msgid "# updates to my type map"
-msgstr ""
+#: src/credential/gnunet-service-credential.c:1138
+#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184
+#, fuzzy, c-format
+msgid "Failed to connect to GNS\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/credential/gnunet-service-credential.c:1144
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
+#: src/namestore/gnunet-namestore.c:914
+#: src/namestore/plugin_rest_namestore.c:1035
+#, fuzzy, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/credential/plugin_gnsrecord_credential.c:186
+#, fuzzy, c-format
+msgid "Unable to parse ATTR record string `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669
+#, fuzzy
+msgid "GNS REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
 
-#: src/datacache/datacache.c:119 src/datacache/datacache.c:294
+#: src/datacache/datacache.c:119 src/datacache/datacache.c:311
 #: src/datastore/gnunet-service-datastore.c:757
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# byte krypterade"
 
-#: src/datacache/datacache.c:123 src/datacache/datacache.c:298
+#: src/datacache/datacache.c:123 src/datacache/datacache.c:315
 #, fuzzy
 msgid "# items stored"
 msgstr "# byte krypterade"
 
-#: src/datacache/datacache.c:202
+#: src/datacache/datacache.c:206
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:213
+#: src/datacache/datacache.c:217
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/datacache/datacache.c:329
+#: src/datacache/datacache.c:344
 #, fuzzy
 msgid "# requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datacache/datacache.c:339
+#: src/datacache/datacache.c:354
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/datacache.c:367
+#: src/datacache/datacache.c:384
 #, fuzzy
 msgid "# requests for random value received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datacache/datacache.c:399
+#: src/datacache/datacache.c:416
 #, fuzzy
 msgid "# proximity search requests received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/datacache/plugin_datacache_heap.c:466
+#: src/datacache/plugin_datacache_heap.c:550
 msgid "Heap datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:113
-#: src/datacache/plugin_datacache_sqlite.c:122
+#: src/datacache/plugin_datacache_sqlite.c:118
+#: src/datacache/plugin_datacache_sqlite.c:127
 #: src/datastore/plugin_datastore_mysql.c:892
 #: src/datastore/plugin_datastore_sqlite.c:58
-#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92
-#: src/mysql/mysql.c:42 src/mysql/mysql.c:49
-#: src/namecache/plugin_namecache_sqlite.c:53
+#: src/datastore/plugin_datastore_sqlite.c:66
+#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80
+#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49
+#: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_sqlite.c:53
 #: src/peerstore/plugin_peerstore_sqlite.c:52
 #: src/psycstore/plugin_psycstore_mysql.c:62
@@ -1552,16 +1695,17 @@ msgstr ""
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:735 src/include/gnunet_common.h:744
+#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:817
-#: src/datastore/plugin_datastore_sqlite.c:456
-#: src/namecache/plugin_namecache_sqlite.c:296
-#: src/namestore/plugin_namestore_sqlite.c:355
+#: src/datacache/plugin_datacache_sqlite.c:862
+#: src/datastore/plugin_datastore_sqlite.c:508
+#: src/identity-provider/plugin_identity_provider_sqlite.c:336
+#: src/namecache/plugin_namecache_sqlite.c:329
+#: src/namestore/plugin_namestore_sqlite.c:264
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1863,7 +2007,7 @@ msgid "MySQL statement run failure"
 msgstr ""
 
 #: src/datastore/plugin_datastore_mysql.c:410
-#: src/datastore/plugin_datastore_sqlite.c:626
+#: src/datastore/plugin_datastore_sqlite.c:678
 #, fuzzy
 msgid "Data too large"
 msgstr "antal iterationer"
@@ -1902,32 +2046,34 @@ msgid "`%s' failed at %s:%u with error: %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:271
-#: src/namecache/plugin_namecache_sqlite.c:194
-#: src/namestore/plugin_namestore_sqlite.c:222
+#: src/identity-provider/plugin_identity_provider_sqlite.c:212
+#: src/namecache/plugin_namecache_sqlite.c:209
+#: src/namestore/plugin_namestore_sqlite.c:205
 #: src/peerstore/plugin_peerstore_sqlite.c:535
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:577
+#: src/datastore/plugin_datastore_sqlite.c:629
 msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1259
+#: src/datastore/plugin_datastore_sqlite.c:1322
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1293
+#: src/datastore/plugin_datastore_sqlite.c:1356
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1337
-#: src/namecache/plugin_namecache_sqlite.c:603
-#: src/namestore/plugin_namestore_sqlite.c:802
+#: src/datastore/plugin_datastore_sqlite.c:1400
+#: src/identity-provider/plugin_identity_provider_sqlite.c:711
+#: src/namecache/plugin_namecache_sqlite.c:640
+#: src/namestore/plugin_namestore_sqlite.c:754
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -1935,159 +2081,104 @@ msgstr ""
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:157
+#: src/dht/gnunet-dht-get.c:158
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
+#: src/dht/gnunet-dht-get.c:159
+#, c-format
+msgid "Result %d, type %d:\n"
+msgstr ""
+
 #: src/dht/gnunet-dht-get.c:204
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:218
+#: src/dht/gnunet-dht-get.c:219
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:222
+#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307
+#: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:251
+#: src/dht/gnunet-dht-get.c:253
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304
+#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:264
+#: src/dht/gnunet-dht-get.c:263
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227
+#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:283
+#: src/dht/gnunet-dht-get.c:280
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:310
+#: src/dht/gnunet-dht-monitor.c:319
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344
-#: src/nse/gnunet-nse-profiler.c:871
+#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372
+#: src/nse/gnunet-nse-profiler.c:878
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:328
+#: src/dht/gnunet-dht-monitor.c:337
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:253
-#, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "Maximalt antal chattklienter uppnått.\n"
-
-#: src/dht/gnunet_dht_profiler.c:1188
-#, fuzzy
-msgid "number of peers to start"
-msgstr "antal iterationer"
-
-#: src/dht/gnunet_dht_profiler.c:1194
-msgid ""
-"maximum number of times we try to search for successor circle formation (0 "
-"for R5N)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853
-#: src/testbed/gnunet-testbed-profiler.c:304
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1206
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1212
-msgid "delay to start doing PUTs (default: 1 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1218
-msgid "delay to start doing GETs (default: 5 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1223
-msgid "replication degree for DHT PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1230
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1248
-#, fuzzy
-msgid "Measure quality and performance of the DHT service."
-msgstr "Kan inte tillgå tjänsten"
-
-#: src/dht/gnunet-dht-put.c:120
-#, fuzzy
-msgid "PUT request sent with key"
-msgstr "# byte mottogs via TCP"
-
-#: src/dht/gnunet-dht-put.c:123
-msgid "Timeout sending PUT request!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:126
-#, fuzzy
-msgid "PUT request not confirmed!\n"
-msgstr "# byte mottogs via TCP"
-
-#: src/dht/gnunet-dht-put.c:156
+#: src/dht/gnunet-dht-put.c:134
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:163
-#, fuzzy, c-format
-msgid "Could not connect to %s service!\n"
+#: src/dht/gnunet-dht-put.c:142
+#, fuzzy
+msgid "Could not connect to DHT service!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-put.c:174
+#: src/dht/gnunet-dht-put.c:153
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-put.c:188
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:216
+#: src/dht/gnunet-dht-put.c:193
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:233
+#: src/dht/gnunet-dht-put.c:207
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:238
+#: src/dht/gnunet-dht-put.c:211
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:244
+#: src/dht/gnunet-dht-put.c:216
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:262
+#: src/dht/gnunet-dht-put.c:233
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
@@ -2096,78 +2187,78 @@ msgstr ""
 msgid "# GET requests from clients injected"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_clients.c:485
+#: src/dht/gnunet-service-dht_clients.c:483
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:624
+#: src/dht/gnunet-service-dht_clients.c:616
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:850
+#: src/dht/gnunet-service-dht_clients.c:842
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1035
+#: src/dht/gnunet-service-dht_clients.c:1027
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1050
+#: src/dht/gnunet-service-dht_clients.c:1042
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1096
+#: src/dht/gnunet-service-dht_clients.c:1088
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1103
+#: src/dht/gnunet-service-dht_clients.c:1095
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1181
+#: src/dht/gnunet-service-dht_clients.c:1173
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:72
+#: src/dht/gnunet-service-dht_datacache.c:73
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# byte mottagna av typen %d"
 
-#: src/dht/gnunet-service-dht_datacache.c:82
+#: src/dht/gnunet-service-dht_datacache.c:83
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:198
+#: src/dht/gnunet-service-dht_datacache.c:202
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:210
+#: src/dht/gnunet-service-dht_datacache.c:214
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:216
+#: src/dht/gnunet-service-dht_datacache.c:220
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:222
+#: src/dht/gnunet-service-dht_datacache.c:226
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-dht_datacache.c:238
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:242
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:273
+#: src/dht/gnunet-service-dht_datacache.c:277
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# byte mottogs via TCP"
@@ -2315,16 +2406,64 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/plugin_block_dht.c:187
+#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
+#, fuzzy, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "Maximalt antal chattklienter uppnått.\n"
+
+#: src/dht/gnunet_dht_profiler.c:949
+#, fuzzy
+msgid "number of peers to start"
+msgstr "antal iterationer"
+
+#: src/dht/gnunet_dht_profiler.c:954
+msgid "number of PUTs to perform per peer"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
+#: src/testbed/gnunet-testbed-profiler.c:304
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:964
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:969
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:974
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:979
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:984
+msgid "chance that a peer is selected at random for PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:989
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1009
+#, fuzzy
+msgid "Measure quality and performance of the DHT service."
+msgstr "Kan inte tillgå tjänsten"
+
+#: src/dht/plugin_block_dht.c:189
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/dht/plugin_block_dht.c:194
+#: src/dht/plugin_block_dht.c:198
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:204
+#: src/dht/plugin_block_dht.c:209
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2334,36 +2473,31 @@ msgstr ""
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/dns/dnsparser.c:818
+#: src/dns/dnsparser.c:823
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/dns/dnsstub.c:176
+#: src/dns/dnsstub.c:233
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382
+#: src/dns/dnsstub.c:364
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
+
+#: src/dns/dnsstub.c:511
 #, fuzzy, c-format
-msgid "Failed to send DNS request to %s\n"
+msgid "Failed to send DNS request to %s: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/dns/dnsstub.c:298
+#: src/dns/dnsstub.c:517
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/dns/dnsstub.c:367
-#, c-format
-msgid "Configured DNS exit `%s' is not working / valid.\n"
-msgstr ""
-
-#: src/dns/dnsstub.c:437
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
 #: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS queries"
 msgstr ""
@@ -2388,50 +2522,50 @@ msgstr ""
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:608
+#: src/dns/gnunet-service-dns.c:610
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:738
+#: src/dns/gnunet-service-dns.c:740
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:813
+#: src/dns/gnunet-service-dns.c:815
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:928
+#: src/dns/gnunet-service-dns.c:930
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:944
+#: src/dns/gnunet-service-dns.c:946
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:953
+#: src/dns/gnunet-service-dns.c:955
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:963
+#: src/dns/gnunet-service-dns.c:965
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:965
+#: src/dns/gnunet-service-dns.c:967
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1032
+#: src/dns/gnunet-service-dns.c:1034
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569
+#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/dns/gnunet-service-dns.c:1090
+#: src/dns/gnunet-service-dns.c:1092
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
@@ -2441,214 +2575,214 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/exit/gnunet-daemon-exit.c:961
+#: src/exit/gnunet-daemon-exit.c:960
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1062
+#: src/exit/gnunet-daemon-exit.c:1061
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1341
+#: src/exit/gnunet-daemon-exit.c:1340
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573
-#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702
-#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954
-#: src/exit/gnunet-daemon-exit.c:2208
+#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572
+#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701
+#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953
+#: src/exit/gnunet-daemon-exit.c:2207
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1468
+#: src/exit/gnunet-daemon-exit.c:1467
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1576
+#: src/exit/gnunet-daemon-exit.c:1575
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1616
+#: src/exit/gnunet-daemon-exit.c:1615
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1705
+#: src/exit/gnunet-daemon-exit.c:1704
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1789
+#: src/exit/gnunet-daemon-exit.c:1788
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1826
+#: src/exit/gnunet-daemon-exit.c:1825
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1957
+#: src/exit/gnunet-daemon-exit.c:1956
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280
-#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828
+#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279
+#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828
 #: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339
-#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887
+#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338
+#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887
 #: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2211
+#: src/exit/gnunet-daemon-exit.c:2210
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985
+#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985
 #: src/vpn/gnunet-service-vpn.c:2096
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875
+#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875
 #: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069
+#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/exit/gnunet-daemon-exit.c:2523
+#: src/exit/gnunet-daemon-exit.c:2522
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2542
+#: src/exit/gnunet-daemon-exit.c:2541
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr "# byte skickade av typen %d"
 
-#: src/exit/gnunet-daemon-exit.c:2720
+#: src/exit/gnunet-daemon-exit.c:2719
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2728
+#: src/exit/gnunet-daemon-exit.c:2727
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2802
+#: src/exit/gnunet-daemon-exit.c:2801
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2874
+#: src/exit/gnunet-daemon-exit.c:2873
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2922
+#: src/exit/gnunet-daemon-exit.c:2921
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:2936
+#: src/exit/gnunet-daemon-exit.c:2935
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:2962
+#: src/exit/gnunet-daemon-exit.c:2961
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2989
+#: src/exit/gnunet-daemon-exit.c:2988
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3035
+#: src/exit/gnunet-daemon-exit.c:3034
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3043
+#: src/exit/gnunet-daemon-exit.c:3042
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256
+#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278
+#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3319
+#: src/exit/gnunet-daemon-exit.c:3318
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346
+#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3358
+#: src/exit/gnunet-daemon-exit.c:3357
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3503
+#: src/exit/gnunet-daemon-exit.c:3501
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3511
+#: src/exit/gnunet-daemon-exit.c:3509
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3518
+#: src/exit/gnunet-daemon-exit.c:3516
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3524
+#: src/exit/gnunet-daemon-exit.c:3522
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3694
+#: src/exit/gnunet-daemon-exit.c:3690
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3809
+#: src/exit/gnunet-daemon-exit.c:3805
 #, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204
+#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3970
+#: src/exit/gnunet-daemon-exit.c:3966
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2781,64 +2915,64 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/fs_download.c:309
+#: src/fs/fs_download.c:310
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:334
+#: src/fs/fs_download.c:335
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:346
+#: src/fs/fs_download.c:347
 #, fuzzy, c-format
 msgid ""
 "Failed to access full directroy contents of `%s' for recursive download\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_download.c:533 src/fs/fs_download.c:545
+#: src/fs/fs_download.c:534 src/fs/fs_download.c:546
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:955
+#: src/fs/fs_download.c:956
 #, fuzzy, c-format
 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:1046
+#: src/fs/fs_download.c:1047
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1074
+#: src/fs/fs_download.c:1075
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1098
+#: src/fs/fs_download.c:1099
 #, 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:1110
+#: src/fs/fs_download.c:1111
 #, 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:1120
 #, 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:1219
+#: src/fs/fs_download.c:1220
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/fs_download.c:1884
+#: src/fs/fs_download.c:1885
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ogiltiga argument: "
@@ -2961,12 +3095,12 @@ msgstr "Kunde inte ansluta till gnunetd.\n"
 msgid "Internal error."
 msgstr "Okänt fel.\n"
 
-#: src/fs/fs_search.c:809 src/fs/fs_search.c:879
+#: src/fs/fs_search.c:822 src/fs/fs_search.c:892
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/fs_search.c:966
+#: src/fs/fs_search.c:979
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3020,96 +3154,96 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_uri.c:223
+#: src/fs/fs_uri.c:234
 #, fuzzy, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:282
+#: src/fs/fs_uri.c:293
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:300
+#: src/fs/fs_uri.c:311
 #, fuzzy
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:307
+#: src/fs/fs_uri.c:318
 #, fuzzy
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:377
+#: src/fs/fs_uri.c:388
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:418
+#: src/fs/fs_uri.c:429
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:433
+#: src/fs/fs_uri.c:444
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:512
+#: src/fs/fs_uri.c:523
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:527
+#: src/fs/fs_uri.c:538
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:537
+#: src/fs/fs_uri.c:548
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545
+#: src/fs/fs_uri.c:556
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:553
+#: src/fs/fs_uri.c:564
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:559
+#: src/fs/fs_uri.c:570
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:565
+#: src/fs/fs_uri.c:576
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:574
+#: src/fs/fs_uri.c:585
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:580
+#: src/fs/fs_uri.c:591
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
+#: src/fs/fs_uri.c:597
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:609
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:632
+#: src/fs/fs_uri.c:643
 #, fuzzy
 msgid "invalid argument"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/fs/fs_uri.c:644
+#: src/fs/fs_uri.c:655
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075
+#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1081
+#: src/fs/fs_uri.c:1092
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3151,19 +3285,19 @@ msgstr "Du måste ange en och endast en fil att 
avindexera.\n"
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949
+#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962
+#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -3210,106 +3344,97 @@ msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 msgid "Display contents of a GNUnet directory"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/gnunet-download.c:137
+#: src/fs/gnunet-download.c:139
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-download.c:147
+#: src/fs/gnunet-download.c:149
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Okänt fel"
 
-#: src/fs/gnunet-download.c:157
+#: src/fs/gnunet-download.c:158
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:179
+#: src/fs/gnunet-download.c:184
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-download.c:194
+#: src/fs/gnunet-download.c:201
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Uppladdning vägrades!"
 
-#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
+#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295
 #: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:246
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726
+#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:264
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:273
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
+#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870
 #: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:311
+#: src/fs/gnunet-download.c:344
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319
+#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:322
+#: src/fs/gnunet-download.c:354
 msgid "write the file to FILENAME"
 msgstr "skriv filen till FILNAMN"
 
-#: src/fs/gnunet-download.c:328
+#: src/fs/gnunet-download.c:359
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:334
+#: src/fs/gnunet-download.c:364
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:339
+#: src/fs/gnunet-download.c:368
 msgid "download a GNUnet directory recursively"
 msgstr "hämta en GNUnet-katalog rekursivt"
 
-#: src/fs/gnunet-download.c:356
+#: src/fs/gnunet-download.c:386
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:119
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:130
-#, fuzzy
-msgid "Special file-sharing operations"
-msgstr "Visa alla alternativ"
-
 #: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
@@ -3326,6 +3451,15 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
+#: src/fs/gnunet-fs.c:119
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:130
+#, fuzzy
+msgid "Special file-sharing operations"
+msgstr "Visa alla alternativ"
+
 #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -3462,56 +3596,56 @@ msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:916
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:923
+#: src/fs/gnunet-publish.c:919
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:930
+#: src/fs/gnunet-publish.c:925
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:935
+#: src/fs/gnunet-publish.c:930
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:942
+#: src/fs/gnunet-publish.c:937
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:955
+#: src/fs/gnunet-publish.c:950
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:968
+#: src/fs/gnunet-publish.c:960
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:975
+#: src/fs/gnunet-publish.c:966
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:982
+#: src/fs/gnunet-publish.c:973
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:998
+#: src/fs/gnunet-publish.c:989
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3589,7 +3723,7 @@ msgid "FS service is lacking HOSTKEY configuration 
setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
 #: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355
-#: src/topology/gnunet-daemon-topology.c:1203
+#: src/topology/gnunet-daemon-topology.c:1202
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -3640,7 +3774,7 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343
+#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345
 msgid "# P2P searches active"
 msgstr ""
 
@@ -3690,21 +3824,21 @@ msgstr ""
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1239
+#: src/fs/gnunet-service-fs_cp.c:1241
 #, fuzzy
 msgid "# requests dropped due to full reply queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_cp.c:1295
+#: src/fs/gnunet-service-fs_cp.c:1297
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1339
+#: src/fs/gnunet-service-fs_cp.c:1341
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1706
+#: src/fs/gnunet-service-fs_cp.c:1708
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -3927,6 +4061,10 @@ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
+#: src/gns/gns_tld_api.c:276
+msgid "Expected a base32-encoded public zone key\n"
+msgstr ""
+
 #: src/gns/gnunet-bcd.c:127
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
@@ -3955,134 +4093,65 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:238
+#: src/gns/gnunet-dns2gns.c:203
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:408
+#: src/gns/gnunet-dns2gns.c:404
 #, fuzzy, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:424
+#: src/gns/gnunet-dns2gns.c:420
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/gns/gnunet-dns2gns.c:432
+#: src/gns/gnunet-dns2gns.c:428
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:711
-msgid "No ego configured for `dns2gns` subsystem\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:739
+#: src/gns/gnunet-dns2gns.c:587
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/gns/gnunet-dns2gns.c:760
-#, fuzzy
-msgid "No valid GNS zone specified!\n"
-msgstr "Inga nyckelord angivna!\n"
-
-#: src/gns/gnunet-dns2gns.c:784
+#: src/gns/gnunet-dns2gns.c:687
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:790
-msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:796
-msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:802
+#: src/gns/gnunet-dns2gns.c:692
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:808
-msgid "Public key of the GNS zone to use (overrides default)"
+#: src/gns/gnunet-dns2gns.c:709
+msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:826
-msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
+#: src/gns/gnunet-gns-benchmark.c:582
+msgid "how long to wait between queries"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
+#: src/gns/gnunet-gns-benchmark.c:587
+msgid "how long to wait for an answer"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:252
-#, c-format
-msgid "Please specify name to lookup!\n"
+#: src/gns/gnunet-gns-benchmark.c:591
+msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:276
-#, c-format
-msgid "Ego for `%s' not found, cannot perform lookup.\n"
+#: src/gns/gnunet-gns-helper-service-w32.c:602
+msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701
-#: src/gns/plugin_rest_gns.c:422
-#, c-format
+#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727
-#, fuzzy, c-format
-msgid "Failed to connect to GNS\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/gns/gnunet-gns.c:374
-#, c-format
-msgid "Public key `%s' is not well-formed\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:428
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:434
-#, fuzzy
-msgid "Specify the type of the record to lookup"
-msgstr "ange prioritet för innehållet"
-
-#: src/gns/gnunet-gns.c:440
-#, fuzzy
-msgid "Specify timeout for the lookup"
-msgstr "ange prioritet för innehållet"
-
-#: src/gns/gnunet-gns.c:445
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:451
-#, fuzzy
-msgid "Specify the public key of the zone to lookup the record in"
-msgstr "ange prioritet för innehållet"
-
-#: src/gns/gnunet-gns.c:457
-#, fuzzy
-msgid "Specify the name of the ego of the zone to lookup the record in"
-msgstr "ange prioritet för innehållet"
-
-#: src/gns/gnunet-gns.c:476
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "Spåra GNUnets nätverkstopologi."
-
-#: src/gns/gnunet-gns-helper-service-w32.c:602
-msgid "Not ready to process requests, lacking ego data\n"
-msgstr ""
-
 #: src/gns/gnunet-gns-helper-service-w32.c:739
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
@@ -4093,229 +4162,238 @@ msgid "This program will import some GNS authorities 
into your GNS namestore."
 msgstr ""
 
 #: src/gns/gnunet-gns-proxy.c:109
-#: src/hostlist/gnunet-daemon-hostlist_client.c:569
-#: src/hostlist/gnunet-daemon-hostlist_client.c:787
-#: src/hostlist/gnunet-daemon-hostlist_client.c:793
-#: src/hostlist/gnunet-daemon-hostlist_client.c:845
-#: src/hostlist/gnunet-daemon-hostlist_client.c:854
-#: src/hostlist/gnunet-daemon-hostlist_client.c:965
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1060
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1065
+#: src/hostlist/gnunet-daemon-hostlist_client.c:535
+#: src/hostlist/gnunet-daemon-hostlist_client.c:753
+#: src/hostlist/gnunet-daemon-hostlist_client.c:759
+#: src/hostlist/gnunet-daemon-hostlist_client.c:811
+#: src/hostlist/gnunet-daemon-hostlist_client.c:820
+#: src/hostlist/gnunet-daemon-hostlist_client.c:931
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
 #: src/transport/plugin_transport_http_client.c:598
 #: src/transport/plugin_transport_http_client.c:616
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/gns/gnunet-gns-proxy.c:887
+#: src/gns/gnunet-gns-proxy.c:910
 #, fuzzy, c-format
-msgid "Unsupported CURL SSL backend %d\n"
+msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:933
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:956
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/gns/gnunet-gns-proxy.c:946
+#: src/gns/gnunet-gns-proxy.c:969
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:961
+#: src/gns/gnunet-gns-proxy.c:984
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:971
+#: src/gns/gnunet-gns-proxy.c:994
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:995
+#: src/gns/gnunet-gns-proxy.c:1018
 #, c-format
-msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgid "TLS certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1104
+#: src/gns/gnunet-gns-proxy.c:1132
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1709
+#: src/gns/gnunet-gns-proxy.c:1868
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2172
+#: src/gns/gnunet-gns-proxy.c:2364
 #, 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:2202
+#: src/gns/gnunet-gns-proxy.c:2394
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:2375
+#: src/gns/gnunet-gns-proxy.c:2573
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2394 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2716
+#: src/gns/gnunet-gns-proxy.c:2925
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2745
+#: src/gns/gnunet-gns-proxy.c:2954
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2763 src/gns/gnunet-gns-proxy.c:2792
-msgid "SSL connection to plain IPv4 address requested\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:2842
+#: src/gns/gnunet-gns-proxy.c:3035
 #, fuzzy, c-format
-msgid "Unsupported socks address type %d\n"
-msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
-
-#: src/gns/gnunet-gns-proxy.c:3177 src/gns/gnunet-service-gns.c:403
-#, c-format
-msgid "No ego configured for `%s`\n"
-msgstr ""
+msgid "Unsupported socks address type %d\n"
+msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3238
+#: src/gns/gnunet-gns-proxy.c:3316
 #, fuzzy, c-format
-msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
+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:3281
+#: src/gns/gnunet-gns-proxy.c:3443
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3287
+#: src/gns/gnunet-gns-proxy.c:3448
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3312
+#: src/gns/gnunet-gns-proxy.c:3473
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:442
+#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:238
+#, fuzzy
+msgid "Specify the type of the record to lookup"
+msgstr "ange prioritet för innehållet"
+
+#: src/gns/gnunet-gns.c:242
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:258
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "Spåra GNUnets nätverkstopologi."
+
+#: src/gns/gnunet-service-gns.c:513
+#, fuzzy
+msgid "Properly base32-encoded public key required"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/gns/gnunet-service-gns.c:549
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:461
-#: src/zonemaster/gnunet-service-zonemaster.c:742
+#: src/gns/gnunet-service-gns.c:568
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
+#: src/zonemaster/gnunet-service-zonemaster.c:875
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:263
+#: src/gns/gnunet-service-gns_interceptor.c:259
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:370
+#: src/gns/gnunet-service-gns_interceptor.c:366
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:641
+#: src/gns/gnunet-service-gns_resolver.c:713
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:652
+#: src/gns/gnunet-service-gns_resolver.c:724
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:844
+#: src/gns/gnunet-service-gns_resolver.c:927
 #, 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:986
+#: src/gns/gnunet-service-gns_resolver.c:1102
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1347
+#: src/gns/gnunet-service-gns_resolver.c:1796
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1865
+#: src/gns/gnunet-service-gns_resolver.c:1839
+msgid "GNS lookup failed (zero records found)\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:2253
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1889
+#: src/gns/gnunet-service-gns_resolver.c:2276
 #, 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:2171
+#: src/gns/gnunet-service-gns_resolver.c:2563
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2318
-#, c-format
-msgid "Hostname `%s' is not well-formed, resolution fails\n"
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:203
+#: src/gns/plugin_gnsrecord_gns.c:181
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:232
+#: src/gns/plugin_gnsrecord_gns.c:212
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:253
+#: src/gns/plugin_gnsrecord_gns.c:233
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:276
+#: src/gns/plugin_gnsrecord_gns.c:258
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:312
+#: src/gns/plugin_gnsrecord_gns.c:294
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:360
-#, fuzzy, c-format
-msgid "Unable to parse REVERSE record string `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
 #: src/gns/plugin_rest_gns.c:384
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:668
-#, fuzzy
-msgid "GNS REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
 #: src/gnsrecord/plugin_gnsrecord_dns.c:359
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4484,153 +4562,153 @@ msgstr ""
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:371
+#: src/hostlist/gnunet-daemon-hostlist_client.c:349
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:392
-#: src/hostlist/gnunet-daemon-hostlist_client.c:437
+#: src/hostlist/gnunet-daemon-hostlist_client.c:370
+#: src/hostlist/gnunet-daemon-hostlist_client.c:403
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:395
-#: src/hostlist/gnunet-daemon-hostlist_client.c:440
+#: src/hostlist/gnunet-daemon-hostlist_client.c:373
+#: src/hostlist/gnunet-daemon-hostlist_client.c:406
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:413
+#: src/hostlist/gnunet-daemon-hostlist_client.c:391
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:695
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1441
+#: src/hostlist/gnunet-daemon-hostlist_client.c:661
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:725
+#: src/hostlist/gnunet-daemon-hostlist_client.c:691
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:768
+#: src/hostlist/gnunet-daemon-hostlist_client.c:734
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:862
 #, 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:910
+#: src/hostlist/gnunet-daemon-hostlist_client.c:876
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:930
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, 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:936
+#: src/hostlist/gnunet-daemon-hostlist_client.c:902
 #, 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:944
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:997
+#: src/hostlist/gnunet-daemon-hostlist_client.c:963
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1005
+#: src/hostlist/gnunet-daemon-hostlist_client.c:971
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1132
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1698
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1098
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1665
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1141
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1107
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1200
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1221
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1166
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1187
 #, fuzzy
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
 #, 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:1392
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
 #, 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:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
 #, 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:1435
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1438
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1484
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
 #, 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:1491
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
 #, 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:1515
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1532
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1527
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1595
 #: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1657
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1624
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1671
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1638
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1651
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4649,7 +4727,7 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_server.c:531
 #: src/peerinfo-tool/gnunet-peerinfo.c:385
 #: src/peerinfo-tool/gnunet-peerinfo.c:534
-#: src/topology/gnunet-daemon-topology.c:857
+#: src/topology/gnunet-daemon-topology.c:862
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -4746,6 +4824,71 @@ msgstr "\"%s\" är inte tillgänglig."
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
+#: src/identity-provider/gnunet-idp.c:424
+#, fuzzy
+msgid "Ego is required\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/identity-provider/gnunet-idp.c:432
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:440
+#, fuzzy
+msgid "Requesting party key is required!\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/identity-provider/gnunet-idp.c:463
+msgid "Add attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:469
+msgid "Attribute value"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:474
+msgid "Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:479
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:483
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:488
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:493
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:498
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:503
+msgid "Type of attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:508
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/identity-provider/identity_provider_api.c:436
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/identity-provider/plugin_rest_identity_provider.c:1230
+#: src/identity-provider/plugin_rest_openid_connect.c:2147
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
 #: src/identity/gnunet-identity.c:179
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
@@ -4833,34 +4976,11 @@ 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:967
+#: src/identity/plugin_rest_identity.c:968
 #, fuzzy
 msgid "Identity REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/identity-provider/gnunet-identity-token.c:66
-#, fuzzy
-msgid "Option `-t' is required\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
-
-#: src/identity-provider/gnunet-identity-token.c:77
-#, fuzzy, c-format
-msgid "Token `%s' is malformed\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/identity-provider/gnunet-identity-token.c:166
-msgid "GNUid token"
-msgstr ""
-
-#: src/identity-provider/gnunet-identity-token.c:171
-msgid "Print token contents"
-msgstr ""
-
-#: src/identity-provider/plugin_rest_identity_provider.c:1166
-#, fuzzy
-msgid "Identity Token REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
 #: src/json/json.c:119
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -4890,7 +5010,7 @@ msgstr "Kunde inte köra \"%s\": %s\n"
 msgid "No records found for `%s'"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4910,7 +5030,7 @@ msgstr "Ogiltigt argument: \"%s\"\n"
 msgid "You must specify a name\n"
 msgstr "Du måste ange en mottagare!\n"
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4919,7 +5039,7 @@ msgstr ""
 msgid "spezifies the public key of the zone to look in"
 msgstr "ange prioritet för innehållet"
 
-#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
@@ -4933,293 +5053,299 @@ msgstr ""
 msgid "Error communicating with namecache service"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namecache/plugin_namecache_flat.c:119
-#: src/namecache/plugin_namecache_flat.c:253
-#: src/namestore/plugin_namestore_flat.c:179
-#: src/namestore/plugin_namestore_flat.c:375
+#: src/namecache/plugin_namecache_flat.c:121
+#: src/namecache/plugin_namecache_flat.c:255
+#: src/namestore/plugin_namestore_flat.c:150
+#: src/namestore/plugin_namestore_flat.c:385
 #: src/peerstore/plugin_peerstore_flat.c:379
 #: src/peerstore/plugin_peerstore_flat.c:538
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/namecache/plugin_namecache_flat.c:130
-#: src/namestore/plugin_namestore_flat.c:190
+#: src/namecache/plugin_namecache_flat.c:132
+#: src/namestore/plugin_namestore_flat.c:161
 #: src/peerstore/plugin_peerstore_flat.c:394
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/namecache/plugin_namecache_flat.c:149
-#: src/namestore/plugin_namestore_flat.c:203
+#: src/namecache/plugin_namecache_flat.c:151
+#: src/namestore/plugin_namestore_flat.c:174
 #: src/peerstore/plugin_peerstore_flat.c:406
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/namecache/plugin_namecache_flat.c:408
+#: src/namecache/plugin_namecache_flat.c:410
 msgid "flat plugin running\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:301
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:547
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:567
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:598
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:678
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:736
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:754
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:790
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:799
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1019
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1045
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1092
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1130
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:313
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:562
+#: src/namestore/gnunet-namestore.c:343
+#: src/namestore/plugin_rest_namestore.c:572
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:571
+#: src/namestore/gnunet-namestore.c:350
+#: src/namestore/plugin_rest_namestore.c:581
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527
-#: src/namestore/gnunet-namestore.c:535
+#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561
-#: src/namestore/gnunet-namestore.c:573
+#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
-#: src/namestore/plugin_rest_namestore.c:597
+#: src/namestore/gnunet-namestore.c:677
+#, c-format
+msgid ""
+"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:810
+#: src/namestore/plugin_rest_namestore.c:607
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:739
+#: src/namestore/gnunet-namestore.c:851
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:776
-#: src/namestore/plugin_rest_namestore.c:1004
-#, fuzzy, c-format
-msgid "Ego `%s' not known to identity service\n"
-msgstr "\"%s\": okänd tjänst: %s\n"
-
-#: src/namestore/gnunet-namestore.c:791
+#: src/namestore/gnunet-namestore.c:903
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:802
-#: src/namestore/gnunet-namestore-fcfsd.c:1034
-#: src/namestore/plugin_rest_namestore.c:1017
-#, fuzzy
-msgid "Failed to connect to namestore\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819
-#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861
-#: src/namestore/gnunet-namestore.c:915
+#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973
+#: src/namestore/gnunet-namestore.c:1027
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820
-#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863
+#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932
+#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:829
-#: src/namestore/plugin_rest_namestore.c:671
+#: src/namestore/gnunet-namestore.c:941
+#: src/namestore/plugin_rest_namestore.c:684
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore.c:851
-#: src/namestore/plugin_rest_namestore.c:689
-#: src/namestore/plugin_rest_namestore.c:729
+#: src/namestore/gnunet-namestore.c:963
+#: src/namestore/plugin_rest_namestore.c:704
+#: src/namestore/plugin_rest_namestore.c:746
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
 
-#: src/namestore/gnunet-namestore.c:896
+#: src/namestore/gnunet-namestore.c:1008
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1028
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:950
+#: src/namestore/gnunet-namestore.c:1071
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/namestore/gnunet-namestore.c:1100
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:1014
+#: src/namestore/gnunet-namestore.c:1135
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:1051
-#: src/namestore/plugin_rest_namestore.c:1047
+#: src/namestore/gnunet-namestore.c:1175
+#: src/namestore/plugin_rest_namestore.c:1065
 #, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1108
-#: src/namestore/plugin_rest_namestore.c:1143
+#: src/namestore/gnunet-namestore.c:1239
+#: src/namestore/plugin_rest_namestore.c:1161
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1137
+#: src/namestore/gnunet-namestore.c:1264
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1142
+#: src/namestore/gnunet-namestore.c:1268
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1147
+#: src/namestore/gnunet-namestore.c:1272
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1153
+#: src/namestore/gnunet-namestore.c:1277
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1282
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1164
+#: src/namestore/gnunet-namestore.c:1286
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1176
+#: src/namestore/gnunet-namestore.c:1296
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1184
+#: src/namestore/gnunet-namestore.c:1301
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1190
+#: src/namestore/gnunet-namestore.c:1306
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1196
+#: src/namestore/gnunet-namestore.c:1311
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1201
+#: src/namestore/gnunet-namestore.c:1315
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1206
+#: src/namestore/gnunet-namestore.c:1319
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1212
+#: src/namestore/gnunet-namestore.c:1324
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:508
-#, fuzzy, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:535
-#, fuzzy, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:555
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:585
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:662
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:718
+#: src/namestore/gnunet-service-namestore.c:750
 #, fuzzy, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:734
-#, fuzzy, c-format
-msgid "Failed to setup post processor for `%s'\n"
+msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:770
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:778
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:974
-msgid "No ego configured for `fcfsd` subsystem\n"
+#: src/namestore/gnunet-zoneimport.c:2035
+msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1000
-#, fuzzy
-msgid "Failed to start HTTP server\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1042
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1074
-msgid "GNU Name System First Come First Serve name registration service"
+#: src/namestore/gnunet-zoneimport.c:2040
+msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:615
-#, fuzzy, c-format
-msgid "Failed to replicate block in namecache: %s\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/namestore/namestore_api.c:379
+#: src/namestore/namestore_api.c:391
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:656
+#: src/namestore/plugin_namestore_flat.c:767
 msgid "flat file database running\n"
 msgstr ""
 
-#: src/namestore/plugin_rest_namestore.c:1188
+#: src/namestore/plugin_namestore_sqlite.c:218
+#: src/namestore/plugin_namestore_sqlite.c:229
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "Fel vid %s:%d.\n"
+
+#: src/namestore/plugin_rest_namestore.c:1206
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -5248,11 +5374,11 @@ msgstr "GNUnet-konfiguration"
 msgid "section name providing the configuration for the adapter"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447
+#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453
 msgid "use TCP"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452
+#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458
 msgid "use UDP"
 msgstr ""
 
@@ -5435,58 +5561,58 @@ msgstr "Misslyckades att binda till UDP-port %d.\n"
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/nat/gnunet-nat.c:425
+#: src/nat/gnunet-nat.c:431
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:431
+#: src/nat/gnunet-nat.c:437
 msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:437
+#: src/nat/gnunet-nat.c:443
 msgid ""
 "name of configuration section to find additional options, such as manual "
 "host punching data"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:442
+#: src/nat/gnunet-nat.c:448
 msgid "enable STUN processing"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:457
+#: src/nat/gnunet-nat.c:463
 msgid "watch for connection reversal requests"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:469
+#: src/nat/gnunet-nat.c:475
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1335
+#: src/nat/gnunet-service-nat.c:1339
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1345
+#: src/nat/gnunet-service-nat.c:1349
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1361
+#: src/nat/gnunet-service-nat.c:1365
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1372
+#: src/nat/gnunet-service-nat.c:1376
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1837
+#: src/nat/gnunet-service-nat.c:1841
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Samling stoppad.\n"
 
-#: src/nat/gnunet-service-nat.c:1910
+#: src/nat/gnunet-service-nat.c:1914
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5506,100 +5632,45 @@ msgstr "Misslyckades att starta samling.\n"
 msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat_mini.c:656
-msgid "`upnpc' command not found\n"
-msgstr ""
-
-#: src/nse/gnunet-nse.c:122
-#, fuzzy
-msgid "Show network size estimates from NSE service."
-msgstr "# byte mottogs via TCP"
-
-#: src/nse/gnunet-nse-profiler.c:842
-#, fuzzy
-msgid "limit to the number of connections to NSE services, 0 for none"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/nse/gnunet-nse-profiler.c:847
-msgid "name of the file for writing connection information and statistics"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:859
-msgid "name of the file for writing the main results"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:866
-msgid "Number of peers to run in each round, separated by commas"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:877
-msgid "delay between rounds"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:886
-#, fuzzy
-msgid "Measure quality and performance of the NSE service."
-msgstr "Kan inte tillgå tjänsten"
-
-#: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:840 src/util/gnunet-scrypt.c:276
-msgid "Value is too large.\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:178
-#, fuzzy, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Tillgängliga transport(er): %s\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:310
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:331
-#: src/peerinfo/gnunet-service-peerinfo.c:362
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:446
-msgid "# peers known"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:489
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:655
-#, fuzzy, c-format
-msgid "Scanning directory `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#: src/nat/gnunet-service-nat_mini.c:656
+msgid "`upnpc' command not found\n"
+msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:663
-#, c-format
-msgid "Still no peers found in `%s'!\n"
+#: src/nse/gnunet-nse-profiler.c:849
+#, fuzzy
+msgid "limit to the number of connections to NSE services, 0 for none"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/nse/gnunet-nse-profiler.c:854
+msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1080
-#, fuzzy, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+#: src/nse/gnunet-nse-profiler.c:866
+msgid "name of the file for writing the main results"
+msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1409
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
+#: src/nse/gnunet-nse-profiler.c:873
+msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1422
-msgid "Skipping import of included HELLOs\n"
+#: src/nse/gnunet-nse-profiler.c:884
+msgid "delay between rounds"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:220
+#: src/nse/gnunet-nse-profiler.c:893
 #, fuzzy
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+msgid "Measure quality and performance of the NSE service."
+msgstr "Kan inte tillgå tjänsten"
+
+#: src/nse/gnunet-nse.c:122
+#, fuzzy
+msgid "Show network size estimates from NSE service."
+msgstr "# byte mottogs via TCP"
+
+#: src/nse/gnunet-service-nse.c:1534
+#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
+msgid "Value is too large.\n"
+msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
@@ -5691,6 +5762,61 @@ msgstr "Testar transport(er) %s\n"
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
+#: src/peerinfo/gnunet-service-peerinfo.c:178
+#, fuzzy, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Tillgängliga transport(er): %s\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:313
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:334
+#: src/peerinfo/gnunet-service-peerinfo.c:365
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:449
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:492
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:659
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:667
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1100
+#, fuzzy, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1438
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1451
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:220
+#, fuzzy
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
 #: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
@@ -6004,11 +6130,11 @@ msgstr "\"%s\" är inte en fil.\n"
 msgid "Search string `%s' is too long!\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/rest/gnunet-rest-server.c:790
+#: src/rest/gnunet-rest-server.c:927
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:807
+#: src/rest/gnunet-rest-server.c:944
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Spåra GNUnets nätverkstopologi."
@@ -6143,19 +6269,22 @@ msgid "# revocation set unions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
 #: src/revocation/gnunet-service-revocation.c:525
-#: src/revocation/gnunet-service-revocation.c:773
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:864
+#: src/revocation/gnunet-service-revocation.c:867
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/rps/gnunet-rps.c:146
+#: src/rps/gnunet-rps.c:203
 msgid "Seed a PeerID"
 msgstr ""
 
+#: src/rps/gnunet-rps.c:207
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
 #: src/scalarproduct/gnunet-scalarproduct.c:220
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
@@ -6211,10 +6340,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Anslutning misslyckades (fel?)\n"
@@ -6594,14 +6723,14 @@ msgstr ""
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:247
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:249
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46
-#: src/testing/testing.c:288 src/util/gnunet-ecc.c:306
+#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6671,16 +6800,6 @@ msgstr ""
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:118
-#, fuzzy
-msgid "Waiting for child to exit.\n"
-msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:241
-#, fuzzy, c-format
-msgid "Spawning process `%s'\n"
-msgstr "Startade samling \"%s\".\n"
-
 #: src/testbed/gnunet-testbed-profiler.c:289
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
@@ -6692,6 +6811,16 @@ msgid ""
 "signal is received"
 msgstr ""
 
+#: src/testbed/gnunet_testbed_mpi_spawn.c:118
+#, fuzzy
+msgid "Waiting for child to exit.\n"
+msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
+
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
+#, fuzzy, c-format
+msgid "Spawning process `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
 #: src/testbed/testbed_api.c:410
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
@@ -6915,83 +7044,79 @@ msgstr "Fel vid %s:%d.\n"
 msgid "Failed to load configuration from %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/topology/friends.c:106
+#: src/topology/friends.c:126
 #, fuzzy, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/topology/friends.c:160
+#: src/topology/friends.c:180
 #, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:225
+#: src/topology/gnunet-daemon-topology.c:230
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:339
+#: src/topology/gnunet-daemon-topology.c:344
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# byte mottogs via TCP"
 
-#: src/topology/gnunet-daemon-topology.c:533
+#: src/topology/gnunet-daemon-topology.c:538
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:635
-#: src/topology/gnunet-daemon-topology.c:721
+#: src/topology/gnunet-daemon-topology.c:640
+#: src/topology/gnunet-daemon-topology.c:726
 #, fuzzy
 msgid "# friends connected"
 msgstr "# av anslutna parter"
 
-#: src/topology/gnunet-daemon-topology.c:918
+#: src/topology/gnunet-daemon-topology.c:923
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:951
+#: src/topology/gnunet-daemon-topology.c:956
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:958
+#: src/topology/gnunet-daemon-topology.c:963
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:980
+#: src/topology/gnunet-daemon-topology.c:985
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:983
+#: src/topology/gnunet-daemon-topology.c:988
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:990
+#: src/topology/gnunet-daemon-topology.c:995
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:1001
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1059
+#: src/topology/gnunet-daemon-topology.c:1054
 #: src/transport/plugin_transport_wlan.c:1517
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/topology/gnunet-daemon-topology.c:1233
+#: src/topology/gnunet-daemon-topology.c:1232
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:141
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport.c:448
 msgid "# messages dropped due to slow client"
 msgstr ""
@@ -7040,222 +7165,226 @@ msgstr ""
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:804
+#: src/transport/gnunet-service-transport_neighbours.c:806
 #, fuzzy
 msgid "# session creation failed"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1053
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1168
+#: src/transport/gnunet-service-transport_neighbours.c:1176
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1764
+#: src/transport/gnunet-service-transport_neighbours.c:1324
+#: src/transport/gnunet-service-transport_neighbours.c:1785
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1316
+#: src/transport/gnunet-service-transport_neighbours.c:1329
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1322
+#: src/transport/gnunet-service-transport_neighbours.c:1335
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1395
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1458
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1494
+#: src/transport/gnunet-service-transport_neighbours.c:1515
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1502
+#: src/transport/gnunet-service-transport_neighbours.c:1523
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1512
+#: src/transport/gnunet-service-transport_neighbours.c:1533
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1557
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1566
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1574
+#: src/transport/gnunet-service-transport_neighbours.c:1595
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1583
+#: src/transport/gnunet-service-transport_neighbours.c:1604
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1588
+#: src/transport/gnunet-service-transport_neighbours.c:1609
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1615
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1661
+#: src/transport/gnunet-service-transport_neighbours.c:1682
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1695
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1710
+#: src/transport/gnunet-service-transport_neighbours.c:1731
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1830
+#: src/transport/gnunet-service-transport_neighbours.c:1854
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1850
+#: src/transport/gnunet-service-transport_neighbours.c:1874
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1889
+#: src/transport/gnunet-service-transport_neighbours.c:1913
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1906
+#: src/transport/gnunet-service-transport_neighbours.c:1930
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1936
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2001
+#: src/transport/gnunet-service-transport_neighbours.c:2028
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2055
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2072
+#: src/transport/gnunet-service-transport_neighbours.c:2099
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2233
+#: src/transport/gnunet-service-transport_neighbours.c:2262
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2238
+#: src/transport/gnunet-service-transport_neighbours.c:2267
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2623
+#: src/transport/gnunet-service-transport_neighbours.c:2654
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3105
+#: src/transport/gnunet-service-transport_neighbours.c:3139
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3113
+#: src/transport/gnunet-service-transport_neighbours.c:3147
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3131
-#: src/transport/gnunet-service-transport_neighbours.c:3155
+#: src/transport/gnunet-service-transport_neighbours.c:3165
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3167
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3192
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3205
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3377
+#: src/transport/gnunet-service-transport_neighbours.c:3412
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3413
+#: src/transport/gnunet-service-transport_neighbours.c:3448
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3501
+#: src/transport/gnunet-service-transport_neighbours.c:3536
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3508
+#: src/transport/gnunet-service-transport_neighbours.c:3543
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3548
+#: src/transport/gnunet-service-transport_neighbours.c:3583
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3555
+#: src/transport/gnunet-service-transport_neighbours.c:3590
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3566
+#: src/transport/gnunet-service-transport_neighbours.c:3601
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3700
+#: src/transport/gnunet-service-transport_neighbours.c:3736
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
@@ -7371,6 +7500,51 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_validation.c:1627
+#, fuzzy
+msgid "# HELLOs given to peerinfo"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#: src/transport/gnunet-transport-profiler.c:219
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:617
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:621
+#, fuzzy
+msgid "receive data from peer"
+msgstr "# byte mottagna av typen %d"
+
+#: src/transport/gnunet-transport-profiler.c:626
+#, fuzzy
+msgid "iterations"
+msgstr "Visa alla alternativ"
+
+#: src/transport/gnunet-transport-profiler.c:631
+#, fuzzy
+msgid "number of messages to send"
+msgstr "antal meddelanden att använda per iteration"
+
+#: src/transport/gnunet-transport-profiler.c:636
+#, fuzzy
+msgid "message size to use"
+msgstr "meddelandestorlek"
+
+#: src/transport/gnunet-transport-profiler.c:641
+#: src/transport/gnunet-transport.c:1462
+msgid "peer identity"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:652
+#: src/transport/gnunet-transport.c:1482
+#, fuzzy
+msgid "Direct access to transport service."
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
 #: src/transport/gnunet-transport.c:413
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7510,11 +7684,6 @@ msgstr "Skriv ut information om GNUnets motparter."
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:1462
-#: src/transport/gnunet-transport-profiler.c:641
-msgid "peer identity"
-msgstr ""
-
 #: src/transport/gnunet-transport.c:1466
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7523,46 +7692,11 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1482
-#: src/transport/gnunet-transport-profiler.c:652
-#, fuzzy
-msgid "Direct access to transport service."
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/transport/gnunet-transport-profiler.c:219
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:617
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:621
-#, fuzzy
-msgid "receive data from peer"
-msgstr "# byte mottagna av typen %d"
-
-#: src/transport/gnunet-transport-profiler.c:626
-#, fuzzy
-msgid "iterations"
-msgstr "Visa alla alternativ"
-
-#: src/transport/gnunet-transport-profiler.c:631
-#, fuzzy
-msgid "number of messages to send"
-msgstr "antal meddelanden att använda per iteration"
-
-#: src/transport/gnunet-transport-profiler.c:636
-#, fuzzy
-msgid "message size to use"
-msgstr "meddelandestorlek"
-
 #: src/transport/plugin_transport_http_client.c:1474
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3526
-#: src/transport/plugin_transport_tcp.c:3890
-#: src/transport/plugin_transport_tcp.c:3897
+#: src/transport/plugin_transport_tcp.c:3891
+#: src/transport/plugin_transport_tcp.c:3898
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7633,7 +7767,7 @@ msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2901
-#: src/transport/plugin_transport_udp.c:3622
+#: src/transport/plugin_transport_udp.c:3623
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7752,7 +7886,7 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1730
 #: src/transport/plugin_transport_tcp.c:1954
 #: src/transport/plugin_transport_tcp.c:3137
-#: src/transport/plugin_transport_tcp.c:4013
+#: src/transport/plugin_transport_tcp.c:4014
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
@@ -7795,119 +7929,119 @@ msgstr ""
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:3408
+#: src/transport/plugin_transport_tcp.c:3409
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:3459
-#: src/transport/plugin_transport_tcp.c:3517
+#: src/transport/plugin_transport_tcp.c:3460
+#: src/transport/plugin_transport_tcp.c:3518
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "Nätverksanslutning"
 
-#: src/transport/plugin_transport_tcp.c:3463
+#: src/transport/plugin_transport_tcp.c:3464
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# av anslutna parter"
 
-#: src/transport/plugin_transport_tcp.c:3469
+#: src/transport/plugin_transport_tcp.c:3470
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3471
+#: src/transport/plugin_transport_tcp.c:3472
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3511
+#: src/transport/plugin_transport_tcp.c:3512
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3521
+#: src/transport/plugin_transport_tcp.c:3522
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3840
+#: src/transport/plugin_transport_tcp.c:3841
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:4001
+#: src/transport/plugin_transport_tcp.c:4002
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4005
+#: src/transport/plugin_transport_tcp.c:4006
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4009
+#: src/transport/plugin_transport_tcp.c:4010
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:168
-#, fuzzy
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:548
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:565
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp.c:3366
+#: src/transport/plugin_transport_udp.c:3367
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3380
+#: src/transport/plugin_transport_udp.c:3381
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3698
-#: src/transport/plugin_transport_udp.c:3797
+#: src/transport/plugin_transport_udp.c:3699
+#: src/transport/plugin_transport_udp.c:3798
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3716
+#: src/transport/plugin_transport_udp.c:3717
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3807
+#: src/transport/plugin_transport_udp.c:3808
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3878
-#: src/transport/plugin_transport_udp.c:3892
+#: src/transport/plugin_transport_udp.c:3879
+#: src/transport/plugin_transport_udp.c:3893
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3924
+#: src/transport/plugin_transport_udp.c:3925
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/transport/plugin_transport_udp.c:3951
+#: src/transport/plugin_transport_udp.c:3952
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/transport/plugin_transport_udp.c:4015
+#: src/transport/plugin_transport_udp.c:4016
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
+#: src/transport/plugin_transport_udp_broadcasting.c:168
+#, fuzzy
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:548
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:565
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+
 #: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
@@ -8023,7 +8157,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2346
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Okänd operation \"%s\"\n"
@@ -8080,7 +8214,7 @@ msgstr ""
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517
 #: src/util/service.c:1378
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
@@ -8099,19 +8233,19 @@ msgstr "Kan inte ändra användare/grupp till \"%s\": 
%s\n"
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:255
+#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279
 #: src/util/service.c:1790
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:272
+#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299
 #: src/util/service.c:1801
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:267
+#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292
 #: src/util/service.c:1807
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
@@ -8122,62 +8256,62 @@ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/util/bio.c:177 src/util/bio.c:185
+#: src/util/bio.c:181 src/util/bio.c:189
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/bio.c:187
+#: src/util/bio.c:191
 #, fuzzy
 msgid "End of file"
 msgstr "Läs in en konfigurationsfil"
 
-#: src/util/bio.c:244
+#: src/util/bio.c:248
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:254
+#: src/util/bio.c:258
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:300
+#: src/util/bio.c:306
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:314
+#: src/util/bio.c:328
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:911
+#: src/util/client.c:914
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1132
+#: src/util/common_logging.c:259 src/util/common_logging.c:1146
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1130
+#: src/util/common_logging.c:261 src/util/common_logging.c:1144
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1128
+#: src/util/common_logging.c:263 src/util/common_logging.c:1142
 msgid "MESSAGE"
 msgstr "MEDDELANDE"
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1126
+#: src/util/common_logging.c:265 src/util/common_logging.c:1140
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1124
+#: src/util/common_logging.c:267 src/util/common_logging.c:1138
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/common_logging.c:269 src/util/common_logging.c:1134
+#: src/util/common_logging.c:269 src/util/common_logging.c:1148
 msgid "NONE"
 msgstr ""
 
@@ -8186,24 +8320,24 @@ msgstr ""
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1135
+#: src/util/common_logging.c:1149
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1326
+#: src/util/common_logging.c:1442
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1368
+#: src/util/common_logging.c:1484
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1386
+#: src/util/common_logging.c:1502
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/common_logging.c:1407
+#: src/util/common_logging.c:1523
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8214,88 +8348,88 @@ msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör 
\"gnunet-setup -d\"!\n"
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/configuration.c:355
+#: src/util/configuration.c:363
 #, fuzzy, c-format
 msgid "Error while reading file `%s'\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/util/configuration.c:1034
+#: src/util/configuration.c:1051
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1153
+#: src/util/configuration.c:1170
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1186
+#: src/util/configuration.c:1203
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/configuration.c:1254
+#: src/util/configuration.c:1271
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:531
+#: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:810
+#: src/util/crypto_ecc.c:836
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:860
+#: src/util/crypto_ecc.c:886
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:934
+#: src/util/crypto_ecc.c:960
 #, 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.c:991
+#: src/util/crypto_ecc.c:1017
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc_setup.c:122 src/util/crypto_ecc_setup.c:161
-#: src/util/crypto_ecc_setup.c:279 src/util/crypto_ecc_setup.c:317
+#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165
+#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/crypto_ecc_setup.c:128 src/util/crypto_ecc_setup.c:284
+#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
 
-#: src/util/crypto_ecc_setup.c:165 src/util/crypto_ecc_setup.c:322
+#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:195 src/util/crypto_ecc_setup.c:352
+#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:356
+#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:415
+#: src/util/crypto_ecc_setup.c:471
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
@@ -8305,12 +8439,12 @@ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 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"
 
-#: src/util/crypto_rsa.c:835
+#: src/util/crypto_rsa.c:834
 #, fuzzy, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_rsa.c:1166
+#: src/util/crypto_rsa.c:1165
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -8385,11 +8519,11 @@ msgstr "Använd --help för att få en lista på flaggor.\n"
 msgid "Missing mandatory option `%s'.\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/getopt_helpers.c:68
+#: src/util/getopt_helpers.c:70
 msgid "print the version number"
 msgstr "skriv ut versionsnummer"
 
-#: src/util/getopt_helpers.c:111
+#: src/util/getopt_helpers.c:115
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8397,94 +8531,100 @@ msgstr ""
 "Argument som är obligatoriska för långa flaggor är också obligatoriska för "
 "korta flaggor.\n"
 
-#: src/util/getopt_helpers.c:199
+#: src/util/getopt_helpers.c:203
 msgid "print this help"
 msgstr "skriv ut denna hjälp"
 
-#: src/util/getopt_helpers.c:274
+#: src/util/getopt_helpers.c:281
 msgid "be verbose"
 msgstr "var informativ"
 
-#: src/util/getopt_helpers.c:410
+#: src/util/getopt_helpers.c:422
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:488
+#: src/util/getopt_helpers.c:502
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:510
+#: src/util/getopt_helpers.c:524
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740
+#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758
+#: src/util/getopt_helpers.c:825
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/getopt_helpers.c:610
+#: src/util/getopt_helpers.c:626
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/getopt_helpers.c:675
+#: src/util/getopt_helpers.c:692
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/getopt_helpers.c:823
+#: src/util/getopt_helpers.c:832
+#, fuzzy, c-format
+msgid "You must pass a number below %u to the `%s' option.\n"
+msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
+
+#: src/util/getopt_helpers.c:918
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:124
+#: src/util/gnunet-config.c:134
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/gnunet-config.c:137
+#: src/util/gnunet-config.c:147
 #, c-format
 msgid "--section argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:140
+#: src/util/gnunet-config.c:150
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:191
+#: src/util/gnunet-config.c:201
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:229
+#: src/util/gnunet-config.c:240
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:234
+#: src/util/gnunet-config.c:245
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:239
+#: src/util/gnunet-config.c:250
 #, fuzzy
 msgid "name of the option to access"
 msgstr "Visa värde av alternativet"
 
-#: src/util/gnunet-config.c:244
+#: src/util/gnunet-config.c:255
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:248
+#: src/util/gnunet-config.c:259
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "GNUnet-konfiguration"
 
-#: src/util/gnunet-config.c:252
+#: src/util/gnunet-config.c:263
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:265
+#: src/util/gnunet-config.c:276
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -8525,63 +8665,63 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:288
+#: src/util/gnunet-ecc.c:290
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/util/gnunet-ecc.c:299
+#: src/util/gnunet-ecc.c:305
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/util/gnunet-ecc.c:321
+#: src/util/gnunet-ecc.c:334
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/util/gnunet-ecc.c:372
+#: src/util/gnunet-ecc.c:391
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:456
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:442
+#: src/util/gnunet-ecc.c:461
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:447
+#: src/util/gnunet-ecc.c:466
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:451
+#: src/util/gnunet-ecc.c:470
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:455
+#: src/util/gnunet-ecc.c:474
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:459
+#: src/util/gnunet-ecc.c:478
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:463
+#: src/util/gnunet-ecc.c:482
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:479
+#: src/util/gnunet-ecc.c:498
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet-resolver.c:150
+#: src/util/gnunet-resolver.c:168
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:161
+#: src/util/gnunet-resolver.c:179
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
@@ -8661,41 +8801,41 @@ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/network.c:137
+#: src/util/network.c:136
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1793 src/util/network.c:1977
+#: src/util/network.c:1795 src/util/network.c:1979
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:501
+#: src/util/os_installation.c:509
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:873
+#: src/util/os_installation.c:881
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/util/os_installation.c:913
+#: src/util/os_installation.c:922
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/os_installation.c:944
+#: src/util/os_installation.c:953
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/os_installation.c:954
+#: src/util/os_installation.c:963
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8726,7 +8866,7 @@ msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:223
+#: src/util/resolver_api.c:224
 #, fuzzy, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
@@ -8735,22 +8875,22 @@ msgstr ""
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/util/resolver_api.c:827
+#: src/util/resolver_api.c:851
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/resolver_api.c:840
+#: src/util/resolver_api.c:864
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1024
+#: src/util/resolver_api.c:1048
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1110 src/util/resolver_api.c:1133
-#: src/util/resolver_api.c:1147
+#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157
+#: src/util/resolver_api.c:1171
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
@@ -8760,7 +8900,7 @@ msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/service.c:2091
+#: src/util/service.c:2093
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8837,63 +8977,63 @@ msgstr " dagar"
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1270
+#: src/util/strings.c:1272
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1278
+#: src/util/strings.c:1280
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1284
+#: src/util/strings.c:1286
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1291
+#: src/util/strings.c:1293
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1300
+#: src/util/strings.c:1302
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/util/strings.c:1572 src/util/strings.c:1588
+#: src/util/strings.c:1574 src/util/strings.c:1590
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1597
+#: src/util/strings.c:1599
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/strings.c:1680 src/util/strings.c:1711 src/util/strings.c:1759
-#: src/util/strings.c:1780
+#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761
+#: src/util/strings.c:1782
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1737
+#: src/util/strings.c:1739
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
 
-#: src/util/strings.c:1789
+#: src/util/strings.c:1791
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1841
+#: src/util/strings.c:1843
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/util/strings.c:1891
+#: src/util/strings.c:1893
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/util/strings.c:1922
+#: src/util/strings.c:1924
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
@@ -9076,28 +9216,57 @@ msgstr "# byte mottagna via UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:706
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
+#: src/zonemaster/gnunet-service-zonemaster.c:838
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/include/gnunet_common.h:689 src/include/gnunet_common.h:696
-#: src/include/gnunet_common.h:706 src/include/gnunet_common.h:714
+#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773
+#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/include/gnunet_common.h:726
+#: src/include/gnunet_common.h:803
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:753 src/include/gnunet_common.h:762
+#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid "PUT request sent with key"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "PUT request not confirmed!\n"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "Could not connect to %s service!\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "No valid GNS zone specified!\n"
+#~ msgstr "Inga nyckelord angivna!\n"
+
+#, fuzzy
+#~ msgid "Specify timeout for the lookup"
+#~ msgstr "ange prioritet för innehållet"
+
+#, fuzzy
+#~ msgid "Specify the name of the ego of the zone to lookup the record in"
+#~ msgstr "ange prioritet för innehållet"
+
+#, fuzzy
+#~ msgid "Token `%s' is malformed\n"
+#~ msgstr "Ogiltigt argument: \"%s\"\n"
+
+#, fuzzy
 #~ msgid "Failed to create indices\n"
 #~ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
@@ -9583,10 +9752,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med 
fel: %s\n"
 #~ msgstr "Okänd operation \"%s\"\n"
 
 #, fuzzy
-#~ msgid "valid public key required"
-#~ msgstr "Ogiltigt argument: \"%s\"\n"
-
-#, fuzzy
 #~ msgid "Failed to create or access directory for log file `%s'\n"
 #~ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
diff --git a/po/vi.po b/po/vi.po
index b26232a55..8dc190439 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: address@hidden"
-"POT-Creation-Date: 2018-01-02 02:33+0100\n"
+"POT-Creation-Date: 2018-06-04 23:27+0200\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -243,7 +243,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3824
+#: src/transport/plugin_transport_tcp.c:3825
 #: src/transport/tcp_service_legacy.c:576
 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
 #: src/util/service.c:643
@@ -252,14 +252,14 @@ msgid "Require valid port number for service `%s' in 
configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176
-#: src/transport/tcp_service_legacy.c:613 src/util/client.c:505
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506
 #: src/util/service.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
-#: src/transport/tcp_service_legacy.c:617 src/util/client.c:510
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511
 #: src/util/service.c:687
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
@@ -362,132 +362,15 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939
-msgid "solver to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945
-#: src/ats-tests/gnunet-solver-eval.c:950
-msgid "experiment to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3306
+#: src/ats-tests/ats-testing-log.c:837
 #, fuzzy
-msgid "print logging"
+msgid "Stop logging\n"
 msgstr "Theo dõi"
 
-#: src/ats/gnunet-ats-solver-eval.c:3311
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3316
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:304
-#, 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:314
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:359
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:451
-#, fuzzy, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "Không thể sơ khởi SQLite: %s.\n"
-
-#: src/ats/plugin_ats_mlp.c:1274
-msgid "Problem size too large, cannot allocate memory!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1869
-#, fuzzy, c-format
-msgid "Adding address for peer `%s' multiple times\n"
-msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
-
-#: src/ats/plugin_ats_mlp.c:1913
-#, fuzzy, c-format
-msgid "Updating address property for peer `%s' %p not added before\n"
-msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
-
-#: src/ats/plugin_ats_mlp.c:2475
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
-#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
-#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
-#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
-#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
-#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
-#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
-
-#: src/ats/plugin_ats_mlp.c:2670
-#, c-format
-msgid ""
-"Adjusting inconsistent outbound quota configuration for network `%s', is "
-"%llu must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2679
-#, c-format
-msgid ""
-"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
-"must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2689
-#, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2698
-#, c-format
-msgid ""
-"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1164
+#: src/ats-tests/ats-testing-log.c:892
 #, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
+msgid "Start logging `%s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
 
 #: src/ats-tests/ats-testing.c:422
 #, c-format
@@ -499,16 +382,6 @@ msgstr ""
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/ats-tests/ats-testing-log.c:837
-#, fuzzy
-msgid "Stop logging\n"
-msgstr "Theo dõi"
-
-#: src/ats-tests/ats-testing-log.c:892
-#, fuzzy, c-format
-msgid "Start logging `%s'\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
-
 #: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
@@ -516,6 +389,15 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
+#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294
+msgid "solver to use"
+msgstr ""
+
+#: src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299
+msgid "experiment to use"
+msgstr ""
+
 #: src/ats-tool/gnunet-ats.c:307
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -638,6 +520,124 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3306
+#, fuzzy
+msgid "print logging"
+msgstr "Theo dõi"
+
+#: src/ats/gnunet-ats-solver-eval.c:3311
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3316
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:304
+#, 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:314
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:359
+#, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:451
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "Không thể sơ khởi SQLite: %s.\n"
+
+#: src/ats/plugin_ats_mlp.c:1274
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1869
+#, fuzzy, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
+
+#: src/ats/plugin_ats_mlp.c:1913
+#, fuzzy, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
+
+#: src/ats/plugin_ats_mlp.c:2475
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
+#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
+#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
+#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
+#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/ats/plugin_ats_mlp.c:2670
+#, c-format
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2679
+#, c-format
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2689
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2698
+#, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_proportional.c:1164
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
 #: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
@@ -781,292 +781,292 @@ msgstr ""
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:513
-#: src/conversation/conversation_api_call.c:490
+#: src/conversation/conversation_api.c:515
+#: src/conversation/conversation_api_call.c:494
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:269
+#: src/conversation/gnunet-conversation-test.c:119
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:145
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:210
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:270
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:294
+#: src/conversation/gnunet-conversation.c:295
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:329
+#: src/conversation/gnunet-conversation.c:330
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:334
+#: src/conversation/gnunet-conversation.c:335
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:352
+#: src/conversation/gnunet-conversation.c:353
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:367
+#: src/conversation/gnunet-conversation.c:368
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/conversation/gnunet-conversation.c:379
+#: src/conversation/gnunet-conversation.c:380
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:401
+#: src/conversation/gnunet-conversation.c:404
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:408
+#: src/conversation/gnunet-conversation.c:411
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/conversation/gnunet-conversation.c:415
+#: src/conversation/gnunet-conversation.c:418
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/conversation/gnunet-conversation.c:423
+#: src/conversation/gnunet-conversation.c:426
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:432
+#: src/conversation/gnunet-conversation.c:435
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:438
+#: src/conversation/gnunet-conversation.c:441
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:443
+#: src/conversation/gnunet-conversation.c:446
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:512
+#: src/conversation/gnunet-conversation.c:517
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Không rõ câu lệnh « %s ».\n"
 
-#: src/conversation/gnunet-conversation.c:528
-#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:533
+#: src/conversation/gnunet-conversation.c:547
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:535
-#: src/conversation/gnunet-conversation.c:592
+#: src/conversation/gnunet-conversation.c:540
+#: src/conversation/gnunet-conversation.c:596
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:550
-#: src/conversation/gnunet-conversation.c:605
+#: src/conversation/gnunet-conversation.c:555
+#: src/conversation/gnunet-conversation.c:609
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:560
+#: src/conversation/gnunet-conversation.c:565
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:620
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:633
+#: src/conversation/gnunet-conversation.c:637
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:663
+#: src/conversation/gnunet-conversation.c:668
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:686
+#: src/conversation/gnunet-conversation.c:692
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:691
+#: src/conversation/gnunet-conversation.c:697
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:697
-#: src/conversation/gnunet-conversation.c:721
+#: src/conversation/gnunet-conversation.c:703
+#: src/conversation/gnunet-conversation.c:727
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:702
+#: src/conversation/gnunet-conversation.c:708
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:711
+#: src/conversation/gnunet-conversation.c:717
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/conversation/gnunet-conversation.c:716
+#: src/conversation/gnunet-conversation.c:722
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:735
+#: src/conversation/gnunet-conversation.c:741
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:741
+#: src/conversation/gnunet-conversation.c:747
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/conversation/gnunet-conversation.c:769
-#: src/conversation/gnunet-conversation.c:784
+#: src/conversation/gnunet-conversation.c:776
+#: src/conversation/gnunet-conversation.c:791
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:817
-#: src/conversation/gnunet-conversation.c:833
+#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:840
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:840
+#: src/conversation/gnunet-conversation.c:847
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:849
+#: src/conversation/gnunet-conversation.c:856
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:866
+#: src/conversation/gnunet-conversation.c:873
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:901
+#: src/conversation/gnunet-conversation.c:908
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:909
+#: src/conversation/gnunet-conversation.c:916
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:926
+#: src/conversation/gnunet-conversation.c:933
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:952
+#: src/conversation/gnunet-conversation.c:959
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:954
+#: src/conversation/gnunet-conversation.c:961
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:956
+#: src/conversation/gnunet-conversation.c:963
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:958
+#: src/conversation/gnunet-conversation.c:965
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:960
+#: src/conversation/gnunet-conversation.c:967
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:962
+#: src/conversation/gnunet-conversation.c:969
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:964
+#: src/conversation/gnunet-conversation.c:971
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:966
+#: src/conversation/gnunet-conversation.c:973
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat"
 
-#: src/conversation/gnunet-conversation.c:968
+#: src/conversation/gnunet-conversation.c:975
 msgid "Use `/help command' to get help for a specific command"
 msgstr "Gõ chuỗi « /help LỆNH » để xem trợ giúp về lệnh đó"
 
-#: src/conversation/gnunet-conversation.c:1172
+#: src/conversation/gnunet-conversation.c:1191
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/conversation/gnunet-conversation.c:1185
+#: src/conversation/gnunet-conversation.c:1204
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Biệt hiệu « %s » bị xoá.\n"
 
-#: src/conversation/gnunet-conversation.c:1220
+#: src/conversation/gnunet-conversation.c:1242
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/conversation/gnunet-conversation.c:1244
+#: src/conversation/gnunet-conversation.c:1266
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/conversation/gnunet-conversation.c:1273
-msgid "sets the NAME of the ego to use for the phone (and name resolution)"
+#: src/conversation/gnunet-conversation.c:1295
+msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1279
+#: src/conversation/gnunet-conversation.c:1300
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1306
+#: src/conversation/gnunet-conversation.c:1329
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:119
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:145
-#, c-format
-msgid ""
-"\n"
-"We are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:210
-#, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
-msgstr ""
-
-#: src/conversation/gnunet_gst.c:622
 #: src/conversation/gnunet-helper-audio-playback-gst.c:361
+#: src/conversation/gnunet_gst.c:622
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1318,242 +1318,385 @@ msgstr "Lưu cấu hình ngay bây giờ không?"
 msgid "Core service of `%s' ready.\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/core/gnunet-service-core_kx.c:566
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes encrypted"
 msgstr "# các byte đã mã hoá"
 
-#: src/core/gnunet-service-core_kx.c:626
+#: src/core/gnunet-service-core_kx.c:677
 msgid "# bytes decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:728
+#: src/core/gnunet-service-core_kx.c:779
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:778
+#: src/core/gnunet-service-core_kx.c:829
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:840
+#: src/core/gnunet-service-core_kx.c:891
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:874
+#: src/core/gnunet-service-core_kx.c:925
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:941
+#: src/core/gnunet-service-core_kx.c:992
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:948
+#: src/core/gnunet-service-core_kx.c:1005
 #, fuzzy
-msgid "# ephemeral keys received"
+msgid "# duplicate ephemeral keys ignored"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_kx.c:987
+#: src/core/gnunet-service-core_kx.c:1040
+#, fuzzy
+msgid "# EPHEMERAL_KEYs rejected (bad signature)"
+msgstr "# các thông báo được chắp liền"
+
+#: src/core/gnunet-service-core_kx.c:1054
 #, c-format
 msgid ""
-"Ephemeral key message from peer `%s' rejected as its validity range does not "
-"match our system time (%llu not in [%llu,%llu]).\n"
+"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match "
+"our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:998
+#: src/core/gnunet-service-core_kx.c:1060
 #, fuzzy
-msgid "# EPHEMERAL_KEY messages received"
+msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_kx.c:1094
+#: src/core/gnunet-service-core_kx.c:1080
+#, fuzzy
+msgid "# valid ephemeral keys received"
+msgstr "# các thông báo phát hiện dht được nhận"
+
+#: src/core/gnunet-service-core_kx.c:1180
 #: src/transport/gnunet-service-transport_validation.c:1128
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1103
+#: src/core/gnunet-service-core_kx.c:1189
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_kx.c:1161
+#: src/core/gnunet-service-core_kx.c:1248
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1187
+#: src/core/gnunet-service-core_kx.c:1274
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1200
+#: src/core/gnunet-service-core_kx.c:1287
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# các thông báo PING nhập thô được gửi"
 
-#: src/core/gnunet-service-core_kx.c:1264
+#: src/core/gnunet-service-core_kx.c:1351
 #: src/transport/gnunet-service-transport_validation.c:1461
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1271
+#: src/core/gnunet-service-core_kx.c:1358
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1363
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_kx.c:1311
+#: src/core/gnunet-service-core_kx.c:1398
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1349
+#: src/core/gnunet-service-core_kx.c:1436
 #, fuzzy
 msgid "# session keys 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:1360
-#, fuzzy
-msgid "# timeouts prevented via PONG"
-msgstr "# các byte đã nhận qua TCP"
+#: src/core/gnunet-service-core_kx.c:1447
+#, fuzzy
+msgid "# timeouts prevented via PONG"
+msgstr "# các byte đã nhận qua TCP"
+
+#: src/core/gnunet-service-core_kx.c:1454
+#, fuzzy
+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:1642
+#, 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:1650
+#, 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:1653
+#, 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:1742
+#: src/core/gnunet-service-core_kx.c:1768
+#, fuzzy
+msgid "# bytes dropped (duplicates)"
+msgstr "# các byte loại bỏ bởi UDP (đi ra)"
+
+#: src/core/gnunet-service-core_kx.c:1755
+#, 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:1797
+#, 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:1805
+#, fuzzy
+msgid "# bytes of payload decrypted"
+msgstr "# các byte đã giải mã"
+
+#: src/core/gnunet-service-core_sessions.c:260
+#: src/core/gnunet-service-core_sessions.c:350
+#: src/dht/gnunet-service-dht_neighbours.c:733
+#: src/dht/gnunet-service-dht_neighbours.c:795
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522
+#: src/topology/gnunet-daemon-topology.c:617
+#: src/topology/gnunet-daemon-topology.c:719
+#: src/transport/gnunet-service-transport_neighbours.c:721
+#: src/transport/gnunet-service-transport_neighbours.c:729
+#, fuzzy
+msgid "# peers connected"
+msgstr "# của các đồng đẳng đã kết nối"
+
+#: src/core/gnunet-service-core_sessions.c:296
+#, fuzzy
+msgid "# type map refreshes sent"
+msgstr "# tổng số yêu cầu lỗ hổng được gửi"
+
+#: src/core/gnunet-service-core_sessions.c:416
+#, fuzzy
+msgid "# outdated typemap confirmations received"
+msgstr "Lỗi lưu cấu hình."
+
+#: src/core/gnunet-service-core_sessions.c:433
+#, fuzzy
+msgid "# valid typemap confirmations received"
+msgstr "Lỗi lưu cấu hình."
+
+#: src/core/gnunet-service-core_typemap.c:169
+#: src/core/gnunet-service-core_typemap.c:181
+#, fuzzy
+msgid "# type maps received"
+msgstr "# các thông báo phát hiện dht được nhận"
+
+#: src/core/gnunet-service-core_typemap.c:212
+msgid "# updates to my type map"
+msgstr ""
+
+#: src/credential/credential_misc.c:88
+#, fuzzy, c-format
+msgid "Unable to parse CRED record string `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888
+#: src/namestore/plugin_rest_namestore.c:1022
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:280
+#: src/credential/gnunet-credential.c:434
+#, fuzzy, c-format
+msgid "Issuer public key `%s' is not well-formed\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/credential/gnunet-credential.c:361
+#: src/credential/gnunet-credential.c:423
+#, fuzzy, c-format
+msgid "Issuer public key not well-formed\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/credential/gnunet-credential.c:372
+#: src/credential/gnunet-credential.c:444
+#, fuzzy, c-format
+msgid "Failed to connect to CREDENTIAL\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/credential/gnunet-credential.c:379
+#, c-format
+msgid "You must provide issuer the attribute\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:387
+#, c-format
+msgid "ego required\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:403
+#, c-format
+msgid "Subject public key needed\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:414
+#, fuzzy, c-format
+msgid "Subject public key `%s' is not well-formed\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/credential/gnunet-credential.c:451
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:504
+#, c-format
+msgid "Issuer ego required\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:516
+#, c-format
+msgid "Please specify name to lookup, subject key and issuer key!\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:536
+msgid "create credential"
+msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1367
-#, fuzzy
-msgid "# rekey operations confirmed via PONG"
-msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
+#: src/credential/gnunet-credential.c:540
+msgid "verify credential against attribute"
+msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/credential/gnunet-credential.c:545
 #, fuzzy
-msgid "# DATA message dropped (out of order)"
-msgstr "# các byte loại bỏ bởi UDP (đi ra)"
+msgid "The public key of the subject to lookup the credential for"
+msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/core/gnunet-service-core_kx.c:1529
-#, c-format
-msgid ""
-"Session to peer `%s' went down due to key expiration (should not happen)\n"
+#: src/credential/gnunet-credential.c:550
+msgid "The name of the credential presented by the subject"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1532
+#: src/credential/gnunet-credential.c:555
 #, fuzzy
-msgid "# sessions terminated by key expiration"
-msgstr "# các byte loại đi bởi TCP (đi ra)"
+msgid "The public key of the authority to verify the credential against"
+msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/core/gnunet-service-core_kx.c:1593
-#: src/core/gnunet-service-core_kx.c:1619
+#: src/credential/gnunet-credential.c:560
 #, fuzzy
-msgid "# bytes dropped (duplicates)"
-msgstr "# các byte loại bỏ bởi UDP (đi ra)"
+msgid "The ego to use"
+msgstr "kích cỡ tin nhắn"
 
-#: src/core/gnunet-service-core_kx.c:1606
-#, fuzzy
-msgid "# bytes dropped (out of sequence)"
-msgstr "# các byte loại bỏ bởi UDP (đi ra)"
+#: src/credential/gnunet-credential.c:565
+msgid "The issuer attribute to verify against or to issue"
+msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1648
-#, fuzzy
-msgid "# bytes dropped (ancient message)"
-msgstr "# các byte loại bỏ bởi UDP (đi ra)"
+#: src/credential/gnunet-credential.c:570
+msgid "The time to live for the credential"
+msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1656
-#, fuzzy
-msgid "# bytes of payload decrypted"
-msgstr "# các byte đã giải mã"
+#: src/credential/gnunet-credential.c:574
+msgid "collect credentials"
+msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:260
-#: src/core/gnunet-service-core_sessions.c:350
-#: src/dht/gnunet-service-dht_neighbours.c:733
-#: src/dht/gnunet-service-dht_neighbours.c:795
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520
-#: src/topology/gnunet-daemon-topology.c:612
-#: src/topology/gnunet-daemon-topology.c:714
-#: src/transport/gnunet-service-transport_neighbours.c:719
-#: src/transport/gnunet-service-transport_neighbours.c:727
+#: src/credential/gnunet-credential.c:588
 #, fuzzy
-msgid "# peers connected"
-msgstr "# của các đồng đẳng đã kết nối"
+msgid "GNUnet credential resolver tool"
+msgstr "Bản ghi lỗi GNUnet"
 
-#: src/core/gnunet-service-core_sessions.c:296
-#, fuzzy
-msgid "# type map refreshes sent"
-msgstr "# tổng số yêu cầu lỗ hổng được gửi"
+#: src/credential/gnunet-service-credential.c:1138
+#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184
+#, fuzzy, c-format
+msgid "Failed to connect to GNS\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/core/gnunet-service-core_sessions.c:416
-#, fuzzy
-msgid "# outdated typemap confirmations received"
-msgstr "Lỗi lưu cấu hình."
+#: src/credential/gnunet-service-credential.c:1144
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
+#: src/namestore/gnunet-namestore.c:914
+#: src/namestore/plugin_rest_namestore.c:1035
+#, fuzzy, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/core/gnunet-service-core_sessions.c:433
-#, fuzzy
-msgid "# valid typemap confirmations received"
-msgstr "Lỗi lưu cấu hình."
+#: src/credential/plugin_gnsrecord_credential.c:186
+#, fuzzy, c-format
+msgid "Unable to parse ATTR record string `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:181
+#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669
 #, fuzzy
-msgid "# type maps received"
-msgstr "# các thông báo phát hiện dht được nhận"
-
-#: src/core/gnunet-service-core_typemap.c:212
-msgid "# updates to my type map"
-msgstr ""
+msgid "GNS REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
 
-#: src/datacache/datacache.c:119 src/datacache/datacache.c:294
+#: src/datacache/datacache.c:119 src/datacache/datacache.c:311
 #: src/datastore/gnunet-service-datastore.c:757
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/datacache/datacache.c:123 src/datacache/datacache.c:298
+#: src/datacache/datacache.c:123 src/datacache/datacache.c:315
 #, fuzzy
 msgid "# items stored"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/datacache/datacache.c:202
+#: src/datacache/datacache.c:206
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:213
+#: src/datacache/datacache.c:217
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/datacache/datacache.c:329
+#: src/datacache/datacache.c:344
 #, fuzzy
 msgid "# requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datacache/datacache.c:339
+#: src/datacache/datacache.c:354
 msgid "# requests filtered by bloom filter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/datacache/datacache.c:367
+#: src/datacache/datacache.c:384
 #, fuzzy
 msgid "# requests for random value received"
 msgstr "# tổng số yêu cầu lỗ hổng được nhận"
 
-#: src/datacache/datacache.c:399
+#: src/datacache/datacache.c:416
 #, fuzzy
 msgid "# proximity search requests received"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/datacache/plugin_datacache_heap.c:466
+#: src/datacache/plugin_datacache_heap.c:550
 #, fuzzy
 msgid "Heap datacache running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/datacache/plugin_datacache_sqlite.c:113
-#: src/datacache/plugin_datacache_sqlite.c:122
+#: src/datacache/plugin_datacache_sqlite.c:118
+#: src/datacache/plugin_datacache_sqlite.c:127
 #: src/datastore/plugin_datastore_mysql.c:892
 #: src/datastore/plugin_datastore_sqlite.c:58
-#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92
-#: src/mysql/mysql.c:42 src/mysql/mysql.c:49
-#: src/namecache/plugin_namecache_sqlite.c:53
+#: src/datastore/plugin_datastore_sqlite.c:66
+#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80
+#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49
+#: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_sqlite.c:53
 #: src/peerstore/plugin_peerstore_sqlite.c:52
 #: src/psycstore/plugin_psycstore_mysql.c:62
@@ -1562,16 +1705,17 @@ msgstr "kho dữ liệu sqlite"
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:735 src/include/gnunet_common.h:744
+#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821
 #: src/scalarproduct/scalarproduct.h:35
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:817
-#: src/datastore/plugin_datastore_sqlite.c:456
-#: src/namecache/plugin_namecache_sqlite.c:296
-#: src/namestore/plugin_namestore_sqlite.c:355
+#: src/datacache/plugin_datacache_sqlite.c:862
+#: src/datastore/plugin_datastore_sqlite.c:508
+#: src/identity-provider/plugin_identity_provider_sqlite.c:336
+#: src/namecache/plugin_namecache_sqlite.c:329
+#: src/namestore/plugin_namestore_sqlite.c:264
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1882,7 +2026,7 @@ msgid "MySQL statement run failure"
 msgstr ""
 
 #: src/datastore/plugin_datastore_mysql.c:410
-#: src/datastore/plugin_datastore_sqlite.c:626
+#: src/datastore/plugin_datastore_sqlite.c:678
 #, fuzzy
 msgid "Data too large"
 msgstr "số lần lặp lại"
@@ -1923,32 +2067,34 @@ msgid "`%s' failed at %s:%u with error: %s"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
 
 #: src/datastore/plugin_datastore_sqlite.c:271
-#: src/namecache/plugin_namecache_sqlite.c:194
-#: src/namestore/plugin_namestore_sqlite.c:222
+#: src/identity-provider/plugin_identity_provider_sqlite.c:212
+#: src/namecache/plugin_namecache_sqlite.c:209
+#: src/namestore/plugin_namestore_sqlite.c:205
 #: src/peerstore/plugin_peerstore_sqlite.c:535
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:577
+#: src/datastore/plugin_datastore_sqlite.c:629
 msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1259
+#: src/datastore/plugin_datastore_sqlite.c:1322
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1293
+#: src/datastore/plugin_datastore_sqlite.c:1356
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1337
-#: src/namecache/plugin_namecache_sqlite.c:603
-#: src/namestore/plugin_namestore_sqlite.c:802
+#: src/datastore/plugin_datastore_sqlite.c:1400
+#: src/identity-provider/plugin_identity_provider_sqlite.c:711
+#: src/namecache/plugin_namecache_sqlite.c:640
+#: src/namestore/plugin_namestore_sqlite.c:754
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -1957,159 +2103,104 @@ msgstr "kho dữ liệu sqlite"
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:157
+#: src/dht/gnunet-dht-get.c:158
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
+#: src/dht/gnunet-dht-get.c:159
+#, c-format
+msgid "Result %d, type %d:\n"
+msgstr ""
+
 #: src/dht/gnunet-dht-get.c:204
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:218
+#: src/dht/gnunet-dht-get.c:219
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:222
+#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307
+#: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:251
+#: src/dht/gnunet-dht-get.c:253
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304
+#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:264
+#: src/dht/gnunet-dht-get.c:263
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227
+#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:283
+#: src/dht/gnunet-dht-get.c:280
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:310
+#: src/dht/gnunet-dht-monitor.c:319
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344
-#: src/nse/gnunet-nse-profiler.c:871
+#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372
+#: src/nse/gnunet-nse-profiler.c:878
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:328
+#: src/dht/gnunet-dht-monitor.c:337
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:253
-#, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "tăng sổ tối đa các kết nối TCP/IP"
-
-#: src/dht/gnunet_dht_profiler.c:1188
-#, fuzzy
-msgid "number of peers to start"
-msgstr "số lần lặp lại"
-
-#: src/dht/gnunet_dht_profiler.c:1194
-msgid ""
-"maximum number of times we try to search for successor circle formation (0 "
-"for R5N)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853
-#: src/testbed/gnunet-testbed-profiler.c:304
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1206
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1212
-msgid "delay to start doing PUTs (default: 1 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1218
-msgid "delay to start doing GETs (default: 5 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1223
-msgid "replication degree for DHT PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1230
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1248
-#, fuzzy
-msgid "Measure quality and performance of the DHT service."
-msgstr "Không thể truy cập đến dịch vụ"
-
-#: src/dht/gnunet-dht-put.c:120
-#, fuzzy
-msgid "PUT request sent with key"
-msgstr "# độ tin cậy được tiêu phí"
-
-#: src/dht/gnunet-dht-put.c:123
-msgid "Timeout sending PUT request!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:126
-#, fuzzy
-msgid "PUT request not confirmed!\n"
-msgstr "# độ tin cậy được tiêu phí"
-
-#: src/dht/gnunet-dht-put.c:156
+#: src/dht/gnunet-dht-put.c:134
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:163
-#, fuzzy, c-format
-msgid "Could not connect to %s service!\n"
+#: src/dht/gnunet-dht-put.c:142
+#, fuzzy
+msgid "Could not connect to DHT service!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/dht/gnunet-dht-put.c:174
+#: src/dht/gnunet-dht-put.c:153
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-put.c:188
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:216
+#: src/dht/gnunet-dht-put.c:193
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:233
+#: src/dht/gnunet-dht-put.c:207
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:238
+#: src/dht/gnunet-dht-put.c:211
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:244
+#: src/dht/gnunet-dht-put.c:216
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:262
+#: src/dht/gnunet-dht-put.c:233
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
@@ -2118,77 +2209,77 @@ msgstr ""
 msgid "# GET requests from clients injected"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:485
+#: src/dht/gnunet-service-dht_clients.c:483
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/dht/gnunet-service-dht_clients.c:624
+#: src/dht/gnunet-service-dht_clients.c:616
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:850
+#: src/dht/gnunet-service-dht_clients.c:842
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:1035
+#: src/dht/gnunet-service-dht_clients.c:1027
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1050
+#: src/dht/gnunet-service-dht_clients.c:1042
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1096
+#: src/dht/gnunet-service-dht_clients.c:1088
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1103
+#: src/dht/gnunet-service-dht_clients.c:1095
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1181
+#: src/dht/gnunet-service-dht_clients.c:1173
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:72
+#: src/dht/gnunet-service-dht_datacache.c:73
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/dht/gnunet-service-dht_datacache.c:82
+#: src/dht/gnunet-service-dht_datacache.c:83
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:198
+#: src/dht/gnunet-service-dht_datacache.c:202
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:210
+#: src/dht/gnunet-service-dht_datacache.c:214
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:216
+#: src/dht/gnunet-service-dht_datacache.c:220
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:222
+#: src/dht/gnunet-service-dht_datacache.c:226
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-dht_datacache.c:238
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:242
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:273
+#: src/dht/gnunet-service-dht_datacache.c:277
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
@@ -2338,16 +2429,64 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/plugin_block_dht.c:187
+#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
+#, fuzzy, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "tăng sổ tối đa các kết nối TCP/IP"
+
+#: src/dht/gnunet_dht_profiler.c:949
+#, fuzzy
+msgid "number of peers to start"
+msgstr "số lần lặp lại"
+
+#: src/dht/gnunet_dht_profiler.c:954
+msgid "number of PUTs to perform per peer"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
+#: src/testbed/gnunet-testbed-profiler.c:304
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:964
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:969
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:974
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:979
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:984
+msgid "chance that a peer is selected at random for PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:989
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1009
+#, fuzzy
+msgid "Measure quality and performance of the DHT service."
+msgstr "Không thể truy cập đến dịch vụ"
+
+#: src/dht/plugin_block_dht.c:189
 #, 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"
 
-#: src/dht/plugin_block_dht.c:194
+#: src/dht/plugin_block_dht.c:198
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:204
+#: src/dht/plugin_block_dht.c:209
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2357,36 +2496,31 @@ msgstr ""
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/dns/dnsparser.c:818
+#: src/dns/dnsparser.c:823
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/dns/dnsstub.c:176
+#: src/dns/dnsstub.c:233
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
-#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382
+#: src/dns/dnsstub.c:364
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
+
+#: src/dns/dnsstub.c:511
 #, fuzzy, c-format
-msgid "Failed to send DNS request to %s\n"
+msgid "Failed to send DNS request to %s: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/dns/dnsstub.c:298
+#: src/dns/dnsstub.c:517
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/dns/dnsstub.c:367
-#, c-format
-msgid "Configured DNS exit `%s' is not working / valid.\n"
-msgstr ""
-
-#: src/dns/dnsstub.c:437
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
 #: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS queries"
 msgstr ""
@@ -2411,50 +2545,50 @@ msgstr ""
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:608
+#: src/dns/gnunet-service-dns.c:610
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:738
+#: src/dns/gnunet-service-dns.c:740
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:813
+#: src/dns/gnunet-service-dns.c:815
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:928
+#: src/dns/gnunet-service-dns.c:930
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:944
+#: src/dns/gnunet-service-dns.c:946
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:953
+#: src/dns/gnunet-service-dns.c:955
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:963
+#: src/dns/gnunet-service-dns.c:965
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:965
+#: src/dns/gnunet-service-dns.c:967
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1032
+#: src/dns/gnunet-service-dns.c:1034
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569
+#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/dns/gnunet-service-dns.c:1090
+#: src/dns/gnunet-service-dns.c:1092
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
@@ -2464,214 +2598,214 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/exit/gnunet-daemon-exit.c:961
+#: src/exit/gnunet-daemon-exit.c:960
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1062
+#: src/exit/gnunet-daemon-exit.c:1061
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1341
+#: src/exit/gnunet-daemon-exit.c:1340
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573
-#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702
-#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954
-#: src/exit/gnunet-daemon-exit.c:2208
+#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572
+#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701
+#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953
+#: src/exit/gnunet-daemon-exit.c:2207
 #, fuzzy
 msgid "# Bytes received from CADET"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1468
+#: src/exit/gnunet-daemon-exit.c:1467
 #, fuzzy
 msgid "# UDP IP-exit requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1576
+#: src/exit/gnunet-daemon-exit.c:1575
 #, fuzzy
 msgid "# UDP service requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1616
+#: src/exit/gnunet-daemon-exit.c:1615
 #, fuzzy
 msgid "# TCP service creation requests received via cadet"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1705
+#: src/exit/gnunet-daemon-exit.c:1704
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1789
+#: src/exit/gnunet-daemon-exit.c:1788
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:1826
+#: src/exit/gnunet-daemon-exit.c:1825
 #, fuzzy
 msgid "# TCP data requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1957
+#: src/exit/gnunet-daemon-exit.c:1956
 #, fuzzy
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280
-#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828
+#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279
+#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828
 #: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339
-#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887
+#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338
+#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887
 #: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2211
+#: src/exit/gnunet-daemon-exit.c:2210
 #, fuzzy
 msgid "# ICMP service requests received via cadet"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985
+#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985
 #: src/vpn/gnunet-service-vpn.c:2096
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875
+#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875
 #: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069
+#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/exit/gnunet-daemon-exit.c:2523
+#: src/exit/gnunet-daemon-exit.c:2522
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2542
+#: src/exit/gnunet-daemon-exit.c:2541
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr "# các byte được gửi"
 
-#: src/exit/gnunet-daemon-exit.c:2720
+#: src/exit/gnunet-daemon-exit.c:2719
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2728
+#: src/exit/gnunet-daemon-exit.c:2727
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2802
+#: src/exit/gnunet-daemon-exit.c:2801
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2874
+#: src/exit/gnunet-daemon-exit.c:2873
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2922
+#: src/exit/gnunet-daemon-exit.c:2921
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:2936
+#: src/exit/gnunet-daemon-exit.c:2935
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:2962
+#: src/exit/gnunet-daemon-exit.c:2961
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2989
+#: src/exit/gnunet-daemon-exit.c:2988
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3035
+#: src/exit/gnunet-daemon-exit.c:3034
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3043
+#: src/exit/gnunet-daemon-exit.c:3042
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256
+#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278
+#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3319
+#: src/exit/gnunet-daemon-exit.c:3318
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346
+#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3358
+#: src/exit/gnunet-daemon-exit.c:3357
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3503
+#: src/exit/gnunet-daemon-exit.c:3501
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3511
+#: src/exit/gnunet-daemon-exit.c:3509
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3518
+#: src/exit/gnunet-daemon-exit.c:3516
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3524
+#: src/exit/gnunet-daemon-exit.c:3522
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3694
+#: src/exit/gnunet-daemon-exit.c:3690
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3809
+#: src/exit/gnunet-daemon-exit.c:3805
 #, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204
+#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3970
+#: src/exit/gnunet-daemon-exit.c:3966
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2805,64 +2939,64 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
 
-#: src/fs/fs_download.c:309
+#: src/fs/fs_download.c:310
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:334
+#: src/fs/fs_download.c:335
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:346
+#: src/fs/fs_download.c:347
 #, fuzzy, c-format
 msgid ""
 "Failed to access full directroy contents of `%s' for recursive download\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/fs_download.c:533 src/fs/fs_download.c:545
+#: src/fs/fs_download.c:534 src/fs/fs_download.c:546
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:955
+#: src/fs/fs_download.c:956
 #, fuzzy, c-format
 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:1046
+#: src/fs/fs_download.c:1047
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1074
+#: src/fs/fs_download.c:1075
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1098
+#: src/fs/fs_download.c:1099
 #, 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:1110
+#: src/fs/fs_download.c:1111
 #, 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:1120
 #, 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:1219
+#: src/fs/fs_download.c:1220
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_download.c:1884
+#: src/fs/fs_download.c:1885
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
@@ -2985,12 +3119,12 @@ msgstr "« %s »: Không thể kết nối.\n"
 msgid "Internal error."
 msgstr "Lỗi VR."
 
-#: src/fs/fs_search.c:809 src/fs/fs_search.c:879
+#: src/fs/fs_search.c:822 src/fs/fs_search.c:892
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/fs/fs_search.c:966
+#: src/fs/fs_search.c:979
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3044,93 +3178,93 @@ msgstr "Không kết nối được đến trình nền gnunetd."
 msgid "Failed to compute hash of file."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_uri.c:223
+#: src/fs/fs_uri.c:234
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:282
+#: src/fs/fs_uri.c:293
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:300
+#: src/fs/fs_uri.c:311
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:307
+#: src/fs/fs_uri.c:318
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:377
+#: src/fs/fs_uri.c:388
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:418
+#: src/fs/fs_uri.c:429
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:433
+#: src/fs/fs_uri.c:444
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:512
+#: src/fs/fs_uri.c:523
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:527
+#: src/fs/fs_uri.c:538
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:537
+#: src/fs/fs_uri.c:548
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545
+#: src/fs/fs_uri.c:556
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:553
+#: src/fs/fs_uri.c:564
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:559
+#: src/fs/fs_uri.c:570
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:565
+#: src/fs/fs_uri.c:576
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:574
+#: src/fs/fs_uri.c:585
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:580
+#: src/fs/fs_uri.c:591
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
+#: src/fs/fs_uri.c:597
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:609
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:632
+#: src/fs/fs_uri.c:643
 #, fuzzy
 msgid "invalid argument"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/fs/fs_uri.c:644
+#: src/fs/fs_uri.c:655
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075
+#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1081
+#: src/fs/fs_uri.c:1092
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
@@ -3170,19 +3304,19 @@ msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên"
 
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949
+#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944
 msgid "specify the priority of the content"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962
+#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -3230,109 +3364,100 @@ msgstr "Lỗi định dạng tập tin (không phải là thư mục 
GNUnet ?)\n
 msgid "Display contents of a GNUnet directory"
 msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
 
-#: src/fs/gnunet-download.c:137
+#: src/fs/gnunet-download.c:139
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-download.c:147
+#: src/fs/gnunet-download.c:149
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Lỗi không rõ"
 
-#: src/fs/gnunet-download.c:157
+#: src/fs/gnunet-download.c:158
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:179
+#: src/fs/gnunet-download.c:184
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-download.c:194
+#: src/fs/gnunet-download.c:201
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
 
-#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
+#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295
 #: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:246
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726
+#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:264
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:273
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
+#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870
 #: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313
 #, fuzzy
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: src/fs/gnunet-download.c:311
+#: src/fs/gnunet-download.c:344
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "xoá việc tải về không hoàn thành (khi hủy bở dùng CTRL-C)"
 
-#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319
+#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:322
+#: src/fs/gnunet-download.c:354
 msgid "write the file to FILENAME"
 msgstr "ghi tập tin vào TÊN_TẬP_TIN"
 
-#: src/fs/gnunet-download.c:328
+#: src/fs/gnunet-download.c:359
 #, fuzzy
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
 
-#: src/fs/gnunet-download.c:334
+#: src/fs/gnunet-download.c:364
 #, fuzzy
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
 
-#: src/fs/gnunet-download.c:339
+#: src/fs/gnunet-download.c:368
 msgid "download a GNUnet directory recursively"
 msgstr "tải xuống đệ quy một thư mục GNUnet"
 
-#: src/fs/gnunet-download.c:356
+#: src/fs/gnunet-download.c:386
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:119
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:130
-#, fuzzy
-msgid "Special file-sharing operations"
-msgstr "Tùy chọn chia sẻ tập tin"
-
 #: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
@@ -3349,6 +3474,15 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
+#: src/fs/gnunet-fs.c:119
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:130
+#, fuzzy
+msgid "Special file-sharing operations"
+msgstr "Tùy chọn chia sẻ tập tin"
+
 #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -3484,7 +3618,7 @@ msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s 
».\n"
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:916
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3492,7 +3626,7 @@ msgstr ""
 "in ra danh sách các từ khóa đã giải phóng cần sử dụng, nhưng không thực hiện "
 "tải lên"
 
-#: src/fs/gnunet-publish.c:923
+#: src/fs/gnunet-publish.c:919
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3500,11 +3634,11 @@ msgstr ""
 "thêm một từ khoá bổ sung cho tập tin hoặc thư mục ở cấp đầu (có thể chỉ ra "
 "tùy chọn này nhiều lần)"
 
-#: src/fs/gnunet-publish.c:930
+#: src/fs/gnunet-publish.c:925
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "đặt siêu dữ liệu cho KIỂU đưa ra thành GIÁ_TRỊ chỉ ra"
 
-#: src/fs/gnunet-publish.c:935
+#: src/fs/gnunet-publish.c:930
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3512,7 +3646,7 @@ msgstr ""
 "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng "
 "mã hóa trong cơ sở dữ liệu GNUnet)"
 
-#: src/fs/gnunet-publish.c:942
+#: src/fs/gnunet-publish.c:937
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3520,12 +3654,12 @@ msgstr ""
 "chỉ ra mã số của một phiên bản đã cập nhật để công bố trong tương lai (chỉ "
 "cho sự chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:955
+#: src/fs/gnunet-publish.c:950
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "công bố các tập tin dưới biệt hiệu TÊN (đặt tập tin vào không gian tên)"
 
-#: src/fs/gnunet-publish.c:968
+#: src/fs/gnunet-publish.c:960
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -3533,13 +3667,13 @@ msgid ""
 msgstr ""
 "chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
 
-#: src/fs/gnunet-publish.c:975
+#: src/fs/gnunet-publish.c:966
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "đặt mã số của phiên bản này của sự công bố (chỉ cho chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:982
+#: src/fs/gnunet-publish.c:973
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3547,7 +3681,7 @@ msgstr ""
 "Địa chỉ URI cần công bố (có thể được dùng thay vào gửi một tập tin để thêm "
 "từ khoá vào tập tin có địa chỉ URI tương ứng)"
 
-#: src/fs/gnunet-publish.c:998
+#: src/fs/gnunet-publish.c:989
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3627,7 +3761,7 @@ msgid "FS service is lacking HOSTKEY configuration 
setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
 #: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355
-#: src/topology/gnunet-daemon-topology.c:1203
+#: src/topology/gnunet-daemon-topology.c:1202
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -3678,7 +3812,7 @@ msgstr "# các thông báo phát hiện dht được nhận"
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343
+#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345
 msgid "# P2P searches active"
 msgstr ""
 
@@ -3732,22 +3866,22 @@ msgstr ""
 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:1239
+#: src/fs/gnunet-service-fs_cp.c:1241
 #, 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:1295
+#: src/fs/gnunet-service-fs_cp.c:1297
 #, 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:1339
+#: src/fs/gnunet-service-fs_cp.c:1341
 #, 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:1706
+#: src/fs/gnunet-service-fs_cp.c:1708
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
@@ -3973,6 +4107,10 @@ msgstr "Không thể truy cập đến thông tin về không gian 
tên.\n"
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
+#: src/gns/gns_tld_api.c:276
+msgid "Expected a base32-encoded public zone key\n"
+msgstr ""
+
 #: src/gns/gnunet-bcd.c:127
 #, fuzzy, c-format
 msgid "Refusing `%s' request to HTTP server\n"
@@ -4001,134 +4139,65 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:238
+#: src/gns/gnunet-dns2gns.c:203
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-dns2gns.c:408
+#: src/gns/gnunet-dns2gns.c:404
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:424
+#: src/gns/gnunet-dns2gns.c:420
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:432
+#: src/gns/gnunet-dns2gns.c:428
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:711
-msgid "No ego configured for `dns2gns` subsystem\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:739
+#: src/gns/gnunet-dns2gns.c:587
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/gns/gnunet-dns2gns.c:760
-#, fuzzy
-msgid "No valid GNS zone specified!\n"
-msgstr "Chưa ghi rõ từ khoá.\n"
-
-#: src/gns/gnunet-dns2gns.c:784
+#: src/gns/gnunet-dns2gns.c:687
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:790
-msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:796
-msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:802
+#: src/gns/gnunet-dns2gns.c:692
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:808
-msgid "Public key of the GNS zone to use (overrides default)"
+#: src/gns/gnunet-dns2gns.c:709
+msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:826
-msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
+#: src/gns/gnunet-gns-benchmark.c:582
+msgid "how long to wait between queries"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
+#: src/gns/gnunet-gns-benchmark.c:587
+msgid "how long to wait for an answer"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:252
-#, c-format
-msgid "Please specify name to lookup!\n"
+#: src/gns/gnunet-gns-benchmark.c:591
+msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:276
-#, c-format
-msgid "Ego for `%s' not found, cannot perform lookup.\n"
+#: src/gns/gnunet-gns-helper-service-w32.c:602
+msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701
-#: src/gns/plugin_rest_gns.c:422
-#, c-format
+#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727
-#, fuzzy, c-format
-msgid "Failed to connect to GNS\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/gns/gnunet-gns.c:374
-#, c-format
-msgid "Public key `%s' is not well-formed\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:428
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:434
-#, fuzzy
-msgid "Specify the type of the record to lookup"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/gns/gnunet-gns.c:440
-#, fuzzy
-msgid "Specify timeout for the lookup"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/gns/gnunet-gns.c:445
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:451
-#, fuzzy
-msgid "Specify the public key of the zone to lookup the record in"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/gns/gnunet-gns.c:457
-#, fuzzy
-msgid "Specify the name of the ego of the zone to lookup the record in"
-msgstr "xác định mức ưu tiên của nội dung"
-
-#: src/gns/gnunet-gns.c:476
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "Bản ghi lỗi GNUnet"
-
-#: src/gns/gnunet-gns-helper-service-w32.c:602
-msgid "Not ready to process requests, lacking ego data\n"
-msgstr ""
-
 #: src/gns/gnunet-gns-helper-service-w32.c:739
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
@@ -4139,230 +4208,239 @@ msgid "This program will import some GNS authorities 
into your GNS namestore."
 msgstr ""
 
 #: src/gns/gnunet-gns-proxy.c:109
-#: src/hostlist/gnunet-daemon-hostlist_client.c:569
-#: src/hostlist/gnunet-daemon-hostlist_client.c:787
-#: src/hostlist/gnunet-daemon-hostlist_client.c:793
-#: src/hostlist/gnunet-daemon-hostlist_client.c:845
-#: src/hostlist/gnunet-daemon-hostlist_client.c:854
-#: src/hostlist/gnunet-daemon-hostlist_client.c:965
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1060
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1065
+#: src/hostlist/gnunet-daemon-hostlist_client.c:535
+#: src/hostlist/gnunet-daemon-hostlist_client.c:753
+#: src/hostlist/gnunet-daemon-hostlist_client.c:759
+#: src/hostlist/gnunet-daemon-hostlist_client.c:811
+#: src/hostlist/gnunet-daemon-hostlist_client.c:820
+#: src/hostlist/gnunet-daemon-hostlist_client.c:931
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
 #: src/transport/plugin_transport_http_client.c:598
 #: src/transport/plugin_transport_http_client.c:616
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:887
+#: src/gns/gnunet-gns-proxy.c:910
 #, fuzzy, c-format
-msgid "Unsupported CURL SSL backend %d\n"
+msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:933
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:956
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/gns/gnunet-gns-proxy.c:946
+#: src/gns/gnunet-gns-proxy.c:969
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:961
+#: src/gns/gnunet-gns-proxy.c:984
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/gns/gnunet-gns-proxy.c:971
+#: src/gns/gnunet-gns-proxy.c:994
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:995
+#: src/gns/gnunet-gns-proxy.c:1018
 #, c-format
-msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgid "TLS certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1104
+#: src/gns/gnunet-gns-proxy.c:1132
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1709
+#: src/gns/gnunet-gns-proxy.c:1868
 #, fuzzy, c-format
 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:2172
+#: src/gns/gnunet-gns-proxy.c:2364
 #, 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:2202
+#: src/gns/gnunet-gns-proxy.c:2394
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/gns/gnunet-gns-proxy.c:2375
+#: src/gns/gnunet-gns-proxy.c:2573
 #, 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:2394 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658
 #, 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:2716
+#: src/gns/gnunet-gns-proxy.c:2925
 #, 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:2745
+#: src/gns/gnunet-gns-proxy.c:2954
 #, 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:2763 src/gns/gnunet-gns-proxy.c:2792
-msgid "SSL connection to plain IPv4 address requested\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:2842
+#: src/gns/gnunet-gns-proxy.c:3035
 #, 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:3177 src/gns/gnunet-service-gns.c:403
-#, c-format
-msgid "No ego configured for `%s`\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:3238
+#: src/gns/gnunet-gns-proxy.c:3316
 #, fuzzy, c-format
-msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
+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:3281
+#: src/gns/gnunet-gns-proxy.c:3443
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3287
+#: src/gns/gnunet-gns-proxy.c:3448
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3312
+#: src/gns/gnunet-gns-proxy.c:3473
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:442
+#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:238
+#, fuzzy
+msgid "Specify the type of the record to lookup"
+msgstr "xác định mức ưu tiên của nội dung"
+
+#: src/gns/gnunet-gns.c:242
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:258
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "Bản ghi lỗi GNUnet"
+
+#: src/gns/gnunet-service-gns.c:513
+#, fuzzy
+msgid "Properly base32-encoded public key required"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/gns/gnunet-service-gns.c:549
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/gns/gnunet-service-gns.c:461
-#: src/zonemaster/gnunet-service-zonemaster.c:742
+#: src/gns/gnunet-service-gns.c:568
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
+#: src/zonemaster/gnunet-service-zonemaster.c:875
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:263
+#: src/gns/gnunet-service-gns_interceptor.c:259
 #, fuzzy
 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:370
+#: src/gns/gnunet-service-gns_interceptor.c:366
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:641
+#: src/gns/gnunet-service-gns_resolver.c:713
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:652
+#: src/gns/gnunet-service-gns_resolver.c:724
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:844
+#: src/gns/gnunet-service-gns_resolver.c:927
 #, 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:986
+#: src/gns/gnunet-service-gns_resolver.c:1102
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1347
+#: src/gns/gnunet-service-gns_resolver.c:1796
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1865
+#: src/gns/gnunet-service-gns_resolver.c:1839
+msgid "GNS lookup failed (zero records found)\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:2253
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1889
+#: src/gns/gnunet-service-gns_resolver.c:2276
 #, 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:2171
+#: src/gns/gnunet-service-gns_resolver.c:2563
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2318
-#, c-format
-msgid "Hostname `%s' is not well-formed, resolution fails\n"
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:203
+#: src/gns/plugin_gnsrecord_gns.c:181
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:232
+#: src/gns/plugin_gnsrecord_gns.c:212
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:253
+#: src/gns/plugin_gnsrecord_gns.c:233
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:276
+#: src/gns/plugin_gnsrecord_gns.c:258
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:312
+#: src/gns/plugin_gnsrecord_gns.c:294
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:360
-#, fuzzy, c-format
-msgid "Unable to parse REVERSE record string `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
 #: src/gns/plugin_rest_gns.c:384
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:668
-#, fuzzy
-msgid "GNS REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
 #: src/gnsrecord/plugin_gnsrecord_dns.c:359
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4534,156 +4612,156 @@ msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:371
+#: src/hostlist/gnunet-daemon-hostlist_client.c:349
 #, fuzzy
 msgid "# bytes downloaded from hostlist servers"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:392
-#: src/hostlist/gnunet-daemon-hostlist_client.c:437
+#: src/hostlist/gnunet-daemon-hostlist_client.c:370
+#: src/hostlist/gnunet-daemon-hostlist_client.c:403
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:395
-#: src/hostlist/gnunet-daemon-hostlist_client.c:440
+#: src/hostlist/gnunet-daemon-hostlist_client.c:373
+#: src/hostlist/gnunet-daemon-hostlist_client.c:406
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:413
+#: src/hostlist/gnunet-daemon-hostlist_client.c:391
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:695
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1441
+#: src/hostlist/gnunet-daemon-hostlist_client.c:661
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:725
+#: src/hostlist/gnunet-daemon-hostlist_client.c:691
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:768
+#: src/hostlist/gnunet-daemon-hostlist_client.c:734
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:862
 #, 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:910
+#: src/hostlist/gnunet-daemon-hostlist_client.c:876
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:930
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, 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:936
+#: src/hostlist/gnunet-daemon-hostlist_client.c:902
 #, 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:944
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:997
+#: src/hostlist/gnunet-daemon-hostlist_client.c:963
 #, 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:1005
+#: src/hostlist/gnunet-daemon-hostlist_client.c:971
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1132
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1698
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1098
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1665
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1141
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1107
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1200
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1221
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1166
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1187
 #, fuzzy
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
 #, 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:1392
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
 #, 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:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
 #, 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:1435
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1438
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
 #, 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:1484
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
 #, 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:1491
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
 #, 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:1515
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1532
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1527
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
 #, 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:1628
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1595
 #: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1657
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1624
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1671
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1638
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1651
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4702,7 +4780,7 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_server.c:531
 #: src/peerinfo-tool/gnunet-peerinfo.c:385
 #: src/peerinfo-tool/gnunet-peerinfo.c:534
-#: src/topology/gnunet-daemon-topology.c:857
+#: src/topology/gnunet-daemon-topology.c:862
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
@@ -4805,6 +4883,71 @@ msgstr "« %s » không sẵn sàng.\n"
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
 
+#: src/identity-provider/gnunet-idp.c:424
+#, fuzzy
+msgid "Ego is required\n"
+msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
+
+#: src/identity-provider/gnunet-idp.c:432
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:440
+#, fuzzy
+msgid "Requesting party key is required!\n"
+msgstr "đặt tên hiệu cần dùng (cần thiết)"
+
+#: src/identity-provider/gnunet-idp.c:463
+msgid "Add attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:469
+msgid "Attribute value"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:474
+msgid "Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:479
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:483
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:488
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:493
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:498
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:503
+msgid "Type of attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:508
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/identity-provider/identity_provider_api.c:436
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/identity-provider/plugin_rest_identity_provider.c:1230
+#: src/identity-provider/plugin_rest_openid_connect.c:2147
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
 #: src/identity/gnunet-identity.c:179
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
@@ -4892,34 +5035,11 @@ 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:967
+#: src/identity/plugin_rest_identity.c:968
 #, fuzzy
 msgid "Identity REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
 
-#: src/identity-provider/gnunet-identity-token.c:66
-#, fuzzy
-msgid "Option `-t' is required\n"
-msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
-
-#: src/identity-provider/gnunet-identity-token.c:77
-#, fuzzy, c-format
-msgid "Token `%s' is malformed\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/identity-provider/gnunet-identity-token.c:166
-msgid "GNUid token"
-msgstr ""
-
-#: src/identity-provider/gnunet-identity-token.c:171
-msgid "Print token contents"
-msgstr ""
-
-#: src/identity-provider/plugin_rest_identity_provider.c:1166
-#, fuzzy
-msgid "Identity Token REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
 #: src/json/json.c:119
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -4949,7 +5069,7 @@ msgstr "Không thể truy cập đến « %s »: %s\n"
 msgid "No records found for `%s'"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4969,7 +5089,7 @@ msgstr "Đối số không hợp lệ cho « %s ».\n"
 msgid "You must specify a name\n"
 msgstr "Phải ghi rõ tên hiệu\n"
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4978,7 +5098,7 @@ msgstr ""
 msgid "spezifies the public key of the zone to look in"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
@@ -4992,288 +5112,294 @@ msgstr ""
 msgid "Error communicating with namecache service"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/namecache/plugin_namecache_flat.c:119
-#: src/namecache/plugin_namecache_flat.c:253
-#: src/namestore/plugin_namestore_flat.c:179
-#: src/namestore/plugin_namestore_flat.c:375
+#: src/namecache/plugin_namecache_flat.c:121
+#: src/namecache/plugin_namecache_flat.c:255
+#: src/namestore/plugin_namestore_flat.c:150
+#: src/namestore/plugin_namestore_flat.c:385
 #: src/peerstore/plugin_peerstore_flat.c:379
 #: src/peerstore/plugin_peerstore_flat.c:538
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/namecache/plugin_namecache_flat.c:130
-#: src/namestore/plugin_namestore_flat.c:190
+#: src/namecache/plugin_namecache_flat.c:132
+#: src/namestore/plugin_namestore_flat.c:161
 #: src/peerstore/plugin_peerstore_flat.c:394
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/namecache/plugin_namecache_flat.c:149
-#: src/namestore/plugin_namestore_flat.c:203
+#: src/namecache/plugin_namecache_flat.c:151
+#: src/namestore/plugin_namestore_flat.c:174
 #: src/peerstore/plugin_peerstore_flat.c:406
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/namecache/plugin_namecache_flat.c:408
+#: src/namecache/plugin_namecache_flat.c:410
 #, fuzzy
 msgid "flat plugin running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/namestore/gnunet-namestore.c:301
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:547
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:567
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:598
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:678
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:736
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:754
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:790
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:799
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1019
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1045
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1092
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1130
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:313
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:562
+#: src/namestore/gnunet-namestore.c:343
+#: src/namestore/plugin_rest_namestore.c:572
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:571
+#: src/namestore/gnunet-namestore.c:350
+#: src/namestore/plugin_rest_namestore.c:581
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527
-#: src/namestore/gnunet-namestore.c:535
+#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561
-#: src/namestore/gnunet-namestore.c:573
+#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
-#: src/namestore/plugin_rest_namestore.c:597
+#: src/namestore/gnunet-namestore.c:677
 #, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
+msgid ""
+"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:739
+#: src/namestore/gnunet-namestore.c:810
+#: src/namestore/plugin_rest_namestore.c:607
 #, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
+msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:776
-#: src/namestore/plugin_rest_namestore.c:1004
+#: src/namestore/gnunet-namestore.c:851
 #, c-format
-msgid "Ego `%s' not known to identity service\n"
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:791
+#: src/namestore/gnunet-namestore.c:903
 #, fuzzy, c-format
 msgid "No options given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/namestore/gnunet-namestore.c:802
-#: src/namestore/gnunet-namestore-fcfsd.c:1034
-#: src/namestore/plugin_rest_namestore.c:1017
-#, fuzzy
-msgid "Failed to connect to namestore\n"
-msgstr "Không kết nối được đến trình nền gnunetd."
-
-#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819
-#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861
-#: src/namestore/gnunet-namestore.c:915
+#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973
+#: src/namestore/gnunet-namestore.c:1027
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820
-#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863
+#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932
+#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:829
-#: src/namestore/plugin_rest_namestore.c:671
+#: src/namestore/gnunet-namestore.c:941
+#: src/namestore/plugin_rest_namestore.c:684
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/namestore/gnunet-namestore.c:851
-#: src/namestore/plugin_rest_namestore.c:689
-#: src/namestore/plugin_rest_namestore.c:729
+#: src/namestore/gnunet-namestore.c:963
+#: src/namestore/plugin_rest_namestore.c:704
+#: src/namestore/plugin_rest_namestore.c:746
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:896
+#: src/namestore/gnunet-namestore.c:1008
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1028
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:950
+#: src/namestore/gnunet-namestore.c:1071
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/namestore/gnunet-namestore.c:1100
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/namestore/gnunet-namestore.c:1014
+#: src/namestore/gnunet-namestore.c:1135
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/namestore/gnunet-namestore.c:1051
-#: src/namestore/plugin_rest_namestore.c:1047
+#: src/namestore/gnunet-namestore.c:1175
+#: src/namestore/plugin_rest_namestore.c:1065
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1108
-#: src/namestore/plugin_rest_namestore.c:1143
+#: src/namestore/gnunet-namestore.c:1239
+#: src/namestore/plugin_rest_namestore.c:1161
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1137
+#: src/namestore/gnunet-namestore.c:1264
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1142
+#: src/namestore/gnunet-namestore.c:1268
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1147
+#: src/namestore/gnunet-namestore.c:1272
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1153
+#: src/namestore/gnunet-namestore.c:1277
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1282
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/namestore/gnunet-namestore.c:1164
+#: src/namestore/gnunet-namestore.c:1286
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/namestore/gnunet-namestore.c:1176
+#: src/namestore/gnunet-namestore.c:1296
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/namestore/gnunet-namestore.c:1184
+#: src/namestore/gnunet-namestore.c:1301
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1190
+#: src/namestore/gnunet-namestore.c:1306
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1196
+#: src/namestore/gnunet-namestore.c:1311
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1201
+#: src/namestore/gnunet-namestore.c:1315
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1206
+#: src/namestore/gnunet-namestore.c:1319
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1212
+#: src/namestore/gnunet-namestore.c:1324
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:508
-#, fuzzy, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:535
-#, fuzzy, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:555
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:585
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:662
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:718
-#, fuzzy, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr "Không thể tạo miền tên.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:734
+#: src/namestore/gnunet-service-namestore.c:750
 #, fuzzy, c-format
-msgid "Failed to setup post processor for `%s'\n"
+msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:770
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:778
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:974
-msgid "No ego configured for `fcfsd` subsystem\n"
+#: src/namestore/gnunet-zoneimport.c:2035
+msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1000
-#, fuzzy
-msgid "Failed to start HTTP server\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1042
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1074
-msgid "GNU Name System First Come First Serve name registration service"
+#: src/namestore/gnunet-zoneimport.c:2040
+msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:615
-#, fuzzy, c-format
-msgid "Failed to replicate block in namecache: %s\n"
-msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
-
-#: src/namestore/namestore_api.c:379
+#: src/namestore/namestore_api.c:391
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:656
+#: src/namestore/plugin_namestore_flat.c:767
 #, fuzzy
 msgid "flat file database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/namestore/plugin_rest_namestore.c:1188
+#: src/namestore/plugin_namestore_sqlite.c:218
+#: src/namestore/plugin_namestore_sqlite.c:229
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "Lỗi chạy %s: %s %d\n"
+
+#: src/namestore/plugin_rest_namestore.c:1206
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -5304,11 +5430,11 @@ msgstr "Cấu hình hạn ngạch"
 msgid "section name providing the configuration for the adapter"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447
+#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453
 msgid "use TCP"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452
+#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458
 msgid "use UDP"
 msgstr ""
 
@@ -5485,58 +5611,58 @@ msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/nat/gnunet-nat.c:425
+#: src/nat/gnunet-nat.c:431
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:431
+#: src/nat/gnunet-nat.c:437
 msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:437
+#: src/nat/gnunet-nat.c:443
 msgid ""
 "name of configuration section to find additional options, such as manual "
 "host punching data"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:442
+#: src/nat/gnunet-nat.c:448
 msgid "enable STUN processing"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:457
+#: src/nat/gnunet-nat.c:463
 msgid "watch for connection reversal requests"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:469
+#: src/nat/gnunet-nat.c:475
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1335
+#: src/nat/gnunet-service-nat.c:1339
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1345
+#: src/nat/gnunet-service-nat.c:1349
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1361
+#: src/nat/gnunet-service-nat.c:1365
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1372
+#: src/nat/gnunet-service-nat.c:1376
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1837
+#: src/nat/gnunet-service-nat.c:1841
 #, fuzzy
 msgid "Connection reversal request failed\n"
 msgstr "Thu thập bị dừng.\n"
 
-#: src/nat/gnunet-service-nat.c:1910
+#: src/nat/gnunet-service-nat.c:1914
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5560,101 +5686,42 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:122
-#, fuzzy
-msgid "Show network size estimates from NSE service."
-msgstr "# các yêu cầu get (lấy) dht được nhận"
-
-#: src/nse/gnunet-nse-profiler.c:842
-#, fuzzy
-msgid "limit to the number of connections to NSE services, 0 for none"
-msgstr "Không kết nối được đến trình nền gnunetd."
-
-#: src/nse/gnunet-nse-profiler.c:847
-msgid "name of the file for writing connection information and statistics"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:859
-msgid "name of the file for writing the main results"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:866
-msgid "Number of peers to run in each round, separated by commas"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:877
-msgid "delay between rounds"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:886
-#, fuzzy
-msgid "Measure quality and performance of the NSE service."
-msgstr "Không thể truy cập đến dịch vụ"
-
-#: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:840 src/util/gnunet-scrypt.c:276
-#, fuzzy
-msgid "Value is too large.\n"
-msgstr "Giá trị không nằm trong phạm vi được phép."
-
-#: src/peerinfo/gnunet-service-peerinfo.c:178
-#, fuzzy, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Đã nạp truyền tải « %s »\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:310
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:331
-#: src/peerinfo/gnunet-service-peerinfo.c:362
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:446
-msgid "# peers known"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:489
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-"Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ "
-"bỏ.\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:655
-#, fuzzy, c-format
-msgid "Scanning directory `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+#: src/nse/gnunet-nse-profiler.c:849
+#, fuzzy
+msgid "limit to the number of connections to NSE services, 0 for none"
+msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/peerinfo/gnunet-service-peerinfo.c:663
-#, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
+#: src/nse/gnunet-nse-profiler.c:854
+msgid "name of the file for writing connection information and statistics"
+msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1080
-#, fuzzy, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+#: src/nse/gnunet-nse-profiler.c:866
+msgid "name of the file for writing the main results"
+msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1409
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
+#: src/nse/gnunet-nse-profiler.c:873
+msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1422
-msgid "Skipping import of included HELLOs\n"
+#: src/nse/gnunet-nse-profiler.c:884
+msgid "delay between rounds"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:220
+#: src/nse/gnunet-nse-profiler.c:893
 #, fuzzy
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr ""
-"\n"
-"Không nhận được đáp ứng từ gnunetd.\n"
+msgid "Measure quality and performance of the NSE service."
+msgstr "Không thể truy cập đến dịch vụ"
+
+#: src/nse/gnunet-nse.c:122
+#, fuzzy
+msgid "Show network size estimates from NSE service."
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#: src/nse/gnunet-service-nse.c:1534
+#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
+#, fuzzy
+msgid "Value is too large.\n"
+msgstr "Giá trị không nằm trong phạm vi được phép."
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
@@ -5747,6 +5814,65 @@ msgstr "Đang nạp các truyền tải « %s »\n"
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
+#: src/peerinfo/gnunet-service-peerinfo.c:178
+#, fuzzy, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Đã nạp truyền tải « %s »\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:313
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:334
+#: src/peerinfo/gnunet-service-peerinfo.c:365
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:449
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:492
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+"Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ "
+"bỏ.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:659
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:667
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1100
+#, fuzzy, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1438
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1451
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:220
+#, fuzzy
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr ""
+"\n"
+"Không nhận được đáp ứng từ gnunetd.\n"
+
 #: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
@@ -6059,11 +6185,11 @@ msgstr "« %s » không phải là một tập tin.\n"
 msgid "Search string `%s' is too long!\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/rest/gnunet-rest-server.c:790
+#: src/rest/gnunet-rest-server.c:927
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:807
+#: src/rest/gnunet-rest-server.c:944
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Bản ghi lỗi GNUnet"
@@ -6198,19 +6324,22 @@ msgid "# revocation set unions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
 #: src/revocation/gnunet-service-revocation.c:525
-#: src/revocation/gnunet-service-revocation.c:773
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:864
+#: src/revocation/gnunet-service-revocation.c:867
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/rps/gnunet-rps.c:146
+#: src/rps/gnunet-rps.c:203
 msgid "Seed a PeerID"
 msgstr ""
 
+#: src/rps/gnunet-rps.c:207
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
 #: src/scalarproduct/gnunet-scalarproduct.c:220
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
@@ -6266,10 +6395,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr " Không kết nối được (lỗi ?)\n"
@@ -6647,14 +6776,14 @@ msgstr ""
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:247
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:249
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46
-#: src/testing/testing.c:288 src/util/gnunet-ecc.c:306
+#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6724,16 +6853,6 @@ msgstr "« %s » đang tắt.\n"
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:118
-#, fuzzy
-msgid "Waiting for child to exit.\n"
-msgstr "Đang đợi các đồng đẳng kết nối"
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:241
-#, fuzzy, c-format
-msgid "Spawning process `%s'\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
-
 #: src/testbed/gnunet-testbed-profiler.c:289
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
@@ -6745,6 +6864,16 @@ msgid ""
 "signal is received"
 msgstr ""
 
+#: src/testbed/gnunet_testbed_mpi_spawn.c:118
+#, fuzzy
+msgid "Waiting for child to exit.\n"
+msgstr "Đang đợi các đồng đẳng kết nối"
+
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
+#, fuzzy, c-format
+msgid "Spawning process `%s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
 #: src/testbed/testbed_api.c:410
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
@@ -6967,90 +7096,86 @@ msgstr "Lỗi chạy %s: %s %d\n"
 msgid "Failed to load configuration from %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/topology/friends.c:106
+#: src/topology/friends.c:126
 #, fuzzy, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr ""
 "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
 
-#: src/topology/friends.c:160
+#: src/topology/friends.c:180
 #, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:225
+#: src/topology/gnunet-daemon-topology.c:230
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:339
+#: src/topology/gnunet-daemon-topology.c:344
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/topology/gnunet-daemon-topology.c:533
+#: src/topology/gnunet-daemon-topology.c:538
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# các thông báo gửi đi bị loại bỏ"
 
-#: src/topology/gnunet-daemon-topology.c:635
-#: src/topology/gnunet-daemon-topology.c:721
+#: src/topology/gnunet-daemon-topology.c:640
+#: src/topology/gnunet-daemon-topology.c:726
 #, fuzzy
 msgid "# friends connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/topology/gnunet-daemon-topology.c:918
+#: src/topology/gnunet-daemon-topology.c:923
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:951
+#: src/topology/gnunet-daemon-topology.c:956
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:958
+#: src/topology/gnunet-daemon-topology.c:963
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:980
+#: src/topology/gnunet-daemon-topology.c:985
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:983
+#: src/topology/gnunet-daemon-topology.c:988
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:990
+#: src/topology/gnunet-daemon-topology.c:995
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 "Xác định quá ít bạn bè (dưới số tối thiểu). Sẽ chỉ kết nối tới bạn bè.\n"
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:1001
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr "Cần thiết nhiều kết nối bạn bè hơn tổng số kết nối đích.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1059
+#: src/topology/gnunet-daemon-topology.c:1054
 #: src/transport/plugin_transport_wlan.c:1517
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/topology/gnunet-daemon-topology.c:1233
+#: src/topology/gnunet-daemon-topology.c:1232
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:141
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport.c:448
 #, fuzzy
 msgid "# messages dropped due to slow client"
@@ -7100,224 +7225,228 @@ msgstr ""
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:804
+#: src/transport/gnunet-service-transport_neighbours.c:806
 #, fuzzy
 msgid "# session creation failed"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1053
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1168
+#: src/transport/gnunet-service-transport_neighbours.c:1176
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1764
+#: src/transport/gnunet-service-transport_neighbours.c:1324
+#: src/transport/gnunet-service-transport_neighbours.c:1785
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1316
+#: src/transport/gnunet-service-transport_neighbours.c:1329
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/transport/gnunet-service-transport_neighbours.c:1322
+#: src/transport/gnunet-service-transport_neighbours.c:1335
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1395
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1458
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1494
+#: src/transport/gnunet-service-transport_neighbours.c:1515
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1502
+#: src/transport/gnunet-service-transport_neighbours.c:1523
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1512
+#: src/transport/gnunet-service-transport_neighbours.c:1533
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1557
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1566
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1574
+#: src/transport/gnunet-service-transport_neighbours.c:1595
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1583
+#: src/transport/gnunet-service-transport_neighbours.c:1604
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1588
+#: src/transport/gnunet-service-transport_neighbours.c:1609
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1615
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1661
+#: src/transport/gnunet-service-transport_neighbours.c:1682
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1695
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "theo dõi gnunetd sử dụng dải thông"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1710
+#: src/transport/gnunet-service-transport_neighbours.c:1731
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1830
+#: src/transport/gnunet-service-transport_neighbours.c:1854
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1850
+#: src/transport/gnunet-service-transport_neighbours.c:1874
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1889
+#: src/transport/gnunet-service-transport_neighbours.c:1913
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1906
+#: src/transport/gnunet-service-transport_neighbours.c:1930
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1936
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2001
+#: src/transport/gnunet-service-transport_neighbours.c:2028
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2055
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 #, fuzzy
 msgid "# SYN_ACK messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2072
+#: src/transport/gnunet-service-transport_neighbours.c:2099
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2233
+#: src/transport/gnunet-service-transport_neighbours.c:2262
 #, fuzzy
 msgid "# SYN messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2238
+#: src/transport/gnunet-service-transport_neighbours.c:2267
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2623
+#: src/transport/gnunet-service-transport_neighbours.c:2654
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3105
+#: src/transport/gnunet-service-transport_neighbours.c:3139
 #, fuzzy
 msgid "# SYN_ACK messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3113
+#: src/transport/gnunet-service-transport_neighbours.c:3147
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3131
-#: src/transport/gnunet-service-transport_neighbours.c:3155
+#: src/transport/gnunet-service-transport_neighbours.c:3165
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3167
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3192
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3205
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 #, fuzzy
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3377
+#: src/transport/gnunet-service-transport_neighbours.c:3412
 #, fuzzy
 msgid "# ACK messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3413
+#: src/transport/gnunet-service-transport_neighbours.c:3448
 #, fuzzy
 msgid "# unexpected ACK messages"
 msgstr "# các thông báo PONG đã mật mã được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3501
+#: src/transport/gnunet-service-transport_neighbours.c:3536
 #, fuzzy
 msgid "# quota messages ignored (malformed)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3508
+#: src/transport/gnunet-service-transport_neighbours.c:3543
 #, fuzzy
 msgid "# QUOTA messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3548
+#: src/transport/gnunet-service-transport_neighbours.c:3583
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3555
+#: src/transport/gnunet-service-transport_neighbours.c:3590
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3566
+#: src/transport/gnunet-service-transport_neighbours.c:3601
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3700
+#: src/transport/gnunet-service-transport_neighbours.c:3736
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
@@ -7434,6 +7563,51 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_validation.c:1627
+#, fuzzy
+msgid "# HELLOs given to peerinfo"
+msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
+
+#: src/transport/gnunet-transport-profiler.c:219
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:617
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:621
+#, fuzzy
+msgid "receive data from peer"
+msgstr "Yêu cầu cấp %d từ đồng đẳng %d\n"
+
+#: src/transport/gnunet-transport-profiler.c:626
+#, fuzzy
+msgid "iterations"
+msgstr "Tùy chọn chung"
+
+#: src/transport/gnunet-transport-profiler.c:631
+#, fuzzy
+msgid "number of messages to send"
+msgstr "số tin nhắn cần dùng mỗi lần lặp"
+
+#: src/transport/gnunet-transport-profiler.c:636
+#, fuzzy
+msgid "message size to use"
+msgstr "kích cỡ tin nhắn"
+
+#: src/transport/gnunet-transport-profiler.c:641
+#: src/transport/gnunet-transport.c:1462
+msgid "peer identity"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:652
+#: src/transport/gnunet-transport.c:1482
+#, fuzzy
+msgid "Direct access to transport service."
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
 #: src/transport/gnunet-transport.c:413
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7573,11 +7747,6 @@ msgstr "In ra thông tin về các đồng đẳng GNUnet."
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:1462
-#: src/transport/gnunet-transport-profiler.c:641
-msgid "peer identity"
-msgstr ""
-
 #: src/transport/gnunet-transport.c:1466
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7586,46 +7755,11 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1482
-#: src/transport/gnunet-transport-profiler.c:652
-#, fuzzy
-msgid "Direct access to transport service."
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/transport/gnunet-transport-profiler.c:219
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:617
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:621
-#, fuzzy
-msgid "receive data from peer"
-msgstr "Yêu cầu cấp %d từ đồng đẳng %d\n"
-
-#: src/transport/gnunet-transport-profiler.c:626
-#, fuzzy
-msgid "iterations"
-msgstr "Tùy chọn chung"
-
-#: src/transport/gnunet-transport-profiler.c:631
-#, fuzzy
-msgid "number of messages to send"
-msgstr "số tin nhắn cần dùng mỗi lần lặp"
-
-#: src/transport/gnunet-transport-profiler.c:636
-#, fuzzy
-msgid "message size to use"
-msgstr "kích cỡ tin nhắn"
-
 #: src/transport/plugin_transport_http_client.c:1474
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3526
-#: src/transport/plugin_transport_tcp.c:3890
-#: src/transport/plugin_transport_tcp.c:3897
+#: src/transport/plugin_transport_tcp.c:3891
+#: src/transport/plugin_transport_tcp.c:3898
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7695,7 +7829,7 @@ msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2901
-#: src/transport/plugin_transport_udp.c:3622
+#: src/transport/plugin_transport_udp.c:3623
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7806,7 +7940,7 @@ msgstr "Gặp sự kiện bất thường: %d\n"
 #: src/transport/plugin_transport_tcp.c:1730
 #: src/transport/plugin_transport_tcp.c:1954
 #: src/transport/plugin_transport_tcp.c:3137
-#: src/transport/plugin_transport_tcp.c:4013
+#: src/transport/plugin_transport_tcp.c:4014
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
@@ -7849,119 +7983,119 @@ msgstr ""
 msgid "# TCP WELCOME messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_tcp.c:3408
+#: src/transport/plugin_transport_tcp.c:3409
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:3459
-#: src/transport/plugin_transport_tcp.c:3517
+#: src/transport/plugin_transport_tcp.c:3460
+#: src/transport/plugin_transport_tcp.c:3518
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr "# các kết nối dht"
 
-#: src/transport/plugin_transport_tcp.c:3463
+#: src/transport/plugin_transport_tcp.c:3464
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/transport/plugin_transport_tcp.c:3469
+#: src/transport/plugin_transport_tcp.c:3470
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3471
+#: src/transport/plugin_transport_tcp.c:3472
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3511
+#: src/transport/plugin_transport_tcp.c:3512
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3521
+#: src/transport/plugin_transport_tcp.c:3522
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3840
+#: src/transport/plugin_transport_tcp.c:3841
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:4001
+#: src/transport/plugin_transport_tcp.c:4002
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4005
+#: src/transport/plugin_transport_tcp.c:4006
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4009
+#: src/transport/plugin_transport_tcp.c:4010
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:168
-#, fuzzy
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr "# các thông báo PONG đã mật mã được nhận"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:548
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:565
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp.c:3366
+#: src/transport/plugin_transport_udp.c:3367
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3380
+#: src/transport/plugin_transport_udp.c:3381
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3698
-#: src/transport/plugin_transport_udp.c:3797
+#: src/transport/plugin_transport_udp.c:3699
+#: src/transport/plugin_transport_udp.c:3798
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_udp.c:3716
+#: src/transport/plugin_transport_udp.c:3717
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3807
+#: src/transport/plugin_transport_udp.c:3808
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_udp.c:3878
-#: src/transport/plugin_transport_udp.c:3892
+#: src/transport/plugin_transport_udp.c:3879
+#: src/transport/plugin_transport_udp.c:3893
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3924
+#: src/transport/plugin_transport_udp.c:3925
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/transport/plugin_transport_udp.c:3951
+#: src/transport/plugin_transport_udp.c:3952
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/transport/plugin_transport_udp.c:4015
+#: src/transport/plugin_transport_udp.c:4016
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "Không thể tạo miền tên.\n"
 
+#: src/transport/plugin_transport_udp_broadcasting.c:168
+#, fuzzy
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:548
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:565
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+
 #: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
@@ -8076,7 +8210,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2346
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "\tKhông rõ miền tên « %s »\n"
@@ -8133,7 +8267,7 @@ msgstr ""
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517
 #: src/util/service.c:1378
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
@@ -8152,19 +8286,19 @@ msgstr "Không thể thay đổi người dùng/nhóm thành « %s 
»: %s\n"
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:255
+#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279
 #: src/util/service.c:1790
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:272
+#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299
 #: src/util/service.c:1801
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:267
+#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292
 #: src/util/service.c:1807
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
@@ -8175,61 +8309,61 @@ msgstr "Không thể truy cập đến tập tin gnunet-directory 
« %s »\n"
 msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/util/bio.c:177 src/util/bio.c:185
+#: src/util/bio.c:181 src/util/bio.c:189
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/bio.c:187
+#: src/util/bio.c:191
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:244
+#: src/util/bio.c:248
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:254
+#: src/util/bio.c:258
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:300
+#: src/util/bio.c:306
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:314
+#: src/util/bio.c:328
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:911
+#: src/util/client.c:914
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1132
+#: src/util/common_logging.c:259 src/util/common_logging.c:1146
 msgid "DEBUG"
 msgstr "GỠ LỖI"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1130
+#: src/util/common_logging.c:261 src/util/common_logging.c:1144
 msgid "INFO"
 msgstr "TIN"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1128
+#: src/util/common_logging.c:263 src/util/common_logging.c:1142
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1126
+#: src/util/common_logging.c:265 src/util/common_logging.c:1140
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1124
+#: src/util/common_logging.c:267 src/util/common_logging.c:1138
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/common_logging.c:269 src/util/common_logging.c:1134
+#: src/util/common_logging.c:269 src/util/common_logging.c:1148
 msgid "NONE"
 msgstr ""
 
@@ -8238,25 +8372,25 @@ msgstr ""
 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:1135
+#: src/util/common_logging.c:1149
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1326
+#: src/util/common_logging.c:1442
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1368
+#: src/util/common_logging.c:1484
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1386
+#: src/util/common_logging.c:1502
 #, 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:1407
+#: src/util/common_logging.c:1523
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8268,12 +8402,12 @@ msgstr ""
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
 
-#: src/util/configuration.c:355
+#: src/util/configuration.c:363
 #, fuzzy, c-format
 msgid "Error while reading file `%s'\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/util/configuration.c:1034
+#: src/util/configuration.c:1051
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8282,76 +8416,76 @@ msgstr ""
 "Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong "
 "tập hợp các sự chọn được phép\n"
 
-#: src/util/configuration.c:1153
+#: src/util/configuration.c:1170
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1186
+#: src/util/configuration.c:1203
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/util/configuration.c:1254
+#: src/util/configuration.c:1271
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:531
+#: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:810
+#: src/util/crypto_ecc.c:836
 #, fuzzy, c-format
 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:860
+#: src/util/crypto_ecc.c:886
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/util/crypto_ecc.c:934
+#: src/util/crypto_ecc.c:960
 #, 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.c:991
+#: src/util/crypto_ecc.c:1017
 #, fuzzy, c-format
 msgid "EdDSA 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:122 src/util/crypto_ecc_setup.c:161
-#: src/util/crypto_ecc_setup.c:279 src/util/crypto_ecc_setup.c:317
+#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165
+#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/util/crypto_ecc_setup.c:128 src/util/crypto_ecc_setup.c:284
+#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
 
-#: src/util/crypto_ecc_setup.c:165 src/util/crypto_ecc_setup.c:322
+#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:195 src/util/crypto_ecc_setup.c:352
+#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:356
+#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:415
+#: src/util/crypto_ecc_setup.c:471
 #, 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"
@@ -8361,12 +8495,12 @@ msgstr "Không thể truy cập đến tập tin gnunet-directory 
« %s »\n"
 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"
 
-#: src/util/crypto_rsa.c:835
+#: src/util/crypto_rsa.c:834
 #, fuzzy, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/util/crypto_rsa.c:1166
+#: src/util/crypto_rsa.c:1165
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
@@ -8442,11 +8576,11 @@ msgstr ""
 msgid "Missing mandatory option `%s'.\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/util/getopt_helpers.c:68
+#: src/util/getopt_helpers.c:70
 msgid "print the version number"
 msgstr "hiển thị số thứ tự phiên bản"
 
-#: src/util/getopt_helpers.c:111
+#: src/util/getopt_helpers.c:115
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8454,94 +8588,100 @@ msgstr ""
 "Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn "
 "ngắn.\n"
 
-#: src/util/getopt_helpers.c:199
+#: src/util/getopt_helpers.c:203
 msgid "print this help"
 msgstr "hiển thị trợ giúp này"
 
-#: src/util/getopt_helpers.c:274
+#: src/util/getopt_helpers.c:281
 msgid "be verbose"
 msgstr "xuất chi tiết"
 
-#: src/util/getopt_helpers.c:410
+#: src/util/getopt_helpers.c:422
 msgid "configure logging to use LOGLEVEL"
 msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
 
-#: src/util/getopt_helpers.c:488
+#: src/util/getopt_helpers.c:502
 #, fuzzy
 msgid "configure logging to write logs to FILENAME"
 msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
 
-#: src/util/getopt_helpers.c:510
+#: src/util/getopt_helpers.c:524
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740
+#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758
+#: src/util/getopt_helpers.c:825
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 
-#: src/util/getopt_helpers.c:610
+#: src/util/getopt_helpers.c:626
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 
-#: src/util/getopt_helpers.c:675
+#: src/util/getopt_helpers.c:692
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 
-#: src/util/getopt_helpers.c:823
+#: src/util/getopt_helpers.c:832
+#, fuzzy, c-format
+msgid "You must pass a number below %u to the `%s' option.\n"
+msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
+
+#: src/util/getopt_helpers.c:918
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:124
+#: src/util/gnunet-config.c:134
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/util/gnunet-config.c:137
+#: src/util/gnunet-config.c:147
 #, fuzzy, c-format
 msgid "--section argument is required\n"
 msgstr "đặt tên hiệu cần dùng (cần thiết)"
 
-#: src/util/gnunet-config.c:140
+#: src/util/gnunet-config.c:150
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:191
+#: src/util/gnunet-config.c:201
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:229
+#: src/util/gnunet-config.c:240
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:234
+#: src/util/gnunet-config.c:245
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:239
+#: src/util/gnunet-config.c:250
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:244
+#: src/util/gnunet-config.c:255
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:248
+#: src/util/gnunet-config.c:259
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/util/gnunet-config.c:252
+#: src/util/gnunet-config.c:263
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:265
+#: src/util/gnunet-config.c:276
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -8582,63 +8722,63 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:288
+#: src/util/gnunet-ecc.c:290
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/util/gnunet-ecc.c:299
+#: src/util/gnunet-ecc.c:305
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
 
-#: src/util/gnunet-ecc.c:321
+#: src/util/gnunet-ecc.c:334
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/util/gnunet-ecc.c:372
+#: src/util/gnunet-ecc.c:391
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:456
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:442
+#: src/util/gnunet-ecc.c:461
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:447
+#: src/util/gnunet-ecc.c:466
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:451
+#: src/util/gnunet-ecc.c:470
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:455
+#: src/util/gnunet-ecc.c:474
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:459
+#: src/util/gnunet-ecc.c:478
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:463
+#: src/util/gnunet-ecc.c:482
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:479
+#: src/util/gnunet-ecc.c:498
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/util/gnunet-resolver.c:150
+#: src/util/gnunet-resolver.c:168
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:161
+#: src/util/gnunet-resolver.c:179
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
@@ -8718,40 +8858,40 @@ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 msgid "Error writing to `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/network.c:137
+#: src/util/network.c:136
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1793 src/util/network.c:1977
+#: src/util/network.c:1795 src/util/network.c:1979
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:501
+#: src/util/os_installation.c:509
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:873
+#: src/util/os_installation.c:881
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/util/os_installation.c:913
+#: src/util/os_installation.c:922
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
 
-#: src/util/os_installation.c:944
+#: src/util/os_installation.c:953
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/os_installation.c:954
+#: src/util/os_installation.c:963
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8782,29 +8922,29 @@ msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:223
+#: src/util/resolver_api.c:224
 #, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
 "resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:827
+#: src/util/resolver_api.c:851
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "không quyết định các tên máy"
 
-#: src/util/resolver_api.c:840
+#: src/util/resolver_api.c:864
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/util/resolver_api.c:1024
+#: src/util/resolver_api.c:1048
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1110 src/util/resolver_api.c:1133
-#: src/util/resolver_api.c:1147
+#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157
+#: src/util/resolver_api.c:1171
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
@@ -8814,7 +8954,7 @@ msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/service.c:2091
+#: src/util/service.c:2093
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8892,63 +9032,63 @@ msgstr " ngày"
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1270
+#: src/util/strings.c:1272
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1278
+#: src/util/strings.c:1280
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1284
+#: src/util/strings.c:1286
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1291
+#: src/util/strings.c:1293
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1300
+#: src/util/strings.c:1302
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/util/strings.c:1572 src/util/strings.c:1588
+#: src/util/strings.c:1574 src/util/strings.c:1590
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1597
+#: src/util/strings.c:1599
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/util/strings.c:1680 src/util/strings.c:1711 src/util/strings.c:1759
-#: src/util/strings.c:1780
+#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761
+#: src/util/strings.c:1782
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1737
+#: src/util/strings.c:1739
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
 
-#: src/util/strings.c:1789
+#: src/util/strings.c:1791
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1841
+#: src/util/strings.c:1843
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
 
-#: src/util/strings.c:1891
+#: src/util/strings.c:1893
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/strings.c:1922
+#: src/util/strings.c:1924
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Mạng có định dạng sai « %s »: %s\n"
@@ -9131,28 +9271,57 @@ msgstr "# các byte đã nhận qua UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:706
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
+#: src/zonemaster/gnunet-service-zonemaster.c:838
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/include/gnunet_common.h:689 src/include/gnunet_common.h:696
-#: src/include/gnunet_common.h:706 src/include/gnunet_common.h:714
+#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773
+#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:726
+#: src/include/gnunet_common.h:803
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:753 src/include/gnunet_common.h:762
+#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
 #, fuzzy
+#~ msgid "PUT request sent with key"
+#~ msgstr "# độ tin cậy được tiêu phí"
+
+#, fuzzy
+#~ msgid "PUT request not confirmed!\n"
+#~ msgstr "# độ tin cậy được tiêu phí"
+
+#, fuzzy
+#~ msgid "Could not connect to %s service!\n"
+#~ msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#, fuzzy
+#~ msgid "No valid GNS zone specified!\n"
+#~ msgstr "Chưa ghi rõ từ khoá.\n"
+
+#, fuzzy
+#~ msgid "Specify timeout for the lookup"
+#~ msgstr "xác định mức ưu tiên của nội dung"
+
+#, fuzzy
+#~ msgid "Specify the name of the ego of the zone to lookup the record in"
+#~ msgstr "xác định mức ưu tiên của nội dung"
+
+#, fuzzy
+#~ msgid "Token `%s' is malformed\n"
+#~ msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#, fuzzy
 #~ msgid "Failed to create indices\n"
 #~ msgstr "Không thể tạo miền tên.\n"
 
@@ -9669,10 +9838,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với 
lỗi: %s
 #~ msgstr "Không đủ quyền truy cập cho « %s »: %s\n"
 
 #, fuzzy
-#~ msgid "valid public key required"
-#~ msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#, fuzzy
 #~ msgid "Failed to create or access directory for log file `%s'\n"
 #~ msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 11632aed0..c3248d9ca 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: address@hidden"
-"POT-Creation-Date: 2018-01-02 02:33+0100\n"
+"POT-Creation-Date: 2018-06-04 23:27+0200\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -230,7 +230,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:393 src/arm/gnunet-service-arm.c:399
 #: src/transport/plugin_transport_tcp.c:1139
 #: src/transport/plugin_transport_tcp.c:1145
-#: src/transport/plugin_transport_tcp.c:3824
+#: src/transport/plugin_transport_tcp.c:3825
 #: src/transport/tcp_service_legacy.c:576
 #: src/transport/tcp_service_legacy.c:582 src/util/service.c:637
 #: src/util/service.c:643
@@ -239,14 +239,14 @@ msgid "Require valid port number for service `%s' in 
configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:430 src/transport/plugin_transport_tcp.c:1176
-#: src/transport/tcp_service_legacy.c:613 src/util/client.c:505
+#: src/transport/tcp_service_legacy.c:613 src/util/client.c:506
 #: src/util/service.c:682
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:434 src/transport/plugin_transport_tcp.c:1180
-#: src/transport/tcp_service_legacy.c:617 src/util/client.c:510
+#: src/transport/tcp_service_legacy.c:617 src/util/client.c:511
 #: src/util/service.c:687
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
@@ -349,132 +349,14 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3294 src/ats-tests/gnunet-solver-eval.c:939
-msgid "solver to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3299 src/ats-tests/gnunet-solver-eval.c:945
-#: src/ats-tests/gnunet-solver-eval.c:950
-msgid "experiment to use"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3306
-#, fuzzy
-msgid "print logging"
-msgstr "未知的命令“%s”。\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:3311
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3316
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:304
-#, 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:314
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:359
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:451
-#, fuzzy, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "无法初始化 SQLite:%s。\n"
-
-#: src/ats/plugin_ats_mlp.c:1274
-msgid "Problem size too large, cannot allocate memory!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1869
-#, c-format
-msgid "Adding address for peer `%s' multiple times\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:1913
-#, c-format
-msgid "Updating address property for peer `%s' %p not added before\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2475
-msgid ""
-"MLP solver is not optimizing for anything, changing to feasibility check\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
-#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
-#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
-#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
-#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
-#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
-#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/ats/plugin_ats_mlp.c:2670
-#, c-format
-msgid ""
-"Adjusting inconsistent outbound quota configuration for network `%s', is "
-"%llu must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2679
-#, c-format
-msgid ""
-"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
-"must be at least %llu\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2689
-#, c-format
-msgid ""
-"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:2698
-#, c-format
-msgid ""
-"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+#: src/ats-tests/ats-testing-log.c:837
+msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1164
+#: src/ats-tests/ats-testing-log.c:892
 #, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr "解析配置文件“%s”失败\n"
+msgid "Start logging `%s'\n"
+msgstr "未知的命令“%s”。\n"
 
 #: src/ats-tests/ats-testing.c:422
 #, c-format
@@ -486,15 +368,6 @@ msgstr ""
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tests/ats-testing-log.c:837
-msgid "Stop logging\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing-log.c:892
-#, fuzzy, c-format
-msgid "Start logging `%s'\n"
-msgstr "未知的命令“%s”。\n"
-
 #: src/ats-tests/gnunet-ats-sim.c:90
 #, c-format
 msgid ""
@@ -502,6 +375,15 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
+#: src/ats-tests/gnunet-solver-eval.c:939 src/ats/gnunet-ats-solver-eval.c:3294
+msgid "solver to use"
+msgstr ""
+
+#: src/ats-tests/gnunet-solver-eval.c:945
+#: src/ats-tests/gnunet-solver-eval.c:950 src/ats/gnunet-ats-solver-eval.c:3299
+msgid "experiment to use"
+msgstr ""
+
 #: src/ats-tool/gnunet-ats.c:307
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -623,6 +505,124 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
+#: src/ats/gnunet-ats-solver-eval.c:2781 src/ats/gnunet-ats-solver-eval.c:2822
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2799
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:2840
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3306
+#, fuzzy
+msgid "print logging"
+msgstr "未知的命令“%s”。\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:3311
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3316
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:304
+#, 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:314
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:359
+#, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:451
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "无法初始化 SQLite:%s。\n"
+
+#: src/ats/plugin_ats_mlp.c:1274
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1869
+#, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:1913
+#, c-format
+msgid "Updating address property for peer `%s' %p not added before\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2475
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2515 src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2564 src/ats/plugin_ats_mlp.c:2582
+#: src/ats/plugin_ats_mlp.c:2601 src/ats/plugin_ats_proportional.c:1141
+#: src/ats/plugin_ats_ril.c:2612 src/ats/plugin_ats_ril.c:2629
+#: src/ats/plugin_ats_ril.c:2646 src/ats/plugin_ats_ril.c:2663
+#: src/ats/plugin_ats_ril.c:2680 src/ats/plugin_ats_ril.c:2697
+#: src/ats/plugin_ats_ril.c:2714 src/ats/plugin_ats_ril.c:2731
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/ats/plugin_ats_mlp.c:2670
+#, c-format
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2679
+#, c-format
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2689
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_mlp.c:2698
+#, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/plugin_ats_proportional.c:1164
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f\n"
+msgstr "解析配置文件“%s”失败\n"
+
 #: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
@@ -763,291 +763,291 @@ msgstr ""
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:513
-#: src/conversation/conversation_api_call.c:490
+#: src/conversation/conversation_api.c:515
+#: src/conversation/conversation_api_call.c:494
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:269
+#: src/conversation/gnunet-conversation-test.c:119
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:145
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:210
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation.c:270
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:294
+#: src/conversation/gnunet-conversation.c:295
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:329
+#: src/conversation/gnunet-conversation.c:330
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:334
+#: src/conversation/gnunet-conversation.c:335
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:352
+#: src/conversation/gnunet-conversation.c:353
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:367
+#: src/conversation/gnunet-conversation.c:368
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:379
+#: src/conversation/gnunet-conversation.c:380
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:401
+#: src/conversation/gnunet-conversation.c:404
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:408
+#: src/conversation/gnunet-conversation.c:411
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/conversation/gnunet-conversation.c:415
+#: src/conversation/gnunet-conversation.c:418
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/conversation/gnunet-conversation.c:423
+#: src/conversation/gnunet-conversation.c:426
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:432
+#: src/conversation/gnunet-conversation.c:435
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:438
+#: src/conversation/gnunet-conversation.c:441
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:443
+#: src/conversation/gnunet-conversation.c:446
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:512
+#: src/conversation/gnunet-conversation.c:517
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/conversation/gnunet-conversation.c:528
-#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:533
+#: src/conversation/gnunet-conversation.c:547
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:535
-#: src/conversation/gnunet-conversation.c:592
+#: src/conversation/gnunet-conversation.c:540
+#: src/conversation/gnunet-conversation.c:596
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:550
-#: src/conversation/gnunet-conversation.c:605
+#: src/conversation/gnunet-conversation.c:555
+#: src/conversation/gnunet-conversation.c:609
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:560
+#: src/conversation/gnunet-conversation.c:565
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:620
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:633
+#: src/conversation/gnunet-conversation.c:637
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:663
+#: src/conversation/gnunet-conversation.c:668
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:686
+#: src/conversation/gnunet-conversation.c:692
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:691
+#: src/conversation/gnunet-conversation.c:697
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:697
-#: src/conversation/gnunet-conversation.c:721
+#: src/conversation/gnunet-conversation.c:703
+#: src/conversation/gnunet-conversation.c:727
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:702
+#: src/conversation/gnunet-conversation.c:708
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:711
+#: src/conversation/gnunet-conversation.c:717
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/conversation/gnunet-conversation.c:716
+#: src/conversation/gnunet-conversation.c:722
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:735
+#: src/conversation/gnunet-conversation.c:741
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:741
+#: src/conversation/gnunet-conversation.c:747
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/conversation/gnunet-conversation.c:769
-#: src/conversation/gnunet-conversation.c:784
+#: src/conversation/gnunet-conversation.c:776
+#: src/conversation/gnunet-conversation.c:791
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:817
-#: src/conversation/gnunet-conversation.c:833
+#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:840
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:840
+#: src/conversation/gnunet-conversation.c:847
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:849
+#: src/conversation/gnunet-conversation.c:856
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:866
+#: src/conversation/gnunet-conversation.c:873
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:901
+#: src/conversation/gnunet-conversation.c:908
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:909
+#: src/conversation/gnunet-conversation.c:916
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:926
+#: src/conversation/gnunet-conversation.c:933
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:952
+#: src/conversation/gnunet-conversation.c:959
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:954
+#: src/conversation/gnunet-conversation.c:961
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:956
+#: src/conversation/gnunet-conversation.c:963
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:958
+#: src/conversation/gnunet-conversation.c:965
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:960
+#: src/conversation/gnunet-conversation.c:967
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:962
+#: src/conversation/gnunet-conversation.c:969
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:964
+#: src/conversation/gnunet-conversation.c:971
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:966
+#: src/conversation/gnunet-conversation.c:973
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:968
+#: src/conversation/gnunet-conversation.c:975
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1172
+#: src/conversation/gnunet-conversation.c:1191
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:1185
+#: src/conversation/gnunet-conversation.c:1204
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1220
+#: src/conversation/gnunet-conversation.c:1242
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/conversation/gnunet-conversation.c:1244
+#: src/conversation/gnunet-conversation.c:1266
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/conversation/gnunet-conversation.c:1273
-msgid "sets the NAME of the ego to use for the phone (and name resolution)"
+#: src/conversation/gnunet-conversation.c:1295
+msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1279
+#: src/conversation/gnunet-conversation.c:1300
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1306
+#: src/conversation/gnunet-conversation.c:1329
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:119
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:145
-#, c-format
-msgid ""
-"\n"
-"We are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:210
-#, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
-msgstr ""
-
-#: src/conversation/gnunet_gst.c:622
 #: src/conversation/gnunet-helper-audio-playback-gst.c:361
+#: src/conversation/gnunet_gst.c:622
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1291,128 +1291,137 @@ msgstr "立即保存配置?"
 msgid "Core service of `%s' ready.\n"
 msgstr "服务已删除。\n"
 
-#: src/core/gnunet-service-core_kx.c:566
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:626
+#: src/core/gnunet-service-core_kx.c:677
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:728
+#: src/core/gnunet-service-core_kx.c:779
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:778
+#: src/core/gnunet-service-core_kx.c:829
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:840
+#: src/core/gnunet-service-core_kx.c:891
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:874
+#: src/core/gnunet-service-core_kx.c:925
 #, fuzzy
 msgid "# PING messages transmitted"
 msgstr "消息尺寸"
 
-#: src/core/gnunet-service-core_kx.c:941
+#: src/core/gnunet-service-core_kx.c:992
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:948
-msgid "# ephemeral keys received"
+#: src/core/gnunet-service-core_kx.c:1005
+msgid "# duplicate ephemeral keys ignored"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1040
+msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:987
+#: src/core/gnunet-service-core_kx.c:1054
 #, c-format
 msgid ""
-"Ephemeral key message from peer `%s' rejected as its validity range does not "
-"match our system time (%llu not in [%llu,%llu]).\n"
+"EPHERMAL_KEY from peer `%s' rejected as its validity range does not match "
+"our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:998
-msgid "# EPHEMERAL_KEY messages received"
+#: src/core/gnunet-service-core_kx.c:1060
+msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1094
+#: src/core/gnunet-service-core_kx.c:1080
+#, fuzzy
+msgid "# valid ephemeral keys received"
+msgstr "保存配置失败。"
+
+#: src/core/gnunet-service-core_kx.c:1180
 #: src/transport/gnunet-service-transport_validation.c:1128
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1103
+#: src/core/gnunet-service-core_kx.c:1189
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1161
+#: src/core/gnunet-service-core_kx.c:1248
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1187
+#: src/core/gnunet-service-core_kx.c:1274
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1200
+#: src/core/gnunet-service-core_kx.c:1287
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1264
+#: src/core/gnunet-service-core_kx.c:1351
 #: src/transport/gnunet-service-transport_validation.c:1461
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1271
+#: src/core/gnunet-service-core_kx.c:1358
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1363
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1311
+#: src/core/gnunet-service-core_kx.c:1398
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1349
+#: src/core/gnunet-service-core_kx.c:1436
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1360
+#: src/core/gnunet-service-core_kx.c:1447
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1367
+#: src/core/gnunet-service-core_kx.c:1454
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1521
+#: src/core/gnunet-service-core_kx.c:1642
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1529
+#: src/core/gnunet-service-core_kx.c:1650
 #, 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:1532
+#: src/core/gnunet-service-core_kx.c:1653
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1593
-#: src/core/gnunet-service-core_kx.c:1619
+#: src/core/gnunet-service-core_kx.c:1742
+#: src/core/gnunet-service-core_kx.c:1768
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1606
+#: src/core/gnunet-service-core_kx.c:1755
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1648
+#: src/core/gnunet-service-core_kx.c:1797
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1656
+#: src/core/gnunet-service-core_kx.c:1805
 msgid "# bytes of payload decrypted"
 msgstr ""
 
@@ -1420,11 +1429,11 @@ msgstr ""
 #: src/core/gnunet-service-core_sessions.c:350
 #: src/dht/gnunet-service-dht_neighbours.c:733
 #: src/dht/gnunet-service-dht_neighbours.c:795
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1520
-#: src/topology/gnunet-daemon-topology.c:612
-#: src/topology/gnunet-daemon-topology.c:714
-#: src/transport/gnunet-service-transport_neighbours.c:719
-#: src/transport/gnunet-service-transport_neighbours.c:727
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1522
+#: src/topology/gnunet-daemon-topology.c:617
+#: src/topology/gnunet-daemon-topology.c:719
+#: src/transport/gnunet-service-transport_neighbours.c:721
+#: src/transport/gnunet-service-transport_neighbours.c:729
 msgid "# peers connected"
 msgstr ""
 
@@ -1451,53 +1460,183 @@ msgstr ""
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:119 src/datacache/datacache.c:294
+#: src/credential/credential_misc.c:88
+#, fuzzy, c-format
+msgid "Unable to parse CRED record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:888
+#: src/namestore/plugin_rest_namestore.c:1022
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:280
+#: src/credential/gnunet-credential.c:434
+#, fuzzy, c-format
+msgid "Issuer public key `%s' is not well-formed\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/credential/gnunet-credential.c:361
+#: src/credential/gnunet-credential.c:423
+#, fuzzy, c-format
+msgid "Issuer public key not well-formed\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/credential/gnunet-credential.c:372
+#: src/credential/gnunet-credential.c:444
+#, fuzzy, c-format
+msgid "Failed to connect to CREDENTIAL\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/credential/gnunet-credential.c:379
+#, c-format
+msgid "You must provide issuer the attribute\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:387
+#, c-format
+msgid "ego required\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:403
+#, c-format
+msgid "Subject public key needed\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:414
+#, fuzzy, c-format
+msgid "Subject public key `%s' is not well-formed\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/credential/gnunet-credential.c:451
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:504
+#, c-format
+msgid "Issuer ego required\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:516
+#, c-format
+msgid "Please specify name to lookup, subject key and issuer key!\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:536
+msgid "create credential"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:540
+msgid "verify credential against attribute"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:545
+msgid "The public key of the subject to lookup the credential for"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:550
+msgid "The name of the credential presented by the subject"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:555
+msgid "The public key of the authority to verify the credential against"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:560
+#, fuzzy
+msgid "The ego to use"
+msgstr "消息尺寸"
+
+#: src/credential/gnunet-credential.c:565
+msgid "The issuer attribute to verify against or to issue"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:570
+msgid "The time to live for the credential"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:574
+msgid "collect credentials"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:588
+#, fuzzy
+msgid "GNUnet credential resolver tool"
+msgstr "GNUnet 错误日志"
+
+#: src/credential/gnunet-service-credential.c:1138
+#: src/gns/gnunet-gns-helper-service-w32.c:727 src/gns/gnunet-gns.c:184
+#, fuzzy, c-format
+msgid "Failed to connect to GNS\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/credential/gnunet-service-credential.c:1144
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
+#: src/namestore/gnunet-namestore.c:914
+#: src/namestore/plugin_rest_namestore.c:1035
+#, fuzzy, c-format
+msgid "Failed to connect to namestore\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/credential/plugin_gnsrecord_credential.c:186
+#, fuzzy, c-format
+msgid "Unable to parse ATTR record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/credential/plugin_rest_credential.c:1128 src/gns/plugin_rest_gns.c:669
+msgid "GNS REST API initialized\n"
+msgstr ""
+
+#: src/datacache/datacache.c:119 src/datacache/datacache.c:311
 #: src/datastore/gnunet-service-datastore.c:757
 msgid "# bytes stored"
 msgstr ""
 
-#: src/datacache/datacache.c:123 src/datacache/datacache.c:298
+#: src/datacache/datacache.c:123 src/datacache/datacache.c:315
 msgid "# items stored"
 msgstr ""
 
-#: src/datacache/datacache.c:202
+#: src/datacache/datacache.c:206
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:213
+#: src/datacache/datacache.c:217
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:329
+#: src/datacache/datacache.c:344
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:339
+#: src/datacache/datacache.c:354
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/datacache.c:367
+#: src/datacache/datacache.c:384
 msgid "# requests for random value received"
 msgstr ""
 
-#: src/datacache/datacache.c:399
+#: src/datacache/datacache.c:416
 msgid "# proximity search requests received"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:466
+#: src/datacache/plugin_datacache_heap.c:550
 #, fuzzy
 msgid "Heap datacache running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/datacache/plugin_datacache_sqlite.c:113
-#: src/datacache/plugin_datacache_sqlite.c:122
+#: src/datacache/plugin_datacache_sqlite.c:118
+#: src/datacache/plugin_datacache_sqlite.c:127
 #: src/datastore/plugin_datastore_mysql.c:892
 #: src/datastore/plugin_datastore_sqlite.c:58
-#: src/datastore/plugin_datastore_sqlite.c:66 src/my/my.c:80 src/my/my.c:92
-#: src/mysql/mysql.c:42 src/mysql/mysql.c:49
-#: src/namecache/plugin_namecache_sqlite.c:53
+#: src/datastore/plugin_datastore_sqlite.c:66
+#: src/identity-provider/plugin_identity_provider_sqlite.c:52 src/my/my.c:80
+#: src/my/my.c:92 src/mysql/mysql.c:42 src/mysql/mysql.c:49
+#: src/namecache/plugin_namecache_sqlite.c:52
 #: src/namestore/plugin_namestore_sqlite.c:53
 #: src/peerstore/plugin_peerstore_sqlite.c:52
 #: src/psycstore/plugin_psycstore_mysql.c:62
@@ -1506,16 +1645,17 @@ msgstr "sqlite 数据仓库"
 #: src/testbed/gnunet-daemon-testbed-underlay.c:56
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
 #: src/util/crypto_ecc_setup.c:41 src/util/crypto_mpi.c:39
-#: src/include/gnunet_common.h:735 src/include/gnunet_common.h:744
+#: src/include/gnunet_common.h:812 src/include/gnunet_common.h:821
 #: src/scalarproduct/scalarproduct.h:35
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:817
-#: src/datastore/plugin_datastore_sqlite.c:456
-#: src/namecache/plugin_namecache_sqlite.c:296
-#: src/namestore/plugin_namestore_sqlite.c:355
+#: src/datacache/plugin_datacache_sqlite.c:862
+#: src/datastore/plugin_datastore_sqlite.c:508
+#: src/identity-provider/plugin_identity_provider_sqlite.c:336
+#: src/namecache/plugin_namecache_sqlite.c:329
+#: src/namestore/plugin_namestore_sqlite.c:264
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1808,7 +1948,7 @@ msgid "MySQL statement run failure"
 msgstr ""
 
 #: src/datastore/plugin_datastore_mysql.c:410
-#: src/datastore/plugin_datastore_sqlite.c:626
+#: src/datastore/plugin_datastore_sqlite.c:678
 #, fuzzy
 msgid "Data too large"
 msgstr "迭代次数"
@@ -1847,32 +1987,34 @@ msgid "`%s' failed at %s:%u with error: %s"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:271
-#: src/namecache/plugin_namecache_sqlite.c:194
-#: src/namestore/plugin_namestore_sqlite.c:222
+#: src/identity-provider/plugin_identity_provider_sqlite.c:212
+#: src/namecache/plugin_namecache_sqlite.c:209
+#: src/namestore/plugin_namestore_sqlite.c:205
 #: src/peerstore/plugin_peerstore_sqlite.c:535
 #: src/psycstore/plugin_psycstore_sqlite.c:325
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:577
+#: src/datastore/plugin_datastore_sqlite.c:629
 msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1259
+#: src/datastore/plugin_datastore_sqlite.c:1322
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1293
+#: src/datastore/plugin_datastore_sqlite.c:1356
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1337
-#: src/namecache/plugin_namecache_sqlite.c:603
-#: src/namestore/plugin_namestore_sqlite.c:802
+#: src/datastore/plugin_datastore_sqlite.c:1400
+#: src/identity-provider/plugin_identity_provider_sqlite.c:711
+#: src/namecache/plugin_namecache_sqlite.c:640
+#: src/namestore/plugin_namestore_sqlite.c:754
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
@@ -1881,157 +2023,104 @@ msgstr "sqlite 数据仓库"
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:157
+#: src/dht/gnunet-dht-get.c:158
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
+#: src/dht/gnunet-dht-get.c:159
+#, c-format
+msgid "Result %d, type %d:\n"
+msgstr ""
+
 #: src/dht/gnunet-dht-get.c:204
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:248
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-monitor.c:257
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-dht-get.c:218
+#: src/dht/gnunet-dht-get.c:219
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:245 src/dht/gnunet-dht-monitor.c:298
-#: src/dht/gnunet-dht-put.c:222
+#: src/dht/gnunet-dht-get.c:248 src/dht/gnunet-dht-monitor.c:307
+#: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:251
+#: src/dht/gnunet-dht-get.c:253
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:304
+#: src/dht/gnunet-dht-get.c:258 src/dht/gnunet-dht-monitor.c:313
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:264
+#: src/dht/gnunet-dht-get.c:263
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:269 src/dht/gnunet-dht-put.c:227
+#: src/dht/gnunet-dht-get.c:267 src/dht/gnunet-dht-put.c:202
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:283
+#: src/dht/gnunet-dht-get.c:280
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:310
+#: src/dht/gnunet-dht-monitor.c:319
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:315 src/fs/gnunet-download.c:344
-#: src/nse/gnunet-nse-profiler.c:871
+#: src/dht/gnunet-dht-monitor.c:324 src/fs/gnunet-download.c:372
+#: src/nse/gnunet-nse-profiler.c:878
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:328
+#: src/dht/gnunet-dht-monitor.c:337
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:1161 src/testbed/gnunet-testbed-profiler.c:253
-#, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "增加 TCP/IP 的最大连接数"
-
-#: src/dht/gnunet_dht_profiler.c:1188
-#, fuzzy
-msgid "number of peers to start"
-msgstr "迭代次数"
-
-#: src/dht/gnunet_dht_profiler.c:1194
-msgid ""
-"maximum number of times we try to search for successor circle formation (0 "
-"for R5N)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1200 src/nse/gnunet-nse-profiler.c:853
-#: src/testbed/gnunet-testbed-profiler.c:304
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1206
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1212
-msgid "delay to start doing PUTs (default: 1 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1218
-msgid "delay to start doing GETs (default: 5 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1223
-msgid "replication degree for DHT PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1230
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1248
-#, fuzzy
-msgid "Measure quality and performance of the DHT service."
-msgstr "无法访问该服务"
-
-#: src/dht/gnunet-dht-put.c:120
-msgid "PUT request sent with key"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:123
-msgid "Timeout sending PUT request!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:126
-msgid "PUT request not confirmed!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-put.c:156
+#: src/dht/gnunet-dht-put.c:134
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:163
-#, fuzzy, c-format
-msgid "Could not connect to %s service!\n"
+#: src/dht/gnunet-dht-put.c:142
+#, fuzzy
+msgid "Could not connect to DHT service!\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/dht/gnunet-dht-put.c:174
+#: src/dht/gnunet-dht-put.c:153
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-put.c:188
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:216
+#: src/dht/gnunet-dht-put.c:193
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:233
+#: src/dht/gnunet-dht-put.c:207
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:238
+#: src/dht/gnunet-dht-put.c:211
 msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:244
+#: src/dht/gnunet-dht-put.c:216
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:262
+#: src/dht/gnunet-dht-put.c:233
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
@@ -2039,74 +2128,74 @@ msgstr ""
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:485
+#: src/dht/gnunet-service-dht_clients.c:483
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:624
+#: src/dht/gnunet-service-dht_clients.c:616
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:850
+#: src/dht/gnunet-service-dht_clients.c:842
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1035
+#: src/dht/gnunet-service-dht_clients.c:1027
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1050
+#: src/dht/gnunet-service-dht_clients.c:1042
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1096
+#: src/dht/gnunet-service-dht_clients.c:1088
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1103
+#: src/dht/gnunet-service-dht_clients.c:1095
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1181
+#: src/dht/gnunet-service-dht_clients.c:1173
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:72
+#: src/dht/gnunet-service-dht_datacache.c:73
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:82
+#: src/dht/gnunet-service-dht_datacache.c:83
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:198
+#: src/dht/gnunet-service-dht_datacache.c:202
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:210
+#: src/dht/gnunet-service-dht_datacache.c:214
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:216
+#: src/dht/gnunet-service-dht_datacache.c:220
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:222
+#: src/dht/gnunet-service-dht_datacache.c:226
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:234
+#: src/dht/gnunet-service-dht_datacache.c:238
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:242
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:273
+#: src/dht/gnunet-service-dht_datacache.c:277
 msgid "# GET requests given to datacache"
 msgstr ""
 
@@ -2234,16 +2323,64 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:187
+#: src/dht/gnunet_dht_profiler.c:916 src/testbed/gnunet-testbed-profiler.c:253
+#, fuzzy, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "增加 TCP/IP 的最大连接数"
+
+#: src/dht/gnunet_dht_profiler.c:949
+#, fuzzy
+msgid "number of peers to start"
+msgstr "迭代次数"
+
+#: src/dht/gnunet_dht_profiler.c:954
+msgid "number of PUTs to perform per peer"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:959 src/nse/gnunet-nse-profiler.c:860
+#: src/testbed/gnunet-testbed-profiler.c:304
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:964
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:969
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:974
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:979
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:984
+msgid "chance that a peer is selected at random for PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:989
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1009
+#, fuzzy
+msgid "Measure quality and performance of the DHT service."
+msgstr "无法访问该服务"
+
+#: src/dht/plugin_block_dht.c:189
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:194
+#: src/dht/plugin_block_dht.c:198
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:204
+#: src/dht/plugin_block_dht.c:209
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -2253,36 +2390,31 @@ msgstr ""
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/dns/dnsparser.c:818
+#: src/dns/dnsparser.c:823
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/dns/dnsstub.c:176
+#: src/dns/dnsstub.c:233
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/dns/dnsstub.c:294 src/dns/dnsstub.c:382
+#: src/dns/dnsstub.c:364
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
+
+#: src/dns/dnsstub.c:511
 #, fuzzy, c-format
-msgid "Failed to send DNS request to %s\n"
+msgid "Failed to send DNS request to %s: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/dns/dnsstub.c:298
+#: src/dns/dnsstub.c:517
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/dns/dnsstub.c:367
-#, c-format
-msgid "Configured DNS exit `%s' is not working / valid.\n"
-msgstr ""
-
-#: src/dns/dnsstub.c:437
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
 #: src/dns/gnunet-dns-monitor.c:353 src/dns/gnunet-dns-monitor.c:358
 msgid "only monitor DNS queries"
 msgstr ""
@@ -2307,49 +2439,49 @@ msgstr ""
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:608
+#: src/dns/gnunet-service-dns.c:610
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:738
+#: src/dns/gnunet-service-dns.c:740
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:813
+#: src/dns/gnunet-service-dns.c:815
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:928
+#: src/dns/gnunet-service-dns.c:930
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:944
+#: src/dns/gnunet-service-dns.c:946
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:953
+#: src/dns/gnunet-service-dns.c:955
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:963
+#: src/dns/gnunet-service-dns.c:965
 msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:965
+#: src/dns/gnunet-service-dns.c:967
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1032
+#: src/dns/gnunet-service-dns.c:1034
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1077 src/exit/gnunet-daemon-exit.c:3569
+#: src/dns/gnunet-service-dns.c:1082 src/exit/gnunet-daemon-exit.c:3565
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/dns/gnunet-service-dns.c:1090
+#: src/dns/gnunet-service-dns.c:1092
 #, c-format
 msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
@@ -2359,204 +2491,204 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/exit/gnunet-daemon-exit.c:961
+#: src/exit/gnunet-daemon-exit.c:960
 msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1062
+#: src/exit/gnunet-daemon-exit.c:1061
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1341
+#: src/exit/gnunet-daemon-exit.c:1340
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1465 src/exit/gnunet-daemon-exit.c:1573
-#: src/exit/gnunet-daemon-exit.c:1620 src/exit/gnunet-daemon-exit.c:1702
-#: src/exit/gnunet-daemon-exit.c:1823 src/exit/gnunet-daemon-exit.c:1954
-#: src/exit/gnunet-daemon-exit.c:2208
+#: src/exit/gnunet-daemon-exit.c:1464 src/exit/gnunet-daemon-exit.c:1572
+#: src/exit/gnunet-daemon-exit.c:1619 src/exit/gnunet-daemon-exit.c:1701
+#: src/exit/gnunet-daemon-exit.c:1822 src/exit/gnunet-daemon-exit.c:1953
+#: src/exit/gnunet-daemon-exit.c:2207
 msgid "# Bytes received from CADET"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1468
+#: src/exit/gnunet-daemon-exit.c:1467
 msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1576
+#: src/exit/gnunet-daemon-exit.c:1575
 msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1616
+#: src/exit/gnunet-daemon-exit.c:1615
 msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1705
+#: src/exit/gnunet-daemon-exit.c:1704
 msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1789
+#: src/exit/gnunet-daemon-exit.c:1788
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1826
+#: src/exit/gnunet-daemon-exit.c:1825
 msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1957
+#: src/exit/gnunet-daemon-exit.c:1956
 msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2023 src/exit/gnunet-daemon-exit.c:2280
-#: src/exit/gnunet-daemon-exit.c:2635 src/vpn/gnunet-service-vpn.c:828
+#: src/exit/gnunet-daemon-exit.c:2022 src/exit/gnunet-daemon-exit.c:2279
+#: src/exit/gnunet-daemon-exit.c:2634 src/vpn/gnunet-service-vpn.c:828
 #: src/vpn/gnunet-service-vpn.c:991 src/vpn/gnunet-service-vpn.c:2105
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2082 src/exit/gnunet-daemon-exit.c:2339
-#: src/exit/gnunet-daemon-exit.c:2672 src/vpn/gnunet-service-vpn.c:887
+#: src/exit/gnunet-daemon-exit.c:2081 src/exit/gnunet-daemon-exit.c:2338
+#: src/exit/gnunet-daemon-exit.c:2671 src/vpn/gnunet-service-vpn.c:887
 #: src/vpn/gnunet-service-vpn.c:1024 src/vpn/gnunet-service-vpn.c:2158
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2211
+#: src/exit/gnunet-daemon-exit.c:2210
 msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2265 src/vpn/gnunet-service-vpn.c:985
+#: src/exit/gnunet-daemon-exit.c:2264 src/vpn/gnunet-service-vpn.c:985
 #: src/vpn/gnunet-service-vpn.c:2096
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2324 src/vpn/gnunet-service-vpn.c:875
+#: src/exit/gnunet-daemon-exit.c:2323 src/vpn/gnunet-service-vpn.c:875
 #: src/vpn/gnunet-service-vpn.c:2130 src/vpn/gnunet-service-vpn.c:2141
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2403 src/exit/gnunet-daemon-exit.c:3069
+#: src/exit/gnunet-daemon-exit.c:2402 src/exit/gnunet-daemon-exit.c:3068
 #, fuzzy
 msgid "# Inbound CADET channels created"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/exit/gnunet-daemon-exit.c:2523
+#: src/exit/gnunet-daemon-exit.c:2522
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2542
+#: src/exit/gnunet-daemon-exit.c:2541
 #, fuzzy
 msgid "# Messages transmitted via cadet channels"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/exit/gnunet-daemon-exit.c:2720
+#: src/exit/gnunet-daemon-exit.c:2719
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2728
+#: src/exit/gnunet-daemon-exit.c:2727
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2802
+#: src/exit/gnunet-daemon-exit.c:2801
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2874
+#: src/exit/gnunet-daemon-exit.c:2873
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2922
+#: src/exit/gnunet-daemon-exit.c:2921
 msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2936
+#: src/exit/gnunet-daemon-exit.c:2935
 msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2962
+#: src/exit/gnunet-daemon-exit.c:2961
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2989
+#: src/exit/gnunet-daemon-exit.c:2988
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3035
+#: src/exit/gnunet-daemon-exit.c:3034
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3043
+#: src/exit/gnunet-daemon-exit.c:3042
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3246 src/exit/gnunet-daemon-exit.c:3256
+#: src/exit/gnunet-daemon-exit.c:3245 src/exit/gnunet-daemon-exit.c:3255
 #, fuzzy, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr "%s:选项“%s”有歧义\n"
 
-#: src/exit/gnunet-daemon-exit.c:3270 src/exit/gnunet-daemon-exit.c:3278
+#: src/exit/gnunet-daemon-exit.c:3269 src/exit/gnunet-daemon-exit.c:3277
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3319
+#: src/exit/gnunet-daemon-exit.c:3318
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3333 src/exit/gnunet-daemon-exit.c:3346
+#: src/exit/gnunet-daemon-exit.c:3332 src/exit/gnunet-daemon-exit.c:3345
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3358
+#: src/exit/gnunet-daemon-exit.c:3357
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3503
+#: src/exit/gnunet-daemon-exit.c:3501
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3511
+#: src/exit/gnunet-daemon-exit.c:3509
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3518
+#: src/exit/gnunet-daemon-exit.c:3516
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3524
+#: src/exit/gnunet-daemon-exit.c:3522
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3694
+#: src/exit/gnunet-daemon-exit.c:3690
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3809
+#: src/exit/gnunet-daemon-exit.c:3805
 #, c-format
 msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3821 src/pt/gnunet-daemon-pt.c:1204
+#: src/exit/gnunet-daemon-exit.c:3817 src/pt/gnunet-daemon-pt.c:1204
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3970
+#: src/exit/gnunet-daemon-exit.c:3966
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2682,64 +2814,64 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:309
+#: src/fs/fs_download.c:310
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:334
+#: src/fs/fs_download.c:335
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:346
+#: src/fs/fs_download.c:347
 #, c-format
 msgid ""
 "Failed to access full directroy contents of `%s' for recursive download\n"
 msgstr ""
 
-#: src/fs/fs_download.c:533 src/fs/fs_download.c:545
+#: src/fs/fs_download.c:534 src/fs/fs_download.c:546
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_download.c:955
+#: src/fs/fs_download.c:956
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1046
+#: src/fs/fs_download.c:1047
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:1074
+#: src/fs/fs_download.c:1075
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1098
+#: src/fs/fs_download.c:1099
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_download.c:1110
+#: src/fs/fs_download.c:1111
 #, 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:1120
 #, 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:1219
+#: src/fs/fs_download.c:1220
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_download.c:1884
+#: src/fs/fs_download.c:1885
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
@@ -2855,12 +2987,12 @@ msgstr ""
 msgid "Internal error."
 msgstr "未知错误。\n"
 
-#: src/fs/fs_search.c:809 src/fs/fs_search.c:879
+#: src/fs/fs_search.c:822 src/fs/fs_search.c:892
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/fs/fs_search.c:966
+#: src/fs/fs_search.c:979
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2912,93 +3044,93 @@ msgstr "打开日志文件“%s”失败:%s\n"
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/fs_uri.c:223
+#: src/fs/fs_uri.c:234
 #, no-c-format
 msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:282
+#: src/fs/fs_uri.c:293
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:300
+#: src/fs/fs_uri.c:311
 msgid "Malformed KSK URI (`++' not allowed)"
 msgstr ""
 
-#: src/fs/fs_uri.c:307
+#: src/fs/fs_uri.c:318
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:377
+#: src/fs/fs_uri.c:388
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:418
+#: src/fs/fs_uri.c:429
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:433
+#: src/fs/fs_uri.c:444
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:512
+#: src/fs/fs_uri.c:523
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:527
+#: src/fs/fs_uri.c:538
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:537
+#: src/fs/fs_uri.c:548
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545
+#: src/fs/fs_uri.c:556
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:553
+#: src/fs/fs_uri.c:564
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:559
+#: src/fs/fs_uri.c:570
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:565
+#: src/fs/fs_uri.c:576
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:574
+#: src/fs/fs_uri.c:585
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:580
+#: src/fs/fs_uri.c:591
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
+#: src/fs/fs_uri.c:597
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:609
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:632
+#: src/fs/fs_uri.c:643
 #, fuzzy
 msgid "invalid argument"
 msgstr "“%s”的参数无效。\n"
 
-#: src/fs/fs_uri.c:644
+#: src/fs/fs_uri.c:655
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1048 src/fs/fs_uri.c:1075
+#: src/fs/fs_uri.c:1059 src/fs/fs_uri.c:1086
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1081
+#: src/fs/fs_uri.c:1092
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3038,19 +3170,19 @@ msgstr ""
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:905
+#: src/fs/gnunet-auto-share.c:772 src/fs/gnunet-publish.c:904
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:911
+#: src/fs/gnunet-auto-share.c:777 src/fs/gnunet-publish.c:909
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:949
+#: src/fs/gnunet-auto-share.c:783 src/fs/gnunet-publish.c:944
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:962
+#: src/fs/gnunet-auto-share.c:789 src/fs/gnunet-publish.c:956
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -3097,105 +3229,97 @@ msgstr "更改 GNUnet 目录的权限出错"
 msgid "Display contents of a GNUnet directory"
 msgstr "更改 GNUnet 目录的权限出错"
 
-#: src/fs/gnunet-download.c:137
+#: src/fs/gnunet-download.c:139
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-download.c:147
+#: src/fs/gnunet-download.c:149
 #, fuzzy
 msgid "<unknown time>"
 msgstr "未知错误"
 
-#: src/fs/gnunet-download.c:157
+#: src/fs/gnunet-download.c:158
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:179
+#: src/fs/gnunet-download.c:184
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:194
+#: src/fs/gnunet-download.c:201
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:295
+#: src/fs/gnunet-download.c:216 src/fs/gnunet-publish.c:295
 #: src/fs/gnunet-search.c:212 src/fs/gnunet-unindex.c:107
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:246
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:726
+#: src/fs/gnunet-download.c:253 src/fs/gnunet-publish.c:726
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:264
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:273
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:870
+#: src/fs/gnunet-download.c:291 src/fs/gnunet-publish.c:870
 #: src/fs/gnunet-search.c:270 src/fs/gnunet-unindex.c:139
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-download.c:306 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:339 src/fs/gnunet-search.c:313
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:311
+#: src/fs/gnunet-download.c:344
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:316 src/fs/gnunet-search.c:319
+#: src/fs/gnunet-download.c:349 src/fs/gnunet-search.c:319
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:322
+#: src/fs/gnunet-download.c:354
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:328
+#: src/fs/gnunet-download.c:359
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:334
+#: src/fs/gnunet-download.c:364
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:339
+#: src/fs/gnunet-download.c:368
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:356
+#: src/fs/gnunet-download.c:386
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:119
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:130
-msgid "Special file-sharing operations"
-msgstr ""
-
 #: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
@@ -3208,8 +3332,16 @@ msgstr ""
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:233
-msgid "run a testbed to measure file-sharing performance"
+#: src/fs/gnunet-fs-profiler.c:233
+msgid "run a testbed to measure file-sharing performance"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:119
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:130
+msgid "Special file-sharing operations"
 msgstr ""
 
 #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:231
@@ -3343,56 +3475,56 @@ msgstr ""
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:916
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:923
+#: src/fs/gnunet-publish.c:919
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:930
+#: src/fs/gnunet-publish.c:925
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:935
+#: src/fs/gnunet-publish.c:930
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:942
+#: src/fs/gnunet-publish.c:937
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:955
+#: src/fs/gnunet-publish.c:950
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:968
+#: src/fs/gnunet-publish.c:960
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:975
+#: src/fs/gnunet-publish.c:966
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:982
+#: src/fs/gnunet-publish.c:973
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:998
+#: src/fs/gnunet-publish.c:989
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3465,7 +3597,7 @@ msgid "FS service is lacking HOSTKEY configuration 
setting.  Exiting.\n"
 msgstr "立即保存配置?"
 
 #: src/fs/gnunet-service-fs.c:1311 src/hostlist/gnunet-daemon-hostlist.c:355
-#: src/topology/gnunet-daemon-topology.c:1203
+#: src/topology/gnunet-daemon-topology.c:1202
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -3514,7 +3646,7 @@ msgstr ""
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1343
+#: src/fs/gnunet-service-fs_cp.c:723 src/fs/gnunet-service-fs_cp.c:1345
 msgid "# P2P searches active"
 msgstr ""
 
@@ -3562,19 +3694,19 @@ msgstr ""
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1239
+#: src/fs/gnunet-service-fs_cp.c:1241
 msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1295
+#: src/fs/gnunet-service-fs_cp.c:1297
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1339
+#: src/fs/gnunet-service-fs_cp.c:1341
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1706
+#: src/fs/gnunet-service-fs_cp.c:1708
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3782,6 +3914,10 @@ msgstr ""
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
+#: src/gns/gns_tld_api.c:276
+msgid "Expected a base32-encoded public zone key\n"
+msgstr ""
+
 #: src/gns/gnunet-bcd.c:127
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
@@ -3810,128 +3946,64 @@ msgstr ""
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:238
+#: src/gns/gnunet-dns2gns.c:203
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-dns2gns.c:408
+#: src/gns/gnunet-dns2gns.c:404
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:424
+#: src/gns/gnunet-dns2gns.c:420
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:432
+#: src/gns/gnunet-dns2gns.c:428
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:711
-msgid "No ego configured for `dns2gns` subsystem\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:739
+#: src/gns/gnunet-dns2gns.c:587
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:760
-msgid "No valid GNS zone specified!\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:784
+#: src/gns/gnunet-dns2gns.c:687
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:790
-msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:796
-msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:802
+#: src/gns/gnunet-dns2gns.c:692
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:808
-msgid "Public key of the GNS zone to use (overrides default)"
+#: src/gns/gnunet-dns2gns.c:709
+msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:826
-msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
+#: src/gns/gnunet-gns-benchmark.c:582
+msgid "how long to wait between queries"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:235 src/gns/plugin_rest_gns.c:346
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
+#: src/gns/gnunet-gns-benchmark.c:587
+msgid "how long to wait for an answer"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:252
-#, c-format
-msgid "Please specify name to lookup!\n"
+#: src/gns/gnunet-gns-benchmark.c:591
+msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:276
-#, c-format
-msgid "Ego for `%s' not found, cannot perform lookup.\n"
+#: src/gns/gnunet-gns-helper-service-w32.c:602
+msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:315 src/gns/gnunet-gns-helper-service-w32.c:701
-#: src/gns/plugin_rest_gns.c:422
-#, c-format
+#: src/gns/gnunet-gns-helper-service-w32.c:701 src/gns/plugin_rest_gns.c:422
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:355 src/gns/gnunet-gns-helper-service-w32.c:727
-#, fuzzy, c-format
-msgid "Failed to connect to GNS\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/gns/gnunet-gns.c:374
-#, c-format
-msgid "Public key `%s' is not well-formed\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:428
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:434
-msgid "Specify the type of the record to lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:440
-msgid "Specify timeout for the lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:445
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:451
-msgid "Specify the public key of the zone to lookup the record in"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:457
-msgid "Specify the name of the ego of the zone to lookup the record in"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:476
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "GNUnet 错误日志"
-
-#: src/gns/gnunet-gns-helper-service-w32.c:602
-msgid "Not ready to process requests, lacking ego data\n"
-msgstr ""
-
 #: src/gns/gnunet-gns-helper-service-w32.c:739
 #, fuzzy, c-format
 msgid "Failed to connect to identity service\n"
@@ -3942,228 +4014,237 @@ msgid "This program will import some GNS authorities 
into your GNS namestore."
 msgstr ""
 
 #: src/gns/gnunet-gns-proxy.c:109
-#: src/hostlist/gnunet-daemon-hostlist_client.c:569
-#: src/hostlist/gnunet-daemon-hostlist_client.c:787
-#: src/hostlist/gnunet-daemon-hostlist_client.c:793
-#: src/hostlist/gnunet-daemon-hostlist_client.c:845
-#: src/hostlist/gnunet-daemon-hostlist_client.c:854
-#: src/hostlist/gnunet-daemon-hostlist_client.c:965
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1060
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1065
+#: src/hostlist/gnunet-daemon-hostlist_client.c:535
+#: src/hostlist/gnunet-daemon-hostlist_client.c:753
+#: src/hostlist/gnunet-daemon-hostlist_client.c:759
+#: src/hostlist/gnunet-daemon-hostlist_client.c:811
+#: src/hostlist/gnunet-daemon-hostlist_client.c:820
+#: src/hostlist/gnunet-daemon-hostlist_client.c:931
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
 #: src/transport/plugin_transport_http_client.c:598
 #: src/transport/plugin_transport_http_client.c:616
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:887
+#: src/gns/gnunet-gns-proxy.c:910
 #, fuzzy, c-format
-msgid "Unsupported CURL SSL backend %d\n"
+msgid "Unsupported CURL TLS backend %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:910
+#: src/gns/gnunet-gns-proxy.c:933
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:933
+#: src/gns/gnunet-gns-proxy.c:956
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/gns/gnunet-gns-proxy.c:946
+#: src/gns/gnunet-gns-proxy.c:969
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:961
+#: src/gns/gnunet-gns-proxy.c:984
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:971
+#: src/gns/gnunet-gns-proxy.c:994
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:995
+#: src/gns/gnunet-gns-proxy.c:1018
 #, c-format
-msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgid "TLS certificate subject name (%s) does not match `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1104
+#: src/gns/gnunet-gns-proxy.c:1132
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1709
+#: src/gns/gnunet-gns-proxy.c:1868
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2172
+#: src/gns/gnunet-gns-proxy.c:2364
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户:"
 
-#: src/gns/gnunet-gns-proxy.c:2202
+#: src/gns/gnunet-gns-proxy.c:2394
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "无法保存配置文件“%s”:"
 
-#: src/gns/gnunet-gns-proxy.c:2375
+#: src/gns/gnunet-gns-proxy.c:2573
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2394 src/rest/gnunet-rest-server.c:533
+#: src/gns/gnunet-gns-proxy.c:2598 src/rest/gnunet-rest-server.c:658
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2716
+#: src/gns/gnunet-gns-proxy.c:2925
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2745
+#: src/gns/gnunet-gns-proxy.c:2954
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2763 src/gns/gnunet-gns-proxy.c:2792
-msgid "SSL connection to plain IPv4 address requested\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:2842
+#: src/gns/gnunet-gns-proxy.c:3035
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3177 src/gns/gnunet-service-gns.c:403
-#, c-format
-msgid "No ego configured for `%s`\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:3238
+#: src/gns/gnunet-gns-proxy.c:3316
 #, fuzzy, c-format
-msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
+msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3281
+#: src/gns/gnunet-gns-proxy.c:3443
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3287
+#: src/gns/gnunet-gns-proxy.c:3448
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3312
+#: src/gns/gnunet-gns-proxy.c:3473
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:442
+#: src/gns/gnunet-gns.c:199 src/gns/plugin_rest_gns.c:346
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:238
+msgid "Specify the type of the record to lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:242
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:258
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "GNUnet 错误日志"
+
+#: src/gns/gnunet-service-gns.c:513
+#, fuzzy
+msgid "Properly base32-encoded public key required"
+msgstr "“%s”的参数无效。\n"
+
+#: src/gns/gnunet-service-gns.c:549
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns.c:461
-#: src/zonemaster/gnunet-service-zonemaster.c:742
+#: src/gns/gnunet-service-gns.c:568
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:440
+#: src/zonemaster/gnunet-service-zonemaster.c:875
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/gns/gnunet-service-gns_interceptor.c:263
+#: src/gns/gnunet-service-gns_interceptor.c:259
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:370
+#: src/gns/gnunet-service-gns_interceptor.c:366
 #, fuzzy
 msgid "Failed to connect to the DNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:641
+#: src/gns/gnunet-service-gns_resolver.c:713
 #, c-format
 msgid "Protocol `%s' unknown, skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:652
+#: src/gns/gnunet-service-gns_resolver.c:724
 #, c-format
 msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:844
+#: src/gns/gnunet-service-gns_resolver.c:927
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:986
+#: src/gns/gnunet-service-gns_resolver.c:1102
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1347
+#: src/gns/gnunet-service-gns_resolver.c:1796
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1865
+#: src/gns/gnunet-service-gns_resolver.c:1839
+msgid "GNS lookup failed (zero records found)\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:2253
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1889
+#: src/gns/gnunet-service-gns_resolver.c:2276
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2171
+#: src/gns/gnunet-service-gns_resolver.c:2563
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2318
-#, c-format
-msgid "Hostname `%s' is not well-formed, resolution fails\n"
-msgstr ""
-
-#: src/gns/plugin_gnsrecord_gns.c:203
+#: src/gns/plugin_gnsrecord_gns.c:181
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:232
+#: src/gns/plugin_gnsrecord_gns.c:212
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:253
+#: src/gns/plugin_gnsrecord_gns.c:233
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:276
+#: src/gns/plugin_gnsrecord_gns.c:258
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:312
+#: src/gns/plugin_gnsrecord_gns.c:294
 #, fuzzy, c-format
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:360
-#, fuzzy, c-format
-msgid "Unable to parse REVERSE record string `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
 #: src/gns/plugin_rest_gns.c:384
 msgid "Ego for not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:668
-msgid "GNS REST API initialized\n"
-msgstr ""
-
 #: src/gnsrecord/plugin_gnsrecord_dns.c:359
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4331,150 +4412,150 @@ msgstr ""
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:371
+#: src/hostlist/gnunet-daemon-hostlist_client.c:349
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:392
-#: src/hostlist/gnunet-daemon-hostlist_client.c:437
+#: src/hostlist/gnunet-daemon-hostlist_client.c:370
+#: src/hostlist/gnunet-daemon-hostlist_client.c:403
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:395
-#: src/hostlist/gnunet-daemon-hostlist_client.c:440
+#: src/hostlist/gnunet-daemon-hostlist_client.c:373
+#: src/hostlist/gnunet-daemon-hostlist_client.c:406
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:413
+#: src/hostlist/gnunet-daemon-hostlist_client.c:391
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:695
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1441
+#: src/hostlist/gnunet-daemon-hostlist_client.c:661
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:725
+#: src/hostlist/gnunet-daemon-hostlist_client.c:691
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:768
+#: src/hostlist/gnunet-daemon-hostlist_client.c:734
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:862
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:910
+#: src/hostlist/gnunet-daemon-hostlist_client.c:876
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:930
+#: src/hostlist/gnunet-daemon-hostlist_client.c:896
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:936
+#: src/hostlist/gnunet-daemon-hostlist_client.c:902
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:944
+#: src/hostlist/gnunet-daemon-hostlist_client.c:910
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:997
+#: src/hostlist/gnunet-daemon-hostlist_client.c:963
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1005
+#: src/hostlist/gnunet-daemon-hostlist_client.c:971
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1132
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1698
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1098
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1665
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1141
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1107
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1200
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1221
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1166
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1187
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1387
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1392
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
 #, 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:1435
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1438
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1484
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
 #, 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:1491
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1515
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1532
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1527
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1628
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1595
 #: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1657
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1624
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1671
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1638
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1651
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4492,7 +4573,7 @@ msgstr ""
 #: src/hostlist/gnunet-daemon-hostlist_server.c:531
 #: src/peerinfo-tool/gnunet-peerinfo.c:385
 #: src/peerinfo-tool/gnunet-peerinfo.c:534
-#: src/topology/gnunet-daemon-topology.c:857
+#: src/topology/gnunet-daemon-topology.c:862
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
@@ -4588,6 +4669,70 @@ msgstr "“%s”不可用。\n"
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
+#: src/identity-provider/gnunet-idp.c:424
+#, fuzzy
+msgid "Ego is required\n"
+msgstr "%s:选项“%s”有歧义\n"
+
+#: src/identity-provider/gnunet-idp.c:432
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:440
+#, fuzzy
+msgid "Requesting party key is required!\n"
+msgstr "设置要使用的昵称(必须)"
+
+#: src/identity-provider/gnunet-idp.c:463
+msgid "Add attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:469
+msgid "Attribute value"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:474
+msgid "Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:479
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:483
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:488
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:493
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:498
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:503
+msgid "Type of attribute"
+msgstr ""
+
+#: src/identity-provider/gnunet-idp.c:508
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/identity-provider/identity_provider_api.c:436
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/identity-provider/plugin_rest_identity_provider.c:1230
+#: src/identity-provider/plugin_rest_openid_connect.c:2147
+msgid "Identity Provider REST API initialized\n"
+msgstr ""
+
 #: src/identity/gnunet-identity.c:179
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
@@ -4675,32 +4820,10 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/plugin_rest_identity.c:967
+#: src/identity/plugin_rest_identity.c:968
 msgid "Identity REST API initialized\n"
 msgstr ""
 
-#: src/identity-provider/gnunet-identity-token.c:66
-#, fuzzy
-msgid "Option `-t' is required\n"
-msgstr "%s:选项“%s”有歧义\n"
-
-#: src/identity-provider/gnunet-identity-token.c:77
-#, fuzzy, c-format
-msgid "Token `%s' is malformed\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/identity-provider/gnunet-identity-token.c:166
-msgid "GNUid token"
-msgstr ""
-
-#: src/identity-provider/gnunet-identity-token.c:171
-msgid "Print token contents"
-msgstr ""
-
-#: src/identity-provider/plugin_rest_identity_provider.c:1166
-msgid "Identity Token REST API initialized\n"
-msgstr ""
-
 #: src/json/json.c:119
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -4730,7 +4853,7 @@ msgstr "无法解析“%s”(%s):%s\n"
 msgid "No records found for `%s'"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:415
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:426
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4750,7 +4873,7 @@ msgstr "“%s”的参数无效。\n"
 msgid "You must specify a name\n"
 msgstr "您必须指定一个接收方!\n"
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1170
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1291
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4758,7 +4881,7 @@ msgstr ""
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1228
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1343
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
@@ -4772,288 +4895,294 @@ msgstr ""
 msgid "Error communicating with namecache service"
 msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
 
-#: src/namecache/plugin_namecache_flat.c:119
-#: src/namecache/plugin_namecache_flat.c:253
-#: src/namestore/plugin_namestore_flat.c:179
-#: src/namestore/plugin_namestore_flat.c:375
+#: src/namecache/plugin_namecache_flat.c:121
+#: src/namecache/plugin_namecache_flat.c:255
+#: src/namestore/plugin_namestore_flat.c:150
+#: src/namestore/plugin_namestore_flat.c:385
 #: src/peerstore/plugin_peerstore_flat.c:379
 #: src/peerstore/plugin_peerstore_flat.c:538
 #, fuzzy, c-format
 msgid "Unable to initialize file: %s.\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/namecache/plugin_namecache_flat.c:130
-#: src/namestore/plugin_namestore_flat.c:190
+#: src/namecache/plugin_namecache_flat.c:132
+#: src/namestore/plugin_namestore_flat.c:161
 #: src/peerstore/plugin_peerstore_flat.c:394
 #, fuzzy, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr "发送消息失败。\n"
 
-#: src/namecache/plugin_namecache_flat.c:149
-#: src/namestore/plugin_namestore_flat.c:203
+#: src/namecache/plugin_namecache_flat.c:151
+#: src/namestore/plugin_namestore_flat.c:174
 #: src/peerstore/plugin_peerstore_flat.c:406
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
 msgstr "发送消息失败。\n"
 
-#: src/namecache/plugin_namecache_flat.c:408
+#: src/namecache/plugin_namecache_flat.c:410
 #, fuzzy
 msgid "flat plugin running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/namestore/gnunet-namestore.c:301
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, fuzzy, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:547
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:567
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:598
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:678
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:736
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "发送消息失败。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:754
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:790
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:799
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1019
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1045
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1092
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1130
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:313
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:330
-#: src/namestore/plugin_rest_namestore.c:562
+#: src/namestore/gnunet-namestore.c:343
+#: src/namestore/plugin_rest_namestore.c:572
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:337
-#: src/namestore/plugin_rest_namestore.c:571
+#: src/namestore/gnunet-namestore.c:350
+#: src/namestore/plugin_rest_namestore.c:581
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:519 src/namestore/gnunet-namestore.c:527
-#: src/namestore/gnunet-namestore.c:535
+#: src/namestore/gnunet-namestore.c:630 src/namestore/gnunet-namestore.c:638
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:549 src/namestore/gnunet-namestore.c:561
-#: src/namestore/gnunet-namestore.c:573
+#: src/namestore/gnunet-namestore.c:652 src/namestore/gnunet-namestore.c:664
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
-#: src/namestore/plugin_rest_namestore.c:597
+#: src/namestore/gnunet-namestore.c:677
 #, c-format
-msgid "There are no records under label `%s' that could be deleted.\n"
+msgid ""
+"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:739
+#: src/namestore/gnunet-namestore.c:810
+#: src/namestore/plugin_rest_namestore.c:607
 #, c-format
-msgid ""
-"There are no records under label `%s' that match the request for deletion.\n"
+msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:776
-#: src/namestore/plugin_rest_namestore.c:1004
+#: src/namestore/gnunet-namestore.c:851
 #, c-format
-msgid "Ego `%s' not known to identity service\n"
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:791
+#: src/namestore/gnunet-namestore.c:903
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:802
-#: src/namestore/gnunet-namestore-fcfsd.c:1034
-#: src/namestore/plugin_rest_namestore.c:1017
-#, fuzzy
-msgid "Failed to connect to namestore\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/namestore/gnunet-namestore.c:810 src/namestore/gnunet-namestore.c:819
-#: src/namestore/gnunet-namestore.c:838 src/namestore/gnunet-namestore.c:861
-#: src/namestore/gnunet-namestore.c:915
+#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:973
+#: src/namestore/gnunet-namestore.c:1027
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore.c:811 src/namestore/gnunet-namestore.c:820
-#: src/namestore/gnunet-namestore.c:839 src/namestore/gnunet-namestore.c:863
+#: src/namestore/gnunet-namestore.c:923 src/namestore/gnunet-namestore.c:932
+#: src/namestore/gnunet-namestore.c:951 src/namestore/gnunet-namestore.c:975
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:829
-#: src/namestore/plugin_rest_namestore.c:671
+#: src/namestore/gnunet-namestore.c:941
+#: src/namestore/plugin_rest_namestore.c:684
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:851
-#: src/namestore/plugin_rest_namestore.c:689
-#: src/namestore/plugin_rest_namestore.c:729
+#: src/namestore/gnunet-namestore.c:963
+#: src/namestore/plugin_rest_namestore.c:704
+#: src/namestore/plugin_rest_namestore.c:746
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:896
+#: src/namestore/gnunet-namestore.c:1008
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1028
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:950
+#: src/namestore/gnunet-namestore.c:1071
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/namestore/gnunet-namestore.c:979 src/peerinfo-tool/gnunet-peerinfo.c:775
+#: src/namestore/gnunet-namestore.c:1100
+#: src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:1014
+#: src/namestore/gnunet-namestore.c:1135
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:1051
-#: src/namestore/plugin_rest_namestore.c:1047
+#: src/namestore/gnunet-namestore.c:1175
+#: src/namestore/plugin_rest_namestore.c:1065
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1108
-#: src/namestore/plugin_rest_namestore.c:1143
+#: src/namestore/gnunet-namestore.c:1239
+#: src/namestore/plugin_rest_namestore.c:1161
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/namestore/gnunet-namestore.c:1137
+#: src/namestore/gnunet-namestore.c:1264
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1142
+#: src/namestore/gnunet-namestore.c:1268
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1147
+#: src/namestore/gnunet-namestore.c:1272
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1153
+#: src/namestore/gnunet-namestore.c:1277
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1282
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/namestore/gnunet-namestore.c:1164
+#: src/namestore/gnunet-namestore.c:1286
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:1176
+#: src/namestore/gnunet-namestore.c:1296
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/namestore/gnunet-namestore.c:1184
+#: src/namestore/gnunet-namestore.c:1301
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1190
+#: src/namestore/gnunet-namestore.c:1306
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1196
+#: src/namestore/gnunet-namestore.c:1311
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1201
+#: src/namestore/gnunet-namestore.c:1315
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1206
+#: src/namestore/gnunet-namestore.c:1319
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1212
+#: src/namestore/gnunet-namestore.c:1324
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:508
-#, fuzzy, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "未知的命令“%s”。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:535
-#, fuzzy, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:555
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:585
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:662
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:718
+#: src/namestore/gnunet-service-namestore.c:750
 #, fuzzy, c-format
-msgid "Failed to create page for `%s'\n"
+msgid "Failed to replicate block in namecache: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:734
-#, fuzzy, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:770
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:778
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:974
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1000
-#, fuzzy
-msgid "Failed to start HTTP server\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1042
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1074
-msgid "GNU Name System First Come First Serve name registration service"
+#: src/namestore/gnunet-zoneimport.c:2035
+msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:615
-#, fuzzy, c-format
-msgid "Failed to replicate block in namecache: %s\n"
-msgstr "发送消息失败。\n"
+#: src/namestore/gnunet-zoneimport.c:2040
+msgid "minimum expiration time we assume for imported records"
+msgstr ""
 
-#: src/namestore/namestore_api.c:379
+#: src/namestore/namestore_api.c:391
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:656
+#: src/namestore/plugin_namestore_flat.c:767
 #, fuzzy
 msgid "flat file database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/namestore/plugin_rest_namestore.c:1188
+#: src/namestore/plugin_namestore_sqlite.c:218
+#: src/namestore/plugin_namestore_sqlite.c:229
+#, fuzzy, c-format
+msgid "Failed to setup database at `%s'\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/namestore/plugin_rest_namestore.c:1206
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
@@ -5083,11 +5212,11 @@ msgstr "配额配置"
 msgid "section name providing the configuration for the adapter"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:447
+#: src/nat-auto/gnunet-nat-auto.c:356 src/nat/gnunet-nat.c:453
 msgid "use TCP"
 msgstr ""
 
-#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:452
+#: src/nat-auto/gnunet-nat-auto.c:361 src/nat/gnunet-nat.c:458
 msgid "use UDP"
 msgstr ""
 
@@ -5262,57 +5391,57 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/nat/gnunet-nat.c:425
+#: src/nat/gnunet-nat.c:431
 msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:431
+#: src/nat/gnunet-nat.c:437
 msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:437
+#: src/nat/gnunet-nat.c:443
 msgid ""
 "name of configuration section to find additional options, such as manual "
 "host punching data"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:442
+#: src/nat/gnunet-nat.c:448
 msgid "enable STUN processing"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:457
+#: src/nat/gnunet-nat.c:463
 msgid "watch for connection reversal requests"
 msgstr ""
 
-#: src/nat/gnunet-nat.c:469
+#: src/nat/gnunet-nat.c:475
 msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1335
+#: src/nat/gnunet-service-nat.c:1339
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1345
+#: src/nat/gnunet-service-nat.c:1349
 #, c-format
 msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1361
+#: src/nat/gnunet-service-nat.c:1365
 #, c-format
 msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1372
+#: src/nat/gnunet-service-nat.c:1376
 #, c-format
 msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1837
+#: src/nat/gnunet-service-nat.c:1841
 msgid "Connection reversal request failed\n"
 msgstr ""
 
-#: src/nat/gnunet-service-nat.c:1910
+#: src/nat/gnunet-service-nat.c:1914
 msgid ""
 "UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
 "disabling UPnP\n"
@@ -5336,95 +5465,41 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:122
-msgid "Show network size estimates from NSE service."
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:842
+#: src/nse/gnunet-nse-profiler.c:849
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:847
+#: src/nse/gnunet-nse-profiler.c:854
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:859
+#: src/nse/gnunet-nse-profiler.c:866
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:866
+#: src/nse/gnunet-nse-profiler.c:873
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:877
+#: src/nse/gnunet-nse-profiler.c:884
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:886
+#: src/nse/gnunet-nse-profiler.c:893
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
+#: src/nse/gnunet-nse.c:122
+msgid "Show network size estimates from NSE service."
+msgstr ""
+
 #: src/nse/gnunet-service-nse.c:1534
-#: src/revocation/gnunet-service-revocation.c:840 src/util/gnunet-scrypt.c:276
+#: src/revocation/gnunet-service-revocation.c:843 src/util/gnunet-scrypt.c:276
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "值不在合法范围内。"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:178
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:310
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:331
-#: src/peerinfo/gnunet-service-peerinfo.c:362
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:446
-msgid "# peers known"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:489
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:655
-#, fuzzy, c-format
-msgid "Scanning directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:663
-#, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1080
-#, fuzzy, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1409
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1422
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:220
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr ""
-
 #: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
@@ -5516,6 +5591,60 @@ msgstr ""
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
+#: src/peerinfo/gnunet-service-peerinfo.c:178
+#, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:313
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:334
+#: src/peerinfo/gnunet-service-peerinfo.c:365
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:449
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:492
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:659
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:667
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1100
+#, fuzzy, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1438
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1451
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:220
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr ""
+
 #: src/peerstore/gnunet-peerstore.c:91
 msgid "peerstore"
 msgstr ""
@@ -5819,11 +5948,11 @@ msgstr "服务已删除。\n"
 msgid "Search string `%s' is too long!\n"
 msgstr "服务已删除。\n"
 
-#: src/rest/gnunet-rest-server.c:790
+#: src/rest/gnunet-rest-server.c:927
 msgid "listen on specified port (default: 7776)"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:807
+#: src/rest/gnunet-rest-server.c:944
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "GNUnet 错误日志"
@@ -5956,19 +6085,22 @@ msgid "# revocation set unions completed"
 msgstr ""
 
 #: src/revocation/gnunet-service-revocation.c:525
-#: src/revocation/gnunet-service-revocation.c:773
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:864
+#: src/revocation/gnunet-service-revocation.c:867
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/rps/gnunet-rps.c:146
+#: src/rps/gnunet-rps.c:203
 msgid "Seed a PeerID"
 msgstr ""
 
+#: src/rps/gnunet-rps.c:207
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
 #: src/scalarproduct/gnunet-scalarproduct.c:220
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
@@ -6024,10 +6156,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
-#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1172
 #: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1063
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1401
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1345
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "“%s”已连接到“%s”。\n"
@@ -6405,14 +6537,14 @@ msgstr ""
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:247
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:249
 msgid ""
 "Daemon to restrict incoming transport layer connections during testbed "
 "deployments"
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:233 src/testing/list-keys.c:46
-#: src/testing/testing.c:288 src/util/gnunet-ecc.c:306
+#: src/testing/testing.c:288 src/util/gnunet-ecc.c:312
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6482,15 +6614,6 @@ msgstr ""
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:118
-msgid "Waiting for child to exit.\n"
-msgstr ""
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:241
-#, fuzzy, c-format
-msgid "Spawning process `%s'\n"
-msgstr "卸载 GNUnet 服务"
-
 #: src/testbed/gnunet-testbed-profiler.c:289
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
@@ -6502,6 +6625,15 @@ msgid ""
 "signal is received"
 msgstr ""
 
+#: src/testbed/gnunet_testbed_mpi_spawn.c:118
+msgid "Waiting for child to exit.\n"
+msgstr ""
+
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
+#, fuzzy, c-format
+msgid "Spawning process `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
 #: src/testbed/testbed_api.c:410
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
@@ -6724,84 +6856,80 @@ msgstr "运行 %s失败:%s %d\n"
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/topology/friends.c:106
+#: src/topology/friends.c:126
 #, fuzzy, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/topology/friends.c:160
+#: src/topology/friends.c:180
 #, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:225
+#: src/topology/gnunet-daemon-topology.c:230
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:339
+#: src/topology/gnunet-daemon-topology.c:344
 msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:533
+#: src/topology/gnunet-daemon-topology.c:538
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:635
-#: src/topology/gnunet-daemon-topology.c:721
+#: src/topology/gnunet-daemon-topology.c:640
+#: src/topology/gnunet-daemon-topology.c:726
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:918
+#: src/topology/gnunet-daemon-topology.c:923
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:951
+#: src/topology/gnunet-daemon-topology.c:956
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:958
+#: src/topology/gnunet-daemon-topology.c:963
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:980
+#: src/topology/gnunet-daemon-topology.c:985
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:983
+#: src/topology/gnunet-daemon-topology.c:988
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:990
+#: src/topology/gnunet-daemon-topology.c:995
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:1001
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1059
+#: src/topology/gnunet-daemon-topology.c:1054
 #: src/transport/plugin_transport_wlan.c:1517
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1233
+#: src/topology/gnunet-daemon-topology.c:1232
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:141
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport.c:448
 msgid "# messages dropped due to slow client"
 msgstr ""
@@ -6847,197 +6975,201 @@ msgstr ""
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置?"
 
+#: src/transport/gnunet-service-transport_ats.c:141
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:804
+#: src/transport/gnunet-service-transport_neighbours.c:806
 msgid "# session creation failed"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1053
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1168
+#: src/transport/gnunet-service-transport_neighbours.c:1176
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1311
-#: src/transport/gnunet-service-transport_neighbours.c:1764
+#: src/transport/gnunet-service-transport_neighbours.c:1324
+#: src/transport/gnunet-service-transport_neighbours.c:1785
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1316
+#: src/transport/gnunet-service-transport_neighbours.c:1329
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1322
+#: src/transport/gnunet-service-transport_neighbours.c:1335
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1395
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1458
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1494
+#: src/transport/gnunet-service-transport_neighbours.c:1515
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1502
+#: src/transport/gnunet-service-transport_neighbours.c:1523
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1512
+#: src/transport/gnunet-service-transport_neighbours.c:1533
 msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1557
+#: src/transport/gnunet-service-transport_neighbours.c:1578
 msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1566
+#: src/transport/gnunet-service-transport_neighbours.c:1587
 msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1574
+#: src/transport/gnunet-service-transport_neighbours.c:1595
 msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1583
+#: src/transport/gnunet-service-transport_neighbours.c:1604
 msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1588
+#: src/transport/gnunet-service-transport_neighbours.c:1609
 msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1594
+#: src/transport/gnunet-service-transport_neighbours.c:1615
 msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1661
+#: src/transport/gnunet-service-transport_neighbours.c:1682
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1695
+#: src/transport/gnunet-service-transport_neighbours.c:1716
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1710
+#: src/transport/gnunet-service-transport_neighbours.c:1731
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1830
+#: src/transport/gnunet-service-transport_neighbours.c:1854
 #, fuzzy, c-format
 msgid "Failed to send SYN message to peer `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1850
+#: src/transport/gnunet-service-transport_neighbours.c:1874
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1889
+#: src/transport/gnunet-service-transport_neighbours.c:1913
 #, fuzzy
 msgid "# SYN messages sent"
 msgstr "消息尺寸"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1906
+#: src/transport/gnunet-service-transport_neighbours.c:1930
 #, fuzzy, c-format
 msgid "Failed to transmit SYN message to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1936
+#: src/transport/gnunet-service-transport_neighbours.c:1960
 #, fuzzy
 msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2001
+#: src/transport/gnunet-service-transport_neighbours.c:2028
 #, fuzzy, c-format
 msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2055
+#: src/transport/gnunet-service-transport_neighbours.c:2082
 msgid "# SYN_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2072
+#: src/transport/gnunet-service-transport_neighbours.c:2099
 #, fuzzy, c-format
 msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2233
+#: src/transport/gnunet-service-transport_neighbours.c:2262
 msgid "# SYN messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2238
+#: src/transport/gnunet-service-transport_neighbours.c:2267
 #, c-format
 msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2623
+#: src/transport/gnunet-service-transport_neighbours.c:2654
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3105
+#: src/transport/gnunet-service-transport_neighbours.c:3139
 msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3113
+#: src/transport/gnunet-service-transport_neighbours.c:3147
 msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3131
-#: src/transport/gnunet-service-transport_neighbours.c:3155
+#: src/transport/gnunet-service-transport_neighbours.c:3165
+#: src/transport/gnunet-service-transport_neighbours.c:3189
 msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3167
+#: src/transport/gnunet-service-transport_neighbours.c:3201
 msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3192
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3205
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3377
+#: src/transport/gnunet-service-transport_neighbours.c:3412
 msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3413
+#: src/transport/gnunet-service-transport_neighbours.c:3448
 msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3501
+#: src/transport/gnunet-service-transport_neighbours.c:3536
 msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3508
+#: src/transport/gnunet-service-transport_neighbours.c:3543
 msgid "# QUOTA messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3548
+#: src/transport/gnunet-service-transport_neighbours.c:3583
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3555
+#: src/transport/gnunet-service-transport_neighbours.c:3590
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3566
+#: src/transport/gnunet-service-transport_neighbours.c:3601
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3700
+#: src/transport/gnunet-service-transport_neighbours.c:3736
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -7151,6 +7283,48 @@ msgstr ""
 msgid "# validations succeeded"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_validation.c:1627
+msgid "# HELLOs given to peerinfo"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:219
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:617
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:621
+msgid "receive data from peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:626
+msgid "iterations"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:631
+#, fuzzy
+msgid "number of messages to send"
+msgstr "每次迭代所使用的消息数量"
+
+#: src/transport/gnunet-transport-profiler.c:636
+#, fuzzy
+msgid "message size to use"
+msgstr "消息尺寸"
+
+#: src/transport/gnunet-transport-profiler.c:641
+#: src/transport/gnunet-transport.c:1462
+msgid "peer identity"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:652
+#: src/transport/gnunet-transport.c:1482
+#, fuzzy
+msgid "Direct access to transport service."
+msgstr "初始化“%s”服务失败。\n"
+
 #: src/transport/gnunet-transport.c:413
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7287,11 +7461,6 @@ msgstr ""
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1462
-#: src/transport/gnunet-transport-profiler.c:641
-msgid "peer identity"
-msgstr ""
-
 #: src/transport/gnunet-transport.c:1466
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7300,44 +7469,11 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1482
-#: src/transport/gnunet-transport-profiler.c:652
-#, fuzzy
-msgid "Direct access to transport service."
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/transport/gnunet-transport-profiler.c:219
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:617
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:621
-msgid "receive data from peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:626
-msgid "iterations"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:631
-#, fuzzy
-msgid "number of messages to send"
-msgstr "每次迭代所使用的消息数量"
-
-#: src/transport/gnunet-transport-profiler.c:636
-#, fuzzy
-msgid "message size to use"
-msgstr "消息尺寸"
-
 #: src/transport/plugin_transport_http_client.c:1474
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3526
-#: src/transport/plugin_transport_tcp.c:3890
-#: src/transport/plugin_transport_tcp.c:3897
+#: src/transport/plugin_transport_tcp.c:3891
+#: src/transport/plugin_transport_tcp.c:3898
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
@@ -7407,7 +7543,7 @@ msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http_server.c:2901
-#: src/transport/plugin_transport_udp.c:3622
+#: src/transport/plugin_transport_udp.c:3623
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
@@ -7518,7 +7654,7 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1730
 #: src/transport/plugin_transport_tcp.c:1954
 #: src/transport/plugin_transport_tcp.c:3137
-#: src/transport/plugin_transport_tcp.c:4013
+#: src/transport/plugin_transport_tcp.c:4014
 msgid "# TCP sessions active"
 msgstr ""
 
@@ -7555,122 +7691,122 @@ msgstr ""
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3408
+#: src/transport/plugin_transport_tcp.c:3409
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3459
-#: src/transport/plugin_transport_tcp.c:3517
+#: src/transport/plugin_transport_tcp.c:3460
+#: src/transport/plugin_transport_tcp.c:3518
 #, fuzzy
 msgid "# TCP server connections active"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/transport/plugin_transport_tcp.c:3463
+#: src/transport/plugin_transport_tcp.c:3464
 #, fuzzy
 msgid "# TCP server connect events"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/transport/plugin_transport_tcp.c:3469
+#: src/transport/plugin_transport_tcp.c:3470
 msgid "TCP connection limit reached, suspending server\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3471
+#: src/transport/plugin_transport_tcp.c:3472
 msgid "# TCP service suspended"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3511
+#: src/transport/plugin_transport_tcp.c:3512
 msgid "# TCP service resumed"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3521
+#: src/transport/plugin_transport_tcp.c:3522
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:3840
+#: src/transport/plugin_transport_tcp.c:3841
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:4001
+#: src/transport/plugin_transport_tcp.c:4002
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4005
+#: src/transport/plugin_transport_tcp.c:4006
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:4009
+#: src/transport/plugin_transport_tcp.c:4010
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:168
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:548
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:565
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp.c:3366
+#: src/transport/plugin_transport_udp.c:3367
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3380
+#: src/transport/plugin_transport_udp.c:3381
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3698
-#: src/transport/plugin_transport_udp.c:3797
+#: src/transport/plugin_transport_udp.c:3699
+#: src/transport/plugin_transport_udp.c:3798
 #, fuzzy, c-format
 msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_udp.c:3716
+#: src/transport/plugin_transport_udp.c:3717
 msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3807
+#: src/transport/plugin_transport_udp.c:3808
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_udp.c:3878
-#: src/transport/plugin_transport_udp.c:3892
+#: src/transport/plugin_transport_udp.c:3879
+#: src/transport/plugin_transport_udp.c:3893
 msgid "must be in [0,65535]"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3924
+#: src/transport/plugin_transport_udp.c:3925
 #, fuzzy
 msgid "must be valid IPv4 address"
 msgstr "“%s”不可用。\n"
 
-#: src/transport/plugin_transport_udp.c:3951
+#: src/transport/plugin_transport_udp.c:3952
 #, fuzzy
 msgid "must be valid IPv6 address"
 msgstr "“%s”不可用。\n"
 
-#: src/transport/plugin_transport_udp.c:4015
+#: src/transport/plugin_transport_udp.c:4016
 #, fuzzy
 msgid "Failed to create UDP network sockets\n"
 msgstr "发送消息失败。\n"
 
+#: src/transport/plugin_transport_udp_broadcasting.c:168
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:548
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:565
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+
 #: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
@@ -7775,7 +7911,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2346
+#: src/transport/tcp_service_legacy.c:339 src/util/service.c:2348
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -7832,7 +7968,7 @@ msgstr ""
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1488
+#: src/transport/tcp_service_legacy.c:1313 src/util/disk.c:1517
 #: src/util/service.c:1378
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
@@ -7851,19 +7987,19 @@ msgstr "无法更改用户/组为“%s”:%s\n"
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:255
+#: src/transport/tcp_service_legacy.c:1448 src/util/program.c:279
 #: src/util/service.c:1790
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:272
+#: src/transport/tcp_service_legacy.c:1458 src/util/program.c:299
 #: src/util/service.c:1801
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:267
+#: src/transport/tcp_service_legacy.c:1463 src/util/program.c:292
 #: src/util/service.c:1807
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
@@ -7874,61 +8010,61 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 msgid "Bad mask: %d\n"
 msgstr ""
 
-#: src/util/bio.c:177 src/util/bio.c:185
+#: src/util/bio.c:181 src/util/bio.c:189
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "创建用户出错"
 
-#: src/util/bio.c:187
+#: src/util/bio.c:191
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:244
+#: src/util/bio.c:248
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:254
+#: src/util/bio.c:258
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:300
+#: src/util/bio.c:306
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:314
+#: src/util/bio.c:328
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:911
+#: src/util/client.c:914
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1132
+#: src/util/common_logging.c:259 src/util/common_logging.c:1146
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1130
+#: src/util/common_logging.c:261 src/util/common_logging.c:1144
 msgid "INFO"
 msgstr "信息"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1128
+#: src/util/common_logging.c:263 src/util/common_logging.c:1142
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1126
+#: src/util/common_logging.c:265 src/util/common_logging.c:1140
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1124
+#: src/util/common_logging.c:267 src/util/common_logging.c:1138
 msgid "ERROR"
 msgstr "错误"
 
-#: src/util/common_logging.c:269 src/util/common_logging.c:1134
+#: src/util/common_logging.c:269 src/util/common_logging.c:1148
 msgid "NONE"
 msgstr ""
 
@@ -7937,24 +8073,24 @@ msgstr ""
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次,在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:1135
+#: src/util/common_logging.c:1149
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1326
+#: src/util/common_logging.c:1442
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1368
+#: src/util/common_logging.c:1484
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1386
+#: src/util/common_logging.c:1502
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/util/common_logging.c:1407
+#: src/util/common_logging.c:1523
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -7965,88 +8101,88 @@ msgstr "配置不满足配置规范文件“%s”的约束!\n"
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/util/configuration.c:355
+#: src/util/configuration.c:363
 #, fuzzy, c-format
 msgid "Error while reading file `%s'\n"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/util/configuration.c:1034
+#: src/util/configuration.c:1051
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1153
+#: src/util/configuration.c:1170
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1186
+#: src/util/configuration.c:1203
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/util/configuration.c:1254
+#: src/util/configuration.c:1271
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
 "as an environmental variable\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:531
+#: src/util/container_bloomfilter.c:532
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:810
+#: src/util/crypto_ecc.c:836
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/crypto_ecc.c:860
+#: src/util/crypto_ecc.c:886
 #, fuzzy, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/crypto_ecc.c:934
+#: src/util/crypto_ecc.c:960
 #, 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.c:991
+#: src/util/crypto_ecc.c:1017
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/crypto_ecc_setup.c:122 src/util/crypto_ecc_setup.c:161
-#: src/util/crypto_ecc_setup.c:279 src/util/crypto_ecc_setup.c:317
+#: src/util/crypto_ecc_setup.c:126 src/util/crypto_ecc_setup.c:165
+#: src/util/crypto_ecc_setup.c:308 src/util/crypto_ecc_setup.c:355
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/crypto_ecc_setup.c:128 src/util/crypto_ecc_setup.c:284
+#: src/util/crypto_ecc_setup.c:132 src/util/crypto_ecc_setup.c:314
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_ecc_setup.c:165 src/util/crypto_ecc_setup.c:322
+#: src/util/crypto_ecc_setup.c:169 src/util/crypto_ecc_setup.c:359
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:195 src/util/crypto_ecc_setup.c:352
+#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:401
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:356
+#: src/util/crypto_ecc_setup.c:204 src/util/crypto_ecc_setup.c:405
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:415
+#: src/util/crypto_ecc_setup.c:471
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -8056,12 +8192,12 @@ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/util/crypto_rsa.c:835
+#: src/util/crypto_rsa.c:834
 #, fuzzy, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/crypto_rsa.c:1166
+#: src/util/crypto_rsa.c:1165
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
@@ -8136,103 +8272,109 @@ msgstr "请使用 --help 获取选项列表。\n"
 msgid "Missing mandatory option `%s'.\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/util/getopt_helpers.c:68
+#: src/util/getopt_helpers.c:70
 msgid "print the version number"
 msgstr ""
 
-#: src/util/getopt_helpers.c:111
+#: src/util/getopt_helpers.c:115
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "长选项的必选参数对短选项也是必选的。\n"
 
-#: src/util/getopt_helpers.c:199
+#: src/util/getopt_helpers.c:203
 msgid "print this help"
 msgstr ""
 
-#: src/util/getopt_helpers.c:274
+#: src/util/getopt_helpers.c:281
 msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt_helpers.c:410
+#: src/util/getopt_helpers.c:422
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:488
+#: src/util/getopt_helpers.c:502
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:510
+#: src/util/getopt_helpers.c:524
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/getopt_helpers.c:546 src/util/getopt_helpers.c:740
+#: src/util/getopt_helpers.c:561 src/util/getopt_helpers.c:758
+#: src/util/getopt_helpers.c:825
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:610
+#: src/util/getopt_helpers.c:626
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:675
+#: src/util/getopt_helpers.c:692
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:823
+#: src/util/getopt_helpers.c:832
+#, fuzzy, c-format
+msgid "You must pass a number below %u to the `%s' option.\n"
+msgstr "您必须向“%s”选项传递一个数字。\n"
+
+#: src/util/getopt_helpers.c:918
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:124
+#: src/util/gnunet-config.c:134
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/gnunet-config.c:137
+#: src/util/gnunet-config.c:147
 #, fuzzy, c-format
 msgid "--section argument is required\n"
 msgstr "设置要使用的昵称(必须)"
 
-#: src/util/gnunet-config.c:140
+#: src/util/gnunet-config.c:150
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:191
+#: src/util/gnunet-config.c:201
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:229
+#: src/util/gnunet-config.c:240
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:234
+#: src/util/gnunet-config.c:245
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:239
+#: src/util/gnunet-config.c:250
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:244
+#: src/util/gnunet-config.c:255
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:248
+#: src/util/gnunet-config.c:259
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "立即保存配置?"
 
-#: src/util/gnunet-config.c:252
+#: src/util/gnunet-config.c:263
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:265
+#: src/util/gnunet-config.c:276
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "更改配置文件中的一个值"
@@ -8273,63 +8415,63 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:288
+#: src/util/gnunet-ecc.c:290
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:299
+#: src/util/gnunet-ecc.c:305
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/gnunet-ecc.c:321
+#: src/util/gnunet-ecc.c:334
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/gnunet-ecc.c:372
+#: src/util/gnunet-ecc.c:391
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:456
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:442
+#: src/util/gnunet-ecc.c:461
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:447
+#: src/util/gnunet-ecc.c:466
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:451
+#: src/util/gnunet-ecc.c:470
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:455
+#: src/util/gnunet-ecc.c:474
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:459
+#: src/util/gnunet-ecc.c:478
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:463
+#: src/util/gnunet-ecc.c:482
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:479
+#: src/util/gnunet-ecc.c:498
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-resolver.c:150
+#: src/util/gnunet-resolver.c:168
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:161
+#: src/util/gnunet-resolver.c:179
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
@@ -8409,40 +8551,40 @@ msgstr "打开日志文件“%s”失败:%s\n"
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/network.c:137
+#: src/util/network.c:136
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1793 src/util/network.c:1977
+#: src/util/network.c:1795 src/util/network.c:1979
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:501
+#: src/util/os_installation.c:509
 #, fuzzy, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:873
+#: src/util/os_installation.c:881
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/util/os_installation.c:913
+#: src/util/os_installation.c:922
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
 
-#: src/util/os_installation.c:944
+#: src/util/os_installation.c:953
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/os_installation.c:954
+#: src/util/os_installation.c:963
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -8473,29 +8615,29 @@ msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:223
+#: src/util/resolver_api.c:224
 #, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
 "resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:827
+#: src/util/resolver_api.c:851
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:840
+#: src/util/resolver_api.c:864
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/util/resolver_api.c:1024
+#: src/util/resolver_api.c:1048
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1110 src/util/resolver_api.c:1133
-#: src/util/resolver_api.c:1147
+#: src/util/resolver_api.c:1134 src/util/resolver_api.c:1157
+#: src/util/resolver_api.c:1171
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
@@ -8505,7 +8647,7 @@ msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/service.c:2091
+#: src/util/service.c:2093
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8582,63 +8724,63 @@ msgstr " 天"
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1270
+#: src/util/strings.c:1272
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1278
+#: src/util/strings.c:1280
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1284
+#: src/util/strings.c:1286
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1291
+#: src/util/strings.c:1293
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1300
+#: src/util/strings.c:1302
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/util/strings.c:1572 src/util/strings.c:1588
+#: src/util/strings.c:1574 src/util/strings.c:1590
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1597
+#: src/util/strings.c:1599
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/strings.c:1680 src/util/strings.c:1711 src/util/strings.c:1759
-#: src/util/strings.c:1780
+#: src/util/strings.c:1682 src/util/strings.c:1713 src/util/strings.c:1761
+#: src/util/strings.c:1782
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/util/strings.c:1737
+#: src/util/strings.c:1739
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/util/strings.c:1789
+#: src/util/strings.c:1791
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/util/strings.c:1841
+#: src/util/strings.c:1843
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾:“%s”)\n"
 
-#: src/util/strings.c:1891
+#: src/util/strings.c:1893
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 
-#: src/util/strings.c:1922
+#: src/util/strings.c:1924
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
@@ -8813,28 +8955,37 @@ msgstr ""
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/zonemaster/gnunet-service-zonemaster.c:706
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:416
+#: src/zonemaster/gnunet-service-zonemaster.c:838
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/include/gnunet_common.h:689 src/include/gnunet_common.h:696
-#: src/include/gnunet_common.h:706 src/include/gnunet_common.h:714
+#: src/include/gnunet_common.h:766 src/include/gnunet_common.h:773
+#: src/include/gnunet_common.h:783 src/include/gnunet_common.h:791
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:726
+#: src/include/gnunet_common.h:803
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:753 src/include/gnunet_common.h:762
+#: src/include/gnunet_common.h:830 src/include/gnunet_common.h:839
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not connect to %s service!\n"
+#~ msgstr "无法连接到 %s:%u:%s\n"
+
+#, fuzzy
+#~ msgid "Token `%s' is malformed\n"
+#~ msgstr "“%s”的参数无效。\n"
+
+#, fuzzy
 #~ msgid "Failed to create indices\n"
 #~ msgstr "发送消息失败。\n"
 
@@ -9199,10 +9350,6 @@ msgstr ""
 #~ msgstr "未知错误"
 
 #, fuzzy
-#~ msgid "valid public key required"
-#~ msgstr "“%s”的参数无效。\n"
-
-#, fuzzy
 #~ msgid "Failed to create or access directory for log file `%s'\n"
 #~ msgstr "解析配置文件“%s”失败\n"
 
diff --git a/src/datacache/test_datacache_quota.c 
b/src/datacache/test_datacache_quota.c
index 35357a8d2..b89d71a27 100644
--- a/src/datacache/test_datacache_quota.c
+++ b/src/datacache/test_datacache_quota.c
@@ -49,8 +49,6 @@ run (void *cls, char *const *args, const char *cfgfile,
   struct GNUNET_DATACACHE_Handle *h;
   struct GNUNET_HashCode k;
   struct GNUNET_HashCode n;
-  unsigned int i;
-  unsigned int j;
   char buf[3200];
   struct GNUNET_TIME_Absolute exp;
 
@@ -59,36 +57,43 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   if (h == NULL)
   {
-    FPRINTF (stderr, "%s", "Failed to initialize datacache.  Database likely 
not setup, skipping test.\n");
+    FPRINTF (stderr,
+             "%s",
+             "Failed to initialize datacache.  Database likely not setup, 
skipping test.\n");
     return;
   }
   exp = GNUNET_TIME_relative_to_absolute (GNUNET_TIME_UNIT_HOURS);
   memset (buf, 1, sizeof (buf));
   memset (&k, 0, sizeof (struct GNUNET_HashCode));
-  for (i = 0; i < 10; i++)
+  for (unsigned int i = 0; i < 10; i++)
   {
-    FPRINTF (stderr, "%s",  ".");
-    GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n);
-    for (j = i; j < sizeof (buf); j += 10)
+    FPRINTF (stderr,
+             "%s",
+             ".");
+    GNUNET_CRYPTO_hash (&k,
+                        sizeof (struct GNUNET_HashCode),
+                        &n);
+    for (unsigned int j = i; j < sizeof (buf); j += 10)
     {
       exp.abs_value_us++;
       buf[j] = i;
-      ASSERT (GNUNET_OK == GNUNET_DATACACHE_put (h,
-                                                 &k,
-                                                 GNUNET_YES,
-                                                 j,
-                                                 buf,
-                                                 1 + i,
-                                                 exp,
-                                                 0,
-                                                 NULL));
+      ASSERT (GNUNET_OK ==
+              GNUNET_DATACACHE_put (h,
+                                    &k,
+                                    GNUNET_YES,
+                                    j,
+                                    buf,
+                                    1 + i,
+                                    exp,
+                                    0,
+                                    NULL));
       ASSERT (0 < GNUNET_DATACACHE_get (h, &k, 1 + i, NULL, NULL));
     }
     k = n;
   }
   FPRINTF (stderr, "%s",  "\n");
   memset (&k, 0, sizeof (struct GNUNET_HashCode));
-  for (i = 0; i < 10; i++)
+  for (unsigned int i = 0; i < 10; i++)
   {
     FPRINTF (stderr, "%s",  ".");
     GNUNET_CRYPTO_hash (&k, sizeof (struct GNUNET_HashCode), &n);
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 8697d0941..d0db6b141 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -292,7 +292,7 @@ plugin_LTLIBRARIES = \
 if HAVE_EXPERIMENTAL
 plugin_LTLIBRARIES += \
   libgnunet_plugin_transport_xt.la \
-  libgnunet_plugin_transport_xu.la 
+  libgnunet_plugin_transport_xu.la
 endif
 
 # Note: real plugins of course need to be added
@@ -301,7 +301,7 @@ noinst_LTLIBRARIES = \
   libgnunet_plugin_transport_template.la
 
 libgnunet_plugin_transport_tcp_la_SOURCES = \
-  plugin_transport_tcp.c 
+  plugin_transport_tcp.c
 libgnunet_plugin_transport_tcp_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -313,7 +313,7 @@ libgnunet_plugin_transport_tcp_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
 libgnunet_plugin_transport_xt_la_SOURCES = \
-  plugin_transport_xt.c 
+  plugin_transport_xt.c
 libgnunet_plugin_transport_xt_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -374,7 +374,7 @@ libgnunet_plugin_transport_udp_la_LDFLAGS = \
 
 libgnunet_plugin_transport_xu_la_SOURCES = \
   plugin_transport_xu.c plugin_transport_xu.h
-libgnunet_plugin_transport_udp_la_LIBADD = \
+libgnunet_plugin_transport_xu_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/fragmentation/libgnunetfragmentation.la \
   $(top_builddir)/src/statistics/libgnunetstatistics.la \
@@ -382,7 +382,7 @@ libgnunet_plugin_transport_udp_la_LIBADD = \
   $(top_builddir)/src/nat/libgnunetnatnew.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
-libgnunet_plugin_transport_udp_la_LDFLAGS = \
+libgnunet_plugin_transport_xu_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
 libgnunet_plugin_transport_unix_la_SOURCES = \

-- 
To stop receiving notification emails like this one, please contact
address@hidden



reply via email to

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