gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] [gnunet] 01/02: no need to select private key


From: gnunet
Subject: [GNUnet-SVN] [gnunet] 01/02: no need to select private key
Date: Thu, 01 Nov 2018 19:24:18 +0100

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

grothoff pushed a commit to branch master
in repository gnunet.

commit 8a2eccb41ad0740a80d4f3ccc7fba7ed4825979a
Author: Christian Grothoff <address@hidden>
AuthorDate: Thu Nov 1 19:22:26 2018 +0100

    no need to select private key
---
 po/de.po                                |  959 ++--
 po/es.po                                |  985 +++--
 po/fr.po                                |  939 ++--
 po/it.po                                | 7273 +++++++++++++++++--------------
 po/sv.po                                |  966 ++--
 po/vi.po                                |  971 +++--
 po/zh_CN.po                             |  954 ++--
 src/namestore/plugin_namestore_sqlite.c |    2 +-
 8 files changed, 6981 insertions(+), 6068 deletions(-)

diff --git a/po/de.po b/po/de.po
index 779cb248b..eb6b2a4d3 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-06-20 22:22+0200\n"
+"POT-Creation-Date: 2018-10-20 11:13+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"
@@ -225,7 +225,7 @@ msgstr ""
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:381 src/transport/plugin_transport_tcp.c:1118
+#: src/arm/gnunet-service-arm.c:386 src/transport/plugin_transport_tcp.c:1118
 #: src/transport/plugin_transport_xt.c:1118
 #: src/transport/tcp_service_legacy.c:555 src/util/service.c:610
 #, c-format
@@ -233,7 +233,7 @@ msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:405 src/arm/gnunet-service-arm.c:411
+#: src/arm/gnunet-service-arm.c:410 src/arm/gnunet-service-arm.c:416
 #: src/transport/plugin_transport_tcp.c:1137
 #: src/transport/plugin_transport_tcp.c:1143
 #: src/transport/plugin_transport_tcp.c:3823
@@ -247,7 +247,7 @@ msgstr ""
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:450 src/transport/plugin_transport_tcp.c:1174
+#: src/arm/gnunet-service-arm.c:455 src/transport/plugin_transport_tcp.c:1174
 #: src/transport/plugin_transport_xt.c:1174
 #: src/transport/tcp_service_legacy.c:611 src/util/client.c:504
 #: src/util/service.c:680
@@ -255,7 +255,7 @@ msgstr ""
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:455 src/transport/plugin_transport_tcp.c:1178
+#: src/arm/gnunet-service-arm.c:460 src/transport/plugin_transport_tcp.c:1178
 #: src/transport/plugin_transport_xt.c:1178
 #: src/transport/tcp_service_legacy.c:615 src/util/client.c:509
 #: src/util/service.c:685
@@ -263,7 +263,7 @@ msgstr ""
 msgid "Using `%s' instead\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:488 src/transport/plugin_transport_tcp.c:1209
+#: src/arm/gnunet-service-arm.c:493 src/transport/plugin_transport_tcp.c:1209
 #: src/transport/plugin_transport_xt.c:1209
 #: src/transport/tcp_service_legacy.c:646 src/util/service.c:721
 #, c-format
@@ -272,14 +272,14 @@ msgid ""
 "domain socket: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:510 src/transport/plugin_transport_tcp.c:1226
+#: src/arm/gnunet-service-arm.c:515 src/transport/plugin_transport_tcp.c:1226
 #: src/transport/plugin_transport_xt.c:1226
 #: src/transport/tcp_service_legacy.c:663 src/util/service.c:739
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:549
+#: src/arm/gnunet-service-arm.c:554
 #: src/transport/plugin_transport_http_server.c:2682
 #: src/transport/plugin_transport_tcp.c:1257
 #: src/transport/plugin_transport_xt.c:1257
@@ -288,7 +288,7 @@ msgstr ""
 msgid "Failed to resolve `%s': %s\n"
 msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
 
-#: src/arm/gnunet-service-arm.c:568
+#: src/arm/gnunet-service-arm.c:573
 #: src/transport/plugin_transport_http_server.c:2700
 #: src/transport/plugin_transport_tcp.c:1276
 #: src/transport/plugin_transport_xt.c:1276
@@ -297,64 +297,64 @@ msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/arm/gnunet-service-arm.c:979
+#: src/arm/gnunet-service-arm.c:984
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:990
+#: src/arm/gnunet-service-arm.c:995
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1102
+#: src/arm/gnunet-service-arm.c:1107
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/arm/gnunet-service-arm.c:1137
+#: src/arm/gnunet-service-arm.c:1142
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1180
+#: src/arm/gnunet-service-arm.c:1185
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1359
+#: src/arm/gnunet-service-arm.c:1364
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1664
+#: src/arm/gnunet-service-arm.c:1669
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Dienst »%s« wird neu gestartet.\n"
 
-#: src/arm/gnunet-service-arm.c:1825
+#: src/arm/gnunet-service-arm.c:1830
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1830
+#: src/arm/gnunet-service-arm.c:1835
 msgid "signal"
 msgstr "Signal"
 
-#: src/arm/gnunet-service-arm.c:1835
+#: src/arm/gnunet-service-arm.c:1840
 msgid "unknown"
 msgstr "Unbekannt"
 
-#: src/arm/gnunet-service-arm.c:1841
+#: src/arm/gnunet-service-arm.c:1846
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dienst »%s« benötigte %s zum Beenden\n"
 
-#: src/arm/gnunet-service-arm.c:1867
+#: src/arm/gnunet-service-arm.c:1872
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr "Dienst »%s« wurde normal beendet, wird jederzeit neu gestartet\n"
 
-#: src/arm/gnunet-service-arm.c:1883
+#: src/arm/gnunet-service-arm.c:1888
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -432,24 +432,24 @@ msgstr "SQLite Datenbank konnte nicht initialisiert 
werden.\n"
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1867
+#: src/ats/plugin_ats_mlp.c:1868
 #, 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:1911
+#: src/ats/plugin_ats_mlp.c:1912
 #, 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:2473
+#: src/ats/plugin_ats_mlp.c:2474
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2513 src/ats/plugin_ats_mlp.c:2530
-#: src/ats/plugin_ats_mlp.c:2562 src/ats/plugin_ats_mlp.c:2580
-#: src/ats/plugin_ats_mlp.c:2599 src/ats/plugin_ats_proportional.c:1139
+#: src/ats/plugin_ats_mlp.c:2514 src/ats/plugin_ats_mlp.c:2531
+#: src/ats/plugin_ats_mlp.c:2563 src/ats/plugin_ats_mlp.c:2581
+#: src/ats/plugin_ats_mlp.c:2600 src/ats/plugin_ats_proportional.c:1139
 #: src/ats/plugin_ats_ril.c:2610 src/ats/plugin_ats_ril.c:2627
 #: src/ats/plugin_ats_ril.c:2644 src/ats/plugin_ats_ril.c:2661
 #: src/ats/plugin_ats_ril.c:2678 src/ats/plugin_ats_ril.c:2695
@@ -458,27 +458,27 @@ msgstr ""
 msgid "Invalid %s configuration %f \n"
 msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
 
-#: src/ats/plugin_ats_mlp.c:2668
+#: src/ats/plugin_ats_mlp.c:2669
 #, 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:2677
+#: src/ats/plugin_ats_mlp.c:2678
 #, 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:2687
+#: src/ats/plugin_ats_mlp.c:2688
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2696
+#: src/ats/plugin_ats_mlp.c:2697
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
@@ -673,63 +673,63 @@ msgstr ""
 msgid "help text"
 msgstr "Hilfetext"
 
-#: src/cadet/gnunet-cadet.c:662
+#: src/cadet/gnunet-cadet.c:705
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/cadet/gnunet-cadet.c:701
+#: src/cadet/gnunet-cadet.c:744
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/cadet/gnunet-cadet.c:774
+#: src/cadet/gnunet-cadet.c:817
 msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:865
+#: src/cadet/gnunet-cadet.c:908
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/cadet/gnunet-cadet.c:902
+#: src/cadet/gnunet-cadet.c:945
 #, fuzzy
 msgid "No action requested\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/cadet/gnunet-cadet.c:927
+#: src/cadet/gnunet-cadet.c:970
 #, fuzzy
 msgid "Provide information about a particular connection"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:932
+#: src/cadet/gnunet-cadet.c:975
 msgid "Activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:937
+#: src/cadet/gnunet-cadet.c:980
 msgid "Dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:943
+#: src/cadet/gnunet-cadet.c:986
 msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:950
+#: src/cadet/gnunet-cadet.c:993
 #, fuzzy
 msgid "Provide information about a patricular peer"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:956
+#: src/cadet/gnunet-cadet.c:999
 #, fuzzy
 msgid "Provide information about all peers"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:962
+#: src/cadet/gnunet-cadet.c:1005
 #, fuzzy
 msgid "Provide information about a particular tunnel"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:968
+#: src/cadet/gnunet-cadet.c:1011
 #, fuzzy
 msgid "Provide information about all tunnels"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -777,260 +777,260 @@ msgstr "Ausführlicherer Modus (empfangene Werte 
ausgeben)"
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:268
+#: src/conversation/gnunet-conversation.c:275
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:293
+#: src/conversation/gnunet-conversation.c:300
 #, fuzzy, c-format
 msgid "Call from `%s' terminated\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/conversation/gnunet-conversation.c:328
+#: src/conversation/gnunet-conversation.c:335
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:333
+#: src/conversation/gnunet-conversation.c:340
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:351
+#: src/conversation/gnunet-conversation.c:358
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:366
+#: src/conversation/gnunet-conversation.c:373
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Telefon konnte nicht eingerichtet werden (interner Fehler)\n"
 
-#: src/conversation/gnunet-conversation.c:378
+#: src/conversation/gnunet-conversation.c:385
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:402
+#: src/conversation/gnunet-conversation.c:409
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:409
+#: src/conversation/gnunet-conversation.c:416
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/conversation/gnunet-conversation.c:416
+#: src/conversation/gnunet-conversation.c:423
 #, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "»%s« konnte nicht aufgelöst werden\n"
 
-#: src/conversation/gnunet-conversation.c:424
+#: src/conversation/gnunet-conversation.c:431
 #, fuzzy, c-format
 msgid "Call to `%s' terminated\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/conversation/gnunet-conversation.c:433
+#: src/conversation/gnunet-conversation.c:440
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:439
+#: src/conversation/gnunet-conversation.c:446
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:444
+#: src/conversation/gnunet-conversation.c:451
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:515
+#: src/conversation/gnunet-conversation.c:522
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Unbekannter Befehl »%s«\n"
 
-#: src/conversation/gnunet-conversation.c:531
-#: src/conversation/gnunet-conversation.c:545
+#: src/conversation/gnunet-conversation.c:538
+#: src/conversation/gnunet-conversation.c:552
 #, fuzzy, c-format
 msgid "Ego `%s' not available\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/conversation/gnunet-conversation.c:538
-#: src/conversation/gnunet-conversation.c:594
+#: src/conversation/gnunet-conversation.c:545
+#: src/conversation/gnunet-conversation.c:601
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:553
-#: src/conversation/gnunet-conversation.c:607
+#: src/conversation/gnunet-conversation.c:560
+#: src/conversation/gnunet-conversation.c:614
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:563
+#: src/conversation/gnunet-conversation.c:570
 msgid "Call recipient missing.\n"
 msgstr "Anzurufender Teilnehmer fehlt.\n"
 
-#: src/conversation/gnunet-conversation.c:618
+#: src/conversation/gnunet-conversation.c:625
 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:635
+#: src/conversation/gnunet-conversation.c:642
 #, 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:666
+#: src/conversation/gnunet-conversation.c:673
 msgid "We currently do not have an address.\n"
 msgstr "Derzeit keine Adresse vorhanden.\n"
 
-#: src/conversation/gnunet-conversation.c:690
+#: src/conversation/gnunet-conversation.c:697
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:695
+#: src/conversation/gnunet-conversation.c:702
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:701
-#: src/conversation/gnunet-conversation.c:725
+#: src/conversation/gnunet-conversation.c:708
+#: src/conversation/gnunet-conversation.c:732
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:706
+#: src/conversation/gnunet-conversation.c:713
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:715
+#: src/conversation/gnunet-conversation.c:722
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:720
+#: src/conversation/gnunet-conversation.c:727
 #, c-format
 msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr "Wir rufen `%s' an, deren Telefon sollte jetzt klingeln.\n"
 
-#: src/conversation/gnunet-conversation.c:739
+#: src/conversation/gnunet-conversation.c:746
 msgid "Calls waiting:\n"
 msgstr "Anruf wartet:\n"
 
-#: src/conversation/gnunet-conversation.c:745
+#: src/conversation/gnunet-conversation.c:752
 #, c-format
 msgid "#%u: `%s'\n"
 msgstr "#%u: »%s«\n"
 
-#: src/conversation/gnunet-conversation.c:774
-#: src/conversation/gnunet-conversation.c:789
+#: src/conversation/gnunet-conversation.c:781
+#: src/conversation/gnunet-conversation.c:796
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:822
-#: src/conversation/gnunet-conversation.c:838
+#: src/conversation/gnunet-conversation.c:829
+#: src/conversation/gnunet-conversation.c:845
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:845
+#: src/conversation/gnunet-conversation.c:852
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:854
+#: src/conversation/gnunet-conversation.c:861
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:871
+#: src/conversation/gnunet-conversation.c:878
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:906
+#: src/conversation/gnunet-conversation.c:913
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:914
+#: src/conversation/gnunet-conversation.c:921
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:931
+#: src/conversation/gnunet-conversation.c:938
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:957
+#: src/conversation/gnunet-conversation.c:964
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:959
+#: src/conversation/gnunet-conversation.c:966
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:963
+#: src/conversation/gnunet-conversation.c:970
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:965
+#: src/conversation/gnunet-conversation.c:972
 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:967
+#: src/conversation/gnunet-conversation.c:974
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:969
+#: src/conversation/gnunet-conversation.c:976
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:971
+#: src/conversation/gnunet-conversation.c:978
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
 
-#: src/conversation/gnunet-conversation.c:973
+#: src/conversation/gnunet-conversation.c:980
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1189
+#: src/conversation/gnunet-conversation.c:1196
 #, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1202
+#: src/conversation/gnunet-conversation.c:1209
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym `%s' wurde gelöscht.\n"
 
-#: src/conversation/gnunet-conversation.c:1240
+#: src/conversation/gnunet-conversation.c:1247
 #, 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:1264
+#: src/conversation/gnunet-conversation.c:1271
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/conversation/gnunet-conversation.c:1293
+#: src/conversation/gnunet-conversation.c:1300
 msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1298
+#: src/conversation/gnunet-conversation.c:1305
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1327
+#: src/conversation/gnunet-conversation.c:1334
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1182,7 +1182,7 @@ msgstr "ogg_stream_init() fehlgeschlagen.\n"
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "UDP-Sockets können nicht geöffnet werden\n"
 
-#: src/conversation/gnunet-service-conversation.c:1285
+#: src/conversation/gnunet-service-conversation.c:1303
 #, fuzzy, c-format
 msgid "Could not open line, port %s already in use!\n"
 msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
@@ -1491,8 +1491,7 @@ msgstr ""
 msgid "Unable to parse CRED record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/credential/gnunet-credential.c:262 src/namestore/gnunet-namestore.c:886
-#: src/namestore/plugin_rest_namestore.c:1020
+#: src/credential/gnunet-credential.c:262 src/namestore/gnunet-namestore.c:887
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
@@ -1592,16 +1591,15 @@ msgstr ""
 msgid "GNUnet credential resolver tool"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/credential/gnunet-service-credential.c:1136 src/gns/gnunet-gns.c:182
+#: src/credential/gnunet-service-credential.c:1136 src/gns/gnunet-gns.c:183
 #: src/gns/gnunet-gns-helper-service-w32.c:725
 #, 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:1142
-#: src/namestore/gnunet-namestore.c:912
-#: src/namestore/gnunet-namestore-fcfsd.c:1112
-#: src/namestore/plugin_rest_namestore.c:1033
+#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore-fcfsd.c:1136
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -1611,11 +1609,6 @@ msgstr "Es konnte keine Verbindung mit gnunetd 
hergestellt werden.\n"
 msgid "Unable to parse ATTR record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/credential/plugin_rest_credential.c:1126 src/gns/plugin_rest_gns.c:667
-#, fuzzy
-msgid "GNS REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
 #: src/datacache/datacache.c:117 src/datacache/datacache.c:309
 #: src/datastore/gnunet-service-datastore.c:755
 msgid "# bytes stored"
@@ -1661,29 +1654,29 @@ msgstr ""
 #: src/datacache/plugin_datacache_sqlite.c:125
 #: src/datastore/plugin_datastore_mysql.c:890
 #: src/datastore/plugin_datastore_sqlite.c:56
-#: src/datastore/plugin_datastore_sqlite.c:64
-#: src/identity-provider/plugin_identity_provider_sqlite.c:50 src/my/my.c:79
-#: src/my/my.c:91 src/mysql/mysql.c:40 src/mysql/mysql.c:47
+#: src/datastore/plugin_datastore_sqlite.c:64 src/my/my.c:79 src/my/my.c:91
+#: src/mysql/mysql.c:40 src/mysql/mysql.c:47
 #: src/namecache/plugin_namecache_sqlite.c:50
 #: src/namestore/plugin_namestore_sqlite.c:51
 #: src/peerstore/plugin_peerstore_sqlite.c:50
 #: src/psycstore/plugin_psycstore_mysql.c:60
+#: src/reclaim/plugin_reclaim_sqlite.c:50
 #: src/testbed/generate-underlay-topology.c:45
 #: src/testbed/gnunet-daemon-latency-logger.c:50
 #: src/testbed/gnunet-daemon-testbed-underlay.c:54
-#: src/testbed/testbed_api_hosts.c:67 src/util/crypto_ecc.c:50
+#: src/testbed/testbed_api_hosts.c:67 src/util/crypto_ecc.c:51
 #: src/util/crypto_ecc_setup.c:39 src/util/crypto_mpi.c:37
-#: src/include/gnunet_common.h:810 src/include/gnunet_common.h:819
+#: src/include/gnunet_common.h:816 src/include/gnunet_common.h:825
 #: src/scalarproduct/scalarproduct.h:33
 #, 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:860
+#: src/datacache/plugin_datacache_sqlite.c:861
 #: src/datastore/plugin_datastore_sqlite.c:506
-#: src/identity-provider/plugin_identity_provider_sqlite.c:334
 #: src/namecache/plugin_namecache_sqlite.c:327
 #: src/namestore/plugin_namestore_sqlite.c:262
+#: src/reclaim/plugin_reclaim_sqlite.c:334
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -2022,11 +2015,11 @@ 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:269
-#: src/identity-provider/plugin_identity_provider_sqlite.c:210
 #: src/namecache/plugin_namecache_sqlite.c:207
 #: src/namestore/plugin_namestore_sqlite.c:203
 #: src/peerstore/plugin_peerstore_sqlite.c:533
 #: src/psycstore/plugin_psycstore_sqlite.c:323
+#: src/reclaim/plugin_reclaim_sqlite.c:210
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite-Datenbank konnte nicht initialisiert werden: %s.\n"
@@ -2035,21 +2028,21 @@ msgstr "SQLite-Datenbank konnte nicht initialisiert 
werden: %s.\n"
 msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1324
+#: src/datastore/plugin_datastore_sqlite.c:1325
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1358
+#: src/datastore/plugin_datastore_sqlite.c:1359
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1402
-#: src/identity-provider/plugin_identity_provider_sqlite.c:709
+#: src/datastore/plugin_datastore_sqlite.c:1403
 #: src/namecache/plugin_namecache_sqlite.c:638
-#: src/namestore/plugin_namestore_sqlite.c:752
+#: src/namestore/plugin_namestore_sqlite.c:753
+#: src/reclaim/plugin_reclaim_sqlite.c:709
 msgid "Sqlite database running\n"
 msgstr "Sqlite-Datenbank läuft\n"
 
@@ -2124,7 +2117,7 @@ msgstr ""
 msgid "Exiting as the number of peers is %u\n"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:947 src/rps/gnunet-rps-profiler.c:2691
+#: src/dht/gnunet_dht_profiler.c:947 src/rps/gnunet-rps-profiler.c:2764
 #, fuzzy
 msgid "number of peers to start"
 msgstr "Anzahl an Durchläufen"
@@ -2444,36 +2437,6 @@ msgstr ""
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:252
-#, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr ""
-
-#: src/dns/dnsparser.c:821
-#, c-format
-msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
-msgstr ""
-
-#: src/dns/dnsstub.c:231
-#, 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:362
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
-#: src/dns/dnsstub.c:509
-#, 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:515
-#, c-format
-msgid "Sent DNS request to %s\n"
-msgstr ""
-
 #: src/dns/gnunet-dns-monitor.c:351 src/dns/gnunet-dns-monitor.c:356
 msgid "only monitor DNS queries"
 msgstr ""
@@ -4072,11 +4035,11 @@ msgstr "Der Transportdienst auf Port %d konnte nicht 
gestartet werden.\n"
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/gns/gnunet-bcd.c:520
+#: src/gns/gnunet-bcd.c:521
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:533
+#: src/gns/gnunet-bcd.c:534
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
@@ -4084,35 +4047,35 @@ msgstr ""
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:402
+#: src/gns/gnunet-dns2gns.c:403
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:418
+#: src/gns/gnunet-dns2gns.c:419
 #, 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:426
+#: src/gns/gnunet-dns2gns.c:427
 #, 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:585
+#: src/gns/gnunet-dns2gns.c:586
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:685
+#: src/gns/gnunet-dns2gns.c:686
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:690
+#: src/gns/gnunet-dns2gns.c:691
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:707
+#: src/gns/gnunet-dns2gns.c:708
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4128,7 +4091,7 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:197 src/gns/plugin_rest_gns.c:344
+#: src/gns/gnunet-gns.c:197
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
@@ -4155,7 +4118,7 @@ msgstr "GNUnet Netzwerk Topologie tracen."
 msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:699 src/gns/plugin_rest_gns.c:420
+#: src/gns/gnunet-gns-helper-service-w32.c:699
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
@@ -4225,64 +4188,64 @@ msgstr ""
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2061
+#: src/gns/gnunet-gns-proxy.c:2062
 #, 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:2582
+#: src/gns/gnunet-gns-proxy.c:2583
 #, 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:2614
+#: src/gns/gnunet-gns-proxy.c:2615
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2813
+#: src/gns/gnunet-gns-proxy.c:2814
 #, 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:2838 src/rest/gnunet-rest-server.c:656
+#: src/gns/gnunet-gns-proxy.c:2839 src/rest/gnunet-rest-server.c:656
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3168
+#: src/gns/gnunet-gns-proxy.c:3169
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3197
+#: src/gns/gnunet-gns-proxy.c:3198
 #, 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:3279
+#: src/gns/gnunet-gns-proxy.c:3280
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3569
+#: src/gns/gnunet-gns-proxy.c:3570
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:3697
+#: src/gns/gnunet-gns-proxy.c:3698
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3702
+#: src/gns/gnunet-gns-proxy.c:3703
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3706
+#: src/gns/gnunet-gns-proxy.c:3707
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3732
+#: src/gns/gnunet-gns-proxy.c:3733
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4392,10 +4355,6 @@ msgstr "Fehler beim Speichern der Konfigurationsdatei 
`%s':"
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/plugin_rest_gns.c:382
-msgid "Ego for not found, cannot perform lookup.\n"
-msgstr ""
-
 #: src/gnsrecord/plugin_gnsrecord_dns.c:357
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4867,122 +4826,53 @@ msgstr ""
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:388
+#: src/identity/gnunet-service-identity.c:389
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:410
+#: src/identity/gnunet-service-identity.c:414
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:499
-#: src/identity/gnunet-service-identity.c:771
-#: src/identity/gnunet-service-identity.c:893
+#: src/identity/gnunet-service-identity.c:505
+#: src/identity/gnunet-service-identity.c:788
+#: src/identity/gnunet-service-identity.c:916
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/identity/gnunet-service-identity.c:506
+#: src/identity/gnunet-service-identity.c:513
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:599
+#: src/identity/gnunet-service-identity.c:608
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:748
+#: src/identity/gnunet-service-identity.c:763
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:787
-#: src/identity/gnunet-service-identity.c:910
+#: src/identity/gnunet-service-identity.c:806
+#: src/identity/gnunet-service-identity.c:934
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:944
+#: src/identity/gnunet-service-identity.c:969
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/identity/gnunet-service-identity.c:1002
+#: src/identity/gnunet-service-identity.c:1027
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/identity/gnunet-service-identity.c:1012
+#: src/identity/gnunet-service-identity.c:1037
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/identity/plugin_rest_identity.c:966
-msgid "Identity REST API initialized\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:422
-#, fuzzy
-msgid "Ego is required\n"
-msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
-
-#: src/identity-provider/gnunet-idp.c:430
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:438
-#, 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:461
-msgid "Add attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:467
-msgid "Attribute value"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:472
-msgid "Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:477
-msgid "Audience (relying party)"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:481
-msgid "List attributes for Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:486
-msgid "Issue a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:491
-msgid "Consume a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:496
-msgid "Revoke a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:501
-msgid "Type of attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:506
-msgid "Expiration interval of the attribute"
-msgstr ""
-
-#: src/identity-provider/identity_provider_api.c:434
-#, fuzzy
-msgid "failed to store record\n"
-msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
-
-#: src/identity-provider/plugin_rest_identity_provider.c:1228
-#: src/identity-provider/plugin_rest_openid_connect.c:2145
-#, fuzzy
-msgid "Identity Provider REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
 #: src/json/json.c:121
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -5032,7 +4922,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:230 src/namestore/gnunet-namestore.c:1289
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1290
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -5041,7 +4931,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:248 src/namestore/gnunet-namestore.c:1341
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1342
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
@@ -5057,8 +4947,8 @@ 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:148
-#: src/namestore/plugin_namestore_flat.c:383
+#: src/namestore/plugin_namestore_heap.c:146
+#: src/namestore/plugin_namestore_heap.c:393
 #: src/peerstore/plugin_peerstore_flat.c:377
 #: src/peerstore/plugin_peerstore_flat.c:536
 #, fuzzy, c-format
@@ -5066,14 +4956,14 @@ 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:159
+#: src/namestore/plugin_namestore_heap.c:157
 #: src/peerstore/plugin_peerstore_flat.c:392
 #, 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:172
+#: src/namestore/plugin_namestore_heap.c:170
 #: src/peerstore/plugin_peerstore_flat.c:404
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
@@ -5090,13 +4980,11 @@ msgid "Adding record failed: %s\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:341
-#: src/namestore/plugin_rest_namestore.c:570
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:348
-#: src/namestore/plugin_rest_namestore.c:579
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
@@ -5117,214 +5005,208 @@ msgid ""
 "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:808
-#: src/namestore/plugin_rest_namestore.c:605
+#: src/namestore/gnunet-namestore.c:809
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:849
+#: src/namestore/gnunet-namestore.c:850
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:901
+#: src/namestore/gnunet-namestore.c:902
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:920 src/namestore/gnunet-namestore.c:929
-#: src/namestore/gnunet-namestore.c:948 src/namestore/gnunet-namestore.c:971
-#: src/namestore/gnunet-namestore.c:1025
+#: src/namestore/gnunet-namestore.c:921 src/namestore/gnunet-namestore.c:930
+#: src/namestore/gnunet-namestore.c:949 src/namestore/gnunet-namestore.c:972
+#: src/namestore/gnunet-namestore.c:1026
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:921 src/namestore/gnunet-namestore.c:930
-#: src/namestore/gnunet-namestore.c:949 src/namestore/gnunet-namestore.c:973
+#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:974
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:939
-#: src/namestore/plugin_rest_namestore.c:682
+#: src/namestore/gnunet-namestore.c:940
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/namestore/gnunet-namestore.c:961
-#: src/namestore/plugin_rest_namestore.c:702
-#: src/namestore/plugin_rest_namestore.c:744
+#: src/namestore/gnunet-namestore.c:962
 #, 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:1006
+#: src/namestore/gnunet-namestore.c:1007
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1026
+#: src/namestore/gnunet-namestore.c:1027
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1069
+#: src/namestore/gnunet-namestore.c:1070
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1098
+#: src/namestore/gnunet-namestore.c:1099
 #: src/peerinfo-tool/gnunet-peerinfo.c:773
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1133
+#: src/namestore/gnunet-namestore.c:1134
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1173
-#: src/namestore/plugin_rest_namestore.c:1063
+#: src/namestore/gnunet-namestore.c:1174
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1237
-#: src/namestore/plugin_rest_namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1238
 #, 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:1262
+#: src/namestore/gnunet-namestore.c:1263
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1266
+#: src/namestore/gnunet-namestore.c:1267
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1270
+#: src/namestore/gnunet-namestore.c:1271
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1275
+#: src/namestore/gnunet-namestore.c:1276
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1280
+#: src/namestore/gnunet-namestore.c:1281
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1284
+#: src/namestore/gnunet-namestore.c:1285
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1294
+#: src/namestore/gnunet-namestore.c:1295
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1299
+#: src/namestore/gnunet-namestore.c:1300
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1304
+#: src/namestore/gnunet-namestore.c:1305
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1309
+#: src/namestore/gnunet-namestore.c:1310
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1313
+#: src/namestore/gnunet-namestore.c:1314
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1317
+#: src/namestore/gnunet-namestore.c:1318
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1322
+#: src/namestore/gnunet-namestore.c:1323
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:538
+#: src/namestore/gnunet-namestore-fcfsd.c:547
 #, 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:565
+#: src/namestore/gnunet-namestore-fcfsd.c:574
 #, 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:585
+#: src/namestore/gnunet-namestore-fcfsd.c:595
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:616
+#: src/namestore/gnunet-namestore-fcfsd.c:627
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:696
+#: src/namestore/gnunet-namestore-fcfsd.c:687
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:754
+#: src/namestore/gnunet-namestore-fcfsd.c:775
 #, 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:772
+#: src/namestore/gnunet-namestore-fcfsd.c:794
 #, 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:808
+#: src/namestore/gnunet-namestore-fcfsd.c:830
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:817
+#: src/namestore/gnunet-namestore-fcfsd.c:839
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1045
+#: src/namestore/gnunet-namestore-fcfsd.c:1069
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1073
+#: src/namestore/gnunet-namestore-fcfsd.c:1097
 #, 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:1121
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1147
+#: src/namestore/gnunet-namestore-fcfsd.c:1171
 msgid "name of the zone that is to be managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1166
+#: src/namestore/gnunet-namestore-fcfsd.c:1190
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:748
+#: src/namestore/gnunet-service-namestore.c:749
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:2033
+#: src/namestore/gnunet-zoneimport.c:2036
 msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:2038
+#: src/namestore/gnunet-zoneimport.c:2041
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
@@ -5332,9 +5214,9 @@ msgstr ""
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:765
+#: src/namestore/plugin_namestore_heap.c:776
 #, fuzzy
-msgid "flat file database running\n"
+msgid "heap file database running\n"
 msgstr "Sqlite-Datenbank läuft\n"
 
 #: src/namestore/plugin_namestore_sqlite.c:216
@@ -5343,11 +5225,6 @@ msgstr "Sqlite-Datenbank läuft\n"
 msgid "Failed to setup database at `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/plugin_rest_namestore.c:1204
-#, fuzzy
-msgid "Namestore REST API initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
-
 #: src/nat-auto/gnunet-nat-auto.c:191
 #, fuzzy
 msgid "Suggested configuration changes:\n"
@@ -5734,6 +5611,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:297
+#: src/rest-plugins/plugin_rest_peerinfo.c:499
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
@@ -6035,6 +5913,66 @@ msgstr ""
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
+#: src/reclaim/gnunet-reclaim.c:465
+#, fuzzy, c-format
+msgid "Ego is required\n"
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
+
+#: src/reclaim/gnunet-reclaim.c:473
+#, c-format
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:481
+#, fuzzy, c-format
+msgid "Requesting party key is required!\n"
+msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
+
+#: src/reclaim/gnunet-reclaim.c:504
+msgid "Add attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:510
+msgid "Attribute value"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:515
+msgid "Ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:520
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:524
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:529
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:534
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:539
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:544
+msgid "Type of attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:549
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/reclaim/reclaim_api.c:434
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
+
 #: src/regex/gnunet-daemon-regexprofiler.c:265
 #, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
@@ -6128,6 +6066,41 @@ msgstr ""
 msgid "GNUnet REST server"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
+#: src/rest-plugins/plugin_rest_copying.c:207
+#, fuzzy
+msgid "COPYING REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/rest-plugins/plugin_rest_credential.c:1126
+#, fuzzy
+msgid "GNS REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/rest-plugins/plugin_rest_gns.c:450
+#, fuzzy
+msgid "Gns REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/rest-plugins/plugin_rest_identity.c:1295
+msgid "Identity REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_namestore.c:1077
+#, fuzzy
+msgid "Namestore REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/rest-plugins/plugin_rest_openid_connect.c:2135
+#: src/rest-plugins/plugin_rest_reclaim.c:1079
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/rest-plugins/plugin_rest_peerinfo.c:794
+#, fuzzy
+msgid "Peerinfo REST API initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
 #: src/revocation/gnunet-revocation.c:127
 #, c-format
 msgid "Key `%s' is valid\n"
@@ -6262,15 +6235,32 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/rps/gnunet-rps.c:201
+#: src/rps/gnunet-rps.c:258
 msgid "Seed a PeerID"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:205
+#: src/rps/gnunet-rps.c:262
 msgid "Get updates of view (0 for infinite updates)"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2705
+#: src/rps/gnunet-rps.c:266
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2770
+msgid "duration of the profiling"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2776
+msgid "timeout for the profiling"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2782
+#, fuzzy
+msgid "number of PeerIDs to request"
+msgstr "Anzahl an Durchläufen"
+
+#: src/rps/gnunet-rps-profiler.c:2797
 msgid "Measure quality and performance of the RPS service."
 msgstr ""
 
@@ -6357,7 +6347,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1987
+#: src/set/gnunet-service-set.c:2004
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
@@ -6554,93 +6544,93 @@ msgstr "Dateien aus dem GNUnet herunterladen."
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-statistics.c:271
-#: src/statistics/gnunet-statistics.c:365
+#: src/statistics/gnunet-statistics.c:407
+#: src/statistics/gnunet-statistics.c:448
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:274
-#: src/statistics/gnunet-statistics.c:368
+#: src/statistics/gnunet-statistics.c:410
+#: src/statistics/gnunet-statistics.c:451
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/statistics/gnunet-statistics.c:502
+#: src/statistics/gnunet-statistics.c:526
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:510
+#: src/statistics/gnunet-statistics.c:534
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:553
+#: src/statistics/gnunet-statistics.c:577
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:568
+#: src/statistics/gnunet-statistics.c:592
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/statistics/gnunet-statistics.c:703
+#: src/statistics/gnunet-statistics.c:727
 #, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ungültiges Argument »%s«\n"
 
-#: src/statistics/gnunet-statistics.c:721
+#: src/statistics/gnunet-statistics.c:745
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:729
+#: src/statistics/gnunet-statistics.c:753
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:760
+#: src/statistics/gnunet-statistics.c:784
 #, c-format
 msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:793
+#: src/statistics/gnunet-statistics.c:817
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:798
+#: src/statistics/gnunet-statistics.c:822
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:804
+#: src/statistics/gnunet-statistics.c:828
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:810
+#: src/statistics/gnunet-statistics.c:834
 msgid "use as csv separator"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:816
+#: src/statistics/gnunet-statistics.c:840
 msgid "path to the folder containing the testbed data"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:821
+#: src/statistics/gnunet-statistics.c:845
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:826
+#: src/statistics/gnunet-statistics.c:850
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:832
+#: src/statistics/gnunet-statistics.c:856
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:838
+#: src/statistics/gnunet-statistics.c:862
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:855
+#: src/statistics/gnunet-statistics.c:879
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet-Aktivitäten ausgeben."
 
@@ -8253,7 +8243,7 @@ msgstr ""
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1311 src/util/disk.c:1515
+#: src/transport/tcp_service_legacy.c:1311 src/util/disk.c:1521
 #: src/util/service.c:1376
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
@@ -8290,11 +8280,6 @@ msgstr "GNUnet Konfiguration"
 msgid "Could not access configuration file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/tun/regex.c:132
-#, c-format
-msgid "Bad mask: %d\n"
-msgstr ""
-
 #: src/util/bio.c:179 src/util/bio.c:187
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
@@ -8324,60 +8309,69 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:912
+#: src/util/client.c:732
+msgid "not a valid filename"
+msgstr ""
+
+#: src/util/client.c:923
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:257 src/util/common_logging.c:1144
+#: src/util/common_logging.c:257 src/util/common_logging.c:1159
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1142
+#: src/util/common_logging.c:259 src/util/common_logging.c:1157
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1140
+#: src/util/common_logging.c:261 src/util/common_logging.c:1155
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1138
+#: src/util/common_logging.c:263 src/util/common_logging.c:1153
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1136
+#: src/util/common_logging.c:265 src/util/common_logging.c:1151
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1146
+#: src/util/common_logging.c:267 src/util/common_logging.c:1161
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:880
+#: src/util/common_logging.c:631 src/util/common_logging.c:661
+#, c-format
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+msgstr ""
+
+#: src/util/common_logging.c:895
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1147
+#: src/util/common_logging.c:1162
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1440
+#: src/util/common_logging.c:1455
 msgid "unknown address"
 msgstr "Unbekannte Adresse"
 
-#: src/util/common_logging.c:1482
+#: src/util/common_logging.c:1497
 msgid "invalid address"
 msgstr "Ungültige Adresse"
 
-#: src/util/common_logging.c:1500
+#: src/util/common_logging.c:1515
 #, 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:1521
+#: src/util/common_logging.c:1536
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8395,24 +8389,28 @@ msgstr "Syntaxfehler in Konfigurationsdatei `%s' in 
Zeile %d.\n"
 msgid "Error while reading file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
 
-#: src/util/configuration.c:1049
+#: src/util/configuration.c:970
+msgid "Not a valid relative time specification"
+msgstr ""
+
+#: src/util/configuration.c:1059
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1168
+#: src/util/configuration.c:1178
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1201
+#: src/util/configuration.c:1211
 #, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1269
+#: src/util/configuration.c:1279
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8426,22 +8424,22 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:831
+#: src/util/crypto_ecc.c:860
 #, 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:881
+#: src/util/crypto_ecc.c:915
 #, 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:955
+#: src/util/crypto_ecc.c:994
 #, 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:1012
+#: src/util/crypto_ecc.c:1055
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
@@ -8476,27 +8474,57 @@ msgstr ""
 msgid "Could not load peer's private key\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/util/crypto_random.c:282
+#: src/util/crypto_random.c:304
 #, c-format
 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:836
+#: src/util/crypto_rsa.c:848
 #, 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:1167
+#: src/util/crypto_rsa.c:1187
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/disk.c:1245
+#: src/util/disk.c:1251
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
+#: src/util/dnsparser.c:250
+#, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr ""
+
+#: src/util/dnsparser.c:940
+#, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr ""
+
+#: src/util/dnsstub.c:229
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
+
+#: src/util/dnsstub.c:360
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
+
+#: src/util/dnsstub.c:507
+#, 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/util/dnsstub.c:513
+#, c-format
+msgid "Sent DNS request to %s\n"
+msgstr ""
+
 #: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -8596,8 +8624,8 @@ msgid "use configuration file FILENAME"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/util/getopt_helpers.c:559 src/util/getopt_helpers.c:756
-#: src/util/getopt_helpers.c:823
+#: src/util/getopt_helpers.c:559 src/util/getopt_helpers.c:763
+#: src/util/getopt_helpers.c:830
 #, 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"
@@ -8612,62 +8640,67 @@ msgstr "Sie müssen eine relative Zeit zu der Option 
»%s« übergeben.\n"
 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:830
+#: src/util/getopt_helpers.c:754
+#, c-format
+msgid "Your input for the '%s' option has to be a non negative number \n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:837
 #, 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:916
+#: src/util/getopt_helpers.c:923
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:148
+#: src/util/gnunet-config.c:157
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
 
-#: src/util/gnunet-config.c:161
+#: src/util/gnunet-config.c:170
 #, c-format
 msgid "--section argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:164
+#: src/util/gnunet-config.c:173
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:215
+#: src/util/gnunet-config.c:224
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:254
+#: src/util/gnunet-config.c:263
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:259
+#: src/util/gnunet-config.c:268
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:264
+#: src/util/gnunet-config.c:273
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:269
+#: src/util/gnunet-config.c:278
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:273
+#: src/util/gnunet-config.c:282
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "GNUnet Konfiguration"
 
-#: src/util/gnunet-config.c:277
+#: src/util/gnunet-config.c:286
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:290
+#: src/util/gnunet-config.c:299
 msgid "Manipulate GNUnet configuration files"
 msgstr "GNUnet-Konfigurationsdateien bearbeiten"
 
@@ -8795,16 +8828,9 @@ msgstr ""
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:369
-#, fuzzy, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
-
-#: src/util/gnunet-service-resolver.c:458
-#: src/util/gnunet-service-resolver.c:510
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
-msgstr "IP des Hosts »%s« konnte nicht ermittelt werden: %s\n"
+#: src/util/gnunet-service-resolver.c:1443
+msgid "No DNS server available. DNS resolution will not be possible.\n"
+msgstr ""
 
 #: src/util/gnunet-uri.c:83
 #, c-format
@@ -8904,13 +8930,18 @@ msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. 
Ort: %s:%d. Fehler: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/util/resolver_api.c:201
+#: src/util/regex.c:132
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
+
+#: src/util/resolver_api.c:216
 #, c-format
 msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:222
+#: src/util/resolver_api.c:237
 #, fuzzy, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
@@ -8919,23 +8950,23 @@ msgstr ""
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/util/resolver_api.c:849
+#: src/util/resolver_api.c:873
 #, 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:862
+#: src/util/resolver_api.c:886
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1046
+#: src/util/resolver_api.c:1071
 #, fuzzy
 msgid "Resolver not configured correctly.\n"
 msgstr "Standarddienst »%s« ist nicht korrekt eingerichtet!\n"
 
-#: src/util/resolver_api.c:1132 src/util/resolver_api.c:1155
-#: src/util/resolver_api.c:1169
+#: src/util/resolver_api.c:1158 src/util/resolver_api.c:1181
+#: src/util/resolver_api.c:1195
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
@@ -8971,112 +9002,112 @@ msgstr ""
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:469
+#: src/util/strings.c:471
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:596
+#: src/util/strings.c:598
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:700
+#: src/util/strings.c:702
 msgid "µs"
 msgstr "µs"
 
-#: src/util/strings.c:704
+#: src/util/strings.c:706
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:706
+#: src/util/strings.c:708
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:712
+#: src/util/strings.c:714
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:718
+#: src/util/strings.c:720
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:724
+#: src/util/strings.c:726
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:730
+#: src/util/strings.c:732
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:737
+#: src/util/strings.c:739
 msgid "day"
 msgstr "Tag"
 
-#: src/util/strings.c:739
+#: src/util/strings.c:741
 msgid "days"
 msgstr "Tage"
 
-#: src/util/strings.c:768
+#: src/util/strings.c:770
 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"
@@ -9261,22 +9292,34 @@ msgstr "Tunnel über VPN einrichten."
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/include/gnunet_common.h:764 src/include/gnunet_common.h:771
-#: src/include/gnunet_common.h:781 src/include/gnunet_common.h:789
+#: src/include/gnunet_common.h:770 src/include/gnunet_common.h:777
+#: src/include/gnunet_common.h:787
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d. Aborting.\n"
+msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+
+#: src/include/gnunet_common.h:795
 #, 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:801
+#: src/include/gnunet_common.h:807
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n"
 
-#: src/include/gnunet_common.h:828 src/include/gnunet_common.h:837
+#: src/include/gnunet_common.h:834 src/include/gnunet_common.h:843
 #, 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"
 
+#, fuzzy
+#~ msgid "Could not resolve `%s' (%s): %s\n"
+#~ msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
+
+#~ msgid "Could not find IP of host `%s': %s\n"
+#~ msgstr "IP des Hosts »%s« konnte nicht ermittelt werden: %s\n"
+
 #~ msgid "Could not connect to %s service!\n"
 #~ msgstr "Verbindung zum %s-Dienst ist fehlgeschlagen!\n"
 
diff --git a/po/es.po b/po/es.po
index e68990fc7..3733454dd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2018-06-20 22:22+0200\n"
+"POT-Creation-Date: 2018-10-20 11:13+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"
@@ -233,7 +233,7 @@ msgid "Control services and the Automated Restart Manager 
(ARM)"
 msgstr ""
 "Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)"
 
-#: src/arm/gnunet-service-arm.c:381 src/transport/plugin_transport_tcp.c:1118
+#: src/arm/gnunet-service-arm.c:386 src/transport/plugin_transport_tcp.c:1118
 #: src/transport/plugin_transport_xt.c:1118
 #: src/transport/tcp_service_legacy.c:555 src/util/service.c:610
 #, c-format
@@ -243,7 +243,7 @@ msgstr ""
 "Deshabilitando el soporte para IPv6 para el servicio «%s», se produjo un "
 "fallo al crear un «socket» IPv6: %s\n"
 
-#: src/arm/gnunet-service-arm.c:405 src/arm/gnunet-service-arm.c:411
+#: src/arm/gnunet-service-arm.c:410 src/arm/gnunet-service-arm.c:416
 #: src/transport/plugin_transport_tcp.c:1137
 #: src/transport/plugin_transport_tcp.c:1143
 #: src/transport/plugin_transport_tcp.c:3823
@@ -259,7 +259,7 @@ msgstr ""
 "¡Se requiere un número de puerto válido para el servicio «%s» en la "
 "configuración!\n"
 
-#: src/arm/gnunet-service-arm.c:450 src/transport/plugin_transport_tcp.c:1174
+#: src/arm/gnunet-service-arm.c:455 src/transport/plugin_transport_tcp.c:1174
 #: src/transport/plugin_transport_xt.c:1174
 #: src/transport/tcp_service_legacy.c:611 src/util/client.c:504
 #: src/util/service.c:680
@@ -268,7 +268,7 @@ msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n"
 
-#: src/arm/gnunet-service-arm.c:455 src/transport/plugin_transport_tcp.c:1178
+#: src/arm/gnunet-service-arm.c:460 src/transport/plugin_transport_tcp.c:1178
 #: src/transport/plugin_transport_xt.c:1178
 #: src/transport/tcp_service_legacy.c:615 src/util/client.c:509
 #: src/util/service.c:685
@@ -276,7 +276,7 @@ msgstr ""
 msgid "Using `%s' instead\n"
 msgstr "Usando «%s» en su defecto\n"
 
-#: src/arm/gnunet-service-arm.c:488 src/transport/plugin_transport_tcp.c:1209
+#: src/arm/gnunet-service-arm.c:493 src/transport/plugin_transport_tcp.c:1209
 #: src/transport/plugin_transport_xt.c:1209
 #: src/transport/tcp_service_legacy.c:646 src/util/service.c:721
 #, c-format
@@ -287,7 +287,7 @@ msgstr ""
 "Deshabilitando el soporte de dominio de «sockets» UNIX para el servicio "
 "«%s», no se pudo crear un «socket» UNIX: %s\n"
 
-#: src/arm/gnunet-service-arm.c:510 src/transport/plugin_transport_tcp.c:1226
+#: src/arm/gnunet-service-arm.c:515 src/transport/plugin_transport_tcp.c:1226
 #: src/transport/plugin_transport_xt.c:1226
 #: src/transport/tcp_service_legacy.c:663 src/util/service.c:739
 #, c-format
@@ -296,7 +296,7 @@ msgstr ""
 "No hay ni puerto (PORT) ni ruta unix (UNIXPATH) para el servicio «%s», pero "
 "uno es necesario\n"
 
-#: src/arm/gnunet-service-arm.c:549
+#: src/arm/gnunet-service-arm.c:554
 #: src/transport/plugin_transport_http_server.c:2682
 #: src/transport/plugin_transport_tcp.c:1257
 #: src/transport/plugin_transport_xt.c:1257
@@ -305,7 +305,7 @@ msgstr ""
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 
-#: src/arm/gnunet-service-arm.c:568
+#: src/arm/gnunet-service-arm.c:573
 #: src/transport/plugin_transport_http_server.c:2700
 #: src/transport/plugin_transport_tcp.c:1276
 #: src/transport/plugin_transport_xt.c:1276
@@ -314,23 +314,23 @@ msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "No se encontró la dirección %s para «%s».\n"
 
-#: src/arm/gnunet-service-arm.c:979
+#: src/arm/gnunet-service-arm.c:984
 #, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:990
+#: src/arm/gnunet-service-arm.c:995
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr "Iniciando el servicio «%s»\n"
 
 # Miguel: ¿Alguna idea para "socket"?
-#: src/arm/gnunet-service-arm.c:1102
+#: src/arm/gnunet-service-arm.c:1107
 #, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Imposible crear un «socket» para el servicio «%s»: %s\n"
 
-#: src/arm/gnunet-service-arm.c:1137
+#: src/arm/gnunet-service-arm.c:1142
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
@@ -341,44 +341,44 @@ msgstr ""
 # no es exactamente lo mismo que el texto en inglés, pero
 # es fiel a la realidad puesto que el ARM reinicia
 # las conexiones cuando se caen.
-#: src/arm/gnunet-service-arm.c:1180
+#: src/arm/gnunet-service-arm.c:1185
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr "El ARM ahora gestiona las conexiones del servicio «%s» en «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:1359
+#: src/arm/gnunet-service-arm.c:1364
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Preparando para parar «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:1664
+#: src/arm/gnunet-service-arm.c:1669
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Reiniciando el servicio «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:1825
+#: src/arm/gnunet-service-arm.c:1830
 msgid "exit"
 msgstr "salida"
 
-#: src/arm/gnunet-service-arm.c:1830
+#: src/arm/gnunet-service-arm.c:1835
 msgid "signal"
 msgstr "señal"
 
-#: src/arm/gnunet-service-arm.c:1835
+#: src/arm/gnunet-service-arm.c:1840
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/arm/gnunet-service-arm.c:1841
+#: src/arm/gnunet-service-arm.c:1846
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "El servicio «%s» tardó %s en finalizar\n"
 
-#: src/arm/gnunet-service-arm.c:1867
+#: src/arm/gnunet-service-arm.c:1872
 #, fuzzy, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n"
 
-#: src/arm/gnunet-service-arm.c:1883
+#: src/arm/gnunet-service-arm.c:1888
 #, fuzzy, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n"
@@ -469,24 +469,24 @@ msgstr "¡No se puede inicializar el resolvedor!\n"
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1867
+#: src/ats/plugin_ats_mlp.c:1868
 #, 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:1911
+#: src/ats/plugin_ats_mlp.c:1912
 #, 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:2473
+#: src/ats/plugin_ats_mlp.c:2474
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2513 src/ats/plugin_ats_mlp.c:2530
-#: src/ats/plugin_ats_mlp.c:2562 src/ats/plugin_ats_mlp.c:2580
-#: src/ats/plugin_ats_mlp.c:2599 src/ats/plugin_ats_proportional.c:1139
+#: src/ats/plugin_ats_mlp.c:2514 src/ats/plugin_ats_mlp.c:2531
+#: src/ats/plugin_ats_mlp.c:2563 src/ats/plugin_ats_mlp.c:2581
+#: src/ats/plugin_ats_mlp.c:2600 src/ats/plugin_ats_proportional.c:1139
 #: src/ats/plugin_ats_ril.c:2610 src/ats/plugin_ats_ril.c:2627
 #: src/ats/plugin_ats_ril.c:2644 src/ats/plugin_ats_ril.c:2661
 #: src/ats/plugin_ats_ril.c:2678 src/ats/plugin_ats_ril.c:2695
@@ -495,7 +495,7 @@ msgstr ""
 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:2668
+#: src/ats/plugin_ats_mlp.c:2669
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
@@ -504,7 +504,7 @@ 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:2677
+#: src/ats/plugin_ats_mlp.c:2678
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
@@ -514,14 +514,14 @@ msgstr ""
 "ancho de banda predeterminado (%llu)\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/plugin_ats_mlp.c:2687
+#: src/ats/plugin_ats_mlp.c:2688
 #, 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:2696
+#: src/ats/plugin_ats_mlp.c:2697
 #, fuzzy, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
@@ -734,63 +734,63 @@ msgstr ""
 msgid "help text"
 msgstr "texto de ayuda"
 
-#: src/cadet/gnunet-cadet.c:662
+#: src/cadet/gnunet-cadet.c:705
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/cadet/gnunet-cadet.c:701
+#: src/cadet/gnunet-cadet.c:744
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/cadet/gnunet-cadet.c:774
+#: src/cadet/gnunet-cadet.c:817
 msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:865
+#: src/cadet/gnunet-cadet.c:908
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/cadet/gnunet-cadet.c:902
+#: src/cadet/gnunet-cadet.c:945
 #, fuzzy
 msgid "No action requested\n"
 msgstr "Colección detenida.\n"
 
-#: src/cadet/gnunet-cadet.c:927
+#: src/cadet/gnunet-cadet.c:970
 #, fuzzy
 msgid "Provide information about a particular connection"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:932
+#: src/cadet/gnunet-cadet.c:975
 msgid "Activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:937
+#: src/cadet/gnunet-cadet.c:980
 msgid "Dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:943
+#: src/cadet/gnunet-cadet.c:986
 msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:950
+#: src/cadet/gnunet-cadet.c:993
 #, fuzzy
 msgid "Provide information about a patricular peer"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:956
+#: src/cadet/gnunet-cadet.c:999
 #, fuzzy
 msgid "Provide information about all peers"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:962
+#: src/cadet/gnunet-cadet.c:1005
 #, fuzzy
 msgid "Provide information about a particular tunnel"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:968
+#: src/cadet/gnunet-cadet.c:1011
 #, fuzzy
 msgid "Provide information about all tunnels"
 msgstr "proveer información acerca de un túnel en particular"
@@ -843,261 +843,261 @@ 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:268
+#: src/conversation/gnunet-conversation.c:275
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:293
+#: src/conversation/gnunet-conversation.c:300
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:328
+#: src/conversation/gnunet-conversation.c:335
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:333
+#: src/conversation/gnunet-conversation.c:340
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:351
+#: src/conversation/gnunet-conversation.c:358
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:366
+#: src/conversation/gnunet-conversation.c:373
 #, 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:378
+#: src/conversation/gnunet-conversation.c:385
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:402
+#: src/conversation/gnunet-conversation.c:409
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:409
+#: src/conversation/gnunet-conversation.c:416
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/conversation/gnunet-conversation.c:416
+#: src/conversation/gnunet-conversation.c:423
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 
-#: src/conversation/gnunet-conversation.c:424
+#: src/conversation/gnunet-conversation.c:431
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:433
+#: src/conversation/gnunet-conversation.c:440
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:439
+#: src/conversation/gnunet-conversation.c:446
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:444
+#: src/conversation/gnunet-conversation.c:451
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:515
+#: src/conversation/gnunet-conversation.c:522
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Comando desconocido «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:531
-#: src/conversation/gnunet-conversation.c:545
+#: src/conversation/gnunet-conversation.c:538
+#: src/conversation/gnunet-conversation.c:552
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:538
-#: src/conversation/gnunet-conversation.c:594
+#: src/conversation/gnunet-conversation.c:545
+#: src/conversation/gnunet-conversation.c:601
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:553
-#: src/conversation/gnunet-conversation.c:607
+#: src/conversation/gnunet-conversation.c:560
+#: src/conversation/gnunet-conversation.c:614
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:563
+#: src/conversation/gnunet-conversation.c:570
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:618
+#: src/conversation/gnunet-conversation.c:625
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:635
+#: src/conversation/gnunet-conversation.c:642
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:666
+#: src/conversation/gnunet-conversation.c:673
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:690
+#: src/conversation/gnunet-conversation.c:697
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:695
+#: src/conversation/gnunet-conversation.c:702
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:701
-#: src/conversation/gnunet-conversation.c:725
+#: src/conversation/gnunet-conversation.c:708
+#: src/conversation/gnunet-conversation.c:732
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:706
+#: src/conversation/gnunet-conversation.c:713
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:715
+#: src/conversation/gnunet-conversation.c:722
 #, 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:720
+#: src/conversation/gnunet-conversation.c:727
 #, c-format
 msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:739
+#: src/conversation/gnunet-conversation.c:746
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:745
+#: src/conversation/gnunet-conversation.c:752
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Par «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:774
-#: src/conversation/gnunet-conversation.c:789
+#: src/conversation/gnunet-conversation.c:781
+#: src/conversation/gnunet-conversation.c:796
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:822
-#: src/conversation/gnunet-conversation.c:838
+#: src/conversation/gnunet-conversation.c:829
+#: src/conversation/gnunet-conversation.c:845
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:845
+#: src/conversation/gnunet-conversation.c:852
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:854
+#: src/conversation/gnunet-conversation.c:861
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:871
+#: src/conversation/gnunet-conversation.c:878
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:906
+#: src/conversation/gnunet-conversation.c:913
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:914
+#: src/conversation/gnunet-conversation.c:921
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:931
+#: src/conversation/gnunet-conversation.c:938
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:957
+#: src/conversation/gnunet-conversation.c:964
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:959
+#: src/conversation/gnunet-conversation.c:966
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:963
+#: src/conversation/gnunet-conversation.c:970
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:965
+#: src/conversation/gnunet-conversation.c:972
 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:967
+#: src/conversation/gnunet-conversation.c:974
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:969
+#: src/conversation/gnunet-conversation.c:976
 #, fuzzy
 msgid "Use `/status' to print status information"
 msgstr "ser prolijo (imprime información de progreso)"
 
-#: src/conversation/gnunet-conversation.c:971
+#: src/conversation/gnunet-conversation.c:978
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Use «/quit» para finalizar «gnunet-chat»"
 
-#: src/conversation/gnunet-conversation.c:973
+#: src/conversation/gnunet-conversation.c:980
 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:1189
+#: src/conversation/gnunet-conversation.c:1196
 #, 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:1202
+#: src/conversation/gnunet-conversation.c:1209
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "El pseudónimo '%s' fue borrado.\n"
 
-#: src/conversation/gnunet-conversation.c:1240
+#: src/conversation/gnunet-conversation.c:1247
 #, 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:1264
+#: src/conversation/gnunet-conversation.c:1271
 #, 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:1293
+#: src/conversation/gnunet-conversation.c:1300
 msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1298
+#: src/conversation/gnunet-conversation.c:1305
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1327
+#: src/conversation/gnunet-conversation.c:1334
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1256,7 +1256,7 @@ msgid "Failed to allocate %u bytes for second packet\n"
 msgstr ""
 "Se produjo un fallo al alojar las direcciones IP para el nuevo destino\n"
 
-#: src/conversation/gnunet-service-conversation.c:1285
+#: src/conversation/gnunet-service-conversation.c:1303
 #, fuzzy, c-format
 msgid "Could not open line, port %s already in use!\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
@@ -1563,8 +1563,7 @@ msgstr "# actualizaciones de mi mapa de tipos"
 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:262 src/namestore/gnunet-namestore.c:886
-#: src/namestore/plugin_rest_namestore.c:1020
+#: src/credential/gnunet-credential.c:262 src/namestore/gnunet-namestore.c:887
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
@@ -1666,16 +1665,15 @@ msgstr ""
 msgid "GNUnet credential resolver tool"
 msgstr "Herramienta de acceso GNUnet GNS"
 
-#: src/credential/gnunet-service-credential.c:1136 src/gns/gnunet-gns.c:182
+#: src/credential/gnunet-service-credential.c:1136 src/gns/gnunet-gns.c:183
 #: src/gns/gnunet-gns-helper-service-w32.c:725
 #, 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:1142
-#: src/namestore/gnunet-namestore.c:912
-#: src/namestore/gnunet-namestore-fcfsd.c:1112
-#: src/namestore/plugin_rest_namestore.c:1033
+#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore-fcfsd.c:1136
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
@@ -1685,11 +1683,6 @@ msgstr "Se produjo un fallo al conectar con el almacén 
de nombres\n"
 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:1126 src/gns/plugin_rest_gns.c:667
-#, fuzzy
-msgid "GNS REST API initialized\n"
-msgstr "Conexión fallida\n"
-
 #: src/datacache/datacache.c:117 src/datacache/datacache.c:309
 #: src/datastore/gnunet-service-datastore.c:755
 msgid "# bytes stored"
@@ -1736,29 +1729,29 @@ msgstr "Caché de datos de montículo (heap) 
ejecutándose\n"
 #: src/datacache/plugin_datacache_sqlite.c:125
 #: src/datastore/plugin_datastore_mysql.c:890
 #: src/datastore/plugin_datastore_sqlite.c:56
-#: src/datastore/plugin_datastore_sqlite.c:64
-#: src/identity-provider/plugin_identity_provider_sqlite.c:50 src/my/my.c:79
-#: src/my/my.c:91 src/mysql/mysql.c:40 src/mysql/mysql.c:47
+#: src/datastore/plugin_datastore_sqlite.c:64 src/my/my.c:79 src/my/my.c:91
+#: src/mysql/mysql.c:40 src/mysql/mysql.c:47
 #: src/namecache/plugin_namecache_sqlite.c:50
 #: src/namestore/plugin_namestore_sqlite.c:51
 #: src/peerstore/plugin_peerstore_sqlite.c:50
 #: src/psycstore/plugin_psycstore_mysql.c:60
+#: src/reclaim/plugin_reclaim_sqlite.c:50
 #: src/testbed/generate-underlay-topology.c:45
 #: src/testbed/gnunet-daemon-latency-logger.c:50
 #: src/testbed/gnunet-daemon-testbed-underlay.c:54
-#: src/testbed/testbed_api_hosts.c:67 src/util/crypto_ecc.c:50
+#: src/testbed/testbed_api_hosts.c:67 src/util/crypto_ecc.c:51
 #: src/util/crypto_ecc_setup.c:39 src/util/crypto_mpi.c:37
-#: src/include/gnunet_common.h:810 src/include/gnunet_common.h:819
+#: src/include/gnunet_common.h:816 src/include/gnunet_common.h:825
 #: src/scalarproduct/scalarproduct.h:33
 #, 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:860
+#: src/datacache/plugin_datacache_sqlite.c:861
 #: src/datastore/plugin_datastore_sqlite.c:506
-#: src/identity-provider/plugin_identity_provider_sqlite.c:334
 #: src/namecache/plugin_namecache_sqlite.c:327
 #: src/namestore/plugin_namestore_sqlite.c:262
+#: src/reclaim/plugin_reclaim_sqlite.c:334
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 "Se intentó cerrar sqlite sin finalizar todas las sentencias preparadas.\n"
@@ -2104,11 +2097,11 @@ 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:269
-#: src/identity-provider/plugin_identity_provider_sqlite.c:210
 #: src/namecache/plugin_namecache_sqlite.c:207
 #: src/namestore/plugin_namestore_sqlite.c:203
 #: src/peerstore/plugin_peerstore_sqlite.c:533
 #: src/psycstore/plugin_psycstore_sqlite.c:323
+#: src/reclaim/plugin_reclaim_sqlite.c:210
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Imposible inicializar SQLite: %s.\n"
@@ -2118,13 +2111,13 @@ msgid "sqlite bind failure"
 msgstr ""
 
 # to should be too, i think
-#: src/datastore/plugin_datastore_sqlite.c:1324
+#: src/datastore/plugin_datastore_sqlite.c:1325
 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:1358
+#: src/datastore/plugin_datastore_sqlite.c:1359
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
@@ -2133,10 +2126,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:1402
-#: src/identity-provider/plugin_identity_provider_sqlite.c:709
+#: src/datastore/plugin_datastore_sqlite.c:1403
 #: src/namecache/plugin_namecache_sqlite.c:638
-#: src/namestore/plugin_namestore_sqlite.c:752
+#: src/namestore/plugin_namestore_sqlite.c:753
+#: src/reclaim/plugin_reclaim_sqlite.c:709
 msgid "Sqlite database running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
 
@@ -2216,7 +2209,7 @@ msgstr "Imprime todos los paquetes que pasan por la DHT."
 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:947 src/rps/gnunet-rps-profiler.c:2691
+#: src/dht/gnunet_dht_profiler.c:947 src/rps/gnunet-rps-profiler.c:2764
 msgid "number of peers to start"
 msgstr "número de pares para empezar"
 
@@ -2538,40 +2531,6 @@ msgstr "Discrepancias de tamaños para el bloque\n"
 msgid "Block of type %u is malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/dns/dnsparser.c:252
-#, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr ""
-"Se produjo un fallo al convertir el nombre en formato DNS IDNA «%s» a UTF-8: "
-"%s\n"
-
-#: src/dns/dnsparser.c:821
-#, 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:231
-#, 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:362
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr "Recibida respuesta DNS demasiado pequeña (%u bytes)"
-
-#: src/dns/dnsstub.c:509
-#, 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:515
-#, c-format
-msgid "Sent DNS request to %s\n"
-msgstr "Petición DNS enviada a %s\n"
-
 #: src/dns/gnunet-dns-monitor.c:351 src/dns/gnunet-dns-monitor.c:356
 msgid "only monitor DNS queries"
 msgstr "sólo monitorizar consultas DNS"
@@ -4199,11 +4158,11 @@ msgid "Could not start businesscard 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/gns/gnunet-bcd.c:520
+#: src/gns/gnunet-bcd.c:521
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:533
+#: src/gns/gnunet-bcd.c:534
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
@@ -4212,38 +4171,38 @@ 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:402
+#: src/gns/gnunet-dns2gns.c:403
 #, 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:418
+#: src/gns/gnunet-dns2gns.c:419
 #, 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:426
+#: src/gns/gnunet-dns2gns.c:427
 #, 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:585
+#: src/gns/gnunet-dns2gns.c:586
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/gns/gnunet-dns2gns.c:685
+#: src/gns/gnunet-dns2gns.c:686
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr "IP del resolvedor recursivo DNS a usar (requerido)"
 
-#: src/gns/gnunet-dns2gns.c:690
+#: src/gns/gnunet-dns2gns.c:691
 #, 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:707
+#: src/gns/gnunet-dns2gns.c:708
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)"
 
@@ -4260,7 +4219,7 @@ msgstr "¿cuánto tiempo se debe ejecutar? 0 = para siempre"
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:197 src/gns/plugin_rest_gns.c:344
+#: src/gns/gnunet-gns.c:197
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
@@ -4286,7 +4245,7 @@ msgstr "Herramienta de acceso GNUnet GNS"
 msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:699 src/gns/plugin_rest_gns.c:420
+#: src/gns/gnunet-gns-helper-service-w32.c:699
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
@@ -4356,64 +4315,64 @@ msgstr ""
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2061
+#: src/gns/gnunet-gns-proxy.c:2062
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:2582
+#: src/gns/gnunet-gns-proxy.c:2583
 #, 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:2614
+#: src/gns/gnunet-gns-proxy.c:2615
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "No se pudo importar el certificado %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:2813
+#: src/gns/gnunet-gns-proxy.c:2814
 #, 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:2838 src/rest/gnunet-rest-server.c:656
+#: src/gns/gnunet-gns-proxy.c:2839 src/rest/gnunet-rest-server.c:656
 #, 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:3168
+#: src/gns/gnunet-gns-proxy.c:3169
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3197
+#: src/gns/gnunet-gns-proxy.c:3198
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3279
+#: src/gns/gnunet-gns-proxy.c:3280
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3569
+#: src/gns/gnunet-gns-proxy.c:3570
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:3697
+#: src/gns/gnunet-gns-proxy.c:3698
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3702
+#: src/gns/gnunet-gns-proxy.c:3703
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3706
+#: src/gns/gnunet-gns-proxy.c:3707
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3732
+#: src/gns/gnunet-gns-proxy.c:3733
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
@@ -4524,10 +4483,6 @@ msgstr "No se pudo procesar la cadena de registro VPN 
«%s»\n"
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
 
-#: src/gns/plugin_rest_gns.c:382
-msgid "Ego for not found, cannot perform lookup.\n"
-msgstr ""
-
 #: src/gnsrecord/plugin_gnsrecord_dns.c:357
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -5035,125 +4990,55 @@ msgstr ""
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:388
+#: src/identity/gnunet-service-identity.c:389
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:410
+#: src/identity/gnunet-service-identity.c:414
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:499
-#: src/identity/gnunet-service-identity.c:771
-#: src/identity/gnunet-service-identity.c:893
+#: src/identity/gnunet-service-identity.c:505
+#: src/identity/gnunet-service-identity.c:788
+#: src/identity/gnunet-service-identity.c:916
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/identity/gnunet-service-identity.c:506
+#: src/identity/gnunet-service-identity.c:513
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:599
+#: src/identity/gnunet-service-identity.c:608
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:748
+#: src/identity/gnunet-service-identity.c:763
 #, fuzzy
 msgid "target name already exists"
 msgstr "El registro ya existía en el almacén de nombres"
 
-#: src/identity/gnunet-service-identity.c:787
-#: src/identity/gnunet-service-identity.c:910
+#: src/identity/gnunet-service-identity.c:806
+#: src/identity/gnunet-service-identity.c:934
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:944
+#: src/identity/gnunet-service-identity.c:969
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
 
-#: src/identity/gnunet-service-identity.c:1002
+#: src/identity/gnunet-service-identity.c:1027
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/identity/gnunet-service-identity.c:1012
+#: src/identity/gnunet-service-identity.c:1037
 #, fuzzy, c-format
 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:966
-#, fuzzy
-msgid "Identity REST API initialized\n"
-msgstr "Conexión fallida\n"
-
-#: src/identity-provider/gnunet-idp.c:422
-#, fuzzy
-msgid "Ego is required\n"
-msgstr "Las opción «%s» o «%s» es necesaria.\n"
-
-#: src/identity-provider/gnunet-idp.c:430
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:438
-#, fuzzy
-msgid "Requesting party key is required!\n"
-msgstr "el parámetro --section es necesario\n"
-
-#: src/identity-provider/gnunet-idp.c:461
-msgid "Add attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:467
-msgid "Attribute value"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:472
-msgid "Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:477
-msgid "Audience (relying party)"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:481
-msgid "List attributes for Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:486
-msgid "Issue a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:491
-msgid "Consume a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:496
-msgid "Revoke a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:501
-msgid "Type of attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:506
-msgid "Expiration interval of the attribute"
-msgstr ""
-
-#: src/identity-provider/identity_provider_api.c:434
-#, 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:1228
-#: src/identity-provider/plugin_rest_openid_connect.c:2145
-#, fuzzy
-msgid "Identity Provider REST API initialized\n"
-msgstr "Conexión fallida\n"
-
 #: src/json/json.c:121
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -5203,7 +5088,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:230 src/namestore/gnunet-namestore.c:1289
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1290
 msgid "name of the record to add/delete/display"
 msgstr "nombre del registro a añadir/borrar/mostrar"
 
@@ -5212,7 +5097,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:248 src/namestore/gnunet-namestore.c:1341
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1342
 msgid "GNUnet zone manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
 
@@ -5229,8 +5114,8 @@ 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:148
-#: src/namestore/plugin_namestore_flat.c:383
+#: src/namestore/plugin_namestore_heap.c:146
+#: src/namestore/plugin_namestore_heap.c:393
 #: src/peerstore/plugin_peerstore_flat.c:377
 #: src/peerstore/plugin_peerstore_flat.c:536
 #, fuzzy, c-format
@@ -5238,14 +5123,14 @@ 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:159
+#: src/namestore/plugin_namestore_heap.c:157
 #: src/peerstore/plugin_peerstore_flat.c:392
 #, 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:172
+#: src/namestore/plugin_namestore_heap.c:170
 #: src/peerstore/plugin_peerstore_flat.c:404
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
@@ -5262,13 +5147,11 @@ msgid "Adding record failed: %s\n"
 msgstr "No se pudo añadir el registro: %s\n"
 
 #: src/namestore/gnunet-namestore.c:341
-#: src/namestore/plugin_rest_namestore.c:570
 #, 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:348
-#: src/namestore/plugin_rest_namestore.c:579
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr "No se pudo borrar el registro: %s\n"
@@ -5289,221 +5172,215 @@ msgid ""
 "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:808
-#: src/namestore/plugin_rest_namestore.c:605
+#: src/namestore/gnunet-namestore.c:809
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:849
+#: src/namestore/gnunet-namestore.c:850
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:901
+#: src/namestore/gnunet-namestore.c:902
 #, c-format
 msgid "No options given\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/namestore/gnunet-namestore.c:920 src/namestore/gnunet-namestore.c:929
-#: src/namestore/gnunet-namestore.c:948 src/namestore/gnunet-namestore.c:971
-#: src/namestore/gnunet-namestore.c:1025
+#: src/namestore/gnunet-namestore.c:921 src/namestore/gnunet-namestore.c:930
+#: src/namestore/gnunet-namestore.c:949 src/namestore/gnunet-namestore.c:972
+#: src/namestore/gnunet-namestore.c:1026
 #, 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:921 src/namestore/gnunet-namestore.c:930
-#: src/namestore/gnunet-namestore.c:949 src/namestore/gnunet-namestore.c:973
+#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:974
 msgid "add"
 msgstr "añadir"
 
-#: src/namestore/gnunet-namestore.c:939
-#: src/namestore/plugin_rest_namestore.c:682
+#: src/namestore/gnunet-namestore.c:940
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:961
-#: src/namestore/plugin_rest_namestore.c:702
-#: src/namestore/plugin_rest_namestore.c:744
+#: src/namestore/gnunet-namestore.c:962
 #, 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:1006
+#: src/namestore/gnunet-namestore.c:1007
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1026
+#: src/namestore/gnunet-namestore.c:1027
 msgid "del"
 msgstr "borrar"
 
-#: src/namestore/gnunet-namestore.c:1069
+#: src/namestore/gnunet-namestore.c:1070
 #, 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:1098
+#: src/namestore/gnunet-namestore.c:1099
 #: src/peerinfo-tool/gnunet-peerinfo.c:773
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1133
+#: src/namestore/gnunet-namestore.c:1134
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1173
-#: src/namestore/plugin_rest_namestore.c:1063
+#: src/namestore/gnunet-namestore.c:1174
 #, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1237
-#: src/namestore/plugin_rest_namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1238
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/namestore/gnunet-namestore.c:1262
+#: src/namestore/gnunet-namestore.c:1263
 msgid "add record"
 msgstr "añadir registro"
 
-#: src/namestore/gnunet-namestore.c:1266
+#: src/namestore/gnunet-namestore.c:1267
 msgid "delete record"
 msgstr "borrar registro"
 
-#: src/namestore/gnunet-namestore.c:1270
+#: src/namestore/gnunet-namestore.c:1271
 msgid "display records"
 msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore.c:1275
+#: src/namestore/gnunet-namestore.c:1276
 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:1280
+#: src/namestore/gnunet-namestore.c:1281
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
-#: src/namestore/gnunet-namestore.c:1284
+#: src/namestore/gnunet-namestore.c:1285
 #, 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:1294
+#: src/namestore/gnunet-namestore.c:1295
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "establece las preferencias para el par dado"
 
-#: src/namestore/gnunet-namestore.c:1299
+#: src/namestore/gnunet-namestore.c:1300
 msgid "type of the record to add/delete/display"
 msgstr "tipo del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:1304
+#: src/namestore/gnunet-namestore.c:1305
 msgid "URI to import into our zone"
 msgstr "URI a importar a nuestra zona"
 
-#: src/namestore/gnunet-namestore.c:1309
+#: src/namestore/gnunet-namestore.c:1310
 msgid "value of the record to add/delete"
 msgstr "valor del registro a añadir/borrar"
 
-#: src/namestore/gnunet-namestore.c:1313
+#: src/namestore/gnunet-namestore.c:1314
 msgid "create or list public record"
 msgstr "crear o listar registros públicos"
 
-#: src/namestore/gnunet-namestore.c:1317
+#: src/namestore/gnunet-namestore.c:1318
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1322
+#: src/namestore/gnunet-namestore.c:1323
 #, 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:538
+#: src/namestore/gnunet-namestore-fcfsd.c:547
 #, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Forma de valor no soportada «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:565
+#: src/namestore/gnunet-namestore-fcfsd.c:574
 #, 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:585
+#: src/namestore/gnunet-namestore-fcfsd.c:595
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:616
+#: src/namestore/gnunet-namestore-fcfsd.c:627
 #, 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:696
+#: src/namestore/gnunet-namestore-fcfsd.c:687
 #, 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:754
+#: src/namestore/gnunet-namestore-fcfsd.c:775
 #, 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:772
+#: src/namestore/gnunet-namestore-fcfsd.c:794
 #, 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:808
+#: src/namestore/gnunet-namestore-fcfsd.c:830
 msgid "Domain name must not contain `.'\n"
 msgstr "El nombre de dominio no puede contener «.»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:817
+#: src/namestore/gnunet-namestore-fcfsd.c:839
 msgid "Domain name must not contain `+'\n"
 msgstr "El nombre de dominio no puede contener «+»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1045
+#: src/namestore/gnunet-namestore-fcfsd.c:1069
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1073
+#: src/namestore/gnunet-namestore-fcfsd.c:1097
 msgid "Failed to start HTTP server\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1121
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1147
+#: src/namestore/gnunet-namestore-fcfsd.c:1171
 msgid "name of the zone that is to be managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1166
+#: src/namestore/gnunet-namestore-fcfsd.c:1190
 #, 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:748
+#: src/namestore/gnunet-service-namestore.c:749
 #, 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-zoneimport.c:2033
+#: src/namestore/gnunet-zoneimport.c:2036
 msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:2038
+#: src/namestore/gnunet-zoneimport.c:2041
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
@@ -5512,9 +5389,9 @@ msgstr ""
 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:765
+#: src/namestore/plugin_namestore_heap.c:776
 #, fuzzy
-msgid "flat file database running\n"
+msgid "heap file database running\n"
 msgstr "Base de datos de plantilla ejecutándose\n"
 
 #: src/namestore/plugin_namestore_sqlite.c:216
@@ -5523,11 +5400,6 @@ msgstr "Base de datos de plantilla ejecutándose\n"
 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:1204
-#, fuzzy
-msgid "Namestore REST API initialized\n"
-msgstr "Conexión fallida\n"
-
 #: src/nat-auto/gnunet-nat-auto.c:191
 #, fuzzy
 msgid "Suggested configuration changes:\n"
@@ -5928,6 +5800,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:297
+#: src/rest-plugins/plugin_rest_peerinfo.c:499
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Se produjo un fallo al resolver la dirección para el par «%s»\n"
@@ -6223,6 +6096,66 @@ msgid "Daemon to run to perform IP protocol translation 
to GNUnet"
 msgstr ""
 "Demonio a ejecutar para realizar la traducción de protocolo IP a GNUnet"
 
+#: src/reclaim/gnunet-reclaim.c:465
+#, fuzzy, c-format
+msgid "Ego is required\n"
+msgstr "Las opción «%s» o «%s» es necesaria.\n"
+
+#: src/reclaim/gnunet-reclaim.c:473
+#, c-format
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:481
+#, fuzzy, c-format
+msgid "Requesting party key is required!\n"
+msgstr "el parámetro --section es necesario\n"
+
+#: src/reclaim/gnunet-reclaim.c:504
+msgid "Add attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:510
+msgid "Attribute value"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:515
+msgid "Ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:520
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:524
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:529
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:534
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:539
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:544
+msgid "Type of attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:549
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/reclaim/reclaim_api.c:434
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "El almacén de nombres no pudo añadir el registro\n"
+
 #: src/regex/gnunet-daemon-regexprofiler.c:265
 #, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
@@ -6328,6 +6261,42 @@ msgstr "escuchar en el puerto especificado 
(predeterminado: 7777)"
 msgid "GNUnet REST server"
 msgstr "Herramienta de acceso GNUnet GNS"
 
+#: src/rest-plugins/plugin_rest_copying.c:207
+#, fuzzy
+msgid "COPYING REST API initialized\n"
+msgstr "Conexión fallida\n"
+
+#: src/rest-plugins/plugin_rest_credential.c:1126
+#, fuzzy
+msgid "GNS REST API initialized\n"
+msgstr "Conexión fallida\n"
+
+#: src/rest-plugins/plugin_rest_gns.c:450
+#, fuzzy
+msgid "Gns REST API initialized\n"
+msgstr "Conexión fallida\n"
+
+#: src/rest-plugins/plugin_rest_identity.c:1295
+#, fuzzy
+msgid "Identity REST API initialized\n"
+msgstr "Conexión fallida\n"
+
+#: src/rest-plugins/plugin_rest_namestore.c:1077
+#, fuzzy
+msgid "Namestore REST API initialized\n"
+msgstr "Conexión fallida\n"
+
+#: src/rest-plugins/plugin_rest_openid_connect.c:2135
+#: src/rest-plugins/plugin_rest_reclaim.c:1079
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr "Conexión fallida\n"
+
+#: src/rest-plugins/plugin_rest_peerinfo.c:794
+#, fuzzy
+msgid "Peerinfo REST API initialized\n"
+msgstr "Conexión fallida\n"
+
 #: src/revocation/gnunet-revocation.c:127
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
@@ -6468,15 +6437,35 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr "No se pudo conectar con el almacén de datos."
 
-#: src/rps/gnunet-rps.c:201
+#: src/rps/gnunet-rps.c:258
 msgid "Seed a PeerID"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:205
+#: src/rps/gnunet-rps.c:262
 msgid "Get updates of view (0 for infinite updates)"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2705
+#: src/rps/gnunet-rps.c:266
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2770
+#, fuzzy
+msgid "duration of the profiling"
+msgstr ""
+"La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar '%s'!\n"
+
+#: src/rps/gnunet-rps-profiler.c:2776
+#, fuzzy
+msgid "timeout for the profiling"
+msgstr "Especificar el tipo del registro a buscar"
+
+#: src/rps/gnunet-rps-profiler.c:2782
+#, fuzzy
+msgid "number of PeerIDs to request"
+msgstr "número de pares para empezar"
+
+#: src/rps/gnunet-rps-profiler.c:2797
 #, fuzzy
 msgid "Measure quality and performance of the RPS service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
@@ -6564,7 +6553,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1987
+#: src/set/gnunet-service-set.c:2004
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
@@ -6764,93 +6753,93 @@ msgstr "Escritos %llu bytes de estadísticas a «%s»\n"
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Cargando %llu bytes de estadísticas de «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:271
-#: src/statistics/gnunet-statistics.c:365
+#: src/statistics/gnunet-statistics.c:407
+#: src/statistics/gnunet-statistics.c:448
 msgid "Failed to obtain statistics.\n"
 msgstr "Se produjo un fallo al obtener las estadísticas.\n"
 
-#: src/statistics/gnunet-statistics.c:274
-#: src/statistics/gnunet-statistics.c:368
+#: src/statistics/gnunet-statistics.c:410
+#: src/statistics/gnunet-statistics.c:451
 #, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 "Se produjo un fallo al obtener las estadísticas de la máquina «%s:%llu»\n"
 
-#: src/statistics/gnunet-statistics.c:502
+#: src/statistics/gnunet-statistics.c:526
 msgid "Missing argument: subsystem \n"
 msgstr "Falta el parámetro: subsistema\n"
 
-#: src/statistics/gnunet-statistics.c:510
+#: src/statistics/gnunet-statistics.c:534
 msgid "Missing argument: name\n"
 msgstr "Falta el argumento: nombre\n"
 
-#: src/statistics/gnunet-statistics.c:553
+#: src/statistics/gnunet-statistics.c:577
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr "No se proporcionó un subsistema o un nombre\n"
 
-#: src/statistics/gnunet-statistics.c:568
+#: src/statistics/gnunet-statistics.c:592
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Se produjo un fallo al inicializar la rutina de visualización\n"
 
-#: src/statistics/gnunet-statistics.c:703
+#: src/statistics/gnunet-statistics.c:727
 #, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:721
+#: src/statistics/gnunet-statistics.c:745
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Se necesita un puerto para conectar con la máquina «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:729
+#: src/statistics/gnunet-statistics.c:753
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr "Un puerto debe estar entre 1 y 65534 para conectar a la máquina «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:760
+#: src/statistics/gnunet-statistics.c:784
 #, c-format
 msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:793
+#: src/statistics/gnunet-statistics.c:817
 msgid "limit output to statistics for the given NAME"
 msgstr "limita la salida de estadísticas para el nombre (NAME) dado"
 
-#: src/statistics/gnunet-statistics.c:798
+#: src/statistics/gnunet-statistics.c:822
 msgid "make the value being set persistent"
 msgstr "hacer el valor persistente"
 
-#: src/statistics/gnunet-statistics.c:804
+#: src/statistics/gnunet-statistics.c:828
 msgid "limit output to the given SUBSYSTEM"
 msgstr "límite de salida para el subsistema (SUBSYSTEM) dado"
 
-#: src/statistics/gnunet-statistics.c:810
+#: src/statistics/gnunet-statistics.c:834
 msgid "use as csv separator"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:816
+#: src/statistics/gnunet-statistics.c:840
 msgid "path to the folder containing the testbed data"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:821
+#: src/statistics/gnunet-statistics.c:845
 msgid "just print the statistics value"
 msgstr "imprime el valor de las estadísticas"
 
-#: src/statistics/gnunet-statistics.c:826
+#: src/statistics/gnunet-statistics.c:850
 msgid "watch value continuously"
 msgstr "visualiza el valor continuamente"
 
-#: src/statistics/gnunet-statistics.c:832
+#: src/statistics/gnunet-statistics.c:856
 msgid "connect to remote host"
 msgstr "conectar a equipo remoto"
 
-#: src/statistics/gnunet-statistics.c:838
+#: src/statistics/gnunet-statistics.c:862
 msgid "port for remote host"
 msgstr "puerto del equipo remoto"
 
-#: src/statistics/gnunet-statistics.c:855
+#: src/statistics/gnunet-statistics.c:879
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
@@ -8566,7 +8555,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:1311 src/util/disk.c:1515
+#: src/transport/tcp_service_legacy.c:1311 src/util/disk.c:1521
 #: src/util/service.c:1376
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
@@ -8603,11 +8592,6 @@ msgstr "Se produjo un fallo al borrar el fichero de 
configuración %s\n"
 msgid "Could not access configuration file `%s'\n"
 msgstr "No se pudo acceder al fichero de configuración «%s»\n"
 
-#: src/tun/regex.c:132
-#, c-format
-msgid "Bad mask: %d\n"
-msgstr ""
-
 #: src/util/bio.c:179 src/util/bio.c:187
 #, c-format
 msgid "Error reading `%s': %s"
@@ -8637,58 +8621,67 @@ msgstr "Los metadatos serializados «%s» son mayores de 
lo permitido (%u>%u)"
 msgid "Metadata `%s' failed to deserialize"
 msgstr "Se produjo un fallo al deserializar los metadatos «%s»"
 
-#: src/util/client.c:912
+#: src/util/client.c:732
+msgid "not a valid filename"
+msgstr ""
+
+#: src/util/client.c:923
 #, 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:257 src/util/common_logging.c:1144
+#: src/util/common_logging.c:257 src/util/common_logging.c:1159
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1142
+#: src/util/common_logging.c:259 src/util/common_logging.c:1157
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1140
+#: src/util/common_logging.c:261 src/util/common_logging.c:1155
 msgid "MESSAGE"
 msgstr "MENSAJE"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1138
+#: src/util/common_logging.c:263 src/util/common_logging.c:1153
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1136
+#: src/util/common_logging.c:265 src/util/common_logging.c:1151
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1146
+#: src/util/common_logging.c:267 src/util/common_logging.c:1161
 msgid "NONE"
 msgstr "NINGUNO"
 
-#: src/util/common_logging.c:880
+#: src/util/common_logging.c:631 src/util/common_logging.c:661
+#, c-format
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+msgstr ""
+
+#: src/util/common_logging.c:895
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Mensaje `%.*s» repetido %u veces en el último %s\n"
 
-#: src/util/common_logging.c:1147
+#: src/util/common_logging.c:1162
 msgid "INVALID"
 msgstr "NO VÁLIDO"
 
-#: src/util/common_logging.c:1440
+#: src/util/common_logging.c:1455
 msgid "unknown address"
 msgstr "dirección desconocida"
 
-#: src/util/common_logging.c:1482
+#: src/util/common_logging.c:1497
 msgid "invalid address"
 msgstr "dirección no válida"
 
-#: src/util/common_logging.c:1500
+#: src/util/common_logging.c:1515
 #, 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:1521
+#: src/util/common_logging.c:1536
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8706,7 +8699,12 @@ msgstr "Error de sintaxis en la línea %u mientras se 
deserializaba\n"
 msgid "Error while reading file `%s'\n"
 msgstr "Error decodificando clave %u\n"
 
-#: src/util/configuration.c:1049
+#: src/util/configuration.c:970
+#, fuzzy
+msgid "Not a valid relative time specification"
+msgstr "Tiempo de expiración no válido para la operación «%s»\n"
+
+#: src/util/configuration.c:1059
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8715,17 +8713,17 @@ 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:1168
+#: src/util/configuration.c:1178
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1201
+#: src/util/configuration.c:1211
 #, 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:1269
+#: src/util/configuration.c:1279
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8741,22 +8739,22 @@ msgstr ""
 "El tamaño del fichero en disco es incorrecto para este «Bloom "
 "filter» (esperado %llu, tiene %llu)\n"
 
-#: src/util/crypto_ecc.c:831
+#: src/util/crypto_ecc.c:860
 #, 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:881
+#: src/util/crypto_ecc.c:915
 #, 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:955
+#: src/util/crypto_ecc.c:994
 #, 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:1012
+#: src/util/crypto_ecc.c:1055
 #, 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"
@@ -8796,26 +8794,60 @@ msgstr ""
 msgid "Could not load peer's private key\n"
 msgstr "No se pudo acceder a la clave de máquina.\n"
 
-#: src/util/crypto_random.c:282
+#: src/util/crypto_random.c:304
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt no tiene la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/crypto_rsa.c:836
+#: src/util/crypto_rsa.c:848
 #, 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:1167
+#: src/util/crypto_rsa.c:1187
 #, 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"
 
-#: src/util/disk.c:1245
+#: src/util/disk.c:1251
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
 
+#: src/util/dnsparser.c:250
+#, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr ""
+"Se produjo un fallo al convertir el nombre en formato DNS IDNA «%s» a UTF-8: "
+"%s\n"
+
+#: src/util/dnsparser.c:940
+#, 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/util/dnsstub.c:229
+#, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "No se pudo asociar con ningún puerto: %s\n"
+
+#: src/util/dnsstub.c:360
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr "Recibida respuesta DNS demasiado pequeña (%u bytes)"
+
+#: src/util/dnsstub.c:507
+#, 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/util/dnsstub.c:513
+#, c-format
+msgid "Sent DNS request to %s\n"
+msgstr "Petición DNS enviada a %s\n"
+
 #: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -8914,8 +8946,8 @@ msgstr ""
 msgid "use configuration file FILENAME"
 msgstr "crear ficheros de configuración únicos"
 
-#: src/util/getopt_helpers.c:559 src/util/getopt_helpers.c:756
-#: src/util/getopt_helpers.c:823
+#: src/util/getopt_helpers.c:559 src/util/getopt_helpers.c:763
+#: src/util/getopt_helpers.c:830
 #, 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"
@@ -8930,63 +8962,68 @@ msgstr "Debes introducir un tiempo relativo en la 
opción «%s».\n"
 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:830
+#: src/util/getopt_helpers.c:754
+#, c-format
+msgid "Your input for the '%s' option has to be a non negative number \n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:837
 #, 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:916
+#: src/util/getopt_helpers.c:923
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:148
+#: src/util/gnunet-config.c:157
 #, 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:161
+#: src/util/gnunet-config.c:170
 #, c-format
 msgid "--section argument is required\n"
 msgstr "el parámetro --section es necesario\n"
 
-#: src/util/gnunet-config.c:164
+#: src/util/gnunet-config.c:173
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:215
+#: src/util/gnunet-config.c:224
 #, 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:254
+#: src/util/gnunet-config.c:263
 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:259
+#: src/util/gnunet-config.c:268
 msgid "name of the section to access"
 msgstr "nombre de la sección a la que acceder"
 
-#: src/util/gnunet-config.c:264
+#: src/util/gnunet-config.c:273
 msgid "name of the option to access"
 msgstr "nombre de la opción a la que acceder"
 
-#: src/util/gnunet-config.c:269
+#: src/util/gnunet-config.c:278
 msgid "value to set"
 msgstr "valor a establecer"
 
-#: src/util/gnunet-config.c:273
+#: src/util/gnunet-config.c:282
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "Falta configuración sobre las opciones de claves.\n"
 
-#: src/util/gnunet-config.c:277
+#: src/util/gnunet-config.c:286
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:290
+#: src/util/gnunet-config.c:299
 msgid "Manipulate GNUnet configuration files"
 msgstr "Manipular ficheros de configuración de GNUnet"
 
@@ -9115,16 +9152,9 @@ msgstr ""
 msgid "Manipulate GNUnet proof of work files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
-#: src/util/gnunet-service-resolver.c:369
-#, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr "No se pudo resolver «%s» (%s): %s\n"
-
-#: src/util/gnunet-service-resolver.c:458
-#: src/util/gnunet-service-resolver.c:510
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
-msgstr "No se encontró la IP del host «%s»: %s\n"
+#: src/util/gnunet-service-resolver.c:1443
+msgid "No DNS server available. DNS resolution will not be possible.\n"
+msgstr ""
 
 #: src/util/gnunet-uri.c:83
 #, c-format
@@ -9228,13 +9258,18 @@ msgstr "Falló «%s» para la biblioteca «%s» con error: 
%s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
 
-#: src/util/resolver_api.c:201
+#: src/util/regex.c:132
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
+
+#: src/util/resolver_api.c:216
 #, c-format
 msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:222
+#: src/util/resolver_api.c:237
 #, fuzzy, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
@@ -9243,12 +9278,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:849
+#: src/util/resolver_api.c:873
 #, 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:862
+#: src/util/resolver_api.c:886
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "Expiración de plazo intentando resolver la dirección IP «%s».\n"
@@ -9256,13 +9291,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:1046
+#: src/util/resolver_api.c:1071
 #, fuzzy
 msgid "Resolver not configured correctly.\n"
 msgstr "¡El servicio predeterminado «%s» no está configurado correctamente!\n"
 
-#: src/util/resolver_api.c:1132 src/util/resolver_api.c:1155
-#: src/util/resolver_api.c:1169
+#: src/util/resolver_api.c:1158 src/util/resolver_api.c:1181
+#: src/util/resolver_api.c:1195
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr ""
@@ -9301,118 +9336,118 @@ msgstr ""
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:469
+#: src/util/strings.c:471
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr "Los conjuntos de caracteres pedidos fueron «%s»->«%s»\n"
 
-#: src/util/strings.c:596
+#: src/util/strings.c:598
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Se produjo un fallo al expandir «$HOME»: variable de entorno «HOME» no "
 "establecida"
 
-#: src/util/strings.c:700
+#: src/util/strings.c:702
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:704
+#: src/util/strings.c:706
 msgid "forever"
 msgstr "para siempre"
 
-#: src/util/strings.c:706
+#: src/util/strings.c:708
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:712
+#: src/util/strings.c:714
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:718
+#: src/util/strings.c:720
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:724
+#: src/util/strings.c:726
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:730
+#: src/util/strings.c:732
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:737
+#: src/util/strings.c:739
 msgid "day"
 msgstr "día"
 
-#: src/util/strings.c:739
+#: src/util/strings.c:741
 msgid "days"
 msgstr "días"
 
-#: src/util/strings.c:768
+#: src/util/strings.c:770
 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"
@@ -9598,22 +9633,33 @@ msgstr "Configurar túneles vía VPN."
 msgid "Failed to connect to the namestore!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/include/gnunet_common.h:764 src/include/gnunet_common.h:771
-#: src/include/gnunet_common.h:781 src/include/gnunet_common.h:789
+#: src/include/gnunet_common.h:770 src/include/gnunet_common.h:777
+#: src/include/gnunet_common.h:787
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d. Aborting.\n"
+msgstr "Aserción fallida en %s:%d.\n"
+
+#: src/include/gnunet_common.h:795
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Aserción fallida en %s:%d.\n"
 
-#: src/include/gnunet_common.h:801
+#: src/include/gnunet_common.h:807
 #, 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:828 src/include/gnunet_common.h:837
+#: src/include/gnunet_common.h:834 src/include/gnunet_common.h:843
 #, 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 "Could not resolve `%s' (%s): %s\n"
+#~ msgstr "No se pudo resolver «%s» (%s): %s\n"
+
+#~ msgid "Could not find IP of host `%s': %s\n"
+#~ msgstr "No se encontró la IP del host «%s»: %s\n"
+
 #~ msgid "PUT request sent with key"
 #~ msgstr "Petición «PUT» enviada con clave"
 
@@ -9641,10 +9687,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #~ 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"
 
@@ -11095,9 +11137,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #~ "El borrado requiere o tiempo absoluto, o ningún tiempo. Tomado tiempo "
 #~ "relativo «%s» en su defecto.\n"
 
-#~ msgid "No valid expiration time for operation `%s'\n"
-#~ msgstr "Tiempo de expiración no válido para la operación «%s»\n"
-
 # Miguel: "Failed to find" lo he traducido por "No se pudo encontrar"
 # puesto que es mas claro que "fallar en la búsqueda".
 #~ msgid "Failed to find record to remove\n"
@@ -14312,12 +14351,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el 
error: %s\n"
 #~ "\")."
 
 #, fuzzy
-#~ msgid "Configuration of the logging system"
-#~ msgstr ""
-#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar "
-#~ "'%s'!\n"
-
-#, fuzzy
 #~ msgid "Run gnunetd as this user."
 #~ msgstr "Ejecutar gnunet-update"
 
diff --git a/po/fr.po b/po/fr.po
index eb4d32303..41ac372ef 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-06-20 22:22+0200\n"
+"POT-Creation-Date: 2018-10-20 11:13+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"
@@ -220,7 +220,7 @@ msgstr ""
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:381 src/transport/plugin_transport_tcp.c:1118
+#: src/arm/gnunet-service-arm.c:386 src/transport/plugin_transport_tcp.c:1118
 #: src/transport/plugin_transport_xt.c:1118
 #: src/transport/tcp_service_legacy.c:555 src/util/service.c:610
 #, c-format
@@ -228,7 +228,7 @@ msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:405 src/arm/gnunet-service-arm.c:411
+#: src/arm/gnunet-service-arm.c:410 src/arm/gnunet-service-arm.c:416
 #: src/transport/plugin_transport_tcp.c:1137
 #: src/transport/plugin_transport_tcp.c:1143
 #: src/transport/plugin_transport_tcp.c:3823
@@ -242,7 +242,7 @@ msgstr ""
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:450 src/transport/plugin_transport_tcp.c:1174
+#: src/arm/gnunet-service-arm.c:455 src/transport/plugin_transport_tcp.c:1174
 #: src/transport/plugin_transport_xt.c:1174
 #: src/transport/tcp_service_legacy.c:611 src/util/client.c:504
 #: src/util/service.c:680
@@ -250,7 +250,7 @@ msgstr ""
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:455 src/transport/plugin_transport_tcp.c:1178
+#: src/arm/gnunet-service-arm.c:460 src/transport/plugin_transport_tcp.c:1178
 #: src/transport/plugin_transport_xt.c:1178
 #: src/transport/tcp_service_legacy.c:615 src/util/client.c:509
 #: src/util/service.c:685
@@ -258,7 +258,7 @@ msgstr ""
 msgid "Using `%s' instead\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:488 src/transport/plugin_transport_tcp.c:1209
+#: src/arm/gnunet-service-arm.c:493 src/transport/plugin_transport_tcp.c:1209
 #: src/transport/plugin_transport_xt.c:1209
 #: src/transport/tcp_service_legacy.c:646 src/util/service.c:721
 #, c-format
@@ -267,14 +267,14 @@ msgid ""
 "domain socket: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:510 src/transport/plugin_transport_tcp.c:1226
+#: src/arm/gnunet-service-arm.c:515 src/transport/plugin_transport_tcp.c:1226
 #: src/transport/plugin_transport_xt.c:1226
 #: src/transport/tcp_service_legacy.c:663 src/util/service.c:739
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:549
+#: src/arm/gnunet-service-arm.c:554
 #: src/transport/plugin_transport_http_server.c:2682
 #: src/transport/plugin_transport_tcp.c:1257
 #: src/transport/plugin_transport_xt.c:1257
@@ -283,7 +283,7 @@ msgstr ""
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/arm/gnunet-service-arm.c:568
+#: src/arm/gnunet-service-arm.c:573
 #: src/transport/plugin_transport_http_server.c:2700
 #: src/transport/plugin_transport_tcp.c:1276
 #: src/transport/plugin_transport_xt.c:1276
@@ -292,64 +292,64 @@ msgstr "Résolution de « %s » échouée : %s\n"
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:979
+#: src/arm/gnunet-service-arm.c:984
 #, c-format
 msgid "Failed to start service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:990
+#: src/arm/gnunet-service-arm.c:995
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1102
+#: src/arm/gnunet-service-arm.c:1107
 #, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1137
+#: src/arm/gnunet-service-arm.c:1142
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1180
+#: src/arm/gnunet-service-arm.c:1185
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1359
+#: src/arm/gnunet-service-arm.c:1364
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1664
+#: src/arm/gnunet-service-arm.c:1669
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1825
+#: src/arm/gnunet-service-arm.c:1830
 msgid "exit"
 msgstr "exit"
 
-#: src/arm/gnunet-service-arm.c:1830
+#: src/arm/gnunet-service-arm.c:1835
 msgid "signal"
 msgstr "signal"
 
-#: src/arm/gnunet-service-arm.c:1835
+#: src/arm/gnunet-service-arm.c:1840
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/arm/gnunet-service-arm.c:1841
+#: src/arm/gnunet-service-arm.c:1846
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1867
+#: src/arm/gnunet-service-arm.c:1872
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1883
+#: src/arm/gnunet-service-arm.c:1888
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -427,24 +427,24 @@ msgstr ""
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1867
+#: src/ats/plugin_ats_mlp.c:1868
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1911
+#: src/ats/plugin_ats_mlp.c:1912
 #, c-format
 msgid "Updating address property for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2473
+#: src/ats/plugin_ats_mlp.c:2474
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2513 src/ats/plugin_ats_mlp.c:2530
-#: src/ats/plugin_ats_mlp.c:2562 src/ats/plugin_ats_mlp.c:2580
-#: src/ats/plugin_ats_mlp.c:2599 src/ats/plugin_ats_proportional.c:1139
+#: src/ats/plugin_ats_mlp.c:2514 src/ats/plugin_ats_mlp.c:2531
+#: src/ats/plugin_ats_mlp.c:2563 src/ats/plugin_ats_mlp.c:2581
+#: src/ats/plugin_ats_mlp.c:2600 src/ats/plugin_ats_proportional.c:1139
 #: src/ats/plugin_ats_ril.c:2610 src/ats/plugin_ats_ril.c:2627
 #: src/ats/plugin_ats_ril.c:2644 src/ats/plugin_ats_ril.c:2661
 #: src/ats/plugin_ats_ril.c:2678 src/ats/plugin_ats_ril.c:2695
@@ -453,27 +453,27 @@ msgstr ""
 msgid "Invalid %s configuration %f \n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/ats/plugin_ats_mlp.c:2668
+#: src/ats/plugin_ats_mlp.c:2669
 #, 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:2677
+#: src/ats/plugin_ats_mlp.c:2678
 #, 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:2687
+#: src/ats/plugin_ats_mlp.c:2688
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2696
+#: src/ats/plugin_ats_mlp.c:2697
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
@@ -666,58 +666,58 @@ msgstr ""
 msgid "help text"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:662
+#: src/cadet/gnunet-cadet.c:705
 #, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:701
+#: src/cadet/gnunet-cadet.c:744
 #, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:774
+#: src/cadet/gnunet-cadet.c:817
 msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:865
+#: src/cadet/gnunet-cadet.c:908
 #, c-format
 msgid "Invalid target `%s'\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:902
+#: src/cadet/gnunet-cadet.c:945
 msgid "No action requested\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:927
+#: src/cadet/gnunet-cadet.c:970
 msgid "Provide information about a particular connection"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:932
+#: src/cadet/gnunet-cadet.c:975
 msgid "Activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:937
+#: src/cadet/gnunet-cadet.c:980
 msgid "Dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:943
+#: src/cadet/gnunet-cadet.c:986
 msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:950
+#: src/cadet/gnunet-cadet.c:993
 msgid "Provide information about a patricular peer"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:956
+#: src/cadet/gnunet-cadet.c:999
 msgid "Provide information about all peers"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:962
+#: src/cadet/gnunet-cadet.c:1005
 msgid "Provide information about a particular tunnel"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:968
+#: src/cadet/gnunet-cadet.c:1011
 msgid "Provide information about all tunnels"
 msgstr ""
 
@@ -763,256 +763,256 @@ msgstr ""
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:268
+#: src/conversation/gnunet-conversation.c:275
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:293
+#: src/conversation/gnunet-conversation.c:300
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:328
+#: src/conversation/gnunet-conversation.c:335
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:333
+#: src/conversation/gnunet-conversation.c:340
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:351
+#: src/conversation/gnunet-conversation.c:358
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:366
+#: src/conversation/gnunet-conversation.c:373
 msgid "Failed to setup phone (internal error)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:378
+#: src/conversation/gnunet-conversation.c:385
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:402
+#: src/conversation/gnunet-conversation.c:409
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:409
+#: src/conversation/gnunet-conversation.c:416
 #, c-format
 msgid "Connection established to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:416
+#: src/conversation/gnunet-conversation.c:423
 #, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Résolution de « %s » échouée\n"
 
-#: src/conversation/gnunet-conversation.c:424
+#: src/conversation/gnunet-conversation.c:431
 #, fuzzy, c-format
 msgid "Call to `%s' terminated\n"
 msgstr "Appel terminé\n"
 
-#: src/conversation/gnunet-conversation.c:433
+#: src/conversation/gnunet-conversation.c:440
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:439
+#: src/conversation/gnunet-conversation.c:446
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:444
+#: src/conversation/gnunet-conversation.c:451
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:515
+#: src/conversation/gnunet-conversation.c:522
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Commande « %s » inconnue\n"
 
-#: src/conversation/gnunet-conversation.c:531
-#: src/conversation/gnunet-conversation.c:545
+#: src/conversation/gnunet-conversation.c:538
+#: src/conversation/gnunet-conversation.c:552
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:538
-#: src/conversation/gnunet-conversation.c:594
+#: src/conversation/gnunet-conversation.c:545
+#: src/conversation/gnunet-conversation.c:601
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:553
-#: src/conversation/gnunet-conversation.c:607
+#: src/conversation/gnunet-conversation.c:560
+#: src/conversation/gnunet-conversation.c:614
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:563
+#: src/conversation/gnunet-conversation.c:570
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:618
+#: src/conversation/gnunet-conversation.c:625
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:635
+#: src/conversation/gnunet-conversation.c:642
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:666
+#: src/conversation/gnunet-conversation.c:673
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:690
+#: src/conversation/gnunet-conversation.c:697
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:695
+#: src/conversation/gnunet-conversation.c:702
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:701
-#: src/conversation/gnunet-conversation.c:725
+#: src/conversation/gnunet-conversation.c:708
+#: src/conversation/gnunet-conversation.c:732
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:706
+#: src/conversation/gnunet-conversation.c:713
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:715
+#: src/conversation/gnunet-conversation.c:722
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:720
+#: src/conversation/gnunet-conversation.c:727
 #, c-format
 msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:739
+#: src/conversation/gnunet-conversation.c:746
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:745
+#: src/conversation/gnunet-conversation.c:752
 #, c-format
 msgid "#%u: `%s'\n"
 msgstr "#%u : « %s »\n"
 
-#: src/conversation/gnunet-conversation.c:774
-#: src/conversation/gnunet-conversation.c:789
+#: src/conversation/gnunet-conversation.c:781
+#: src/conversation/gnunet-conversation.c:796
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:822
-#: src/conversation/gnunet-conversation.c:838
+#: src/conversation/gnunet-conversation.c:829
+#: src/conversation/gnunet-conversation.c:845
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:845
+#: src/conversation/gnunet-conversation.c:852
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:854
+#: src/conversation/gnunet-conversation.c:861
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:871
+#: src/conversation/gnunet-conversation.c:878
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:906
+#: src/conversation/gnunet-conversation.c:913
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:914
+#: src/conversation/gnunet-conversation.c:921
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:931
+#: src/conversation/gnunet-conversation.c:938
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:957
+#: src/conversation/gnunet-conversation.c:964
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:959
+#: src/conversation/gnunet-conversation.c:966
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:963
+#: src/conversation/gnunet-conversation.c:970
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:965
+#: src/conversation/gnunet-conversation.c:972
 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:967
+#: src/conversation/gnunet-conversation.c:974
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:969
+#: src/conversation/gnunet-conversation.c:976
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:971
+#: src/conversation/gnunet-conversation.c:978
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:973
+#: src/conversation/gnunet-conversation.c:980
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1189
+#: src/conversation/gnunet-conversation.c:1196
 #, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1202
+#: src/conversation/gnunet-conversation.c:1209
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1240
+#: src/conversation/gnunet-conversation.c:1247
 msgid "You must specify the NAME of an ego to use\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1264
+#: src/conversation/gnunet-conversation.c:1271
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1293
+#: src/conversation/gnunet-conversation.c:1300
 msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1298
+#: src/conversation/gnunet-conversation.c:1305
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1327
+#: src/conversation/gnunet-conversation.c:1334
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1163,7 +1163,7 @@ msgstr "ogg_stream_init() échoué.\n"
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1285
+#: src/conversation/gnunet-service-conversation.c:1303
 #, c-format
 msgid "Could not open line, port %s already in use!\n"
 msgstr ""
@@ -1444,8 +1444,7 @@ msgstr ""
 msgid "Unable to parse CRED record string `%s'\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:262 src/namestore/gnunet-namestore.c:886
-#: src/namestore/plugin_rest_namestore.c:1020
+#: src/credential/gnunet-credential.c:262 src/namestore/gnunet-namestore.c:887
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
@@ -1543,16 +1542,15 @@ msgstr ""
 msgid "GNUnet credential resolver tool"
 msgstr ""
 
-#: src/credential/gnunet-service-credential.c:1136 src/gns/gnunet-gns.c:182
+#: src/credential/gnunet-service-credential.c:1136 src/gns/gnunet-gns.c:183
 #: src/gns/gnunet-gns-helper-service-w32.c:725
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr ""
 
 #: src/credential/gnunet-service-credential.c:1142
-#: src/namestore/gnunet-namestore.c:912
-#: src/namestore/gnunet-namestore-fcfsd.c:1112
-#: src/namestore/plugin_rest_namestore.c:1033
+#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore-fcfsd.c:1136
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr ""
@@ -1562,10 +1560,6 @@ msgstr ""
 msgid "Unable to parse ATTR record string `%s'\n"
 msgstr "Résolution de « %s » échouée\n"
 
-#: src/credential/plugin_rest_credential.c:1126 src/gns/plugin_rest_gns.c:667
-msgid "GNS REST API initialized\n"
-msgstr ""
-
 #: src/datacache/datacache.c:117 src/datacache/datacache.c:309
 #: src/datastore/gnunet-service-datastore.c:755
 msgid "# bytes stored"
@@ -1609,29 +1603,29 @@ msgstr ""
 #: src/datacache/plugin_datacache_sqlite.c:125
 #: src/datastore/plugin_datastore_mysql.c:890
 #: src/datastore/plugin_datastore_sqlite.c:56
-#: src/datastore/plugin_datastore_sqlite.c:64
-#: src/identity-provider/plugin_identity_provider_sqlite.c:50 src/my/my.c:79
-#: src/my/my.c:91 src/mysql/mysql.c:40 src/mysql/mysql.c:47
+#: src/datastore/plugin_datastore_sqlite.c:64 src/my/my.c:79 src/my/my.c:91
+#: src/mysql/mysql.c:40 src/mysql/mysql.c:47
 #: src/namecache/plugin_namecache_sqlite.c:50
 #: src/namestore/plugin_namestore_sqlite.c:51
 #: src/peerstore/plugin_peerstore_sqlite.c:50
 #: src/psycstore/plugin_psycstore_mysql.c:60
+#: src/reclaim/plugin_reclaim_sqlite.c:50
 #: src/testbed/generate-underlay-topology.c:45
 #: src/testbed/gnunet-daemon-latency-logger.c:50
 #: src/testbed/gnunet-daemon-testbed-underlay.c:54
-#: src/testbed/testbed_api_hosts.c:67 src/util/crypto_ecc.c:50
+#: src/testbed/testbed_api_hosts.c:67 src/util/crypto_ecc.c:51
 #: src/util/crypto_ecc_setup.c:39 src/util/crypto_mpi.c:37
-#: src/include/gnunet_common.h:810 src/include/gnunet_common.h:819
+#: src/include/gnunet_common.h:816 src/include/gnunet_common.h:825
 #: src/scalarproduct/scalarproduct.h:33
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:860
+#: src/datacache/plugin_datacache_sqlite.c:861
 #: src/datastore/plugin_datastore_sqlite.c:506
-#: src/identity-provider/plugin_identity_provider_sqlite.c:334
 #: src/namecache/plugin_namecache_sqlite.c:327
 #: src/namestore/plugin_namestore_sqlite.c:262
+#: src/reclaim/plugin_reclaim_sqlite.c:334
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1954,11 +1948,11 @@ msgid "`%s' failed at %s:%u with error: %s"
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:269
-#: src/identity-provider/plugin_identity_provider_sqlite.c:210
 #: src/namecache/plugin_namecache_sqlite.c:207
 #: src/namestore/plugin_namestore_sqlite.c:203
 #: src/peerstore/plugin_peerstore_sqlite.c:533
 #: src/psycstore/plugin_psycstore_sqlite.c:323
+#: src/reclaim/plugin_reclaim_sqlite.c:210
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
@@ -1967,21 +1961,21 @@ msgstr ""
 msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1324
+#: src/datastore/plugin_datastore_sqlite.c:1325
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1358
+#: src/datastore/plugin_datastore_sqlite.c:1359
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1402
-#: src/identity-provider/plugin_identity_provider_sqlite.c:709
+#: src/datastore/plugin_datastore_sqlite.c:1403
 #: src/namecache/plugin_namecache_sqlite.c:638
-#: src/namestore/plugin_namestore_sqlite.c:752
+#: src/namestore/plugin_namestore_sqlite.c:753
+#: src/reclaim/plugin_reclaim_sqlite.c:709
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -2060,7 +2054,7 @@ msgstr ""
 msgid "Exiting as the number of peers is %u\n"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:947 src/rps/gnunet-rps-profiler.c:2691
+#: src/dht/gnunet_dht_profiler.c:947 src/rps/gnunet-rps-profiler.c:2764
 #, fuzzy
 msgid "number of peers to start"
 msgstr "nombre de valeurs"
@@ -2361,36 +2355,6 @@ msgstr ""
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:252
-#, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr ""
-
-#: src/dns/dnsparser.c:821
-#, c-format
-msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
-msgstr ""
-
-#: src/dns/dnsstub.c:231
-#, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr ""
-
-#: src/dns/dnsstub.c:362
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
-#: src/dns/dnsstub.c:509
-#, 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:515
-#, c-format
-msgid "Sent DNS request to %s\n"
-msgstr ""
-
 #: src/dns/gnunet-dns-monitor.c:351 src/dns/gnunet-dns-monitor.c:356
 msgid "only monitor DNS queries"
 msgstr ""
@@ -3885,11 +3849,11 @@ msgstr ""
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:520
+#: src/gns/gnunet-bcd.c:521
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:533
+#: src/gns/gnunet-bcd.c:534
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
@@ -3897,34 +3861,34 @@ msgstr ""
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:402
+#: src/gns/gnunet-dns2gns.c:403
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:418
+#: src/gns/gnunet-dns2gns.c:419
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:426
+#: src/gns/gnunet-dns2gns.c:427
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:585
+#: src/gns/gnunet-dns2gns.c:586
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:685
+#: src/gns/gnunet-dns2gns.c:686
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:690
+#: src/gns/gnunet-dns2gns.c:691
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:707
+#: src/gns/gnunet-dns2gns.c:708
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -3940,7 +3904,7 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:197 src/gns/plugin_rest_gns.c:344
+#: src/gns/gnunet-gns.c:197
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
@@ -3965,7 +3929,7 @@ msgstr ""
 msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:699 src/gns/plugin_rest_gns.c:420
+#: src/gns/gnunet-gns-helper-service-w32.c:699
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
@@ -4035,63 +3999,63 @@ msgstr ""
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2061
+#: src/gns/gnunet-gns-proxy.c:2062
 #, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2582
+#: src/gns/gnunet-gns-proxy.c:2583
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2614
+#: src/gns/gnunet-gns-proxy.c:2615
 #, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2813
+#: src/gns/gnunet-gns-proxy.c:2814
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2838 src/rest/gnunet-rest-server.c:656
+#: src/gns/gnunet-gns-proxy.c:2839 src/rest/gnunet-rest-server.c:656
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3168
+#: src/gns/gnunet-gns-proxy.c:3169
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3197
+#: src/gns/gnunet-gns-proxy.c:3198
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3279
+#: src/gns/gnunet-gns-proxy.c:3280
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3569
+#: src/gns/gnunet-gns-proxy.c:3570
 #, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3697
+#: src/gns/gnunet-gns-proxy.c:3698
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3702
+#: src/gns/gnunet-gns-proxy.c:3703
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3706
+#: src/gns/gnunet-gns-proxy.c:3707
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3732
+#: src/gns/gnunet-gns-proxy.c:3733
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4195,10 +4159,6 @@ msgstr ""
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:382
-msgid "Ego for not found, cannot perform lookup.\n"
-msgstr ""
-
 #: src/gnsrecord/plugin_gnsrecord_dns.c:357
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4658,119 +4618,53 @@ msgstr ""
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:388
+#: src/identity/gnunet-service-identity.c:389
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:410
+#: src/identity/gnunet-service-identity.c:414
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:499
-#: src/identity/gnunet-service-identity.c:771
-#: src/identity/gnunet-service-identity.c:893
+#: src/identity/gnunet-service-identity.c:505
+#: src/identity/gnunet-service-identity.c:788
+#: src/identity/gnunet-service-identity.c:916
 #, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:506
+#: src/identity/gnunet-service-identity.c:513
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:599
+#: src/identity/gnunet-service-identity.c:608
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:748
+#: src/identity/gnunet-service-identity.c:763
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:787
-#: src/identity/gnunet-service-identity.c:910
+#: src/identity/gnunet-service-identity.c:806
+#: src/identity/gnunet-service-identity.c:934
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:944
+#: src/identity/gnunet-service-identity.c:969
 #, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1002
+#: src/identity/gnunet-service-identity.c:1027
 #, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1012
+#: src/identity/gnunet-service-identity.c:1037
 #, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
-#: src/identity/plugin_rest_identity.c:966
-msgid "Identity REST API initialized\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:422
-msgid "Ego is required\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:430
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:438
-msgid "Requesting party key is required!\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:461
-msgid "Add attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:467
-msgid "Attribute value"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:472
-msgid "Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:477
-msgid "Audience (relying party)"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:481
-msgid "List attributes for Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:486
-msgid "Issue a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:491
-msgid "Consume a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:496
-msgid "Revoke a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:501
-msgid "Type of attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:506
-msgid "Expiration interval of the attribute"
-msgstr ""
-
-#: src/identity-provider/identity_provider_api.c:434
-#, fuzzy
-msgid "failed to store record\n"
-msgstr "Échec du démarrage de %s\n"
-
-#: src/identity-provider/plugin_rest_identity_provider.c:1228
-#: src/identity-provider/plugin_rest_openid_connect.c:2145
-msgid "Identity Provider REST API initialized\n"
-msgstr ""
-
 #: src/json/json.c:121
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -4820,7 +4714,7 @@ msgstr "fornat invalide : « %s »\n"
 msgid "You must specify a name\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1289
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1290
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4828,7 +4722,7 @@ msgstr ""
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1341
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1342
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
@@ -4842,8 +4736,8 @@ msgstr ""
 
 #: src/namecache/plugin_namecache_flat.c:119
 #: src/namecache/plugin_namecache_flat.c:253
-#: src/namestore/plugin_namestore_flat.c:148
-#: src/namestore/plugin_namestore_flat.c:383
+#: src/namestore/plugin_namestore_heap.c:146
+#: src/namestore/plugin_namestore_heap.c:393
 #: src/peerstore/plugin_peerstore_flat.c:377
 #: src/peerstore/plugin_peerstore_flat.c:536
 #, c-format
@@ -4851,14 +4745,14 @@ msgid "Unable to initialize file: %s.\n"
 msgstr ""
 
 #: src/namecache/plugin_namecache_flat.c:130
-#: src/namestore/plugin_namestore_flat.c:159
+#: src/namestore/plugin_namestore_heap.c:157
 #: src/peerstore/plugin_peerstore_flat.c:392
 #, c-format
 msgid "Unable to get filesize: %s.\n"
 msgstr ""
 
 #: src/namecache/plugin_namecache_flat.c:149
-#: src/namestore/plugin_namestore_flat.c:172
+#: src/namestore/plugin_namestore_heap.c:170
 #: src/peerstore/plugin_peerstore_flat.c:404
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
@@ -4874,13 +4768,11 @@ msgid "Adding record failed: %s\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:341
-#: src/namestore/plugin_rest_namestore.c:570
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:348
-#: src/namestore/plugin_rest_namestore.c:579
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
@@ -4901,212 +4793,206 @@ msgid ""
 "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:808
-#: src/namestore/plugin_rest_namestore.c:605
+#: src/namestore/gnunet-namestore.c:809
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:849
+#: src/namestore/gnunet-namestore.c:850
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:901
+#: src/namestore/gnunet-namestore.c:902
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:920 src/namestore/gnunet-namestore.c:929
-#: src/namestore/gnunet-namestore.c:948 src/namestore/gnunet-namestore.c:971
-#: src/namestore/gnunet-namestore.c:1025
+#: src/namestore/gnunet-namestore.c:921 src/namestore/gnunet-namestore.c:930
+#: src/namestore/gnunet-namestore.c:949 src/namestore/gnunet-namestore.c:972
+#: src/namestore/gnunet-namestore.c:1026
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:921 src/namestore/gnunet-namestore.c:930
-#: src/namestore/gnunet-namestore.c:949 src/namestore/gnunet-namestore.c:973
+#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:974
 msgid "add"
 msgstr "ajouter"
 
-#: src/namestore/gnunet-namestore.c:939
-#: src/namestore/plugin_rest_namestore.c:682
+#: src/namestore/gnunet-namestore.c:940
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:961
-#: src/namestore/plugin_rest_namestore.c:702
-#: src/namestore/plugin_rest_namestore.c:744
+#: src/namestore/gnunet-namestore.c:962
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1006
+#: src/namestore/gnunet-namestore.c:1007
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1026
+#: src/namestore/gnunet-namestore.c:1027
 msgid "del"
 msgstr "supprimer"
 
-#: src/namestore/gnunet-namestore.c:1069
+#: src/namestore/gnunet-namestore.c:1070
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1098
+#: src/namestore/gnunet-namestore.c:1099
 #: src/peerinfo-tool/gnunet-peerinfo.c:773
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI invalide « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:1133
+#: src/namestore/gnunet-namestore.c:1134
 #, c-format
 msgid "Invalid nick `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1173
-#: src/namestore/plugin_rest_namestore.c:1063
+#: src/namestore/gnunet-namestore.c:1174
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1237
-#: src/namestore/plugin_rest_namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1238
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1262
+#: src/namestore/gnunet-namestore.c:1263
 msgid "add record"
 msgstr "ajouter un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1266
+#: src/namestore/gnunet-namestore.c:1267
 msgid "delete record"
 msgstr "suprimer un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1270
+#: src/namestore/gnunet-namestore.c:1271
 msgid "display records"
 msgstr "afficher les enregistrements"
 
-#: src/namestore/gnunet-namestore.c:1275
+#: src/namestore/gnunet-namestore.c:1276
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1280
+#: src/namestore/gnunet-namestore.c:1281
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1284
+#: src/namestore/gnunet-namestore.c:1285
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1294
+#: src/namestore/gnunet-namestore.c:1295
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1299
+#: src/namestore/gnunet-namestore.c:1300
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1304
+#: src/namestore/gnunet-namestore.c:1305
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1309
+#: src/namestore/gnunet-namestore.c:1310
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1313
+#: src/namestore/gnunet-namestore.c:1314
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1317
+#: src/namestore/gnunet-namestore.c:1318
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1322
+#: src/namestore/gnunet-namestore.c:1323
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:538
+#: src/namestore/gnunet-namestore-fcfsd.c:547
 #, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:565
+#: src/namestore/gnunet-namestore-fcfsd.c:574
 #, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:585
+#: src/namestore/gnunet-namestore-fcfsd.c:595
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:616
+#: src/namestore/gnunet-namestore-fcfsd.c:627
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:696
+#: src/namestore/gnunet-namestore-fcfsd.c:687
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:754
+#: src/namestore/gnunet-namestore-fcfsd.c:775
 #, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:772
+#: src/namestore/gnunet-namestore-fcfsd.c:794
 #, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:808
+#: src/namestore/gnunet-namestore-fcfsd.c:830
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:817
+#: src/namestore/gnunet-namestore-fcfsd.c:839
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1045
+#: src/namestore/gnunet-namestore-fcfsd.c:1069
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1073
+#: src/namestore/gnunet-namestore-fcfsd.c:1097
 msgid "Failed to start HTTP server\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1121
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
 msgid "Failed to connect to identity\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1147
+#: src/namestore/gnunet-namestore-fcfsd.c:1171
 msgid "name of the zone that is to be managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1166
+#: src/namestore/gnunet-namestore-fcfsd.c:1190
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:748
+#: src/namestore/gnunet-service-namestore.c:749
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:2033
+#: src/namestore/gnunet-zoneimport.c:2036
 msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:2038
+#: src/namestore/gnunet-zoneimport.c:2041
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
@@ -5114,8 +5000,8 @@ msgstr ""
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:765
-msgid "flat file database running\n"
+#: src/namestore/plugin_namestore_heap.c:776
+msgid "heap file database running\n"
 msgstr ""
 
 #: src/namestore/plugin_namestore_sqlite.c:216
@@ -5124,10 +5010,6 @@ msgstr ""
 msgid "Failed to setup database at `%s'\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/namestore/plugin_rest_namestore.c:1204
-msgid "Namestore REST API initialized\n"
-msgstr ""
-
 #: src/nat-auto/gnunet-nat-auto.c:191
 msgid "Suggested configuration changes:\n"
 msgstr ""
@@ -5497,6 +5379,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:297
+#: src/rest-plugins/plugin_rest_peerinfo.c:499
 #, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr ""
@@ -5776,6 +5659,66 @@ msgstr ""
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
+#: src/reclaim/gnunet-reclaim.c:465
+#, c-format
+msgid "Ego is required\n"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:473
+#, c-format
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:481
+#, c-format
+msgid "Requesting party key is required!\n"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:504
+msgid "Add attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:510
+msgid "Attribute value"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:515
+msgid "Ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:520
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:524
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:529
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:534
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:539
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:544
+msgid "Type of attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:549
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/reclaim/reclaim_api.c:434
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Échec du démarrage de %s\n"
+
 #: src/regex/gnunet-daemon-regexprofiler.c:265
 #, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
@@ -5868,6 +5811,35 @@ msgstr ""
 msgid "GNUnet REST server"
 msgstr ""
 
+#: src/rest-plugins/plugin_rest_copying.c:207
+msgid "COPYING REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_credential.c:1126
+msgid "GNS REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_gns.c:450
+msgid "Gns REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_identity.c:1295
+msgid "Identity REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_namestore.c:1077
+msgid "Namestore REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_openid_connect.c:2135
+#: src/rest-plugins/plugin_rest_reclaim.c:1079
+msgid "Identity Provider REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_peerinfo.c:794
+msgid "Peerinfo REST API initialized\n"
+msgstr ""
+
 #: src/revocation/gnunet-revocation.c:127
 #, c-format
 msgid "Key `%s' is valid\n"
@@ -5997,15 +5969,32 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:201
+#: src/rps/gnunet-rps.c:258
 msgid "Seed a PeerID"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:205
+#: src/rps/gnunet-rps.c:262
 msgid "Get updates of view (0 for infinite updates)"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2705
+#: src/rps/gnunet-rps.c:266
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2770
+msgid "duration of the profiling"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2776
+msgid "timeout for the profiling"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2782
+#, fuzzy
+msgid "number of PeerIDs to request"
+msgstr "nombre de valeurs"
+
+#: src/rps/gnunet-rps-profiler.c:2797
 msgid "Measure quality and performance of the RPS service."
 msgstr ""
 
@@ -6090,7 +6079,7 @@ msgstr "threshold"
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1987
+#: src/set/gnunet-service-set.c:2004
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "Impossible d’ouvrir « %s ».\n"
@@ -6282,92 +6271,92 @@ msgstr ""
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:271
-#: src/statistics/gnunet-statistics.c:365
+#: src/statistics/gnunet-statistics.c:407
+#: src/statistics/gnunet-statistics.c:448
 msgid "Failed to obtain statistics.\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:274
-#: src/statistics/gnunet-statistics.c:368
+#: src/statistics/gnunet-statistics.c:410
+#: src/statistics/gnunet-statistics.c:451
 #, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:502
+#: src/statistics/gnunet-statistics.c:526
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:510
+#: src/statistics/gnunet-statistics.c:534
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:553
+#: src/statistics/gnunet-statistics.c:577
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:568
+#: src/statistics/gnunet-statistics.c:592
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:703
+#: src/statistics/gnunet-statistics.c:727
 #, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Argument invalide « %s »\n"
 
-#: src/statistics/gnunet-statistics.c:721
+#: src/statistics/gnunet-statistics.c:745
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:729
+#: src/statistics/gnunet-statistics.c:753
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:760
+#: src/statistics/gnunet-statistics.c:784
 #, c-format
 msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:793
+#: src/statistics/gnunet-statistics.c:817
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:798
+#: src/statistics/gnunet-statistics.c:822
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:804
+#: src/statistics/gnunet-statistics.c:828
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:810
+#: src/statistics/gnunet-statistics.c:834
 msgid "use as csv separator"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:816
+#: src/statistics/gnunet-statistics.c:840
 msgid "path to the folder containing the testbed data"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:821
+#: src/statistics/gnunet-statistics.c:845
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:826
+#: src/statistics/gnunet-statistics.c:850
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:832
+#: src/statistics/gnunet-statistics.c:856
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:838
+#: src/statistics/gnunet-statistics.c:862
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:855
+#: src/statistics/gnunet-statistics.c:879
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
@@ -7927,7 +7916,7 @@ msgstr ""
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1311 src/util/disk.c:1515
+#: src/transport/tcp_service_legacy.c:1311 src/util/disk.c:1521
 #: src/util/service.c:1376
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
@@ -7963,11 +7952,6 @@ msgstr ""
 msgid "Could not access configuration file `%s'\n"
 msgstr ""
 
-#: src/tun/regex.c:132
-#, c-format
-msgid "Bad mask: %d\n"
-msgstr "Masque érroné : %d\n"
-
 #: src/util/bio.c:179 src/util/bio.c:187
 #, c-format
 msgid "Error reading `%s': %s"
@@ -7997,58 +7981,67 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:912
+#: src/util/client.c:732
+msgid "not a valid filename"
+msgstr ""
+
+#: src/util/client.c:923
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:257 src/util/common_logging.c:1144
+#: src/util/common_logging.c:257 src/util/common_logging.c:1159
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1142
+#: src/util/common_logging.c:259 src/util/common_logging.c:1157
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1140
+#: src/util/common_logging.c:261 src/util/common_logging.c:1155
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1138
+#: src/util/common_logging.c:263 src/util/common_logging.c:1153
 msgid "WARNING"
 msgstr "AVERTISSEMENT"
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1136
+#: src/util/common_logging.c:265 src/util/common_logging.c:1151
 msgid "ERROR"
 msgstr "ERREUR"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1146
+#: src/util/common_logging.c:267 src/util/common_logging.c:1161
 msgid "NONE"
 msgstr "AUCUN"
 
-#: src/util/common_logging.c:880
+#: src/util/common_logging.c:631 src/util/common_logging.c:661
+#, c-format
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+msgstr ""
+
+#: src/util/common_logging.c:895
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1147
+#: src/util/common_logging.c:1162
 msgid "INVALID"
 msgstr "INVALIDE"
 
-#: src/util/common_logging.c:1440
+#: src/util/common_logging.c:1455
 msgid "unknown address"
 msgstr "adresse inconnue"
 
-#: src/util/common_logging.c:1482
+#: src/util/common_logging.c:1497
 msgid "invalid address"
 msgstr "adresse invalide"
 
-#: src/util/common_logging.c:1500
+#: src/util/common_logging.c:1515
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1521
+#: src/util/common_logging.c:1536
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8064,24 +8057,28 @@ msgstr ""
 msgid "Error while reading file `%s'\n"
 msgstr "Erreur de lecture : « %s » : %s"
 
-#: src/util/configuration.c:1049
+#: src/util/configuration.c:970
+msgid "Not a valid relative time specification"
+msgstr ""
+
+#: src/util/configuration.c:1059
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1168
+#: src/util/configuration.c:1178
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1201
+#: src/util/configuration.c:1211
 #, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1269
+#: src/util/configuration.c:1279
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8095,22 +8092,22 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:831
+#: src/util/crypto_ecc.c:860
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:881
+#: src/util/crypto_ecc.c:915
 #, c-format
 msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:955
+#: src/util/crypto_ecc.c:994
 #, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1012
+#: src/util/crypto_ecc.c:1055
 #, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
@@ -8143,26 +8140,56 @@ msgstr ""
 msgid "Could not load peer's private key\n"
 msgstr ""
 
-#: src/util/crypto_random.c:282
+#: src/util/crypto_random.c:304
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:836
+#: src/util/crypto_rsa.c:848
 #, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1167
+#: src/util/crypto_rsa.c:1187
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:1245
+#: src/util/disk.c:1251
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
+#: src/util/dnsparser.c:250
+#, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr ""
+
+#: src/util/dnsparser.c:940
+#, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr ""
+
+#: src/util/dnsstub.c:229
+#, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr ""
+
+#: src/util/dnsstub.c:360
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
+
+#: src/util/dnsstub.c:507
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s: %s\n"
+msgstr "Résolution de « %s » échouée : %s\n"
+
+#: src/util/dnsstub.c:513
+#, c-format
+msgid "Sent DNS request to %s\n"
+msgstr ""
+
 #: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -8259,8 +8286,8 @@ msgstr ""
 msgid "use configuration file FILENAME"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/util/getopt_helpers.c:559 src/util/getopt_helpers.c:756
-#: src/util/getopt_helpers.c:823
+#: src/util/getopt_helpers.c:559 src/util/getopt_helpers.c:763
+#: src/util/getopt_helpers.c:830
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
@@ -8275,61 +8302,66 @@ msgstr ""
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:830
+#: src/util/getopt_helpers.c:754
+#, c-format
+msgid "Your input for the '%s' option has to be a non negative number \n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:837
 #, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:916
+#: src/util/getopt_helpers.c:923
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:148
+#: src/util/gnunet-config.c:157
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/util/gnunet-config.c:161
+#: src/util/gnunet-config.c:170
 #, c-format
 msgid "--section argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:164
+#: src/util/gnunet-config.c:173
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:215
+#: src/util/gnunet-config.c:224
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:254
+#: src/util/gnunet-config.c:263
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:259
+#: src/util/gnunet-config.c:268
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:264
+#: src/util/gnunet-config.c:273
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:269
+#: src/util/gnunet-config.c:278
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:273
+#: src/util/gnunet-config.c:282
 msgid "print available configuration sections"
 msgstr ""
 
-#: src/util/gnunet-config.c:277
+#: src/util/gnunet-config.c:286
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:290
+#: src/util/gnunet-config.c:299
 msgid "Manipulate GNUnet configuration files"
 msgstr ""
 
@@ -8455,15 +8487,8 @@ msgstr ""
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:369
-#, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr ""
-
-#: src/util/gnunet-service-resolver.c:458
-#: src/util/gnunet-service-resolver.c:510
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
+#: src/util/gnunet-service-resolver.c:1443
+msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
 #: src/util/gnunet-uri.c:83
@@ -8562,35 +8587,40 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:201
+#: src/util/regex.c:132
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr "Masque érroné : %d\n"
+
+#: src/util/resolver_api.c:216
 #, c-format
 msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:222
+#: src/util/resolver_api.c:237
 #, 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:849
+#: src/util/resolver_api.c:873
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:862
+#: src/util/resolver_api.c:886
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1046
+#: src/util/resolver_api.c:1071
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1132 src/util/resolver_api.c:1155
-#: src/util/resolver_api.c:1169
+#: src/util/resolver_api.c:1158 src/util/resolver_api.c:1181
+#: src/util/resolver_api.c:1195
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
@@ -8626,112 +8656,112 @@ msgstr ""
 msgid "b"
 msgstr "o"
 
-#: src/util/strings.c:469
+#: src/util/strings.c:471
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:596
+#: src/util/strings.c:598
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:700
+#: src/util/strings.c:702
 msgid "µs"
 msgstr "µs"
 
-#: src/util/strings.c:704
+#: src/util/strings.c:706
 msgid "forever"
 msgstr "perpetuel"
 
-#: src/util/strings.c:706
+#: src/util/strings.c:708
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:712
+#: src/util/strings.c:714
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:718
+#: src/util/strings.c:720
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:724
+#: src/util/strings.c:726
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:730
+#: src/util/strings.c:732
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:737
+#: src/util/strings.c:739
 msgid "day"
 msgstr "jour"
 
-#: src/util/strings.c:739
+#: src/util/strings.c:741
 msgid "days"
 msgstr "jours"
 
-#: src/util/strings.c:768
+#: src/util/strings.c:770
 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 ""
@@ -8905,18 +8935,23 @@ msgstr "Configurer des tunnels via VPN."
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:764 src/include/gnunet_common.h:771
-#: src/include/gnunet_common.h:781 src/include/gnunet_common.h:789
+#: src/include/gnunet_common.h:770 src/include/gnunet_common.h:777
+#: src/include/gnunet_common.h:787
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d. Aborting.\n"
+msgstr "opus_encode_float() échoué : %s. Annulation\n"
+
+#: src/include/gnunet_common.h:795
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:801
+#: src/include/gnunet_common.h:807
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:828 src/include/gnunet_common.h:837
+#: src/include/gnunet_common.h:834 src/include/gnunet_common.h:843
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 1aa36b663..5069e0baa 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,2707 +7,2809 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-04-08 11:11+0200\n"
+"POT-Creation-Date: 2018-10-20 11:13+0200\n"
 "PO-Revision-Date: 2018-08-29 13:48+0200\n"
 "Last-Translator: Sebastiano Pistore <address@hidden>\n"
 "Language-Team: Italian <address@hidden>\n"
 "Language: it\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 "\n"
 "X-Generator: Poedit 2.0.7\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/arm_api.c:337
-msgid "Client was disconnected from arm service, trying to reconnect.\n"
-msgstr ""
-
-#: src/arm/arm_monitor_api.c:321
-msgid "Monitoring client was disconnected from arm service, trying to 
reconnect.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:164
+#: src/arm/gnunet-arm.c:154
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:170
+#: src/arm/gnunet-arm.c:160
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:1013
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1137
 msgid "Message was sent successfully"
 msgstr "Messaggio inviato con successo"
 
-#: src/arm/gnunet-arm.c:218
-msgid "Misconfiguration (can not connect to the ARM service)"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:1017
+#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1019
-msgid "ARM API is busy"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:224
-msgid "Request does not fit into a message"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1023
-msgid "Request timed out"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:228 src/testbed/gnunet-service-testbed_peers.c:1025
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
 msgid "Unknown request status"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1041
-#, c-format
-msgid "%s is stopped"
-msgstr ""
+#: src/arm/gnunet-arm.c:240
+#, fuzzy
+msgid "is stopped"
+msgstr "# elementi memorizzati"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1043
-#, c-format
-msgid "%s is starting"
+#: src/arm/gnunet-arm.c:242
+msgid "is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1045
-#, c-format
-msgid "%s is stopping"
+#: src/arm/gnunet-arm.c:244
+msgid "is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1047
-#, c-format
-msgid "%s is starting already"
+#: src/arm/gnunet-arm.c:246
+msgid "is starting already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1049
-#, c-format
-msgid "%s is stopping already"
+#: src/arm/gnunet-arm.c:248
+msgid "is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1051
-#, c-format
-msgid "%s is started already"
+#: src/arm/gnunet-arm.c:250
+msgid "is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1053
-#, c-format
-msgid "%s is stopped already"
+#: src/arm/gnunet-arm.c:252
+msgid "is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1055
-#, c-format
-msgid "%s service is not known to ARM"
+#: src/arm/gnunet-arm.c:254
+msgid "service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:260 src/testbed/gnunet-service-testbed_peers.c:1057
-#, c-format
-msgid "%s service failed to start"
+#: src/arm/gnunet-arm.c:256
+msgid "service failed to start"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:262
-#, c-format
-msgid "%s service cannot be started because ARM is shutting down"
+#: src/arm/gnunet-arm.c:258
+msgid "service cannot be manipulated because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:264 src/testbed/gnunet-service-testbed_peers.c:1061
-#, c-format
-msgid "%.s Unknown result code."
+#: src/arm/gnunet-arm.c:260
+msgid "Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:297
+#: src/arm/gnunet-arm.c:292
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:326 src/arm/gnunet-arm.c:335
+#: src/arm/gnunet-arm.c:320 src/arm/gnunet-arm.c:329
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:363
 #, c-format
 msgid "Failed to send a stop request to the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:379
+#: src/arm/gnunet-arm.c:374
 #, c-format
 msgid "Failed to stop the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:421
+#: src/arm/gnunet-arm.c:413
 #, c-format
-msgid "Failed to send a request to start the `%s' service: %%s\n"
+msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:431
+#: src/arm/gnunet-arm.c:423
 #, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:468
+#: src/arm/gnunet-arm.c:460
 #, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:479
+#: src/arm/gnunet-arm.c:471
 #, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:517
+#: src/arm/gnunet-arm.c:511
 #, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:525
+#: src/arm/gnunet-arm.c:520
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:530
+#: src/arm/gnunet-arm.c:526
 msgid "Running services:\n"
 msgstr "Servizi in esecuzione:\n"
 
-#: src/arm/gnunet-arm.c:612
+#: src/arm/gnunet-arm.c:614
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:643
+#: src/arm/gnunet-arm.c:646
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "%s arrestato.\n"
 
-#: src/arm/gnunet-arm.c:646
+#: src/arm/gnunet-arm.c:649
 #, c-format
 msgid "Starting %s...\n"
 msgstr "Avvio di %s in corso...\n"
 
-#: src/arm/gnunet-arm.c:649
+#: src/arm/gnunet-arm.c:652
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "Arresto di %s in corso...\n"
 
-#: src/arm/gnunet-arm.c:660
+#: src/arm/gnunet-arm.c:666
 #, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:724
+#: src/arm/gnunet-arm.c:767
 msgid "stop all GNUnet services"
 msgstr "arresta tutti i servizi GNUnet"
 
-#: src/arm/gnunet-arm.c:726
+#: src/arm/gnunet-arm.c:773
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:728
+#: src/arm/gnunet-arm.c:779
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:730
+#: src/arm/gnunet-arm.c:784
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:733
+#: src/arm/gnunet-arm.c:789
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:736
+#: src/arm/gnunet-arm.c:793
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:739
+#: src/arm/gnunet-arm.c:798
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:741
+#: src/arm/gnunet-arm.c:803
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:744
-msgid "timeout in MSECS milliseconds for completing current operation"
+#: src/arm/gnunet-arm.c:809
+msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:746
+#: src/arm/gnunet-arm.c:814
 msgid "list currently running services"
 msgstr "elenca i servizi in esecuzione"
 
-#: src/arm/gnunet-arm.c:748
+#: src/arm/gnunet-arm.c:819
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:750
+#: src/arm/gnunet-arm.c:824
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:761
+#: src/arm/gnunet-arm.c:837
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:266
-msgid "Could not send status result to client\n"
+#: src/arm/gnunet-service-arm.c:386 src/transport/plugin_transport_tcp.c:1118
+#: src/transport/plugin_transport_xt.c:1118
+#: src/transport/tcp_service_legacy.c:555 src/util/service.c:610
+#, c-format
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:410 src/arm/gnunet-service-arm.c:416
+#: src/transport/plugin_transport_tcp.c:1137
+#: src/transport/plugin_transport_tcp.c:1143
+#: src/transport/plugin_transport_tcp.c:3823
+#: src/transport/plugin_transport_xt.c:1137
+#: src/transport/plugin_transport_xt.c:1143
+#: src/transport/plugin_transport_xt.c:3831
+#: src/transport/tcp_service_legacy.c:574
+#: src/transport/tcp_service_legacy.c:580 src/util/service.c:635
+#: src/util/service.c:641
+#, c-format
+msgid "Require valid port number for service `%s' in configuration!\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:455 src/transport/plugin_transport_tcp.c:1174
+#: src/transport/plugin_transport_xt.c:1174
+#: src/transport/tcp_service_legacy.c:611 src/util/client.c:504
+#: src/util/service.c:680
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:460 src/transport/plugin_transport_tcp.c:1178
+#: src/transport/plugin_transport_xt.c:1178
+#: src/transport/tcp_service_legacy.c:615 src/util/client.c:509
+#: src/util/service.c:685
+#, c-format
+msgid "Using `%s' instead\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:493 src/transport/plugin_transport_tcp.c:1209
+#: src/transport/plugin_transport_xt.c:1209
+#: src/transport/tcp_service_legacy.c:646 src/util/service.c:721
+#, c-format
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:515 src/transport/plugin_transport_tcp.c:1226
+#: src/transport/plugin_transport_xt.c:1226
+#: src/transport/tcp_service_legacy.c:663 src/util/service.c:739
+#, c-format
+msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:554
+#: src/transport/plugin_transport_http_server.c:2682
+#: src/transport/plugin_transport_tcp.c:1257
+#: src/transport/plugin_transport_xt.c:1257
+#: src/transport/tcp_service_legacy.c:694 src/util/service.c:780
+#, c-format
+msgid "Failed to resolve `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:302
-msgid "Could not send list result to client\n"
+#: src/arm/gnunet-service-arm.c:573
+#: src/transport/plugin_transport_http_server.c:2700
+#: src/transport/plugin_transport_tcp.c:1276
+#: src/transport/plugin_transport_xt.c:1276
+#: src/transport/tcp_service_legacy.c:713 src/util/service.c:800
+#, c-format
+msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:529
+#: src/arm/gnunet-service-arm.c:984
 #, c-format
 msgid "Failed to start service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:540
+#: src/arm/gnunet-service-arm.c:995
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr "Avvio del servizio '%s' in corso\n"
 
-#: src/arm/gnunet-service-arm.c:639
+#: src/arm/gnunet-service-arm.c:1107
 #, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:661
+#: src/arm/gnunet-service-arm.c:1142
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:695
+#: src/arm/gnunet-service-arm.c:1185
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:831
+#: src/arm/gnunet-service-arm.c:1364
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1100
+#: src/arm/gnunet-service-arm.c:1669
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1193
+#: src/arm/gnunet-service-arm.c:1830
 msgid "exit"
 msgstr "uscita"
 
-#: src/arm/gnunet-service-arm.c:1198
+#: src/arm/gnunet-service-arm.c:1835
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1203
+#: src/arm/gnunet-service-arm.c:1840
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: src/arm/gnunet-service-arm.c:1209
+#: src/arm/gnunet-service-arm.c:1846
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1231
+#: src/arm/gnunet-service-arm.c:1872
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1246
+#: src/arm/gnunet-service-arm.c:1888
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1500
-#, c-format
-msgid "Starting default services `%s'\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:1511
-#, c-format
-msgid "Default service `%s' not configured correctly!\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:1524
-msgid "No default services configured, GNUnet will not really start right 
now.\n"
-msgstr ""
-
-#: src/arm/mockup-service.c:41
+#: src/arm/mockup-service.c:40
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:468
+#: src/ats/gnunet-ats-solver-eval.c:2779 src/ats/gnunet-ats-solver-eval.c:2820
 #, c-format
-msgid "Received %s message\n"
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:511
+#: src/ats/gnunet-ats-solver-eval.c:2797
 #, c-format
-msgid "Received last message for %s \n"
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2199 src/ats/gnunet-ats-solver-eval.c:2233
-#: src/ats/gnunet-service-ats_addresses.c:1980
-#: src/ats/gnunet-service-ats_addresses.c:2024
+#: src/ats/gnunet-ats-solver-eval.c:2838
 #, c-format
-msgid "Could not load quota for network `%s':  `%s', assigning default 
bandwidth %llu\n"
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2205
-#: src/ats/gnunet-service-ats_addresses.c:1987
-#, c-format
-msgid "Outbound quota configure for network `%s' is %llu\n"
+#: src/ats/gnunet-ats-solver-eval.c:3292 src/ats-tests/gnunet-solver-eval.c:937
+msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2212
-#: src/ats/gnunet-service-ats_addresses.c:1995
-#, c-format
-msgid "No outbound quota configured for network `%s', assigning default 
bandwidth %llu\n"
+#: src/ats/gnunet-ats-solver-eval.c:3297 src/ats-tests/gnunet-solver-eval.c:943
+#: src/ats-tests/gnunet-solver-eval.c:948
+msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2239
-#: src/ats/gnunet-service-ats_addresses.c:2031
-#, c-format
-msgid "Inbound quota configured for network `%s' is %llu\n"
+#: src/ats/gnunet-ats-solver-eval.c:3304
+msgid "print logging"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2246
-#: src/ats/gnunet-service-ats_addresses.c:2039
-#, c-format
-msgid "No outbound quota configure for network `%s', assigning default 
bandwidth %llu\n"
+#: src/ats/gnunet-ats-solver-eval.c:3309
+msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2671
-#: src/ats-tests/gnunet-solver-eval.c:919
-msgid "solver to use"
+#: src/ats/gnunet-ats-solver-eval.c:3314
+msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2674 src/ats/gnunet-ats-solver-eval.c:2677
-#: src/ats-tests/gnunet-solver-eval.c:922
-#: src/ats-tests/gnunet-solver-eval.c:925
-msgid "experiment to use"
+#: src/ats/gnunet-service-ats_plugins.c:302
+#, c-format
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2680
-msgid "print logging"
+#: src/ats/gnunet-service-ats_plugins.c:312
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2217
+#: src/ats/gnunet-service-ats_plugins.c:357
 #, c-format
-msgid "Initializing solver `%s '`%s'\n"
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2220
+#: src/ats/gnunet-service-ats_plugins.c:449
 #, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:2243
-msgid "Failed to initialize solver!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_mlp.c:892
+#: src/ats/plugin_ats_mlp.c:1272
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1329
+#: src/ats/plugin_ats_mlp.c:1868
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1376
+#: src/ats/plugin_ats_mlp.c:1912
 #, c-format
-msgid "Updating address property `%s' for peer `%s' %p not added before\n"
+msgid "Updating address property for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2122
-#, c-format
-msgid "Adjusting inconsistent outbound quota configuration for network `%s', 
is %llu must be at least %llu\n"
+#: src/ats/plugin_ats_mlp.c:2474
+msgid ""
+"MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2131
+#: src/ats/plugin_ats_mlp.c:2514 src/ats/plugin_ats_mlp.c:2531
+#: src/ats/plugin_ats_mlp.c:2563 src/ats/plugin_ats_mlp.c:2581
+#: src/ats/plugin_ats_mlp.c:2600 src/ats/plugin_ats_proportional.c:1139
+#: src/ats/plugin_ats_ril.c:2610 src/ats/plugin_ats_ril.c:2627
+#: src/ats/plugin_ats_ril.c:2644 src/ats/plugin_ats_ril.c:2661
+#: src/ats/plugin_ats_ril.c:2678 src/ats/plugin_ats_ril.c:2695
+#: src/ats/plugin_ats_ril.c:2712 src/ats/plugin_ats_ril.c:2729
 #, c-format
-msgid "Adjusting inconsistent inbound quota configuration for network `%s', is 
%llu must be at least %llu\n"
+msgid "Invalid %s configuration %f \n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2142
+#: src/ats/plugin_ats_mlp.c:2669
 #, c-format
-msgid "Adjusting outbound quota configuration for network `%s'from %llu to 
%.0f\n"
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2150
+#: src/ats/plugin_ats_mlp.c:2678
 #, c-format
-msgid "Adjusting inbound quota configuration for network `%s' from %llu to 
%.0f\n"
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2161
+#: src/ats/plugin_ats_mlp.c:2688
 #, c-format
-msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1511
+#: src/ats/plugin_ats_mlp.c:2697
 #, c-format
-msgid "Invalid network type `%u' `%s': Disconnect!\n"
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:72
-msgid "Benchmarking done\n"
-msgstr "Benchmark completato\n"
-
-#: src/ats-tests/ats-testing.c:105
+#: src/ats/plugin_ats_proportional.c:1162
 #, c-format
-msgid "Failed to connect peer 0 and %u\n"
+msgid "Invalid %s configuration %f\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:413
+#: src/ats-tests/ats-testing.c:420
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:419
+#: src/ats-tests/ats-testing.c:427
 #, c-format
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:450
-msgid "Connecting peers on CORE level\n"
+#: src/ats-tests/ats-testing-log.c:835
+msgid "Stop logging\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:461
+#: src/ats-tests/ats-testing-log.c:890
 #, c-format
-msgid "Connecting master [%u] with slave [%u]\n"
+msgid "Start logging `%s'\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing.c:470
+#: src/ats-tests/gnunet-ats-sim.c:88
 #, c-format
-msgid "Could not connect master [%u] and slave [%u]\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:671
-msgid "Initialization failed, shutdown\n"
-msgstr ""
-
-#: src/ats-tests/ats-testing-log.c:842
-msgid "Stop logging\n"
+msgid ""
+"Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
+"= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:893
+#: src/ats-tool/gnunet-ats.c:305
 #, c-format
-msgid "Start logging `%s'\n"
+msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tests/gnunet-ats-sim.c:86
+#: src/ats-tool/gnunet-ats.c:309
 #, c-format
-msgid "Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u 
sec. = %u KiB/s\n"
+msgid "ATS returned stat_results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:169
+#: src/ats-tool/gnunet-ats.c:393
 #, c-format
-msgid "%u address resolutions had a timeout\n"
+msgid ""
+"Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
+"s, %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:171
-#, c-format
-msgid "ATS returned results for %u addresses\n"
+#: src/ats-tool/gnunet-ats.c:400
+msgid "active "
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:232
-#, c-format
-msgid "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u 
Bytes/s, %s\n"
+#: src/ats-tool/gnunet-ats.c:400
+msgid "inactive "
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:413
+#: src/ats-tool/gnunet-ats.c:510
 #, c-format
-msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
+msgid "Removed address of peer `%s' with plugin `%s'\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:433 src/core/gnunet-core.c:163
-#: src/namestore/gnunet-namestore.c:550 src/transport/gnunet-transport.c:1246
+#: src/ats-tool/gnunet-ats.c:703
 #, c-format
-msgid "Service `%s' is not running\n"
+msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:445 src/transport/gnunet-transport.c:1255
+#: src/ats-tool/gnunet-ats.c:746 src/ats-tool/gnunet-ats.c:759
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:454
+#: src/ats-tool/gnunet-ats.c:771
 #, c-format
-msgid "Please select one operation : %s or %s or %s or %s or %s\n"
+msgid "Please select one operation: %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:470 src/ats-tool/gnunet-ats.c:489
-#: src/ats-tool/gnunet-ats.c:506 src/ats-tool/gnunet-ats.c:543
-#, c-format
+#: src/ats-tool/gnunet-ats.c:793 src/ats-tool/gnunet-ats.c:818
+#: src/ats-tool/gnunet-ats.c:849 src/ats-tool/gnunet-ats.c:894
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:478 src/ats-tool/gnunet-ats.c:495
-#, c-format
+#: src/ats-tool/gnunet-ats.c:804 src/ats-tool/gnunet-ats.c:830
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:515
-#, c-format
+#: src/ats-tool/gnunet-ats.c:860
 msgid "No preference type given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:520
-#, c-format
+#: src/ats-tool/gnunet-ats.c:867
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:536
+#: src/ats-tool/gnunet-ats.c:885
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:594
+#: src/ats-tool/gnunet-ats.c:948
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:596
+#: src/ats-tool/gnunet-ats.c:952
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:599
+#: src/ats-tool/gnunet-ats.c:958
+msgid "connect to PEER"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:962
 msgid "do not resolve IP addresses to hostnames"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:601
+#: src/ats-tool/gnunet-ats.c:967
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:603
+#: src/ats-tool/gnunet-ats.c:972
 msgid "set preference for the given peer"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:605
+#: src/ats-tool/gnunet-ats.c:977
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:607
+#: src/ats-tool/gnunet-ats.c:982
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:610
+#: src/ats-tool/gnunet-ats.c:988
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:612
+#: src/ats-tool/gnunet-ats.c:994
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:615
+#: src/ats-tool/gnunet-ats.c:999
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:622
+#: src/ats-tool/gnunet-ats.c:1009
 msgid "Print information about ATS state"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:437
-#: src/secretsharing/gnunet-secretsharing-profiler.c:535
+#: src/auction/gnunet-auction-create.c:161
+msgid "description of the item to be sold"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:167
+msgid "mapping of possible prices"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:173
+msgid "max duration per round"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:179
+msgid "duration until auction starts"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:184
+msgid ""
+"number of items to sell\n"
+"0 for first price auction\n"
+">0 for vickrey/M+1st price auction"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:191
+msgid "public auction outcome"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:196
+msgid "keep running in foreground until auction completes"
+msgstr ""
+
+#: src/auction/gnunet-auction-create.c:207
+msgid "create a new auction and start listening for bidders"
+msgstr ""
+
+#: src/auction/gnunet-auction-info.c:74 src/auction/gnunet-auction-join.c:74
+#: src/conversation/gnunet-conversation-test.c:252
+#: src/revocation/gnunet-revocation.c:560 src/template/gnunet-template.c:74
+msgid "help text"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:705
+#, c-format
+msgid "Invalid peer ID `%s'\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:744
+#, c-format
+msgid "Invalid tunnel owner `%s'\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:817
+msgid "Extra arguments are not applicable in combination with this option.\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:908
+#, c-format
+msgid "Invalid target `%s'\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:945
+msgid "No action requested\n"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:970
+msgid "Provide information about a particular connection"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:975
+msgid "Activate echo mode"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:980
+msgid "Dump debug information to STDERR"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:986
+msgid "Listen for connections using a shared secret among sender and recipient"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:993
+msgid "Provide information about a patricular peer"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:999
+msgid "Provide information about all peers"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:1005
+msgid "Provide information about a particular tunnel"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:1011
+msgid "Provide information about all tunnels"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:521
+#: src/secretsharing/gnunet-secretsharing-profiler.c:608
 msgid "number of peers in consensus"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:440
-msgid "how many peers receive one value?"
+#: src/consensus/gnunet-consensus-profiler.c:527
+msgid ""
+"how many peers (random selection without replacement) receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:443
-#: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
-#: src/set/gnunet-set-profiler.c:292
+#: src/consensus/gnunet-consensus-profiler.c:533
+#: src/set/gnunet-set-profiler.c:431 src/set/gnunet-set-profiler.c:437
+#: src/set/gnunet-set-profiler.c:460
 msgid "number of values"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:446
+#: src/consensus/gnunet-consensus-profiler.c:539
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:449
+#: src/consensus/gnunet-consensus-profiler.c:546
 msgid "delay until consensus starts"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-profiler.c:452
-#: src/secretsharing/gnunet-secretsharing-profiler.c:550
+#: src/consensus/gnunet-consensus-profiler.c:552
+#: src/set/gnunet-set-profiler.c:478
+msgid "write statistics to file"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:557
+msgid "distribute elements to a static subset of good peers"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-profiler.c:562
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:557
-#: src/conversation/conversation_api_call.c:470
+#: src/conversation/conversation_api.c:513
+#: src/conversation/conversation_api_call.c:492
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:264
+#: src/conversation/gnunet-conversation.c:275
 #, c-format
-msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
+msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:286
+#: src/conversation/gnunet-conversation.c:300
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:319
+#: src/conversation/gnunet-conversation.c:335
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:324
+#: src/conversation/gnunet-conversation.c:340
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:342
+#: src/conversation/gnunet-conversation.c:358
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:356
+#: src/conversation/gnunet-conversation.c:373
 msgid "Failed to setup phone (internal error)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:368
+#: src/conversation/gnunet-conversation.c:385
 #, c-format
-msgid "Phone active on line %u.  Type `/help' for a list of available 
commands\n"
+msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:390
+#: src/conversation/gnunet-conversation.c:409
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:397
+#: src/conversation/gnunet-conversation.c:416
 #, c-format
 msgid "Connection established to `%s'\n"
 msgstr "Connessione stabilita con `%s'\n"
 
-#: src/conversation/gnunet-conversation.c:404
+#: src/conversation/gnunet-conversation.c:423
 #, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:411
-msgid "Call terminated\n"
+#: src/conversation/gnunet-conversation.c:431
+#, c-format
+msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:417
+#: src/conversation/gnunet-conversation.c:440
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:423
+#: src/conversation/gnunet-conversation.c:446
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:428
+#: src/conversation/gnunet-conversation.c:451
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:495
+#: src/conversation/gnunet-conversation.c:522
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Comando `%s' sconosciuto.\n"
 
-#: src/conversation/gnunet-conversation.c:511
-#: src/conversation/gnunet-conversation.c:525
+#: src/conversation/gnunet-conversation.c:538
+#: src/conversation/gnunet-conversation.c:552
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:518
-#: src/conversation/gnunet-conversation.c:575
+#: src/conversation/gnunet-conversation.c:545
+#: src/conversation/gnunet-conversation.c:601
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:533
-#: src/conversation/gnunet-conversation.c:588
+#: src/conversation/gnunet-conversation.c:560
+#: src/conversation/gnunet-conversation.c:614
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:544
+#: src/conversation/gnunet-conversation.c:570
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:599
+#: src/conversation/gnunet-conversation.c:625
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:642
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:647
+#: src/conversation/gnunet-conversation.c:673
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:670
+#: src/conversation/gnunet-conversation.c:697
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:675
+#: src/conversation/gnunet-conversation.c:702
 #, c-format
-msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
+msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:681
-#: src/conversation/gnunet-conversation.c:705
+#: src/conversation/gnunet-conversation.c:708
+#: src/conversation/gnunet-conversation.c:732
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:686
-msgid "We had an internal error setting up our phone line. You can still make 
calls.\n"
+#: src/conversation/gnunet-conversation.c:713
+msgid ""
+"We had an internal error setting up our phone line. You can still make "
+"calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:695
+#: src/conversation/gnunet-conversation.c:722
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:700
+#: src/conversation/gnunet-conversation.c:727
 #, c-format
-msgid "We are calling `%s', his phone should be ringing.\n"
+msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:719
+#: src/conversation/gnunet-conversation.c:746
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:725
+#: src/conversation/gnunet-conversation.c:752
 #, c-format
 msgid "#%u: `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:753
-#: src/conversation/gnunet-conversation.c:768
+#: src/conversation/gnunet-conversation.c:781
+#: src/conversation/gnunet-conversation.c:796
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:801
-#: src/conversation/gnunet-conversation.c:817
+#: src/conversation/gnunet-conversation.c:829
+#: src/conversation/gnunet-conversation.c:845
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:852
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:833
+#: src/conversation/gnunet-conversation.c:861
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:850
+#: src/conversation/gnunet-conversation.c:878
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:885
+#: src/conversation/gnunet-conversation.c:913
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:893
+#: src/conversation/gnunet-conversation.c:921
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:910
+#: src/conversation/gnunet-conversation.c:938
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:937
+#: src/conversation/gnunet-conversation.c:964
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:939
+#: src/conversation/gnunet-conversation.c:966
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:941
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:943
+#: src/conversation/gnunet-conversation.c:970
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:945
-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."
+#: src/conversation/gnunet-conversation.c:972
+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:947
+#: src/conversation/gnunet-conversation.c:974
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:949
+#: src/conversation/gnunet-conversation.c:976
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:951
+#: src/conversation/gnunet-conversation.c:978
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:953
+#: src/conversation/gnunet-conversation.c:980
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1151
+#: src/conversation/gnunet-conversation.c:1196
 #, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1164
+#: src/conversation/gnunet-conversation.c:1209
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1199
+#: src/conversation/gnunet-conversation.c:1247
 msgid "You must specify the NAME of an ego to use\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1223
+#: src/conversation/gnunet-conversation.c:1271
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1249
-msgid "sets the NAME of the ego to use for the phone (and name resolution)"
+#: src/conversation/gnunet-conversation.c:1300
+msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1252
+#: src/conversation/gnunet-conversation.c:1305
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1276
+#: src/conversation/gnunet-conversation.c:1334
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:121
+#: src/conversation/gnunet-conversation-test.c:118
 #, c-format
 msgid ""
 "\n"
 "End of transmission.  Have a GNU day.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:149
+#: src/conversation/gnunet-conversation-test.c:143
 #, c-format
 msgid ""
 "\n"
-"We are now playing your recording back.  If you can hear it, your audio 
settings are working..."
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:215
+#: src/conversation/gnunet-conversation-test.c:214
 #, c-format
-msgid "We will now be recording you for %s. After that time, the recording 
will be played back to you..."
+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-test.c:248
-#: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
-#: src/template/gnunet-template.c:70
-msgid "help text"
+#: src/conversation/gnunet_gst.c:620
+#: src/conversation/gnunet-helper-audio-playback-gst.c:359
+#, c-format
+msgid "Read error from STDIN: %d %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:305
+#: src/conversation/gnunet-helper-audio-playback.c:323
 #, c-format
 msgid "pa_stream_write() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:587
+#: src/conversation/gnunet-helper-audio-playback.c:625
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:612
-#: src/conversation/gnunet-helper-audio-record.c:545
+#: src/conversation/gnunet-helper-audio-playback.c:651
+#: src/conversation/gnunet-helper-audio-record.c:561
 msgid "Connection established.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:617
-#: src/conversation/gnunet-helper-audio-record.c:550
+#: src/conversation/gnunet-helper-audio-playback.c:656
+#: src/conversation/gnunet-helper-audio-record.c:566
 #, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:631
+#: src/conversation/gnunet-helper-audio-playback.c:670
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:644
-#: src/conversation/gnunet-helper-audio-record.c:576
+#: src/conversation/gnunet-helper-audio-playback.c:683
+#: src/conversation/gnunet-helper-audio-record.c:592
 #, c-format
 msgid "Connection failure: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:665
-#: src/conversation/gnunet-helper-audio-record.c:599
+#: src/conversation/gnunet-helper-audio-playback.c:704
+#: src/conversation/gnunet-helper-audio-record.c:615
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:671
-#: src/conversation/gnunet-helper-audio-record.c:605
+#: src/conversation/gnunet-helper-audio-playback.c:710
+#: src/conversation/gnunet-helper-audio-record.c:621
 msgid "pa_mainloop_new() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:685
-#: src/conversation/gnunet-helper-audio-record.c:620
+#: src/conversation/gnunet-helper-audio-playback.c:724
+#: src/conversation/gnunet-helper-audio-record.c:636
 msgid "pa_context_new() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:692
-#: src/conversation/gnunet-helper-audio-record.c:626
+#: src/conversation/gnunet-helper-audio-playback.c:731
+#: src/conversation/gnunet-helper-audio-record.c:642
 #, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:698
-#: src/conversation/gnunet-helper-audio-record.c:632
+#: src/conversation/gnunet-helper-audio-playback.c:737
+#: src/conversation/gnunet-helper-audio-record.c:648
 msgid "pa_mainloop_run() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:768
+#: src/conversation/gnunet-helper-audio-playback.c:816
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:325
-#, c-format
-msgid "Read error from STDIN: %d %s\n"
-msgstr ""
-
-#: src/conversation/gnunet-helper-audio-record.c:344
+#: src/conversation/gnunet-helper-audio-record.c:351
 #, c-format
 msgid "opus_encode_float() failed: %s. Aborting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:420
+#: src/conversation/gnunet-helper-audio-record.c:430
 #, c-format
 msgid "pa_stream_peek() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:458
+#: src/conversation/gnunet-helper-audio-record.c:472
 msgid "Got signal, exiting.\n"
 msgstr "Segnale ricevuto. Uscita in corso.\n"
 
-#: src/conversation/gnunet-helper-audio-record.c:483
+#: src/conversation/gnunet-helper-audio-record.c:498
 msgid "Stream successfully created.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:488
+#: src/conversation/gnunet-helper-audio-record.c:503
 #, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:496
+#: src/conversation/gnunet-helper-audio-record.c:511
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:500
+#: src/conversation/gnunet-helper-audio-record.c:515
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:507
+#: src/conversation/gnunet-helper-audio-record.c:522
 #, c-format
 msgid "Connected to device %s (%u, %ssuspended).\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:516
+#: src/conversation/gnunet-helper-audio-record.c:531
 #, c-format
 msgid "Stream error: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:563
+#: src/conversation/gnunet-helper-audio-record.c:579
 #, c-format
 msgid "pa_stream_connect_record() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:676
+#: src/conversation/gnunet-helper-audio-record.c:693
 msgid "ogg_stream_init() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-record.c:721
+#: src/conversation/gnunet-helper-audio-record.c:738
 #, c-format
-msgid "Failed to allocate %d bytes for second packet\n"
-msgstr ""
-
-#: src/conversation/gnunet-service-conversation.c:841
-msgid "Mesh audio channel not ready; audio data dropped\n"
+msgid "Failed to allocate %u bytes for second packet\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:932
+#: src/conversation/gnunet-service-conversation.c:1303
 #, c-format
-msgid "No available phone for incoming call on line %u, sending HANG_UP 
signal\n"
+msgid "Could not open line, port %s already in use!\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1338
-#, c-format
-msgid "Received incoming channel on port %u\n"
+#: src/conversation/microphone.c:119
+msgid "Could not start record audio helper\n"
 msgstr ""
 
-#: src/conversation/microphone.c:121
-msgid "Could not start record audio helper\n"
+#: src/conversation/plugin_gnsrecord_conversation.c:70
+#, c-format
+msgid "PHONE version %u not supported\n"
 msgstr ""
 
-#: src/conversation/plugin_gnsrecord_conversation.c:116
+#: src/conversation/plugin_gnsrecord_conversation.c:133
+#: src/conversation/plugin_gnsrecord_conversation.c:147
 #, c-format
 msgid "Unable to parse PHONE record `%s'\n"
 msgstr ""
 
-#: src/conversation/speaker.c:75
+#: src/conversation/speaker.c:73
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/core/core_api.c:767
-msgid "Client was disconnected from core service, trying to reconnect.\n"
+#: src/core/gnunet-core.c:88
+#, fuzzy
+msgid "fresh connection"
+msgstr "# connessioni attive"
+
+#: src/core/gnunet-core.c:91
+msgid "key sent"
 msgstr ""
 
-#: src/core/gnunet-core.c:80
-#, c-format
-msgid "Peer `%s'\n"
-msgstr "Peer `%s'\n"
+#: src/core/gnunet-core.c:94
+msgid "key received"
+msgstr ""
 
-#: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:910 src/transport/gnunet-transport.c:930
-#, c-format
-msgid "%24s: %-17s %4s   (%u connections in total)\n"
+#: src/core/gnunet-core.c:97
+#, fuzzy
+msgid "connection established"
+msgstr "Connessione stabilita con `%s'\n"
+
+#: src/core/gnunet-core.c:100
+msgid "rekeying"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:911
-msgid "Connected to"
+#: src/core/gnunet-core.c:103
+msgid "disconnected"
 msgstr ""
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:931
-msgid "Disconnected from"
+#: src/core/gnunet-core.c:110
+msgid "Connection to CORE service lost (reconnecting)"
+msgstr ""
+
+#: src/core/gnunet-core.c:113
+#, fuzzy
+msgid "unknown state"
+msgstr "indirizzo sconosciuto"
+
+#: src/core/gnunet-core.c:118
+#, c-format
+msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:211 src/peerinfo-tool/gnunet-peerinfo.c:694
+#: src/core/gnunet-core.c:142 src/peerinfo-tool/gnunet-peerinfo.c:726
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:233 src/transport/gnunet-transport.c:1486
+#: src/core/gnunet-core.c:153
+msgid "Failed to connect to CORE service!\n"
+msgstr ""
+
+#: src/core/gnunet-core.c:175 src/transport/gnunet-transport.c:1447
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core.c:244
+#: src/core/gnunet-core.c:184
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:105
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+#: src/core/gnunet-service-core.c:345
+msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:126
-#, c-format
-msgid "Core service of `%4s' ready.\n"
+#: src/core/gnunet-service-core.c:369
+msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:370
-msgid "# send requests dropped (disconnected)"
+#: src/core/gnunet-service-core.c:441
+#, c-format
+msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:480
+#: src/core/gnunet-service-core.c:539
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:526
+#: src/core/gnunet-service-core.c:877
 #, c-format
-msgid "# bytes of messages of type %u received"
+msgid "# messages of type %u discarded (client busy)"
+msgstr ""
+
+#: src/core/gnunet-service-core.c:986
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:535
+#: src/core/gnunet-service-core.c:1007
+#, fuzzy, c-format
+msgid "Core service of `%s' ready.\n"
+msgstr "Avvio del servizio '%s' in corso\n"
+
+#: src/core/gnunet-service-core_kx.c:615
 msgid "# bytes encrypted"
 msgstr "# byte crittografati"
 
-#: src/core/gnunet-service-core_kx.c:586
+#: src/core/gnunet-service-core_kx.c:675
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:777
+msgid "# PAYLOAD dropped (out of order)"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:827
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:713
+#: src/core/gnunet-service-core_kx.c:889
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:810
+#: src/core/gnunet-service-core_kx.c:923
+#, fuzzy
+msgid "# PING messages transmitted"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/core/gnunet-service-core_kx.c:990
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:816
-msgid "# ephemeral keys received"
+#: src/core/gnunet-service-core_kx.c:1003
+msgid "# duplicate ephemeral keys ignored"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1038
+msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:850
+#: src/core/gnunet-service-core_kx.c:1052
 #, 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"
+msgid ""
+"EPHEMERAL_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:861
-msgid "# EPHEMERAL_KEY messages received"
+#: src/core/gnunet-service-core_kx.c:1058
+msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:951
-#: src/transport/gnunet-service-transport_validation.c:1016
+#: src/core/gnunet-service-core_kx.c:1078
+#, fuzzy
+msgid "# valid ephemeral keys received"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/core/gnunet-service-core_kx.c:1178
+#: src/transport/gnunet-service-transport_validation.c:1126
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:959
+#: src/core/gnunet-service-core_kx.c:1187
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:986
-#, c-format
-msgid "Received PING from `%s' for different identity: I am `%s', PONG 
identity: `%s'\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:1003
+#: src/core/gnunet-service-core_kx.c:1246
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:1272
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1039
+#: src/core/gnunet-service-core_kx.c:1285
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1096
-#: src/transport/gnunet-service-transport_validation.c:1328
+#: src/core/gnunet-service-core_kx.c:1349
+#: src/transport/gnunet-service-transport_validation.c:1459
 msgid "# PONG messages received"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/core/gnunet-service-core_kx.c:1102
+#: src/core/gnunet-service-core_kx.c:1356
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1107
+#: src/core/gnunet-service-core_kx.c:1361
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1137
+#: src/core/gnunet-service-core_kx.c:1396
 msgid "# PONG messages decrypted"
 msgstr "# messaggi PONG decrittati"
 
-#: src/core/gnunet-service-core_kx.c:1171
+#: src/core/gnunet-service-core_kx.c:1434
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1181
+#: src/core/gnunet-service-core_kx.c:1445
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1188
+#: src/core/gnunet-service-core_kx.c:1452
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1328
+#: src/core/gnunet-service-core_kx.c:1640
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1335
+#: src/core/gnunet-service-core_kx.c:1648
 #, c-format
-msgid "Session to peer `%s' went down due to key expiration (should not 
happen)\n"
+msgid ""
+"Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1338
+#: src/core/gnunet-service-core_kx.c:1651
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1383
-#: src/core/gnunet-service-core_kx.c:1408
+#: src/core/gnunet-service-core_kx.c:1740
+#: src/core/gnunet-service-core_kx.c:1766
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1395
+#: src/core/gnunet-service-core_kx.c:1753
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1437
+#: src/core/gnunet-service-core_kx.c:1795
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1445
+#: src/core/gnunet-service-core_kx.c:1803
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1480
-msgid "# PAYLOAD dropped (out of order)"
+#: src/core/gnunet-service-core_sessions.c:258
+#: src/core/gnunet-service-core_sessions.c:348
+#: src/dht/gnunet-service-dht_neighbours.c:739
+#: src/dht/gnunet-service-dht_neighbours.c:802
+#: src/fs/gnunet-service-fs_cp.c:613 src/fs/gnunet-service-fs_cp.c:1520
+#: src/topology/gnunet-daemon-topology.c:615
+#: src/topology/gnunet-daemon-topology.c:717
+#: src/transport/gnunet-service-transport_neighbours.c:719
+#: src/transport/gnunet-service-transport_neighbours.c:727
+msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:168
-msgid "# sessions terminated by transport disconnect"
+#: src/core/gnunet-service-core_sessions.c:294
+msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:184
-#: src/core/gnunet-service-core_neighbours.c:335
-msgid "# neighbour entries allocated"
+#: src/core/gnunet-service-core_sessions.c:414
+msgid "# outdated typemap confirmations received"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:252
-msgid "# encrypted bytes given to transport"
+#: src/core/gnunet-service-core_sessions.c:431
+msgid "# valid typemap confirmations received"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:418
-#, c-format
-msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
+#: src/core/gnunet-service-core_typemap.c:167
+#: src/core/gnunet-service-core_typemap.c:179
+msgid "# type maps received"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:216
-#: src/core/gnunet-service-core_sessions.c:288
-#: src/dht/gnunet-service-dht_neighbours.c:662
-#: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:1304
-#: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
-#: src/topology/gnunet-daemon-topology.c:707
-#: src/topology/gnunet-daemon-topology.c:808
-#: src/transport/gnunet-service-transport_neighbours.c:917
-#: src/transport/gnunet-service-transport_neighbours.c:1141
-#: src/transport/gnunet-service-transport_neighbours.c:3142
-#: src/transport/gnunet-service-transport_neighbours.c:3438
-msgid "# peers connected"
+#: src/core/gnunet-service-core_typemap.c:210
+msgid "# updates to my type map"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:255
-msgid "# type map refreshes sent"
+#: src/credential/credential_misc.c:86
+#, c-format
+msgid "Unable to parse CRED record string `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:426
-msgid "# messages discarded (expired prior to transmission)"
+#: src/credential/gnunet-credential.c:262 src/namestore/gnunet-namestore.c:887
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:110
-#: src/core/gnunet-service-core_typemap.c:121
-msgid "# type maps received"
+#: src/credential/gnunet-credential.c:278
+#: src/credential/gnunet-credential.c:432
+#, c-format
+msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:151
-msgid "# updates to my type map"
+#: src/credential/gnunet-credential.c:359
+#: src/credential/gnunet-credential.c:421
+#, c-format
+msgid "Issuer public key not well-formed\n"
 msgstr ""
 
-#: src/datacache/datacache.c:115 src/datacache/datacache.c:266
-#: src/datastore/gnunet-service-datastore.c:838
-msgid "# bytes stored"
+#: src/credential/gnunet-credential.c:370
+#: src/credential/gnunet-credential.c:442
+#, c-format
+msgid "Failed to connect to CREDENTIAL\n"
 msgstr ""
 
-#: src/datacache/datacache.c:117 src/datacache/datacache.c:268
-msgid "# items stored"
-msgstr "# elementi memorizzati"
+#: src/credential/gnunet-credential.c:377
+#, c-format
+msgid "You must provide issuer the attribute\n"
+msgstr ""
 
-#: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1487
-#: src/datastore/gnunet-service-datastore.c:1498
+#: src/credential/gnunet-credential.c:385
 #, c-format
-msgid "No `%s' specified for `%s' in configuration!\n"
+msgid "ego required\n"
 msgstr ""
 
-#: src/datacache/datacache.c:184
+#: src/credential/gnunet-credential.c:401
 #, c-format
-msgid "Loading `%s' datacache plugin\n"
+msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/datacache/datacache.c:192
+#: src/credential/gnunet-credential.c:412
 #, c-format
-msgid "Failed to load datacache plugin for `%s'\n"
+msgid "Subject public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/datacache/datacache.c:295
-msgid "# requests received"
+#: src/credential/gnunet-credential.c:449
+#, c-format
+msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/datacache/datacache.c:304
-msgid "# requests filtered by bloom filter"
+#: src/credential/gnunet-credential.c:502
+#, c-format
+msgid "Issuer ego required\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_heap.c:406
-msgid "Heap datacache running\n"
+#: src/credential/gnunet-credential.c:514
+#, c-format
+msgid "Please specify name to lookup, subject key and issuer key!\n"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:534
+msgid "create credential"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:538
+msgid "verify credential against attribute"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:543
+msgid "The public key of the subject to lookup the credential for"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:548
+msgid "The name of the credential presented by the subject"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:553
+msgid "The public key of the authority to verify the credential against"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:392
-msgid "Postgres datacache running\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_sqlite.c:69
-#: src/datacache/plugin_datacache_sqlite.c:72
-#: src/datastore/plugin_datastore_mysql.c:806
-#: src/datastore/plugin_datastore_mysql.c:820
-#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
-#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
-#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
-#: src/namecache/plugin_namecache_postgres.c:52
-#: src/namecache/plugin_namecache_sqlite.c:52
-#: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:52
-#: src/testbed/generate-underlay-topology.c:47
-#: src/testbed/gnunet-daemon-latency-logger.c:52
-#: src/testbed/gnunet-daemon-testbed-underlay.c:55
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
-#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:50
+#: src/credential/gnunet-credential.c:558
+msgid "The ego to use"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:563
+msgid "The issuer attribute to verify against or to issue"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:568
+msgid "The time to live for the credential"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:572
+msgid "collect credentials"
+msgstr ""
+
+#: src/credential/gnunet-credential.c:586
+msgid "GNUnet credential resolver tool"
+msgstr ""
+
+#: src/credential/gnunet-service-credential.c:1136 src/gns/gnunet-gns.c:183
+#: src/gns/gnunet-gns-helper-service-w32.c:725
 #, c-format
-msgid "`%s' failed at %s:%d with error: %s\n"
+msgid "Failed to connect to GNS\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:450
-msgid "Sqlite datacache running\n"
+#: src/credential/gnunet-service-credential.c:1142
+#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore-fcfsd.c:1136
+#, c-format
+msgid "Failed to connect to namestore\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:484
-#: src/datastore/plugin_datastore_sqlite.c:404
-#: src/namecache/plugin_namecache_sqlite.c:295
-#: src/namestore/plugin_namestore_sqlite.c:327
-msgid "Tried to close sqlite without finalizing all prepared statements.\n"
+#: src/credential/plugin_gnsrecord_credential.c:184
+#, c-format
+msgid "Unable to parse ATTR record string `%s'\n"
+msgstr ""
+
+#: src/datacache/datacache.c:117 src/datacache/datacache.c:309
+#: src/datastore/gnunet-service-datastore.c:755
+msgid "# bytes stored"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:491
+#: src/datacache/datacache.c:121 src/datacache/datacache.c:313
+msgid "# items stored"
+msgstr "# elementi memorizzati"
+
+#: src/datacache/datacache.c:204
 #, c-format
-msgid "Failed to close statement %p: %d\n"
+msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_template.c:125
-msgid "Template datacache running\n"
+#: src/datacache/datacache.c:215
+#, c-format
+msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:310
-msgid "Failed to transmit request to drop database.\n"
+#: src/datacache/datacache.c:343
+msgid "# requests received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:394
-msgid "# queue entry timeouts"
+#: src/datacache/datacache.c:353
+msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datastore/datastore_api.c:443
-msgid "# queue overflows"
+#: src/datacache/datacache.c:383
+msgid "# requests for random value received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:471
-msgid "# queue entries created"
+#: src/datacache/datacache.c:415
+msgid "# proximity search requests received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:491
-msgid "# Requests dropped from datastore queue"
+#: src/datacache/plugin_datacache_heap.c:551
+msgid "Heap datacache running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:533
-msgid "# datastore connections (re)created"
+#: src/datacache/plugin_datacache_sqlite.c:116
+#: src/datacache/plugin_datacache_sqlite.c:125
+#: src/datastore/plugin_datastore_mysql.c:890
+#: src/datastore/plugin_datastore_sqlite.c:56
+#: src/datastore/plugin_datastore_sqlite.c:64 src/my/my.c:79 src/my/my.c:91
+#: src/mysql/mysql.c:40 src/mysql/mysql.c:47
+#: src/namecache/plugin_namecache_sqlite.c:50
+#: src/namestore/plugin_namestore_sqlite.c:51
+#: src/peerstore/plugin_peerstore_sqlite.c:50
+#: src/psycstore/plugin_psycstore_mysql.c:60
+#: src/reclaim/plugin_reclaim_sqlite.c:50
+#: src/testbed/generate-underlay-topology.c:45
+#: src/testbed/gnunet-daemon-latency-logger.c:50
+#: src/testbed/gnunet-daemon-testbed-underlay.c:54
+#: src/testbed/testbed_api_hosts.c:67 src/util/crypto_ecc.c:51
+#: src/util/crypto_ecc_setup.c:39 src/util/crypto_mpi.c:37
+#: src/include/gnunet_common.h:816 src/include/gnunet_common.h:825
+#: src/scalarproduct/scalarproduct.h:33
+#, c-format
+msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:616 src/scalarproduct/scalarproduct_api.c:279
-msgid "# transmission request failures"
+#: src/datacache/plugin_datacache_sqlite.c:861
+#: src/datastore/plugin_datastore_sqlite.c:506
+#: src/namecache/plugin_namecache_sqlite.c:327
+#: src/namestore/plugin_namestore_sqlite.c:262
+#: src/reclaim/plugin_reclaim_sqlite.c:334
+msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:638
-msgid "# bytes sent to datastore"
+#: src/datastore/datastore_api.c:346
+msgid "DATASTORE disconnected"
 msgstr ""
 
-#: src/datastore/datastore_api.c:770
-msgid "Failed to receive status response from database."
+#: src/datastore/datastore_api.c:466
+msgid "Disconnected from DATASTORE"
 msgstr ""
 
-#: src/datastore/datastore_api.c:784
-msgid "Error reading response from datastore service"
+#: src/datastore/datastore_api.c:567
+msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:796 src/datastore/datastore_api.c:802
-msgid "Invalid error message received from datastore service"
+#: src/datastore/datastore_api.c:597
+msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:806
+#: src/datastore/datastore_api.c:758
 msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:876
+#: src/datastore/datastore_api.c:812
+msgid "# Results received"
+msgstr ""
+
+#: src/datastore/datastore_api.c:918
+msgid "# datastore connections (re)created"
+msgstr ""
+
+#: src/datastore/datastore_api.c:1032
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:944
+#: src/datastore/datastore_api.c:1093
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1005
+#: src/datastore/datastore_api.c:1158
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1065
-msgid "# UPDATE requests executed"
+#: src/datastore/datastore_api.c:1236
+msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1129
-msgid "# REMOVE requests executed"
+#: src/datastore/datastore_api.c:1296
+msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1174
-msgid "Failed to receive response from database.\n"
+#: src/datastore/datastore_api.c:1358
+msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1233
-msgid "# Results received"
+#: src/datastore/datastore_api.c:1439
+msgid "# GET requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1300
-msgid "# GET REPLICATION requests executed"
+#: src/datastore/gnunet-datastore.c:187
+#, c-format
+msgid "Dumped %<PRIu64> records\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1363
-msgid "# GET ZERO ANONYMITY requests executed"
+#: src/datastore/gnunet-datastore.c:215 src/datastore/gnunet-datastore.c:227
+#, c-format
+msgid "Short write to file: %zd bytes expecting %zd\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1424
-msgid "# GET requests executed"
+#: src/datastore/gnunet-datastore.c:259
+msgid "Error queueing datastore GET operation\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:285 src/datastore/gnunet-datastore.c:410
+#, c-format
+msgid "Unable to open dump file: %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:114
+#: src/datastore/gnunet-datastore.c:324
 #, c-format
 msgid "Failed to store item: %s, aborting\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:200
+#: src/datastore/gnunet-datastore.c:338
 #, c-format
-msgid "Cannot use the same configuration for source and destination\n"
+msgid "Inserted %<PRIu64> records\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:246
-msgid "specifies the configuration to use to access an alternative datastore; 
will merge that datastore into our current datastore"
+#: src/datastore/gnunet-datastore.c:347 src/datastore/gnunet-datastore.c:361
+#, c-format
+msgid "Short read from file: %zd bytes expecting %zd\n"
 msgstr ""
 
-#: src/datastore/gnunet-datastore.c:255
-msgid "Manipulate GNUnet datastore"
+#: src/datastore/gnunet-datastore.c:387
+msgid "Error queueing datastore PUT operation\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:351
-msgid "# bytes expired"
+#: src/datastore/gnunet-datastore.c:430
+msgid "Input file is not of a supported format\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:425
-msgid "# bytes purged (low-priority)"
+#: src/datastore/gnunet-datastore.c:456
+msgid "Failed connecting to the datastore.\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:468
+#, c-format
+msgid "Please choose at least one operation: %s, %s\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:483
-#: src/gns/gnunet-gns-helper-service-w32.c:223
-msgid "Transmission to client failed!\n"
+#: src/datastore/gnunet-datastore.c:491
+msgid "Dump all records from the datastore"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:514
-#: src/gns/gnunet-gns-helper-service-w32.c:262
-msgid "Shutdown in progress, aborting transmission.\n"
+#: src/datastore/gnunet-datastore.c:495
+msgid "Insert records into the datastore"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:630
+#: src/datastore/gnunet-datastore.c:500
+msgid "File to dump or insert"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:509
+msgid "Manipulate GNUnet datastore"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:336
+msgid "# bytes expired"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:418
+msgid "# bytes purged (low-priority)"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:560
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:673
+#: src/datastore/gnunet-service-datastore.c:601
 #, c-format
-msgid "Insufficient space (%llu bytes are available) to satisfy `%s' request 
for %llu bytes\n"
+msgid ""
+"Insufficient space (%llu bytes are available) to satisfy RESERVE request for "
+"%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:612
 #, c-format
-msgid "The requested amount (%llu bytes) is larger than the cache size (%llu 
bytes)\n"
+msgid ""
+"The requested amount (%llu bytes) is larger than the cache size (%llu "
+"bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:688
-msgid "Insufficient space to satisfy request and requested amount is larger 
than cache size"
+#: src/datastore/gnunet-service-datastore.c:618
+msgid ""
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:694
+#: src/datastore/gnunet-service-datastore.c:625
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:699
-#: src/datastore/gnunet-service-datastore.c:751
-#: src/datastore/gnunet-service-datastore.c:964
-#: src/datastore/gnunet-service-datastore.c:1421
+#: src/datastore/gnunet-service-datastore.c:632
+#: src/datastore/gnunet-service-datastore.c:687
+#: src/datastore/gnunet-service-datastore.c:835
+#: src/datastore/gnunet-service-datastore.c:1467
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:764
+#: src/datastore/gnunet-service-datastore.c:705
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:850
+#: src/datastore/gnunet-service-datastore.c:771
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1010
+#: src/datastore/gnunet-service-datastore.c:874
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1022
-msgid "# requests filtered by bloomfilter"
-msgstr ""
+#: src/datastore/gnunet-service-datastore.c:905
+#, fuzzy
+msgid "# GET KEY requests received"
+msgstr "# messaggi PONG ricevuti"
 
-#: src/datastore/gnunet-service-datastore.c:1050
-msgid "# UPDATE requests received"
+#: src/datastore/gnunet-service-datastore.c:918
+msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1080
+#: src/datastore/gnunet-service-datastore.c:954
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1113
+#: src/datastore/gnunet-service-datastore.c:987
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1138
+#: src/datastore/gnunet-service-datastore.c:1034
 msgid "Content not found"
 msgstr "Contenuto non trovato"
 
-#: src/datastore/gnunet-service-datastore.c:1146
+#: src/datastore/gnunet-service-datastore.c:1041
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1178
+#: src/datastore/gnunet-service-datastore.c:1086
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1220
+#: src/datastore/gnunet-service-datastore.c:1135
+#, c-format
+msgid ""
+"Datastore payload must have been inaccurate (%lld < %lld). Recomputing it.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1141
+#: src/datastore/gnunet-service-datastore.c:1316
 #, c-format
-msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
+msgid "New payload: %lld\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1281
+#: src/datastore/gnunet-service-datastore.c:1195
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1290
+#: src/datastore/gnunet-service-datastore.c:1207
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1492
+#: src/datastore/gnunet-service-datastore.c:1267
+msgid "Bloomfilter construction complete.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1323
+msgid "Rebuilding bloomfilter.  Please be patient.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1334
+msgid "Plugin does not support get_keys function. Please fix!\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:1504
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1503
+#: src/datastore/gnunet-service-datastore.c:1520
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1505
+#: src/datastore/gnunet-service-datastore.c:1525
 msgid "# cache size"
 msgstr "# dimensione cache"
 
-#: src/datastore/gnunet-service-datastore.c:1518
+#: src/datastore/gnunet-service-datastore.c:1541
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1536
-#: src/datastore/gnunet-service-datastore.c:1552
+#: src/datastore/gnunet-service-datastore.c:1559
+#: src/datastore/gnunet-service-datastore.c:1575
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1582
+#: src/datastore/gnunet-service-datastore.c:1607
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1611
-msgid "Rebuilding bloomfilter.  Please be patient.\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1616
-msgid "Plugin does not support get_keys function. Please fix!\n"
-msgstr ""
-
-#: src/datastore/gnunet-service-datastore.c:1619
-msgid "Bloomfilter construction complete.\n"
+#: src/datastore/plugin_datastore_heap.c:891
+msgid "Heap database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_heap.c:820
-msgid "Heap database running\n"
+#: src/datastore/plugin_datastore_mysql.c:369
+#: src/datastore/plugin_datastore_mysql.c:421
+#: src/datastore/plugin_datastore_mysql.c:1073
+msgid "MySQL statement run failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:783
-#, c-format
-msgid "Failed to prepare statement `%s'\n"
+#: src/datastore/plugin_datastore_mysql.c:408
+#: src/datastore/plugin_datastore_sqlite.c:676
+msgid "Data too large"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:791
+#: src/datastore/plugin_datastore_mysql.c:846
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:1022
+#: src/datastore/plugin_datastore_mysql.c:1178
+#: src/psycstore/plugin_psycstore_mysql.c:1934
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:824
+#: src/datastore/plugin_datastore_postgres.c:274
+#: src/datastore/plugin_datastore_postgres.c:891
+msgid "Postgress exec failure"
+msgstr ""
+
+#: src/datastore/plugin_datastore_postgres.c:852
 msgid "Failed to drop table from database.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:860
-#: src/namecache/plugin_namecache_postgres.c:414
-#: src/namestore/plugin_namestore_postgres.c:569
+#: src/datastore/plugin_datastore_postgres.c:950
+#: src/psycstore/plugin_psycstore_postgres.c:1504
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:57
-#: src/testbed/generate-underlay-topology.c:50
-#: src/testbed/gnunet-daemon-latency-logger.c:55
-#: src/testbed/gnunet-daemon-testbed-underlay.c:58
+#: src/datastore/plugin_datastore_sqlite.c:64
+#: src/testbed/generate-underlay-topology.c:48
+#: src/testbed/gnunet-daemon-latency-logger.c:53
+#: src/testbed/gnunet-daemon-testbed-underlay.c:57
 #, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:255
-#: src/namecache/plugin_namecache_sqlite.c:193
-#: src/namestore/plugin_namestore_sqlite.c:204
-#: src/psycstore/plugin_psycstore_sqlite.c:319
+#: src/datastore/plugin_datastore_sqlite.c:269
+#: src/namecache/plugin_namecache_sqlite.c:207
+#: src/namestore/plugin_namestore_sqlite.c:203
+#: src/peerstore/plugin_peerstore_sqlite.c:533
+#: src/psycstore/plugin_psycstore_sqlite.c:323
+#: src/reclaim/plugin_reclaim_sqlite.c:210
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:663
-msgid "Invalid data in database.  Trying to fix (by deletion).\n"
+#: src/datastore/plugin_datastore_sqlite.c:627
+msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1156
+#: src/datastore/plugin_datastore_sqlite.c:1325
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1175
+#: src/datastore/plugin_datastore_sqlite.c:1359
 #, c-format
-msgid "Using sqlite page utilization to estimate payload (%llu pages of size 
%llu bytes)\n"
+msgid ""
+"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
+"bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1215
-#: src/namecache/plugin_namecache_sqlite.c:583
-#: src/namestore/plugin_namestore_sqlite.c:719
+#: src/datastore/plugin_datastore_sqlite.c:1403
+#: src/namecache/plugin_namecache_sqlite.c:638
+#: src/namestore/plugin_namestore_sqlite.c:753
+#: src/reclaim/plugin_reclaim_sqlite.c:709
 msgid "Sqlite database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_template.c:257
+#: src/datastore/plugin_datastore_template.c:251
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:376
-msgid "Failed to connect to the DHT service!\n"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:133
+#: src/dht/gnunet-dht-get.c:156
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:159
+#: src/dht/gnunet-dht-get.c:157
+#, c-format
+msgid "Result %d, type %d:\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:202
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:165 src/dht/gnunet-dht-monitor.c:225
+#: src/dht/gnunet-dht-get.c:208 src/dht/gnunet-dht-monitor.c:255
 msgid "Failed to connect to DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:173
+#: src/dht/gnunet-dht-get.c:217
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:189 src/dht/gnunet-dht-monitor.c:262
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-get.c:246 src/dht/gnunet-dht-monitor.c:305
+#: src/dht/gnunet-dht-put.c:196
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:192
+#: src/dht/gnunet-dht-get.c:251
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265
+#: src/dht/gnunet-dht-get.c:256 src/dht/gnunet-dht-monitor.c:311
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:261
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:265 src/dht/gnunet-dht-put.c:200
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
-#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
-#: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:873
-msgid "be verbose (print progress information)"
-msgstr ""
-
-#: src/dht/gnunet-dht-get.c:225
+#: src/dht/gnunet-dht-get.c:278
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:268
+#: src/dht/gnunet-dht-monitor.c:317
 msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:293
+#: src/dht/gnunet-dht-monitor.c:322 src/fs/gnunet-download.c:370
+#: src/nse/gnunet-nse-profiler.c:876
+msgid "be verbose (print progress information)"
+msgstr ""
+
+#: src/dht/gnunet-dht-monitor.c:335
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:118
-msgid "PUT request sent with key"
+#: src/dht/gnunet_dht_profiler.c:914 src/testbed/gnunet-testbed-profiler.c:251
+#, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:947 src/rps/gnunet-rps-profiler.c:2764
+msgid "number of peers to start"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:952
+msgid "number of PUTs to perform per peer"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:957 src/nse/gnunet-nse-profiler.c:858
+#: src/testbed/gnunet-testbed-profiler.c:302
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:962
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:967
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:972
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:977
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:982
+msgid "chance that a peer is selected at random for PUTs"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:121
-msgid "Timeout sending PUT request!\n"
+#: src/dht/gnunet_dht_profiler.c:987
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:124
-msgid "PUT request not confirmed!\n"
+#: src/dht/gnunet_dht_profiler.c:1007
+msgid "Measure quality and performance of the DHT service."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:153
+#: src/dht/gnunet-dht-put.c:132
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:160
-#, c-format
-msgid "Could not connect to %s service!\n"
+#: src/dht/gnunet-dht-put.c:140
+msgid "Could not connect to DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:176
+#: src/dht/gnunet-dht-put.c:151
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-put.c:186
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:191
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:204
+#: src/dht/gnunet-dht-put.c:205
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:207
-msgid "the type to insert data as"
+#: src/dht/gnunet-dht-put.c:209
+msgid "use DHT's record route option"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:236
-msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
+#: src/dht/gnunet-dht-put.c:214
+msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:176
-msgid "Failed to connect to transport service!\n"
+#: src/dht/gnunet-dht-put.c:231
+msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-xdht_clients.c:838
+#: src/dht/gnunet-service-dht_clients.c:367
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:927
+#: src/dht/gnunet-service-dht_clients.c:481
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-xdht_clients.c:1013
+#: src/dht/gnunet-service-dht_clients.c:614
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-xdht_clients.c:1214
+#: src/dht/gnunet-service-dht_clients.c:840
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1039
-#: src/dht/gnunet-service-xdht_clients.c:498
+#: src/dht/gnunet-service-dht_clients.c:1025
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1052
-#: src/dht/gnunet-service-xdht_clients.c:511
+#: src/dht/gnunet-service-dht_clients.c:1040
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1089
-#: src/dht/gnunet-service-xdht_clients.c:548
+#: src/dht/gnunet-service-dht_clients.c:1086
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1112
-#: src/dht/gnunet-service-xdht_clients.c:571
+#: src/dht/gnunet-service-dht_clients.c:1093
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1166
-#: src/dht/gnunet-service-dht_clients.c:1209
-#: src/dht/gnunet-service-xdht_clients.c:625
-#: src/dht/gnunet-service-xdht_clients.c:668
+#: src/dht/gnunet-service-dht_clients.c:1171
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1176
-#: src/dht/gnunet-service-xdht_clients.c:635
-msgid "Could not pass reply to client, message too big!\n"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_datacache.c:68
-#: src/dht/gnunet-service-xdht_datacache.c:68
+#: src/dht/gnunet-service-dht_datacache.c:71
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-xdht_datacache.c:78
+#: src/dht/gnunet-service-dht_datacache.c:81
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:165
+#: src/dht/gnunet-service-dht_datacache.c:205
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:176
+#: src/dht/gnunet-service-dht_datacache.c:217
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:182
+#: src/dht/gnunet-service-dht_datacache.c:223
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:188
+#: src/dht/gnunet-service-dht_datacache.c:229
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:200
+#: src/dht/gnunet-service-dht_datacache.c:241
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:203
+#: src/dht/gnunet-service-dht_datacache.c:245
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:234
-#: src/dht/gnunet-service-xdht_datacache.c:234
+#: src/dht/gnunet-service-dht_datacache.c:280
 msgid "# GET requests given to datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_hello.c:84
-#: src/dht/gnunet-service-xdht_hello.c:82
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:516
-msgid "# Preference updates given to core"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:610
+#: src/dht/gnunet-service-dht_neighbours.c:677
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:764
-msgid "# Queued messages discarded (peer disconnected)"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:703
-msgid "# Bytes transmitted to other peers"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:742
-msgid "# Bytes of bandwidth requested from core"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:889
+#: src/dht/gnunet-service-dht_neighbours.c:850
 msgid "# requests TTL-dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1093
-#: src/dht/gnunet-service-dht_neighbours.c:1130
+#: src/dht/gnunet-service-dht_neighbours.c:1053
+#: src/dht/gnunet-service-dht_neighbours.c:1096
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1108
-#: src/dht/gnunet-service-dht_neighbours.c:1145
+#: src/dht/gnunet-service-dht_neighbours.c:1070
+#: src/dht/gnunet-service-dht_neighbours.c:1112
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1287
+#: src/dht/gnunet-service-dht_neighbours.c:1269
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1316
+#: src/dht/gnunet-service-dht_neighbours.c:1302
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1323
-#: src/dht/gnunet-service-dht_neighbours.c:1440
-#: src/dht/gnunet-service-dht_neighbours.c:1543
-#: src/dht/gnunet-service-xdht_neighbours.c:794
-#: src/dht/gnunet-service-xdht_neighbours.c:860
-#: src/dht/gnunet-service-xdht_neighbours.c:919
-#: src/dht/gnunet-service-xdht_neighbours.c:981
-#: src/dht/gnunet-service-xdht_neighbours.c:1041
+#: src/dht/gnunet-service-dht_neighbours.c:1313
+#: src/dht/gnunet-service-dht_neighbours.c:1453
+#: src/dht/gnunet-service-dht_neighbours.c:1556
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1405
+#: src/dht/gnunet-service-dht_neighbours.c:1398
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1432
+#: src/dht/gnunet-service-dht_neighbours.c:1441
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1550
+#: src/dht/gnunet-service-dht_neighbours.c:1571
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1636
+#: src/dht/gnunet-service-dht_neighbours.c:1674
+msgid "# Expired PUTs discarded"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1682
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1639
+#: src/dht/gnunet-service-dht_neighbours.c:1686
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-dht_neighbours.c:1912
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1920
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1904
+#: src/dht/gnunet-service-dht_neighbours.c:2082
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1907
+#: src/dht/gnunet-service-dht_neighbours.c:2086
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1961
+#: src/dht/gnunet-service-dht_neighbours.c:2151
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1975
+#: src/dht/gnunet-service-dht_neighbours.c:2172
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2052
+#: src/dht/gnunet-service-dht_neighbours.c:2349
+msgid "# Expired results discarded"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:2365
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:2055
+#: src/dht/gnunet-service-dht_neighbours.c:2369
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_nse.c:59 src/dht/gnunet-service-xdht_nse.c:59
+#: src/dht/gnunet-service-dht_nse.c:57
 msgid "# Network size estimates received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:211
+#: src/dht/gnunet-service-dht_routing.c:221
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:220
+#: src/dht/gnunet-service-dht_routing.c:235
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:226
+#: src/dht/gnunet-service-dht_routing.c:241
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:232
+#: src/dht/gnunet-service-dht_routing.c:247
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:244
+#: src/dht/gnunet-service-dht_routing.c:259
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:317
+#: src/dht/gnunet-service-dht_routing.c:337
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:399
+#: src/dht/gnunet-service-dht_routing.c:413
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:417
+#: src/dht/gnunet-service-dht_routing.c:435
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/gnunet-service-xdht_neighbours.c:1398
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d,my_identity = %s"
-msgstr ""
-
-#: src/dht/gnunet-service-xdht_neighbours.c:1514
-#: src/dht/gnunet-service-xdht_neighbours.c:1524
-#: src/dht/gnunet-service-xdht_neighbours.c:1530
-#: src/dht/gnunet-service-xdht_neighbours.c:1536
-#: src/dht/gnunet-service-xdht_neighbours.c:1545
-#, c-format
-msgid ""
-"\n"
-"SUPU %s, %s, %d"
-msgstr ""
-
-#: src/dht/plugin_block_dht.c:138
+#: src/dht/plugin_block_dht.c:187
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:145
+#: src/dht/plugin_block_dht.c:196
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:155
+#: src/dht/plugin_block_dht.c:207
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:257
-#, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr ""
-
-#: src/dns/dnsparser.c:856
-#, c-format
-msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
-msgstr ""
-
-#: src/dns/dnsstub.c:175
-#, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr ""
-
-#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
-#, c-format
-msgid "Failed to send DNS request to %s\n"
-msgstr ""
-
-#: src/dns/dnsstub.c:299
-#, c-format
-msgid "Sent DNS request to %s\n"
-msgstr ""
-
-#: src/dns/dnsstub.c:368
-#, c-format
-msgid "Configured DNS exit `%s' is not working / valid.\n"
-msgstr ""
-
-#: src/dns/dnsstub.c:440
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:355
+#: src/dns/gnunet-dns-monitor.c:351 src/dns/gnunet-dns-monitor.c:356
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:358
-msgid "only monitor DNS replies"
-msgstr ""
-
-#: src/dns/gnunet-dns-monitor.c:369
+#: src/dns/gnunet-dns-monitor.c:368
 msgid "Monitor DNS queries."
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:236
+#: src/dns/gnunet-dns-redirector.c:235
 msgid "set A records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:239
+#: src/dns/gnunet-dns-redirector.c:241
 msgid "set AAAA records"
 msgstr ""
 
-#: src/dns/gnunet-dns-redirector.c:251
+#: src/dns/gnunet-dns-redirector.c:254
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:456
+#: src/dns/gnunet-service-dns.c:460
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:603
+#: src/dns/gnunet-service-dns.c:608
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:714
+#: src/dns/gnunet-service-dns.c:738
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:792
+#: src/dns/gnunet-service-dns.c:813
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:907
+#: src/dns/gnunet-service-dns.c:928
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:923
+#: src/dns/gnunet-service-dns.c:944
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:932
+#: src/dns/gnunet-service-dns.c:953
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:942
-msgid "# Non-DNS UDP packet received via TUN interface"
+#: src/dns/gnunet-service-dns.c:963
+msgid "DNS interceptor got non-DNS packet (dropped)\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1009
-msgid "# DNS requests received via TUN interface"
+#: src/dns/gnunet-service-dns.c:965
+msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3514
-#, c-format
-msgid "`%s' must be installed SUID, refusing to run\n"
+#: src/dns/gnunet-service-dns.c:1032
+msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3571
+#: src/dns/gnunet-service-dns.c:1080 src/exit/gnunet-daemon-exit.c:3563
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:169
-msgid "verbose output"
+#: src/dns/gnunet-service-dns.c:1090
+#, c-format
+msgid "`%s' must be installed SUID, will not run DNS interceptor\n"
 msgstr ""
 
-#: src/dv/gnunet-dv.c:178
+#: src/dv/gnunet-dv.c:173
 msgid "Print information about DV state"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:802
-#, c-format
-msgid "Got duplicate service records for `%s:%u'\n"
+#: src/exit/gnunet-daemon-exit.c:958
+msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:853
-msgid "# Bytes transmitted via mesh channels"
+#: src/exit/gnunet-daemon-exit.c:1059
+msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:970 src/exit/gnunet-daemon-exit.c:2397
-#: src/exit/gnunet-daemon-exit.c:2654 src/vpn/gnunet-service-vpn.c:1407
-#: src/vpn/gnunet-service-vpn.c:1797 src/vpn/gnunet-service-vpn.c:1960
-msgid "# ICMPv4 packets dropped (type not allowed)"
+#: src/exit/gnunet-daemon-exit.c:1338
+msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1007 src/exit/gnunet-daemon-exit.c:2456
-#: src/exit/gnunet-daemon-exit.c:2713 src/vpn/gnunet-service-vpn.c:1463
-#: src/vpn/gnunet-service-vpn.c:1856 src/vpn/gnunet-service-vpn.c:1993
-msgid "# ICMPv6 packets dropped (type not allowed)"
+#: src/exit/gnunet-daemon-exit.c:1462 src/exit/gnunet-daemon-exit.c:1570
+#: src/exit/gnunet-daemon-exit.c:1617 src/exit/gnunet-daemon-exit.c:1699
+#: src/exit/gnunet-daemon-exit.c:1820 src/exit/gnunet-daemon-exit.c:1951
+#: src/exit/gnunet-daemon-exit.c:2205
+msgid "# Bytes received from CADET"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1047
-msgid "# ICMP packets dropped (not allowed)"
+#: src/exit/gnunet-daemon-exit.c:1465
+msgid "# UDP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1054
-msgid "ICMP Packet dropped, have no matching connection information\n"
+#: src/exit/gnunet-daemon-exit.c:1573
+msgid "# UDP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1130
-msgid "UDP Packet dropped, have no matching connection information\n"
+#: src/exit/gnunet-daemon-exit.c:1613
+msgid "# TCP service creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1204
-msgid "TCP Packet dropped, have no matching connection information\n"
+#: src/exit/gnunet-daemon-exit.c:1702
+msgid "# TCP IP-exit creation requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1256
-msgid "# Packets received from TUN"
+#: src/exit/gnunet-daemon-exit.c:1786
+msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1270
-msgid "# Bytes received from TUN"
+#: src/exit/gnunet-daemon-exit.c:1823
+msgid "# TCP data requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1296
-msgid "IPv4 packet options received.  Ignored.\n"
+#: src/exit/gnunet-daemon-exit.c:1954
+msgid "# ICMP IP-exit requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1323
-#, c-format
-msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
+#: src/exit/gnunet-daemon-exit.c:2020 src/exit/gnunet-daemon-exit.c:2277
+#: src/exit/gnunet-daemon-exit.c:2632 src/vpn/gnunet-service-vpn.c:826
+#: src/vpn/gnunet-service-vpn.c:989 src/vpn/gnunet-service-vpn.c:2103
+msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1369
-#, c-format
-msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
+#: src/exit/gnunet-daemon-exit.c:2079 src/exit/gnunet-daemon-exit.c:2336
+#: src/exit/gnunet-daemon-exit.c:2669 src/vpn/gnunet-service-vpn.c:885
+#: src/vpn/gnunet-service-vpn.c:1022 src/vpn/gnunet-service-vpn.c:2156
+msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1377
-#, c-format
-msgid "Packet from unknown protocol %u received.  Ignored.\n"
+#: src/exit/gnunet-daemon-exit.c:2208
+msgid "# ICMP service requests received via cadet"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1759
-msgid "# TCP packets sent via TUN"
+#: src/exit/gnunet-daemon-exit.c:2262 src/vpn/gnunet-service-vpn.c:983
+#: src/vpn/gnunet-service-vpn.c:2094
+msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1872
-msgid "# TCP service creation requests received via mesh"
+#: src/exit/gnunet-daemon-exit.c:2321 src/vpn/gnunet-service-vpn.c:873
+#: src/vpn/gnunet-service-vpn.c:2128 src/vpn/gnunet-service-vpn.c:2139
+msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1875 src/exit/gnunet-daemon-exit.c:1968
-#: src/exit/gnunet-daemon-exit.c:2073 src/exit/gnunet-daemon-exit.c:2321
-#: src/exit/gnunet-daemon-exit.c:2570 src/exit/gnunet-daemon-exit.c:2859
-#: src/exit/gnunet-daemon-exit.c:2966
-msgid "# Bytes received from MESH"
+#: src/exit/gnunet-daemon-exit.c:2400 src/exit/gnunet-daemon-exit.c:3066
+msgid "# Inbound CADET channels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1909 src/exit/gnunet-daemon-exit.c:2990
+#: src/exit/gnunet-daemon-exit.c:2520
 #, c-format
-msgid "No service %s found for %s on port %d!\n"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1914
-msgid "# TCP requests dropped (no such service)"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:1971
-msgid "# TCP IP-exit creation requests received via mesh"
-msgstr ""
-
-#: src/exit/gnunet-daemon-exit.c:2076
-msgid "# TCP data requests received via mesh"
+msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2090
-msgid "# TCP DATA requests dropped (no session)"
+#: src/exit/gnunet-daemon-exit.c:2539
+msgid "# Messages transmitted via cadet channels"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2150
-msgid "# ICMP packets sent via TUN"
+#: src/exit/gnunet-daemon-exit.c:2717
+msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2324
-msgid "# ICMP IP-exit requests received via mesh"
+#: src/exit/gnunet-daemon-exit.c:2725
+msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2573
-msgid "# ICMP service requests received via mesh"
+#: src/exit/gnunet-daemon-exit.c:2799
+msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2639 src/vpn/gnunet-service-vpn.c:1397
-#: src/vpn/gnunet-service-vpn.c:1954
-msgid "# ICMPv4 packets dropped (impossible PT to v6)"
+#: src/exit/gnunet-daemon-exit.c:2871
+msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2698 src/vpn/gnunet-service-vpn.c:1433
-#: src/vpn/gnunet-service-vpn.c:1445 src/vpn/gnunet-service-vpn.c:1844
-msgid "# ICMPv6 packets dropped (impossible PT to v4)"
+#: src/exit/gnunet-daemon-exit.c:2919
+msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2748
-msgid "# UDP packets sent via TUN"
+#: src/exit/gnunet-daemon-exit.c:2933
+msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2862
-msgid "# UDP IP-exit requests received via mesh"
+#: src/exit/gnunet-daemon-exit.c:2959
+msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2969
-msgid "# UDP service requests received via mesh"
+#: src/exit/gnunet-daemon-exit.c:2986
+#, c-format
+msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2995
-msgid "# UDP requests dropped (no such service)"
+#: src/exit/gnunet-daemon-exit.c:3032
+#, c-format
+msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3031
-msgid "# Inbound MESH channels created"
+#: src/exit/gnunet-daemon-exit.c:3040
+#, c-format
+msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3235 src/exit/gnunet-daemon-exit.c:3245
+#: src/exit/gnunet-daemon-exit.c:3243 src/exit/gnunet-daemon-exit.c:3253
 #, c-format
 msgid "Option `%s' for domain `%s' is not formatted correctly!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3259 src/exit/gnunet-daemon-exit.c:3267
+#: src/exit/gnunet-daemon-exit.c:3267 src/exit/gnunet-daemon-exit.c:3275
 #, c-format
 msgid "`%s' is not a valid port number (for domain `%s')!"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3300
+#: src/exit/gnunet-daemon-exit.c:3316
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3314 src/exit/gnunet-daemon-exit.c:3326
+#: src/exit/gnunet-daemon-exit.c:3330 src/exit/gnunet-daemon-exit.c:3343
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3337
+#: src/exit/gnunet-daemon-exit.c:3355
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3527
-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:3535
-msgid "This system does not support IPv6, will disable IPv6 functions despite 
them being enabled in the configuration\n"
+#: src/exit/gnunet-daemon-exit.c:3499
+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:3542
-msgid "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use 
ENABLE_IPv4=YES\n"
+#: src/exit/gnunet-daemon-exit.c:3507
+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:3548
-msgid "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use 
ENABLE_IPv6=YES\n"
+#: src/exit/gnunet-daemon-exit.c:3514
+msgid ""
+"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
+"ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3554 src/exit/gnunet-daemon-exit.c:3717
-#: src/pt/gnunet-daemon-pt.c:1247
-msgid "No useful service enabled.  Exiting.\n"
+#: src/exit/gnunet-daemon-exit.c:3520
+msgid ""
+"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
+"ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3664
+#: src/exit/gnunet-daemon-exit.c:3688
 msgid "Must be a number"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3813
-msgid "Daemon to run to provide an IP exit node for the VPN"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:55
-msgid "Experimentation daemon shutting down ...\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:77
-msgid "Experimentation daemon starting ...\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:83
-msgid "Failed to create statistics!\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation.c:120
-msgid "GNUnet experimentation daemon"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:241
-#, c-format
-msgid "Experiment `%s': Experiment signature is invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:250
-#, c-format
-msgid "Adding experiment `%s' running from `%s' to `%s' every %llu sec. for 
%llu sec. \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:303
-#, c-format
-msgid "Experiment `%s': Issuer missing\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:312
-#, c-format
-msgid "Experiment `%s': Issuer invalid\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:320
-#, c-format
-msgid "Experiment `%s': Issuer not accepted!\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:330
-#, c-format
-msgid "Experiment `%s': Version missing or invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:339
-#, c-format
-msgid "Experiment `%s': Required capabilities missing \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:345
-#, c-format
-msgid "Experiment `%s': Required capabilities invalid \n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:390
-#, c-format
-msgid "Failed to parse file `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:420
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
-msgid "No valid experiment issuers configured! Set value to public keys of 
issuers! Exiting.\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:435
-msgid "Invalid value for public key\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:473
-#, c-format
-msgid "Cannot read experiments file `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
-#, c-format
-msgid "Cannot send message to peer `%s' for experiment `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
-#, c-format
-msgid "Sending experimentation request to peer %s\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
-#, c-format
-msgid "Added peer `%s' as active node\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891
-#, c-format
-msgid "Connected to peer %s\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921
-#, c-format
-msgid "Disconnected from peer %s\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
-msgid "Failed to connect to CORE service!\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:108
-#, c-format
-msgid "Peer `%s' did not respond to request for experiment `%s'\n"
-msgstr ""
-
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:143
+#: src/exit/gnunet-daemon-exit.c:3803
 #, c-format
-msgid "Starting inbound experiment `%s' with peer `%s'\n"
+msgid "`%s' must be installed SUID, EXIT will not work\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:276
-#, c-format
-msgid "Starting outbound experiment `%s' with peer `%s'\n"
+#: src/exit/gnunet-daemon-exit.c:3815 src/pt/gnunet-daemon-pt.c:1202
+msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:294
-#, c-format
-msgid "Received %s message from peer %s for experiment `%s'\n"
+#: src/exit/gnunet-daemon-exit.c:3964
+msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:270
+#: src/fragmentation/defragmentation.c:273
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:456
+#: src/fragmentation/defragmentation.c:466
+#: src/transport/plugin_transport_wlan.c:1552
 msgid "# fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:521
+#: src/fragmentation/defragmentation.c:536
 msgid "# duplicate fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:534
+#: src/fragmentation/defragmentation.c:554
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:208
+#: src/fragmentation/fragmentation.c:238
 msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:211
+#: src/fragmentation/fragmentation.c:243
 msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:237
+#: src/fragmentation/fragmentation.c:276
 msgid "# fragments wrap arounds"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:281
+#: src/fragmentation/fragmentation.c:323
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:284
+#: src/fragmentation/fragmentation.c:329
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:405
+#: src/fragmentation/fragmentation.c:454
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:411
+#: src/fragmentation/fragmentation.c:461
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:435
+#: src/fragmentation/fragmentation.c:485
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:465
+#: src/fs/fs_api.c:497
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:474
+#: src/fs/fs_api.c:508
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:480
+#: src/fs/fs_api.c:516
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1066
+#: src/fs/fs_api.c:1124
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1571
+#: src/fs/fs_api.c:1644
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1585
+#: src/fs/fs_api.c:1660
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2242
+#: src/fs/fs_api.c:2320
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2252
+#: src/fs/fs_api.c:2330
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2619
+#: src/fs/fs_api.c:2458 src/fs/fs_api.c:2704
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2395
+#: src/fs/fs_api.c:2476
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2409 src/fs/fs_api.c:2428 src/fs/fs_api.c:2911
+#: src/fs/fs_api.c:2491 src/fs/fs_api.c:2510 src/fs/fs_api.c:3014
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2610
+#: src/fs/fs_api.c:2694
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2855
+#: src/fs/fs_api.c:2957
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2949
+#: src/fs/fs_api.c:3052
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_directory.c:208
+#: src/fs/fs_directory.c:211
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:322
-msgid "Recursive downloads of directories larger than 4 GB are not supported 
on 32-bit systems\n"
+#: src/fs/fs_download.c:308
+msgid ""
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:342
+#: src/fs/fs_download.c:333
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:523 src/fs/fs_download.c:535
+#: src/fs/fs_download.c:345
+#, c-format
+msgid ""
+"Failed to access full directroy contents of `%s' for recursive download\n"
+msgstr ""
+
+#: src/fs/fs_download.c:532 src/fs/fs_download.c:544
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr ""
 
-#: src/fs/fs_download.c:905
+#: src/fs/fs_download.c:954
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:987
+#: src/fs/fs_download.c:1045
 #, c-format
-msgid "Internal error or bogus download URI (expected %u bytes at depth %u and 
offset %llu/%llu, got %u bytes)"
+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:1013
+#: src/fs/fs_download.c:1073
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1036
+#: src/fs/fs_download.c:1097
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1046
+#: src/fs/fs_download.c:1109
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1055
+#: src/fs/fs_download.c:1118
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1153
+#: src/fs/fs_download.c:1218
 msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1944
+#: src/fs/fs_download.c:1883
 msgid "Invalid URI"
 msgstr ""
 
-#: src/fs/fs_getopt.c:192
+#: src/fs/fs_getopt.c:224
 #, c-format
-msgid "Unknown metadata type in metadata option `%s'.  Using metadata type 
`unknown' instead.\n"
-msgstr ""
-
-#: src/fs/fs_list_indexed.c:90
-#, c-format
-msgid "Failed to receive response for `%s' request from `%s' service.\n"
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:113
+#: src/fs/fs_list_indexed.c:150
 #, c-format
-msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
+msgid "Failed to receive response from `%s' service.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:151
+#: src/fs/fs_list_indexed.c:194
 #, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr ""
@@ -2717,316 +2819,324 @@ msgstr ""
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:207
+#: src/fs/fs_namespace.c:205
 #, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:229
+#: src/fs/fs_namespace.c:230
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:320
+#: src/fs/fs_namespace.c:322
 #, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:466
+#: src/fs/fs_namespace.c:468
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:436
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:667 src/fs/fs_publish.c:684 src/fs/fs_publish.c:723
-#: src/fs/fs_publish.c:744 src/fs/fs_publish.c:768 src/fs/fs_publish.c:914
+#: src/fs/fs_publish.c:722 src/fs/fs_publish.c:776 src/fs/fs_publish.c:821
+#: src/fs/fs_publish.c:842 src/fs/fs_publish.c:872 src/fs/fs_publish.c:1138
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:669
-msgid "timeout on index-start request to `fs' service"
+#: src/fs/fs_publish.c:778
+msgid "error on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:681
-msgid "unknown error"
-msgstr ""
-
-#: src/fs/fs_publish.c:725
+#: src/fs/fs_publish.c:823
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:745
+#: src/fs/fs_publish.c:843
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:770
+#: src/fs/fs_publish.c:874
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:793
+#: src/fs/fs_publish.c:900
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:862
+#: src/fs/fs_publish.c:989 src/fs/fs_publish.c:1025
+msgid "Can not create LOC URI. Will continue with CHK instead.\n"
+msgstr ""
+
+#: src/fs/fs_publish.c:1092
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:868
+#: src/fs/fs_publish.c:1100
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:915
+#: src/fs/fs_publish.c:1140
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1151
+#: src/fs/fs_publish.c:1379
 #, c-format
-msgid "Insufficient space for publishing: %s"
+msgid "Datastore failure: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1243
+#: src/fs/fs_publish.c:1470
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:219
+#: src/fs/fs_publish_ksk.c:218
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish_ublock.c:219
+#: src/fs/fs_publish_ublock.c:239
 msgid "Internal error."
 msgstr ""
 
-#: src/fs/fs_search.c:813
+#: src/fs/fs_search.c:820 src/fs/fs_search.c:890
 #, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_search.c:872
+#: src/fs/fs_search.c:977
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:59
+#: src/fs/fs_unindex.c:61
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:64
+#: src/fs/fs_unindex.c:66
 msgid "Failed to read file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:234
-msgid "Unexpected time for a response from `fs' service."
+#: src/fs/fs_unindex.c:273
+msgid "Error communicating with `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:242
-msgid "Timeout waiting for `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:250
-msgid "Invalid response from `fs' service."
-msgstr ""
-
-#: src/fs/fs_unindex.c:291
+#: src/fs/fs_unindex.c:324
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:347 src/fs/fs_unindex.c:359
+#: src/fs/fs_unindex.c:374 src/fs/fs_unindex.c:386
 msgid "Failed to get KSKs from directory scan."
 msgstr ""
 
-#: src/fs/fs_unindex.c:355
+#: src/fs/fs_unindex.c:382
 #, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:414
+#: src/fs/fs_unindex.c:441
 #, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:562 src/fs/fs_unindex.c:626
+#: src/fs/fs_unindex.c:586 src/fs/fs_unindex.c:650
 msgid "Failed to connect to `datastore' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:639
+#: src/fs/fs_unindex.c:663
 msgid "Failed to open file for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:673
+#: src/fs/fs_unindex.c:702
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/fs_uri.c:222
+#: src/fs/fs_uri.c:232
 #, no-c-format
-msgid "`%' must be followed by HEX number"
+msgid "Malformed KSK URI (`%' must be followed by HEX number)"
 msgstr ""
 
-#: src/fs/fs_uri.c:281
+#: src/fs/fs_uri.c:291
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:299
-msgid "`++' not allowed in KSK URI"
+#: src/fs/fs_uri.c:309
+msgid "Malformed KSK URI (`++' not allowed)"
+msgstr ""
+
+#: src/fs/fs_uri.c:316
+msgid "Malformed KSK URI (quotes not balanced)"
+msgstr ""
+
+#: src/fs/fs_uri.c:386
+msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:306
-msgid "Quotes not balanced in KSK URI"
+#: src/fs/fs_uri.c:427
+msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:376
-msgid "Malformed SKS URI"
+#: src/fs/fs_uri.c:442
+msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
-msgid "Malformed CHK URI"
+#: src/fs/fs_uri.c:521
+msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:512 src/fs/fs_uri.c:580
-msgid "SKS URI malformed"
+#: src/fs/fs_uri.c:536
+msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:527 src/fs/fs_uri.c:537
-msgid "LOC URI malformed"
+#: src/fs/fs_uri.c:546
+msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:545 src/fs/fs_uri.c:553
+#: src/fs/fs_uri.c:554
+msgid "LOC URI malformed (wrong syntax for public key)"
+msgstr ""
+
+#: src/fs/fs_uri.c:562
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:559
-msgid "SKS URI malformed (could not find signature)"
+#: src/fs/fs_uri.c:568
+msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:565 src/fs/fs_uri.c:574
-msgid "SKS URI malformed (could not decode signature)"
+#: src/fs/fs_uri.c:574
+msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:586
-msgid "SKS URI malformed (could not parse expiration time)"
+#: src/fs/fs_uri.c:583
+msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
-msgid "SKS URI malformed (signature failed validation)"
+#: src/fs/fs_uri.c:589
+msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:636
-msgid "Unrecognized URI type"
+#: src/fs/fs_uri.c:595
+msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:860
-msgid "Lacking key configuration settings.\n"
+#: src/fs/fs_uri.c:607
+msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:866
-#, c-format
-msgid "Could not access hostkey file `%s'.\n"
+#: src/fs/fs_uri.c:641
+msgid "invalid argument"
 msgstr ""
 
-#: src/fs/fs_uri.c:1050 src/fs/fs_uri.c:1077
+#: src/fs/fs_uri.c:653
+msgid "Unrecognized URI type"
+msgstr ""
+
+#: src/fs/fs_uri.c:1057 src/fs/fs_uri.c:1084
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1083
+#: src/fs/fs_uri.c:1090
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:236
+#: src/fs/gnunet-auto-share.c:230
 #, c-format
 msgid "Failed to load state: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:289 src/fs/gnunet-auto-share.c:299
-#: src/fs/gnunet-auto-share.c:309
+#: src/fs/gnunet-auto-share.c:283 src/fs/gnunet-auto-share.c:293
+#: src/fs/gnunet-auto-share.c:303
 #, c-format
 msgid "Failed to save state to file %s\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:401
+#: src/fs/gnunet-auto-share.c:405
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:488
+#: src/fs/gnunet-auto-share.c:492
 #, c-format
 msgid "Publishing `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:497
+#: src/fs/gnunet-auto-share.c:502
 #, c-format
 msgid "Failed to run `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:686
+#: src/fs/gnunet-auto-share.c:711
 #, c-format
-msgid "You must specify one and only one directory name for automatic 
publication.\n"
+msgid ""
+"You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:824
+#: src/fs/gnunet-auto-share.c:765 src/fs/gnunet-publish.c:898
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:828
+#: src/fs/gnunet-auto-share.c:770 src/fs/gnunet-publish.c:902
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:831
+#: src/fs/gnunet-auto-share.c:775 src/fs/gnunet-publish.c:907
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855
+#: src/fs/gnunet-auto-share.c:781 src/fs/gnunet-publish.c:942
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862
+#: src/fs/gnunet-auto-share.c:787 src/fs/gnunet-publish.c:954
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:770
+#: src/fs/gnunet-auto-share.c:811
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:660
+#: src/fs/gnunet-daemon-fsprofiler.c:646
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:49
+#: src/fs/gnunet-directory.c:51
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:94
+#: src/fs/gnunet-directory.c:103
 #, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:97
+#: src/fs/gnunet-directory.c:106
 #, c-format
 msgid "Directory `%s' contents:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:132
+#: src/fs/gnunet-directory.c:141
 msgid "You must specify a filename to inspect.\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:145
+#: src/fs/gnunet-directory.c:154
 #, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:154
+#: src/fs/gnunet-directory.c:163
 #, c-format
 msgid "`%s' is not a GNUnet directory\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:183
+#: src/fs/gnunet-directory.c:192
 msgid "Display contents of a GNUnet directory"
 msgstr ""
 
@@ -3039,667 +3149,694 @@ msgstr ""
 msgid "<unknown time>"
 msgstr ""
 
-#: src/fs/gnunet-download.c:157
+#: src/fs/gnunet-download.c:156
 #, c-format
-msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to 
download\n"
+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:182
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:194
+#: src/fs/gnunet-download.c:199
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
-#: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-download.c:214 src/fs/gnunet-publish.c:293
+#: src/fs/gnunet-search.c:210 src/fs/gnunet-unindex.c:105
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:234
+#: src/fs/gnunet-download.c:244
 msgid "You need to specify a URI argument.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:665
+#: src/fs/gnunet-download.c:251 src/fs/gnunet-publish.c:724
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:247
+#: src/fs/gnunet-download.c:262
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:254
+#: src/fs/gnunet-download.c:271
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
-#: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
+#: src/fs/gnunet-download.c:289 src/fs/gnunet-publish.c:868
+#: src/fs/gnunet-search.c:268 src/fs/gnunet-unindex.c:137
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:289
+#: src/fs/gnunet-download.c:337 src/fs/gnunet-search.c:311
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:308
+#: src/fs/gnunet-download.c:342
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:292
+#: src/fs/gnunet-download.c:347 src/fs/gnunet-search.c:317
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:314
+#: src/fs/gnunet-download.c:352
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:318
+#: src/fs/gnunet-download.c:357
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:322
+#: src/fs/gnunet-download.c:362
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:325
+#: src/fs/gnunet-download.c:366
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:339
-msgid "Download files from GNUnet using a GNUnet CHK or LOC URI 
(gnunet://fs/chk/...)"
+#: src/fs/gnunet-download.c:384
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
 msgstr ""
 
 #: src/fs/gnunet-fs.c:117
 msgid "print a list of all indexed files"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:127
+#: src/fs/gnunet-fs.c:128
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:193
+#: src/fs/gnunet-fs-profiler.c:209
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:196
+#: src/fs/gnunet-fs-profiler.c:215
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:199
+#: src/fs/gnunet-fs-profiler.c:221
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:208
+#: src/fs/gnunet-fs-profiler.c:231
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
+#: src/fs/gnunet-publish.c:217 src/fs/gnunet-publish.c:229
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:250
+#: src/fs/gnunet-publish.c:237
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:260
+#: src/fs/gnunet-publish.c:244
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:249
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr ""
 "L'URI è `%s'.\n"
 "\n"
 
-#: src/fs/gnunet-publish.c:283
-msgid "Cleanup after abort complete.\n"
+#: src/fs/gnunet-publish.c:257
+#, fuzzy, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr ""
+"L'URI è `%s'.\n"
+"\n"
+
+#: src/fs/gnunet-publish.c:273
+msgid "Starting cleanup after abort\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:401
+#: src/fs/gnunet-publish.c:280
+msgid "Cleanup after abort completed.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:286
+msgid "Cleanup after abort failed.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:428
 #, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:403
+#: src/fs/gnunet-publish.c:433
 #, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:542
+#: src/fs/gnunet-publish.c:587
 msgid "Could not publish\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:612
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:598
+#: src/fs/gnunet-publish.c:646
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:600
+#: src/fs/gnunet-publish.c:650
 #, c-format
 msgid "Scanning file `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:656
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:610
+#: src/fs/gnunet-publish.c:663
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:614
+#: src/fs/gnunet-publish.c:668
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-publish.c:675
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:625
+#: src/fs/gnunet-publish.c:684
 msgid "Internal error scanning directory.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:656
+#: src/fs/gnunet-publish.c:712
 #, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:682
+#: src/fs/gnunet-publish.c:745
 #, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:695
-msgid "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs 
installed?\n"
+#: src/fs/gnunet-publish.c:759
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:815
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:754
+#: src/fs/gnunet-publish.c:822
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:760
+#: src/fs/gnunet-publish.c:828
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:836 src/vpn/gnunet-vpn.c:208
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1284 src/transport/gnunet-transport.c:1314
-#: src/transport/gnunet-transport.c:1344
+#: src/fs/gnunet-publish.c:847 src/fs/gnunet-publish.c:855
+#: src/transport/gnunet-transport.c:1280 src/transport/gnunet-transport.c:1307
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:835
-msgid "print list of extracted keywords that would be used, but do not perform 
upload"
+#: src/fs/gnunet-publish.c:911
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:839
-msgid "add an additional keyword for the top-level file or directory (this 
option can be specified multiple times)"
+#: src/fs/gnunet-publish.c:917
+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:843
+#: src/fs/gnunet-publish.c:923
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:846
-msgid "do not index, perform full insertion (stores entire file in encrypted 
form in GNUnet database)"
+#: src/fs/gnunet-publish.c:928
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:851
-msgid "specify ID of an updated version to be published in the future (for 
namespace insertions only)"
+#: src/fs/gnunet-publish.c:935
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:859
+#: src/fs/gnunet-publish.c:948
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:865
-msgid "only simulate the process but do not do any actual publishing (useful 
to compute URIs)"
+#: src/fs/gnunet-publish.c:958
+msgid ""
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:869
-msgid "set the ID of this version of the publication (for namespace insertions 
only)"
+#: src/fs/gnunet-publish.c:964
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:873
-msgid "URI to be published (can be used instead of passing a file to add 
keywords to the file with the respective URI)"
+#: src/fs/gnunet-publish.c:971
+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:889
+#: src/fs/gnunet-publish.c:987
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:114
+#: src/fs/gnunet-search.c:125
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:191
+#: src/fs/gnunet-search.c:202
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:240
+#: src/fs/gnunet-search.c:258
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:264
+#: src/fs/gnunet-search.c:282
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:295
+#: src/fs/gnunet-search.c:323
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:298
+#: src/fs/gnunet-search.c:329
 msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:305
+#: src/fs/gnunet-search.c:338
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:316
+#: src/fs/gnunet-search.c:351
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:271
+#: src/fs/gnunet-service-fs.c:375 src/fs/gnunet-service-fs.c:880
+msgid "# client searches active"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:434
+msgid "# replies received for local clients"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:603
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
+#: src/fs/gnunet-service-fs.c:655 src/fs/gnunet-service-fs_cp.c:562
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
-#: src/topology/gnunet-daemon-topology.c:1254
-#: src/topology/gnunet-daemon-topology.c:1261
+#: src/fs/gnunet-service-fs.c:834
+msgid "# client searches received"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:873
+msgid "# client searches updated (merged content seen list)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs.c:1044
 #, c-format
-msgid "Failed to connect to `%s' service.\n"
+msgid "Hash mismatch trying to index file `%s' which does not have hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:682
-msgid "# migration stop messages received"
+#: src/fs/gnunet-service-fs.c:1284
+msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:686
+#: src/fs/gnunet-service-fs.c:1309 src/hostlist/gnunet-daemon-hostlist.c:353
+#: src/topology/gnunet-daemon-topology.c:1200
 #, c-format
-msgid "Migration of content to peer `%s' blocked for %s\n"
+msgid "Failed to connect to `%s' service.\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_client.c:368
+msgid "# replies received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:721
-msgid "# replies transmitted to other peers"
+#: src/fs/gnunet-service-fs_cadet_client.c:382
+msgid "# replies received via cadet dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:727
-msgid "# replies dropped"
+#: src/fs/gnunet-service-fs_cadet_server.c:263
+msgid "# queries received via CADET not answered"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301
+#: src/fs/gnunet-service-fs_cadet_server.c:318
+msgid "# Blocks transferred via cadet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:344
+msgid "# queries received via cadet"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cadet_server.c:386
+#, fuzzy
+msgid "# cadet client connections rejected"
+msgstr "# connessioni attive"
+
+#: src/fs/gnunet-service-fs_cadet_server.c:393
+#: src/fs/gnunet-service-fs_cadet_server.c:433
+#, fuzzy
+msgid "# cadet connections active"
+msgstr "# connessioni attive"
+
+#: src/fs/gnunet-service-fs_cp.c:684
+msgid "# migration stop messages received"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:688
+#, c-format
+msgid "Migration of content to peer `%s' blocked for %s\n"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_cp.c:721 src/fs/gnunet-service-fs_cp.c:1343
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:845
+#: src/fs/gnunet-service-fs_cp.c:816
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:898
+#: src/fs/gnunet-service-fs_cp.c:873
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:906
+#: src/fs/gnunet-service-fs_cp.c:881
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:920
+#: src/fs/gnunet-service-fs_cp.c:895
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:958
+#: src/fs/gnunet-service-fs_cp.c:942
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1026
+#: src/fs/gnunet-service-fs_cp.c:1013
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1051
+#: src/fs/gnunet-service-fs_cp.c:1038
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1061
+#: src/fs/gnunet-service-fs_cp.c:1048
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1139
-msgid "# GET requests received (from other peers)"
+#: src/fs/gnunet-service-fs_cp.c:1146
+msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1173
-msgid "# requests dropped due to initiator not being connected"
+#: src/fs/gnunet-service-fs_cp.c:1203
+msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1195
+#: src/fs/gnunet-service-fs_cp.c:1226
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1246
-msgid "# requests dropped due TTL underflow"
+#: src/fs/gnunet-service-fs_cp.c:1239
+msgid "# requests dropped due to full reply queue"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1270
-msgid "# requests dropped due to higher-TTL request"
+#: src/fs/gnunet-service-fs_cp.c:1295
+msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1299
+#: src/fs/gnunet-service-fs_cp.c:1339
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1670
+#: src/fs/gnunet-service-fs_cp.c:1706
 msgid "# migration stop messages sent"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:181
+#: src/fs/gnunet-service-fs_indexing.c:132
+#: src/fs/gnunet-service-fs_indexing.c:193
 #, c-format
 msgid "Could not open `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:142
+#: src/fs/gnunet-service-fs_indexing.c:149
 #, c-format
 msgid "Error writing `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:237
-#, c-format
-msgid "Index request received for file `%s' is already indexed as `%s'.  
Permitting anyway.\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:275
-#, c-format
-msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_indexing.c:477
+#: src/fs/gnunet-service-fs_indexing.c:251
 #, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:542
+#: src/fs/gnunet-service-fs_indexing.c:329
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:557
+#: src/fs/gnunet-service-fs_indexing.c:355
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:559
+#: src/fs/gnunet-service-fs_indexing.c:359
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:574
+#: src/fs/gnunet-service-fs_indexing.c:392
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
-msgid "# client searches active"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_lc.c:256
-msgid "# replies received for local clients"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_lc.c:327
-msgid "# client searches received"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_lc.c:362
-msgid "# client searches updated (merged content seen list)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_client.c:484
-msgid "# replies received via mesh"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_client.c:498
-msgid "# replies received via mesh dropped"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_server.c:260
-msgid "# Blocks transferred via mesh"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_server.c:352
-msgid "# queries received via mesh not answered"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_server.c:432
-msgid "# queries received via mesh"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_server.c:476
-msgid "# mesh client connections rejected"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_mesh_server.c:482
-#: src/fs/gnunet-service-fs_mesh_server.c:522
-msgid "# mesh connections active"
+#: src/fs/gnunet-service-fs_indexing.c:516
+#, c-format
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:269
+#: src/fs/gnunet-service-fs_pe.c:263
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:400
-msgid "# transmission failed (core has no bandwidth)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:433
-msgid "# query messages sent to other peers"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pe.c:484
+#: src/fs/gnunet-service-fs_pe.c:425
 msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:492
+#: src/fs/gnunet-service-fs_pe.c:436
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:552
+#: src/fs/gnunet-service-fs_pe.c:464
+msgid "# query messages sent to other peers"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:534
 msgid "# requests merged"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:560
+#: src/fs/gnunet-service-fs_pe.c:544
 msgid "# requests refreshed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:616 src/fs/gnunet-service-fs_pe.c:700
-#: src/fs/gnunet-service-fs_pe.c:771
+#: src/fs/gnunet-service-fs_pe.c:604 src/fs/gnunet-service-fs_pe.c:707
+#: src/fs/gnunet-service-fs_pe.c:786
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:311
+#: src/fs/gnunet-service-fs_pr.c:328
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:394 src/fs/gnunet-service-fs_pr.c:645
+#: src/fs/gnunet-service-fs_pr.c:428 src/fs/gnunet-service-fs_pr.c:675
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:814
+#: src/fs/gnunet-service-fs_pr.c:856
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:844
+#: src/fs/gnunet-service-fs_pr.c:892
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:853
+#: src/fs/gnunet-service-fs_pr.c:901
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:867
+#: src/fs/gnunet-service-fs_pr.c:916
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:880
+#: src/fs/gnunet-service-fs_pr.c:933
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1001
+#: src/fs/gnunet-service-fs_pr.c:1063
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1029
+#: src/fs/gnunet-service-fs_pr.c:1091
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1064
+#: src/fs/gnunet-service-fs_pr.c:1129
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1192
-msgid "# Replies received from MESH"
+#: src/fs/gnunet-service-fs_pr.c:1260
+msgid "# Replies received from CADET"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1312
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1264
+#: src/fs/gnunet-service-fs_pr.c:1333
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1393
+msgid "# requested DBLOCK or IBLOCK not found"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1452
+msgid "# Datastore lookups concluded (error queueing)"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:1507
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1326
+#: src/fs/gnunet-service-fs_pr.c:1522
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1335
+#: src/fs/gnunet-service-fs_pr.c:1546
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1350
-msgid "# requested DBLOCK or IBLOCK not found"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:1364
+#: src/fs/gnunet-service-fs_pr.c:1560
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1377
+#: src/fs/gnunet-service-fs_pr.c:1581
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1382
+#: src/fs/gnunet-service-fs_pr.c:1586
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
-#: src/fs/gnunet-service-fs_pr.c:1590
-msgid "# Datastore lookups concluded (error queueing)"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_pr.c:1467
+#: src/fs/gnunet-service-fs_pr.c:1624
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1637
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1566
+#: src/fs/gnunet-service-fs_pr.c:1691
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1651
+#: src/fs/gnunet-service-fs_pr.c:1747
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:631
+#: src/fs/gnunet-service-fs_push.c:644
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:89
+#: src/fs/gnunet-unindex.c:87
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:95
+#: src/fs/gnunet-unindex.c:93
 #, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:100
+#: src/fs/gnunet-unindex.c:98
 msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:130
+#: src/fs/gnunet-unindex.c:127
 #, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:147
+#: src/fs/gnunet-unindex.c:144
 msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:179
+#: src/fs/gnunet-unindex.c:176
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:393
-msgid "Failed to deserialize lookup reply from GNS service!\n"
+#: src/gns/gns_tld_api.c:274
+msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:123
+#: src/gns/gnunet-bcd.c:125
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
+#: src/gns/gnunet-bcd.c:355
 #, c-format
-msgid "Invalid port number %llu.  Exiting.\n"
+msgid "Invalid port number %u.  Exiting.\n"
 msgstr ""
 
 #: src/gns/gnunet-bcd.c:360
 #, c-format
-msgid "Businesscard HTTP server starts on %llu\n"
+msgid "Businesscard HTTP server starts on %u\n"
 msgstr ""
 
 #: src/gns/gnunet-bcd.c:374
@@ -3707,2158 +3844,2515 @@ msgstr ""
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:519
+#: src/gns/gnunet-bcd.c:521
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:531
+#: src/gns/gnunet-bcd.c:534
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:228
+#: src/gns/gnunet-dns2gns.c:201
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:400
+#: src/gns/gnunet-dns2gns.c:403
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:416
+#: src/gns/gnunet-dns2gns.c:419
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:424
+#: src/gns/gnunet-dns2gns.c:427
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:701
-msgid "No ego configured for `dns2gns` subsystem\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:727
+#: src/gns/gnunet-dns2gns.c:586
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:749
-msgid "No valid GNS zone specified!\n"
-msgstr ""
-
-#: src/gns/gnunet-dns2gns.c:770
+#: src/gns/gnunet-dns2gns.c:686
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:773
-msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
+#: src/gns/gnunet-dns2gns.c:691
+msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:776
-msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+#: src/gns/gnunet-dns2gns.c:708
+msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:779
-msgid "UDP port to listen on for inbound DNS requests; default: 53"
+#: src/gns/gnunet-gns-benchmark.c:580
+msgid "how long to wait between queries"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:782
-msgid "Public key of the GNS zone to use (overrides default)"
+#: src/gns/gnunet-gns-benchmark.c:585
+msgid "how long to wait for an answer"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:795
-msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
+#: src/gns/gnunet-gns-benchmark.c:589
+msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:227
+#: src/gns/gnunet-gns.c:197
 #, c-format
-msgid "Please specify name to lookup!\n"
+msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:308
-#, c-format
-msgid "Ego for `%s' not found, cannot perform lookup.\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:347 src/gns/gnunet-gns-helper-service-w32.c:798
-#, c-format
-msgid "Ego for `gns-master' not found, cannot perform lookup.  Did you run 
gnunet-gns-import.sh?\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:386 src/gns/gnunet-gns-helper-service-w32.c:828
-#, c-format
-msgid "Failed to connect to GNS\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:399
-#, c-format
-msgid "Public key `%s' is not well-formed\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:449
+#: src/gns/gnunet-gns.c:231
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:452
+#: src/gns/gnunet-gns.c:236
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:455
-msgid "Specify timeout for the lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:458
+#: src/gns/gnunet-gns.c:240
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:461
-msgid "Specify the public key of the zone to lookup the record in"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:464
-msgid "Specify the name of the ego of the zone to lookup the record in"
+#: src/gns/gnunet-gns.c:256
+msgid "GNUnet GNS resolver tool"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:478
-msgid "GNUnet GNS resolver tool"
+#: src/gns/gnunet-gns-helper-service-w32.c:600
+msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:768
-#, c-format
-msgid "Ego for `gns-short' not found. This is not really fatal, but i'll 
pretend that it is and refuse to perform a lookup.  Did you run 
gnunet-gns-import.sh?\n"
+#: src/gns/gnunet-gns-helper-service-w32.c:699
+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:838
+#: src/gns/gnunet-gns-helper-service-w32.c:737
 #, c-format
 msgid "Failed to connect to identity service\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-import.c:479
+#: src/gns/gnunet-gns-import.c:450
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:105 src/hostlist/hostlist-client.c:469
-#: src/hostlist/hostlist-client.c:683 src/hostlist/hostlist-client.c:689
-#: src/hostlist/hostlist-client.c:741 src/hostlist/hostlist-client.c:750
-#: src/hostlist/hostlist-client.c:871 src/hostlist/hostlist-client.c:963
-#: src/hostlist/hostlist-client.c:968
-#: src/transport/plugin_transport_http_client.c:1062
-#: src/transport/plugin_transport_http_client.c:1077
+#: src/gns/gnunet-gns-proxy.c:110
+#: src/hostlist/gnunet-daemon-hostlist_client.c:533
+#: src/hostlist/gnunet-daemon-hostlist_client.c:751
+#: src/hostlist/gnunet-daemon-hostlist_client.c:757
+#: src/hostlist/gnunet-daemon-hostlist_client.c:809
+#: src/hostlist/gnunet-daemon-hostlist_client.c:818
+#: src/hostlist/gnunet-daemon-hostlist_client.c:929
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1024
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1029
+#: src/transport/plugin_transport_http_client.c:596
+#: src/transport/plugin_transport_http_client.c:614
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:833
+#: src/gns/gnunet-gns-proxy.c:960
 #, c-format
-msgid "Unsupported CURL SSL backend %d\n"
+msgid "Unsupported CURL TLS backend %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:856
+#: src/gns/gnunet-gns-proxy.c:985
 #, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:879
+#: src/gns/gnunet-gns-proxy.c:1008
 #, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:892
+#: src/gns/gnunet-gns-proxy.c:1021
 #, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:907
+#: src/gns/gnunet-gns-proxy.c:1036
 #, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:917
+#: src/gns/gnunet-gns-proxy.c:1046
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:941
+#: src/gns/gnunet-gns-proxy.c:1070
 #, c-format
-msgid "SSL certificate subject name (%s) does not match `%s'\n"
+msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1086
+#: src/gns/gnunet-gns-proxy.c:1200
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1602
+#: src/gns/gnunet-gns-proxy.c:2062
 #, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1973
+#: src/gns/gnunet-gns-proxy.c:2583
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2003
+#: src/gns/gnunet-gns-proxy.c:2615
 #, c-format
-msgid "Unable to import certificate %s\n"
+msgid "Unable to import certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2177
+#: src/gns/gnunet-gns-proxy.c:2814
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2196
+#: src/gns/gnunet-gns-proxy.c:2839 src/rest/gnunet-rest-server.c:656
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2504
+#: src/gns/gnunet-gns-proxy.c:3169
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2533
+#: src/gns/gnunet-gns-proxy.c:3198
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
-msgid "SSL connection to plain IPv4 address requested\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:2631
+#: src/gns/gnunet-gns-proxy.c:3280
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2970
-msgid "No ego configured for `shorten-zone`\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:3010
-#, c-format
-msgid "No ego configured for `%s`\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-proxy.c:3072
+#: src/gns/gnunet-gns-proxy.c:3570
 #, 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:3113
+#: src/gns/gnunet-gns-proxy.c:3698
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3116
+#: src/gns/gnunet-gns-proxy.c:3703
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3135
+#: src/gns/gnunet-gns-proxy.c:3707
+msgid "disable use of IPv6"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:3733
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:862
-msgid "Failed to connect to the namestore!\n"
+#: src/gns/gnunet-service-gns.c:511
+msgid "Properly base32-encoded public key required"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:870
+#: src/gns/gnunet-service-gns.c:547
 msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:903
+#: src/gns/gnunet-service-gns.c:566
+#: src/zonemaster/gnunet-service-zonemaster.c:873
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:438
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:919
-msgid "valid public key required"
-msgstr ""
-
-#: src/gns/gnunet-service-gns_interceptor.c:263
+#: src/gns/gnunet-service-gns_interceptor.c:257
 msgid "Error converting GNS response to DNS response!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_interceptor.c:369
+#: src/gns/gnunet-service-gns_interceptor.c:364
 msgid "Failed to connect to the DNS service!\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:816
+#: src/gns/gnunet-service-gns_resolver.c:717
+#, c-format
+msgid "Protocol `%s' unknown, skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:728
+#, c-format
+msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:931
 msgid "Failed to parse DNS response\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:958
+#: src/gns/gnunet-service-gns_resolver.c:1112
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1317
+#: src/gns/gnunet-service-gns_resolver.c:1382
+#, c-format
+msgid "VPN returned empty result for `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1823
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1817
+#: src/gns/gnunet-service-gns_resolver.c:1866
+#, c-format
+msgid "GNS lookup failed (zero records found for `%s')\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:2281
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1841
+#: src/gns/gnunet-service-gns_resolver.c:2304
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2123
+#: src/gns/gnunet-service-gns_resolver.c:2467
 #, c-format
-msgid "Zone %s was revoked, resolution fails\n"
+msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2272
+#: src/gns/gnunet-service-gns_resolver.c:2602
 #, c-format
-msgid "Hostname `%s' is not well-formed, resolution fails\n"
+msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:151
+#: src/gns/plugin_gnsrecord_gns.c:179
 #, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:180
+#: src/gns/plugin_gnsrecord_gns.c:210
 #, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:231
 #, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:217
+#: src/gns/plugin_gnsrecord_gns.c:256
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:293
+#: src/gns/plugin_gnsrecord_gns.c:292
+#, c-format
+msgid "Unable to parse BOX record string `%s'\n"
+msgstr ""
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:357
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:314
+#: src/gnsrecord/plugin_gnsrecord_dns.c:378
 #, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:336
+#: src/gnsrecord/plugin_gnsrecord_dns.c:400
 #, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:420
+#: src/gnsrecord/plugin_gnsrecord_dns.c:485
 #, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:452
+#: src/gnsrecord/plugin_gnsrecord_dns.c:521
 #, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:471
+#: src/gnsrecord/plugin_gnsrecord_dns.c:540
 #, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:494
+#: src/gnsrecord/plugin_gnsrecord_dns.c:563
 #, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:514
+#: src/gnsrecord/plugin_gnsrecord_dns.c:586
 #, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:529
+#: src/gnsrecord/plugin_gnsrecord_dns.c:601
 #, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:549
+#: src/gnsrecord/plugin_gnsrecord_dns.c:628
+#, c-format
+msgid "Unable to parse SRV record `%s'\n"
+msgstr ""
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:644
+#, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr ""
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:661
 #, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr ""
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:567
+#: src/gnsrecord/plugin_gnsrecord_dns.c:685
+#: src/gnsrecord/plugin_gnsrecord_dns.c:701
 #, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:123
+#: src/hello/gnunet-hello.c:124
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:129
+#: src/hello/gnunet-hello.c:130
 #, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:137
+#: src/hello/gnunet-hello.c:138
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:144
+#: src/hello/gnunet-hello.c:145
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183
+#: src/hello/gnunet-hello.c:155 src/hello/gnunet-hello.c:196
 #, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:170
+#: src/hello/gnunet-hello.c:172
 #, c-format
 msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:195
+#: src/hello/gnunet-hello.c:208
 #, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:203
+#: src/hello/gnunet-hello.c:217
 #, c-format
-msgid "Modified %u addresses \n"
+msgid "Modified %u addresses, wrote %u bytes\n"
 msgstr ""
 
-#: src/hello/hello.c:944
+#: src/hello/hello.c:1108
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:953
+#: src/hello/hello.c:1117
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 
-#: src/hello/hello.c:963
+#: src/hello/hello.c:1127
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr ""
 
-#: src/hello/hello.c:973
+#: src/hello/hello.c:1138
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:990
+#: src/hello/hello.c:1156
 #, c-format
-msgid "Plugin `%s' not found\n"
+msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:999
+#: src/hello/hello.c:1164
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1018
+#: src/hello/hello.c:1179
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:259
-msgid "None of the functions for the hostlist daemon were enabled.  I have no 
reason to run!\n"
+#: src/hostlist/gnunet-daemon-hostlist.c:314
+msgid ""
+"None of the functions for the hostlist daemon were enabled.  I have no "
+"reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:308
+#: src/hostlist/gnunet-daemon-hostlist.c:374
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:313
-msgid "bootstrap using hostlists (it is highly recommended that you always use 
this option)"
+#: src/hostlist/gnunet-daemon-hostlist.c:379
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:383
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:320
+#: src/hostlist/gnunet-daemon-hostlist.c:388
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:335
+#: src/hostlist/gnunet-daemon-hostlist.c:404
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:288
+#: src/hostlist/gnunet-daemon-hostlist_client.c:347
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:309 src/hostlist/hostlist-client.c:339
+#: src/hostlist/gnunet-daemon-hostlist_client.c:368
+#: src/hostlist/gnunet-daemon-hostlist_client.c:401
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:312 src/hostlist/hostlist-client.c:342
+#: src/hostlist/gnunet-daemon-hostlist_client.c:371
+#: src/hostlist/gnunet-daemon-hostlist_client.c:404
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:330
+#: src/hostlist/gnunet-daemon-hostlist_client.c:389
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1333
+#: src/hostlist/gnunet-daemon-hostlist_client.c:659
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1405
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/hostlist/gnunet-daemon-hostlist_client.c:689
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:664
+#: src/hostlist/gnunet-daemon-hostlist_client.c:732
 #, c-format
-msgid "Advertised hostlist with URI `%s' could not be downloaded. Advertised 
URI gets dismissed.\n"
+msgid ""
+"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
+"gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:802
+#: src/hostlist/gnunet-daemon-hostlist_client.c:860
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:816
+#: src/hostlist/gnunet-daemon-hostlist_client.c:874
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:836
+#: src/hostlist/gnunet-daemon-hostlist_client.c:894
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/gnunet-daemon-hostlist_client.c:900
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:850
+#: src/hostlist/gnunet-daemon-hostlist_client.c:908
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:903
+#: src/hostlist/gnunet-daemon-hostlist_client.c:961
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:911
+#: src/hostlist/gnunet-daemon-hostlist_client.c:969
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1040 src/hostlist/hostlist-client.c:1506
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1096
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1663
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1049
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1105
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1164
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1185
 msgid "# active connections"
 msgstr "# connessioni attive"
 
-#: src/hostlist/hostlist-client.c:1280
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1351
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1285
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1356
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1296
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1365
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1329
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1399
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1402
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1376
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1448
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1381
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1455
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1479
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1496
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1417
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1491
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1471
-msgid "Learning is enabled on this peer\n"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1593
+#: src/transport/plugin_transport_http_client.c:2272
+#, c-format
+msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
-msgid "Learning is not enabled on this peer\n"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1622
+msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1495
-#, c-format
-msgid "Since learning is not enabled on this peer, hostlist file `%s' was 
removed\n"
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1636
+msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1499
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1649
 #, c-format
-msgid "Hostlist file `%s' could not be removed\n"
+msgid ""
+"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:137
+#: src/hostlist/gnunet-daemon-hostlist_server.c:174
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:161
+#: src/hostlist/gnunet-daemon-hostlist_server.c:199
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425
-#: src/peerinfo-tool/gnunet-peerinfo.c:350
-#: src/peerinfo-tool/gnunet-peerinfo.c:419
-#: src/peerinfo-tool/gnunet-peerinfo.c:490
-#: src/topology/gnunet-daemon-topology.c:925
+#: src/hostlist/gnunet-daemon-hostlist_server.c:235
+#: src/hostlist/gnunet-daemon-hostlist_server.c:529
+#: src/peerinfo-tool/gnunet-peerinfo.c:383
+#: src/peerinfo-tool/gnunet-peerinfo.c:532
+#: src/topology/gnunet-daemon-topology.c:860
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:210
+#: src/hostlist/gnunet-daemon-hostlist_server.c:259
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:224
+#: src/hostlist/gnunet-daemon-hostlist_server.c:276
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:268
+#: src/hostlist/gnunet-daemon-hostlist_server.c:380
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:271
+#: src/hostlist/gnunet-daemon-hostlist_server.c:383
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:284
+#: src/hostlist/gnunet-daemon-hostlist_server.c:395
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:288
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:296
+#: src/hostlist/gnunet-daemon-hostlist_server.c:406
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/gnunet-daemon-hostlist_server.c:409
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:303
+#: src/hostlist/gnunet-daemon-hostlist_server.c:414
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:304
+#: src/hostlist/gnunet-daemon-hostlist_server.c:416
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:346
+#: src/hostlist/gnunet-daemon-hostlist_server.c:464
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:390
-msgid "Advertisement message could not be queued by core\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:677
+#: src/transport/gnunet-service-transport.c:2813
+msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639
-#: src/transport/gnunet-service-transport.c:1114
-msgid "Could not access PEERINFO service.  Exiting.\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:689
+#, c-format
+msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:576
+#: src/hostlist/gnunet-daemon-hostlist_server.c:701
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:590
+#: src/hostlist/gnunet-daemon-hostlist_server.c:716
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:630
-#, c-format
-msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+#: src/hostlist/gnunet-daemon-hostlist_server.c:729
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr ""
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:746
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:673
+#: src/hostlist/gnunet-daemon-hostlist_server.c:767
+#, fuzzy, c-format
+msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr "`%s' non è un indirizzo IP valido.\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:787
+#, fuzzy, c-format
+msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
+msgstr "`%s' non è un indirizzo IP valido.\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:827
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:165
+#: src/identity/gnunet-identity.c:177
 #, c-format
 msgid "Failed to create ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:184
+#: src/identity/gnunet-identity.c:199
 #, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:327
+#: src/identity/gnunet-identity.c:354
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:330
+#: src/identity/gnunet-identity.c:360
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:333
+#: src/identity/gnunet-identity.c:365
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:336
-msgid "set default identity to EGO for a subsystem SUBSYSTEM (use together 
with -s)"
+#: src/identity/gnunet-identity.c:371
+msgid ""
+"set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:339
+#: src/identity/gnunet-identity.c:376
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:342
-msgid "set default identity to EGO for a subsystem SUBSYSTEM (use together 
with -e)"
+#: src/identity/gnunet-identity.c:382
+msgid ""
+"set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:351
+#: src/identity/gnunet-identity.c:396
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:338
+#: src/identity/gnunet-service-identity.c:389
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:362
+#: src/identity/gnunet-service-identity.c:414
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:439
-#: src/identity/gnunet-service-identity.c:670
-#: src/identity/gnunet-service-identity.c:778
+#: src/identity/gnunet-service-identity.c:505
+#: src/identity/gnunet-service-identity.c:788
+#: src/identity/gnunet-service-identity.c:916
 #, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:446
+#: src/identity/gnunet-service-identity.c:513
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:516
+#: src/identity/gnunet-service-identity.c:608
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:647
+#: src/identity/gnunet-service-identity.c:763
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:686
-#: src/identity/gnunet-service-identity.c:795
+#: src/identity/gnunet-service-identity.c:806
+#: src/identity/gnunet-service-identity.c:934
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:829
+#: src/identity/gnunet-service-identity.c:969
 #, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:902
+#: src/identity/gnunet-service-identity.c:1027
 #, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:914
+#: src/identity/gnunet-service-identity.c:1037
 #, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:357
+#: src/json/json.c:121
 #, c-format
-msgid "Invalid target `%s'\n"
+msgid "Failed to parse JSON in option `%s': %s (%s)\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:607
-#, c-format
-msgid "Invalid peer ID `%s'\n"
+#: src/multicast/gnunet-multicast.c:46 src/multicast/gnunet-multicast.c:70
+msgid "This command doesn't do anything yet."
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:650
+#: src/my/my.c:194 src/my/my.c:213
 #, c-format
-msgid "Invalid tunnel owner `%s'\n"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:716
-msgid "You must NOT give a TARGETwhen using 'request all' options\n"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:807
-msgid "provide information about a particular connection"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:810
-msgid "activate echo mode"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:816
-msgid "port to listen to (default; 0)"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:819 src/mesh/gnunet-mesh.c:822
-msgid "provide information about all peers"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:825
-msgid "provide information about a particular tunnel"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:828
-msgid "provide information about all tunnels"
-msgstr ""
-
-#: src/mesh/gnunet-service-mesh_peer.c:390
-msgid "Wrong CORE service\n"
+msgid "%s failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/mysql/mysql.c:174
+#: src/mysql/mysql.c:178
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/mysql/mysql.c:181
+#: src/mysql/mysql.c:185
 #, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:109
+#: src/namecache/gnunet-namecache.c:105
 #, c-format
 msgid "No records found for `%s'"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
+#: src/namecache/gnunet-namecache.c:120 src/namestore/gnunet-namestore.c:424
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:185
+#: src/namecache/gnunet-namecache.c:181
 #, c-format
 msgid "You must specify which zone should be accessed\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:695
+#: src/namecache/gnunet-namecache.c:191
 #, c-format
-msgid "Invalid public key for reverse lookup `%s'\n"
+msgid "Invalid public key for zone `%s'\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:203
+#: src/namecache/gnunet-namecache.c:199
 #, c-format
 msgid "You must specify a name\n"
 msgstr "È necessario specificare un nome\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:931
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1290
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:237
+#: src/namecache/gnunet-namecache.c:236
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:963
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1342
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
-#: src/namecache/namecache_api.c:276
+#: src/namecache/namecache_api.c:294
 msgid "Namecache failed to cache block"
 msgstr ""
 
-#: src/namecache/plugin_namecache_postgres.c:89
-#: src/namestore/plugin_namestore_postgres.c:96
-msgid "Failed to create indices\n"
+#: src/namecache/namecache_api.c:381
+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_heap.c:146
+#: src/namestore/plugin_namestore_heap.c:393
+#: src/peerstore/plugin_peerstore_flat.c:377
+#: src/peerstore/plugin_peerstore_flat.c:536
+#, c-format
+msgid "Unable to initialize file: %s.\n"
+msgstr ""
+
+#: src/namecache/plugin_namecache_flat.c:130
+#: src/namestore/plugin_namestore_heap.c:157
+#: src/peerstore/plugin_peerstore_flat.c:392
+#, c-format
+msgid "Unable to get filesize: %s.\n"
+msgstr ""
+
+#: src/namecache/plugin_namecache_flat.c:149
+#: src/namestore/plugin_namestore_heap.c:170
+#: src/peerstore/plugin_peerstore_flat.c:404
+#, c-format
+msgid "Unable to read file: %s.\n"
+msgstr ""
+
+#: src/namecache/plugin_namecache_flat.c:408
+msgid "flat plugin running\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:303
+#: src/namestore/gnunet-namestore.c:311
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:332
+#: src/namestore/gnunet-namestore.c:341
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:339
+#: src/namestore/gnunet-namestore.c:348
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:558
+#: src/namestore/gnunet-namestore.c:628 src/namestore/gnunet-namestore.c:636
 #, c-format
-msgid "No options given\n"
+msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:569
-#: src/namestore/gnunet-namestore-fcfsd.c:970
-msgid "Failed to connect to namestore\n"
+#: src/namestore/gnunet-namestore.c:650 src/namestore/gnunet-namestore.c:662
+#, c-format
+msgid "Records already exist under `%s', cannot add `%s' record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:675
+#, c-format
+msgid ""
+"Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:809
+#, c-format
+msgid "There are no records under label `%s' that could be deleted.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:850
+#, c-format
+msgid ""
+"There are no records under label `%s' that match the request for deletion.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:902
+#, c-format
+msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:577 src/namestore/gnunet-namestore.c:586
-#: src/namestore/gnunet-namestore.c:603 src/namestore/gnunet-namestore.c:625
-#: src/namestore/gnunet-namestore.c:665
+#: src/namestore/gnunet-namestore.c:921 src/namestore/gnunet-namestore.c:930
+#: src/namestore/gnunet-namestore.c:949 src/namestore/gnunet-namestore.c:972
+#: src/namestore/gnunet-namestore.c:1026
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:578 src/namestore/gnunet-namestore.c:587
-#: src/namestore/gnunet-namestore.c:604 src/namestore/gnunet-namestore.c:626
+#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:974
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:595
+#: src/namestore/gnunet-namestore.c:940
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:615
+#: src/namestore/gnunet-namestore.c:962
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:651
+#: src/namestore/gnunet-namestore.c:1007
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:666
+#: src/namestore/gnunet-namestore.c:1027
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:715
-#: src/peerinfo-tool/gnunet-peerinfo.c:723
+#: src/namestore/gnunet-namestore.c:1070
 #, c-format
-msgid "Invalid URI `%s'\n"
+msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:750
+#: src/namestore/gnunet-namestore.c:1099
+#: src/peerinfo-tool/gnunet-peerinfo.c:773
 #, c-format
-msgid "Invalid nick `%s'\n"
+msgid "Invalid URI `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:790
+#: src/namestore/gnunet-namestore.c:1134
 #, c-format
-msgid "Ego `%s' not known to identity service\n"
+msgid "Invalid nick `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:817
+#: src/namestore/gnunet-namestore.c:1174
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:853
-#, c-format
-msgid "Identity service is not running\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:865
+#: src/namestore/gnunet-namestore.c:1238
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore.c:1263
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:916
+#: src/namestore/gnunet-namestore.c:1267
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:919
+#: src/namestore/gnunet-namestore.c:1271
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:922
-msgid "expiration time for record to use (for adding only), \"never\" is 
possible"
+#: src/namestore/gnunet-namestore.c:1276
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:925
+#: src/namestore/gnunet-namestore.c:1281
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:928
+#: src/namestore/gnunet-namestore.c:1285
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:934
+#: src/namestore/gnunet-namestore.c:1295
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:937
+#: src/namestore/gnunet-namestore.c:1300
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:940
+#: src/namestore/gnunet-namestore.c:1305
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:943
+#: src/namestore/gnunet-namestore.c:1310
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:946
+#: src/namestore/gnunet-namestore.c:1314
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:949
-msgid "create shadow record (only valid if all other records of the same type 
have expired"
+#: src/namestore/gnunet-namestore.c:1318
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:952
+#: src/namestore/gnunet-namestore.c:1323
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:464
+#: src/namestore/gnunet-namestore-fcfsd.c:547
 #, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:491
+#: src/namestore/gnunet-namestore-fcfsd.c:574
 #, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:525
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:595
+msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:534
-msgid "Error when mapping zone to name\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:627
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:596
+#: src/namestore/gnunet-namestore-fcfsd.c:687
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:652
+#: src/namestore/gnunet-namestore-fcfsd.c:775
 #, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:668
+#: src/namestore/gnunet-namestore-fcfsd.c:794
 #, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:704
+#: src/namestore/gnunet-namestore-fcfsd.c:830
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:712
+#: src/namestore/gnunet-namestore-fcfsd.c:839
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:910
+#: src/namestore/gnunet-namestore-fcfsd.c:1069
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:936
+#: src/namestore/gnunet-namestore-fcfsd.c:1097
 msgid "Failed to start HTTP server\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:978
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
 msgid "Failed to connect to identity\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1011
+#: src/namestore/gnunet-namestore-fcfsd.c:1171
+msgid "name of the zone that is to be managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1190
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:655
+#: src/namestore/gnunet-service-namestore.c:749
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:275
-msgid "Namestore failed to store record\n"
+#: src/namestore/gnunet-zoneimport.c:2036
+msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:279
-#, c-format
-msgid "Please pass valid port number as the first argument! (got `%s')\n"
+#: src/namestore/gnunet-zoneimport.c:2041
+msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:321
-msgid "GNUnet NAT traversal test helper daemon"
+#: src/namestore/namestore_api.c:389
+msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:170
-msgid "NAT traversal with ICMP Server timed out.\n"
+#: src/namestore/plugin_namestore_heap.c:776
+msgid "heap file database running\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:203
-msgid "NAT traversal with ICMP Server succeeded.\n"
+#: src/namestore/plugin_namestore_sqlite.c:216
+#: src/namestore/plugin_namestore_sqlite.c:227
+#, c-format
+msgid "Failed to setup database at `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:204
-msgid "NAT traversal with ICMP Server failed.\n"
+#: src/nat-auto/gnunet-nat-auto.c:191
+msgid "Suggested configuration changes:\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:225
-msgid "Testing connection reversal with ICMP server.\n"
+#: src/nat-auto/gnunet-nat-auto.c:217
+#, c-format
+msgid "Failed to write configuration to `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:274
+#: src/nat-auto/gnunet-nat-auto.c:224
 #, c-format
-msgid "Detected external IP `%s'\n"
+msgid "Wrote updated configuration to `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:344
-msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+#: src/nat-auto/gnunet-nat-auto.c:343
+msgid "run autoconfiguration"
 msgstr ""
 
-#: src/nat/nat_auto.c:360
-#, c-format
-msgid "Detected internal network address `%s'.\n"
+#: src/nat-auto/gnunet-nat-auto.c:349
+msgid "section name providing the configuration for the adapter"
 msgstr ""
 
-#: src/nat/nat_auto.c:413
-msgid "upnpc found, enabling its use\n"
+#: src/nat-auto/gnunet-nat-auto.c:354 src/nat/gnunet-nat.c:451
+msgid "use TCP"
 msgstr ""
 
-#: src/nat/nat_auto.c:414
-msgid "upnpc not found\n"
+#: src/nat-auto/gnunet-nat-auto.c:359 src/nat/gnunet-nat.c:456
+msgid "use UDP"
 msgstr ""
 
-#: src/nat/nat_auto.c:447
-msgid "gnunet-helper-nat-server found, testing it\n"
+#: src/nat-auto/gnunet-nat-auto.c:364
+msgid "write configuration file (for autoconfiguration)"
 msgstr ""
 
-#: src/nat/nat_auto.c:448
-msgid "No working gnunet-helper-nat-server found\n"
+#: src/nat-auto/gnunet-nat-auto.c:376
+msgid "GNUnet NAT traversal autoconfiguration"
 msgstr ""
 
-#: src/nat/nat_auto.c:482
-msgid "gnunet-helper-nat-client found, enabling it\n"
+#: src/nat-auto/gnunet-nat-auto_legacy.c:401
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:679
+#: src/nat-auto/nat_auto_api_test.c:403
+msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:483
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+#: src/nat-auto/gnunet-nat-auto_legacy.c:516
+#, c-format
+msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat.c:867
-#, c-format
-msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
+#: src/nat-auto/gnunet-nat-auto_legacy.c:566
+#: src/nat-auto/nat_auto_api_test.c:569
+msgid "NAT test failed to start NAT library\n"
 msgstr ""
 
-#: src/nat/nat.c:917
-#, c-format
-msgid "Failed to start %s\n"
+#: src/nat-auto/gnunet-service-nat-auto.c:340
+msgid "UPnP client `upnpc` command not found, disabling UPnP\n"
 msgstr ""
 
-#: src/nat/nat.c:1205
-msgid "malformed"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:383
+msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat.c:1276 src/nat/nat.c:1288
-#, c-format
-msgid "Configuration requires `%s', but binary is not installed properly (SUID 
bit not set).  Option disabled.\n"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:384
+msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat.c:1426
-msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:403
+msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat/nat.c:1442
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:435
 #, c-format
-msgid "Running gnunet-helper-nat-client %s %s %u\n"
+msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:155
-msgid "no valid address was returned by `external-ip'"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:570
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:175
-msgid "`external-ip' command not found"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:588
+#, c-format
+msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:201
-msgid "`external-ip' command not found\n"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:722
+msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:366
-msgid "Failed to run `upnpc` command"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:723
+msgid "upnpc not found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:512
-msgid "`upnpc' command took too long, process killed"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:760
+msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:540
-msgid "`upnpc' command failed to establish port mapping"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:772
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:832
+msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:604
-msgid "`upnpc' command not found\n"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:784
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:844
+msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_mini.c:608
-msgid "`upnpc` command not found"
+#: src/nat-auto/gnunet-service-nat-auto_legacy.c:821
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_test.c:351
-msgid "Failed to connect to `gnunet-nat-server'\n"
+#: src/nat-auto/nat_auto_api.c:74
+msgid "Operation Successful"
 msgstr ""
 
-#: src/nat/nat_test.c:423
-#, c-format
-msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
+#: src/nat-auto/nat_auto_api.c:76
+msgid "IPC failure"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:117
-msgid "NSE service is not running\n"
+#: src/nat-auto/nat_auto_api.c:78
+msgid "Failure in network subsystem, check permissions."
 msgstr ""
 
-#: src/nse/gnunet-nse.c:122
-msgid "Error while checking if NSE service is running or not\n"
+#: src/nat-auto/nat_auto_api.c:80
+msgid "Encountered timeout while performing operation"
 msgstr ""
 
-#: src/nse/gnunet-nse.c:168
-msgid "Show network size estimates from NSE service."
+#: src/nat-auto/nat_auto_api.c:82
+msgid "detected that we are offline"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:858
-msgid "limit to the number of connections to NSE services, 0 for none"
+#: src/nat-auto/nat_auto_api.c:84
+msgid "`upnpc` command not found"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:861
-msgid "name of the file for writing connection information and statistics"
+#: src/nat-auto/nat_auto_api.c:86
+msgid "Failed to run `upnpc` command"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:864 src/testbed/gnunet-testbed-profiler.c:306
-msgid "name of the file with the login information for the testbed"
+#: src/nat-auto/nat_auto_api.c:88
+msgid "`upnpc' command took too long, process killed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:867
-msgid "name of the file for writing the main results"
+#: src/nat-auto/nat_auto_api.c:90
+msgid "`upnpc' command failed to establish port mapping"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:870
-msgid "Number of peers to run in each round, separated by commas"
+#: src/nat-auto/nat_auto_api.c:92
+msgid "`external-ip' command not found"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:876
-msgid "delay between rounds"
+#: src/nat-auto/nat_auto_api.c:94
+msgid "Failed to run `external-ip` command"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:885
-msgid "Measure quality and performance of the NSE service."
+#: src/nat-auto/nat_auto_api.c:96
+msgid "`external-ip' command output invalid"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1517
-#: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248
-msgid "Value is too large.\n"
+#: src/nat-auto/nat_auto_api.c:98
+msgid "no valid address was returned by `external-ip'"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:215
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
+#: src/nat-auto/nat_auto_api.c:100
+msgid "Could not determine interface with internal/local network address"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:352
-#, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
+#: src/nat-auto/nat_auto_api.c:102
+msgid "No functioning gnunet-helper-nat-server installation found"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:371
-#: src/peerinfo/gnunet-service-peerinfo.c:388
-#, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
+#: src/nat-auto/nat_auto_api.c:104
+msgid "NAT test could not be initialized"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:466
-msgid "# peers known"
-msgstr "# peer conosciuti"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:503
-#, c-format
-msgid "File `%s' in directory `%s' does not match naming convention. 
Removed.\n"
+#: src/nat-auto/nat_auto_api.c:106
+msgid "NAT test timeout reached"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:653
-#, c-format
-msgid "Scanning directory `%s'\n"
+#: src/nat-auto/nat_auto_api.c:108
+msgid "could not register NAT"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:658
-#, c-format
-msgid "Still no peers found in `%s'!\n"
+#: src/nat-auto/nat_auto_api.c:110
+msgid "No working gnunet-helper-nat-client installation found"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:994
+#: src/nat-auto/nat_auto_api_test.c:475
 #, c-format
-msgid "Cleaning up directory `%s'\n"
+msgid "Failed to find valid PORT in section `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1287
+#: src/nat-auto/nat_auto_api_test.c:520
 #, c-format
-msgid "Importing HELLOs from `%s'\n"
+msgid "Failed to create socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1298
-msgid "Skipping import of included HELLOs\n"
+#: src/nat/gnunet-nat.c:429
+msgid "which IP and port are we locally using to bind/listen to"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:236
-msgid "aborted due to explicit disconnect request"
+#: src/nat/gnunet-nat.c:435
+msgid "which remote IP and port should be asked for connection reversal"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:356
-msgid "failed to transmit request (service down?)"
+#: src/nat/gnunet-nat.c:441
+msgid ""
+"name of configuration section to find additional options, such as manual "
+"host punching data"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:506
-msgid "Failed to receive response from `PEERINFO' service."
+#: src/nat/gnunet-nat.c:446
+msgid "enable STUN processing"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:547 src/peerinfo/peerinfo_api.c:566
-#: src/peerinfo/peerinfo_api.c:581 src/peerinfo/peerinfo_api.c:592
-#: src/peerinfo/peerinfo_api.c:603
-msgid "Received invalid message from `PEERINFO' service."
+#: src/nat/gnunet-nat.c:461
+msgid "watch for connection reversal requests"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:678
-msgid "Timeout transmitting iteration request to `PEERINFO' service."
+#: src/nat/gnunet-nat.c:473
+msgid "GNUnet NAT traversal autoconfigure daemon"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api_notify.c:268
+#: src/nat/gnunet-service-nat.c:1337
 #, c-format
-msgid "Could not connect to `%s' service.\n"
+msgid "Malformed punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:232
+#: src/nat/gnunet-service-nat.c:1347
 #, c-format
-msgid "%sPeer `%s'\n"
+msgid "Invalid port number in punched hole specification `%s' (lacks port)\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:239
+#: src/nat/gnunet-service-nat.c:1363
 #, c-format
-msgid "\tExpires: %s \t %s\n"
+msgid "Malformed punched hole specification `%s' (lacks `]')\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:428
+#: src/nat/gnunet-service-nat.c:1374
 #, c-format
-msgid "Failure: Did not receive %s\n"
+msgid "Malformed punched hole specification `%s' (IPv6 address invalid)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:436
-#, c-format
-msgid "Failure: Received invalid %s\n"
+#: src/nat/gnunet-service-nat.c:1839
+msgid "Connection reversal request failed\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:445
-#, c-format
-msgid "Failed to write HELLO with %u bytes to file `%s'\n"
+#: src/nat/gnunet-service-nat.c:1912
+msgid ""
+"UPnP enabled in configuration, but UPnP client `upnpc` command not found, "
+"disabling UPnP\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:458
+#: src/nat/gnunet-service-nat_helper.c:184
 #, c-format
-msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
+msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:522
+#: src/nat/gnunet-service-nat_helper.c:271
 #, c-format
-msgid "Failure adding HELLO: %s\n"
+msgid "Failed to start %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:633
-#, c-format
-msgid "Service `%s' is not running, please start GNUnet\n"
+#: src/nat/gnunet-service-nat_mini.c:194
+msgid "`external-ip' command not found\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
-#, c-format
-msgid "Loading hostkey from `%s' failed.\n"
+#: src/nat/gnunet-service-nat_mini.c:654
+msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:745
-#, c-format
-msgid "I am peer `%s'.\n"
-msgstr "Io sono il peer '%s''.\n"
+#: src/nse/gnunet-nse.c:120
+msgid "Show network size estimates from NSE service."
+msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
-msgid "don't resolve host names"
+#: src/nse/gnunet-nse-profiler.c:847
+msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:792
-msgid "output only the identity strings"
+#: src/nse/gnunet-nse-profiler.c:852
+msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:795
-msgid "include friend-only information"
+#: src/nse/gnunet-nse-profiler.c:864
+msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:798
+#: src/nse/gnunet-nse-profiler.c:871
+msgid "Number of peers to run in each round, separated by commas"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:882
+msgid "delay between rounds"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:891
+msgid "Measure quality and performance of the NSE service."
+msgstr ""
+
+#: src/nse/gnunet-service-nse.c:1532
+#: src/revocation/gnunet-service-revocation.c:841 src/util/gnunet-scrypt.c:274
+msgid "Value is too large.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:176
+#, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:311
+#, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:332
+#: src/peerinfo/gnunet-service-peerinfo.c:363
+#, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:447
+msgid "# peers known"
+msgstr "# peer conosciuti"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:490
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:657
+#, c-format
+msgid "Scanning directory `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:665
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1098
+#, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1436
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1449
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:218
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:237
+#, c-format
+msgid "%sPeer `%s'\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:244
+#, c-format
+msgid "\tExpires: %s \t %s\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:297
+#: src/rest-plugins/plugin_rest_peerinfo.c:499
+#, c-format
+msgid "Failure: Cannot convert address to string for peer `%s'\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:464
+#, c-format
+msgid "Failure: Received invalid %s\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:478
+#, c-format
+msgid "Failed to write HELLO with %u bytes to file `%s'\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:497
+#, c-format
+msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:797
+#, c-format
+msgid "I am peer `%s'.\n"
+msgstr "Io sono il peer '%s''.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:841
+msgid "don't resolve host names"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:846
+msgid "output only the identity strings"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:850
+msgid "include friend-only information"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:855
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:801
+#: src/peerinfo-tool/gnunet-peerinfo.c:860
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:804
+#: src/peerinfo-tool/gnunet-peerinfo.c:866
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:807
+#: src/peerinfo-tool/gnunet-peerinfo.c:871
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:810
+#: src/peerinfo-tool/gnunet-peerinfo.c:877
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:821
+#: src/peerinfo-tool/gnunet-peerinfo.c:895
 msgid "Print information about peers."
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:128
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:103
+#: src/transport/gnunet-service-transport_plugins.c:166
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:133
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:107
+#: src/transport/gnunet-service-transport_plugins.c:171
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:165
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:127
+#: src/transport/gnunet-service-transport_plugins.c:206
 #, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr ""
 
-#: src/postgres/postgres.c:59
+#: src/peerstore/gnunet-peerstore.c:89
+msgid "peerstore"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:596
 #, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
+msgid "Could not load database backend `%s'\n"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:348
+msgid "timeout"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:564 src/peerstore/peerstore_api.c:613
+msgid "Unexpected iteration response, this should not happen.\n"
 msgstr ""
 
-#: src/postgres/postgres.c:148
+#: src/peerstore/peerstore_api.c:627
+msgid "Received a malformed response from service."
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:776
+msgid "Received a watch result for a non existing watch.\n"
+msgstr ""
+
+#: src/peerstore/plugin_peerstore_sqlite.c:451
+#: src/psycstore/plugin_psycstore_sqlite.c:280
+#, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr ""
+
+#: src/peerstore/plugin_peerstore_sqlite.c:486
+#: src/psycstore/plugin_psycstore_mysql.c:248
+#: src/psycstore/plugin_psycstore_sqlite.c:257
+#, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr ""
+
+#: src/peerstore/plugin_peerstore_sqlite.c:568
+#, c-format
+msgid "Unable to create indices: %s.\n"
+msgstr ""
+
+#: src/pq/pq_prepare.c:82
 #, c-format
-msgid "Unable to initialize Postgres: %s"
+msgid "PQprepare (`%s' as `%s') failed with error: %s\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:200
+#: src/psycstore/gnunet-service-psycstore.c:247
 msgid "Failed to store membership information!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:224
+#: src/psycstore/gnunet-service-psycstore.c:269
 msgid "Failed to test membership!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:246
-msgid "Failed to store fragment!\n"
+#: src/psycstore/gnunet-service-psycstore.c:298
+msgid "Dropping invalid fragment\n"
+msgstr ""
+
+#: src/psycstore/gnunet-service-psycstore.c:309
+msgid "Failed to store fragment\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:272
+#: src/psycstore/gnunet-service-psycstore.c:366
 msgid "Failed to get fragment!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:299
+#: src/psycstore/gnunet-service-psycstore.c:432
 msgid "Failed to get message!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:328
+#: src/psycstore/gnunet-service-psycstore.c:462
 msgid "Failed to get message fragment!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:356
+#: src/psycstore/gnunet-service-psycstore.c:492
 msgid "Failed to get master counters!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:392
-#: src/psycstore/gnunet-service-psycstore.c:465
-msgid "Tried to set invalid state variable name!\n"
-msgstr ""
-
-#: src/psycstore/gnunet-service-psycstore.c:408
-msgid "Failed to begin modifying state!\n"
+#: src/psycstore/gnunet-service-psycstore.c:673
+#, c-format
+msgid "Failed to begin modifying state: %d\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:431
+#: src/psycstore/gnunet-service-psycstore.c:683
 #, c-format
-msgid "Unknown operator: %c\n"
+msgid "Failed to modify state: %d\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:441
+#: src/psycstore/gnunet-service-psycstore.c:691
 msgid "Failed to end modifying state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:479
+#: src/psycstore/gnunet-service-psycstore.c:728
+msgid "Tried to set invalid state variable name!\n"
+msgstr ""
+
+#: src/psycstore/gnunet-service-psycstore.c:742
 msgid "Failed to begin synchronizing state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:495
+#: src/psycstore/gnunet-service-psycstore.c:759
 msgid "Failed to end synchronizing state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:515
-#: src/psycstore/gnunet-service-psycstore.c:534
+#: src/psycstore/gnunet-service-psycstore.c:777
+#: src/psycstore/gnunet-service-psycstore.c:793
 msgid "Failed to reset state!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:557
-#: src/psycstore/gnunet-service-psycstore.c:608
+#: src/psycstore/gnunet-service-psycstore.c:822
+#: src/psycstore/gnunet-service-psycstore.c:879
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:584
-#: src/psycstore/gnunet-service-psycstore.c:623
+#: src/psycstore/gnunet-service-psycstore.c:849
+#: src/psycstore/gnunet-service-psycstore.c:894
 msgid "Failed to get state variable!\n"
 msgstr ""
 
-#: src/psycstore/plugin_psycstore_sqlite.c:60
-#, c-format
-msgid "`%s' failed at %s:%d with error: %s (%d)\n"
+#: src/psycstore/plugin_psycstore_mysql.c:279
+msgid "Unable to initialize Mysql.\n"
 msgstr ""
 
-#: src/psycstore/plugin_psycstore_sqlite.c:253
+#: src/psycstore/plugin_psycstore_mysql.c:289
 #, c-format
-msgid ""
-"Error preparing SQL query: %s\n"
-"  %s\n"
+msgid "Failed to run SQL statement `%s'\n"
 msgstr ""
 
-#: src/psycstore/plugin_psycstore_sqlite.c:276
+#: src/psycstore/plugin_psycstore_sqlite.c:59
 #, c-format
-msgid ""
-"Error executing SQL query: %s\n"
-"  %s\n"
+msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr ""
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1796
+#: src/psycstore/plugin_psycstore_sqlite.c:1922
 msgid "SQLite database running\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:482
+#: src/pt/gnunet-daemon-pt.c:421
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:488
+#: src/pt/gnunet-daemon-pt.c:427
 msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:541
+#: src/pt/gnunet-daemon-pt.c:481
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:717
+#: src/pt/gnunet-daemon-pt.c:665
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:723
+#: src/pt/gnunet-daemon-pt.c:672
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:826
+#: src/pt/gnunet-daemon-pt.c:710
 msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:883
+#: src/pt/gnunet-daemon-pt.c:766
 msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:888
-msgid "# DNS requests dropped (DNS mesh channel down)"
+#: src/pt/gnunet-daemon-pt.c:771
+msgid "# DNS requests dropped (DNS cadet channel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:896
+#: src/pt/gnunet-daemon-pt.c:779
 msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:969
+#: src/pt/gnunet-daemon-pt.c:874
 msgid "# DNS replies received"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:985
+#: src/pt/gnunet-daemon-pt.c:891
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1261 src/pt/gnunet-daemon-pt.c:1270
-#: src/pt/gnunet-daemon-pt.c:1290 src/pt/gnunet-daemon-pt.c:1301
-#: src/pt/gnunet-daemon-pt.c:1310
+#: src/pt/gnunet-daemon-pt.c:1217 src/pt/gnunet-daemon-pt.c:1226
+#: src/pt/gnunet-daemon-pt.c:1242 src/pt/gnunet-daemon-pt.c:1251
+#: src/pt/gnunet-daemon-pt.c:1260
 #, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:1347
+#: src/pt/gnunet-daemon-pt.c:1305
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:270
-#: src/regex/gnunet-regex-simulation-profiler.c:659
+#: src/reclaim/gnunet-reclaim.c:465
 #, c-format
-msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
+msgid "Ego is required\n"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:380
-msgid "Daemon to announce regular expressions for the peer using mesh."
+#: src/reclaim/gnunet-reclaim.c:473
+#, c-format
+msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1288
-msgid "No configuration file given. Exiting\n"
+#: src/reclaim/gnunet-reclaim.c:481
+#, c-format
+msgid "Requesting party key is required!\n"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:504
+msgid "Add attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:510
+msgid "Attribute value"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:515
+msgid "Ego"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1299
-msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
+#: src/reclaim/gnunet-reclaim.c:520
+msgid "Audience (relying party)"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1328
-#: src/regex/gnunet-regex-simulation-profiler.c:622
+#: src/reclaim/gnunet-reclaim.c:524
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:529
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:534
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:539
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:544
+msgid "Type of attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:549
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/reclaim/reclaim_api.c:434
+msgid "failed to store record\n"
+msgstr ""
+
+#: src/regex/gnunet-daemon-regexprofiler.c:265
+#, c-format
+msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
+msgstr ""
+
+#: src/regex/gnunet-daemon-regexprofiler.c:378
+msgid "Daemon to announce regular expressions for the peer using cadet."
+msgstr ""
+
+#: src/regex/gnunet-regex-profiler.c:1384
+msgid "No configuration file given. Exiting\n"
+msgstr ""
+
+#: src/regex/gnunet-regex-profiler.c:1425
+#: src/regex/gnunet-regex-simulation-profiler.c:628
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1334
-#: src/regex/gnunet-regex-simulation-profiler.c:629
+#: src/regex/gnunet-regex-profiler.c:1431
+#: src/regex/gnunet-regex-simulation-profiler.c:636
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1341
+#: src/regex/gnunet-regex-profiler.c:1438
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1350
+#: src/regex/gnunet-regex-profiler.c:1447
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1370
+#: src/regex/gnunet-regex-profiler.c:1467
 msgid "Error loading search strings. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1455
+#: src/regex/gnunet-regex-profiler.c:1555
 msgid "name of the file for writing statistics"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1458
+#: src/regex/gnunet-regex-profiler.c:1561
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1461
+#: src/regex/gnunet-regex-profiler.c:1567
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1464
+#: src/regex/gnunet-regex-profiler.c:1574
 msgid "name of file with input strings"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1467
+#: src/regex/gnunet-regex-profiler.c:1580
 msgid "name of file with hosts' names"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1479
+#: src/regex/gnunet-regex-profiler.c:1593
 msgid "Profiler for regex"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:689
+#: src/regex/gnunet-regex-simulation-profiler.c:697
 msgid "name of the table to write DFAs"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:692
+#: src/regex/gnunet-regex-simulation-profiler.c:703
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-simulation-profiler.c:705
+#: src/regex/gnunet-regex-simulation-profiler.c:717
 msgid "Profiler for regex library"
 msgstr ""
 
-#: src/regex/regex_api.c:131
+#: src/regex/regex_api_announce.c:150
 #, c-format
 msgid "Regex `%s' is too long!\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:126
+#: src/regex/regex_api_search.c:210
+#, c-format
+msgid "Search string `%s' is too long!\n"
+msgstr ""
+
+#: src/rest/gnunet-rest-server.c:925
+msgid "listen on specified port (default: 7776)"
+msgstr ""
+
+#: src/rest/gnunet-rest-server.c:942
+msgid "GNUnet REST server"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_copying.c:207
+msgid "COPYING REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_credential.c:1126
+msgid "GNS REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_gns.c:450
+msgid "Gns REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_identity.c:1295
+msgid "Identity REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_namestore.c:1077
+msgid "Namestore REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_openid_connect.c:2135
+#: src/rest-plugins/plugin_rest_reclaim.c:1079
+msgid "Identity Provider REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_peerinfo.c:794
+msgid "Peerinfo REST API initialized\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:127
 #, c-format
 msgid "Key `%s' is valid\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:131
+#: src/revocation/gnunet-revocation.c:132
 #, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:137
+#: src/revocation/gnunet-revocation.c:138
 msgid "Internal error\n"
 msgstr "Errore interno\n"
 
-#: src/revocation/gnunet-revocation.c:163
+#: src/revocation/gnunet-revocation.c:164
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:168
+#: src/revocation/gnunet-revocation.c:169
 msgid "Revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:173
+#: src/revocation/gnunet-revocation.c:174
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:178
+#: src/revocation/gnunet-revocation.c:179
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:183
+#: src/revocation/gnunet-revocation.c:184
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:294
+#: src/revocation/gnunet-revocation.c:321
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:324
+#: src/revocation/gnunet-revocation.c:350
 #, c-format
 msgid "Ego `%s' not found.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:345
+#: src/revocation/gnunet-revocation.c:371
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:365
+#: src/revocation/gnunet-revocation.c:391
 msgid "Revocation certificate ready\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:375
+#: src/revocation/gnunet-revocation.c:401
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:407
+#: src/revocation/gnunet-revocation.c:435 src/social/gnunet-social.c:1178
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:421
-msgid "Testing and revoking at the same time is not allowed, only executing 
test.\n"
+#: src/revocation/gnunet-revocation.c:448
+msgid ""
+"Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:441
+#: src/revocation/gnunet-revocation.c:468
 msgid "No filename to store revocation certificate given.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:463
+#: src/revocation/gnunet-revocation.c:489
 #, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:488
+#: src/revocation/gnunet-revocation.c:514
 msgid "No action specified. Nothing to do.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:504
+#: src/revocation/gnunet-revocation.c:533
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:507
-msgid "revoke the private key associated for the the private key associated 
with the ego NAME "
+#: src/revocation/gnunet-revocation.c:539
+msgid ""
+"revoke the private key associated for the the private key associated with "
+"the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:510
+#: src/revocation/gnunet-revocation.c:544
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:513
+#: src/revocation/gnunet-revocation.c:550
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:272
-msgid "Duplicate revocation received from peer. Ignored.\n"
+#: src/revocation/gnunet-service-revocation.c:457
+msgid "# unsupported revocations received via set union"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:466
+msgid "# revocation messages received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:434
+#: src/revocation/gnunet-service-revocation.c:471
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:486
+#: src/revocation/gnunet-service-revocation.c:475
+msgid "# revocation set unions failed"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:484
+msgid "# revocation set unions completed"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:523
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:812
+#: src/revocation/gnunet-service-revocation.c:865
 msgid "Could not open revocation database file!"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:225
+#: src/rps/gnunet-rps.c:258
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:262
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:266
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2770
+msgid "duration of the profiling"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2776
+msgid "timeout for the profiling"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2782
+msgid "number of PeerIDs to request"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2797
+msgid "Measure quality and performance of the RPS service."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:218
 msgid "You must specify at least one message ID to check!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:232
+#: src/scalarproduct/gnunet-scalarproduct.c:225
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:239
-msgid "Please give a session key for --input_key!\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:238
+#, c-format
+msgid ""
+"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
+"valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:251
-#, c-format
-msgid "Tried to set initiator mode, as peer ID was given. However, `%s' is not 
a valid peer identifier.\n"
+#: src/scalarproduct/gnunet-scalarproduct.c:256
+msgid "Need elements to compute the scalarproduct, got none.\n"
 msgstr ""
 
 #: src/scalarproduct/gnunet-scalarproduct.c:278
-#: src/scalarproduct/gnunet-scalarproduct.c:314
 #, c-format
-msgid "Could not convert `%s' to int32_t.\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:286
-msgid "Need elements to compute the vectorproduct, got none.\n"
+msgid "Malformed input, could not parse `%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:346
+#: src/scalarproduct/gnunet-scalarproduct.c:296
 #, c-format
-msgid "Could not convert `%s' to integer.\n"
+msgid "Could not convert `%s' to int64_t.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:407
-msgid "A comma separated list of elements to compare as vector with our remote 
peer."
+#: src/scalarproduct/gnunet-scalarproduct.c:323
+#, c-format
+msgid "Failed to initiate computation, were all keys unique?\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:410
-msgid "A comma separated mask to select which elements should actually be 
compared."
+#: src/scalarproduct/gnunet-scalarproduct.c:349
+#: src/scalarproduct/gnunet-scalarproduct.c:355
+msgid ""
+"A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:413
-msgid "[Optional] peer to calculate our scalarproduct with. If this parameter 
is not given, the service will wait for a remote peer to compute the request."
+#: src/scalarproduct/gnunet-scalarproduct.c:361
+msgid ""
+"[Optional] peer to calculate our scalarproduct with. If this parameter is "
+"not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:416
+#: src/scalarproduct/gnunet-scalarproduct.c:367
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:425
+#: src/scalarproduct/gnunet-scalarproduct.c:377
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:541
-#, c-format
-msgid "Client (%p) disconnected from us.\n"
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1399
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1343
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1170
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1061
+msgid "Connect to CADET failed\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:613
-#: src/scalarproduct/gnunet-service-scalarproduct.c:702
-#, c-format
-msgid "Could not send message to client (%p)!\n"
+#: src/scalarproduct/scalarproduct_api.c:183
+msgid "Keys given to SCALARPRODUCT not unique!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:619
-#, c-format
-msgid "Sending session-end notification to client (%p) for session %s\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:614
+msgid "dkg start delay"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:712
-#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:620
+msgid "dkg timeout"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:766
-#: src/scalarproduct/gnunet-service-scalarproduct.c:855
-msgid "Could not send service-response message via mesh!)\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:626
+msgid "threshold"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1028
-#, c-format
-msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:631
+msgid "also profile decryption"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1099
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1208
-msgid "Transmitting service request.\n"
+#: src/set/gnunet-service-set.c:2004
+msgid "Could not connect to CADET service\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1108
-msgid "Could not send service-request multipart message to channel!\n"
+#: src/set/gnunet-set-ibf-profiler.c:250
+msgid "number of element in set A-B"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1147
-#, c-format
-msgid "Successfully created new channel to peer (%s)!\n"
+#: src/set/gnunet-set-ibf-profiler.c:256
+msgid "number of element in set B-A"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1217
-msgid "Could not send message to channel!\n"
+#: src/set/gnunet-set-ibf-profiler.c:262
+msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1274
-msgid "Too short message received from client!\n"
+#: src/set/gnunet-set-ibf-profiler.c:268
+msgid "hash num"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1287
-msgid "Invalid message received from client, session information incorrect!\n"
+#: src/set/gnunet-set-ibf-profiler.c:274
+msgid "ibf size"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1298
-#, c-format
-msgid "Duplicate session information received, cannot create new session with 
key `%s'\n"
+#: src/set/gnunet-set-profiler.c:442
+msgid "use byzantine mode"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1318
-#, c-format
-msgid "Got client-request-session with key %s, preparing channel to remote 
service.\n"
+#: src/set/gnunet-set-profiler.c:448
+msgid "force sending full set"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1354
-#, c-format
-msgid "Creating new channel for session with key %s.\n"
+#: src/set/gnunet-set-profiler.c:454
+msgid "number delta operation"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1399
-#, c-format
-msgid "Got client-responder-session with key %s and a matching 
service-request-session set, processing.\n"
+#: src/set/gnunet-set-profiler.c:466
+msgid "operation to execute"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1409
-#, c-format
-msgid "Got client-responder-session with key %s but NO matching 
service-request-session set, queuing element for later use.\n"
+#: src/set/gnunet-set-profiler.c:472
+msgid "element size"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1439
-#, c-format
-msgid "New incoming channel from peer %s.\n"
+#: src/social/gnunet-social.c:1164
+msgid "--place missing or invalid.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1471
-#, c-format
-msgid "Peer disconnected, terminating session %s with peer (%s)\n"
+#: src/social/gnunet-social.c:1215
+msgid "assign --name in state to --data"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1672
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1814
-#, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+#: src/social/gnunet-social.c:1220
+msgid "say good-bye and leave somebody else's place"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1681
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1821
-#, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+#: src/social/gnunet-social.c:1225
+msgid "create a place"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1771
-#, c-format
-msgid "Got message with duplicate session key (`%s'), ignoring service 
request.\n"
+#: src/social/gnunet-social.c:1230
+msgid "destroy a place we were hosting"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2014
-msgid "Shutting down, initiating cleanup.\n"
+#: src/social/gnunet-social.c:1235
+msgid "enter somebody else's place"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
-msgid "Connect to MESH failed\n"
+#: src/social/gnunet-social.c:1241
+msgid "find state matching name prefix"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2104
-msgid "Mesh initialized\n"
+#: src/social/gnunet-social.c:1246
+msgid "replay history of messages up to the given --limit"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:246
-msgid "# SUC responder result messages received"
+#: src/social/gnunet-social.c:1251
+msgid "reconnect to a previously created place"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:300
-msgid "# bytes sent to scalarproduct"
+#: src/social/gnunet-social.c:1256
+msgid "publish something to a place we are hosting"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:345
-#: src/scalarproduct/scalarproduct_api.c:440
-msgid "Failed to connect to the scalarproduct service\n"
+#: src/social/gnunet-social.c:1261
+msgid "reconnect to a previously entered place"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:353
-#: src/scalarproduct/scalarproduct_api.c:448
-msgid "Failed to send a message to the statistics service\n"
+#: src/social/gnunet-social.c:1266
+msgid "search for state matching exact name"
 msgstr ""
 
-#: src/scalarproduct/scalarproduct_api.c:387
-#: src/scalarproduct/scalarproduct_api.c:485
-msgid "Failed to send a message to the scalarproduct service\n"
+#: src/social/gnunet-social.c:1271
+msgid "submit something to somebody's place"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:538
-msgid "dkg start delay"
+#: src/social/gnunet-social.c:1276
+msgid "list of egos and subscribed places"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:541
-msgid "dkg timeout"
+#: src/social/gnunet-social.c:1281
+msgid "extract and replay history between message IDs --start and --until"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:544
-msgid "threshold"
+#: src/social/gnunet-social.c:1290
+msgid "application ID to use when connecting"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:547
-msgid "also profile decryption"
+#: src/social/gnunet-social.c:1296
+msgid "message body or state value"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1431
-msgid "Could not connect to mesh service\n"
+#: src/social/gnunet-social.c:1302
+msgid "name or public key of ego"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:221
-msgid "number of element in set A-B"
+#: src/social/gnunet-social.c:1307
+msgid "wait for incoming messages"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:224
-msgid "number of element in set B-A"
+#: src/social/gnunet-social.c:1313
+msgid "GNS name"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:227
-msgid "number of common elements in A and B"
+#: src/social/gnunet-social.c:1319
+msgid "peer ID for --guest-enter"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:230
-msgid "hash num"
+#: src/social/gnunet-social.c:1325
+msgid "name (key) to query from state"
 msgstr ""
 
-#: src/set/gnunet-set-ibf-profiler.c:233
-msgid "ibf size"
+#: src/social/gnunet-social.c:1331
+msgid "method name"
+msgstr ""
+
+#: src/social/gnunet-social.c:1337
+msgid "number of messages to replay from history"
+msgstr ""
+
+#: src/social/gnunet-social.c:1343
+msgid "key address of place"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:295
-msgid "oeration to execute"
+#: src/social/gnunet-social.c:1349
+msgid "start message ID for history replay"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:280
+#: src/social/gnunet-social.c:1354
+msgid "respond to entry requests by admitting all guests"
+msgstr ""
+
+#: src/social/gnunet-social.c:1360
+msgid "end message ID for history replay"
+msgstr ""
+
+#: src/social/gnunet-social.c:1365
+msgid "respond to entry requests by refusing all guests"
+msgstr ""
+
+#: src/social/gnunet-social.c:1375
+msgid ""
+"gnunet-social - Interact with the social service: enter/leave, send/receive "
+"messages, access history and state.\n"
+msgstr ""
+
+#: src/sq/sq.c:52
 #, c-format
-msgid "Loading %llu bytes of statistics from `%s'\n"
+msgid "Failure to bind %u-th SQL parameter\n"
+msgstr ""
+
+#: src/sq/sq.c:59
+msgid "Failure in sqlite3_reset (!)\n"
+msgstr ""
+
+#: src/sq/sq.c:137
+#, c-format
+msgid "Failed to reset sqlite statement with error: %s\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:346
+#: src/statistics/gnunet-service-statistics.c:336
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:140
+#: src/statistics/gnunet-service-statistics.c:1084
+#, c-format
+msgid "Loading %llu bytes of statistics from `%s'\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:407
+#: src/statistics/gnunet-statistics.c:448
 msgid "Failed to obtain statistics.\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:142
+#: src/statistics/gnunet-statistics.c:410
+#: src/statistics/gnunet-statistics.c:451
 #, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:189
+#: src/statistics/gnunet-statistics.c:526
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:195
+#: src/statistics/gnunet-statistics.c:534
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:226
+#: src/statistics/gnunet-statistics.c:577
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:234
+#: src/statistics/gnunet-statistics.c:592
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:261
+#: src/statistics/gnunet-statistics.c:727
 #, c-format
-msgid "Trying to connect to remote host, but service `%s' is not running\n"
+msgid "Invalid argument `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:269
+#: src/statistics/gnunet-statistics.c:745
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:276
+#: src/statistics/gnunet-statistics.c:753
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:308
+#: src/statistics/gnunet-statistics.c:784
 #, c-format
-msgid "Invalid argument `%s'\n"
+msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:334
+#: src/statistics/gnunet-statistics.c:817
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:337
+#: src/statistics/gnunet-statistics.c:822
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:828
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:343
+#: src/statistics/gnunet-statistics.c:834
+msgid "use as csv separator"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:840
+msgid "path to the folder containing the testbed data"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:845
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:850
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:856
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:352
+#: src/statistics/gnunet-statistics.c:862
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:364
+#: src/statistics/gnunet-statistics.c:879
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/statistics_api.c:519
+#: src/statistics/statistics_api.c:751
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 
-#: src/statistics/statistics_api.c:1090
-msgid "Failed to receive acknowledgement from statistics service, some 
statistics might have been lost!\n"
-msgstr ""
-
 #: src/testbed/generate-underlay-topology.c:223
-msgid "Need atleast 2 arguments\n"
+msgid "Need at least 2 arguments\n"
 msgstr ""
 
 #: src/testbed/generate-underlay-topology.c:228
@@ -5874,41 +6368,42 @@ msgstr ""
 msgid "Invalid topology: %s\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:252
+#: src/testbed/generate-underlay-topology.c:253
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:258
+#: src/testbed/generate-underlay-topology.c:259
 #, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:266
+#: src/testbed/generate-underlay-topology.c:267
 #, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:280
+#: src/testbed/generate-underlay-topology.c:281
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:286
+#: src/testbed/generate-underlay-topology.c:287
 #, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:335
-#: src/testbed/gnunet-testbed-profiler.c:293
+#: src/testbed/generate-underlay-topology.c:340
+#: src/testbed/gnunet-testbed-profiler.c:281
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:344
+#: src/testbed/generate-underlay-topology.c:350
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
-"The following options are available for TOPO followed by TOPOOPTS if 
applicable:\n"
+"The following options are available for TOPO followed by TOPOOPTS if "
+"applicable:\n"
 "\t LINE\n"
 "\t RING\n"
 "\t RANDOM <num_rnd_links>\n"
@@ -5923,197 +6418,245 @@ msgid ""
 "\t cap: the maximum number of links a node can have\n"
 "\t m: the number of links a node should have while joining the network\n"
 "\t filename: the path of the file which contains topology information\n"
-"NOTE: the format of the above file is descibed here: 
https://www.gnunet.org/content/topology-file-format\n";
+"NOTE: the format of the above file is descibed here: https://www.gnunet.org/";
+"content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:325
+#: src/testbed/gnunet-daemon-latency-logger.c:313
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-blacklist.c:264
-msgid "Daemon to restrict incoming transport layer connections during testbed 
deployments"
+#: src/testbed/gnunet-daemon-testbed-blacklist.c:247
+msgid ""
+"Daemon to restrict incoming transport layer connections during testbed "
+"deployments"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:235 src/testing/list-keys.c:50
-#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
+#: src/testbed/gnunet-daemon-testbed-underlay.c:231 src/testing/list-keys.c:46
+#: src/testing/testing.c:286 src/util/gnunet-ecc.c:310
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-testbed-underlay.c:474
+#: src/testbed/gnunet-daemon-testbed-underlay.c:469
 msgid "Daemon to restrict underlay network in testbed deployments"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:730
+#: src/testbed/gnunet-service-testbed_cpustatus.c:726
+#, c-format
+msgid ""
+"Cannot open %s for writing load statistics.  Not logging load statistics\n"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1157
+#, c-format
+msgid "%s is stopped"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1159
+#, c-format
+msgid "%s is starting"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1161
+#, c-format
+msgid "%s is stopping"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1163
 #, c-format
-msgid "Cannot open %s for writing load statistics.  Not logging load 
statistics\n"
+msgid "%s is starting already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1015
-msgid "Misconfiguration (can't connect to the ARM service)"
+#: src/testbed/gnunet-service-testbed_peers.c:1165
+#, c-format
+msgid "%s is stopping already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1021
-msgid "Request doesn't fit into a message"
+#: src/testbed/gnunet-service-testbed_peers.c:1167
+#, c-format
+msgid "%s is started already"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1059
+#: src/testbed/gnunet-service-testbed_peers.c:1169
+#, c-format
+msgid "%s is stopped already"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1171
+#, c-format
+msgid "%s service is not known to ARM"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1173
+#, c-format
+msgid "%s service failed to start"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1175
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:125
+#: src/testbed/gnunet-service-testbed_peers.c:1177
+#, c-format
+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:247
+#: src/testbed/gnunet_testbed_mpi_spawn.c:241
 #, c-format
 msgid "Spawning process `%s'\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:267
-#, c-format
-msgid "Exiting as the number of peers is %u\n"
+#: src/testbed/gnunet-testbed-profiler.c:287
+msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:296
-msgid "tolerate COUNT number of continious timeout failures"
+#: src/testbed/gnunet-testbed-profiler.c:292
+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-profiler.c:299
-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"
+#: src/testbed/testbed_api.c:408
+#, c-format
+msgid "Adding host %u failed with error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:415
+#: src/testbed/testbed_api_hosts.c:411
 #, c-format
 msgid "Hosts file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:423
+#: src/testbed/testbed_api_hosts.c:419
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:430
+#: src/testbed/testbed_api_hosts.c:426
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:570
+#: src/testbed/testbed_api_hosts.c:567
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1586
-#, c-format
-msgid "Adding host %u failed with error: %s\n"
-msgstr ""
-
-#: src/testbed/testbed_api_testbed.c:819
+#: src/testbed/testbed_api_testbed.c:816
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:988
+#: src/testbed/testbed_api_testbed.c:984
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1054
+#: src/testbed/testbed_api_testbed.c:1050
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1143
+#: src/testbed/testbed_api_testbed.c:1139
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1147
+#: src/testbed/testbed_api_testbed.c:1143
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1185
+#: src/testbed/testbed_api_testbed.c:1181
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1203
+#: src/testbed/testbed_api_testbed.c:1199
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1263
+#: src/testbed/testbed_api_testbed.c:1259
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1275
+#: src/testbed/testbed_api_testbed.c:1271
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1299
+#: src/testbed/testbed_api_testbed.c:1295
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1349
+#: src/testbed/testbed_api_testbed.c:1345
 #, c-format
-msgid "Maximum number of edges a peer can have in a scale free topology cannot 
be more than %u.  Given `%s = %llu'"
+msgid ""
+"Maximum number of edges a peer can have in a scale free topology cannot be "
+"more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1365
+#: src/testbed/testbed_api_testbed.c:1361
 #, c-format
-msgid "The number of edges that can established when adding a new node to 
scale free topology cannot be more than %u.  Given `%s = %llu'"
+msgid ""
+"The number of edges that can established when adding a new node to scale "
+"free topology cannot be more than %u.  Given `%s = %llu'"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:960
+#: src/testbed/testbed_api_topology.c:1026
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:966
+#: src/testbed/testbed_api_topology.c:1034
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:973
+#: src/testbed/testbed_api_topology.c:1042
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:995
+#: src/testbed/testbed_api_topology.c:1064
 #, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1004
-#: src/testbed/testbed_api_topology.c:1028
+#: src/testbed/testbed_api_topology.c:1073
+#: src/testbed/testbed_api_topology.c:1097
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1010
-#: src/testbed/testbed_api_topology.c:1034
+#: src/testbed/testbed_api_topology.c:1079
+#: src/testbed/testbed_api_topology.c:1103
 #, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1016
-#: src/testbed/testbed_api_topology.c:1040
+#: src/testbed/testbed_api_topology.c:1085
+#: src/testbed/testbed_api_topology.c:1109
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:1074
+#: src/testbed/testbed_api_topology.c:1143
 #, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:173
+#: src/testing/gnunet-testing.c:171
 #, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:258
+#: src/testing/gnunet-testing.c:251
 #, c-format
 msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:355
+#: src/testing/gnunet-testing.c:352
 msgid "create unique configuration files"
 msgstr ""
 
@@ -6121,43 +6664,43 @@ msgstr ""
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:359
-msgid "number of unique configuration files to create, or number of the 
hostkey to extract"
+#: src/testing/gnunet-testing.c:363
+msgid ""
+"number of unique configuration files to create, or number of the hostkey to "
+"extract"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:361
+#: src/testing/gnunet-testing.c:370
 msgid "configuration template"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:363
+#: src/testing/gnunet-testing.c:376
 msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:376
+#: src/testing/gnunet-testing.c:389
 msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/list-keys.c:90
+#: src/testing/list-keys.c:89
 msgid "list COUNT number of keys"
 msgstr ""
 
-#: src/testing/list-keys.c:93
-msgid "skip COUNT number of keys in the beginning"
-msgstr ""
-
-#: src/testing/testing.c:277
+#: src/testing/testing.c:270
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:718
+#: src/testing/testing.c:713
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
 #: src/testing/testing.c:1157
 #, c-format
-msgid "You attempted to create a testbed with more than %u hosts.  Please 
precompute more hostkeys first.\n"
+msgid ""
+"You attempted to create a testbed with more than %u hosts.  Please "
+"precompute more hostkeys first.\n"
 msgstr ""
 
 #: src/testing/testing.c:1166
@@ -6193,1298 +6736,1448 @@ msgstr ""
 msgid "Failed to start `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing.c:1706
+#: src/testing/testing.c:1645
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr ""
 
-#: src/topology/friends.c:100
+#: src/topology/friends.c:124
 #, c-format
 msgid "Syntax error in FRIENDS file at offset %llu, skipping bytes `%.*s'.\n"
 msgstr ""
 
-#: src/topology/friends.c:154
+#: src/topology/friends.c:178
 #, c-format
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:255
+#: src/topology/gnunet-daemon-topology.c:228
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:388
-msgid "# connect requests issued to transport"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:728
-#: src/topology/gnunet-daemon-topology.c:813
-msgid "# friends connected"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:993
-msgid "Failed to connect to core service, can not manage topology!\n"
+#: src/topology/gnunet-daemon-topology.c:342
+msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1022
-#, c-format
-msgid "Found myself `%s' in friend list (useless, ignored)\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1029
-#, c-format
-msgid "Found friend `%s' in configuration\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1050
-msgid "Encountered errors parsing friends list!\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1052
-msgid "# friends in configuration"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1057
-msgid "Fewer friends specified than required by minimum friend count. Will 
only connect to friends.\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1063
-msgid "More friendly connections required than target total number of 
connections.\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1094
-msgid "# HELLO messages received"
+#: src/topology/gnunet-daemon-topology.c:536
+msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1151
-msgid "# HELLO messages gossipped"
+#: src/topology/gnunet-daemon-topology.c:638
+#: src/topology/gnunet-daemon-topology.c:724
+msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1290
-msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
+#: src/topology/gnunet-daemon-topology.c:921
+msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:271
+#: src/topology/gnunet-daemon-topology.c:954
 #, c-format
-msgid "Adding blacklisting entry for peer `%s'\n"
+msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:279
+#: src/topology/gnunet-daemon-topology.c:961
 #, c-format
-msgid "Adding blacklisting entry for peer `%s':`%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_blacklist.c:464
-#: src/transport/gnunet-service-transport_blacklist.c:745
-msgid "# disconnects due to blacklist"
+msgid "Found friend `%s' in configuration\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:220
-msgid "# bytes payload discarded due to not connected peer"
+#: src/topology/gnunet-daemon-topology.c:983
+msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:424
-msgid "# bytes total received"
+#: src/topology/gnunet-daemon-topology.c:986
+msgid "# friends in configuration"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:515
-msgid "# bytes payload received"
+#: src/topology/gnunet-daemon-topology.c:993
+msgid ""
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:686
-#, c-format
-msgid "Could not obtain a valid network for `%s' %s (%s)\n"
+#: src/topology/gnunet-daemon-topology.c:999
+msgid ""
+"More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:733
-#, c-format
-msgid "Address or session unknown: failed to update properties for peer `%s' 
plugin `%s' address `%s' session %p\n"
+#: src/topology/gnunet-daemon-topology.c:1052
+#: src/transport/plugin_transport_wlan.c:1515
+msgid "# HELLO messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1084
-msgid "Transport service is lacking key configuration settings. Exiting.\n"
+#: src/topology/gnunet-daemon-topology.c:1230
+msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:432
-#, c-format
-msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+#: src/transport/gnunet-service-transport_ats.c:139
+msgid "# Addresses given to ATS"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:439
+#: src/transport/gnunet-service-transport.c:446
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:596
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
+#: src/transport/gnunet-service-transport.c:816
+msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:737
-msgid "# bytes payload dropped (other peer was not connected)"
+#: src/transport/gnunet-service-transport.c:1549
+msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:770
-#, c-format
-msgid "Blacklist refuses connection attempt to peer `%s'\n"
+#: src/transport/gnunet-service-transport.c:1709
+msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:776
-#, c-format
-msgid "Blacklist allows connection attempt to peer `%s'\n"
+#: src/transport/gnunet-service-transport.c:1806
+msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:801
-msgid "# REQUEST CONNECT messages received"
+#: src/transport/gnunet-service-transport.c:2123
+#: src/transport/gnunet-service-transport.c:2595
+msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:815
+#: src/transport/gnunet-service-transport.c:2599
 #, c-format
-msgid "Received a request connect message for peer `%s'\n"
+msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:826
-msgid "# REQUEST DISCONNECT messages received"
+#: src/transport/gnunet-service-transport.c:2707
+#, c-format
+msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:840
+#: src/transport/gnunet-service-transport.c:2716
 #, c-format
-msgid "Received a request disconnect message for peer `%s'\n"
+msgid "Adding blacklisting entry for peer `%s':`%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:2781
+msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:181
+#: src/transport/gnunet-service-transport_hello.c:193
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1095
+#: src/transport/gnunet-service-transport_neighbours.c:804
+msgid "# session creation failed"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1051
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1220
-#: src/transport/gnunet-service-transport_neighbours.c:1629
+#: src/transport/gnunet-service-transport_neighbours.c:1174
+msgid "# disconnects due to quota of 0"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1322
+#: src/transport/gnunet-service-transport_neighbours.c:1783
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1225
+#: src/transport/gnunet-service-transport_neighbours.c:1327
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1230
+#: src/transport/gnunet-service-transport_neighbours.c:1333
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1287
+#: src/transport/gnunet-service-transport_neighbours.c:1393
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1343
-msgid "# keepalives sent"
+#: src/transport/gnunet-service-transport_neighbours.c:1477
+msgid "# KEEPALIVES sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1376
+#: src/transport/gnunet-service-transport_neighbours.c:1513
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1384
+#: src/transport/gnunet-service-transport_neighbours.c:1521
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1431
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1531
+msgid "# KEEPALIVES received in good order"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1440
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1576
+msgid "# KEEPALIVE_RESPONSEs discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1448
-msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
+#: src/transport/gnunet-service-transport_neighbours.c:1585
+msgid "# KEEPALIVE_RESPONSEs discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1456
-msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
+#: src/transport/gnunet-service-transport_neighbours.c:1593
+msgid "# KEEPALIVE_RESPONSEs discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1534
-msgid "# messages discarded due to lack of neighbour record"
+#: src/transport/gnunet-service-transport_neighbours.c:1602
+msgid "# KEEPALIVE_RESPONSEs discarded (no nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1568
-msgid "# bandwidth quota violations by other peers"
+#: src/transport/gnunet-service-transport_neighbours.c:1607
+msgid "# KEEPALIVE_RESPONSEs discarded (bad nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1584
-msgid "# ms throttling suggested"
+#: src/transport/gnunet-service-transport_neighbours.c:1613
+msgid "# KEEPALIVE_RESPONSEs received (OK)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1678
-#, c-format
-msgid "Failed to send CONNECT message to peer `%s' using address `%s' session 
%p\n"
+#: src/transport/gnunet-service-transport_neighbours.c:1680
+msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1705
-msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
+#: src/transport/gnunet-service-transport_neighbours.c:1714
+msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1751
-msgid "# SESSION_CONNECT messages sent"
+#: src/transport/gnunet-service-transport_neighbours.c:1729
+msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1767
+#: src/transport/gnunet-service-transport_neighbours.c:1852
 #, c-format
-msgid "Failed to transmit CONNECT message via plugin to %s\n"
+msgid "Failed to send SYN message to peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1794
-msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
+#: src/transport/gnunet-service-transport_neighbours.c:1872
+msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1844
+#: src/transport/gnunet-service-transport_neighbours.c:1911
+#, fuzzy
+msgid "# SYN messages sent"
+msgstr "# messaggi PONG decrittati"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1928
 #, c-format
-msgid "Failed to send CONNECT_ACK message to peer `%s' using address `%s' 
session %p\n"
+msgid "Failed to transmit SYN message to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1899
-msgid "# CONNECT_ACK messages sent"
+#: src/transport/gnunet-service-transport_neighbours.c:1958
+msgid "# Failed attempts to switch addresses (failed to send SYN)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1914
+#: src/transport/gnunet-service-transport_neighbours.c:2026
 #, c-format
-msgid "Failed to transmit CONNECT_ACK message via plugin to %s\n"
+msgid "Failed to send SYN_ACK message to peer `%s' using address `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2192
+#: src/transport/gnunet-service-transport_neighbours.c:2080
+#, fuzzy
+msgid "# SYN_ACK messages sent"
+msgstr "# messaggi PONG decrittati"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2097
 #, c-format
-msgid "Blacklisting disapproved to connect to peer `%s'\n"
+msgid "Failed to transmit SYN_ACK message to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2312
-msgid "# CONNECT messages received"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:2260
+#, fuzzy
+msgid "# SYN messages received"
+msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2317
+#: src/transport/gnunet-service-transport_neighbours.c:2265
 #, c-format
-msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
+msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2590
+#: src/transport/gnunet-service-transport_neighbours.c:2652
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3012
-msgid "# Failed attempts to switch addresses (no response)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:3107
-msgid "# CONNECT_ACK messages received"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:3137
+#, fuzzy
+msgid "# SYN_ACK messages received"
+msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3115
-msgid "# unexpected CONNECT_ACK messages (no peer)"
+#: src/transport/gnunet-service-transport_neighbours.c:3145
+msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3129
-#: src/transport/gnunet-service-transport_neighbours.c:3164
-msgid "# unexpected CONNECT_ACK messages (not ready)"
+#: src/transport/gnunet-service-transport_neighbours.c:3163
+#: src/transport/gnunet-service-transport_neighbours.c:3187
+msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3176
-msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
+#: src/transport/gnunet-service-transport_neighbours.c:3199
+msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3200
+#: src/transport/gnunet-service-transport_neighbours.c:3224
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3208
-msgid "# unexpected CONNECT_ACK messages (disconnecting)"
+#: src/transport/gnunet-service-transport_neighbours.c:3237
+msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3396
-msgid "# SESSION_ACK messages received"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:3410
+#, fuzzy
+msgid "# ACK messages received"
+msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3424
-msgid "# unexpected SESSION_ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:3446
+msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3490
-msgid "# SET QUOTA messages ignored (no such peer)"
+#: src/transport/gnunet-service-transport_neighbours.c:3534
+msgid "# quota messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3505
-msgid "# disconnects due to quota of 0"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:3541
+#, fuzzy
+msgid "# QUOTA messages received"
+msgstr "# messaggi PONG ricevuti"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3545
+#: src/transport/gnunet-service-transport_neighbours.c:3581
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3588
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3560
+#: src/transport/gnunet-service-transport_neighbours.c:3599
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3687
+#: src/transport/gnunet-service-transport_neighbours.c:3734
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:120
+#: src/transport/gnunet-service-transport_plugins.c:156
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:178
-#: src/transport/gnunet-service-transport_plugins.c:186
-#: src/transport/gnunet-service-transport_plugins.c:194
-#: src/transport/gnunet-service-transport_plugins.c:202
-#: src/transport/gnunet-service-transport_plugins.c:210
-#: src/transport/gnunet-service-transport_plugins.c:218
-#: src/transport/gnunet-service-transport_plugins.c:226
-#: src/transport/gnunet-service-transport_plugins.c:234
-#: src/transport/gnunet-service-transport_plugins.c:242
-#: src/transport/gnunet-service-transport_plugins.c:250
-#: src/transport/gnunet-service-transport_plugins.c:258
+#: src/transport/gnunet-service-transport_plugins.c:221
+#: src/transport/gnunet-service-transport_plugins.c:229
+#: src/transport/gnunet-service-transport_plugins.c:237
+#: src/transport/gnunet-service-transport_plugins.c:245
+#: src/transport/gnunet-service-transport_plugins.c:253
+#: src/transport/gnunet-service-transport_plugins.c:261
+#: src/transport/gnunet-service-transport_plugins.c:269
+#: src/transport/gnunet-service-transport_plugins.c:277
+#: src/transport/gnunet-service-transport_plugins.c:285
+#: src/transport/gnunet-service-transport_plugins.c:293
+#: src/transport/gnunet-service-transport_plugins.c:301
 #, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:265
+#: src/transport/gnunet-service-transport_plugins.c:308
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:488
-msgid "# address records discarded"
+#: src/transport/gnunet-service-transport_validation.c:386
+msgid "# Addresses in validation map"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:558
-#, c-format
-msgid "Not transmitting `%s' with `%s', message too big (%u bytes!). This 
should not happen.\n"
+#: src/transport/gnunet-service-transport_validation.c:489
+#: src/transport/gnunet-service-transport_validation.c:675
+#: src/transport/gnunet-service-transport_validation.c:995
+#: src/transport/gnunet-service-transport_validation.c:1607
+msgid "# validations running"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:530
+msgid "# address records discarded (timeout)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:578
+msgid "# address records discarded (blacklist)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:666
+msgid "# PINGs for address validation sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:616
-msgid "# PING without HELLO messages sent"
+#: src/transport/gnunet-service-transport_validation.c:746
+msgid "# validations delayed by global throttle"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:722
+#: src/transport/gnunet-service-transport_validation.c:783
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1011
+#: src/transport/gnunet-service-transport_validation.c:1121
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1062
+#: src/transport/gnunet-service-transport_validation.c:1172
 #, c-format
 msgid "Plugin `%s' not available, cannot confirm having this address\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1072
+#: src/transport/gnunet-service-transport_validation.c:1185
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1188
 #, c-format
 msgid "Address `%s' is not one of my addresses, not confirming PING\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1083
+#: src/transport/gnunet-service-transport_validation.c:1196
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1095
-#, c-format
-msgid "Not confirming PING from peer `%s' with address `%s' since I cannot 
confirm having this address.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:1103
+#: src/transport/gnunet-service-transport_validation.c:1209
 #, c-format
-msgid "Received a PING message with validation bug from `%s'\n"
+msgid ""
+"Not confirming PING from peer `%s' with address `%s' since I cannot confirm "
+"having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1157
+#: src/transport/gnunet-service-transport_validation.c:1264
 #, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1206
+#: src/transport/gnunet-service-transport_validation.c:1315
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1215
+#: src/transport/gnunet-service-transport_validation.c:1324
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1356
+#: src/transport/gnunet-service-transport_validation.c:1497
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1371
+#: src/transport/gnunet-service-transport_validation.c:1515
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1493
-#, c-format
-msgid "Validation received new %s message for peer `%s' with size %u\n"
+#: src/transport/gnunet-service-transport_validation.c:1570
+msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1500
-#, c-format
-msgid "Adding `%s' without addresses for peer `%s'\n"
+#: src/transport/gnunet-service-transport_validation.c:1625
+msgid "# HELLOs given to peerinfo"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:367
+#: src/transport/gnunet-transport.c:411
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:375
+#: src/transport/gnunet-transport.c:421
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:415
+#: src/transport/gnunet-transport.c:465
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:428
+#: src/transport/gnunet-transport.c:478
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:438
+#: src/transport/gnunet-transport.c:492
 msgid "Failed to list connections, timeout occured\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:559
-#, c-format
-msgid ""
-"Peer `%s' %s %s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-"\t%s%s\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:586
-#, c-format
-msgid "Peer `%s' %s `%s' \n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:712
-msgid "No transport plugins configured, peer will never communicate\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:726
+#: src/transport/gnunet-transport.c:525
 #, c-format
-msgid "No port configured for plugin `%s', cannot test it\n"
+msgid "Transmitting %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:789
+#: src/transport/gnunet-transport.c:559
 #, c-format
-msgid "Transmitting %u bytes to %s\n"
+msgid ""
+"Successfully connected to `%s', starting to send benchmark data in %u Kb "
+"blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:810
+#: src/transport/gnunet-transport.c:590
 #, c-format
-msgid "Successfully connected to `%s'\n"
+msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:614 src/transport/gnunet-transport.c:643
 #, c-format
-msgid "Successfully connected to `%s', starting to send benchmark data in %u 
Kb blocks\n"
+msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:865
-#, c-format
-msgid "Successfully disconnected from `%s'\n"
+#: src/transport/gnunet-transport.c:616
+msgid "Connected to"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:888
-#, c-format
-msgid "Disconnected from peer `%s' while benchmarking\n"
+#: src/transport/gnunet-transport.c:645
+msgid "Disconnected from"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:950
+#: src/transport/gnunet-transport.c:680
 #, c-format
-msgid "Received %u bytes from %s\n"
+msgid "Received %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:975
+#: src/transport/gnunet-transport.c:717
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:986
+#: src/transport/gnunet-transport.c:729
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1197 src/transport/gnunet-transport.c:1222
-msgid "Failed to send connect request to transport service\n"
+#: src/transport/gnunet-transport.c:1142
+msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1266
+#: src/transport/gnunet-transport.c:1249
 #, c-format
-msgid "Multiple operations given. Please choose only one operation: %s, %s, 
%s, %s, %s, %s\n"
+msgid ""
+"Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
+"%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1274
+#: src/transport/gnunet-transport.c:1262
 #, c-format
-msgid "No operation given. Please choose one operation: %s, %s, %s, %s, %s, 
%s\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1293 src/transport/gnunet-transport.c:1323
-#: src/transport/gnunet-transport.c:1353 src/transport/gnunet-transport.c:1376
-#: src/transport/gnunet-transport.c:1419
-msgid "Failed to connect to transport service\n"
-msgstr ""
-
-#: src/transport/gnunet-transport.c:1302 src/transport/gnunet-transport.c:1332
-#: src/transport/gnunet-transport.c:1362
-msgid "Failed to send request to transport service\n"
+msgid ""
+"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1381
-msgid "Starting to receive benchmark data\n"
+#: src/transport/gnunet-transport.c:1292
+msgid "Failed to connect to transport service for disconnection\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1465
-msgid "print information for all peers (instead of only connected peers )"
+#: src/transport/gnunet-transport.c:1298
+msgid "Blacklisting request in place, stop with CTRL-C\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1468
-msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
+#: src/transport/gnunet-transport.c:1323 src/transport/gnunet-transport.c:1353
+#: src/transport/gnunet-transport.c:1406
+msgid "Failed to connect to transport service\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1471
-msgid "connect to a peer"
+#: src/transport/gnunet-transport.c:1360
+msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1474
-msgid "disconnect to a peer"
+#: src/transport/gnunet-transport.c:1431
+msgid "print information for all peers (instead of only connected peers)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1477
-msgid "print information for all pending validations "
+#: src/transport/gnunet-transport.c:1435
+msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1480
-msgid "print information for all pending validations continously"
+#: src/transport/gnunet-transport.c:1439
+msgid "disconnect from a peer"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1483
+#: src/transport/gnunet-transport.c:1443
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1489
-msgid "provide information about all connects and disconnect events 
(continuously)"
+#: src/transport/gnunet-transport.c:1451
+msgid ""
+"provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1491
+#: src/transport/gnunet-transport.c:1455
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1493
+#: src/transport/gnunet-transport.c:1460
+#: src/transport/gnunet-transport-profiler.c:639
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1495
-msgid "send data for benchmarking to the other peer (until CTRL-C)"
+#: src/transport/gnunet-transport.c:1464
+msgid "monitor plugin sessions"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1498
-msgid "test transport configuration (involves external server)"
+#: src/transport/gnunet-transport.c:1469
+msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1507
+#: src/transport/gnunet-transport.c:1480
+#: src/transport/gnunet-transport-profiler.c:650
 msgid "Direct access to transport service."
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:621
-msgid "# Bluetooth ACKs sent"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:640
-msgid "# Bluetooth messages defragmented"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:686
-#: src/transport/plugin_transport_bluetooth.c:737
-#: src/transport/plugin_transport_bluetooth.c:1942
-msgid "# Bluetooth sessions allocated"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:837
-msgid "# Bluetooth message fragments sent"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:861
-msgid "# Bluetooth messages pending (with fragmentation)"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:969
-#: src/transport/plugin_transport_bluetooth.c:1054
-#: src/transport/plugin_transport_bluetooth.c:1944
-msgid "# Bluetooth MAC endpoints allocated"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:1307
-msgid "# HELLO messages received via Bluetooth"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:1331
-msgid "# fragments received via Bluetooth"
-msgstr ""
-
-#: src/transport/plugin_transport_bluetooth.c:1341
-msgid "# ACKs received via Bluetooth"
+#: src/transport/gnunet-transport-profiler.c:217
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1401
-msgid "# Bluetooth DATA messages discarded due to CRC32 error"
+#: src/transport/gnunet-transport-profiler.c:615
+msgid "send data to peer"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1512
-msgid "# DATA messages received via Bluetooth"
+#: src/transport/gnunet-transport-profiler.c:619
+msgid "receive data from peer"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1547
-msgid "# Bluetooth DATA messages processed"
+#: src/transport/gnunet-transport-profiler.c:624
+msgid "iterations"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1610
-msgid "# HELLO beacons sent via Bluetooth"
+#: src/transport/gnunet-transport-profiler.c:629
+msgid "number of messages to send"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1723
-msgid "Bluetooth address with invalid size encountered\n"
+#: src/transport/gnunet-transport-profiler.c:634
+msgid "message size to use"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1923
-#, c-format
-msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
+#: src/transport/plugin_transport_http_client.c:1472
+#: src/transport/plugin_transport_http_server.c:2310
+#: src/transport/plugin_transport_http_server.c:3524
+#: src/transport/plugin_transport_tcp.c:3889
+#: src/transport/plugin_transport_tcp.c:3896
+#: src/transport/plugin_transport_xt.c:3897
+#: src/transport/plugin_transport_xt.c:3904
+msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1622
+#: src/transport/plugin_transport_http_client.c:2113
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1697
-#: src/transport/plugin_transport_http_server.c:3007
+#: src/transport/plugin_transport_http_client.c:2162
+#: src/transport/plugin_transport_http_server.c:3239
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1722
-#: src/transport/plugin_transport_http_server.c:3063
+#: src/transport/plugin_transport_http_client.c:2179
+#: src/transport/plugin_transport_http_server.c:3309
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1750
-#: src/transport/plugin_transport_http_server.c:2907
+#: src/transport/plugin_transport_http_client.c:2213
 #, c-format
-msgid "Maximum number of connections is %u\n"
+msgid "Maximum number of requests is %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1402
+#: src/transport/plugin_transport_http_server.c:1754
 #, c-format
-msgid "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload 
data size %u\n"
+msgid ""
+"Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
+"size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1663
+#: src/transport/plugin_transport_http_server.c:2026
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1671
+#: src/transport/plugin_transport_http_server.c:2034
 #, c-format
-msgid "Server reached maximum number connections (%u), rejecting new 
connection\n"
+msgid ""
+"Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1958
-msgid "Could not create a new TLS certificate, program 
`gnunet-transport-certificate-creation' could not be started!\n"
+#: src/transport/plugin_transport_http_server.c:2184
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1982
+#: src/transport/plugin_transport_http_server.c:2207
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2405
-msgid "Require valid port number for service in configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_http_server.c:2437 src/util/service.c:698
-#, c-format
-msgid "Failed to resolve `%s': %s\n"
+#: src/transport/plugin_transport_http_server.c:2336
+msgid "Could not load or create server certificate! Loading plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2454 src/util/service.c:715
-#, c-format
-msgid "Failed to find %saddress for `%s'.\n"
+#: src/transport/plugin_transport_http_server.c:2648
+msgid "Require valid port number for service in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2565
+#: src/transport/plugin_transport_http_server.c:2813
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2637
+#: src/transport/plugin_transport_http_server.c:2899
+#: src/transport/plugin_transport_udp.c:3621
+#: src/transport/plugin_transport_xu.c:2047
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2730
+#: src/transport/plugin_transport_http_server.c:3005
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2744
+#: src/transport/plugin_transport_http_server.c:3020
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2751
+#: src/transport/plugin_transport_http_server.c:3026
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2762
+#: src/transport/plugin_transport_http_server.c:3037
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2769
+#: src/transport/plugin_transport_http_server.c:3043
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2784
+#: src/transport/plugin_transport_http_server.c:3062
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2794
+#: src/transport/plugin_transport_http_server.c:3097
 #, c-format
-msgid "Binding to IPv4 address %s\n"
+msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2815
+#: src/transport/plugin_transport_http_server.c:3172
 #, c-format
-msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
+msgid "Using external hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2825
+#: src/transport/plugin_transport_http_server.c:3193
 #, c-format
-msgid "Binding to IPv6 address %s\n"
+msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2877
+#: src/transport/plugin_transport_http_server.c:3210
 #, c-format
-msgid "Using external hostname `%s'\n"
+msgid "Maximum number of connections is %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2893
-#, c-format
-msgid "Notifying transport only about hostname `%s'\n"
+#: src/transport/plugin_transport_http_server.c:3536
+msgid "Unable to compile URL regex\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:223
+#: src/transport/plugin_transport_smtp.c:221
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:310
+#: src/transport/plugin_transport_smtp.c:308
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:319
+#: src/transport/plugin_transport_smtp.c:317
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:414
-#: src/transport/plugin_transport_smtp.c:424
-#: src/transport/plugin_transport_smtp.c:437
-#: src/transport/plugin_transport_smtp.c:456
-#: src/transport/plugin_transport_smtp.c:479
-#: src/transport/plugin_transport_smtp.c:487
-#: src/transport/plugin_transport_smtp.c:500
-#: src/transport/plugin_transport_smtp.c:511
+#: src/transport/plugin_transport_smtp.c:412
+#: src/transport/plugin_transport_smtp.c:422
+#: src/transport/plugin_transport_smtp.c:435
+#: src/transport/plugin_transport_smtp.c:454
+#: src/transport/plugin_transport_smtp.c:477
+#: src/transport/plugin_transport_smtp.c:485
+#: src/transport/plugin_transport_smtp.c:498
+#: src/transport/plugin_transport_smtp.c:509
 #, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:652
+#: src/transport/plugin_transport_smtp.c:650
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:664
+#: src/transport/plugin_transport_smtp.c:662
 msgid "# bytes received via SMTP"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:665
+#: src/transport/plugin_transport_smtp.c:663
 msgid "# bytes sent via SMTP"
 msgstr "# byte inviati via SMTP"
 
-#: src/transport/plugin_transport_smtp.c:667
+#: src/transport/plugin_transport_smtp.c:665
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:555
+#: src/transport/plugin_transport_tcp.c:1545
+#: src/transport/plugin_transport_tcp.c:2871
+#: src/transport/plugin_transport_xt.c:1551
+#: src/transport/plugin_transport_xt.c:2877
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:762
-#: src/transport/plugin_transport_tcp.c:928
-#: src/transport/plugin_transport_tcp.c:2005
-#: src/transport/plugin_transport_tcp.c:2558
+#: src/transport/plugin_transport_tcp.c:1728
+#: src/transport/plugin_transport_tcp.c:1952
+#: src/transport/plugin_transport_tcp.c:3135
+#: src/transport/plugin_transport_tcp.c:4012
+#: src/transport/plugin_transport_xt.c:1734
+#: src/transport/plugin_transport_xt.c:1958
+#: src/transport/plugin_transport_xt.c:3141
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:795
-#: src/transport/plugin_transport_tcp.c:921
-#: src/transport/plugin_transport_tcp.c:1009
-#: src/transport/plugin_transport_tcp.c:1056
-#: src/transport/plugin_transport_tcp.c:1219
-#: src/transport/plugin_transport_tcp.c:1237
+#: src/transport/plugin_transport_tcp.c:1770
+#: src/transport/plugin_transport_tcp.c:1934
+#: src/transport/plugin_transport_tcp.c:2058
+#: src/transport/plugin_transport_tcp.c:2131
+#: src/transport/plugin_transport_tcp.c:2231
+#: src/transport/plugin_transport_tcp.c:2256
+#: src/transport/plugin_transport_xt.c:1776
+#: src/transport/plugin_transport_xt.c:1940
+#: src/transport/plugin_transport_xt.c:2064
+#: src/transport/plugin_transport_xt.c:2137
+#: src/transport/plugin_transport_xt.c:2237
+#: src/transport/plugin_transport_xt.c:2262
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:798
+#: src/transport/plugin_transport_tcp.c:1773
+#: src/transport/plugin_transport_xt.c:1779
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1012
+#: src/transport/plugin_transport_tcp.c:2061
+#: src/transport/plugin_transport_xt.c:2067
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1059
+#: src/transport/plugin_transport_tcp.c:2135
+#: src/transport/plugin_transport_xt.c:2141
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1193
-#, c-format
-msgid "Trying to send with invalid session %p\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1462
+#: src/transport/plugin_transport_tcp.c:2533
+#: src/transport/plugin_transport_xt.c:2539
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1567
+#: src/transport/plugin_transport_tcp.c:2709
+#: src/transport/plugin_transport_xt.c:2715
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2055
+#: src/transport/plugin_transport_tcp.c:3201
+#: src/transport/plugin_transport_xt.c:3207
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2215
+#: src/transport/plugin_transport_tcp.c:3407
+#: src/transport/plugin_transport_xt.c:3413
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2279
-msgid "# network-level TCP disconnect events"
+#: src/transport/plugin_transport_tcp.c:3458
+#: src/transport/plugin_transport_tcp.c:3516
+#: src/transport/plugin_transport_xt.c:3464
+#: src/transport/plugin_transport_xt.c:3522
+#, fuzzy
+msgid "# TCP server connections active"
+msgstr "# connessioni attive"
+
+#: src/transport/plugin_transport_tcp.c:3462
+#: src/transport/plugin_transport_xt.c:3468
+msgid "# TCP server connect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2437 src/util/service.c:582
-#: src/util/service.c:588
-#, c-format
-msgid "Require valid port number for service `%s' in configuration!\n"
+#: src/transport/plugin_transport_tcp.c:3468
+#: src/transport/plugin_transport_xt.c:3474
+msgid "TCP connection limit reached, suspending server\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:3470
+#: src/transport/plugin_transport_xt.c:3476
+msgid "# TCP service suspended"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:3510
+#: src/transport/plugin_transport_xt.c:3516
+msgid "# TCP service resumed"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:3520
+#: src/transport/plugin_transport_xt.c:3526
+msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2451
+#: src/transport/plugin_transport_tcp.c:3839
+#: src/transport/plugin_transport_xt.c:3847
 msgid "Failed to start service.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2547
+#: src/transport/plugin_transport_tcp.c:4000
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2551
+#: src/transport/plugin_transport_tcp.c:4004
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2554
+#: src/transport/plugin_transport_tcp.c:4008
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:167
-msgid "# IPv6 multicast HELLO beacons received via udp"
+#: src/transport/plugin_transport_udp_broadcasting.c:166
+msgid "# Multicast HELLO beacons received via UDP"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:210
-msgid "# IPv4 broadcast HELLO beacons received via udp"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:603
-msgid "Disabling HELLO broadcasting due to friend-to-friend only 
configuration!\n"
+#: src/transport/plugin_transport_udp_broadcasting.c:546
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:626
+#: src/transport/plugin_transport_udp_broadcasting.c:563
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1513
+#: src/transport/plugin_transport_udp.c:3365
 #, c-format
-msgid "Trying to create session for address of unexpected length %u (should be 
%u or %u)\n"
+msgid ""
+"UDP could not transmit message to `%s': Network seems down, please check "
+"your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2602
+#: src/transport/plugin_transport_udp.c:3379
+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:3697
+#: src/transport/plugin_transport_udp.c:3796
 #, c-format
-msgid "UDP could not transmit message to `%s': Network seems down, please 
check your network configuration\n"
+msgid "Failed to bind UDP socket to %s: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2616
-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"
+#: src/transport/plugin_transport_udp.c:3715
+#: src/transport/plugin_transport_xu.c:2141
+msgid "Disabling IPv4 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2961
+#: src/transport/plugin_transport_udp.c:3806
 msgid "Failed to open UDP sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3056
+#: src/transport/plugin_transport_udp.c:3877
+#: src/transport/plugin_transport_udp.c:3891
+#: src/transport/plugin_transport_xu.c:2299
+#: src/transport/plugin_transport_xu.c:2313
+msgid "must be in [0,65535]"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:3923
+#: src/transport/plugin_transport_xu.c:2345
+#, fuzzy
+msgid "must be valid IPv4 address"
+msgstr "`%s' non è un indirizzo IP valido.\n"
+
+#: src/transport/plugin_transport_udp.c:3950
+#: src/transport/plugin_transport_xu.c:2372
+#, fuzzy
+msgid "must be valid IPv6 address"
+msgstr "`%s' non è un indirizzo IP valido.\n"
+
+#: src/transport/plugin_transport_udp.c:4014
+msgid "Failed to create UDP network sockets\n"
+msgstr ""
+
+#: src/transport/plugin_transport_unix.c:1401
+#, c-format
+msgid "Cannot create path to `%s'\n"
+msgstr ""
+
+#: src/transport/plugin_transport_unix.c:1414
+#, fuzzy, c-format
+msgid "Cannot bind to `%s'\n"
+msgstr "Connessione stabilita con `%s'\n"
+
+#: src/transport/plugin_transport_unix.c:1814
+msgid "Failed to open UNIX listen socket\n"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:766
+msgid "# ACKs sent"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:786
+#, fuzzy
+msgid "# Messages defragmented"
+msgstr "# messaggi PONG decrittati"
+
+#: src/transport/plugin_transport_wlan.c:827
+#: src/transport/plugin_transport_wlan.c:912
+msgid "# Sessions allocated"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:1033
+msgid "# message fragments sent"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:1062
+msgid "# messages pending (with fragmentation)"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:1191
+#: src/transport/plugin_transport_wlan.c:1282
+#: src/transport/plugin_transport_wlan.c:2303
+msgid "# MAC endpoints allocated"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:1565
+#, fuzzy
+msgid "# ACKs received"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/transport/plugin_transport_wlan.c:1634
+msgid "# DATA messages discarded due to CRC32 error"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:1738
+msgid "# HELLO beacons sent"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:1854
+#, fuzzy
+msgid "# DATA messages received"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/transport/plugin_transport_wlan.c:1888
+#, fuzzy
+msgid "# DATA messages processed"
+msgstr "# messaggi PONG ricevuti"
+
+#: src/transport/plugin_transport_wlan.c:2278
+#, c-format
+msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:2300
+msgid "# sessions allocated"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4008
 #, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+msgid "XT transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3097
+#: src/transport/plugin_transport_xt.c:4012
+msgid "XT transport not listening on any port (client only)\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xt.c:4016
 #, c-format
-msgid "Invalid IPv6 address: `%s'\n"
+msgid "XT transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3168
-msgid "Failed to create network sockets, plugin failed\n"
+#: src/transport/plugin_transport_xt.c:4020
+msgid "# XT sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1321
+#: src/transport/plugin_transport_xu.c:1235
 #, c-format
-msgid "Cannot create path to `%s'\n"
+msgid ""
+"XU could not transmit message to `%s': Network seems down, please check your "
+"network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1652
-msgid "No UNIXPATH given in configuration!\n"
+#: src/transport/plugin_transport_xu.c:1249
+msgid ""
+"XU 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_xu.c:2123
+#: src/transport/plugin_transport_xu.c:2222
+#, c-format
+msgid "Failed to bind XU socket to %s: %s\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xu.c:2232
+msgid "Failed to open XU sockets\n"
+msgstr ""
+
+#: src/transport/plugin_transport_xu.c:2396
+msgid "Failed to create XU network sockets\n"
+msgstr ""
+
+#: src/transport/tcp_connection_legacy.c:450
+#, c-format
+msgid "Access denied to `%s'\n"
+msgstr ""
+
+#: src/transport/tcp_connection_legacy.c:467
+#, c-format
+msgid "Accepting connection from `%s': %p\n"
+msgstr ""
+
+#: src/transport/tcp_server_legacy.c:472 src/util/service.c:1109
+#, c-format
+msgid "`%s' failed for port %d (%s).\n"
+msgstr ""
+
+#: src/transport/tcp_server_legacy.c:482 src/util/service.c:1119
+#, c-format
+msgid "`%s' failed for port %d (%s): address already in use\n"
+msgstr ""
+
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1125
+#, c-format
+msgid "`%s' failed for `%s': address already in use\n"
+msgstr ""
+
+#: src/transport/tcp_server_legacy.c:888
+#, c-format
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1688
-msgid "Failed to open UNIX listen socket\n"
+#: src/transport/tcp_service_legacy.c:337 src/util/service.c:2378
+#, c-format
+msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:620
-msgid "# WLAN ACKs sent"
+#: src/transport/tcp_service_legacy.c:344
+#, c-format
+msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:639
-msgid "# WLAN messages defragmented"
+#: src/transport/tcp_service_legacy.c:400 src/util/service.c:437
+#, c-format
+msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:688
-#: src/transport/plugin_transport_wlan.c:772
-#: src/transport/plugin_transport_wlan.c:1948
-msgid "# WLAN sessions allocated"
+#: src/transport/tcp_service_legacy.c:438 src/util/service.c:480
+#, c-format
+msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:876
-msgid "# WLAN message fragments sent"
+#: src/transport/tcp_service_legacy.c:902 src/util/service.c:1040
+msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:900
-msgid "# WLAN messages pending (with fragmentation)"
+#: src/transport/tcp_service_legacy.c:951
+#: src/transport/tcp_service_legacy.c:969 src/util/service.c:1192
+#, c-format
+msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1008
-#: src/transport/plugin_transport_wlan.c:1098
-#: src/transport/plugin_transport_wlan.c:1950
-msgid "# WLAN MAC endpoints allocated"
+#: src/transport/tcp_service_legacy.c:994 src/util/service.c:1224
+#, c-format
+msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1302
-msgid "# HELLO messages received via WLAN"
+#: src/transport/tcp_service_legacy.c:1159
+#, c-format
+msgid "Failed to start `%s' at `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1326
-msgid "# fragments received via WLAN"
+#: src/transport/tcp_service_legacy.c:1200
+#, c-format
+msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1336
-msgid "# ACKs received via WLAN"
+#: src/transport/tcp_service_legacy.c:1249 src/util/service.c:1498
+msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1396
-msgid "# WLAN DATA messages discarded due to CRC32 error"
+#: src/transport/tcp_service_legacy.c:1253 src/util/service.c:1502
+msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1518
-msgid "# DATA messages received via WLAN"
+#: src/transport/tcp_service_legacy.c:1257 src/util/service.c:1506
+msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1553
-msgid "# WLAN DATA messages processed"
+#: src/transport/tcp_service_legacy.c:1311 src/util/disk.c:1521
+#: src/util/service.c:1376
+#, c-format
+msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1616
-msgid "# HELLO beacons sent via WLAN"
+#: src/transport/tcp_service_legacy.c:1312 src/util/service.c:1378
+msgid "No such user"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1729
-msgid "WLAN address with invalid size encountered\n"
+#: src/transport/tcp_service_legacy.c:1325 src/util/service.c:1397
+#, c-format
+msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1929
-#, c-format
-msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
+#: src/transport/tcp_service_legacy.c:1396 src/util/service.c:1757
+msgid "do daemonize (detach from terminal)"
 msgstr ""
 
-#: src/transport/transport_api.c:739
+#: src/transport/tcp_service_legacy.c:1446 src/util/program.c:277
+#: src/util/service.c:1820
 #, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
+msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/transport/transport-testing.c:584
-msgid "Failed to initialize testing library!\n"
+#: src/transport/tcp_service_legacy.c:1456 src/util/program.c:297
+#: src/util/service.c:1831
+msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
-#: src/tun/regex.c:129
+#: src/transport/tcp_service_legacy.c:1461 src/util/program.c:290
+#: src/util/service.c:1837
 #, c-format
-msgid "Bad mask: %d\n"
+msgid "Could not access configuration file `%s'\n"
 msgstr ""
 
-#: src/util/bio.c:170 src/util/bio.c:178
+#: src/util/bio.c:179 src/util/bio.c:187
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr ""
 
-#: src/util/bio.c:180
+#: src/util/bio.c:189
 msgid "End of file"
 msgstr "Fine del file"
 
-#: src/util/bio.c:237
+#: src/util/bio.c:246
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:247
+#: src/util/bio.c:256
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:293
+#: src/util/bio.c:304
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:307
+#: src/util/bio.c:326
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:261 src/util/client.c:858 src/util/service.c:619
-#, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/client.c:265 src/util/client.c:863 src/util/service.c:623
-#, c-format
-msgid "Using `%s' instead\n"
-msgstr ""
-
-#: src/util/client.c:360
-#, c-format
-msgid "Could not determine valid hostname and port for service `%s' from 
configuration.\n"
+#: src/util/client.c:732
+msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:368
+#: src/util/client.c:923
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:1008
-#, c-format
-msgid "Could not connect to service `%s', configuration broken.\n"
-msgstr ""
-
-#: src/util/client.c:1020
-#, c-format
-msgid "Failure to transmit request to service `%s'\n"
-msgstr ""
-
-#: src/util/client.c:1303
-msgid "Could not submit request, not expecting to receive a response.\n"
-msgstr ""
-
-#: src/util/common_logging.c:254 src/util/common_logging.c:1039
+#: src/util/common_logging.c:257 src/util/common_logging.c:1159
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:256 src/util/common_logging.c:1037
+#: src/util/common_logging.c:259 src/util/common_logging.c:1157
 msgid "INFO"
 msgstr ""
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1035
+#: src/util/common_logging.c:261 src/util/common_logging.c:1155
+msgid "MESSAGE"
+msgstr ""
+
+#: src/util/common_logging.c:263 src/util/common_logging.c:1153
 msgid "WARNING"
 msgstr ""
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1033
+#: src/util/common_logging.c:265 src/util/common_logging.c:1151
 msgid "ERROR"
 msgstr "ERRORE"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1041
+#: src/util/common_logging.c:267 src/util/common_logging.c:1161
 msgid "NONE"
 msgstr "NESSUNA"
 
-#: src/util/common_logging.c:391
+#: src/util/common_logging.c:631 src/util/common_logging.c:661
 #, c-format
-msgid "Failed to create or access directory for log file `%s'\n"
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:817
+#: src/util/common_logging.c:895
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1042
+#: src/util/common_logging.c:1162
 msgid "INVALID"
 msgstr "NON VALIDO"
 
-#: src/util/common_logging.c:1157
+#: src/util/common_logging.c:1455
 msgid "unknown address"
 msgstr "indirizzo sconosciuto"
 
-#: src/util/common_logging.c:1196
+#: src/util/common_logging.c:1497
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1214
+#: src/util/common_logging.c:1515
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1235
+#: src/util/common_logging.c:1536
 #, c-format
-msgid "Configuration specifies invalid value for option `%s' in section `%s': 
%s\n"
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr ""
 
-#: src/util/configuration.c:288
+#: src/util/configuration.c:294
 #, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:996
+#: src/util/configuration.c:361
 #, c-format
-msgid "Configuration value '%s' for '%s' in section '%s' is not in set of 
legal choices\n"
+msgid "Error while reading file `%s'\n"
+msgstr ""
+
+#: src/util/configuration.c:970
+msgid "Not a valid relative time specification"
 msgstr ""
 
-#: src/util/configuration.c:1066
+#: src/util/configuration.c:1059
 #, c-format
-msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1098
+#: src/util/configuration.c:1178
 #, c-format
-msgid "Missing closing `%s' in option `%s'\n"
+msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1172
+#: src/util/configuration.c:1211
 #, c-format
-msgid "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor 
defined as an environmental variable\n"
+msgid "Missing closing `%s' in option `%s'\n"
 msgstr ""
 
-#: src/util/connection.c:423
+#: src/util/configuration.c:1279
 #, c-format
-msgid "Access denied to `%s'\n"
+msgid ""
+"Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
+"as an environmental variable\n"
 msgstr ""
 
-#: src/util/connection.c:438
+#: src/util/container_bloomfilter.c:530
 #, c-format
-msgid "Accepting connection from `%s': %p\n"
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
 msgstr ""
 
-#: src/util/connection.c:553
+#: src/util/crypto_ecc.c:860
 #, c-format
-msgid "Failed to establish TCP connection to `%s:%u', no further addresses to 
try.\n"
+msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/connection.c:751 src/util/connection.c:919
+#: src/util/crypto_ecc.c:915
 #, c-format
-msgid "Trying to connect to `%s' (%p)\n"
+msgid "EdDSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/connection.c:910
+#: src/util/crypto_ecc.c:994
 #, c-format
-msgid "Attempt to connect to `%s' failed\n"
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/container_bloomfilter.c:531
+#: src/util/crypto_ecc.c:1055
 #, c-format
-msgid "Size of file on disk is incorrect for this Bloom filter (want %llu, 
have %llu)\n"
+msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:702 src/util/crypto_ecc.c:740
-#: src/util/crypto_ecc.c:858 src/util/crypto_ecc.c:896
+#: src/util/crypto_ecc_setup.c:121 src/util/crypto_ecc_setup.c:160
+#: src/util/crypto_ecc_setup.c:303 src/util/crypto_ecc_setup.c:350
 #, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:707 src/util/crypto_ecc.c:863
+#: src/util/crypto_ecc_setup.c:127 src/util/crypto_ecc_setup.c:309
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:744 src/util/crypto_ecc.c:900
+#: src/util/crypto_ecc_setup.c:164 src/util/crypto_ecc_setup.c:354
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:774 src/util/crypto_ecc.c:930
+#: src/util/crypto_ecc_setup.c:194 src/util/crypto_ecc_setup.c:396
 #, c-format
-msgid "When trying to read key file `%s' I found %u bytes but I need at least 
%u.\n"
+msgid ""
+"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:778 src/util/crypto_ecc.c:934
+#: src/util/crypto_ecc_setup.c:199 src/util/crypto_ecc_setup.c:400
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1016
+#: src/util/crypto_ecc_setup.c:466
 msgid "Could not load peer's private key\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1120
+#: src/util/crypto_random.c:304
 #, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
+msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1170
+#: src/util/crypto_rsa.c:848
 #, c-format
-msgid "EdDSA signing failed at %s:%d: %s\n"
+msgid "RSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1244
+#: src/util/crypto_rsa.c:1187
 #, c-format
-msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1301
+#: src/util/disk.c:1251
 #, c-format
-msgid "EdDSA signature verification failed at %s:%d: %s\n"
+msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/crypto_random.c:284
+#: src/util/dnsparser.c:250
 #, c-format
-msgid "libgcrypt has not the expected version (version %s is required).\n"
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/util/disk.c:1184
+#: src/util/dnsparser.c:940
 #, c-format
-msgid "Expected `%s' to be a directory!\n"
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
 
-#: src/util/disk.c:1546 src/util/service.c:1318
+#: src/util/dnsstub.c:229
 #, c-format
-msgid "Cannot obtain information about user `%s': %s\n"
+msgid "Could not bind to any port: %s\n"
+msgstr ""
+
+#: src/util/dnsstub.c:360
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
+
+#: src/util/dnsstub.c:507
+#, c-format
+msgid "Failed to send DNS request to %s: %s\n"
+msgstr ""
+
+#: src/util/dnsstub.c:513
+#, c-format
+msgid "Sent DNS request to %s\n"
 msgstr ""
 
 #: src/util/getopt.c:568
@@ -7542,74 +8235,148 @@ msgstr ""
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:933
+#: src/util/getopt.c:947
 #, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:84
+#: src/util/getopt.c:962
+#, c-format
+msgid "Missing mandatory option `%s'.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:68
+msgid "print the version number"
+msgstr ""
+
+#: src/util/getopt_helpers.c:113
 #, c-format
-msgid "Arguments mandatory for long options are also mandatory for short 
options.\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:201
+msgid "print this help"
+msgstr ""
+
+#: src/util/getopt_helpers.c:279
+msgid "be verbose"
+msgstr ""
+
+#: src/util/getopt_helpers.c:420
+msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:268 src/util/getopt_helpers.c:326
+#: src/util/getopt_helpers.c:500
+msgid "configure logging to write logs to FILENAME"
+msgstr ""
+
+#: src/util/getopt_helpers.c:522
+msgid "use configuration file FILENAME"
+msgstr ""
+
+#: src/util/getopt_helpers.c:559 src/util/getopt_helpers.c:763
+#: src/util/getopt_helpers.c:830
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:298
+#: src/util/getopt_helpers.c:624
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:90
+#: src/util/getopt_helpers.c:690
+#, c-format
+msgid "You must pass absolute time to the `%s' option.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:754
+#, c-format
+msgid "Your input for the '%s' option has to be a non negative number \n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:837
+#, c-format
+msgid "You must pass a number below %u to the `%s' option.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:923
+#, c-format
+msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
+msgstr ""
+
+#: src/util/gnunet-config.c:157
+#, c-format
+msgid "failed to load configuration defaults"
+msgstr ""
+
+#: src/util/gnunet-config.c:170
 #, c-format
 msgid "--section argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:133
+#: src/util/gnunet-config.c:173
+#, c-format
+msgid "The following sections are available:\n"
+msgstr ""
+
+#: src/util/gnunet-config.c:224
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:160
+#: src/util/gnunet-config.c:263
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:163
+#: src/util/gnunet-config.c:268
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:166
+#: src/util/gnunet-config.c:273
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:169
+#: src/util/gnunet-config.c:278
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:178
+#: src/util/gnunet-config.c:282
+msgid "print available configuration sections"
+msgstr ""
+
+#: src/util/gnunet-config.c:286
+msgid "write configuration file that only contains delta to defaults"
+msgstr ""
+
+#: src/util/gnunet-config.c:299
 msgid "Manipulate GNUnet configuration files"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:75
+#: src/util/gnunet-ecc.c:92
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:81
+#: src/util/gnunet-ecc.c:128
+#, c-format
+msgid "Generating %u keys like %s, please wait"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:141
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:97
+#: src/util/gnunet-ecc.c:182
 #, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:107
+#: src/util/gnunet-ecc.c:192
 #, c-format
 msgid ""
 "\n"
@@ -7618,100 +8385,102 @@ msgstr ""
 "\n"
 "Completato!\n"
 
-#: src/util/gnunet-ecc.c:110
+#: src/util/gnunet-ecc.c:195
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:199
+#: src/util/gnunet-ecc.c:288
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:210
+#: src/util/gnunet-ecc.c:303
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:232
+#: src/util/gnunet-ecc.c:332
 #, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:283
+#: src/util/gnunet-ecc.c:389
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:349
+#: src/util/gnunet-ecc.c:454
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:352
+#: src/util/gnunet-ecc.c:459
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:355
+#: src/util/gnunet-ecc.c:464
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:358
+#: src/util/gnunet-ecc.c:468
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:361
-msgid "print the hash of the public key in ASCII format"
+#: src/util/gnunet-ecc.c:472
+msgid "print the private key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:476
+msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:364
+#: src/util/gnunet-ecc.c:480
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:375
+#: src/util/gnunet-ecc.c:496
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:149
+#: src/util/gnunet-resolver.c:166
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:160
+#: src/util/gnunet-resolver.c:177
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:279
+#: src/util/gnunet-scrypt.c:240
+#, c-format
+msgid "Loading hostkey from `%s' failed.\n"
+msgstr ""
+
+#: src/util/gnunet-scrypt.c:315
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:282
+#: src/util/gnunet-scrypt.c:320
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:285
+#: src/util/gnunet-scrypt.c:325
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:288
+#: src/util/gnunet-scrypt.c:330
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:299
+#: src/util/gnunet-scrypt.c:343
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:299
-#, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr ""
-
-#: src/util/gnunet-service-resolver.c:371
-#: src/util/gnunet-service-resolver.c:412
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
+#: src/util/gnunet-service-resolver.c:1443
+msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
-#: src/util/gnunet-uri.c:84
+#: src/util/gnunet-uri.c:83
 #, c-format
 msgid "No URI specified on command line\n"
 msgstr ""
@@ -7735,17 +8504,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:338
+#: src/util/helper.c:333
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr ""
 
-#: src/util/helper.c:383
+#: src/util/helper.c:384
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:609
+#: src/util/helper.c:604
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr ""
@@ -7755,449 +8524,361 @@ msgstr ""
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1355 src/util/network.c:1480
+#: src/util/network.c:1793 src/util/network.c:1977
 #, c-format
-msgid "Fatal internal logic error, process hangs in `%s' (abort with 
CTRL-C)!\n"
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:421
+#: src/util/os_installation.c:507
 #, c-format
-msgid "Could not determine installation path for %s.  Set `%s' environment 
variable.\n"
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:766
+#: src/util/os_installation.c:879
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/os_installation.c:826
+#: src/util/os_installation.c:920
+#, c-format
+msgid "Binary `%s' exists, but is not SUID\n"
+msgstr ""
+
+#: src/util/os_installation.c:951
 #, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/os_installation.c:836
+#: src/util/os_installation.c:961
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
 
-#: src/util/plugin.c:87
+#: src/util/plugin.c:84
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/util/plugin.c:148
+#: src/util/plugin.c:149
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:223
+#: src/util/plugin.c:224
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:382
+#: src/util/plugin.c:383
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/util/program.c:246 src/util/service.c:1452
-#, c-format
-msgid "Malformed configuration file `%s', exit ...\n"
-msgstr ""
-
-#: src/util/program.c:258 src/util/service.c:1467
+#: src/util/regex.c:132
 #, c-format
-msgid "Could not access configuration file `%s'\n"
-msgstr ""
-
-#: src/util/program.c:263 src/util/service.c:1462
-msgid "Malformed configuration, exit ...\n"
-msgstr ""
-
-#: src/util/resolver_api.c:198
-#, c-format
-msgid "Must specify `%s' for `%s' in configuration!\n"
+msgid "Bad mask: %d\n"
 msgstr ""
 
 #: src/util/resolver_api.c:216
 #, c-format
-msgid "Must specify `%s' or numeric IP address for `%s' of `%s' in 
configuration!\n"
+msgid ""
+"Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:348
+#: src/util/resolver_api.c:237
 #, c-format
-msgid "Timeout trying to resolve IP address `%s'.\n"
+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:352
+#: src/util/resolver_api.c:873
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:908
-#, c-format
-msgid "Could not resolve our FQDN : %s\n"
-msgstr ""
-
-#: src/util/scheduler.c:813
-msgid "Looks like we're busy waiting...\n"
-msgstr ""
-
-#: src/util/scheduler.c:948
-#, c-format
-msgid "Attempt to cancel dead task %llu!\n"
-msgstr ""
-
-#: src/util/server.c:484
-#, c-format
-msgid "`%s' failed for port %d (%s).\n"
-msgstr ""
-
-#: src/util/server.c:493
-#, c-format
-msgid "`%s' failed for port %d (%s): address already in use\n"
-msgstr ""
-
-#: src/util/server.c:499
-#, c-format
-msgid "`%s' failed for `%s': address already in use\n"
-msgstr ""
-
-#: src/util/server.c:892
-#, c-format
-msgid "Processing code for message of type %u did not call 
`GNUNET_SERVER_receive_done' after %s\n"
-msgstr ""
-
-#: src/util/service.c:347
-#, c-format
-msgid "Unknown address family %d\n"
-msgstr ""
-
-#: src/util/service.c:354
-#, c-format
-msgid "Access from `%s' denied to service `%s'\n"
-msgstr ""
-
-#: src/util/service.c:409
-#, c-format
-msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-#: src/util/service.c:446
-#, c-format
-msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
-msgstr ""
-
-#: src/util/service.c:563
-#, c-format
-msgid "Disabling IPv6 support for service `%s', failed to create IPv6 socket: 
%s\n"
-msgstr ""
-
-#: src/util/service.c:653
-#, c-format
-msgid "Disabling UNIX domain socket support for service `%s', failed to create 
UNIX domain socket: %s\n"
-msgstr ""
-
-#: src/util/service.c:669
+#: src/util/resolver_api.c:886
 #, c-format
-msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
+msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/service.c:903
-msgid "Could not access a pre-bound socket, will try to bind myself\n"
+#: src/util/resolver_api.c:1071
+msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/service.c:952 src/util/service.c:970
+#: src/util/resolver_api.c:1158 src/util/resolver_api.c:1181
+#: src/util/resolver_api.c:1195
 #, c-format
-msgid "Specified value for `%s' of service `%s' is invalid\n"
+msgid "Could not resolve our FQDN: %s\n"
 msgstr ""
 
-#: src/util/service.c:995
-#, c-format
-msgid "Could not access pre-bound socket %u, will try to bind myself\n"
+#: src/util/service.c:1303
+msgid ""
+"Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
 
-#: src/util/service.c:1165
+#: src/util/service.c:2123
 #, c-format
-msgid "Failed to start `%s' at `%s'\n"
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1207
+#: src/util/signal.c:87
 #, c-format
-msgid "Service `%s' runs at %s\n"
-msgstr ""
-
-#: src/util/service.c:1256
-msgid "Service process failed to initialize\n"
-msgstr ""
-
-#: src/util/service.c:1260
-msgid "Service process could not initialize server function\n"
-msgstr ""
-
-#: src/util/service.c:1264
-msgid "Service process failed to report status\n"
-msgstr ""
-
-#: src/util/service.c:1319
-msgid "No such user"
+msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/service.c:1332
+#: src/util/socks.c:595
 #, c-format
-msgid "Cannot change user/group to `%s': %s\n"
+msgid "Attempting to use invalid port %d as SOCKS proxy for service `%s'.\n"
 msgstr ""
 
-#: src/util/service.c:1402
-msgid "do daemonize (detach from terminal)"
-msgstr ""
-
-#: src/util/signal.c:89
+#: src/util/socks.c:614
 #, c-format
-msgid "signal (%d, %p) returned %d.\n"
+msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:145
+#: src/util/strings.c:174
 msgid "b"
 msgstr ""
 
-#: src/util/strings.c:433
+#: src/util/strings.c:471
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:561
+#: src/util/strings.c:598
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:658
+#: src/util/strings.c:702
 msgid "µs"
 msgstr "µs"
 
-#: src/util/strings.c:662
+#: src/util/strings.c:706
 msgid "forever"
 msgstr "per sempre"
 
-#: src/util/strings.c:664
+#: src/util/strings.c:708
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:670
+#: src/util/strings.c:714
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:676
+#: src/util/strings.c:720
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:682
+#: src/util/strings.c:726
 msgid "m"
 msgstr ""
 
-#: src/util/strings.c:688
+#: src/util/strings.c:732
 msgid "h"
 msgstr "o"
 
-#: src/util/strings.c:695
+#: src/util/strings.c:739
 msgid "day"
 msgstr "giorno"
 
-#: src/util/strings.c:697
+#: src/util/strings.c:741
 msgid "days"
 msgstr "giorni"
 
-#: src/util/strings.c:726
+#: src/util/strings.c:770
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1159
+#: src/util/strings.c:1272
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1167
+#: src/util/strings.c:1280
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1173
+#: src/util/strings.c:1286
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1180
+#: src/util/strings.c:1293
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1189
+#: src/util/strings.c:1302
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
 
-#: src/util/strings.c:1395 src/util/strings.c:1411
+#: src/util/strings.c:1574 src/util/strings.c:1590
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1420
+#: src/util/strings.c:1599
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1503 src/util/strings.c:1534 src/util/strings.c:1582
-#: src/util/strings.c:1603
+#: 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:1560
+#: src/util/strings.c:1739
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/strings.c:1612
+#: src/util/strings.c:1791
 #, c-format
 msgid "Invalid format: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1664
+#: src/util/strings.c:1843
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/strings.c:1714
+#: src/util/strings.c:1893
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/strings.c:1745
+#: src/util/strings.c:1924
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:550 src/vpn/gnunet-service-vpn.c:1086
+#: src/vpn/gnunet-service-vpn.c:538 src/vpn/gnunet-service-vpn.c:1805
 msgid "# Active channels"
 msgstr "# Canali attivi"
 
-#: src/vpn/gnunet-service-vpn.c:642
-msgid "# Bytes given to mesh for transmission"
+#: src/vpn/gnunet-service-vpn.c:597
+msgid "# Messages dropped in cadet queue (overflow)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:751
+msgid "# ICMP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:680
-msgid "# Bytes dropped in mesh queue (overflow)"
+#: src/vpn/gnunet-service-vpn.c:1094
+msgid "# UDP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:753
-msgid "# Mesh channels created"
+#: src/vpn/gnunet-service-vpn.c:1253
+msgid "# TCP packets received from cadet"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:784
-msgid "Failed to setup mesh channel!\n"
+#: src/vpn/gnunet-service-vpn.c:1465
+msgid "# Cadet channels created"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:978
+#: src/vpn/gnunet-service-vpn.c:1685
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1305
+#: src/vpn/gnunet-service-vpn.c:1824
+msgid "# Packets dropped (channel not yet online)"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:2004
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1326
+#: src/vpn/gnunet-service-vpn.c:2025
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1531
+#: src/vpn/gnunet-service-vpn.c:2233
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1564 src/vpn/gnunet-service-vpn.c:1600
+#: src/vpn/gnunet-service-vpn.c:2266 src/vpn/gnunet-service-vpn.c:2302
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1610
+#: src/vpn/gnunet-service-vpn.c:2312
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1624
+#: src/vpn/gnunet-service-vpn.c:2326
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1706
-msgid "# ICMP packets received from mesh"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:2045
-msgid "# UDP packets received from mesh"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:2200
-msgid "# TCP packets received from mesh"
-msgstr ""
-
-#: src/vpn/gnunet-service-vpn.c:2351
+#: src/vpn/gnunet-service-vpn.c:2365
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2406
+#: src/vpn/gnunet-service-vpn.c:2420
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2447 src/vpn/gnunet-service-vpn.c:2663
+#: src/vpn/gnunet-service-vpn.c:2462 src/vpn/gnunet-service-vpn.c:2684
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2715
+#: src/vpn/gnunet-service-vpn.c:2733
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2982
+#: src/vpn/gnunet-service-vpn.c:2996
 msgid "Must specify valid IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3006
+#: src/vpn/gnunet-service-vpn.c:3020
 msgid "Must specify valid IPv6 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3014
+#: src/vpn/gnunet-service-vpn.c:3028
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3027
+#: src/vpn/gnunet-service-vpn.c:3041
 msgid "Must specify valid IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3040
+#: src/vpn/gnunet-service-vpn.c:3054
 msgid "Must specify valid IPv4 mask"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3050
+#: src/vpn/gnunet-service-vpn.c:3064
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:147
+#: src/vpn/gnunet-vpn.c:145
 msgid "Error creating tunnel\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:190 src/vpn/gnunet-vpn.c:221
+#: src/vpn/gnunet-vpn.c:189 src/vpn/gnunet-vpn.c:220
 #, c-format
 msgid "Option `%s' makes no sense with option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:203
+#: src/vpn/gnunet-vpn.c:202
 #, c-format
 msgid "Option `%s' or `%s' is required.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:215
+#: src/vpn/gnunet-vpn.c:214
 #, c-format
 msgid "Option `%s' or `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:235
+#: src/vpn/gnunet-vpn.c:234
 #, c-format
 msgid "`%s' is not a valid peer identifier.\n"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:255
+#: src/vpn/gnunet-vpn.c:254
 #, c-format
 msgid "`%s' is not a valid IP address.\n"
 msgstr "`%s' non è un indirizzo IP valido.\n"
@@ -8206,50 +8887,66 @@ msgstr "`%s' non è un indirizzo IP valido.\n"
 msgid "request that result should be an IPv4 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:293
+#: src/vpn/gnunet-vpn.c:295
 msgid "request that result should be an IPv6 address"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:296
+#: src/vpn/gnunet-vpn.c:301
 msgid "how long should the mapping be valid for new tunnels?"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:299
+#: src/vpn/gnunet-vpn.c:307
 msgid "destination IP for the tunnel"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:302
+#: src/vpn/gnunet-vpn.c:313
 msgid "peer offering the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:305
+#: src/vpn/gnunet-vpn.c:319
 msgid "name of the service we would like to access"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:308
+#: src/vpn/gnunet-vpn.c:324
 msgid "service is offered via TCP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:311
+#: src/vpn/gnunet-vpn.c:329
 msgid "service is offered via UDP"
 msgstr ""
 
-#: src/vpn/gnunet-vpn.c:323
+#: src/vpn/gnunet-vpn.c:342
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573
-#: src/include/gnunet_common.h:581
+#: src/zonemaster/gnunet-service-zonemaster.c:836
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:414
+msgid "Failed to connect to the namestore!\n"
+msgstr ""
+
+#: src/include/gnunet_common.h:770 src/include/gnunet_common.h:777
+#: src/include/gnunet_common.h:787
+#, c-format
+msgid "Assertion failed at %s:%d. Aborting.\n"
+msgstr ""
+
+#: src/include/gnunet_common.h:795
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:593
+#: src/include/gnunet_common.h:807
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:620 src/include/gnunet_common.h:629
+#: src/include/gnunet_common.h:834 src/include/gnunet_common.h:843
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
+
+#~ msgid "Benchmarking done\n"
+#~ msgstr "Benchmark completato\n"
+
+#~ msgid "Peer `%s'\n"
+#~ msgstr "Peer `%s'\n"
diff --git a/po/sv.po b/po/sv.po
index acb0c0197..323f2de49 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-06-20 22:22+0200\n"
+"POT-Creation-Date: 2018-10-20 11:13+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"
@@ -226,7 +226,7 @@ msgstr ""
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:381 src/transport/plugin_transport_tcp.c:1118
+#: src/arm/gnunet-service-arm.c:386 src/transport/plugin_transport_tcp.c:1118
 #: src/transport/plugin_transport_xt.c:1118
 #: src/transport/tcp_service_legacy.c:555 src/util/service.c:610
 #, c-format
@@ -234,7 +234,7 @@ msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:405 src/arm/gnunet-service-arm.c:411
+#: src/arm/gnunet-service-arm.c:410 src/arm/gnunet-service-arm.c:416
 #: src/transport/plugin_transport_tcp.c:1137
 #: src/transport/plugin_transport_tcp.c:1143
 #: src/transport/plugin_transport_tcp.c:3823
@@ -248,7 +248,7 @@ msgstr ""
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:450 src/transport/plugin_transport_tcp.c:1174
+#: src/arm/gnunet-service-arm.c:455 src/transport/plugin_transport_tcp.c:1174
 #: src/transport/plugin_transport_xt.c:1174
 #: src/transport/tcp_service_legacy.c:611 src/util/client.c:504
 #: src/util/service.c:680
@@ -256,7 +256,7 @@ msgstr ""
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:455 src/transport/plugin_transport_tcp.c:1178
+#: src/arm/gnunet-service-arm.c:460 src/transport/plugin_transport_tcp.c:1178
 #: src/transport/plugin_transport_xt.c:1178
 #: src/transport/tcp_service_legacy.c:615 src/util/client.c:509
 #: src/util/service.c:685
@@ -264,7 +264,7 @@ msgstr ""
 msgid "Using `%s' instead\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/arm/gnunet-service-arm.c:488 src/transport/plugin_transport_tcp.c:1209
+#: src/arm/gnunet-service-arm.c:493 src/transport/plugin_transport_tcp.c:1209
 #: src/transport/plugin_transport_xt.c:1209
 #: src/transport/tcp_service_legacy.c:646 src/util/service.c:721
 #, c-format
@@ -273,14 +273,14 @@ msgid ""
 "domain socket: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:510 src/transport/plugin_transport_tcp.c:1226
+#: src/arm/gnunet-service-arm.c:515 src/transport/plugin_transport_tcp.c:1226
 #: src/transport/plugin_transport_xt.c:1226
 #: src/transport/tcp_service_legacy.c:663 src/util/service.c:739
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:549
+#: src/arm/gnunet-service-arm.c:554
 #: src/transport/plugin_transport_http_server.c:2682
 #: src/transport/plugin_transport_tcp.c:1257
 #: src/transport/plugin_transport_xt.c:1257
@@ -289,7 +289,7 @@ msgstr ""
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/arm/gnunet-service-arm.c:568
+#: src/arm/gnunet-service-arm.c:573
 #: src/transport/plugin_transport_http_server.c:2700
 #: src/transport/plugin_transport_tcp.c:1276
 #: src/transport/plugin_transport_xt.c:1276
@@ -298,65 +298,65 @@ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/arm/gnunet-service-arm.c:979
+#: src/arm/gnunet-service-arm.c:984
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-service-arm.c:990
+#: src/arm/gnunet-service-arm.c:995
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1102
+#: src/arm/gnunet-service-arm.c:1107
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/arm/gnunet-service-arm.c:1137
+#: src/arm/gnunet-service-arm.c:1142
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1180
+#: src/arm/gnunet-service-arm.c:1185
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1359
+#: src/arm/gnunet-service-arm.c:1364
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1664
+#: src/arm/gnunet-service-arm.c:1669
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1825
+#: src/arm/gnunet-service-arm.c:1830
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1830
+#: src/arm/gnunet-service-arm.c:1835
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1835
+#: src/arm/gnunet-service-arm.c:1840
 #, fuzzy
 msgid "unknown"
 msgstr "Okänt fel"
 
-#: src/arm/gnunet-service-arm.c:1841
+#: src/arm/gnunet-service-arm.c:1846
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-service-arm.c:1867
+#: src/arm/gnunet-service-arm.c:1872
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1883
+#: src/arm/gnunet-service-arm.c:1888
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -435,24 +435,24 @@ msgstr "Kunde inte initiera SQLite.\n"
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1867
+#: src/ats/plugin_ats_mlp.c:1868
 #, 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:1911
+#: src/ats/plugin_ats_mlp.c:1912
 #, 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:2473
+#: src/ats/plugin_ats_mlp.c:2474
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2513 src/ats/plugin_ats_mlp.c:2530
-#: src/ats/plugin_ats_mlp.c:2562 src/ats/plugin_ats_mlp.c:2580
-#: src/ats/plugin_ats_mlp.c:2599 src/ats/plugin_ats_proportional.c:1139
+#: src/ats/plugin_ats_mlp.c:2514 src/ats/plugin_ats_mlp.c:2531
+#: src/ats/plugin_ats_mlp.c:2563 src/ats/plugin_ats_mlp.c:2581
+#: src/ats/plugin_ats_mlp.c:2600 src/ats/plugin_ats_proportional.c:1139
 #: src/ats/plugin_ats_ril.c:2610 src/ats/plugin_ats_ril.c:2627
 #: src/ats/plugin_ats_ril.c:2644 src/ats/plugin_ats_ril.c:2661
 #: src/ats/plugin_ats_ril.c:2678 src/ats/plugin_ats_ril.c:2695
@@ -461,27 +461,27 @@ msgstr ""
 msgid "Invalid %s configuration %f \n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/ats/plugin_ats_mlp.c:2668
+#: src/ats/plugin_ats_mlp.c:2669
 #, 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:2677
+#: src/ats/plugin_ats_mlp.c:2678
 #, 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:2687
+#: src/ats/plugin_ats_mlp.c:2688
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2696
+#: src/ats/plugin_ats_mlp.c:2697
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
@@ -681,63 +681,63 @@ msgstr ""
 msgid "help text"
 msgstr "hjälptext för -t"
 
-#: src/cadet/gnunet-cadet.c:662
+#: src/cadet/gnunet-cadet.c:705
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/cadet/gnunet-cadet.c:701
+#: src/cadet/gnunet-cadet.c:744
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/cadet/gnunet-cadet.c:774
+#: src/cadet/gnunet-cadet.c:817
 msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:865
+#: src/cadet/gnunet-cadet.c:908
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/cadet/gnunet-cadet.c:902
+#: src/cadet/gnunet-cadet.c:945
 #, fuzzy
 msgid "No action requested\n"
 msgstr "Samling stoppad.\n"
 
-#: src/cadet/gnunet-cadet.c:927
+#: src/cadet/gnunet-cadet.c:970
 #, fuzzy
 msgid "Provide information about a particular connection"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:932
+#: src/cadet/gnunet-cadet.c:975
 msgid "Activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:937
+#: src/cadet/gnunet-cadet.c:980
 msgid "Dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:943
+#: src/cadet/gnunet-cadet.c:986
 msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:950
+#: src/cadet/gnunet-cadet.c:993
 #, fuzzy
 msgid "Provide information about a patricular peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:956
+#: src/cadet/gnunet-cadet.c:999
 #, fuzzy
 msgid "Provide information about all peers"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:962
+#: src/cadet/gnunet-cadet.c:1005
 #, fuzzy
 msgid "Provide information about a particular tunnel"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:968
+#: src/cadet/gnunet-cadet.c:1011
 #, fuzzy
 msgid "Provide information about all tunnels"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -787,260 +787,260 @@ msgstr ""
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:268
+#: src/conversation/gnunet-conversation.c:275
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:293
+#: src/conversation/gnunet-conversation.c:300
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:328
+#: src/conversation/gnunet-conversation.c:335
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:333
+#: src/conversation/gnunet-conversation.c:340
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:351
+#: src/conversation/gnunet-conversation.c:358
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:366
+#: src/conversation/gnunet-conversation.c:373
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/conversation/gnunet-conversation.c:378
+#: src/conversation/gnunet-conversation.c:385
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:402
+#: src/conversation/gnunet-conversation.c:409
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:409
+#: src/conversation/gnunet-conversation.c:416
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/conversation/gnunet-conversation.c:416
+#: src/conversation/gnunet-conversation.c:423
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/conversation/gnunet-conversation.c:424
+#: src/conversation/gnunet-conversation.c:431
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:433
+#: src/conversation/gnunet-conversation.c:440
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:439
+#: src/conversation/gnunet-conversation.c:446
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:444
+#: src/conversation/gnunet-conversation.c:451
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:515
+#: src/conversation/gnunet-conversation.c:522
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/conversation/gnunet-conversation.c:531
-#: src/conversation/gnunet-conversation.c:545
+#: src/conversation/gnunet-conversation.c:538
+#: src/conversation/gnunet-conversation.c:552
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:538
-#: src/conversation/gnunet-conversation.c:594
+#: src/conversation/gnunet-conversation.c:545
+#: src/conversation/gnunet-conversation.c:601
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:553
-#: src/conversation/gnunet-conversation.c:607
+#: src/conversation/gnunet-conversation.c:560
+#: src/conversation/gnunet-conversation.c:614
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:563
+#: src/conversation/gnunet-conversation.c:570
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:618
+#: src/conversation/gnunet-conversation.c:625
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:635
+#: src/conversation/gnunet-conversation.c:642
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:666
+#: src/conversation/gnunet-conversation.c:673
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:690
+#: src/conversation/gnunet-conversation.c:697
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:695
+#: src/conversation/gnunet-conversation.c:702
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:701
-#: src/conversation/gnunet-conversation.c:725
+#: src/conversation/gnunet-conversation.c:708
+#: src/conversation/gnunet-conversation.c:732
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:706
+#: src/conversation/gnunet-conversation.c:713
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:715
+#: src/conversation/gnunet-conversation.c:722
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:720
+#: src/conversation/gnunet-conversation.c:727
 #, c-format
 msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:739
+#: src/conversation/gnunet-conversation.c:746
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:745
+#: src/conversation/gnunet-conversation.c:752
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/conversation/gnunet-conversation.c:774
-#: src/conversation/gnunet-conversation.c:789
+#: src/conversation/gnunet-conversation.c:781
+#: src/conversation/gnunet-conversation.c:796
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:822
-#: src/conversation/gnunet-conversation.c:838
+#: src/conversation/gnunet-conversation.c:829
+#: src/conversation/gnunet-conversation.c:845
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:845
+#: src/conversation/gnunet-conversation.c:852
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:854
+#: src/conversation/gnunet-conversation.c:861
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:871
+#: src/conversation/gnunet-conversation.c:878
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:906
+#: src/conversation/gnunet-conversation.c:913
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:914
+#: src/conversation/gnunet-conversation.c:921
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:931
+#: src/conversation/gnunet-conversation.c:938
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:957
+#: src/conversation/gnunet-conversation.c:964
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:959
+#: src/conversation/gnunet-conversation.c:966
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:963
+#: src/conversation/gnunet-conversation.c:970
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:965
+#: src/conversation/gnunet-conversation.c:972
 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:967
+#: src/conversation/gnunet-conversation.c:974
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:969
+#: src/conversation/gnunet-conversation.c:976
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:971
+#: src/conversation/gnunet-conversation.c:978
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "tillåter klienter att fastställa gnunetds konfiguration"
 
-#: src/conversation/gnunet-conversation.c:973
+#: src/conversation/gnunet-conversation.c:980
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1189
+#: src/conversation/gnunet-conversation.c:1196
 #, 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:1202
+#: src/conversation/gnunet-conversation.c:1209
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym \"%s\" togs bort.\n"
 
-#: src/conversation/gnunet-conversation.c:1240
+#: src/conversation/gnunet-conversation.c:1247
 #, 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:1264
+#: src/conversation/gnunet-conversation.c:1271
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/conversation/gnunet-conversation.c:1293
+#: src/conversation/gnunet-conversation.c:1300
 msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1298
+#: src/conversation/gnunet-conversation.c:1305
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1327
+#: src/conversation/gnunet-conversation.c:1334
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1199,7 +1199,7 @@ msgstr "\"%s\" %s misslyckades: %s\n"
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/conversation/gnunet-service-conversation.c:1285
+#: src/conversation/gnunet-service-conversation.c:1303
 #, fuzzy, c-format
 msgid "Could not open line, port %s already in use!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -1518,8 +1518,7 @@ msgstr ""
 msgid "Unable to parse CRED record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/credential/gnunet-credential.c:262 src/namestore/gnunet-namestore.c:886
-#: src/namestore/plugin_rest_namestore.c:1020
+#: src/credential/gnunet-credential.c:262 src/namestore/gnunet-namestore.c:887
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
@@ -1621,16 +1620,15 @@ msgstr ""
 msgid "GNUnet credential resolver tool"
 msgstr "Spåra GNUnets nätverkstopologi."
 
-#: src/credential/gnunet-service-credential.c:1136 src/gns/gnunet-gns.c:182
+#: src/credential/gnunet-service-credential.c:1136 src/gns/gnunet-gns.c:183
 #: src/gns/gnunet-gns-helper-service-w32.c:725
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/credential/gnunet-service-credential.c:1142
-#: src/namestore/gnunet-namestore.c:912
-#: src/namestore/gnunet-namestore-fcfsd.c:1112
-#: src/namestore/plugin_rest_namestore.c:1033
+#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore-fcfsd.c:1136
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -1640,11 +1638,6 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 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:1126 src/gns/plugin_rest_gns.c:667
-#, fuzzy
-msgid "GNS REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
 #: src/datacache/datacache.c:117 src/datacache/datacache.c:309
 #: src/datastore/gnunet-service-datastore.c:755
 #, fuzzy
@@ -1693,29 +1686,29 @@ msgstr ""
 #: src/datacache/plugin_datacache_sqlite.c:125
 #: src/datastore/plugin_datastore_mysql.c:890
 #: src/datastore/plugin_datastore_sqlite.c:56
-#: src/datastore/plugin_datastore_sqlite.c:64
-#: src/identity-provider/plugin_identity_provider_sqlite.c:50 src/my/my.c:79
-#: src/my/my.c:91 src/mysql/mysql.c:40 src/mysql/mysql.c:47
+#: src/datastore/plugin_datastore_sqlite.c:64 src/my/my.c:79 src/my/my.c:91
+#: src/mysql/mysql.c:40 src/mysql/mysql.c:47
 #: src/namecache/plugin_namecache_sqlite.c:50
 #: src/namestore/plugin_namestore_sqlite.c:51
 #: src/peerstore/plugin_peerstore_sqlite.c:50
 #: src/psycstore/plugin_psycstore_mysql.c:60
+#: src/reclaim/plugin_reclaim_sqlite.c:50
 #: src/testbed/generate-underlay-topology.c:45
 #: src/testbed/gnunet-daemon-latency-logger.c:50
 #: src/testbed/gnunet-daemon-testbed-underlay.c:54
-#: src/testbed/testbed_api_hosts.c:67 src/util/crypto_ecc.c:50
+#: src/testbed/testbed_api_hosts.c:67 src/util/crypto_ecc.c:51
 #: src/util/crypto_ecc_setup.c:39 src/util/crypto_mpi.c:37
-#: src/include/gnunet_common.h:810 src/include/gnunet_common.h:819
+#: src/include/gnunet_common.h:816 src/include/gnunet_common.h:825
 #: src/scalarproduct/scalarproduct.h:33
 #, 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:860
+#: src/datacache/plugin_datacache_sqlite.c:861
 #: src/datastore/plugin_datastore_sqlite.c:506
-#: src/identity-provider/plugin_identity_provider_sqlite.c:334
 #: src/namecache/plugin_namecache_sqlite.c:327
 #: src/namestore/plugin_namestore_sqlite.c:262
+#: src/reclaim/plugin_reclaim_sqlite.c:334
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -2056,11 +2049,11 @@ 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:269
-#: src/identity-provider/plugin_identity_provider_sqlite.c:210
 #: src/namecache/plugin_namecache_sqlite.c:207
 #: src/namestore/plugin_namestore_sqlite.c:203
 #: src/peerstore/plugin_peerstore_sqlite.c:533
 #: src/psycstore/plugin_psycstore_sqlite.c:323
+#: src/reclaim/plugin_reclaim_sqlite.c:210
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
@@ -2069,21 +2062,21 @@ msgstr "Kunde inte initiera SQLite.\n"
 msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1324
+#: src/datastore/plugin_datastore_sqlite.c:1325
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1358
+#: src/datastore/plugin_datastore_sqlite.c:1359
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1402
-#: src/identity-provider/plugin_identity_provider_sqlite.c:709
+#: src/datastore/plugin_datastore_sqlite.c:1403
 #: src/namecache/plugin_namecache_sqlite.c:638
-#: src/namestore/plugin_namestore_sqlite.c:752
+#: src/namestore/plugin_namestore_sqlite.c:753
+#: src/reclaim/plugin_reclaim_sqlite.c:709
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -2159,7 +2152,7 @@ msgstr ""
 msgid "Exiting as the number of peers is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/dht/gnunet_dht_profiler.c:947 src/rps/gnunet-rps-profiler.c:2691
+#: src/dht/gnunet_dht_profiler.c:947 src/rps/gnunet-rps-profiler.c:2764
 #, fuzzy
 msgid "number of peers to start"
 msgstr "antal iterationer"
@@ -2486,36 +2479,6 @@ msgstr ""
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:252
-#, fuzzy, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/dns/dnsparser.c:821
-#, 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:231
-#, fuzzy, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr "Kunde inte köra \"%s\": %s\n"
-
-#: src/dns/dnsstub.c:362
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
-#: src/dns/dnsstub.c:509
-#, fuzzy, c-format
-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:515
-#, 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/gnunet-dns-monitor.c:351 src/dns/gnunet-dns-monitor.c:356
 msgid "only monitor DNS queries"
 msgstr ""
@@ -4103,11 +4066,11 @@ msgstr "Misslyckades att starta samling.\n"
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-bcd.c:520
+#: src/gns/gnunet-bcd.c:521
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:533
+#: src/gns/gnunet-bcd.c:534
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
@@ -4116,35 +4079,35 @@ msgstr ""
 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:402
+#: src/gns/gnunet-dns2gns.c:403
 #, 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:418
+#: src/gns/gnunet-dns2gns.c:419
 #, 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:426
+#: src/gns/gnunet-dns2gns.c:427
 #, 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:585
+#: src/gns/gnunet-dns2gns.c:586
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/gns/gnunet-dns2gns.c:685
+#: src/gns/gnunet-dns2gns.c:686
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:690
+#: src/gns/gnunet-dns2gns.c:691
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:707
+#: src/gns/gnunet-dns2gns.c:708
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4160,7 +4123,7 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:197 src/gns/plugin_rest_gns.c:344
+#: src/gns/gnunet-gns.c:197
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
@@ -4187,7 +4150,7 @@ msgstr "Spåra GNUnets nätverkstopologi."
 msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:699 src/gns/plugin_rest_gns.c:420
+#: src/gns/gnunet-gns-helper-service-w32.c:699
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
@@ -4257,64 +4220,64 @@ msgstr ""
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2061
+#: src/gns/gnunet-gns-proxy.c:2062
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2582
+#: src/gns/gnunet-gns-proxy.c:2583
 #, 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:2614
+#: src/gns/gnunet-gns-proxy.c:2615
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:2813
+#: src/gns/gnunet-gns-proxy.c:2814
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2838 src/rest/gnunet-rest-server.c:656
+#: src/gns/gnunet-gns-proxy.c:2839 src/rest/gnunet-rest-server.c:656
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3168
+#: src/gns/gnunet-gns-proxy.c:3169
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3197
+#: src/gns/gnunet-gns-proxy.c:3198
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3279
+#: src/gns/gnunet-gns-proxy.c:3280
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3569
+#: src/gns/gnunet-gns-proxy.c:3570
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-proxy.c:3697
+#: src/gns/gnunet-gns-proxy.c:3698
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3702
+#: src/gns/gnunet-gns-proxy.c:3703
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3706
+#: src/gns/gnunet-gns-proxy.c:3707
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3732
+#: src/gns/gnunet-gns-proxy.c:3733
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4423,10 +4386,6 @@ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/plugin_rest_gns.c:382
-msgid "Ego for not found, cannot perform lookup.\n"
-msgstr ""
-
 #: src/gnsrecord/plugin_gnsrecord_dns.c:357
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4897,123 +4856,53 @@ msgstr ""
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:388
+#: src/identity/gnunet-service-identity.c:389
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:410
+#: src/identity/gnunet-service-identity.c:414
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:499
-#: src/identity/gnunet-service-identity.c:771
-#: src/identity/gnunet-service-identity.c:893
+#: src/identity/gnunet-service-identity.c:505
+#: src/identity/gnunet-service-identity.c:788
+#: src/identity/gnunet-service-identity.c:916
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/gnunet-service-identity.c:506
+#: src/identity/gnunet-service-identity.c:513
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:599
+#: src/identity/gnunet-service-identity.c:608
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:748
+#: src/identity/gnunet-service-identity.c:763
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:787
-#: src/identity/gnunet-service-identity.c:910
+#: src/identity/gnunet-service-identity.c:806
+#: src/identity/gnunet-service-identity.c:934
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:944
+#: src/identity/gnunet-service-identity.c:969
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/gnunet-service-identity.c:1002
+#: src/identity/gnunet-service-identity.c:1027
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/identity/gnunet-service-identity.c:1012
+#: src/identity/gnunet-service-identity.c:1037
 #, fuzzy, c-format
 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:966
-#, fuzzy
-msgid "Identity REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
-#: src/identity-provider/gnunet-idp.c:422
-#, fuzzy
-msgid "Ego is required\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
-
-#: src/identity-provider/gnunet-idp.c:430
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:438
-#, fuzzy
-msgid "Requesting party key is required!\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
-
-#: src/identity-provider/gnunet-idp.c:461
-msgid "Add attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:467
-msgid "Attribute value"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:472
-msgid "Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:477
-msgid "Audience (relying party)"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:481
-msgid "List attributes for Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:486
-msgid "Issue a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:491
-msgid "Consume a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:496
-msgid "Revoke a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:501
-msgid "Type of attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:506
-msgid "Expiration interval of the attribute"
-msgstr ""
-
-#: src/identity-provider/identity_provider_api.c:434
-#, fuzzy
-msgid "failed to store record\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/identity-provider/plugin_rest_identity_provider.c:1228
-#: src/identity-provider/plugin_rest_openid_connect.c:2145
-#, fuzzy
-msgid "Identity Provider REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
 #: src/json/json.c:121
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -5063,7 +4952,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:230 src/namestore/gnunet-namestore.c:1289
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1290
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -5072,7 +4961,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:248 src/namestore/gnunet-namestore.c:1341
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1342
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
@@ -5088,8 +4977,8 @@ 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:148
-#: src/namestore/plugin_namestore_flat.c:383
+#: src/namestore/plugin_namestore_heap.c:146
+#: src/namestore/plugin_namestore_heap.c:393
 #: src/peerstore/plugin_peerstore_flat.c:377
 #: src/peerstore/plugin_peerstore_flat.c:536
 #, fuzzy, c-format
@@ -5097,14 +4986,14 @@ 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:159
+#: src/namestore/plugin_namestore_heap.c:157
 #: src/peerstore/plugin_peerstore_flat.c:392
 #, 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:172
+#: src/namestore/plugin_namestore_heap.c:170
 #: src/peerstore/plugin_peerstore_flat.c:404
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
@@ -5122,7 +5011,6 @@ msgstr ""
 "Fel vid uppladdning av fil: %s\n"
 
 #: src/namestore/gnunet-namestore.c:341
-#: src/namestore/plugin_rest_namestore.c:570
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
@@ -5130,7 +5018,6 @@ msgstr ""
 "Fel vid uppladdning av fil: %s\n"
 
 #: src/namestore/gnunet-namestore.c:348
-#: src/namestore/plugin_rest_namestore.c:579
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
@@ -5153,218 +5040,212 @@ msgid ""
 "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:808
-#: src/namestore/plugin_rest_namestore.c:605
+#: src/namestore/gnunet-namestore.c:809
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:849
+#: src/namestore/gnunet-namestore.c:850
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:901
+#: src/namestore/gnunet-namestore.c:902
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:920 src/namestore/gnunet-namestore.c:929
-#: src/namestore/gnunet-namestore.c:948 src/namestore/gnunet-namestore.c:971
-#: src/namestore/gnunet-namestore.c:1025
+#: src/namestore/gnunet-namestore.c:921 src/namestore/gnunet-namestore.c:930
+#: src/namestore/gnunet-namestore.c:949 src/namestore/gnunet-namestore.c:972
+#: src/namestore/gnunet-namestore.c:1026
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore.c:921 src/namestore/gnunet-namestore.c:930
-#: src/namestore/gnunet-namestore.c:949 src/namestore/gnunet-namestore.c:973
+#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:974
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:939
-#: src/namestore/plugin_rest_namestore.c:682
+#: src/namestore/gnunet-namestore.c:940
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore.c:961
-#: src/namestore/plugin_rest_namestore.c:702
-#: src/namestore/plugin_rest_namestore.c:744
+#: src/namestore/gnunet-namestore.c:962
 #, 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:1006
+#: src/namestore/gnunet-namestore.c:1007
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:1026
+#: src/namestore/gnunet-namestore.c:1027
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1069
+#: src/namestore/gnunet-namestore.c:1070
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:1098
+#: src/namestore/gnunet-namestore.c:1099
 #: src/peerinfo-tool/gnunet-peerinfo.c:773
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:1133
+#: src/namestore/gnunet-namestore.c:1134
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:1173
-#: src/namestore/plugin_rest_namestore.c:1063
+#: src/namestore/gnunet-namestore.c:1174
 #, 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:1237
-#: src/namestore/plugin_rest_namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1238
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1262
+#: src/namestore/gnunet-namestore.c:1263
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1266
+#: src/namestore/gnunet-namestore.c:1267
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1270
+#: src/namestore/gnunet-namestore.c:1271
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1275
+#: src/namestore/gnunet-namestore.c:1276
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1280
+#: src/namestore/gnunet-namestore.c:1281
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1284
+#: src/namestore/gnunet-namestore.c:1285
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1294
+#: src/namestore/gnunet-namestore.c:1295
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1299
+#: src/namestore/gnunet-namestore.c:1300
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1304
+#: src/namestore/gnunet-namestore.c:1305
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1309
+#: src/namestore/gnunet-namestore.c:1310
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1313
+#: src/namestore/gnunet-namestore.c:1314
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1317
+#: src/namestore/gnunet-namestore.c:1318
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1322
+#: src/namestore/gnunet-namestore.c:1323
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:538
+#: src/namestore/gnunet-namestore-fcfsd.c:547
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:565
+#: src/namestore/gnunet-namestore-fcfsd.c:574
 #, 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:585
+#: src/namestore/gnunet-namestore-fcfsd.c:595
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:616
+#: src/namestore/gnunet-namestore-fcfsd.c:627
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:696
+#: src/namestore/gnunet-namestore-fcfsd.c:687
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:754
+#: src/namestore/gnunet-namestore-fcfsd.c:775
 #, 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:772
+#: src/namestore/gnunet-namestore-fcfsd.c:794
 #, 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:808
+#: src/namestore/gnunet-namestore-fcfsd.c:830
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:817
+#: src/namestore/gnunet-namestore-fcfsd.c:839
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1045
+#: src/namestore/gnunet-namestore-fcfsd.c:1069
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1073
+#: src/namestore/gnunet-namestore-fcfsd.c:1097
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1121
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1147
+#: src/namestore/gnunet-namestore-fcfsd.c:1171
 msgid "name of the zone that is to be managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1166
+#: src/namestore/gnunet-namestore-fcfsd.c:1190
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:748
+#: src/namestore/gnunet-service-namestore.c:749
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/gnunet-zoneimport.c:2033
+#: src/namestore/gnunet-zoneimport.c:2036
 msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:2038
+#: src/namestore/gnunet-zoneimport.c:2041
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
@@ -5372,8 +5253,8 @@ msgstr ""
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:765
-msgid "flat file database running\n"
+#: src/namestore/plugin_namestore_heap.c:776
+msgid "heap file database running\n"
 msgstr ""
 
 #: src/namestore/plugin_namestore_sqlite.c:216
@@ -5382,11 +5263,6 @@ msgstr ""
 msgid "Failed to setup database at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/namestore/plugin_rest_namestore.c:1204
-#, fuzzy
-msgid "Namestore REST API initialized\n"
-msgstr " Anslutning misslyckades\n"
-
 #: src/nat-auto/gnunet-nat-auto.c:191
 #, fuzzy
 msgid "Suggested configuration changes:\n"
@@ -5775,6 +5651,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:297
+#: src/rest-plugins/plugin_rest_peerinfo.c:499
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
@@ -6077,6 +5954,66 @@ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
+#: src/reclaim/gnunet-reclaim.c:465
+#, fuzzy, c-format
+msgid "Ego is required\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/reclaim/gnunet-reclaim.c:473
+#, c-format
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:481
+#, fuzzy, c-format
+msgid "Requesting party key is required!\n"
+msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#: src/reclaim/gnunet-reclaim.c:504
+msgid "Add attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:510
+msgid "Attribute value"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:515
+msgid "Ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:520
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:524
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:529
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:534
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:539
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:544
+msgid "Type of attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:549
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/reclaim/reclaim_api.c:434
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Misslyckades att starta samling.\n"
+
 #: src/regex/gnunet-daemon-regexprofiler.c:265
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
@@ -6176,6 +6113,42 @@ msgstr ""
 msgid "GNUnet REST server"
 msgstr "Spåra GNUnets nätverkstopologi."
 
+#: src/rest-plugins/plugin_rest_copying.c:207
+#, fuzzy
+msgid "COPYING REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugins/plugin_rest_credential.c:1126
+#, fuzzy
+msgid "GNS REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugins/plugin_rest_gns.c:450
+#, fuzzy
+msgid "Gns REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugins/plugin_rest_identity.c:1295
+#, fuzzy
+msgid "Identity REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugins/plugin_rest_namestore.c:1077
+#, fuzzy
+msgid "Namestore REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugins/plugin_rest_openid_connect.c:2135
+#: src/rest-plugins/plugin_rest_reclaim.c:1079
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/rest-plugins/plugin_rest_peerinfo.c:794
+#, fuzzy
+msgid "Peerinfo REST API initialized\n"
+msgstr " Anslutning misslyckades\n"
+
 #: src/revocation/gnunet-revocation.c:127
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
@@ -6314,15 +6287,33 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/rps/gnunet-rps.c:201
+#: src/rps/gnunet-rps.c:258
 msgid "Seed a PeerID"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:205
+#: src/rps/gnunet-rps.c:262
 msgid "Get updates of view (0 for infinite updates)"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2705
+#: src/rps/gnunet-rps.c:266
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2770
+msgid "duration of the profiling"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2776
+#, fuzzy
+msgid "timeout for the profiling"
+msgstr "ange prioritet för innehållet"
+
+#: src/rps/gnunet-rps-profiler.c:2782
+#, fuzzy
+msgid "number of PeerIDs to request"
+msgstr "antal iterationer"
+
+#: src/rps/gnunet-rps-profiler.c:2797
 #, fuzzy
 msgid "Measure quality and performance of the RPS service."
 msgstr "Kan inte tillgå tjänsten"
@@ -6410,7 +6401,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1987
+#: src/set/gnunet-service-set.c:2004
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -6609,93 +6600,93 @@ msgstr "Ladda ner filer från GNUnet."
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-statistics.c:271
-#: src/statistics/gnunet-statistics.c:365
+#: src/statistics/gnunet-statistics.c:407
+#: src/statistics/gnunet-statistics.c:448
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:274
-#: src/statistics/gnunet-statistics.c:368
+#: src/statistics/gnunet-statistics.c:410
+#: src/statistics/gnunet-statistics.c:451
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:502
+#: src/statistics/gnunet-statistics.c:526
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:510
+#: src/statistics/gnunet-statistics.c:534
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:553
+#: src/statistics/gnunet-statistics.c:577
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:568
+#: src/statistics/gnunet-statistics.c:592
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/statistics/gnunet-statistics.c:703
+#: src/statistics/gnunet-statistics.c:727
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/statistics/gnunet-statistics.c:721
+#: src/statistics/gnunet-statistics.c:745
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/statistics/gnunet-statistics.c:729
+#: src/statistics/gnunet-statistics.c:753
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:760
+#: src/statistics/gnunet-statistics.c:784
 #, c-format
 msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:793
+#: src/statistics/gnunet-statistics.c:817
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:798
+#: src/statistics/gnunet-statistics.c:822
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:804
+#: src/statistics/gnunet-statistics.c:828
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:810
+#: src/statistics/gnunet-statistics.c:834
 msgid "use as csv separator"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:816
+#: src/statistics/gnunet-statistics.c:840
 msgid "path to the folder containing the testbed data"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:821
+#: src/statistics/gnunet-statistics.c:845
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:826
+#: src/statistics/gnunet-statistics.c:850
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:832
+#: src/statistics/gnunet-statistics.c:856
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:838
+#: src/statistics/gnunet-statistics.c:862
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:855
+#: src/statistics/gnunet-statistics.c:879
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
@@ -8353,7 +8344,7 @@ msgstr ""
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1311 src/util/disk.c:1515
+#: src/transport/tcp_service_legacy.c:1311 src/util/disk.c:1521
 #: src/util/service.c:1376
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
@@ -8390,11 +8381,6 @@ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 msgid "Could not access configuration file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/tun/regex.c:132
-#, c-format
-msgid "Bad mask: %d\n"
-msgstr ""
-
 #: src/util/bio.c:179 src/util/bio.c:187
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
@@ -8425,58 +8411,67 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:912
+#: src/util/client.c:732
+msgid "not a valid filename"
+msgstr ""
+
+#: src/util/client.c:923
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:257 src/util/common_logging.c:1144
+#: src/util/common_logging.c:257 src/util/common_logging.c:1159
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1142
+#: src/util/common_logging.c:259 src/util/common_logging.c:1157
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1140
+#: src/util/common_logging.c:261 src/util/common_logging.c:1155
 msgid "MESSAGE"
 msgstr "MEDDELANDE"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1138
+#: src/util/common_logging.c:263 src/util/common_logging.c:1153
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1136
+#: src/util/common_logging.c:265 src/util/common_logging.c:1151
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1146
+#: src/util/common_logging.c:267 src/util/common_logging.c:1161
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:880
+#: src/util/common_logging.c:631 src/util/common_logging.c:661
+#, c-format
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+msgstr ""
+
+#: src/util/common_logging.c:895
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1147
+#: src/util/common_logging.c:1162
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1440
+#: src/util/common_logging.c:1455
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1482
+#: src/util/common_logging.c:1497
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1500
+#: src/util/common_logging.c:1515
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/common_logging.c:1521
+#: src/util/common_logging.c:1536
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8492,24 +8487,29 @@ msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad 
%d.\n"
 msgid "Error while reading file `%s'\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/util/configuration.c:1049
+#: src/util/configuration.c:970
+#, fuzzy
+msgid "Not a valid relative time specification"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/util/configuration.c:1059
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1168
+#: src/util/configuration.c:1178
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1201
+#: src/util/configuration.c:1211
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/configuration.c:1269
+#: src/util/configuration.c:1279
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8523,22 +8523,22 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:831
+#: src/util/crypto_ecc.c:860
 #, 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:881
+#: src/util/crypto_ecc.c:915
 #, 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:955
+#: src/util/crypto_ecc.c:994
 #, 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:1012
+#: src/util/crypto_ecc.c:1055
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -8573,26 +8573,56 @@ msgstr ""
 msgid "Could not load peer's private key\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/crypto_random.c:282
+#: src/util/crypto_random.c:304
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 
-#: src/util/crypto_rsa.c:836
+#: src/util/crypto_rsa.c:848
 #, 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:1167
+#: src/util/crypto_rsa.c:1187
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/disk.c:1245
+#: src/util/disk.c:1251
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
+#: src/util/dnsparser.c:250
+#, fuzzy, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/util/dnsparser.c:940
+#, 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/util/dnsstub.c:229
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "Kunde inte köra \"%s\": %s\n"
+
+#: src/util/dnsstub.c:360
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
+
+#: src/util/dnsstub.c:507
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s: %s\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#: src/util/dnsstub.c:513
+#, fuzzy, c-format
+msgid "Sent DNS request to %s\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
 #: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -8691,8 +8721,8 @@ msgstr ""
 msgid "use configuration file FILENAME"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/getopt_helpers.c:559 src/util/getopt_helpers.c:756
-#: src/util/getopt_helpers.c:823
+#: src/util/getopt_helpers.c:559 src/util/getopt_helpers.c:763
+#: src/util/getopt_helpers.c:830
 #, 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"
@@ -8707,63 +8737,68 @@ msgstr "Du måste skicka med ett nummer till flaggan 
\"%s\".\n"
 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:830
+#: src/util/getopt_helpers.c:754
+#, c-format
+msgid "Your input for the '%s' option has to be a non negative number \n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:837
 #, 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:916
+#: src/util/getopt_helpers.c:923
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:148
+#: src/util/gnunet-config.c:157
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/gnunet-config.c:161
+#: src/util/gnunet-config.c:170
 #, c-format
 msgid "--section argument is required\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:164
+#: src/util/gnunet-config.c:173
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:215
+#: src/util/gnunet-config.c:224
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:254
+#: src/util/gnunet-config.c:263
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:259
+#: src/util/gnunet-config.c:268
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:264
+#: src/util/gnunet-config.c:273
 #, fuzzy
 msgid "name of the option to access"
 msgstr "Visa värde av alternativet"
 
-#: src/util/gnunet-config.c:269
+#: src/util/gnunet-config.c:278
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:273
+#: src/util/gnunet-config.c:282
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "GNUnet-konfiguration"
 
-#: src/util/gnunet-config.c:277
+#: src/util/gnunet-config.c:286
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:290
+#: src/util/gnunet-config.c:299
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -8890,15 +8925,8 @@ msgstr ""
 msgid "Manipulate GNUnet proof of work files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet-service-resolver.c:369
-#, fuzzy, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/util/gnunet-service-resolver.c:458
-#: src/util/gnunet-service-resolver.c:510
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
+#: src/util/gnunet-service-resolver.c:1443
+msgid "No DNS server available. DNS resolution will not be possible.\n"
 msgstr ""
 
 #: src/util/gnunet-uri.c:83
@@ -8999,13 +9027,18 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/util/resolver_api.c:201
+#: src/util/regex.c:132
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
+
+#: src/util/resolver_api.c:216
 #, c-format
 msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:222
+#: src/util/resolver_api.c:237
 #, fuzzy, c-format
 msgid ""
 "Missing `%s' or numeric IP address for `%s' of `%s' in configuration, DNS "
@@ -9014,22 +9047,22 @@ msgstr ""
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/util/resolver_api.c:849
+#: src/util/resolver_api.c:873
 #, 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:862
+#: src/util/resolver_api.c:886
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1046
+#: src/util/resolver_api.c:1071
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1132 src/util/resolver_api.c:1155
-#: src/util/resolver_api.c:1169
+#: src/util/resolver_api.c:1158 src/util/resolver_api.c:1181
+#: src/util/resolver_api.c:1195
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
@@ -9065,114 +9098,114 @@ msgstr ""
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:469
+#: src/util/strings.c:471
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:596
+#: src/util/strings.c:598
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:700
+#: src/util/strings.c:702
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:704
+#: src/util/strings.c:706
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:706
+#: src/util/strings.c:708
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:712
+#: src/util/strings.c:714
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:718
+#: src/util/strings.c:720
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:724
+#: src/util/strings.c:726
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:730
+#: src/util/strings.c:732
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:737
+#: src/util/strings.c:739
 #, fuzzy
 msgid "day"
 msgstr " dagar"
 
-#: src/util/strings.c:739
+#: src/util/strings.c:741
 #, fuzzy
 msgid "days"
 msgstr " dagar"
 
-#: src/util/strings.c:768
+#: src/util/strings.c:770
 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"
@@ -9361,23 +9394,32 @@ msgstr ""
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/include/gnunet_common.h:764 src/include/gnunet_common.h:771
-#: src/include/gnunet_common.h:781 src/include/gnunet_common.h:789
+#: src/include/gnunet_common.h:770 src/include/gnunet_common.h:777
+#: src/include/gnunet_common.h:787
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d. Aborting.\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/include/gnunet_common.h:795
 #, 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:801
+#: src/include/gnunet_common.h:807
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:828 src/include/gnunet_common.h:837
+#: src/include/gnunet_common.h:834 src/include/gnunet_common.h:843
 #, 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 "Could not resolve `%s' (%s): %s\n"
+#~ msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#, fuzzy
 #~ msgid "PUT request sent with key"
 #~ msgstr "# byte mottogs via TCP"
 
@@ -9394,10 +9436,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med 
fel: %s\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"
 
@@ -10350,10 +10388,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d 
med fel: %s\n"
 #~ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
 #, fuzzy
-#~ msgid "No valid expiration time for operation `%s'\n"
-#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#, fuzzy
 #~ msgid "Failed to find record to remove\n"
 #~ msgstr "Kunde inte ansluta till gnunetd.\n"
 
diff --git a/po/vi.po b/po/vi.po
index 176ac4c8b..2f05f3daf 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-06-20 22:22+0200\n"
+"POT-Creation-Date: 2018-10-20 11:13+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"
@@ -233,7 +233,7 @@ msgstr ""
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:381 src/transport/plugin_transport_tcp.c:1118
+#: src/arm/gnunet-service-arm.c:386 src/transport/plugin_transport_tcp.c:1118
 #: src/transport/plugin_transport_xt.c:1118
 #: src/transport/tcp_service_legacy.c:555 src/util/service.c:610
 #, c-format
@@ -241,7 +241,7 @@ msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:405 src/arm/gnunet-service-arm.c:411
+#: src/arm/gnunet-service-arm.c:410 src/arm/gnunet-service-arm.c:416
 #: src/transport/plugin_transport_tcp.c:1137
 #: src/transport/plugin_transport_tcp.c:1143
 #: src/transport/plugin_transport_tcp.c:3823
@@ -255,7 +255,7 @@ msgstr ""
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:450 src/transport/plugin_transport_tcp.c:1174
+#: src/arm/gnunet-service-arm.c:455 src/transport/plugin_transport_tcp.c:1174
 #: src/transport/plugin_transport_xt.c:1174
 #: src/transport/tcp_service_legacy.c:611 src/util/client.c:504
 #: src/util/service.c:680
@@ -263,7 +263,7 @@ msgstr ""
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:455 src/transport/plugin_transport_tcp.c:1178
+#: src/arm/gnunet-service-arm.c:460 src/transport/plugin_transport_tcp.c:1178
 #: src/transport/plugin_transport_xt.c:1178
 #: src/transport/tcp_service_legacy.c:615 src/util/client.c:509
 #: src/util/service.c:685
@@ -271,7 +271,7 @@ msgstr ""
 msgid "Using `%s' instead\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/arm/gnunet-service-arm.c:488 src/transport/plugin_transport_tcp.c:1209
+#: src/arm/gnunet-service-arm.c:493 src/transport/plugin_transport_tcp.c:1209
 #: src/transport/plugin_transport_xt.c:1209
 #: src/transport/tcp_service_legacy.c:646 src/util/service.c:721
 #, c-format
@@ -280,14 +280,14 @@ msgid ""
 "domain socket: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:510 src/transport/plugin_transport_tcp.c:1226
+#: src/arm/gnunet-service-arm.c:515 src/transport/plugin_transport_tcp.c:1226
 #: src/transport/plugin_transport_xt.c:1226
 #: src/transport/tcp_service_legacy.c:663 src/util/service.c:739
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:549
+#: src/arm/gnunet-service-arm.c:554
 #: src/transport/plugin_transport_http_server.c:2682
 #: src/transport/plugin_transport_tcp.c:1257
 #: src/transport/plugin_transport_xt.c:1257
@@ -296,7 +296,7 @@ msgstr ""
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/arm/gnunet-service-arm.c:568
+#: src/arm/gnunet-service-arm.c:573
 #: src/transport/plugin_transport_http_server.c:2700
 #: src/transport/plugin_transport_tcp.c:1276
 #: src/transport/plugin_transport_xt.c:1276
@@ -305,65 +305,65 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/arm/gnunet-service-arm.c:979
+#: src/arm/gnunet-service-arm.c:984
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-service-arm.c:990
+#: src/arm/gnunet-service-arm.c:995
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:1102
+#: src/arm/gnunet-service-arm.c:1107
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/arm/gnunet-service-arm.c:1137
+#: src/arm/gnunet-service-arm.c:1142
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1180
+#: src/arm/gnunet-service-arm.c:1185
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1359
+#: src/arm/gnunet-service-arm.c:1364
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:1664
+#: src/arm/gnunet-service-arm.c:1669
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:1825
+#: src/arm/gnunet-service-arm.c:1830
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1830
+#: src/arm/gnunet-service-arm.c:1835
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1835
+#: src/arm/gnunet-service-arm.c:1840
 #, fuzzy
 msgid "unknown"
 msgstr "Lỗi không rõ"
 
-#: src/arm/gnunet-service-arm.c:1841
+#: src/arm/gnunet-service-arm.c:1846
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-service-arm.c:1867
+#: src/arm/gnunet-service-arm.c:1872
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1883
+#: src/arm/gnunet-service-arm.c:1888
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -442,24 +442,24 @@ msgstr "Không thể sơ khởi SQLite: %s.\n"
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1867
+#: src/ats/plugin_ats_mlp.c:1868
 #, 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:1911
+#: src/ats/plugin_ats_mlp.c:1912
 #, 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:2473
+#: src/ats/plugin_ats_mlp.c:2474
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2513 src/ats/plugin_ats_mlp.c:2530
-#: src/ats/plugin_ats_mlp.c:2562 src/ats/plugin_ats_mlp.c:2580
-#: src/ats/plugin_ats_mlp.c:2599 src/ats/plugin_ats_proportional.c:1139
+#: src/ats/plugin_ats_mlp.c:2514 src/ats/plugin_ats_mlp.c:2531
+#: src/ats/plugin_ats_mlp.c:2563 src/ats/plugin_ats_mlp.c:2581
+#: src/ats/plugin_ats_mlp.c:2600 src/ats/plugin_ats_proportional.c:1139
 #: src/ats/plugin_ats_ril.c:2610 src/ats/plugin_ats_ril.c:2627
 #: src/ats/plugin_ats_ril.c:2644 src/ats/plugin_ats_ril.c:2661
 #: src/ats/plugin_ats_ril.c:2678 src/ats/plugin_ats_ril.c:2695
@@ -468,27 +468,27 @@ msgstr ""
 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:2668
+#: src/ats/plugin_ats_mlp.c:2669
 #, 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:2677
+#: src/ats/plugin_ats_mlp.c:2678
 #, 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:2687
+#: src/ats/plugin_ats_mlp.c:2688
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2696
+#: src/ats/plugin_ats_mlp.c:2697
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
@@ -690,63 +690,63 @@ msgstr ""
 msgid "help text"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:662
+#: src/cadet/gnunet-cadet.c:705
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/cadet/gnunet-cadet.c:701
+#: src/cadet/gnunet-cadet.c:744
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/cadet/gnunet-cadet.c:774
+#: src/cadet/gnunet-cadet.c:817
 msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:865
+#: src/cadet/gnunet-cadet.c:908
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/cadet/gnunet-cadet.c:902
+#: src/cadet/gnunet-cadet.c:945
 #, fuzzy
 msgid "No action requested\n"
 msgstr "Thu thập bị dừng.\n"
 
-#: src/cadet/gnunet-cadet.c:927
+#: src/cadet/gnunet-cadet.c:970
 #, fuzzy
 msgid "Provide information about a particular connection"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:932
+#: src/cadet/gnunet-cadet.c:975
 msgid "Activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:937
+#: src/cadet/gnunet-cadet.c:980
 msgid "Dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:943
+#: src/cadet/gnunet-cadet.c:986
 msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:950
+#: src/cadet/gnunet-cadet.c:993
 #, fuzzy
 msgid "Provide information about a patricular peer"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:956
+#: src/cadet/gnunet-cadet.c:999
 #, fuzzy
 msgid "Provide information about all peers"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:962
+#: src/cadet/gnunet-cadet.c:1005
 #, fuzzy
 msgid "Provide information about a particular tunnel"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:968
+#: src/cadet/gnunet-cadet.c:1011
 #, fuzzy
 msgid "Provide information about all tunnels"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -796,260 +796,260 @@ msgstr ""
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:268
+#: src/conversation/gnunet-conversation.c:275
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:293
+#: src/conversation/gnunet-conversation.c:300
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:328
+#: src/conversation/gnunet-conversation.c:335
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:333
+#: src/conversation/gnunet-conversation.c:340
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:351
+#: src/conversation/gnunet-conversation.c:358
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:366
+#: src/conversation/gnunet-conversation.c:373
 #, 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:378
+#: src/conversation/gnunet-conversation.c:385
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:402
+#: src/conversation/gnunet-conversation.c:409
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:409
+#: src/conversation/gnunet-conversation.c:416
 #, 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:416
+#: src/conversation/gnunet-conversation.c:423
 #, 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:424
+#: src/conversation/gnunet-conversation.c:431
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:433
+#: src/conversation/gnunet-conversation.c:440
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:439
+#: src/conversation/gnunet-conversation.c:446
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:444
+#: src/conversation/gnunet-conversation.c:451
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:515
+#: src/conversation/gnunet-conversation.c:522
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Không rõ câu lệnh « %s ».\n"
 
-#: src/conversation/gnunet-conversation.c:531
-#: src/conversation/gnunet-conversation.c:545
+#: src/conversation/gnunet-conversation.c:538
+#: src/conversation/gnunet-conversation.c:552
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:538
-#: src/conversation/gnunet-conversation.c:594
+#: src/conversation/gnunet-conversation.c:545
+#: src/conversation/gnunet-conversation.c:601
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:553
-#: src/conversation/gnunet-conversation.c:607
+#: src/conversation/gnunet-conversation.c:560
+#: src/conversation/gnunet-conversation.c:614
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:563
+#: src/conversation/gnunet-conversation.c:570
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:618
+#: src/conversation/gnunet-conversation.c:625
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:635
+#: src/conversation/gnunet-conversation.c:642
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:666
+#: src/conversation/gnunet-conversation.c:673
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:690
+#: src/conversation/gnunet-conversation.c:697
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:695
+#: src/conversation/gnunet-conversation.c:702
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:701
-#: src/conversation/gnunet-conversation.c:725
+#: src/conversation/gnunet-conversation.c:708
+#: src/conversation/gnunet-conversation.c:732
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:706
+#: src/conversation/gnunet-conversation.c:713
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:715
+#: src/conversation/gnunet-conversation.c:722
 #, 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:720
+#: src/conversation/gnunet-conversation.c:727
 #, c-format
 msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:739
+#: src/conversation/gnunet-conversation.c:746
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:745
+#: src/conversation/gnunet-conversation.c:752
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/conversation/gnunet-conversation.c:774
-#: src/conversation/gnunet-conversation.c:789
+#: src/conversation/gnunet-conversation.c:781
+#: src/conversation/gnunet-conversation.c:796
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:822
-#: src/conversation/gnunet-conversation.c:838
+#: src/conversation/gnunet-conversation.c:829
+#: src/conversation/gnunet-conversation.c:845
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:845
+#: src/conversation/gnunet-conversation.c:852
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:854
+#: src/conversation/gnunet-conversation.c:861
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:871
+#: src/conversation/gnunet-conversation.c:878
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:906
+#: src/conversation/gnunet-conversation.c:913
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:914
+#: src/conversation/gnunet-conversation.c:921
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:931
+#: src/conversation/gnunet-conversation.c:938
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:957
+#: src/conversation/gnunet-conversation.c:964
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:959
+#: src/conversation/gnunet-conversation.c:966
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:963
+#: src/conversation/gnunet-conversation.c:970
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:965
+#: src/conversation/gnunet-conversation.c:972
 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:967
+#: src/conversation/gnunet-conversation.c:974
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:969
+#: src/conversation/gnunet-conversation.c:976
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:971
+#: src/conversation/gnunet-conversation.c:978
 #, 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:973
+#: src/conversation/gnunet-conversation.c:980
 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:1189
+#: src/conversation/gnunet-conversation.c:1196
 #, 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:1202
+#: src/conversation/gnunet-conversation.c:1209
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Biệt hiệu « %s » bị xoá.\n"
 
-#: src/conversation/gnunet-conversation.c:1240
+#: src/conversation/gnunet-conversation.c:1247
 #, 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:1264
+#: src/conversation/gnunet-conversation.c:1271
 #, 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:1293
+#: src/conversation/gnunet-conversation.c:1300
 msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1298
+#: src/conversation/gnunet-conversation.c:1305
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1327
+#: src/conversation/gnunet-conversation.c:1334
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1206,7 +1206,7 @@ msgstr "SMTP: « %s » bị lỗi: %s\n"
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/conversation/gnunet-service-conversation.c:1285
+#: src/conversation/gnunet-service-conversation.c:1303
 #, fuzzy, c-format
 msgid "Could not open line, port %s already in use!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
@@ -1527,8 +1527,7 @@ msgstr ""
 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:262 src/namestore/gnunet-namestore.c:886
-#: src/namestore/plugin_rest_namestore.c:1020
+#: src/credential/gnunet-credential.c:262 src/namestore/gnunet-namestore.c:887
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
@@ -1630,16 +1629,15 @@ msgstr ""
 msgid "GNUnet credential resolver tool"
 msgstr "Bản ghi lỗi GNUnet"
 
-#: src/credential/gnunet-service-credential.c:1136 src/gns/gnunet-gns.c:182
+#: src/credential/gnunet-service-credential.c:1136 src/gns/gnunet-gns.c:183
 #: src/gns/gnunet-gns-helper-service-w32.c:725
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #: src/credential/gnunet-service-credential.c:1142
-#: src/namestore/gnunet-namestore.c:912
-#: src/namestore/gnunet-namestore-fcfsd.c:1112
-#: src/namestore/plugin_rest_namestore.c:1033
+#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore-fcfsd.c:1136
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -1649,11 +1647,6 @@ msgstr "Không kết nối được đến trình nền gnunetd."
 msgid "Unable to parse ATTR record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/credential/plugin_rest_credential.c:1126 src/gns/plugin_rest_gns.c:667
-#, fuzzy
-msgid "GNS REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
 #: src/datacache/datacache.c:117 src/datacache/datacache.c:309
 #: src/datastore/gnunet-service-datastore.c:755
 #, fuzzy
@@ -1703,29 +1696,29 @@ msgstr "kho dữ liệu sqlite"
 #: src/datacache/plugin_datacache_sqlite.c:125
 #: src/datastore/plugin_datastore_mysql.c:890
 #: src/datastore/plugin_datastore_sqlite.c:56
-#: src/datastore/plugin_datastore_sqlite.c:64
-#: src/identity-provider/plugin_identity_provider_sqlite.c:50 src/my/my.c:79
-#: src/my/my.c:91 src/mysql/mysql.c:40 src/mysql/mysql.c:47
+#: src/datastore/plugin_datastore_sqlite.c:64 src/my/my.c:79 src/my/my.c:91
+#: src/mysql/mysql.c:40 src/mysql/mysql.c:47
 #: src/namecache/plugin_namecache_sqlite.c:50
 #: src/namestore/plugin_namestore_sqlite.c:51
 #: src/peerstore/plugin_peerstore_sqlite.c:50
 #: src/psycstore/plugin_psycstore_mysql.c:60
+#: src/reclaim/plugin_reclaim_sqlite.c:50
 #: src/testbed/generate-underlay-topology.c:45
 #: src/testbed/gnunet-daemon-latency-logger.c:50
 #: src/testbed/gnunet-daemon-testbed-underlay.c:54
-#: src/testbed/testbed_api_hosts.c:67 src/util/crypto_ecc.c:50
+#: src/testbed/testbed_api_hosts.c:67 src/util/crypto_ecc.c:51
 #: src/util/crypto_ecc_setup.c:39 src/util/crypto_mpi.c:37
-#: src/include/gnunet_common.h:810 src/include/gnunet_common.h:819
+#: src/include/gnunet_common.h:816 src/include/gnunet_common.h:825
 #: src/scalarproduct/scalarproduct.h:33
 #, 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:860
+#: src/datacache/plugin_datacache_sqlite.c:861
 #: src/datastore/plugin_datastore_sqlite.c:506
-#: src/identity-provider/plugin_identity_provider_sqlite.c:334
 #: src/namecache/plugin_namecache_sqlite.c:327
 #: src/namestore/plugin_namestore_sqlite.c:262
+#: src/reclaim/plugin_reclaim_sqlite.c:334
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -2077,11 +2070,11 @@ 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:269
-#: src/identity-provider/plugin_identity_provider_sqlite.c:210
 #: src/namecache/plugin_namecache_sqlite.c:207
 #: src/namestore/plugin_namestore_sqlite.c:203
 #: src/peerstore/plugin_peerstore_sqlite.c:533
 #: src/psycstore/plugin_psycstore_sqlite.c:323
+#: src/reclaim/plugin_reclaim_sqlite.c:210
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
@@ -2090,21 +2083,21 @@ msgstr "Không thể sơ khởi SQLite: %s.\n"
 msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1324
+#: src/datastore/plugin_datastore_sqlite.c:1325
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1358
+#: src/datastore/plugin_datastore_sqlite.c:1359
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1402
-#: src/identity-provider/plugin_identity_provider_sqlite.c:709
+#: src/datastore/plugin_datastore_sqlite.c:1403
 #: src/namecache/plugin_namecache_sqlite.c:638
-#: src/namestore/plugin_namestore_sqlite.c:752
+#: src/namestore/plugin_namestore_sqlite.c:753
+#: src/reclaim/plugin_reclaim_sqlite.c:709
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -2181,7 +2174,7 @@ msgstr ""
 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:947 src/rps/gnunet-rps-profiler.c:2691
+#: src/dht/gnunet_dht_profiler.c:947 src/rps/gnunet-rps-profiler.c:2764
 #, fuzzy
 msgid "number of peers to start"
 msgstr "số lần lặp lại"
@@ -2509,36 +2502,6 @@ msgstr ""
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:252
-#, fuzzy, c-format
-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:821
-#, 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:231
-#, 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:362
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
-#: src/dns/dnsstub.c:509
-#, fuzzy, c-format
-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:515
-#, 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/gnunet-dns-monitor.c:351 src/dns/gnunet-dns-monitor.c:356
 msgid "only monitor DNS queries"
 msgstr ""
@@ -4149,11 +4112,11 @@ msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ 
thống nhất"
 msgid "Could not start businesscard 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/gns/gnunet-bcd.c:520
+#: src/gns/gnunet-bcd.c:521
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:533
+#: src/gns/gnunet-bcd.c:534
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
@@ -4162,35 +4125,35 @@ msgstr ""
 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:402
+#: src/gns/gnunet-dns2gns.c:403
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:418
+#: src/gns/gnunet-dns2gns.c:419
 #, 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:426
+#: src/gns/gnunet-dns2gns.c:427
 #, 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:585
+#: src/gns/gnunet-dns2gns.c:586
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/gns/gnunet-dns2gns.c:685
+#: src/gns/gnunet-dns2gns.c:686
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:690
+#: src/gns/gnunet-dns2gns.c:691
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:707
+#: src/gns/gnunet-dns2gns.c:708
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4206,7 +4169,7 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:197 src/gns/plugin_rest_gns.c:344
+#: src/gns/gnunet-gns.c:197
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
@@ -4233,7 +4196,7 @@ msgstr "Bản ghi lỗi GNUnet"
 msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:699 src/gns/plugin_rest_gns.c:420
+#: src/gns/gnunet-gns-helper-service-w32.c:699
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
@@ -4303,64 +4266,64 @@ msgstr ""
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2061
+#: src/gns/gnunet-gns-proxy.c:2062
 #, 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:2582
+#: src/gns/gnunet-gns-proxy.c:2583
 #, 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:2614
+#: src/gns/gnunet-gns-proxy.c:2615
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/gns/gnunet-gns-proxy.c:2813
+#: src/gns/gnunet-gns-proxy.c:2814
 #, 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:2838 src/rest/gnunet-rest-server.c:656
+#: src/gns/gnunet-gns-proxy.c:2839 src/rest/gnunet-rest-server.c:656
 #, 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:3168
+#: src/gns/gnunet-gns-proxy.c:3169
 #, 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:3197
+#: src/gns/gnunet-gns-proxy.c:3198
 #, 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:3279
+#: src/gns/gnunet-gns-proxy.c:3280
 #, 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:3569
+#: src/gns/gnunet-gns-proxy.c:3570
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:3697
+#: src/gns/gnunet-gns-proxy.c:3698
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3702
+#: src/gns/gnunet-gns-proxy.c:3703
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3706
+#: src/gns/gnunet-gns-proxy.c:3707
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3732
+#: src/gns/gnunet-gns-proxy.c:3733
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4470,10 +4433,6 @@ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 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_rest_gns.c:382
-msgid "Ego for not found, cannot perform lookup.\n"
-msgstr ""
-
 #: src/gnsrecord/plugin_gnsrecord_dns.c:357
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4956,123 +4915,53 @@ msgstr ""
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:388
+#: src/identity/gnunet-service-identity.c:389
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:410
+#: src/identity/gnunet-service-identity.c:414
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:499
-#: src/identity/gnunet-service-identity.c:771
-#: src/identity/gnunet-service-identity.c:893
+#: src/identity/gnunet-service-identity.c:505
+#: src/identity/gnunet-service-identity.c:788
+#: src/identity/gnunet-service-identity.c:916
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/gnunet-service-identity.c:506
+#: src/identity/gnunet-service-identity.c:513
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:599
+#: src/identity/gnunet-service-identity.c:608
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:748
+#: src/identity/gnunet-service-identity.c:763
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:787
-#: src/identity/gnunet-service-identity.c:910
+#: src/identity/gnunet-service-identity.c:806
+#: src/identity/gnunet-service-identity.c:934
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:944
+#: src/identity/gnunet-service-identity.c:969
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/gnunet-service-identity.c:1002
+#: src/identity/gnunet-service-identity.c:1027
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/identity/gnunet-service-identity.c:1012
+#: src/identity/gnunet-service-identity.c:1037
 #, fuzzy, c-format
 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:966
-#, fuzzy
-msgid "Identity REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
-#: src/identity-provider/gnunet-idp.c:422
-#, 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:430
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:438
-#, 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:461
-msgid "Add attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:467
-msgid "Attribute value"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:472
-msgid "Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:477
-msgid "Audience (relying party)"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:481
-msgid "List attributes for Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:486
-msgid "Issue a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:491
-msgid "Consume a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:496
-msgid "Revoke a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:501
-msgid "Type of attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:506
-msgid "Expiration interval of the attribute"
-msgstr ""
-
-#: src/identity-provider/identity_provider_api.c:434
-#, 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:1228
-#: src/identity-provider/plugin_rest_openid_connect.c:2145
-#, fuzzy
-msgid "Identity Provider REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
 #: src/json/json.c:121
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -5122,7 +5011,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:230 src/namestore/gnunet-namestore.c:1289
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1290
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -5131,7 +5020,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:248 src/namestore/gnunet-namestore.c:1341
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1342
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
@@ -5147,8 +5036,8 @@ 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:148
-#: src/namestore/plugin_namestore_flat.c:383
+#: src/namestore/plugin_namestore_heap.c:146
+#: src/namestore/plugin_namestore_heap.c:393
 #: src/peerstore/plugin_peerstore_flat.c:377
 #: src/peerstore/plugin_peerstore_flat.c:536
 #, fuzzy, c-format
@@ -5156,14 +5045,14 @@ 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:159
+#: src/namestore/plugin_namestore_heap.c:157
 #: src/peerstore/plugin_peerstore_flat.c:392
 #, 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:172
+#: src/namestore/plugin_namestore_heap.c:170
 #: src/peerstore/plugin_peerstore_flat.c:404
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
@@ -5180,13 +5069,11 @@ 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:341
-#: src/namestore/plugin_rest_namestore.c:570
 #, 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:348
-#: src/namestore/plugin_rest_namestore.c:579
 #, 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"
@@ -5207,217 +5094,211 @@ msgid ""
 "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:808
-#: src/namestore/plugin_rest_namestore.c:605
+#: src/namestore/gnunet-namestore.c:809
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:849
+#: src/namestore/gnunet-namestore.c:850
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:901
+#: src/namestore/gnunet-namestore.c:902
 #, fuzzy, c-format
 msgid "No options given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/namestore/gnunet-namestore.c:920 src/namestore/gnunet-namestore.c:929
-#: src/namestore/gnunet-namestore.c:948 src/namestore/gnunet-namestore.c:971
-#: src/namestore/gnunet-namestore.c:1025
+#: src/namestore/gnunet-namestore.c:921 src/namestore/gnunet-namestore.c:930
+#: src/namestore/gnunet-namestore.c:949 src/namestore/gnunet-namestore.c:972
+#: src/namestore/gnunet-namestore.c:1026
 #, 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:921 src/namestore/gnunet-namestore.c:930
-#: src/namestore/gnunet-namestore.c:949 src/namestore/gnunet-namestore.c:973
+#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:974
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:939
-#: src/namestore/plugin_rest_namestore.c:682
+#: src/namestore/gnunet-namestore.c:940
 #, 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:961
-#: src/namestore/plugin_rest_namestore.c:702
-#: src/namestore/plugin_rest_namestore.c:744
+#: src/namestore/gnunet-namestore.c:962
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1006
+#: src/namestore/gnunet-namestore.c:1007
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1026
+#: src/namestore/gnunet-namestore.c:1027
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1069
+#: src/namestore/gnunet-namestore.c:1070
 #, 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:1098
+#: src/namestore/gnunet-namestore.c:1099
 #: src/peerinfo-tool/gnunet-peerinfo.c:773
 #, 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:1133
+#: src/namestore/gnunet-namestore.c:1134
 #, 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:1173
-#: src/namestore/plugin_rest_namestore.c:1063
+#: src/namestore/gnunet-namestore.c:1174
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1237
-#: src/namestore/plugin_rest_namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1238
 #, 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:1262
+#: src/namestore/gnunet-namestore.c:1263
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1266
+#: src/namestore/gnunet-namestore.c:1267
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1270
+#: src/namestore/gnunet-namestore.c:1271
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1275
+#: src/namestore/gnunet-namestore.c:1276
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1280
+#: src/namestore/gnunet-namestore.c:1281
 #, 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:1284
+#: src/namestore/gnunet-namestore.c:1285
 #, 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:1294
+#: src/namestore/gnunet-namestore.c:1295
 #, 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:1299
+#: src/namestore/gnunet-namestore.c:1300
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1304
+#: src/namestore/gnunet-namestore.c:1305
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1309
+#: src/namestore/gnunet-namestore.c:1310
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1313
+#: src/namestore/gnunet-namestore.c:1314
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1317
+#: src/namestore/gnunet-namestore.c:1318
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1322
+#: src/namestore/gnunet-namestore.c:1323
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:538
+#: src/namestore/gnunet-namestore-fcfsd.c:547
 #, 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:565
+#: src/namestore/gnunet-namestore-fcfsd.c:574
 #, 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:585
+#: src/namestore/gnunet-namestore-fcfsd.c:595
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:616
+#: src/namestore/gnunet-namestore-fcfsd.c:627
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:696
+#: src/namestore/gnunet-namestore-fcfsd.c:687
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:754
+#: src/namestore/gnunet-namestore-fcfsd.c:775
 #, 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:772
+#: src/namestore/gnunet-namestore-fcfsd.c:794
 #, 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:808
+#: src/namestore/gnunet-namestore-fcfsd.c:830
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:817
+#: src/namestore/gnunet-namestore-fcfsd.c:839
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1045
+#: src/namestore/gnunet-namestore-fcfsd.c:1069
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1073
+#: src/namestore/gnunet-namestore-fcfsd.c:1097
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1121
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1147
+#: src/namestore/gnunet-namestore-fcfsd.c:1171
 msgid "name of the zone that is to be managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1166
+#: src/namestore/gnunet-namestore-fcfsd.c:1190
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:748
+#: src/namestore/gnunet-service-namestore.c:749
 #, 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/gnunet-zoneimport.c:2033
+#: src/namestore/gnunet-zoneimport.c:2036
 msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:2038
+#: src/namestore/gnunet-zoneimport.c:2041
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
@@ -5425,9 +5306,9 @@ msgstr ""
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:765
+#: src/namestore/plugin_namestore_heap.c:776
 #, fuzzy
-msgid "flat file database running\n"
+msgid "heap file database running\n"
 msgstr "kho dữ liệu sqlite"
 
 #: src/namestore/plugin_namestore_sqlite.c:216
@@ -5436,11 +5317,6 @@ msgstr "kho dữ liệu sqlite"
 msgid "Failed to setup database at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/namestore/plugin_rest_namestore.c:1204
-#, fuzzy
-msgid "Namestore REST API initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
-
 #: src/nat-auto/gnunet-nat-auto.c:191
 #, fuzzy
 msgid "Suggested configuration changes:\n"
@@ -5830,6 +5706,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:297
+#: src/rest-plugins/plugin_rest_peerinfo.c:499
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
@@ -6133,6 +6010,66 @@ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
+#: src/reclaim/gnunet-reclaim.c:465
+#, fuzzy, c-format
+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/reclaim/gnunet-reclaim.c:473
+#, c-format
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:481
+#, fuzzy, c-format
+msgid "Requesting party key is required!\n"
+msgstr "đặt tên hiệu cần dùng (cần thiết)"
+
+#: src/reclaim/gnunet-reclaim.c:504
+msgid "Add attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:510
+msgid "Attribute value"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:515
+msgid "Ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:520
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:524
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:529
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:534
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:539
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:544
+msgid "Type of attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:549
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/reclaim/reclaim_api.c:434
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
 #: src/regex/gnunet-daemon-regexprofiler.c:265
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
@@ -6231,6 +6168,42 @@ msgstr ""
 msgid "GNUnet REST server"
 msgstr "Bản ghi lỗi GNUnet"
 
+#: src/rest-plugins/plugin_rest_copying.c:207
+#, fuzzy
+msgid "COPYING REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugins/plugin_rest_credential.c:1126
+#, fuzzy
+msgid "GNS REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugins/plugin_rest_gns.c:450
+#, fuzzy
+msgid "Gns REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugins/plugin_rest_identity.c:1295
+#, fuzzy
+msgid "Identity REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugins/plugin_rest_namestore.c:1077
+#, fuzzy
+msgid "Namestore REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugins/plugin_rest_openid_connect.c:2135
+#: src/rest-plugins/plugin_rest_reclaim.c:1079
+#, fuzzy
+msgid "Identity Provider REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/rest-plugins/plugin_rest_peerinfo.c:794
+#, fuzzy
+msgid "Peerinfo REST API initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
 #: src/revocation/gnunet-revocation.c:127
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
@@ -6369,15 +6342,33 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/rps/gnunet-rps.c:201
+#: src/rps/gnunet-rps.c:258
 msgid "Seed a PeerID"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:205
+#: src/rps/gnunet-rps.c:262
 msgid "Get updates of view (0 for infinite updates)"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2705
+#: src/rps/gnunet-rps.c:266
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2770
+msgid "duration of the profiling"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2776
+#, fuzzy
+msgid "timeout for the profiling"
+msgstr "xác định mức ưu tiên của nội dung"
+
+#: src/rps/gnunet-rps-profiler.c:2782
+#, fuzzy
+msgid "number of PeerIDs to request"
+msgstr "số lần lặp lại"
+
+#: src/rps/gnunet-rps-profiler.c:2797
 #, fuzzy
 msgid "Measure quality and performance of the RPS service."
 msgstr "Không thể truy cập đến dịch vụ"
@@ -6465,7 +6456,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1987
+#: src/set/gnunet-service-set.c:2004
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
@@ -6662,93 +6653,93 @@ msgstr "Đã tải %llu byte xuống « %s ».\n"
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:271
-#: src/statistics/gnunet-statistics.c:365
+#: src/statistics/gnunet-statistics.c:407
+#: src/statistics/gnunet-statistics.c:448
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:274
-#: src/statistics/gnunet-statistics.c:368
+#: src/statistics/gnunet-statistics.c:410
+#: src/statistics/gnunet-statistics.c:451
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:502
+#: src/statistics/gnunet-statistics.c:526
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:510
+#: src/statistics/gnunet-statistics.c:534
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:553
+#: src/statistics/gnunet-statistics.c:577
 #, fuzzy, c-format
 msgid "No subsystem or name given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/statistics/gnunet-statistics.c:568
+#: src/statistics/gnunet-statistics.c:592
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:703
+#: src/statistics/gnunet-statistics.c:727
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:721
+#: src/statistics/gnunet-statistics.c:745
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/statistics/gnunet-statistics.c:729
+#: src/statistics/gnunet-statistics.c:753
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:760
+#: src/statistics/gnunet-statistics.c:784
 #, c-format
 msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:793
+#: src/statistics/gnunet-statistics.c:817
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:798
+#: src/statistics/gnunet-statistics.c:822
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:804
+#: src/statistics/gnunet-statistics.c:828
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:810
+#: src/statistics/gnunet-statistics.c:834
 msgid "use as csv separator"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:816
+#: src/statistics/gnunet-statistics.c:840
 msgid "path to the folder containing the testbed data"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:821
+#: src/statistics/gnunet-statistics.c:845
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:826
+#: src/statistics/gnunet-statistics.c:850
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:832
+#: src/statistics/gnunet-statistics.c:856
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:838
+#: src/statistics/gnunet-statistics.c:862
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:855
+#: src/statistics/gnunet-statistics.c:879
 msgid "Print statistics about GNUnet operations."
 msgstr "In ra thống kê về các thao tác GNUnet."
 
@@ -8406,7 +8397,7 @@ msgstr ""
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1311 src/util/disk.c:1515
+#: src/transport/tcp_service_legacy.c:1311 src/util/disk.c:1521
 #: src/util/service.c:1376
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
@@ -8443,11 +8434,6 @@ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 msgid "Could not access configuration file `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/tun/regex.c:132
-#, c-format
-msgid "Bad mask: %d\n"
-msgstr ""
-
 #: src/util/bio.c:179 src/util/bio.c:187
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
@@ -8477,59 +8463,68 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:912
+#: src/util/client.c:732
+msgid "not a valid filename"
+msgstr ""
+
+#: src/util/client.c:923
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:257 src/util/common_logging.c:1144
+#: src/util/common_logging.c:257 src/util/common_logging.c:1159
 msgid "DEBUG"
 msgstr "GỠ LỖI"
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1142
+#: src/util/common_logging.c:259 src/util/common_logging.c:1157
 msgid "INFO"
 msgstr "TIN"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1140
+#: src/util/common_logging.c:261 src/util/common_logging.c:1155
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1138
+#: src/util/common_logging.c:263 src/util/common_logging.c:1153
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1136
+#: src/util/common_logging.c:265 src/util/common_logging.c:1151
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1146
+#: src/util/common_logging.c:267 src/util/common_logging.c:1161
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:880
+#: src/util/common_logging.c:631 src/util/common_logging.c:661
+#, c-format
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+msgstr ""
+
+#: src/util/common_logging.c:895
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n"
 
-#: src/util/common_logging.c:1147
+#: src/util/common_logging.c:1162
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1440
+#: src/util/common_logging.c:1455
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1482
+#: src/util/common_logging.c:1497
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1500
+#: src/util/common_logging.c:1515
 #, 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:1521
+#: src/util/common_logging.c:1536
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8546,7 +8541,12 @@ msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » 
tại dòng %
 msgid "Error while reading file `%s'\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/util/configuration.c:1049
+#: src/util/configuration.c:970
+#, fuzzy
+msgid "Not a valid relative time specification"
+msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+
+#: src/util/configuration.c:1059
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8555,17 +8555,17 @@ 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:1168
+#: src/util/configuration.c:1178
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1201
+#: src/util/configuration.c:1211
 #, 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:1269
+#: src/util/configuration.c:1279
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8579,22 +8579,22 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:831
+#: src/util/crypto_ecc.c:860
 #, 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:881
+#: src/util/crypto_ecc.c:915
 #, 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:955
+#: src/util/crypto_ecc.c:994
 #, 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:1012
+#: src/util/crypto_ecc.c:1055
 #, 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"
@@ -8629,26 +8629,56 @@ msgstr ""
 msgid "Could not load peer's private key\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/util/crypto_random.c:282
+#: src/util/crypto_random.c:304
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/util/crypto_rsa.c:836
+#: src/util/crypto_rsa.c:848
 #, 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:1167
+#: src/util/crypto_rsa.c:1187
 #, 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"
 
-#: src/util/disk.c:1245
+#: src/util/disk.c:1251
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Mong đợi « %s » là một thư mục.\n"
 
+#: src/util/dnsparser.c:250
+#, fuzzy, c-format
+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/util/dnsparser.c:940
+#, 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/util/dnsstub.c:229
+#, 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/util/dnsstub.c:360
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
+
+#: src/util/dnsstub.c:507
+#, fuzzy, c-format
+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/util/dnsstub.c:513
+#, 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/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -8749,8 +8779,8 @@ msgstr "cấu hình chức năng ghi sự kiện để dùng 
CẤP_GHI_LƯU"
 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:559 src/util/getopt_helpers.c:756
-#: src/util/getopt_helpers.c:823
+#: src/util/getopt_helpers.c:559 src/util/getopt_helpers.c:763
+#: src/util/getopt_helpers.c:830
 #, 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"
@@ -8765,62 +8795,67 @@ msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 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:830
+#: src/util/getopt_helpers.c:754
+#, c-format
+msgid "Your input for the '%s' option has to be a non negative number \n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:837
 #, 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:916
+#: src/util/getopt_helpers.c:923
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:148
+#: src/util/gnunet-config.c:157
 #, 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:161
+#: src/util/gnunet-config.c:170
 #, 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:164
+#: src/util/gnunet-config.c:173
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:215
+#: src/util/gnunet-config.c:224
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:254
+#: src/util/gnunet-config.c:263
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:259
+#: src/util/gnunet-config.c:268
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:264
+#: src/util/gnunet-config.c:273
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:269
+#: src/util/gnunet-config.c:278
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:273
+#: src/util/gnunet-config.c:282
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/util/gnunet-config.c:277
+#: src/util/gnunet-config.c:286
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:290
+#: src/util/gnunet-config.c:299
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -8947,16 +8982,9 @@ msgstr ""
 msgid "Manipulate GNUnet proof of work files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/util/gnunet-service-resolver.c:369
-#, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr "Không thể giải quyết « %s » (%s): %s\n"
-
-#: src/util/gnunet-service-resolver.c:458
-#: src/util/gnunet-service-resolver.c:510
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
-msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
+#: src/util/gnunet-service-resolver.c:1443
+msgid "No DNS server available. DNS resolution will not be possible.\n"
+msgstr ""
 
 #: src/util/gnunet-uri.c:83
 #, c-format
@@ -9055,35 +9083,40 @@ msgstr "« %s » thất bại cho thư viện « %s » với lỗi: 
%s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/util/resolver_api.c:201
+#: src/util/regex.c:132
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
+
+#: src/util/resolver_api.c:216
 #, c-format
 msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:222
+#: src/util/resolver_api.c:237
 #, 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:849
+#: src/util/resolver_api.c:873
 #, 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:862
+#: src/util/resolver_api.c:886
 #, 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:1046
+#: src/util/resolver_api.c:1071
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1132 src/util/resolver_api.c:1155
-#: src/util/resolver_api.c:1169
+#: src/util/resolver_api.c:1158 src/util/resolver_api.c:1181
+#: src/util/resolver_api.c:1195
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
@@ -9119,115 +9152,115 @@ msgstr ""
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:469
+#: src/util/strings.c:471
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:596
+#: src/util/strings.c:598
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Lỗi mở rộng biến môi trường « $HOME »: chưa đặt biến môi trường « HOME »"
 
-#: src/util/strings.c:700
+#: src/util/strings.c:702
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:704
+#: src/util/strings.c:706
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:706
+#: src/util/strings.c:708
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:712
+#: src/util/strings.c:714
 msgid "ms"
 msgstr "mg"
 
-#: src/util/strings.c:718
+#: src/util/strings.c:720
 msgid "s"
 msgstr "g"
 
-#: src/util/strings.c:724
+#: src/util/strings.c:726
 msgid "m"
 msgstr "p"
 
-#: src/util/strings.c:730
+#: src/util/strings.c:732
 msgid "h"
 msgstr "g"
 
-#: src/util/strings.c:737
+#: src/util/strings.c:739
 #, fuzzy
 msgid "day"
 msgstr " ngày"
 
-#: src/util/strings.c:739
+#: src/util/strings.c:741
 #, fuzzy
 msgid "days"
 msgstr " ngày"
 
-#: src/util/strings.c:768
+#: src/util/strings.c:770
 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"
@@ -9416,22 +9449,33 @@ msgstr ""
 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:764 src/include/gnunet_common.h:771
-#: src/include/gnunet_common.h:781 src/include/gnunet_common.h:789
+#: src/include/gnunet_common.h:770 src/include/gnunet_common.h:777
+#: src/include/gnunet_common.h:787
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d. Aborting.\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:795
 #, 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:801
+#: src/include/gnunet_common.h:807
 #, 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:828 src/include/gnunet_common.h:837
+#: src/include/gnunet_common.h:834 src/include/gnunet_common.h:843
 #, 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"
 
+#~ msgid "Could not resolve `%s' (%s): %s\n"
+#~ msgstr "Không thể giải quyết « %s » (%s): %s\n"
+
+#~ msgid "Could not find IP of host `%s': %s\n"
+#~ msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
+
 #, fuzzy
 #~ msgid "PUT request sent with key"
 #~ msgstr "# độ tin cậy được tiêu phí"
@@ -9449,10 +9493,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với 
lỗi: %s
 #~ 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"
 
@@ -10478,11 +10518,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với 
lỗi: %s
 #~ msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
 #, fuzzy
-#~ msgid "No valid expiration time for operation `%s'\n"
-#~ msgstr ""
-#~ "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
-
-#, fuzzy
 #~ msgid "Failed to find record to remove\n"
 #~ msgstr "Không thể kết nối tới %s:%u: %s\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index d27d6f0a0..cd3a10b4e 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-06-20 22:22+0200\n"
+"POT-Creation-Date: 2018-10-20 11:13+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"
@@ -220,7 +220,7 @@ msgstr ""
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:381 src/transport/plugin_transport_tcp.c:1118
+#: src/arm/gnunet-service-arm.c:386 src/transport/plugin_transport_tcp.c:1118
 #: src/transport/plugin_transport_xt.c:1118
 #: src/transport/tcp_service_legacy.c:555 src/util/service.c:610
 #, c-format
@@ -228,7 +228,7 @@ msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:405 src/arm/gnunet-service-arm.c:411
+#: src/arm/gnunet-service-arm.c:410 src/arm/gnunet-service-arm.c:416
 #: src/transport/plugin_transport_tcp.c:1137
 #: src/transport/plugin_transport_tcp.c:1143
 #: src/transport/plugin_transport_tcp.c:3823
@@ -242,7 +242,7 @@ msgstr ""
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:450 src/transport/plugin_transport_tcp.c:1174
+#: src/arm/gnunet-service-arm.c:455 src/transport/plugin_transport_tcp.c:1174
 #: src/transport/plugin_transport_xt.c:1174
 #: src/transport/tcp_service_legacy.c:611 src/util/client.c:504
 #: src/util/service.c:680
@@ -250,7 +250,7 @@ msgstr ""
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:455 src/transport/plugin_transport_tcp.c:1178
+#: src/arm/gnunet-service-arm.c:460 src/transport/plugin_transport_tcp.c:1178
 #: src/transport/plugin_transport_xt.c:1178
 #: src/transport/tcp_service_legacy.c:615 src/util/client.c:509
 #: src/util/service.c:685
@@ -258,7 +258,7 @@ msgstr ""
 msgid "Using `%s' instead\n"
 msgstr "%s:选项“%s”有歧义\n"
 
-#: src/arm/gnunet-service-arm.c:488 src/transport/plugin_transport_tcp.c:1209
+#: src/arm/gnunet-service-arm.c:493 src/transport/plugin_transport_tcp.c:1209
 #: src/transport/plugin_transport_xt.c:1209
 #: src/transport/tcp_service_legacy.c:646 src/util/service.c:721
 #, c-format
@@ -267,14 +267,14 @@ msgid ""
 "domain socket: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:510 src/transport/plugin_transport_tcp.c:1226
+#: src/arm/gnunet-service-arm.c:515 src/transport/plugin_transport_tcp.c:1226
 #: src/transport/plugin_transport_xt.c:1226
 #: src/transport/tcp_service_legacy.c:663 src/util/service.c:739
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:549
+#: src/arm/gnunet-service-arm.c:554
 #: src/transport/plugin_transport_http_server.c:2682
 #: src/transport/plugin_transport_tcp.c:1257
 #: src/transport/plugin_transport_xt.c:1257
@@ -283,7 +283,7 @@ msgstr ""
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/arm/gnunet-service-arm.c:568
+#: src/arm/gnunet-service-arm.c:573
 #: src/transport/plugin_transport_http_server.c:2700
 #: src/transport/plugin_transport_tcp.c:1276
 #: src/transport/plugin_transport_xt.c:1276
@@ -292,65 +292,65 @@ msgstr "打开日志文件“%s”失败:%s\n"
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/arm/gnunet-service-arm.c:979
+#: src/arm/gnunet-service-arm.c:984
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-service-arm.c:990
+#: src/arm/gnunet-service-arm.c:995
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1102
+#: src/arm/gnunet-service-arm.c:1107
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户:"
 
-#: src/arm/gnunet-service-arm.c:1137
+#: src/arm/gnunet-service-arm.c:1142
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1180
+#: src/arm/gnunet-service-arm.c:1185
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1359
+#: src/arm/gnunet-service-arm.c:1364
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1664
+#: src/arm/gnunet-service-arm.c:1669
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1825
+#: src/arm/gnunet-service-arm.c:1830
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1830
+#: src/arm/gnunet-service-arm.c:1835
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1835
+#: src/arm/gnunet-service-arm.c:1840
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:1841
+#: src/arm/gnunet-service-arm.c:1846
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-service-arm.c:1867
+#: src/arm/gnunet-service-arm.c:1872
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1883
+#: src/arm/gnunet-service-arm.c:1888
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
@@ -429,24 +429,24 @@ msgstr "无法初始化 SQLite:%s。\n"
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1867
+#: src/ats/plugin_ats_mlp.c:1868
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1911
+#: src/ats/plugin_ats_mlp.c:1912
 #, c-format
 msgid "Updating address property for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2473
+#: src/ats/plugin_ats_mlp.c:2474
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2513 src/ats/plugin_ats_mlp.c:2530
-#: src/ats/plugin_ats_mlp.c:2562 src/ats/plugin_ats_mlp.c:2580
-#: src/ats/plugin_ats_mlp.c:2599 src/ats/plugin_ats_proportional.c:1139
+#: src/ats/plugin_ats_mlp.c:2514 src/ats/plugin_ats_mlp.c:2531
+#: src/ats/plugin_ats_mlp.c:2563 src/ats/plugin_ats_mlp.c:2581
+#: src/ats/plugin_ats_mlp.c:2600 src/ats/plugin_ats_proportional.c:1139
 #: src/ats/plugin_ats_ril.c:2610 src/ats/plugin_ats_ril.c:2627
 #: src/ats/plugin_ats_ril.c:2644 src/ats/plugin_ats_ril.c:2661
 #: src/ats/plugin_ats_ril.c:2678 src/ats/plugin_ats_ril.c:2695
@@ -455,27 +455,27 @@ msgstr ""
 msgid "Invalid %s configuration %f \n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats/plugin_ats_mlp.c:2668
+#: src/ats/plugin_ats_mlp.c:2669
 #, 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:2677
+#: src/ats/plugin_ats_mlp.c:2678
 #, 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:2687
+#: src/ats/plugin_ats_mlp.c:2688
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2696
+#: src/ats/plugin_ats_mlp.c:2697
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
@@ -674,62 +674,62 @@ msgstr ""
 msgid "help text"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:662
+#: src/cadet/gnunet-cadet.c:705
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/cadet/gnunet-cadet.c:701
+#: src/cadet/gnunet-cadet.c:744
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/cadet/gnunet-cadet.c:774
+#: src/cadet/gnunet-cadet.c:817
 msgid "Extra arguments are not applicable in combination with this option.\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:865
+#: src/cadet/gnunet-cadet.c:908
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/cadet/gnunet-cadet.c:902
+#: src/cadet/gnunet-cadet.c:945
 msgid "No action requested\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:927
+#: src/cadet/gnunet-cadet.c:970
 #, fuzzy
 msgid "Provide information about a particular connection"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:932
+#: src/cadet/gnunet-cadet.c:975
 msgid "Activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:937
+#: src/cadet/gnunet-cadet.c:980
 msgid "Dump debug information to STDERR"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:943
+#: src/cadet/gnunet-cadet.c:986
 msgid "Listen for connections using a shared secret among sender and recipient"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:950
+#: src/cadet/gnunet-cadet.c:993
 #, fuzzy
 msgid "Provide information about a patricular peer"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:956
+#: src/cadet/gnunet-cadet.c:999
 #, fuzzy
 msgid "Provide information about all peers"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:962
+#: src/cadet/gnunet-cadet.c:1005
 #, fuzzy
 msgid "Provide information about a particular tunnel"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/cadet/gnunet-cadet.c:968
+#: src/cadet/gnunet-cadet.c:1011
 #, fuzzy
 msgid "Provide information about all tunnels"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -778,259 +778,259 @@ msgstr ""
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:268
+#: src/conversation/gnunet-conversation.c:275
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:293
+#: src/conversation/gnunet-conversation.c:300
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:328
+#: src/conversation/gnunet-conversation.c:335
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:333
+#: src/conversation/gnunet-conversation.c:340
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:351
+#: src/conversation/gnunet-conversation.c:358
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:366
+#: src/conversation/gnunet-conversation.c:373
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:378
+#: src/conversation/gnunet-conversation.c:385
 #, c-format
 msgid "Phone active at `%s'.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:402
+#: src/conversation/gnunet-conversation.c:409
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:409
+#: src/conversation/gnunet-conversation.c:416
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/conversation/gnunet-conversation.c:416
+#: src/conversation/gnunet-conversation.c:423
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/conversation/gnunet-conversation.c:424
+#: src/conversation/gnunet-conversation.c:431
 #, c-format
 msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:433
+#: src/conversation/gnunet-conversation.c:440
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:439
+#: src/conversation/gnunet-conversation.c:446
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:444
+#: src/conversation/gnunet-conversation.c:451
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:515
+#: src/conversation/gnunet-conversation.c:522
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/conversation/gnunet-conversation.c:531
-#: src/conversation/gnunet-conversation.c:545
+#: src/conversation/gnunet-conversation.c:538
+#: src/conversation/gnunet-conversation.c:552
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:538
-#: src/conversation/gnunet-conversation.c:594
+#: src/conversation/gnunet-conversation.c:545
+#: src/conversation/gnunet-conversation.c:601
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:553
-#: src/conversation/gnunet-conversation.c:607
+#: src/conversation/gnunet-conversation.c:560
+#: src/conversation/gnunet-conversation.c:614
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:563
+#: src/conversation/gnunet-conversation.c:570
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:618
+#: src/conversation/gnunet-conversation.c:625
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:635
+#: src/conversation/gnunet-conversation.c:642
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:666
+#: src/conversation/gnunet-conversation.c:673
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:690
+#: src/conversation/gnunet-conversation.c:697
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:695
+#: src/conversation/gnunet-conversation.c:702
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:701
-#: src/conversation/gnunet-conversation.c:725
+#: src/conversation/gnunet-conversation.c:708
+#: src/conversation/gnunet-conversation.c:732
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:706
+#: src/conversation/gnunet-conversation.c:713
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:715
+#: src/conversation/gnunet-conversation.c:722
 #, 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:720
+#: src/conversation/gnunet-conversation.c:727
 #, c-format
 msgid "We are calling `%s', their phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:739
+#: src/conversation/gnunet-conversation.c:746
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:745
+#: src/conversation/gnunet-conversation.c:752
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/conversation/gnunet-conversation.c:774
-#: src/conversation/gnunet-conversation.c:789
+#: src/conversation/gnunet-conversation.c:781
+#: src/conversation/gnunet-conversation.c:796
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:822
-#: src/conversation/gnunet-conversation.c:838
+#: src/conversation/gnunet-conversation.c:829
+#: src/conversation/gnunet-conversation.c:845
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:845
+#: src/conversation/gnunet-conversation.c:852
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:854
+#: src/conversation/gnunet-conversation.c:861
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:871
+#: src/conversation/gnunet-conversation.c:878
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:906
+#: src/conversation/gnunet-conversation.c:913
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:914
+#: src/conversation/gnunet-conversation.c:921
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:931
+#: src/conversation/gnunet-conversation.c:938
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:957
+#: src/conversation/gnunet-conversation.c:964
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:959
+#: src/conversation/gnunet-conversation.c:966
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:961
+#: src/conversation/gnunet-conversation.c:968
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:963
+#: src/conversation/gnunet-conversation.c:970
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:965
+#: src/conversation/gnunet-conversation.c:972
 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:967
+#: src/conversation/gnunet-conversation.c:974
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:969
+#: src/conversation/gnunet-conversation.c:976
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:971
+#: src/conversation/gnunet-conversation.c:978
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:973
+#: src/conversation/gnunet-conversation.c:980
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1189
+#: src/conversation/gnunet-conversation.c:1196
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:1202
+#: src/conversation/gnunet-conversation.c:1209
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1240
+#: src/conversation/gnunet-conversation.c:1247
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/conversation/gnunet-conversation.c:1264
+#: src/conversation/gnunet-conversation.c:1271
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/conversation/gnunet-conversation.c:1293
+#: src/conversation/gnunet-conversation.c:1300
 msgid "sets the NAME of the ego to use for the caller ID"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1298
+#: src/conversation/gnunet-conversation.c:1305
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1327
+#: src/conversation/gnunet-conversation.c:1334
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgstr "“%s”说:%s\n"
 msgid "Failed to allocate %u bytes for second packet\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/conversation/gnunet-service-conversation.c:1285
+#: src/conversation/gnunet-service-conversation.c:1303
 #, fuzzy, c-format
 msgid "Could not open line, port %s already in use!\n"
 msgstr "无法连接到 %s:%u:%s\n"
@@ -1475,8 +1475,7 @@ msgstr ""
 msgid "Unable to parse CRED record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/credential/gnunet-credential.c:262 src/namestore/gnunet-namestore.c:886
-#: src/namestore/plugin_rest_namestore.c:1020
+#: src/credential/gnunet-credential.c:262 src/namestore/gnunet-namestore.c:887
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
@@ -1576,16 +1575,15 @@ msgstr ""
 msgid "GNUnet credential resolver tool"
 msgstr "GNUnet 错误日志"
 
-#: src/credential/gnunet-service-credential.c:1136 src/gns/gnunet-gns.c:182
+#: src/credential/gnunet-service-credential.c:1136 src/gns/gnunet-gns.c:183
 #: src/gns/gnunet-gns-helper-service-w32.c:725
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/credential/gnunet-service-credential.c:1142
-#: src/namestore/gnunet-namestore.c:912
-#: src/namestore/gnunet-namestore-fcfsd.c:1112
-#: src/namestore/plugin_rest_namestore.c:1033
+#: src/namestore/gnunet-namestore.c:913
+#: src/namestore/gnunet-namestore-fcfsd.c:1136
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -1595,10 +1593,6 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Unable to parse ATTR record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/credential/plugin_rest_credential.c:1126 src/gns/plugin_rest_gns.c:667
-msgid "GNS REST API initialized\n"
-msgstr ""
-
 #: src/datacache/datacache.c:117 src/datacache/datacache.c:309
 #: src/datastore/gnunet-service-datastore.c:755
 msgid "# bytes stored"
@@ -1643,29 +1637,29 @@ msgstr "sqlite 数据仓库"
 #: src/datacache/plugin_datacache_sqlite.c:125
 #: src/datastore/plugin_datastore_mysql.c:890
 #: src/datastore/plugin_datastore_sqlite.c:56
-#: src/datastore/plugin_datastore_sqlite.c:64
-#: src/identity-provider/plugin_identity_provider_sqlite.c:50 src/my/my.c:79
-#: src/my/my.c:91 src/mysql/mysql.c:40 src/mysql/mysql.c:47
+#: src/datastore/plugin_datastore_sqlite.c:64 src/my/my.c:79 src/my/my.c:91
+#: src/mysql/mysql.c:40 src/mysql/mysql.c:47
 #: src/namecache/plugin_namecache_sqlite.c:50
 #: src/namestore/plugin_namestore_sqlite.c:51
 #: src/peerstore/plugin_peerstore_sqlite.c:50
 #: src/psycstore/plugin_psycstore_mysql.c:60
+#: src/reclaim/plugin_reclaim_sqlite.c:50
 #: src/testbed/generate-underlay-topology.c:45
 #: src/testbed/gnunet-daemon-latency-logger.c:50
 #: src/testbed/gnunet-daemon-testbed-underlay.c:54
-#: src/testbed/testbed_api_hosts.c:67 src/util/crypto_ecc.c:50
+#: src/testbed/testbed_api_hosts.c:67 src/util/crypto_ecc.c:51
 #: src/util/crypto_ecc_setup.c:39 src/util/crypto_mpi.c:37
-#: src/include/gnunet_common.h:810 src/include/gnunet_common.h:819
+#: src/include/gnunet_common.h:816 src/include/gnunet_common.h:825
 #: src/scalarproduct/scalarproduct.h:33
 #, 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:860
+#: src/datacache/plugin_datacache_sqlite.c:861
 #: src/datastore/plugin_datastore_sqlite.c:506
-#: src/identity-provider/plugin_identity_provider_sqlite.c:334
 #: src/namecache/plugin_namecache_sqlite.c:327
 #: src/namestore/plugin_namestore_sqlite.c:262
+#: src/reclaim/plugin_reclaim_sqlite.c:334
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1997,11 +1991,11 @@ msgid "`%s' failed at %s:%u with error: %s"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:269
-#: src/identity-provider/plugin_identity_provider_sqlite.c:210
 #: src/namecache/plugin_namecache_sqlite.c:207
 #: src/namestore/plugin_namestore_sqlite.c:203
 #: src/peerstore/plugin_peerstore_sqlite.c:533
 #: src/psycstore/plugin_psycstore_sqlite.c:323
+#: src/reclaim/plugin_reclaim_sqlite.c:210
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite:%s。\n"
@@ -2010,21 +2004,21 @@ msgstr "无法初始化 SQLite:%s。\n"
 msgid "sqlite bind failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1324
+#: src/datastore/plugin_datastore_sqlite.c:1325
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1358
+#: src/datastore/plugin_datastore_sqlite.c:1359
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1402
-#: src/identity-provider/plugin_identity_provider_sqlite.c:709
+#: src/datastore/plugin_datastore_sqlite.c:1403
 #: src/namecache/plugin_namecache_sqlite.c:638
-#: src/namestore/plugin_namestore_sqlite.c:752
+#: src/namestore/plugin_namestore_sqlite.c:753
+#: src/reclaim/plugin_reclaim_sqlite.c:709
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
@@ -2101,7 +2095,7 @@ msgstr ""
 msgid "Exiting as the number of peers is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/dht/gnunet_dht_profiler.c:947 src/rps/gnunet-rps-profiler.c:2691
+#: src/dht/gnunet_dht_profiler.c:947 src/rps/gnunet-rps-profiler.c:2764
 #, fuzzy
 msgid "number of peers to start"
 msgstr "迭代次数"
@@ -2403,36 +2397,6 @@ msgstr ""
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:252
-#, fuzzy, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
-#: src/dns/dnsparser.c:821
-#, 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:231
-#, fuzzy, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr "找不到主机“%s”的 IP:%s\n"
-
-#: src/dns/dnsstub.c:362
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
-#: src/dns/dnsstub.c:509
-#, fuzzy, c-format
-msgid "Failed to send DNS request to %s: %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
-#: src/dns/dnsstub.c:515
-#, fuzzy, c-format
-msgid "Sent DNS request to %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
 #: src/dns/gnunet-dns-monitor.c:351 src/dns/gnunet-dns-monitor.c:356
 msgid "only monitor DNS queries"
 msgstr ""
@@ -3956,11 +3920,11 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-bcd.c:520
+#: src/gns/gnunet-bcd.c:521
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:533
+#: src/gns/gnunet-bcd.c:534
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
@@ -3969,34 +3933,34 @@ msgstr ""
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-dns2gns.c:402
+#: src/gns/gnunet-dns2gns.c:403
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:418
+#: src/gns/gnunet-dns2gns.c:419
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:426
+#: src/gns/gnunet-dns2gns.c:427
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:585
+#: src/gns/gnunet-dns2gns.c:586
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:685
+#: src/gns/gnunet-dns2gns.c:686
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:690
+#: src/gns/gnunet-dns2gns.c:691
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:707
+#: src/gns/gnunet-dns2gns.c:708
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4012,7 +3976,7 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:197 src/gns/plugin_rest_gns.c:344
+#: src/gns/gnunet-gns.c:197
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
@@ -4038,7 +4002,7 @@ msgstr "GNUnet 错误日志"
 msgid "Not ready to process requests, lacking ego data\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-helper-service-w32.c:699 src/gns/plugin_rest_gns.c:420
+#: src/gns/gnunet-gns-helper-service-w32.c:699
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
@@ -4108,64 +4072,64 @@ msgstr ""
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2061
+#: src/gns/gnunet-gns-proxy.c:2062
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2582
+#: src/gns/gnunet-gns-proxy.c:2583
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户:"
 
-#: src/gns/gnunet-gns-proxy.c:2614
+#: src/gns/gnunet-gns-proxy.c:2615
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "无法保存配置文件“%s”:"
 
-#: src/gns/gnunet-gns-proxy.c:2813
+#: src/gns/gnunet-gns-proxy.c:2814
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2838 src/rest/gnunet-rest-server.c:656
+#: src/gns/gnunet-gns-proxy.c:2839 src/rest/gnunet-rest-server.c:656
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3168
+#: src/gns/gnunet-gns-proxy.c:3169
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3197
+#: src/gns/gnunet-gns-proxy.c:3198
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3279
+#: src/gns/gnunet-gns-proxy.c:3280
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3569
+#: src/gns/gnunet-gns-proxy.c:3570
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3697
+#: src/gns/gnunet-gns-proxy.c:3698
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3702
+#: src/gns/gnunet-gns-proxy.c:3703
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3706
+#: src/gns/gnunet-gns-proxy.c:3707
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3732
+#: src/gns/gnunet-gns-proxy.c:3733
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4274,10 +4238,6 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_rest_gns.c:382
-msgid "Ego for not found, cannot perform lookup.\n"
-msgstr ""
-
 #: src/gnsrecord/plugin_gnsrecord_dns.c:357
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
@@ -4742,121 +4702,53 @@ msgstr ""
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:388
+#: src/identity/gnunet-service-identity.c:389
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:410
+#: src/identity/gnunet-service-identity.c:414
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:499
-#: src/identity/gnunet-service-identity.c:771
-#: src/identity/gnunet-service-identity.c:893
+#: src/identity/gnunet-service-identity.c:505
+#: src/identity/gnunet-service-identity.c:788
+#: src/identity/gnunet-service-identity.c:916
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:506
+#: src/identity/gnunet-service-identity.c:513
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:599
+#: src/identity/gnunet-service-identity.c:608
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:748
+#: src/identity/gnunet-service-identity.c:763
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:787
-#: src/identity/gnunet-service-identity.c:910
+#: src/identity/gnunet-service-identity.c:806
+#: src/identity/gnunet-service-identity.c:934
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:944
+#: src/identity/gnunet-service-identity.c:969
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:1002
+#: src/identity/gnunet-service-identity.c:1027
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:1012
+#: src/identity/gnunet-service-identity.c:1037
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/plugin_rest_identity.c:966
-msgid "Identity REST API initialized\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:422
-#, fuzzy
-msgid "Ego is required\n"
-msgstr "%s:选项“%s”有歧义\n"
-
-#: src/identity-provider/gnunet-idp.c:430
-msgid "Attribute value missing!\n"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:438
-#, fuzzy
-msgid "Requesting party key is required!\n"
-msgstr "设置要使用的昵称(必须)"
-
-#: src/identity-provider/gnunet-idp.c:461
-msgid "Add attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:467
-msgid "Attribute value"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:472
-msgid "Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:477
-msgid "Audience (relying party)"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:481
-msgid "List attributes for Ego"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:486
-msgid "Issue a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:491
-msgid "Consume a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:496
-msgid "Revoke a ticket"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:501
-msgid "Type of attribute"
-msgstr ""
-
-#: src/identity-provider/gnunet-idp.c:506
-msgid "Expiration interval of the attribute"
-msgstr ""
-
-#: src/identity-provider/identity_provider_api.c:434
-#, fuzzy
-msgid "failed to store record\n"
-msgstr "运行 %s失败:%s %d\n"
-
-#: src/identity-provider/plugin_rest_identity_provider.c:1228
-#: src/identity-provider/plugin_rest_openid_connect.c:2145
-msgid "Identity Provider REST API initialized\n"
-msgstr ""
-
 #: src/json/json.c:121
 #, fuzzy, c-format
 msgid "Failed to parse JSON in option `%s': %s (%s)\n"
@@ -4906,7 +4798,7 @@ msgstr "“%s”的参数无效。\n"
 msgid "You must specify a name\n"
 msgstr "您必须指定一个接收方!\n"
 
-#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1289
+#: src/namecache/gnunet-namecache.c:230 src/namestore/gnunet-namestore.c:1290
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4914,7 +4806,7 @@ msgstr ""
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1341
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1342
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
@@ -4930,8 +4822,8 @@ msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
 
 #: src/namecache/plugin_namecache_flat.c:119
 #: src/namecache/plugin_namecache_flat.c:253
-#: src/namestore/plugin_namestore_flat.c:148
-#: src/namestore/plugin_namestore_flat.c:383
+#: src/namestore/plugin_namestore_heap.c:146
+#: src/namestore/plugin_namestore_heap.c:393
 #: src/peerstore/plugin_peerstore_flat.c:377
 #: src/peerstore/plugin_peerstore_flat.c:536
 #, fuzzy, c-format
@@ -4939,14 +4831,14 @@ msgid "Unable to initialize file: %s.\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
 #: src/namecache/plugin_namecache_flat.c:130
-#: src/namestore/plugin_namestore_flat.c:159
+#: src/namestore/plugin_namestore_heap.c:157
 #: src/peerstore/plugin_peerstore_flat.c:392
 #, 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:172
+#: src/namestore/plugin_namestore_heap.c:170
 #: src/peerstore/plugin_peerstore_flat.c:404
 #, fuzzy, c-format
 msgid "Unable to read file: %s.\n"
@@ -4963,13 +4855,11 @@ msgid "Adding record failed: %s\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:341
-#: src/namestore/plugin_rest_namestore.c:570
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:348
-#: src/namestore/plugin_rest_namestore.c:579
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
@@ -4990,217 +4880,211 @@ msgid ""
 "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:808
-#: src/namestore/plugin_rest_namestore.c:605
+#: src/namestore/gnunet-namestore.c:809
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:849
+#: src/namestore/gnunet-namestore.c:850
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:901
+#: src/namestore/gnunet-namestore.c:902
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:920 src/namestore/gnunet-namestore.c:929
-#: src/namestore/gnunet-namestore.c:948 src/namestore/gnunet-namestore.c:971
-#: src/namestore/gnunet-namestore.c:1025
+#: src/namestore/gnunet-namestore.c:921 src/namestore/gnunet-namestore.c:930
+#: src/namestore/gnunet-namestore.c:949 src/namestore/gnunet-namestore.c:972
+#: src/namestore/gnunet-namestore.c:1026
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore.c:921 src/namestore/gnunet-namestore.c:930
-#: src/namestore/gnunet-namestore.c:949 src/namestore/gnunet-namestore.c:973
+#: src/namestore/gnunet-namestore.c:922 src/namestore/gnunet-namestore.c:931
+#: src/namestore/gnunet-namestore.c:950 src/namestore/gnunet-namestore.c:974
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:939
-#: src/namestore/plugin_rest_namestore.c:682
+#: src/namestore/gnunet-namestore.c:940
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:961
-#: src/namestore/plugin_rest_namestore.c:702
-#: src/namestore/plugin_rest_namestore.c:744
+#: src/namestore/gnunet-namestore.c:962
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1006
+#: src/namestore/gnunet-namestore.c:1007
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:1026
+#: src/namestore/gnunet-namestore.c:1027
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1069
+#: src/namestore/gnunet-namestore.c:1070
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/namestore/gnunet-namestore.c:1098
+#: src/namestore/gnunet-namestore.c:1099
 #: src/peerinfo-tool/gnunet-peerinfo.c:773
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:1133
+#: src/namestore/gnunet-namestore.c:1134
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:1173
-#: src/namestore/plugin_rest_namestore.c:1063
+#: src/namestore/gnunet-namestore.c:1174
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1237
-#: src/namestore/plugin_rest_namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1238
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/namestore/gnunet-namestore.c:1262
+#: src/namestore/gnunet-namestore.c:1263
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1266
+#: src/namestore/gnunet-namestore.c:1267
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1270
+#: src/namestore/gnunet-namestore.c:1271
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1275
+#: src/namestore/gnunet-namestore.c:1276
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1280
+#: src/namestore/gnunet-namestore.c:1281
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/namestore/gnunet-namestore.c:1284
+#: src/namestore/gnunet-namestore.c:1285
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:1294
+#: src/namestore/gnunet-namestore.c:1295
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/namestore/gnunet-namestore.c:1299
+#: src/namestore/gnunet-namestore.c:1300
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1304
+#: src/namestore/gnunet-namestore.c:1305
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1309
+#: src/namestore/gnunet-namestore.c:1310
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1313
+#: src/namestore/gnunet-namestore.c:1314
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1317
+#: src/namestore/gnunet-namestore.c:1318
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1322
+#: src/namestore/gnunet-namestore.c:1323
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:538
+#: src/namestore/gnunet-namestore-fcfsd.c:547
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:565
+#: src/namestore/gnunet-namestore-fcfsd.c:574
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:585
+#: src/namestore/gnunet-namestore-fcfsd.c:595
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:616
+#: src/namestore/gnunet-namestore-fcfsd.c:627
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:696
+#: src/namestore/gnunet-namestore-fcfsd.c:687
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:754
+#: src/namestore/gnunet-namestore-fcfsd.c:775
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:772
+#: src/namestore/gnunet-namestore-fcfsd.c:794
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:808
+#: src/namestore/gnunet-namestore-fcfsd.c:830
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:817
+#: src/namestore/gnunet-namestore-fcfsd.c:839
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1045
+#: src/namestore/gnunet-namestore-fcfsd.c:1069
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1073
+#: src/namestore/gnunet-namestore-fcfsd.c:1097
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1121
+#: src/namestore/gnunet-namestore-fcfsd.c:1145
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1147
+#: src/namestore/gnunet-namestore-fcfsd.c:1171
 msgid "name of the zone that is to be managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1166
+#: src/namestore/gnunet-namestore-fcfsd.c:1190
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:748
+#: src/namestore/gnunet-service-namestore.c:749
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/gnunet-zoneimport.c:2033
+#: src/namestore/gnunet-zoneimport.c:2036
 msgid "size to use for the main hash map"
 msgstr ""
 
-#: src/namestore/gnunet-zoneimport.c:2038
+#: src/namestore/gnunet-zoneimport.c:2041
 msgid "minimum expiration time we assume for imported records"
 msgstr ""
 
@@ -5208,9 +5092,9 @@ msgstr ""
 msgid "Namestore failed to store record\n"
 msgstr ""
 
-#: src/namestore/plugin_namestore_flat.c:765
+#: src/namestore/plugin_namestore_heap.c:776
 #, fuzzy
-msgid "flat file database running\n"
+msgid "heap file database running\n"
 msgstr "sqlite 数据仓库"
 
 #: src/namestore/plugin_namestore_sqlite.c:216
@@ -5219,10 +5103,6 @@ msgstr "sqlite 数据仓库"
 msgid "Failed to setup database at `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/namestore/plugin_rest_namestore.c:1204
-msgid "Namestore REST API initialized\n"
-msgstr ""
-
 #: src/nat-auto/gnunet-nat-auto.c:191
 #, fuzzy
 msgid "Suggested configuration changes:\n"
@@ -5602,6 +5482,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:297
+#: src/rest-plugins/plugin_rest_peerinfo.c:499
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -5897,6 +5778,66 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
+#: src/reclaim/gnunet-reclaim.c:465
+#, fuzzy, c-format
+msgid "Ego is required\n"
+msgstr "%s:选项“%s”有歧义\n"
+
+#: src/reclaim/gnunet-reclaim.c:473
+#, c-format
+msgid "Attribute value missing!\n"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:481
+#, fuzzy, c-format
+msgid "Requesting party key is required!\n"
+msgstr "设置要使用的昵称(必须)"
+
+#: src/reclaim/gnunet-reclaim.c:504
+msgid "Add attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:510
+msgid "Attribute value"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:515
+msgid "Ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:520
+msgid "Audience (relying party)"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:524
+msgid "List attributes for Ego"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:529
+msgid "Issue a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:534
+msgid "Consume a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:539
+msgid "Revoke a ticket"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:544
+msgid "Type of attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:549
+msgid "Expiration interval of the attribute"
+msgstr ""
+
+#: src/reclaim/reclaim_api.c:434
+#, fuzzy
+msgid "failed to store record\n"
+msgstr "运行 %s失败:%s %d\n"
+
 #: src/regex/gnunet-daemon-regexprofiler.c:265
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
@@ -5994,6 +5935,35 @@ msgstr ""
 msgid "GNUnet REST server"
 msgstr "GNUnet 错误日志"
 
+#: src/rest-plugins/plugin_rest_copying.c:207
+msgid "COPYING REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_credential.c:1126
+msgid "GNS REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_gns.c:450
+msgid "Gns REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_identity.c:1295
+msgid "Identity REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_namestore.c:1077
+msgid "Namestore REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_openid_connect.c:2135
+#: src/rest-plugins/plugin_rest_reclaim.c:1079
+msgid "Identity Provider REST API initialized\n"
+msgstr ""
+
+#: src/rest-plugins/plugin_rest_peerinfo.c:794
+msgid "Peerinfo REST API initialized\n"
+msgstr ""
+
 #: src/revocation/gnunet-revocation.c:127
 #, c-format
 msgid "Key `%s' is valid\n"
@@ -6130,15 +6100,32 @@ msgstr ""
 msgid "Could not open revocation database file!"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/rps/gnunet-rps.c:201
+#: src/rps/gnunet-rps.c:258
 msgid "Seed a PeerID"
 msgstr ""
 
-#: src/rps/gnunet-rps.c:205
+#: src/rps/gnunet-rps.c:262
 msgid "Get updates of view (0 for infinite updates)"
 msgstr ""
 
-#: src/rps/gnunet-rps-profiler.c:2705
+#: src/rps/gnunet-rps.c:266
+msgid "Get peers from biased stream"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2770
+msgid "duration of the profiling"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2776
+msgid "timeout for the profiling"
+msgstr ""
+
+#: src/rps/gnunet-rps-profiler.c:2782
+#, fuzzy
+msgid "number of PeerIDs to request"
+msgstr "迭代次数"
+
+#: src/rps/gnunet-rps-profiler.c:2797
 #, fuzzy
 msgid "Measure quality and performance of the RPS service."
 msgstr "无法访问该服务"
@@ -6226,7 +6213,7 @@ msgstr ""
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1987
+#: src/set/gnunet-service-set.c:2004
 #, fuzzy
 msgid "Could not connect to CADET service\n"
 msgstr "无法连接到 %s:%u:%s\n"
@@ -6423,93 +6410,93 @@ msgstr ""
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:271
-#: src/statistics/gnunet-statistics.c:365
+#: src/statistics/gnunet-statistics.c:407
+#: src/statistics/gnunet-statistics.c:448
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:274
-#: src/statistics/gnunet-statistics.c:368
+#: src/statistics/gnunet-statistics.c:410
+#: src/statistics/gnunet-statistics.c:451
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:502
+#: src/statistics/gnunet-statistics.c:526
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:510
+#: src/statistics/gnunet-statistics.c:534
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:553
+#: src/statistics/gnunet-statistics.c:577
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:568
+#: src/statistics/gnunet-statistics.c:592
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:703
+#: src/statistics/gnunet-statistics.c:727
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/statistics/gnunet-statistics.c:721
+#: src/statistics/gnunet-statistics.c:745
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/statistics/gnunet-statistics.c:729
+#: src/statistics/gnunet-statistics.c:753
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:760
+#: src/statistics/gnunet-statistics.c:784
 #, c-format
 msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:793
+#: src/statistics/gnunet-statistics.c:817
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:798
+#: src/statistics/gnunet-statistics.c:822
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:804
+#: src/statistics/gnunet-statistics.c:828
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:810
+#: src/statistics/gnunet-statistics.c:834
 msgid "use as csv separator"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:816
+#: src/statistics/gnunet-statistics.c:840
 msgid "path to the folder containing the testbed data"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:821
+#: src/statistics/gnunet-statistics.c:845
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:826
+#: src/statistics/gnunet-statistics.c:850
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:832
+#: src/statistics/gnunet-statistics.c:856
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:838
+#: src/statistics/gnunet-statistics.c:862
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:855
+#: src/statistics/gnunet-statistics.c:879
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
@@ -8109,7 +8096,7 @@ msgstr ""
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1311 src/util/disk.c:1515
+#: src/transport/tcp_service_legacy.c:1311 src/util/disk.c:1521
 #: src/util/service.c:1376
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
@@ -8146,11 +8133,6 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Could not access configuration file `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/tun/regex.c:132
-#, c-format
-msgid "Bad mask: %d\n"
-msgstr ""
-
 #: src/util/bio.c:179 src/util/bio.c:187
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
@@ -8180,58 +8162,67 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:912
+#: src/util/client.c:732
+msgid "not a valid filename"
+msgstr ""
+
+#: src/util/client.c:923
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:257 src/util/common_logging.c:1144
+#: src/util/common_logging.c:257 src/util/common_logging.c:1159
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1142
+#: src/util/common_logging.c:259 src/util/common_logging.c:1157
 msgid "INFO"
 msgstr "信息"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1140
+#: src/util/common_logging.c:261 src/util/common_logging.c:1155
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1138
+#: src/util/common_logging.c:263 src/util/common_logging.c:1153
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1136
+#: src/util/common_logging.c:265 src/util/common_logging.c:1151
 msgid "ERROR"
 msgstr "错误"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1146
+#: src/util/common_logging.c:267 src/util/common_logging.c:1161
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:880
+#: src/util/common_logging.c:631 src/util/common_logging.c:661
+#, c-format
+msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
+msgstr ""
+
+#: src/util/common_logging.c:895
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次,在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:1147
+#: src/util/common_logging.c:1162
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1440
+#: src/util/common_logging.c:1455
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1482
+#: src/util/common_logging.c:1497
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1500
+#: src/util/common_logging.c:1515
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/util/common_logging.c:1521
+#: src/util/common_logging.c:1536
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8247,24 +8238,29 @@ msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 msgid "Error while reading file `%s'\n"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/util/configuration.c:1049
+#: src/util/configuration.c:970
+#, fuzzy
+msgid "Not a valid relative time specification"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/util/configuration.c:1059
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1168
+#: src/util/configuration.c:1178
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1201
+#: src/util/configuration.c:1211
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/util/configuration.c:1269
+#: src/util/configuration.c:1279
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8278,22 +8274,22 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:831
+#: src/util/crypto_ecc.c:860
 #, 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:881
+#: src/util/crypto_ecc.c:915
 #, 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:955
+#: src/util/crypto_ecc.c:994
 #, 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:1012
+#: src/util/crypto_ecc.c:1055
 #, fuzzy, c-format
 msgid "EdDSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
@@ -8328,26 +8324,56 @@ msgstr ""
 msgid "Could not load peer's private key\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/crypto_random.c:282
+#: src/util/crypto_random.c:304
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/util/crypto_rsa.c:836
+#: src/util/crypto_rsa.c:848
 #, 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:1167
+#: src/util/crypto_rsa.c:1187
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/disk.c:1245
+#: src/util/disk.c:1251
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录!\n"
 
+#: src/util/dnsparser.c:250
+#, fuzzy, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/util/dnsparser.c:940
+#, fuzzy, c-format
+msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/util/dnsstub.c:229
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "找不到主机“%s”的 IP:%s\n"
+
+#: src/util/dnsstub.c:360
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
+
+#: src/util/dnsstub.c:507
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s: %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/util/dnsstub.c:513
+#, fuzzy, c-format
+msgid "Sent DNS request to %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
 #: src/util/getopt.c:568
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
@@ -8444,8 +8470,8 @@ msgstr ""
 msgid "use configuration file FILENAME"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/getopt_helpers.c:559 src/util/getopt_helpers.c:756
-#: src/util/getopt_helpers.c:823
+#: src/util/getopt_helpers.c:559 src/util/getopt_helpers.c:763
+#: src/util/getopt_helpers.c:830
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
@@ -8460,62 +8486,67 @@ msgstr "您必须向“%s”选项传递一个数字。\n"
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:830
+#: src/util/getopt_helpers.c:754
+#, c-format
+msgid "Your input for the '%s' option has to be a non negative number \n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:837
 #, fuzzy, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:916
+#: src/util/getopt_helpers.c:923
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:148
+#: src/util/gnunet-config.c:157
 #, fuzzy, c-format
 msgid "failed to load configuration defaults"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/gnunet-config.c:161
+#: src/util/gnunet-config.c:170
 #, fuzzy, c-format
 msgid "--section argument is required\n"
 msgstr "设置要使用的昵称(必须)"
 
-#: src/util/gnunet-config.c:164
+#: src/util/gnunet-config.c:173
 #, c-format
 msgid "The following sections are available:\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:215
+#: src/util/gnunet-config.c:224
 #, c-format
 msgid "--option argument required to set value\n"
 msgstr ""
 
-#: src/util/gnunet-config.c:254
+#: src/util/gnunet-config.c:263
 msgid "obtain option of value as a filename (with $-expansion)"
 msgstr ""
 
-#: src/util/gnunet-config.c:259
+#: src/util/gnunet-config.c:268
 msgid "name of the section to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:264
+#: src/util/gnunet-config.c:273
 msgid "name of the option to access"
 msgstr ""
 
-#: src/util/gnunet-config.c:269
+#: src/util/gnunet-config.c:278
 msgid "value to set"
 msgstr ""
 
-#: src/util/gnunet-config.c:273
+#: src/util/gnunet-config.c:282
 #, fuzzy
 msgid "print available configuration sections"
 msgstr "立即保存配置?"
 
-#: src/util/gnunet-config.c:277
+#: src/util/gnunet-config.c:286
 msgid "write configuration file that only contains delta to defaults"
 msgstr ""
 
-#: src/util/gnunet-config.c:290
+#: src/util/gnunet-config.c:299
 #, fuzzy
 msgid "Manipulate GNUnet configuration files"
 msgstr "更改配置文件中的一个值"
@@ -8642,16 +8673,9 @@ msgstr ""
 msgid "Manipulate GNUnet proof of work files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-service-resolver.c:369
-#, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
-msgstr "无法解析“%s”(%s):%s\n"
-
-#: src/util/gnunet-service-resolver.c:458
-#: src/util/gnunet-service-resolver.c:510
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
-msgstr "找不到主机“%s”的 IP:%s\n"
+#: src/util/gnunet-service-resolver.c:1443
+msgid "No DNS server available. DNS resolution will not be possible.\n"
+msgstr ""
 
 #: src/util/gnunet-uri.c:83
 #, c-format
@@ -8750,35 +8774,40 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/resolver_api.c:201
+#: src/util/regex.c:132
+#, c-format
+msgid "Bad mask: %d\n"
+msgstr ""
+
+#: src/util/resolver_api.c:216
 #, c-format
 msgid ""
 "Missing `%s' for `%s' in configuration, DNS resolution will be unavailable.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:222
+#: src/util/resolver_api.c:237
 #, 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:849
+#: src/util/resolver_api.c:873
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:862
+#: src/util/resolver_api.c:886
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/util/resolver_api.c:1046
+#: src/util/resolver_api.c:1071
 msgid "Resolver not configured correctly.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:1132 src/util/resolver_api.c:1155
-#: src/util/resolver_api.c:1169
+#: src/util/resolver_api.c:1158 src/util/resolver_api.c:1181
+#: src/util/resolver_api.c:1195
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
@@ -8814,114 +8843,114 @@ msgstr ""
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:469
+#: src/util/strings.c:471
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:596
+#: src/util/strings.c:598
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败:没有设置环境变量“HOME”"
 
-#: src/util/strings.c:700
+#: src/util/strings.c:702
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:704
+#: src/util/strings.c:706
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:706
+#: src/util/strings.c:708
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:712
+#: src/util/strings.c:714
 msgid "ms"
 msgstr "毫秒"
 
-#: src/util/strings.c:718
+#: src/util/strings.c:720
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:724
+#: src/util/strings.c:726
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:730
+#: src/util/strings.c:732
 msgid "h"
 msgstr "时"
 
-#: src/util/strings.c:737
+#: src/util/strings.c:739
 #, fuzzy
 msgid "day"
 msgstr " 天"
 
-#: src/util/strings.c:739
+#: src/util/strings.c:741
 #, fuzzy
 msgid "days"
 msgstr " 天"
 
-#: src/util/strings.c:768
+#: src/util/strings.c:770
 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"
@@ -9102,22 +9131,33 @@ msgstr ""
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/include/gnunet_common.h:764 src/include/gnunet_common.h:771
-#: src/include/gnunet_common.h:781 src/include/gnunet_common.h:789
+#: src/include/gnunet_common.h:770 src/include/gnunet_common.h:777
+#: src/include/gnunet_common.h:787
+#, fuzzy, c-format
+msgid "Assertion failed at %s:%d. Aborting.\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
+
+#: src/include/gnunet_common.h:795
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:801
+#: src/include/gnunet_common.h:807
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:828 src/include/gnunet_common.h:837
+#: src/include/gnunet_common.h:834 src/include/gnunet_common.h:843
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
+#~ msgid "Could not resolve `%s' (%s): %s\n"
+#~ msgstr "无法解析“%s”(%s):%s\n"
+
+#~ msgid "Could not find IP of host `%s': %s\n"
+#~ msgstr "找不到主机“%s”的 IP:%s\n"
+
 #, fuzzy
 #~ msgid "Could not connect to %s service!\n"
 #~ msgstr "无法连接到 %s:%u:%s\n"
@@ -9741,10 +9781,6 @@ msgstr ""
 #~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #, fuzzy
-#~ msgid "No valid expiration time for operation `%s'\n"
-#~ msgstr "配置文件“%s”已写入。\n"
-
-#, fuzzy
 #~ msgid "Failed to find record to remove\n"
 #~ msgstr "无法连接到 %s:%u:%s\n"
 
diff --git a/src/namestore/plugin_namestore_sqlite.c 
b/src/namestore/plugin_namestore_sqlite.c
index d9bc5b212..2ffc12f92 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -162,7 +162,7 @@ database_setup (struct Plugin *plugin)
                             " ORDER BY uid ASC"
                             " LIMIT ?",
                             &plugin->iterate_all_zones),
-    GNUNET_SQ_make_prepare ("SELECT 
uid,record_count,record_data,label,zone_private_key"
+    GNUNET_SQ_make_prepare ("SELECT uid,record_count,record_data,label"
                             " FROM ns098records"
                             " WHERE zone_private_key=? AND label=?",
                             &plugin->lookup_label),

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



reply via email to

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