gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] [gnunet] branch master updated: RECLAIM: Fix shutdown; test


From: gnunet
Subject: [GNUnet-SVN] [gnunet] branch master updated: RECLAIM: Fix shutdown; tests
Date: Wed, 08 May 2019 16:01:51 +0200

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

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

The following commit(s) were added to refs/heads/master by this push:
     new e4895ec7c RECLAIM: Fix shutdown; tests
e4895ec7c is described below

commit e4895ec7c1a1808a13195c346a828c271ca86c78
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Wed May 8 16:01:21 2019 +0200

    RECLAIM: Fix shutdown; tests
---
 po/de.po                                     | 489 ++++++++++++++-------------
 po/es.po                                     | 489 ++++++++++++++-------------
 po/fr.po                                     | 489 ++++++++++++++-------------
 po/it.po                                     | 489 ++++++++++++++-------------
 po/sv.po                                     | 489 ++++++++++++++-------------
 po/vi.po                                     | 489 ++++++++++++++-------------
 po/zh_CN.po                                  | 489 ++++++++++++++-------------
 src/reclaim/Makefile.am                      |   4 +-
 src/reclaim/gnunet-service-reclaim.c         | 259 +++++++-------
 src/reclaim/gnunet-service-reclaim_tickets.c |  38 ++-
 src/reclaim/reclaim.conf                     |   2 +-
 src/reclaim/test_reclaim.conf                |   1 +
 src/reclaim/test_reclaim_revoke.sh           |  20 +-
 13 files changed, 1914 insertions(+), 1833 deletions(-)

diff --git a/po/de.po b/po/de.po
index 7a1b4dc6e..9a25c2c7a 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: 2019-04-30 07:47+0000\n"
+"POT-Creation-Date: 2019-05-08 11:34+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"
@@ -21,86 +21,86 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.7.4\n"
 
-#: src/arm/gnunet-arm.c:156
+#: src/arm/gnunet-arm.c:157
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:163
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
+#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
+#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1141
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
+#: src/arm/gnunet-arm.c:227 src/testbed/gnunet-service-testbed_peers.c:1143
 msgid "Unknown request status"
 msgstr "Unbekannter Anfragestatus"
 
-#: src/arm/gnunet-arm.c:242
+#: src/arm/gnunet-arm.c:243
 #, fuzzy
 msgid "is stopped"
 msgstr "%s wurde gestoppt"
 
-#: src/arm/gnunet-arm.c:244
+#: src/arm/gnunet-arm.c:245
 #, fuzzy
 msgid "is starting"
 msgstr "%s startet"
 
-#: src/arm/gnunet-arm.c:246
+#: src/arm/gnunet-arm.c:247
 #, fuzzy
 msgid "is stopping"
 msgstr "%s wird gestoppt"
 
-#: src/arm/gnunet-arm.c:248
+#: src/arm/gnunet-arm.c:249
 #, fuzzy
 msgid "is starting already"
 msgstr "%s ist bereits gestartet"
 
-#: src/arm/gnunet-arm.c:250
+#: src/arm/gnunet-arm.c:251
 #, fuzzy
 msgid "is stopping already"
 msgstr "%s wird bereits gestoppt"
 
-#: src/arm/gnunet-arm.c:252
+#: src/arm/gnunet-arm.c:253
 #, fuzzy
 msgid "is started already"
 msgstr "%s ist bereits gestartet"
 
-#: src/arm/gnunet-arm.c:254
+#: src/arm/gnunet-arm.c:255
 #, fuzzy
 msgid "is stopped already"
 msgstr "%s ist bereits gestoppt"
 
-#: src/arm/gnunet-arm.c:256
+#: src/arm/gnunet-arm.c:257
 msgid "service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:258
+#: src/arm/gnunet-arm.c:259
 #, fuzzy
 msgid "service failed to start"
 msgstr "%s-Dienst konnte nicht gestartet werden"
 
-#: src/arm/gnunet-arm.c:260
+#: src/arm/gnunet-arm.c:261
 msgid "service cannot be manipulated because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:262
+#: src/arm/gnunet-arm.c:263
 #, fuzzy
 msgid "Unknown result code."
 msgstr "Unbekannter Anfragestatus"
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:294
 msgid "Fatal error initializing ARM API.\n"
 msgstr "Schwerwiegender Fehler bei der Initialisierung der ARM-API.\n"
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:323 src/arm/gnunet-arm.c:332
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "ARM-Dienst konnte nicht gestartet werden: %s\n"
@@ -115,113 +115,113 @@ msgstr "Fehler beim Senden einer `%s' Anfrage an den 
SMTP Server.\n"
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/arm/gnunet-arm.c:419
+#: src/arm/gnunet-arm.c:417
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
 
-#: src/arm/gnunet-arm.c:429
+#: src/arm/gnunet-arm.c:427
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/arm/gnunet-arm.c:467
+#: src/arm/gnunet-arm.c:466
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
 
-#: src/arm/gnunet-arm.c:478
+#: src/arm/gnunet-arm.c:477
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/arm/gnunet-arm.c:519
+#: src/arm/gnunet-arm.c:517
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/arm/gnunet-arm.c:528
+#: src/arm/gnunet-arm.c:527
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Fehler bei der Kommunikation mit ARM. Läuft ARM nicht?\n"
 
-#: src/arm/gnunet-arm.c:534
+#: src/arm/gnunet-arm.c:533
 msgid "Running services:\n"
 msgstr "Laufende Dienste:\n"
 
-#: src/arm/gnunet-arm.c:623
+#: src/arm/gnunet-arm.c:615
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:649
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "%s wurde gestoppt.\n"
 
-#: src/arm/gnunet-arm.c:659
+#: src/arm/gnunet-arm.c:652
 #, c-format
 msgid "Starting %s...\n"
 msgstr "%s wird gestartet …\n"
 
-#: src/arm/gnunet-arm.c:662
+#: src/arm/gnunet-arm.c:655
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "%s wird gestoppt …\n"
 
-#: src/arm/gnunet-arm.c:676
+#: src/arm/gnunet-arm.c:667
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/arm/gnunet-arm.c:766
+#: src/arm/gnunet-arm.c:744
 msgid "stop all GNUnet services"
 msgstr "Alle GNUnet-Dienste stoppen"
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:749
 msgid "start a particular service"
 msgstr "Einen bestimmten Dienst starten"
 
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:754
 msgid "stop a particular service"
 msgstr "Einen bestimmten Dienst stoppen"
 
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:759
 msgid "start all GNUnet default services"
 msgstr "Alle Standard-GNUnet-Dienste starten"
 
-#: src/arm/gnunet-arm.c:784
+#: src/arm/gnunet-arm.c:764
 msgid "stop and start all GNUnet default services"
 msgstr "Alle Standard-GNUnet-Dienste stoppen und starten"
 
-#: src/arm/gnunet-arm.c:788
+#: src/arm/gnunet-arm.c:769
 msgid "delete config file and directory on exit"
 msgstr "Konfigurationsdatei und Verzeichnis beim Beenden löschen"
 
-#: src/arm/gnunet-arm.c:792
+#: src/arm/gnunet-arm.c:773
 msgid "monitor ARM activities"
 msgstr "ARM-Aktivitäten überwachen"
 
-#: src/arm/gnunet-arm.c:796
+#: src/arm/gnunet-arm.c:777
 msgid "don't print status messages"
 msgstr "Keine Statusmeldungen ausgeben"
 
-#: src/arm/gnunet-arm.c:801
+#: src/arm/gnunet-arm.c:784
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:805
+#: src/arm/gnunet-arm.c:789
 msgid "list currently running services"
 msgstr "Alle derzeit laufenden Dienste auflisten"
 
-#: src/arm/gnunet-arm.c:809
+#: src/arm/gnunet-arm.c:794
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:813
+#: src/arm/gnunet-arm.c:799
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:828
+#: src/arm/gnunet-arm.c:811
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -1250,34 +1250,34 @@ msgstr ""
 msgid "Print information about connected peers."
 msgstr "Informationen über verbundene Knoten ausgeben."
 
-#: src/core/gnunet-service-core.c:347
+#: src/core/gnunet-service-core.c:329
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core.c:371
+#: src/core/gnunet-service-core.c:355
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:443
+#: src/core/gnunet-service-core.c:420
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core.c:541
+#: src/core/gnunet-service-core.c:508
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:879
+#: src/core/gnunet-service-core.c:828
 #, fuzzy, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core.c:988
+#: src/core/gnunet-service-core.c:929
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1009
+#: src/core/gnunet-service-core.c:948
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Dienst »%s« wird neu gestartet.\n"
@@ -1433,40 +1433,40 @@ msgstr "# Bytes verworfen von TCP (ausgehend)"
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_sessions.c:260
-#: src/core/gnunet-service-core_sessions.c:350
+#: src/core/gnunet-service-core_sessions.c:254
+#: src/core/gnunet-service-core_sessions.c:339
 #: src/dht/gnunet-service-dht_neighbours.c:740
 #: src/dht/gnunet-service-dht_neighbours.c:803
 #: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1521
-#: src/topology/gnunet-daemon-topology.c:615
-#: src/topology/gnunet-daemon-topology.c:717
+#: src/topology/gnunet-daemon-topology.c:581
+#: src/topology/gnunet-daemon-topology.c:673
 #: src/transport/gnunet-service-transport_neighbours.c:720
 #: src/transport/gnunet-service-transport_neighbours.c:728
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
 
-#: src/core/gnunet-service-core_sessions.c:296
+#: src/core/gnunet-service-core_sessions.c:287
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/core/gnunet-service-core_sessions.c:416
+#: src/core/gnunet-service-core_sessions.c:402
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_sessions.c:433
+#: src/core/gnunet-service-core_sessions.c:420
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:181
+#: src/core/gnunet-service-core_typemap.c:170
+#: src/core/gnunet-service-core_typemap.c:183
 #, fuzzy
 msgid "# type maps received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_typemap.c:212
+#: src/core/gnunet-service-core_typemap.c:216
 msgid "# updates to my type map"
 msgstr ""
 
@@ -1475,7 +1475,7 @@ msgstr ""
 msgid "Unable to parse CRED record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:1005
+#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:991
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
@@ -1583,7 +1583,7 @@ msgstr "Es konnte keine Verbindung mit gnunetd 
hergestellt werden.\n"
 
 #: src/credential/gnunet-service-credential.c:1071
 #: src/namestore/gnunet-namestore-fcfsd.c:1138
-#: src/namestore/gnunet-namestore.c:1030
+#: src/namestore/gnunet-namestore.c:1015
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -3657,7 +3657,7 @@ msgid "FS service is lacking HOSTKEY configuration 
setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
 #: src/fs/gnunet-service-fs.c:1305 src/hostlist/gnunet-daemon-hostlist.c:353
-#: src/topology/gnunet-daemon-topology.c:1197
+#: src/topology/gnunet-daemon-topology.c:1100
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
@@ -4095,141 +4095,146 @@ msgstr "Es konnte keine Verbindung mit gnunetd 
hergestellt werden.\n"
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:118
-#: src/hostlist/gnunet-daemon-hostlist_client.c:535
-#: src/hostlist/gnunet-daemon-hostlist_client.c:753
-#: src/hostlist/gnunet-daemon-hostlist_client.c:759
-#: src/hostlist/gnunet-daemon-hostlist_client.c:811
-#: src/hostlist/gnunet-daemon-hostlist_client.c:820
-#: src/hostlist/gnunet-daemon-hostlist_client.c:931
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/transport/plugin_transport_http_client.c:598
-#: src/transport/plugin_transport_http_client.c:616
+#: src/gns/gnunet-gns-proxy.c:115
+#: src/hostlist/gnunet-daemon-hostlist_client.c:532
+#: src/hostlist/gnunet-daemon-hostlist_client.c:750
+#: src/hostlist/gnunet-daemon-hostlist_client.c:756
+#: src/hostlist/gnunet-daemon-hostlist_client.c:808
+#: src/hostlist/gnunet-daemon-hostlist_client.c:817
+#: src/hostlist/gnunet-daemon-hostlist_client.c:928
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1023
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1028
+#: src/transport/plugin_transport_http_client.c:595
+#: src/transport/plugin_transport_http_client.c:613
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "»%s« schlug fehl bei %s:%d mit dem Fehler: »%s«.\n"
 
-#: src/gns/gnunet-gns-proxy.c:989
+#: src/gns/gnunet-gns-proxy.c:986
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1014
+#: src/gns/gnunet-gns-proxy.c:1011
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:1035
+#: src/gns/gnunet-gns-proxy.c:1032
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1050
+#: src/gns/gnunet-gns-proxy.c:1047
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/gns/gnunet-gns-proxy.c:1065
+#: src/gns/gnunet-gns-proxy.c:1062
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1075
+#: src/gns/gnunet-gns-proxy.c:1072
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1099
+#: src/gns/gnunet-gns-proxy.c:1096
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1230
+#: src/gns/gnunet-gns-proxy.c:1227
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2131
+#: src/gns/gnunet-gns-proxy.c:2128
 #, 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:2652
+#: src/gns/gnunet-gns-proxy.c:2649
 #, 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:2684
+#: src/gns/gnunet-gns-proxy.c:2681
 #, 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:2885
+#: src/gns/gnunet-gns-proxy.c:2882
 #, 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:2907 src/rest/gnunet-rest-server.c:668
+#: src/gns/gnunet-gns-proxy.c:2904 src/rest/gnunet-rest-server.c:668
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3243
+#: src/gns/gnunet-gns-proxy.c:3240
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3272
+#: src/gns/gnunet-gns-proxy.c:3269
 #, 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:3355
+#: src/gns/gnunet-gns-proxy.c:3352
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3693
+#: src/gns/gnunet-gns-proxy.c:3690
 #, 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:3821
+#: src/gns/gnunet-gns-proxy.c:3818
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3826
+#: src/gns/gnunet-gns-proxy.c:3823
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3830
+#: src/gns/gnunet-gns-proxy.c:3827
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3856
+#: src/gns/gnunet-gns-proxy.c:3853
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199
+#: src/gns/gnunet-gns.c:178
+#, fuzzy, c-format
+msgid "`%s' is not a valid domain name\n"
+msgstr "»%s« ist keine gültige IP-Adresse.\n"
+
+#: src/gns/gnunet-gns.c:196
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:233
+#: src/gns/gnunet-gns.c:230
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:238
+#: src/gns/gnunet-gns.c:236
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:242
+#: src/gns/gnunet-gns.c:240
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:258
+#: src/gns/gnunet-gns.c:252
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet Netzwerk Topologie tracen."
@@ -4340,7 +4345,7 @@ 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:452
+#: src/gns/plugin_rest_gns.c:451
 #, fuzzy
 msgid "Gns REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -4512,201 +4517,201 @@ msgstr ""
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:349
+#: src/hostlist/gnunet-daemon-hostlist_client.c:346
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:370
-#: src/hostlist/gnunet-daemon-hostlist_client.c:403
+#: src/hostlist/gnunet-daemon-hostlist_client.c:367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:400
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:373
-#: src/hostlist/gnunet-daemon-hostlist_client.c:406
+#: src/hostlist/gnunet-daemon-hostlist_client.c:370
+#: src/hostlist/gnunet-daemon-hostlist_client.c:403
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:391
+#: src/hostlist/gnunet-daemon-hostlist_client.c:388
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:661
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
+#: src/hostlist/gnunet-daemon-hostlist_client.c:658
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:691
+#: src/hostlist/gnunet-daemon-hostlist_client.c:688
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:734
+#: src/hostlist/gnunet-daemon-hostlist_client.c:731
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:862
+#: src/hostlist/gnunet-daemon-hostlist_client.c:859
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:876
+#: src/hostlist/gnunet-daemon-hostlist_client.c:873
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:893
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:902
+#: src/hostlist/gnunet-daemon-hostlist_client.c:899
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:910
+#: src/hostlist/gnunet-daemon-hostlist_client.c:907
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:963
+#: src/hostlist/gnunet-daemon-hostlist_client.c:960
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:971
+#: src/hostlist/gnunet-daemon-hostlist_client.c:968
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1098
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1665
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1095
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1662
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1107
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1104
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1166
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1187
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1163
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1184
 #, fuzzy
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1350
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1355
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Fehler beim Löschen des Pseudonyms `%s' (existiert nicht?).\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1364
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "`%s' konnte nicht aufgelöst werden, um unsere IP-Adresse zu ermitteln: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1447
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "Datei `%s' konnte nicht zu `%s' umbenannt werden: Datei existiert bereits\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1454
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1478
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1495
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1490
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1595
-#: src/transport/plugin_transport_http_client.c:2274
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1592
+#: src/transport/plugin_transport_http_client.c:2271
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1624
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1621
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1638
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1651
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1648
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:176
+#: src/hostlist/gnunet-daemon-hostlist_server.c:172
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# bytes in der Datenbank"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:201
+#: src/hostlist/gnunet-daemon-hostlist_server.c:198
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:237
-#: src/hostlist/gnunet-daemon-hostlist_server.c:531
+#: src/hostlist/gnunet-daemon-hostlist_server.c:235
+#: src/hostlist/gnunet-daemon-hostlist_server.c:526
 #: src/peerinfo-tool/gnunet-peerinfo.c:385
 #: src/peerinfo-tool/gnunet-peerinfo.c:534
-#: src/topology/gnunet-daemon-topology.c:859
+#: src/topology/gnunet-daemon-topology.c:801
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:261
+#: src/hostlist/gnunet-daemon-hostlist_server.c:256
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:278
+#: src/hostlist/gnunet-daemon-hostlist_server.c:274
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:382
+#: src/hostlist/gnunet-daemon-hostlist_server.c:376
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:385
+#: src/hostlist/gnunet-daemon-hostlist_server.c:380
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:397
+#: src/hostlist/gnunet-daemon-hostlist_server.c:393
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:398
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
@@ -4718,60 +4723,60 @@ msgstr ""
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:416
+#: src/hostlist/gnunet-daemon-hostlist_server.c:417
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:418
+#: src/hostlist/gnunet-daemon-hostlist_server.c:419
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:466
+#: src/hostlist/gnunet-daemon-hostlist_server.c:460
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:679
+#: src/hostlist/gnunet-daemon-hostlist_server.c:673
 #: src/transport/gnunet-service-transport.c:2827
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:691
+#: src/hostlist/gnunet-daemon-hostlist_server.c:684
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:703
+#: src/hostlist/gnunet-daemon-hostlist_server.c:696
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:718
+#: src/hostlist/gnunet-daemon-hostlist_server.c:713
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:731
+#: src/hostlist/gnunet-daemon-hostlist_server.c:728
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:748
+#: src/hostlist/gnunet-daemon-hostlist_server.c:742
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:769
+#: src/hostlist/gnunet-daemon-hostlist_server.c:764
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:789
+#: src/hostlist/gnunet-daemon-hostlist_server.c:785
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#: src/hostlist/gnunet-daemon-hostlist_server.c:828
 #, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
@@ -4892,7 +4897,7 @@ msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 msgid "No records found for `%s'"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:454
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:459
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4912,16 +4917,16 @@ msgstr "Ungültiger Parameter: `%s'\n"
 msgid "You must specify a name\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1586
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1536
 msgid "name of the record to add/delete/display"
 msgstr ""
 
 #: src/namecache/gnunet-namecache.c:238
 #, fuzzy
-msgid "spezifies the public key of the zone to look in"
+msgid "specifies the public key of the zone to look in"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1643
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1595
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
@@ -5036,212 +5041,212 @@ msgstr ""
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:341
+#: src/namestore/gnunet-namestore.c:334
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:371
+#: src/namestore/gnunet-namestore.c:362
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:378
+#: src/namestore/gnunet-namestore.c:369
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:660 src/namestore/gnunet-namestore.c:668
+#: src/namestore/gnunet-namestore.c:656 src/namestore/gnunet-namestore.c:666
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:682 src/namestore/gnunet-namestore.c:694
+#: src/namestore/gnunet-namestore.c:681 src/namestore/gnunet-namestore.c:694
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:707
+#: src/namestore/gnunet-namestore.c:709
 #, c-format
 msgid ""
 "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:837
+#: src/namestore/gnunet-namestore.c:829
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:878
+#: src/namestore/gnunet-namestore.c:872
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:965
+#: src/namestore/gnunet-namestore.c:953
 #, fuzzy, c-format
 msgid "Failed to replace records: %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/namestore/gnunet-namestore.c:993
+#: src/namestore/gnunet-namestore.c:979
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1020
+#: src/namestore/gnunet-namestore.c:1006
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1043 src/namestore/gnunet-namestore.c:1076
-#: src/namestore/gnunet-namestore.c:1085 src/namestore/gnunet-namestore.c:1104
-#: src/namestore/gnunet-namestore.c:1127 src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1028 src/namestore/gnunet-namestore.c:1061
+#: src/namestore/gnunet-namestore.c:1071 src/namestore/gnunet-namestore.c:1089
+#: src/namestore/gnunet-namestore.c:1110 src/namestore/gnunet-namestore.c:1137
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1044
+#: src/namestore/gnunet-namestore.c:1030
 msgid "replace"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1077 src/namestore/gnunet-namestore.c:1086
-#: src/namestore/gnunet-namestore.c:1105 src/namestore/gnunet-namestore.c:1129
+#: src/namestore/gnunet-namestore.c:1063 src/namestore/gnunet-namestore.c:1073
+#: src/namestore/gnunet-namestore.c:1091 src/namestore/gnunet-namestore.c:1112
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1095
+#: src/namestore/gnunet-namestore.c:1081
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/namestore/gnunet-namestore.c:1117
+#: src/namestore/gnunet-namestore.c:1100
 #, 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:1140
+#: src/namestore/gnunet-namestore.c:1119
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1160
+#: src/namestore/gnunet-namestore.c:1139
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1203
+#: src/namestore/gnunet-namestore.c:1182
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1232
+#: src/namestore/gnunet-namestore.c:1205
 #: src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1260
+#: src/namestore/gnunet-namestore.c:1231
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1300
+#: src/namestore/gnunet-namestore.c:1269
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1352
+#: src/namestore/gnunet-namestore.c:1320
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1368
+#: src/namestore/gnunet-namestore.c:1331
 #, 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:1418
+#: src/namestore/gnunet-namestore.c:1378
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1434
+#: src/namestore/gnunet-namestore.c:1390
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1446 src/namestore/gnunet-namestore.c:1464
-#: src/namestore/gnunet-namestore.c:1481
+#: src/namestore/gnunet-namestore.c:1402 src/namestore/gnunet-namestore.c:1418
+#: src/namestore/gnunet-namestore.c:1435
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/namestore/gnunet-namestore.c:1455
+#: src/namestore/gnunet-namestore.c:1410
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Unbekannter Befehl »%s«\n"
 
-#: src/namestore/gnunet-namestore.c:1495
+#: src/namestore/gnunet-namestore.c:1448
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "Ungültiges Format für IP: »%s«\n"
 
-#: src/namestore/gnunet-namestore.c:1559
+#: src/namestore/gnunet-namestore.c:1505
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1563
+#: src/namestore/gnunet-namestore.c:1508
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1567
+#: src/namestore/gnunet-namestore.c:1512
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1572
+#: src/namestore/gnunet-namestore.c:1519
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1577
+#: src/namestore/gnunet-namestore.c:1525
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1581
+#: src/namestore/gnunet-namestore.c:1530
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1591
+#: src/namestore/gnunet-namestore.c:1542
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1596
+#: src/namestore/gnunet-namestore.c:1549
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1601
+#: src/namestore/gnunet-namestore.c:1555
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1606
+#: src/namestore/gnunet-namestore.c:1560
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1611
+#: src/namestore/gnunet-namestore.c:1566
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1615
+#: src/namestore/gnunet-namestore.c:1570
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1619
+#: src/namestore/gnunet-namestore.c:1576
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1624
+#: src/namestore/gnunet-namestore.c:1582
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5267,7 +5272,7 @@ msgstr ""
 msgid "heap file database running\n"
 msgstr "Sqlite-Datenbank läuft\n"
 
-#: src/namestore/plugin_rest_namestore.c:1104
+#: src/namestore/plugin_rest_namestore.c:919
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -5585,7 +5590,7 @@ msgstr ""
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1532
+#: src/nse/gnunet-service-nse.c:1438
 #: src/revocation/gnunet-service-revocation.c:841 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
@@ -6852,70 +6857,70 @@ msgstr "Syntaxfehler in Topologieangabe, überspringe 
Bytes `%s'.\n"
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:230
+#: src/topology/gnunet-daemon-topology.c:228
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:343
+#: src/topology/gnunet-daemon-topology.c:334
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/topology/gnunet-daemon-topology.c:537
+#: src/topology/gnunet-daemon-topology.c:513
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/topology/gnunet-daemon-topology.c:638
-#: src/topology/gnunet-daemon-topology.c:724
+#: src/topology/gnunet-daemon-topology.c:600
+#: src/topology/gnunet-daemon-topology.c:680
 msgid "# friends connected"
 msgstr "# verbundener Freunde"
 
-#: src/topology/gnunet-daemon-topology.c:919
+#: src/topology/gnunet-daemon-topology.c:851
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:951
+#: src/topology/gnunet-daemon-topology.c:877
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:958
+#: src/topology/gnunet-daemon-topology.c:884
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:980
+#: src/topology/gnunet-daemon-topology.c:902
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:983
+#: src/topology/gnunet-daemon-topology.c:905
 msgid "# friends in configuration"
 msgstr "# Freunde in Konfiguration"
 
-#: src/topology/gnunet-daemon-topology.c:990
+#: src/topology/gnunet-daemon-topology.c:913
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:921
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:968
 #: src/transport/plugin_transport_wlan.c:1517
 msgid "# HELLO messages received"
 msgstr "# HELLO-Meldungen empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1228
+#: src/topology/gnunet-daemon-topology.c:1128
 msgid "GNUnet topology control"
 msgstr ""
 
 #: src/transport/gnunet-communicator-tcp.c:2162
-#: src/transport/gnunet-communicator-udp.c:2707
-#: src/transport/gnunet-service-tng.c:8884
+#: src/transport/gnunet-communicator-udp.c:2699
+#: src/transport/gnunet-service-tng.c:9110
 #: src/transport/gnunet-service-transport.c:2795
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
@@ -6924,7 +6929,7 @@ msgstr ""
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2778
+#: src/transport/gnunet-communicator-udp.c:2770
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -7490,7 +7495,7 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1474
+#: src/transport/plugin_transport_http_client.c:1471
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3530
 #: src/transport/plugin_transport_tcp.c:3901
@@ -7498,24 +7503,24 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2115
+#: src/transport/plugin_transport_http_client.c:2112
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2164
+#: src/transport/plugin_transport_http_client.c:2161
 #: src/transport/plugin_transport_http_server.c:3245
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/transport/plugin_transport_http_client.c:2181
+#: src/transport/plugin_transport_http_client.c:2178
 #: src/transport/plugin_transport_http_server.c:3315
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/transport/plugin_transport_http_client.c:2215
+#: src/transport/plugin_transport_http_client.c:2212
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "Maximale Anzahl der Verbindungen ist %u\n"
@@ -8244,12 +8249,12 @@ msgstr "RSA Signaturüberprüfung fehlgeschlagen bei 
%s:%d: %s\n"
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/dnsparser.c:264
+#: src/util/dnsparser.c:261
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/util/dnsparser.c:954
+#: src/util/dnsparser.c:911
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
@@ -8691,17 +8696,17 @@ 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/program.c:283
+#: src/util/program.c:255
 #, fuzzy, c-format
 msgid "Unreadable or malformed configuration file `%s', exit ...\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/util/program.c:301
+#: src/util/program.c:272
 #, fuzzy, c-format
 msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/util/program.c:318
+#: src/util/program.c:287
 #, fuzzy
 msgid "Unreadable or malformed configuration, exit ...\n"
 msgstr "GNUnet Konfiguration"
diff --git a/po/es.po b/po/es.po
index 5b0c8fe03..1dfbfcef0 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: 2019-04-30 07:47+0000\n"
+"POT-Creation-Date: 2019-05-08 11:34+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"
@@ -18,62 +18,62 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/gnunet-arm.c:156
+#: src/arm/gnunet-arm.c:157
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:163
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Se produjo un fallo al eliminar el directorio «servicehome» %s.\n"
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
+#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1139
 #, fuzzy
 msgid "Message was sent successfully"
 msgstr "El almacén de nombres añadió el registro satisfactoriamente"
 
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
+#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1141
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
+#: src/arm/gnunet-arm.c:227 src/testbed/gnunet-service-testbed_peers.c:1143
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Usuario desconocido «%s»\n"
 
-#: src/arm/gnunet-arm.c:242
+#: src/arm/gnunet-arm.c:243
 #, fuzzy
 msgid "is stopped"
 msgstr "# elementos almacenados"
 
-#: src/arm/gnunet-arm.c:244
+#: src/arm/gnunet-arm.c:245
 #, fuzzy
 msgid "is starting"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:246
+#: src/arm/gnunet-arm.c:247
 #, fuzzy
 msgid "is stopping"
 msgstr "# elementos almacenados"
 
-#: src/arm/gnunet-arm.c:248
+#: src/arm/gnunet-arm.c:249
 #, fuzzy
 msgid "is starting already"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:250
+#: src/arm/gnunet-arm.c:251
 #, fuzzy
 msgid "is stopping already"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:252
+#: src/arm/gnunet-arm.c:253
 #, fuzzy
 msgid "is started already"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:254
+#: src/arm/gnunet-arm.c:255
 #, fuzzy
 msgid "is stopped already"
 msgstr "'%s' comenzando\n"
@@ -81,32 +81,32 @@ msgstr "'%s' comenzando\n"
 # Miguel: ¿Debería cambiar las siglas de ARM?
 # De momento las he mantenido con una traducción en
 # otro mensaje.
-#: src/arm/gnunet-arm.c:256
+#: src/arm/gnunet-arm.c:257
 #, fuzzy
 msgid "service is not known to ARM"
 msgstr "El servicio «%s» es desconocido para el ARM.\n"
 
-#: src/arm/gnunet-arm.c:258
+#: src/arm/gnunet-arm.c:259
 #, fuzzy
 msgid "service failed to start"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
 # Miguel: ¿Es mejor «ya que» que «porque» o «debido al apagado»?
-#: src/arm/gnunet-arm.c:260
+#: src/arm/gnunet-arm.c:261
 #, fuzzy
 msgid "service cannot be manipulated because ARM is shutting down"
 msgstr "Petición ignorada porque el ARM se está apagando.\n"
 
-#: src/arm/gnunet-arm.c:262
+#: src/arm/gnunet-arm.c:263
 #, fuzzy
 msgid "Unknown result code."
 msgstr "Código de respuesta del ARM desconocido.\n"
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:294
 msgid "Fatal error initializing ARM API.\n"
 msgstr "Error fatal al inicializar la API del ARM.\n"
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:323 src/arm/gnunet-arm.c:332
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
@@ -121,114 +121,114 @@ msgstr "Se produjo un fallo al enviar una petición al 
servicio de transporte\n"
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/arm/gnunet-arm.c:419
+#: src/arm/gnunet-arm.c:417
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
 
-#: src/arm/gnunet-arm.c:429
+#: src/arm/gnunet-arm.c:427
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/arm/gnunet-arm.c:467
+#: src/arm/gnunet-arm.c:466
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
 
-#: src/arm/gnunet-arm.c:478
+#: src/arm/gnunet-arm.c:477
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 
-#: src/arm/gnunet-arm.c:519
+#: src/arm/gnunet-arm.c:517
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/arm/gnunet-arm.c:528
+#: src/arm/gnunet-arm.c:527
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Error al comunicar con el ARM. ¿Está el ARM ejecutándose?\n"
 
-#: src/arm/gnunet-arm.c:534
+#: src/arm/gnunet-arm.c:533
 msgid "Running services:\n"
 msgstr "Servicios en ejecución:\n"
 
-#: src/arm/gnunet-arm.c:623
+#: src/arm/gnunet-arm.c:615
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr "Ahora solo monitorizando, pulsa CTRL-C para parar.\n"
 
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:649
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "%s detenido.\n"
 
-#: src/arm/gnunet-arm.c:659
+#: src/arm/gnunet-arm.c:652
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Iniciando descarga «%s».\n"
 
-#: src/arm/gnunet-arm.c:662
+#: src/arm/gnunet-arm.c:655
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "Deteniendo %s...\n"
 
-#: src/arm/gnunet-arm.c:676
+#: src/arm/gnunet-arm.c:667
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Solicitando incio del servicio «%s».\n"
 
-#: src/arm/gnunet-arm.c:766
+#: src/arm/gnunet-arm.c:744
 msgid "stop all GNUnet services"
 msgstr "detiene todos los servicios de GNUnet"
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:749
 msgid "start a particular service"
 msgstr "inicia un servicio particular"
 
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:754
 msgid "stop a particular service"
 msgstr "detiene un servicio particular"
 
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:759
 msgid "start all GNUnet default services"
 msgstr "inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:784
+#: src/arm/gnunet-arm.c:764
 msgid "stop and start all GNUnet default services"
 msgstr "detiene e inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:788
+#: src/arm/gnunet-arm.c:769
 msgid "delete config file and directory on exit"
 msgstr "borrar el directorio y el fichero de configuración al salir"
 
-#: src/arm/gnunet-arm.c:792
+#: src/arm/gnunet-arm.c:773
 msgid "monitor ARM activities"
 msgstr "monitoriza actividades de ARM"
 
-#: src/arm/gnunet-arm.c:796
+#: src/arm/gnunet-arm.c:777
 msgid "don't print status messages"
 msgstr "no imprime mensajes de estado"
 
-#: src/arm/gnunet-arm.c:801
+#: src/arm/gnunet-arm.c:784
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr "sale con estado de error si la operación no termina despues del DELAY"
 
-#: src/arm/gnunet-arm.c:805
+#: src/arm/gnunet-arm.c:789
 msgid "list currently running services"
 msgstr "lista de servicios actualmente en ejecución"
 
-#: src/arm/gnunet-arm.c:809
+#: src/arm/gnunet-arm.c:794
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr "no permite heredar la salida estándar a «gnunet-service-arm»"
 
-#: src/arm/gnunet-arm.c:813
+#: src/arm/gnunet-arm.c:799
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr "no permite heredar la salida de error estándar a «gnunet-service-arm»"
 
 # Miguel: ARM se mantiene en todo el texto, aquí está la traducción.
-#: src/arm/gnunet-arm.c:828
+#: src/arm/gnunet-arm.c:811
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 "Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)"
@@ -1332,35 +1332,35 @@ msgstr ""
 msgid "Print information about connected peers."
 msgstr "Imprime información sobre los pares conectados."
 
-#: src/core/gnunet-service-core.c:347
+#: src/core/gnunet-service-core.c:329
 msgid "# send requests dropped (disconnected)"
 msgstr "# peticiones de envío descartadas (desconectado)"
 
-#: src/core/gnunet-service-core.c:371
+#: src/core/gnunet-service-core.c:355
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:443
+#: src/core/gnunet-service-core.c:420
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de mensajes del tipo %u recibidos"
 
-#: src/core/gnunet-service-core.c:541
+#: src/core/gnunet-service-core.c:508
 msgid "# messages discarded (session disconnected)"
 msgstr "# mensajes descartados (sesión desconectada)"
 
-#: src/core/gnunet-service-core.c:879
+#: src/core/gnunet-service-core.c:828
 #, fuzzy, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# bytes de mensajes del tipo %u recibidos"
 
-#: src/core/gnunet-service-core.c:988
+#: src/core/gnunet-service-core.c:929
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 "Al servicio principal le falta la configuración de la clave de máquina "
 "(HOSTKEY).  Saliendo.\n"
 
-#: src/core/gnunet-service-core.c:1009
+#: src/core/gnunet-service-core.c:948
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "El servicio principal de «%4s» está listo.\n"
@@ -1509,38 +1509,38 @@ msgstr "# bytes omitidos (mensaje antiguo)"
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
-#: src/core/gnunet-service-core_sessions.c:260
-#: src/core/gnunet-service-core_sessions.c:350
+#: src/core/gnunet-service-core_sessions.c:254
+#: src/core/gnunet-service-core_sessions.c:339
 #: src/dht/gnunet-service-dht_neighbours.c:740
 #: src/dht/gnunet-service-dht_neighbours.c:803
 #: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1521
-#: src/topology/gnunet-daemon-topology.c:615
-#: src/topology/gnunet-daemon-topology.c:717
+#: src/topology/gnunet-daemon-topology.c:581
+#: src/topology/gnunet-daemon-topology.c:673
 #: src/transport/gnunet-service-transport_neighbours.c:720
 #: src/transport/gnunet-service-transport_neighbours.c:728
 msgid "# peers connected"
 msgstr "# pares conectados"
 
-#: src/core/gnunet-service-core_sessions.c:296
+#: src/core/gnunet-service-core_sessions.c:287
 msgid "# type map refreshes sent"
 msgstr "# envíos de refrescos del mapa de tipos"
 
-#: src/core/gnunet-service-core_sessions.c:416
+#: src/core/gnunet-service-core_sessions.c:402
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "Se produjo un fallo al encolar una confirmación de recepción\n"
 
-#: src/core/gnunet-service-core_sessions.c:433
+#: src/core/gnunet-service-core_sessions.c:420
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "Se produjo un fallo al encolar una confirmación de recepción\n"
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:181
+#: src/core/gnunet-service-core_typemap.c:170
+#: src/core/gnunet-service-core_typemap.c:183
 msgid "# type maps received"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_typemap.c:212
+#: src/core/gnunet-service-core_typemap.c:216
 msgid "# updates to my type map"
 msgstr "# actualizaciones de mi mapa de tipos"
 
@@ -1549,7 +1549,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:264 src/namestore/gnunet-namestore.c:1005
+#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:991
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
@@ -1659,7 +1659,7 @@ msgstr "Se produjo un fallo al conectar con GNS\n"
 
 #: src/credential/gnunet-service-credential.c:1071
 #: src/namestore/gnunet-namestore-fcfsd.c:1138
-#: src/namestore/gnunet-namestore.c:1030
+#: src/namestore/gnunet-namestore.c:1015
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
@@ -3797,7 +3797,7 @@ msgstr ""
 "(HOSTKEY).  Saliendo.\n"
 
 #: src/fs/gnunet-service-fs.c:1305 src/hostlist/gnunet-daemon-hostlist.c:353
-#: src/topology/gnunet-daemon-topology.c:1197
+#: src/topology/gnunet-daemon-topology.c:1100
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Se produjo un fallo al conectar con el servicio «%s».\n"
@@ -4229,140 +4229,145 @@ msgstr "Fallo al conectar a gnunetd.\n"
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:118
-#: src/hostlist/gnunet-daemon-hostlist_client.c:535
-#: src/hostlist/gnunet-daemon-hostlist_client.c:753
-#: src/hostlist/gnunet-daemon-hostlist_client.c:759
-#: src/hostlist/gnunet-daemon-hostlist_client.c:811
-#: src/hostlist/gnunet-daemon-hostlist_client.c:820
-#: src/hostlist/gnunet-daemon-hostlist_client.c:931
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/transport/plugin_transport_http_client.c:598
-#: src/transport/plugin_transport_http_client.c:616
+#: src/gns/gnunet-gns-proxy.c:115
+#: src/hostlist/gnunet-daemon-hostlist_client.c:532
+#: src/hostlist/gnunet-daemon-hostlist_client.c:750
+#: src/hostlist/gnunet-daemon-hostlist_client.c:756
+#: src/hostlist/gnunet-daemon-hostlist_client.c:808
+#: src/hostlist/gnunet-daemon-hostlist_client.c:817
+#: src/hostlist/gnunet-daemon-hostlist_client.c:928
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1023
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1028
+#: src/transport/plugin_transport_http_client.c:595
+#: src/transport/plugin_transport_http_client.c:613
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
 
-#: src/gns/gnunet-gns-proxy.c:989
+#: src/gns/gnunet-gns-proxy.c:986
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:1014
+#: src/gns/gnunet-gns-proxy.c:1011
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1035
+#: src/gns/gnunet-gns-proxy.c:1032
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
 
-#: src/gns/gnunet-gns-proxy.c:1050
+#: src/gns/gnunet-gns-proxy.c:1047
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1065
+#: src/gns/gnunet-gns-proxy.c:1062
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1075
+#: src/gns/gnunet-gns-proxy.c:1072
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1099
+#: src/gns/gnunet-gns-proxy.c:1096
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1230
+#: src/gns/gnunet-gns-proxy.c:1227
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2131
+#: src/gns/gnunet-gns-proxy.c:2128
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:2652
+#: src/gns/gnunet-gns-proxy.c:2649
 #, 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:2684
+#: src/gns/gnunet-gns-proxy.c:2681
 #, 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:2885
+#: src/gns/gnunet-gns-proxy.c:2882
 #, 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:2907 src/rest/gnunet-rest-server.c:668
+#: src/gns/gnunet-gns-proxy.c:2904 src/rest/gnunet-rest-server.c:668
 #, 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:3243
+#: src/gns/gnunet-gns-proxy.c:3240
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3272
+#: src/gns/gnunet-gns-proxy.c:3269
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3355
+#: src/gns/gnunet-gns-proxy.c:3352
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3693
+#: src/gns/gnunet-gns-proxy.c:3690
 #, 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:3821
+#: src/gns/gnunet-gns-proxy.c:3818
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3826
+#: src/gns/gnunet-gns-proxy.c:3823
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3830
+#: src/gns/gnunet-gns-proxy.c:3827
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3856
+#: src/gns/gnunet-gns-proxy.c:3853
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
-#: src/gns/gnunet-gns.c:199
+#: src/gns/gnunet-gns.c:178
+#, fuzzy, c-format
+msgid "`%s' is not a valid domain name\n"
+msgstr "«%s» no es una dirección IP válida.\n"
+
+#: src/gns/gnunet-gns.c:196
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:233
+#: src/gns/gnunet-gns.c:230
 msgid "Lookup a record for the given name"
 msgstr "Buscar el registro para el nombre dado"
 
-#: src/gns/gnunet-gns.c:238
+#: src/gns/gnunet-gns.c:236
 msgid "Specify the type of the record to lookup"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:242
+#: src/gns/gnunet-gns.c:240
 msgid "No unneeded output"
 msgstr "Sin salida innecesaria"
 
-#: src/gns/gnunet-gns.c:258
+#: src/gns/gnunet-gns.c:252
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Herramienta de acceso GNUnet GNS"
@@ -4474,7 +4479,7 @@ 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:452
+#: src/gns/plugin_rest_gns.c:451
 #, fuzzy
 msgid "Gns REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -4667,36 +4672,36 @@ msgstr "proveer un servidor de listas de máquinas"
 msgid "GNUnet hostlist server and client"
 msgstr "Servidor y cliente GNUnet de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:349
+#: src/hostlist/gnunet-daemon-hostlist_client.c:346
 msgid "# bytes downloaded from hostlist servers"
 msgstr "# bytes descargados de servidores de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:370
-#: src/hostlist/gnunet-daemon-hostlist_client.c:403
+#: src/hostlist/gnunet-daemon-hostlist_client.c:367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:400
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# «HELLO» no válidos descargados de servidores de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:373
-#: src/hostlist/gnunet-daemon-hostlist_client.c:406
+#: src/hostlist/gnunet-daemon-hostlist_client.c:370
+#: src/hostlist/gnunet-daemon-hostlist_client.c:403
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Mensaje «%s» no válido recibido de la lista de máquinas en «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:391
+#: src/hostlist/gnunet-daemon-hostlist_client.c:388
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# «HELLO» válidos descargados de servidores de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:661
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
+#: src/hostlist/gnunet-daemon-hostlist_client.c:658
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
 msgid "# advertised hostlist URIs"
 msgstr "# URI de listas de máquinas anunciadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:691
+#: src/hostlist/gnunet-daemon-hostlist_client.c:688
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr "# URI anunciadas «%s» descargadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:734
+#: src/hostlist/gnunet-daemon-hostlist_client.c:731
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
@@ -4705,120 +4710,120 @@ msgstr ""
 "Lista de máquinas anunciada con la URI «%s» no pudo ser descargada. La URI "
 "anunciada es descartada.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:862
+#: src/hostlist/gnunet-daemon-hostlist_client.c:859
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 "Finalizado el plazo mientras se intentaba bajar lista de máquinas de «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:876
+#: src/hostlist/gnunet-daemon-hostlist_client.c:873
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr "Límite de descarga de %u bytes superado, parando descarga\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:893
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Descarga de lista de máquinas de «%s» fallida: «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:902
+#: src/hostlist/gnunet-daemon-hostlist_client.c:899
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Descarga de lista de máquinas «%s» completada.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:910
+#: src/hostlist/gnunet-daemon-hostlist_client.c:907
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr "Añadiendo el almacén de datos de la lista de máquinas probada «%s».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:963
+#: src/hostlist/gnunet-daemon-hostlist_client.c:960
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Inicializando usando lista de máquinas en «%s».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:971
+#: src/hostlist/gnunet-daemon-hostlist_client.c:968
 msgid "# hostlist downloads initiated"
 msgstr "# descargas de listas de máquinas iniciadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1098
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1665
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1095
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1662
 msgid "# milliseconds between hostlist downloads"
 msgstr "# milisegundos entre descargas de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1107
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1104
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 "Hay %u/%u conexiones.  Se considerará descargar una lista de máquinas en %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1166
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1187
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1163
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1184
 msgid "# active connections"
 msgstr "# conexiones activas"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1350
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Cargando entradas guardadas de listas de máquinas del fichero «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1355
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "El fichero de listas de máquinas «%s» no existe\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1364
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo lectura para cargar las listas de "
 "máquinas: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr "%u URI de listas de máquinas cargadas del fichero\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 msgid "# hostlist URIs read from file"
 msgstr "# URI de listas de máquinas leídas de fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1447
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo escritura para almacenar las listas "
 "de máquinas: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1454
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Escribiendo %u URI de listas de máquinas a «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1478
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1495
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Error escribiendo URI de listas de máquinas al fichero «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1490
 msgid "# hostlist URIs written to file"
 msgstr "# URI de listas de máquinas escritas a fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1595
-#: src/transport/plugin_transport_http_client.c:2274
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1592
+#: src/transport/plugin_transport_http_client.c:2271
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1624
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1621
 msgid "Learning is enabled on this peer\n"
 msgstr "El aprendizaje está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1638
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
 msgid "Learning is not enabled on this peer\n"
 msgstr "El aprendizaje no está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1651
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1648
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4826,48 +4831,48 @@ msgstr ""
 "La lista de máquinas «%s» fue eliminada puesto que el aprendizaje no está "
 "habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:176
+#: src/hostlist/gnunet-daemon-hostlist_server.c:172
 msgid "bytes in hostlist"
 msgstr "bytes en la lista de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:201
+#: src/hostlist/gnunet-daemon-hostlist_server.c:198
 msgid "expired addresses encountered"
 msgstr "direcciones expiradas encontradas"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:237
-#: src/hostlist/gnunet-daemon-hostlist_server.c:531
+#: src/hostlist/gnunet-daemon-hostlist_server.c:235
+#: src/hostlist/gnunet-daemon-hostlist_server.c:526
 #: src/peerinfo-tool/gnunet-peerinfo.c:385
 #: src/peerinfo-tool/gnunet-peerinfo.c:534
-#: src/topology/gnunet-daemon-topology.c:859
+#: src/topology/gnunet-daemon-topology.c:801
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 "Error en la comunicación con el servicio de información de pares (PEERINFO): "
 "%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:261
+#: src/hostlist/gnunet-daemon-hostlist_server.c:256
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr "«HELLO» sin dirección encontrados (ignorados)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:278
+#: src/hostlist/gnunet-daemon-hostlist_server.c:274
 msgid "bytes not included in hostlist (size limit)"
 msgstr "bytes no incluidos en la lista de máquinas (límite de tamaño)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:382
+#: src/hostlist/gnunet-daemon-hostlist_server.c:376
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:385
+#: src/hostlist/gnunet-daemon-hostlist_server.c:380
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "Peticiones de listas de máquinas rechazadas (no HTTP GET)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:397
+#: src/hostlist/gnunet-daemon-hostlist_server.c:393
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr "Rechazando petición «%s» con %llu bytes de datos de subida\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:398
 msgid "hostlist requests refused (upload data)"
 msgstr "Peticiones de listas de máquinas rechazadas (datos de subida)"
 
@@ -4881,61 +4886,61 @@ msgstr ""
 msgid "hostlist requests refused (not ready)"
 msgstr "Peticiones de listas de máquinas rechazadas (no preparados)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:416
+#: src/hostlist/gnunet-daemon-hostlist_server.c:417
 msgid "Received request for our hostlist\n"
 msgstr "Peticiones recibidas de nuestra lista de máquinas\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:418
+#: src/hostlist/gnunet-daemon-hostlist_server.c:419
 msgid "hostlist requests processed"
 msgstr "Peticiones de lista de máquinas procesadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:466
+#: src/hostlist/gnunet-daemon-hostlist_server.c:460
 msgid "# hostlist advertisements send"
 msgstr "# anuncios de listas de máquinas enviados"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:679
+#: src/hostlist/gnunet-daemon-hostlist_server.c:673
 #: src/transport/gnunet-service-transport.c:2827
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
 "Saliendo.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:691
+#: src/hostlist/gnunet-daemon-hostlist_server.c:684
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Número de puerto %llu no válido.  Saliendo.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:703
+#: src/hostlist/gnunet-daemon-hostlist_server.c:696
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr "Servicio de listas de máquinas arranca en %s:%llu\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:718
+#: src/hostlist/gnunet-daemon-hostlist_server.c:713
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Dirección para obtener la lista de máquinas: «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:731
+#: src/hostlist/gnunet-daemon-hostlist_server.c:728
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:748
+#: src/hostlist/gnunet-daemon-hostlist_server.c:742
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:769
+#: src/hostlist/gnunet-daemon-hostlist_server.c:764
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:789
+#: src/hostlist/gnunet-daemon-hostlist_server.c:785
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#: src/hostlist/gnunet-daemon-hostlist_server.c:828
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -5065,7 +5070,7 @@ msgstr "No se pudo acceder al fichero «%s»: %s\n"
 msgid "No records found for `%s'"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:454
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:459
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr "\tRegistro corrupto o no soportado del tipo %u\n"
@@ -5085,16 +5090,16 @@ msgstr "Parámetro no válido «%s»\n"
 msgid "You must specify a name\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1586
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1536
 msgid "name of the record to add/delete/display"
 msgstr "nombre del registro a añadir/borrar/mostrar"
 
 #: src/namecache/gnunet-namecache.c:238
 #, fuzzy
-msgid "spezifies the public key of the zone to look in"
+msgid "specifies the public key of the zone to look in"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1643
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1595
 msgid "GNUnet zone manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
 
@@ -5211,217 +5216,217 @@ msgstr ""
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
 
-#: src/namestore/gnunet-namestore.c:341
+#: src/namestore/gnunet-namestore.c:334
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr "No se pudo añadir el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:371
+#: src/namestore/gnunet-namestore.c:362
 #, 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:378
+#: src/namestore/gnunet-namestore.c:369
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:660 src/namestore/gnunet-namestore.c:668
+#: src/namestore/gnunet-namestore.c:656 src/namestore/gnunet-namestore.c:666
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:682 src/namestore/gnunet-namestore.c:694
+#: src/namestore/gnunet-namestore.c:681 src/namestore/gnunet-namestore.c:694
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:707
+#: src/namestore/gnunet-namestore.c:709
 #, c-format
 msgid ""
 "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:837
+#: src/namestore/gnunet-namestore.c:829
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:878
+#: src/namestore/gnunet-namestore.c:872
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:965
+#: src/namestore/gnunet-namestore.c:953
 #, fuzzy, c-format
 msgid "Failed to replace records: %s\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/namestore/gnunet-namestore.c:993
+#: src/namestore/gnunet-namestore.c:979
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1020
+#: src/namestore/gnunet-namestore.c:1006
 #, c-format
 msgid "No options given\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/namestore/gnunet-namestore.c:1043 src/namestore/gnunet-namestore.c:1076
-#: src/namestore/gnunet-namestore.c:1085 src/namestore/gnunet-namestore.c:1104
-#: src/namestore/gnunet-namestore.c:1127 src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1028 src/namestore/gnunet-namestore.c:1061
+#: src/namestore/gnunet-namestore.c:1071 src/namestore/gnunet-namestore.c:1089
+#: src/namestore/gnunet-namestore.c:1110 src/namestore/gnunet-namestore.c:1137
 #, 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:1044
+#: src/namestore/gnunet-namestore.c:1030
 msgid "replace"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1077 src/namestore/gnunet-namestore.c:1086
-#: src/namestore/gnunet-namestore.c:1105 src/namestore/gnunet-namestore.c:1129
+#: src/namestore/gnunet-namestore.c:1063 src/namestore/gnunet-namestore.c:1073
+#: src/namestore/gnunet-namestore.c:1091 src/namestore/gnunet-namestore.c:1112
 msgid "add"
 msgstr "añadir"
 
-#: src/namestore/gnunet-namestore.c:1095
+#: src/namestore/gnunet-namestore.c:1081
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1117
+#: src/namestore/gnunet-namestore.c:1100
 #, 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:1140
+#: src/namestore/gnunet-namestore.c:1119
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1160
+#: src/namestore/gnunet-namestore.c:1139
 msgid "del"
 msgstr "borrar"
 
-#: src/namestore/gnunet-namestore.c:1203
+#: src/namestore/gnunet-namestore.c:1182
 #, 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:1232
+#: src/namestore/gnunet-namestore.c:1205
 #: src/peerinfo-tool/gnunet-peerinfo.c:775
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1260
+#: src/namestore/gnunet-namestore.c:1231
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1300
+#: src/namestore/gnunet-namestore.c:1269
 #, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1352
+#: src/namestore/gnunet-namestore.c:1320
 #, fuzzy, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr "Argumentos superfluos (ignorados).\n"
 
-#: src/namestore/gnunet-namestore.c:1368
+#: src/namestore/gnunet-namestore.c:1331
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/namestore/gnunet-namestore.c:1418
+#: src/namestore/gnunet-namestore.c:1378
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1434
+#: src/namestore/gnunet-namestore.c:1390
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1446 src/namestore/gnunet-namestore.c:1464
-#: src/namestore/gnunet-namestore.c:1481
+#: src/namestore/gnunet-namestore.c:1402 src/namestore/gnunet-namestore.c:1418
+#: src/namestore/gnunet-namestore.c:1435
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1455
+#: src/namestore/gnunet-namestore.c:1410
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Comando desconocido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1495
+#: src/namestore/gnunet-namestore.c:1448
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "Formato no válido para la IP: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1559
+#: src/namestore/gnunet-namestore.c:1505
 msgid "add record"
 msgstr "añadir registro"
 
-#: src/namestore/gnunet-namestore.c:1563
+#: src/namestore/gnunet-namestore.c:1508
 msgid "delete record"
 msgstr "borrar registro"
 
-#: src/namestore/gnunet-namestore.c:1567
+#: src/namestore/gnunet-namestore.c:1512
 msgid "display records"
 msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore.c:1572
+#: src/namestore/gnunet-namestore.c:1519
 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:1577
+#: src/namestore/gnunet-namestore.c:1525
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
-#: src/namestore/gnunet-namestore.c:1581
+#: src/namestore/gnunet-namestore.c:1530
 #, 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:1591
+#: src/namestore/gnunet-namestore.c:1542
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "establece las preferencias para el par dado"
 
-#: src/namestore/gnunet-namestore.c:1596
+#: src/namestore/gnunet-namestore.c:1549
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1601
+#: src/namestore/gnunet-namestore.c:1555
 msgid "type of the record to add/delete/display"
 msgstr "tipo del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:1606
+#: src/namestore/gnunet-namestore.c:1560
 msgid "URI to import into our zone"
 msgstr "URI a importar a nuestra zona"
 
-#: src/namestore/gnunet-namestore.c:1611
+#: src/namestore/gnunet-namestore.c:1566
 msgid "value of the record to add/delete"
 msgstr "valor del registro a añadir/borrar"
 
-#: src/namestore/gnunet-namestore.c:1615
+#: src/namestore/gnunet-namestore.c:1570
 msgid "create or list public record"
 msgstr "crear o listar registros públicos"
 
-#: src/namestore/gnunet-namestore.c:1619
+#: src/namestore/gnunet-namestore.c:1576
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1624
+#: src/namestore/gnunet-namestore.c:1582
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "nombre de la sección a la que acceder"
@@ -5449,7 +5454,7 @@ msgstr "El almacén de nombres no pudo añadir el 
registro\n"
 msgid "heap file database running\n"
 msgstr "Base de datos de plantilla ejecutándose\n"
 
-#: src/namestore/plugin_rest_namestore.c:1104
+#: src/namestore/plugin_rest_namestore.c:919
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -5779,7 +5784,7 @@ msgstr "Medir la calidad y rendimiento del servicio NSE."
 msgid "Show network size estimates from NSE service."
 msgstr "# Estimaciones del tamaño de red recibidas"
 
-#: src/nse/gnunet-service-nse.c:1532
+#: src/nse/gnunet-service-nse.c:1438
 #: src/revocation/gnunet-service-revocation.c:841 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
@@ -7089,50 +7094,50 @@ msgstr ""
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr "«gnunet-arm» o «ssh» no parecen terminar.\n"
 
-#: src/topology/gnunet-daemon-topology.c:230
+#: src/topology/gnunet-daemon-topology.c:228
 msgid "# peers blacklisted"
 msgstr "# pares en la lista negra"
 
-#: src/topology/gnunet-daemon-topology.c:343
+#: src/topology/gnunet-daemon-topology.c:334
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# peticiones de conexión requeridas al servicio de transporte"
 
 # gossiped??
-#: src/topology/gnunet-daemon-topology.c:537
+#: src/topology/gnunet-daemon-topology.c:513
 msgid "# HELLO messages gossipped"
 msgstr "# Mensajes «HELLO» rumoreados"
 
-#: src/topology/gnunet-daemon-topology.c:638
-#: src/topology/gnunet-daemon-topology.c:724
+#: src/topology/gnunet-daemon-topology.c:600
+#: src/topology/gnunet-daemon-topology.c:680
 msgid "# friends connected"
 msgstr "# amigos conectados"
 
-#: src/topology/gnunet-daemon-topology.c:919
+#: src/topology/gnunet-daemon-topology.c:851
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 "¡Se produjo un fallo al conectar con el servicio principal, no se puede "
 "gestionar la topología!\n"
 
-#: src/topology/gnunet-daemon-topology.c:951
+#: src/topology/gnunet-daemon-topology.c:877
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr "Me he encontrado «%s» en mi lista de amigos (inútil, ignorado)\n"
 
-#: src/topology/gnunet-daemon-topology.c:958
+#: src/topology/gnunet-daemon-topology.c:884
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr "Encontrado amigo «%s» en la configuración\n"
 
-#: src/topology/gnunet-daemon-topology.c:980
+#: src/topology/gnunet-daemon-topology.c:902
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:983
+#: src/topology/gnunet-daemon-topology.c:905
 msgid "# friends in configuration"
 msgstr "# amigos en configuración"
 
-#: src/topology/gnunet-daemon-topology.c:990
+#: src/topology/gnunet-daemon-topology.c:913
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
@@ -7140,25 +7145,25 @@ msgstr ""
 "Menos amigos especificados que los requeridos por el contador mínimo de "
 "amigos. Sólo me conectaré a amigos.\n"
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:921
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 "Más conexiones amistosas requeridas que el número objetivo total de "
 "conexiones.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:968
 #: src/transport/plugin_transport_wlan.c:1517
 msgid "# HELLO messages received"
 msgstr "# mensajes «HELLO» recibidos"
 
-#: src/topology/gnunet-daemon-topology.c:1228
+#: src/topology/gnunet-daemon-topology.c:1128
 msgid "GNUnet topology control"
 msgstr ""
 
 #: src/transport/gnunet-communicator-tcp.c:2162
-#: src/transport/gnunet-communicator-udp.c:2707
-#: src/transport/gnunet-service-tng.c:8884
+#: src/transport/gnunet-communicator-udp.c:2699
+#: src/transport/gnunet-service-tng.c:9110
 #: src/transport/gnunet-service-transport.c:2795
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
@@ -7171,7 +7176,7 @@ msgstr ""
 msgid "GNUnet TCP communicator"
 msgstr "Configurador Gtk de GNUnet"
 
-#: src/transport/gnunet-communicator-udp.c:2778
+#: src/transport/gnunet-communicator-udp.c:2770
 #, fuzzy
 msgid "GNUnet UDP communicator"
 msgstr "Configurador Gtk de GNUnet"
@@ -7770,7 +7775,7 @@ msgstr "# sesiones wlan pendientes"
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr "enviar data para prueba a otro par (hasta CTRL-C)"
 
-#: src/transport/plugin_transport_http_client.c:1474
+#: src/transport/plugin_transport_http_client.c:1471
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3530
 #: src/transport/plugin_transport_tcp.c:3901
@@ -7778,26 +7783,26 @@ msgstr "enviar data para prueba a otro par (hasta 
CTRL-C)"
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2115
+#: src/transport/plugin_transport_http_client.c:2112
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 "¡No se pudo inicializar el multi-manejador de curl, no se pudo iniciar el "
 "módulo %s!\n"
 
-#: src/transport/plugin_transport_http_client.c:2164
+#: src/transport/plugin_transport_http_client.c:2161
 #: src/transport/plugin_transport_http_server.c:3245
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
-#: src/transport/plugin_transport_http_client.c:2181
+#: src/transport/plugin_transport_http_client.c:2178
 #: src/transport/plugin_transport_http_server.c:3315
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Finalización del módulo «%s» completa\n"
 
-#: src/transport/plugin_transport_http_client.c:2215
+#: src/transport/plugin_transport_http_client.c:2212
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "El número máximo de conexiones es %u\n"
@@ -8563,14 +8568,14 @@ msgstr "La verificación de la firma RSA fallo en %s:%d: 
%s\n"
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
 
-#: src/util/dnsparser.c:264
+#: src/util/dnsparser.c:261
 #, 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:954
+#: src/util/dnsparser.c:911
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
@@ -9020,17 +9025,17 @@ 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/program.c:283
+#: src/util/program.c:255
 #, fuzzy, c-format
 msgid "Unreadable or malformed configuration file `%s', exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/util/program.c:301
+#: src/util/program.c:272
 #, fuzzy, c-format
 msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/util/program.c:318
+#: src/util/program.c:287
 #, fuzzy
 msgid "Unreadable or malformed configuration, exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
diff --git a/po/fr.po b/po/fr.po
index 25141cd58..7e4151eed 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: 2019-04-30 07:47+0000\n"
+"POT-Creation-Date: 2019-05-08 11:34+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"
@@ -16,86 +16,86 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/gnunet-arm.c:156
+#: src/arm/gnunet-arm.c:157
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:163
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
+#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
+#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1141
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
+#: src/arm/gnunet-arm.c:227 src/testbed/gnunet-service-testbed_peers.c:1143
 msgid "Unknown request status"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:242
+#: src/arm/gnunet-arm.c:243
 #, fuzzy
 msgid "is stopped"
 msgstr "%s est arrêté"
 
-#: src/arm/gnunet-arm.c:244
+#: src/arm/gnunet-arm.c:245
 #, fuzzy
 msgid "is starting"
 msgstr "%s est en cours de démarrage"
 
-#: src/arm/gnunet-arm.c:246
+#: src/arm/gnunet-arm.c:247
 #, fuzzy
 msgid "is stopping"
 msgstr "%s est en cours d'arrêt"
 
-#: src/arm/gnunet-arm.c:248
+#: src/arm/gnunet-arm.c:249
 #, fuzzy
 msgid "is starting already"
 msgstr "%s est déjà en cours de démarrage"
 
-#: src/arm/gnunet-arm.c:250
+#: src/arm/gnunet-arm.c:251
 #, fuzzy
 msgid "is stopping already"
 msgstr "%s est déjà arrêté"
 
-#: src/arm/gnunet-arm.c:252
+#: src/arm/gnunet-arm.c:253
 #, fuzzy
 msgid "is started already"
 msgstr "%s est déjà démarré"
 
-#: src/arm/gnunet-arm.c:254
+#: src/arm/gnunet-arm.c:255
 #, fuzzy
 msgid "is stopped already"
 msgstr "%s est déjà arrêté"
 
-#: src/arm/gnunet-arm.c:256
+#: src/arm/gnunet-arm.c:257
 msgid "service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:258
+#: src/arm/gnunet-arm.c:259
 #, fuzzy
 msgid "service failed to start"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/arm/gnunet-arm.c:260
+#: src/arm/gnunet-arm.c:261
 msgid "service cannot be manipulated because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:262
+#: src/arm/gnunet-arm.c:263
 #, fuzzy
 msgid "Unknown result code."
 msgstr "%.s Code d'erreur inconnu"
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:294
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:323 src/arm/gnunet-arm.c:332
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr ""
@@ -110,113 +110,113 @@ msgstr ""
 msgid "Failed to stop the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:419
+#: src/arm/gnunet-arm.c:417
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "Dernier message reçu de %s\n"
 
-#: src/arm/gnunet-arm.c:429
+#: src/arm/gnunet-arm.c:427
 #, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:467
+#: src/arm/gnunet-arm.c:466
 #, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:478
+#: src/arm/gnunet-arm.c:477
 #, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:519
+#: src/arm/gnunet-arm.c:517
 #, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:528
+#: src/arm/gnunet-arm.c:527
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:534
+#: src/arm/gnunet-arm.c:533
 msgid "Running services:\n"
 msgstr "Services en exécution :\n"
 
-#: src/arm/gnunet-arm.c:623
+#: src/arm/gnunet-arm.c:615
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:649
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "Arrêté %s.\n"
 
-#: src/arm/gnunet-arm.c:659
+#: src/arm/gnunet-arm.c:652
 #, c-format
 msgid "Starting %s...\n"
 msgstr "En cous de démarrage %s…\n"
 
-#: src/arm/gnunet-arm.c:662
+#: src/arm/gnunet-arm.c:655
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "En cour d'arrêt %s…\n"
 
-#: src/arm/gnunet-arm.c:676
+#: src/arm/gnunet-arm.c:667
 #, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:766
+#: src/arm/gnunet-arm.c:744
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:749
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:754
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:759
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:784
+#: src/arm/gnunet-arm.c:764
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:788
+#: src/arm/gnunet-arm.c:769
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:792
+#: src/arm/gnunet-arm.c:773
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:796
+#: src/arm/gnunet-arm.c:777
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:801
+#: src/arm/gnunet-arm.c:784
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:805
+#: src/arm/gnunet-arm.c:789
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:809
+#: src/arm/gnunet-arm.c:794
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:813
+#: src/arm/gnunet-arm.c:799
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:828
+#: src/arm/gnunet-arm.c:811
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -1228,33 +1228,33 @@ msgstr ""
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:347
+#: src/core/gnunet-service-core.c:329
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:371
+#: src/core/gnunet-service-core.c:355
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:443
+#: src/core/gnunet-service-core.c:420
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:541
+#: src/core/gnunet-service-core.c:508
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:879
+#: src/core/gnunet-service-core.c:828
 #, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:988
+#: src/core/gnunet-service-core.c:929
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1009
+#: src/core/gnunet-service-core.c:948
 #, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr ""
@@ -1391,36 +1391,36 @@ msgstr ""
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:260
-#: src/core/gnunet-service-core_sessions.c:350
+#: src/core/gnunet-service-core_sessions.c:254
+#: src/core/gnunet-service-core_sessions.c:339
 #: src/dht/gnunet-service-dht_neighbours.c:740
 #: src/dht/gnunet-service-dht_neighbours.c:803
 #: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1521
-#: src/topology/gnunet-daemon-topology.c:615
-#: src/topology/gnunet-daemon-topology.c:717
+#: src/topology/gnunet-daemon-topology.c:581
+#: src/topology/gnunet-daemon-topology.c:673
 #: src/transport/gnunet-service-transport_neighbours.c:720
 #: src/transport/gnunet-service-transport_neighbours.c:728
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:296
+#: src/core/gnunet-service-core_sessions.c:287
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:416
+#: src/core/gnunet-service-core_sessions.c:402
 msgid "# outdated typemap confirmations received"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:433
+#: src/core/gnunet-service-core_sessions.c:420
 msgid "# valid typemap confirmations received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:181
+#: src/core/gnunet-service-core_typemap.c:170
+#: src/core/gnunet-service-core_typemap.c:183
 msgid "# type maps received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:212
+#: src/core/gnunet-service-core_typemap.c:216
 msgid "# updates to my type map"
 msgstr ""
 
@@ -1429,7 +1429,7 @@ msgstr ""
 msgid "Unable to parse CRED record string `%s'\n"
 msgstr ""
 
-#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:1005
+#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:991
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
@@ -1535,7 +1535,7 @@ msgstr ""
 
 #: src/credential/gnunet-service-credential.c:1071
 #: src/namestore/gnunet-namestore-fcfsd.c:1138
-#: src/namestore/gnunet-namestore.c:1030
+#: src/namestore/gnunet-namestore.c:1015
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr ""
@@ -3499,7 +3499,7 @@ msgid "FS service is lacking HOSTKEY configuration 
setting.  Exiting.\n"
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:1305 src/hostlist/gnunet-daemon-hostlist.c:353
-#: src/topology/gnunet-daemon-topology.c:1197
+#: src/topology/gnunet-daemon-topology.c:1100
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr ""
@@ -3909,139 +3909,144 @@ msgstr ""
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:118
-#: src/hostlist/gnunet-daemon-hostlist_client.c:535
-#: src/hostlist/gnunet-daemon-hostlist_client.c:753
-#: src/hostlist/gnunet-daemon-hostlist_client.c:759
-#: src/hostlist/gnunet-daemon-hostlist_client.c:811
-#: src/hostlist/gnunet-daemon-hostlist_client.c:820
-#: src/hostlist/gnunet-daemon-hostlist_client.c:931
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/transport/plugin_transport_http_client.c:598
-#: src/transport/plugin_transport_http_client.c:616
+#: src/gns/gnunet-gns-proxy.c:115
+#: src/hostlist/gnunet-daemon-hostlist_client.c:532
+#: src/hostlist/gnunet-daemon-hostlist_client.c:750
+#: src/hostlist/gnunet-daemon-hostlist_client.c:756
+#: src/hostlist/gnunet-daemon-hostlist_client.c:808
+#: src/hostlist/gnunet-daemon-hostlist_client.c:817
+#: src/hostlist/gnunet-daemon-hostlist_client.c:928
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1023
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1028
+#: src/transport/plugin_transport_http_client.c:595
+#: src/transport/plugin_transport_http_client.c:613
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:989
+#: src/gns/gnunet-gns-proxy.c:986
 #, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1014
+#: src/gns/gnunet-gns-proxy.c:1011
 #, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1035
+#: src/gns/gnunet-gns-proxy.c:1032
 #, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1050
+#: src/gns/gnunet-gns-proxy.c:1047
 #, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1065
+#: src/gns/gnunet-gns-proxy.c:1062
 #, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1075
+#: src/gns/gnunet-gns-proxy.c:1072
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1099
+#: src/gns/gnunet-gns-proxy.c:1096
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1230
+#: src/gns/gnunet-gns-proxy.c:1227
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2131
+#: src/gns/gnunet-gns-proxy.c:2128
 #, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2652
+#: src/gns/gnunet-gns-proxy.c:2649
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2684
+#: src/gns/gnunet-gns-proxy.c:2681
 #, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2885
+#: src/gns/gnunet-gns-proxy.c:2882
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2907 src/rest/gnunet-rest-server.c:668
+#: src/gns/gnunet-gns-proxy.c:2904 src/rest/gnunet-rest-server.c:668
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3243
+#: src/gns/gnunet-gns-proxy.c:3240
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3272
+#: src/gns/gnunet-gns-proxy.c:3269
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3355
+#: src/gns/gnunet-gns-proxy.c:3352
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3693
+#: src/gns/gnunet-gns-proxy.c:3690
 #, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3821
+#: src/gns/gnunet-gns-proxy.c:3818
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3826
+#: src/gns/gnunet-gns-proxy.c:3823
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3830
+#: src/gns/gnunet-gns-proxy.c:3827
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3856
+#: src/gns/gnunet-gns-proxy.c:3853
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199
+#: src/gns/gnunet-gns.c:178
+#, c-format
+msgid "`%s' is not a valid domain name\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:196
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:233
+#: src/gns/gnunet-gns.c:230
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:238
+#: src/gns/gnunet-gns.c:236
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:242
+#: src/gns/gnunet-gns.c:240
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:258
+#: src/gns/gnunet-gns.c:252
 msgid "GNUnet GNS resolver tool"
 msgstr ""
 
@@ -4145,7 +4150,7 @@ msgstr ""
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:452
+#: src/gns/plugin_rest_gns.c:451
 msgid "Gns REST API initialized\n"
 msgstr ""
 
@@ -4313,195 +4318,195 @@ msgstr ""
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:349
+#: src/hostlist/gnunet-daemon-hostlist_client.c:346
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:370
-#: src/hostlist/gnunet-daemon-hostlist_client.c:403
+#: src/hostlist/gnunet-daemon-hostlist_client.c:367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:400
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:373
-#: src/hostlist/gnunet-daemon-hostlist_client.c:406
+#: src/hostlist/gnunet-daemon-hostlist_client.c:370
+#: src/hostlist/gnunet-daemon-hostlist_client.c:403
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:391
+#: src/hostlist/gnunet-daemon-hostlist_client.c:388
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:661
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
+#: src/hostlist/gnunet-daemon-hostlist_client.c:658
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:691
+#: src/hostlist/gnunet-daemon-hostlist_client.c:688
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:734
+#: src/hostlist/gnunet-daemon-hostlist_client.c:731
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:862
+#: src/hostlist/gnunet-daemon-hostlist_client.c:859
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:876
+#: src/hostlist/gnunet-daemon-hostlist_client.c:873
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:893
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:902
+#: src/hostlist/gnunet-daemon-hostlist_client.c:899
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:910
+#: src/hostlist/gnunet-daemon-hostlist_client.c:907
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:963
+#: src/hostlist/gnunet-daemon-hostlist_client.c:960
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:971
+#: src/hostlist/gnunet-daemon-hostlist_client.c:968
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1098
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1665
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1095
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1662
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1107
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1104
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1166
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1187
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1163
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1184
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1350
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1355
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1364
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1447
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1454
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1478
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1495
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1490
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1595
-#: src/transport/plugin_transport_http_client.c:2274
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1592
+#: src/transport/plugin_transport_http_client.c:2271
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1624
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1621
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1638
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1651
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1648
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:176
+#: src/hostlist/gnunet-daemon-hostlist_server.c:172
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:201
+#: src/hostlist/gnunet-daemon-hostlist_server.c:198
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:237
-#: src/hostlist/gnunet-daemon-hostlist_server.c:531
+#: src/hostlist/gnunet-daemon-hostlist_server.c:235
+#: src/hostlist/gnunet-daemon-hostlist_server.c:526
 #: src/peerinfo-tool/gnunet-peerinfo.c:385
 #: src/peerinfo-tool/gnunet-peerinfo.c:534
-#: src/topology/gnunet-daemon-topology.c:859
+#: src/topology/gnunet-daemon-topology.c:801
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:261
+#: src/hostlist/gnunet-daemon-hostlist_server.c:256
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:278
+#: src/hostlist/gnunet-daemon-hostlist_server.c:274
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:382
+#: src/hostlist/gnunet-daemon-hostlist_server.c:376
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:385
+#: src/hostlist/gnunet-daemon-hostlist_server.c:380
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:397
+#: src/hostlist/gnunet-daemon-hostlist_server.c:393
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:398
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
@@ -4513,57 +4518,57 @@ msgstr ""
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:416
+#: src/hostlist/gnunet-daemon-hostlist_server.c:417
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:418
+#: src/hostlist/gnunet-daemon-hostlist_server.c:419
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:466
+#: src/hostlist/gnunet-daemon-hostlist_server.c:460
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:679
+#: src/hostlist/gnunet-daemon-hostlist_server.c:673
 #: src/transport/gnunet-service-transport.c:2827
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:691
+#: src/hostlist/gnunet-daemon-hostlist_server.c:684
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:703
+#: src/hostlist/gnunet-daemon-hostlist_server.c:696
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:718
+#: src/hostlist/gnunet-daemon-hostlist_server.c:713
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:731
+#: src/hostlist/gnunet-daemon-hostlist_server.c:728
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:748
+#: src/hostlist/gnunet-daemon-hostlist_server.c:742
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:769
+#: src/hostlist/gnunet-daemon-hostlist_server.c:764
 #, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:789
+#: src/hostlist/gnunet-daemon-hostlist_server.c:785
 #, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#: src/hostlist/gnunet-daemon-hostlist_server.c:828
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4684,7 +4689,7 @@ msgstr ""
 msgid "No records found for `%s'"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:454
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:459
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4704,15 +4709,15 @@ msgstr "fornat invalide : « %s »\n"
 msgid "You must specify a name\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1586
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1536
 msgid "name of the record to add/delete/display"
 msgstr ""
 
 #: src/namecache/gnunet-namecache.c:238
-msgid "spezifies the public key of the zone to look in"
+msgid "specifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1643
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1595
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
@@ -4822,212 +4827,212 @@ msgstr ""
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:341
+#: src/namestore/gnunet-namestore.c:334
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:371
+#: src/namestore/gnunet-namestore.c:362
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:378
+#: src/namestore/gnunet-namestore.c:369
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:660 src/namestore/gnunet-namestore.c:668
+#: src/namestore/gnunet-namestore.c:656 src/namestore/gnunet-namestore.c:666
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:682 src/namestore/gnunet-namestore.c:694
+#: src/namestore/gnunet-namestore.c:681 src/namestore/gnunet-namestore.c:694
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:707
+#: src/namestore/gnunet-namestore.c:709
 #, c-format
 msgid ""
 "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:837
+#: src/namestore/gnunet-namestore.c:829
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:878
+#: src/namestore/gnunet-namestore.c:872
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:965
+#: src/namestore/gnunet-namestore.c:953
 #, fuzzy, c-format
 msgid "Failed to replace records: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/namestore/gnunet-namestore.c:993
+#: src/namestore/gnunet-namestore.c:979
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1020
+#: src/namestore/gnunet-namestore.c:1006
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1043 src/namestore/gnunet-namestore.c:1076
-#: src/namestore/gnunet-namestore.c:1085 src/namestore/gnunet-namestore.c:1104
-#: src/namestore/gnunet-namestore.c:1127 src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1028 src/namestore/gnunet-namestore.c:1061
+#: src/namestore/gnunet-namestore.c:1071 src/namestore/gnunet-namestore.c:1089
+#: src/namestore/gnunet-namestore.c:1110 src/namestore/gnunet-namestore.c:1137
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1044
+#: src/namestore/gnunet-namestore.c:1030
 msgid "replace"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1077 src/namestore/gnunet-namestore.c:1086
-#: src/namestore/gnunet-namestore.c:1105 src/namestore/gnunet-namestore.c:1129
+#: src/namestore/gnunet-namestore.c:1063 src/namestore/gnunet-namestore.c:1073
+#: src/namestore/gnunet-namestore.c:1091 src/namestore/gnunet-namestore.c:1112
 msgid "add"
 msgstr "ajouter"
 
-#: src/namestore/gnunet-namestore.c:1095
+#: src/namestore/gnunet-namestore.c:1081
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1117
+#: src/namestore/gnunet-namestore.c:1100
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1140
+#: src/namestore/gnunet-namestore.c:1119
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1160
+#: src/namestore/gnunet-namestore.c:1139
 msgid "del"
 msgstr "supprimer"
 
-#: src/namestore/gnunet-namestore.c:1203
+#: src/namestore/gnunet-namestore.c:1182
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1232
+#: src/namestore/gnunet-namestore.c:1205
 #: src/peerinfo-tool/gnunet-peerinfo.c:775
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI invalide « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:1260
+#: src/namestore/gnunet-namestore.c:1231
 #, c-format
 msgid "Invalid nick `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1300
+#: src/namestore/gnunet-namestore.c:1269
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1352
+#: src/namestore/gnunet-namestore.c:1320
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1368
+#: src/namestore/gnunet-namestore.c:1331
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1418
+#: src/namestore/gnunet-namestore.c:1378
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1434
+#: src/namestore/gnunet-namestore.c:1390
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1446 src/namestore/gnunet-namestore.c:1464
-#: src/namestore/gnunet-namestore.c:1481
+#: src/namestore/gnunet-namestore.c:1402 src/namestore/gnunet-namestore.c:1418
+#: src/namestore/gnunet-namestore.c:1435
 #, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1455
+#: src/namestore/gnunet-namestore.c:1410
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Commande « %s » inconnue\n"
 
-#: src/namestore/gnunet-namestore.c:1495
+#: src/namestore/gnunet-namestore.c:1448
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:1559
+#: src/namestore/gnunet-namestore.c:1505
 msgid "add record"
 msgstr "ajouter un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1563
+#: src/namestore/gnunet-namestore.c:1508
 msgid "delete record"
 msgstr "suprimer un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1567
+#: src/namestore/gnunet-namestore.c:1512
 msgid "display records"
 msgstr "afficher les enregistrements"
 
-#: src/namestore/gnunet-namestore.c:1572
+#: src/namestore/gnunet-namestore.c:1519
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1577
+#: src/namestore/gnunet-namestore.c:1525
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1581
+#: src/namestore/gnunet-namestore.c:1530
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1591
+#: src/namestore/gnunet-namestore.c:1542
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1596
+#: src/namestore/gnunet-namestore.c:1549
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1601
+#: src/namestore/gnunet-namestore.c:1555
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1606
+#: src/namestore/gnunet-namestore.c:1560
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1611
+#: src/namestore/gnunet-namestore.c:1566
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1615
+#: src/namestore/gnunet-namestore.c:1570
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1619
+#: src/namestore/gnunet-namestore.c:1576
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1624
+#: src/namestore/gnunet-namestore.c:1582
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5052,7 +5057,7 @@ msgstr ""
 msgid "heap file database running\n"
 msgstr ""
 
-#: src/namestore/plugin_rest_namestore.c:1104
+#: src/namestore/plugin_rest_namestore.c:919
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
@@ -5355,7 +5360,7 @@ msgstr ""
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1532
+#: src/nse/gnunet-service-nse.c:1438
 #: src/revocation/gnunet-service-revocation.c:841 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
@@ -6585,68 +6590,68 @@ msgstr ""
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:230
+#: src/topology/gnunet-daemon-topology.c:228
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:343
+#: src/topology/gnunet-daemon-topology.c:334
 msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:537
+#: src/topology/gnunet-daemon-topology.c:513
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:638
-#: src/topology/gnunet-daemon-topology.c:724
+#: src/topology/gnunet-daemon-topology.c:600
+#: src/topology/gnunet-daemon-topology.c:680
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:919
+#: src/topology/gnunet-daemon-topology.c:851
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:951
+#: src/topology/gnunet-daemon-topology.c:877
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:958
+#: src/topology/gnunet-daemon-topology.c:884
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:980
+#: src/topology/gnunet-daemon-topology.c:902
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:983
+#: src/topology/gnunet-daemon-topology.c:905
 msgid "# friends in configuration"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:990
+#: src/topology/gnunet-daemon-topology.c:913
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:921
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:968
 #: src/transport/plugin_transport_wlan.c:1517
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1228
+#: src/topology/gnunet-daemon-topology.c:1128
 msgid "GNUnet topology control"
 msgstr ""
 
 #: src/transport/gnunet-communicator-tcp.c:2162
-#: src/transport/gnunet-communicator-udp.c:2707
-#: src/transport/gnunet-service-tng.c:8884
+#: src/transport/gnunet-communicator-udp.c:2699
+#: src/transport/gnunet-service-tng.c:9110
 #: src/transport/gnunet-service-transport.c:2795
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
@@ -6655,7 +6660,7 @@ msgstr ""
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2778
+#: src/transport/gnunet-communicator-udp.c:2770
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -7196,7 +7201,7 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1474
+#: src/transport/plugin_transport_http_client.c:1471
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3530
 #: src/transport/plugin_transport_tcp.c:3901
@@ -7204,24 +7209,24 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2115
+#: src/transport/plugin_transport_http_client.c:2112
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2164
+#: src/transport/plugin_transport_http_client.c:2161
 #: src/transport/plugin_transport_http_server.c:3245
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2181
+#: src/transport/plugin_transport_http_client.c:2178
 #: src/transport/plugin_transport_http_server.c:3315
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2215
+#: src/transport/plugin_transport_http_client.c:2212
 #, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr ""
@@ -7924,12 +7929,12 @@ msgstr ""
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/dnsparser.c:264
+#: src/util/dnsparser.c:261
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/util/dnsparser.c:954
+#: src/util/dnsparser.c:911
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
@@ -8363,17 +8368,17 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/util/program.c:283
+#: src/util/program.c:255
 #, fuzzy, c-format
 msgid "Unreadable or malformed configuration file `%s', exit ...\n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/util/program.c:301
+#: src/util/program.c:272
 #, c-format
 msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/util/program.c:318
+#: src/util/program.c:287
 #, fuzzy
 msgid "Unreadable or malformed configuration, exit ...\n"
 msgstr "fornat invalide : « %s »\n"
diff --git a/po/it.po b/po/it.po
index 185407f1b..cc2bc95c7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2019-04-30 07:47+0000\n"
+"POT-Creation-Date: 2019-05-08 11:34+0200\n"
 "PO-Revision-Date: 2019-04-23 20:58+0200\n"
 "Last-Translator: Sebastiano Pistore <address@hidden>\n"
 "Language-Team: Italian <address@hidden>\n"
@@ -20,82 +20,82 @@ msgstr ""
 "X-Generator: Poedit 2.2.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/gnunet-arm.c:156
+#: src/arm/gnunet-arm.c:157
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:163
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
+#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr "Messaggio inviato con successo"
 
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
+#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1141
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
+#: src/arm/gnunet-arm.c:227 src/testbed/gnunet-service-testbed_peers.c:1143
 msgid "Unknown request status"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:242
+#: src/arm/gnunet-arm.c:243
 #, fuzzy
 msgid "is stopped"
 msgstr "# elementi memorizzati"
 
-#: src/arm/gnunet-arm.c:244
+#: src/arm/gnunet-arm.c:245
 msgid "is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246
+#: src/arm/gnunet-arm.c:247
 #, fuzzy
 msgid "is stopping"
 msgstr "# elementi memorizzati"
 
-#: src/arm/gnunet-arm.c:248
+#: src/arm/gnunet-arm.c:249
 msgid "is starting already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:250
+#: src/arm/gnunet-arm.c:251
 #, fuzzy
 msgid "is stopping already"
 msgstr "# elementi memorizzati"
 
-#: src/arm/gnunet-arm.c:252
+#: src/arm/gnunet-arm.c:253
 msgid "is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254
+#: src/arm/gnunet-arm.c:255
 #, fuzzy
 msgid "is stopped already"
 msgstr "# elementi memorizzati"
 
-#: src/arm/gnunet-arm.c:256
+#: src/arm/gnunet-arm.c:257
 msgid "service is not known to ARM"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:258
+#: src/arm/gnunet-arm.c:259
 msgid "service failed to start"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:260
+#: src/arm/gnunet-arm.c:261
 msgid "service cannot be manipulated because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:262
+#: src/arm/gnunet-arm.c:263
 #, fuzzy
 msgid "Unknown result code."
 msgstr "Comando `%s' sconosciuto.\n"
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:294
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:323 src/arm/gnunet-arm.c:332
 #, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr ""
@@ -110,113 +110,113 @@ msgstr ""
 msgid "Failed to stop the ARM service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:419
+#: src/arm/gnunet-arm.c:417
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/arm/gnunet-arm.c:429
+#: src/arm/gnunet-arm.c:427
 #, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:467
+#: src/arm/gnunet-arm.c:466
 #, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:478
+#: src/arm/gnunet-arm.c:477
 #, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:519
+#: src/arm/gnunet-arm.c:517
 #, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:528
+#: src/arm/gnunet-arm.c:527
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:534
+#: src/arm/gnunet-arm.c:533
 msgid "Running services:\n"
 msgstr "Servizi in esecuzione:\n"
 
-#: src/arm/gnunet-arm.c:623
+#: src/arm/gnunet-arm.c:615
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:649
 #, c-format
 msgid "Stopped %s.\n"
 msgstr "%s arrestato.\n"
 
-#: src/arm/gnunet-arm.c:659
+#: src/arm/gnunet-arm.c:652
 #, c-format
 msgid "Starting %s...\n"
 msgstr "Avvio di %s in corso...\n"
 
-#: src/arm/gnunet-arm.c:662
+#: src/arm/gnunet-arm.c:655
 #, c-format
 msgid "Stopping %s...\n"
 msgstr "Arresto di %s in corso...\n"
 
-#: src/arm/gnunet-arm.c:676
+#: src/arm/gnunet-arm.c:667
 #, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:766
+#: src/arm/gnunet-arm.c:744
 msgid "stop all GNUnet services"
 msgstr "arresta tutti i servizi GNUnet"
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:749
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:754
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:759
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:784
+#: src/arm/gnunet-arm.c:764
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:788
+#: src/arm/gnunet-arm.c:769
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:792
+#: src/arm/gnunet-arm.c:773
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:796
+#: src/arm/gnunet-arm.c:777
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:801
+#: src/arm/gnunet-arm.c:784
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:805
+#: src/arm/gnunet-arm.c:789
 msgid "list currently running services"
 msgstr "elenca i servizi in esecuzione"
 
-#: src/arm/gnunet-arm.c:809
+#: src/arm/gnunet-arm.c:794
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:813
+#: src/arm/gnunet-arm.c:799
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:828
+#: src/arm/gnunet-arm.c:811
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -1230,33 +1230,33 @@ msgstr ""
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:347
+#: src/core/gnunet-service-core.c:329
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:371
+#: src/core/gnunet-service-core.c:355
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:443
+#: src/core/gnunet-service-core.c:420
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:541
+#: src/core/gnunet-service-core.c:508
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:879
+#: src/core/gnunet-service-core.c:828
 #, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:988
+#: src/core/gnunet-service-core.c:929
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1009
+#: src/core/gnunet-service-core.c:948
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Avvio del servizio '%s' in corso\n"
@@ -1397,36 +1397,36 @@ msgstr ""
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:260
-#: src/core/gnunet-service-core_sessions.c:350
+#: src/core/gnunet-service-core_sessions.c:254
+#: src/core/gnunet-service-core_sessions.c:339
 #: src/dht/gnunet-service-dht_neighbours.c:740
 #: src/dht/gnunet-service-dht_neighbours.c:803
 #: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1521
-#: src/topology/gnunet-daemon-topology.c:615
-#: src/topology/gnunet-daemon-topology.c:717
+#: src/topology/gnunet-daemon-topology.c:581
+#: src/topology/gnunet-daemon-topology.c:673
 #: src/transport/gnunet-service-transport_neighbours.c:720
 #: src/transport/gnunet-service-transport_neighbours.c:728
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:296
+#: src/core/gnunet-service-core_sessions.c:287
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:416
+#: src/core/gnunet-service-core_sessions.c:402
 msgid "# outdated typemap confirmations received"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:433
+#: src/core/gnunet-service-core_sessions.c:420
 msgid "# valid typemap confirmations received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:181
+#: src/core/gnunet-service-core_typemap.c:170
+#: src/core/gnunet-service-core_typemap.c:183
 msgid "# type maps received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:212
+#: src/core/gnunet-service-core_typemap.c:216
 msgid "# updates to my type map"
 msgstr ""
 
@@ -1435,7 +1435,7 @@ msgstr ""
 msgid "Unable to parse CRED record string `%s'\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:1005
+#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:991
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
@@ -1541,7 +1541,7 @@ msgstr ""
 
 #: src/credential/gnunet-service-credential.c:1071
 #: src/namestore/gnunet-namestore-fcfsd.c:1138
-#: src/namestore/gnunet-namestore.c:1030
+#: src/namestore/gnunet-namestore.c:1015
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr ""
@@ -3517,7 +3517,7 @@ msgid "FS service is lacking HOSTKEY configuration 
setting.  Exiting.\n"
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:1305 src/hostlist/gnunet-daemon-hostlist.c:353
-#: src/topology/gnunet-daemon-topology.c:1197
+#: src/topology/gnunet-daemon-topology.c:1100
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr ""
@@ -3931,139 +3931,144 @@ msgstr ""
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:118
-#: src/hostlist/gnunet-daemon-hostlist_client.c:535
-#: src/hostlist/gnunet-daemon-hostlist_client.c:753
-#: src/hostlist/gnunet-daemon-hostlist_client.c:759
-#: src/hostlist/gnunet-daemon-hostlist_client.c:811
-#: src/hostlist/gnunet-daemon-hostlist_client.c:820
-#: src/hostlist/gnunet-daemon-hostlist_client.c:931
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/transport/plugin_transport_http_client.c:598
-#: src/transport/plugin_transport_http_client.c:616
+#: src/gns/gnunet-gns-proxy.c:115
+#: src/hostlist/gnunet-daemon-hostlist_client.c:532
+#: src/hostlist/gnunet-daemon-hostlist_client.c:750
+#: src/hostlist/gnunet-daemon-hostlist_client.c:756
+#: src/hostlist/gnunet-daemon-hostlist_client.c:808
+#: src/hostlist/gnunet-daemon-hostlist_client.c:817
+#: src/hostlist/gnunet-daemon-hostlist_client.c:928
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1023
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1028
+#: src/transport/plugin_transport_http_client.c:595
+#: src/transport/plugin_transport_http_client.c:613
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:989
+#: src/gns/gnunet-gns-proxy.c:986
 #, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1014
+#: src/gns/gnunet-gns-proxy.c:1011
 #, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1035
+#: src/gns/gnunet-gns-proxy.c:1032
 #, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1050
+#: src/gns/gnunet-gns-proxy.c:1047
 #, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1065
+#: src/gns/gnunet-gns-proxy.c:1062
 #, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1075
+#: src/gns/gnunet-gns-proxy.c:1072
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1099
+#: src/gns/gnunet-gns-proxy.c:1096
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1230
+#: src/gns/gnunet-gns-proxy.c:1227
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2131
+#: src/gns/gnunet-gns-proxy.c:2128
 #, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2652
+#: src/gns/gnunet-gns-proxy.c:2649
 #, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2684
+#: src/gns/gnunet-gns-proxy.c:2681
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "Generazione statistiche fallita\n"
 
-#: src/gns/gnunet-gns-proxy.c:2885
+#: src/gns/gnunet-gns-proxy.c:2882
 #, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2907 src/rest/gnunet-rest-server.c:668
+#: src/gns/gnunet-gns-proxy.c:2904 src/rest/gnunet-rest-server.c:668
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3243
+#: src/gns/gnunet-gns-proxy.c:3240
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3272
+#: src/gns/gnunet-gns-proxy.c:3269
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3355
+#: src/gns/gnunet-gns-proxy.c:3352
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3693
+#: src/gns/gnunet-gns-proxy.c:3690
 #, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3821
+#: src/gns/gnunet-gns-proxy.c:3818
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3826
+#: src/gns/gnunet-gns-proxy.c:3823
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3830
+#: src/gns/gnunet-gns-proxy.c:3827
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3856
+#: src/gns/gnunet-gns-proxy.c:3853
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199
+#: src/gns/gnunet-gns.c:178
+#, fuzzy, c-format
+msgid "`%s' is not a valid domain name\n"
+msgstr "`%s' non è un indirizzo IP valido.\n"
+
+#: src/gns/gnunet-gns.c:196
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:233
+#: src/gns/gnunet-gns.c:230
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:238
+#: src/gns/gnunet-gns.c:236
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:242
+#: src/gns/gnunet-gns.c:240
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:258
+#: src/gns/gnunet-gns.c:252
 msgid "GNUnet GNS resolver tool"
 msgstr ""
 
@@ -4168,7 +4173,7 @@ msgstr ""
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/gns/plugin_rest_gns.c:452
+#: src/gns/plugin_rest_gns.c:451
 msgid "Gns REST API initialized\n"
 msgstr ""
 
@@ -4336,195 +4341,195 @@ msgstr ""
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:349
+#: src/hostlist/gnunet-daemon-hostlist_client.c:346
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:370
-#: src/hostlist/gnunet-daemon-hostlist_client.c:403
+#: src/hostlist/gnunet-daemon-hostlist_client.c:367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:400
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:373
-#: src/hostlist/gnunet-daemon-hostlist_client.c:406
+#: src/hostlist/gnunet-daemon-hostlist_client.c:370
+#: src/hostlist/gnunet-daemon-hostlist_client.c:403
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:391
+#: src/hostlist/gnunet-daemon-hostlist_client.c:388
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:661
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
+#: src/hostlist/gnunet-daemon-hostlist_client.c:658
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:691
+#: src/hostlist/gnunet-daemon-hostlist_client.c:688
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:734
+#: src/hostlist/gnunet-daemon-hostlist_client.c:731
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:862
+#: src/hostlist/gnunet-daemon-hostlist_client.c:859
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:876
+#: src/hostlist/gnunet-daemon-hostlist_client.c:873
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:893
 #, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:902
+#: src/hostlist/gnunet-daemon-hostlist_client.c:899
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:910
+#: src/hostlist/gnunet-daemon-hostlist_client.c:907
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:963
+#: src/hostlist/gnunet-daemon-hostlist_client.c:960
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:971
+#: src/hostlist/gnunet-daemon-hostlist_client.c:968
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1098
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1665
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1095
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1662
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1107
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1104
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1166
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1187
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1163
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1184
 msgid "# active connections"
 msgstr "# connessioni attive"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1350
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1355
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1364
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1447
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1454
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1478
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1495
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1490
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1595
-#: src/transport/plugin_transport_http_client.c:2274
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1592
+#: src/transport/plugin_transport_http_client.c:2271
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1624
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1621
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1638
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1651
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1648
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:176
+#: src/hostlist/gnunet-daemon-hostlist_server.c:172
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:201
+#: src/hostlist/gnunet-daemon-hostlist_server.c:198
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:237
-#: src/hostlist/gnunet-daemon-hostlist_server.c:531
+#: src/hostlist/gnunet-daemon-hostlist_server.c:235
+#: src/hostlist/gnunet-daemon-hostlist_server.c:526
 #: src/peerinfo-tool/gnunet-peerinfo.c:385
 #: src/peerinfo-tool/gnunet-peerinfo.c:534
-#: src/topology/gnunet-daemon-topology.c:859
+#: src/topology/gnunet-daemon-topology.c:801
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:261
+#: src/hostlist/gnunet-daemon-hostlist_server.c:256
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:278
+#: src/hostlist/gnunet-daemon-hostlist_server.c:274
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:382
+#: src/hostlist/gnunet-daemon-hostlist_server.c:376
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:385
+#: src/hostlist/gnunet-daemon-hostlist_server.c:380
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:397
+#: src/hostlist/gnunet-daemon-hostlist_server.c:393
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:398
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
@@ -4536,59 +4541,59 @@ msgstr ""
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:416
+#: src/hostlist/gnunet-daemon-hostlist_server.c:417
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:418
+#: src/hostlist/gnunet-daemon-hostlist_server.c:419
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:466
+#: src/hostlist/gnunet-daemon-hostlist_server.c:460
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:679
+#: src/hostlist/gnunet-daemon-hostlist_server.c:673
 #: src/transport/gnunet-service-transport.c:2827
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:691
+#: src/hostlist/gnunet-daemon-hostlist_server.c:684
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:703
+#: src/hostlist/gnunet-daemon-hostlist_server.c:696
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:718
+#: src/hostlist/gnunet-daemon-hostlist_server.c:713
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:731
+#: src/hostlist/gnunet-daemon-hostlist_server.c:728
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "`%s' non è un indirizzo IP valido.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:748
+#: src/hostlist/gnunet-daemon-hostlist_server.c:742
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "`%s' non è un indirizzo IP valido.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:769
+#: src/hostlist/gnunet-daemon-hostlist_server.c:764
 #, 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:789
+#: src/hostlist/gnunet-daemon-hostlist_server.c:785
 #, 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:829
+#: src/hostlist/gnunet-daemon-hostlist_server.c:828
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4709,7 +4714,7 @@ msgstr ""
 msgid "No records found for `%s'"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:454
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:459
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4729,15 +4734,15 @@ msgstr "# messaggi PONG ricevuti"
 msgid "You must specify a name\n"
 msgstr "È necessario specificare un nome\n"
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1586
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1536
 msgid "name of the record to add/delete/display"
 msgstr ""
 
 #: src/namecache/gnunet-namecache.c:238
-msgid "spezifies the public key of the zone to look in"
+msgid "specifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1643
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1595
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
@@ -4847,212 +4852,212 @@ msgstr ""
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:341
+#: src/namestore/gnunet-namestore.c:334
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:371
+#: src/namestore/gnunet-namestore.c:362
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:378
+#: src/namestore/gnunet-namestore.c:369
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:660 src/namestore/gnunet-namestore.c:668
+#: src/namestore/gnunet-namestore.c:656 src/namestore/gnunet-namestore.c:666
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:682 src/namestore/gnunet-namestore.c:694
+#: src/namestore/gnunet-namestore.c:681 src/namestore/gnunet-namestore.c:694
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:707
+#: src/namestore/gnunet-namestore.c:709
 #, c-format
 msgid ""
 "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:837
+#: src/namestore/gnunet-namestore.c:829
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:878
+#: src/namestore/gnunet-namestore.c:872
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:965
+#: src/namestore/gnunet-namestore.c:953
 #, fuzzy, c-format
 msgid "Failed to replace records: %s\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/namestore/gnunet-namestore.c:993
+#: src/namestore/gnunet-namestore.c:979
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1020
+#: src/namestore/gnunet-namestore.c:1006
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1043 src/namestore/gnunet-namestore.c:1076
-#: src/namestore/gnunet-namestore.c:1085 src/namestore/gnunet-namestore.c:1104
-#: src/namestore/gnunet-namestore.c:1127 src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1028 src/namestore/gnunet-namestore.c:1061
+#: src/namestore/gnunet-namestore.c:1071 src/namestore/gnunet-namestore.c:1089
+#: src/namestore/gnunet-namestore.c:1110 src/namestore/gnunet-namestore.c:1137
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1044
+#: src/namestore/gnunet-namestore.c:1030
 msgid "replace"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1077 src/namestore/gnunet-namestore.c:1086
-#: src/namestore/gnunet-namestore.c:1105 src/namestore/gnunet-namestore.c:1129
+#: src/namestore/gnunet-namestore.c:1063 src/namestore/gnunet-namestore.c:1073
+#: src/namestore/gnunet-namestore.c:1091 src/namestore/gnunet-namestore.c:1112
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1095
+#: src/namestore/gnunet-namestore.c:1081
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1117
+#: src/namestore/gnunet-namestore.c:1100
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1140
+#: src/namestore/gnunet-namestore.c:1119
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1160
+#: src/namestore/gnunet-namestore.c:1139
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1203
+#: src/namestore/gnunet-namestore.c:1182
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1232
+#: src/namestore/gnunet-namestore.c:1205
 #: src/peerinfo-tool/gnunet-peerinfo.c:775
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1260
+#: src/namestore/gnunet-namestore.c:1231
 #, c-format
 msgid "Invalid nick `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1300
+#: src/namestore/gnunet-namestore.c:1269
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1352
+#: src/namestore/gnunet-namestore.c:1320
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1368
+#: src/namestore/gnunet-namestore.c:1331
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1418
+#: src/namestore/gnunet-namestore.c:1378
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1434
+#: src/namestore/gnunet-namestore.c:1390
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1446 src/namestore/gnunet-namestore.c:1464
-#: src/namestore/gnunet-namestore.c:1481
+#: src/namestore/gnunet-namestore.c:1402 src/namestore/gnunet-namestore.c:1418
+#: src/namestore/gnunet-namestore.c:1435
 #, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1455
+#: src/namestore/gnunet-namestore.c:1410
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Comando `%s' sconosciuto.\n"
 
-#: src/namestore/gnunet-namestore.c:1495
+#: src/namestore/gnunet-namestore.c:1448
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "deve essere un indirizzo IPv6 valido"
 
-#: src/namestore/gnunet-namestore.c:1559
+#: src/namestore/gnunet-namestore.c:1505
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1563
+#: src/namestore/gnunet-namestore.c:1508
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1567
+#: src/namestore/gnunet-namestore.c:1512
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1572
+#: src/namestore/gnunet-namestore.c:1519
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1577
+#: src/namestore/gnunet-namestore.c:1525
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1581
+#: src/namestore/gnunet-namestore.c:1530
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1591
+#: src/namestore/gnunet-namestore.c:1542
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1596
+#: src/namestore/gnunet-namestore.c:1549
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1601
+#: src/namestore/gnunet-namestore.c:1555
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1606
+#: src/namestore/gnunet-namestore.c:1560
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1611
+#: src/namestore/gnunet-namestore.c:1566
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1615
+#: src/namestore/gnunet-namestore.c:1570
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1619
+#: src/namestore/gnunet-namestore.c:1576
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1624
+#: src/namestore/gnunet-namestore.c:1582
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5077,7 +5082,7 @@ msgstr ""
 msgid "heap file database running\n"
 msgstr ""
 
-#: src/namestore/plugin_rest_namestore.c:1104
+#: src/namestore/plugin_rest_namestore.c:919
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
@@ -5380,7 +5385,7 @@ msgstr ""
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1532
+#: src/nse/gnunet-service-nse.c:1438
 #: src/revocation/gnunet-service-revocation.c:841 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
@@ -6611,68 +6616,68 @@ msgstr ""
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:230
+#: src/topology/gnunet-daemon-topology.c:228
 msgid "# peers blacklisted"
 msgstr "# nodi in blacklist"
 
-#: src/topology/gnunet-daemon-topology.c:343
+#: src/topology/gnunet-daemon-topology.c:334
 msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:537
+#: src/topology/gnunet-daemon-topology.c:513
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:638
-#: src/topology/gnunet-daemon-topology.c:724
+#: src/topology/gnunet-daemon-topology.c:600
+#: src/topology/gnunet-daemon-topology.c:680
 msgid "# friends connected"
 msgstr "# amici connessi"
 
-#: src/topology/gnunet-daemon-topology.c:919
+#: src/topology/gnunet-daemon-topology.c:851
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:951
+#: src/topology/gnunet-daemon-topology.c:877
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:958
+#: src/topology/gnunet-daemon-topology.c:884
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:980
+#: src/topology/gnunet-daemon-topology.c:902
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:983
+#: src/topology/gnunet-daemon-topology.c:905
 msgid "# friends in configuration"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:990
+#: src/topology/gnunet-daemon-topology.c:913
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:921
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:968
 #: src/transport/plugin_transport_wlan.c:1517
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1228
+#: src/topology/gnunet-daemon-topology.c:1128
 msgid "GNUnet topology control"
 msgstr ""
 
 #: src/transport/gnunet-communicator-tcp.c:2162
-#: src/transport/gnunet-communicator-udp.c:2707
-#: src/transport/gnunet-service-tng.c:8884
+#: src/transport/gnunet-communicator-udp.c:2699
+#: src/transport/gnunet-service-tng.c:9110
 #: src/transport/gnunet-service-transport.c:2795
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
@@ -6681,7 +6686,7 @@ msgstr ""
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2778
+#: src/transport/gnunet-communicator-udp.c:2770
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -7236,7 +7241,7 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1474
+#: src/transport/plugin_transport_http_client.c:1471
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3530
 #: src/transport/plugin_transport_tcp.c:3901
@@ -7244,24 +7249,24 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2115
+#: src/transport/plugin_transport_http_client.c:2112
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2164
+#: src/transport/plugin_transport_http_client.c:2161
 #: src/transport/plugin_transport_http_server.c:3245
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2181
+#: src/transport/plugin_transport_http_client.c:2178
 #: src/transport/plugin_transport_http_server.c:3315
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2215
+#: src/transport/plugin_transport_http_client.c:2212
 #, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr ""
@@ -7971,12 +7976,12 @@ msgstr ""
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/dnsparser.c:264
+#: src/util/dnsparser.c:261
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 
-#: src/util/dnsparser.c:954
+#: src/util/dnsparser.c:911
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
@@ -8409,17 +8414,17 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/util/program.c:283
+#: src/util/program.c:255
 #, c-format
 msgid "Unreadable or malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/util/program.c:301
+#: src/util/program.c:272
 #, c-format
 msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/util/program.c:318
+#: src/util/program.c:287
 msgid "Unreadable or malformed configuration, exit ...\n"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 08a1f0e40..285f25dda 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: 2019-04-30 07:47+0000\n"
+"POT-Creation-Date: 2019-05-08 11:34+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"
@@ -16,89 +16,89 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/gnunet-arm.c:156
+#: src/arm/gnunet-arm.c:157
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:163
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
+#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
+#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1141
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# av anslutna parter"
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
+#: src/arm/gnunet-arm.c:227 src/testbed/gnunet-service-testbed_peers.c:1143
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:242
+#: src/arm/gnunet-arm.c:243
 #, fuzzy
 msgid "is stopped"
 msgstr "# byte krypterade"
 
-#: src/arm/gnunet-arm.c:244
+#: src/arm/gnunet-arm.c:245
 #, fuzzy
 msgid "is starting"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:246
+#: src/arm/gnunet-arm.c:247
 #, fuzzy
 msgid "is stopping"
 msgstr "# byte krypterade"
 
-#: src/arm/gnunet-arm.c:248
+#: src/arm/gnunet-arm.c:249
 #, fuzzy
 msgid "is starting already"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:250
+#: src/arm/gnunet-arm.c:251
 #, fuzzy
 msgid "is stopping already"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:252
+#: src/arm/gnunet-arm.c:253
 #, fuzzy
 msgid "is started already"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:254
+#: src/arm/gnunet-arm.c:255
 #, fuzzy
 msgid "is stopped already"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:256
+#: src/arm/gnunet-arm.c:257
 #, fuzzy
 msgid "service is not known to ARM"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:258
+#: src/arm/gnunet-arm.c:259
 #, fuzzy
 msgid "service failed to start"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:260
+#: src/arm/gnunet-arm.c:261
 msgid "service cannot be manipulated because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:262
+#: src/arm/gnunet-arm.c:263
 #, fuzzy
 msgid "Unknown result code."
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:294
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:323 src/arm/gnunet-arm.c:332
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
@@ -113,116 +113,116 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:419
+#: src/arm/gnunet-arm.c:417
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:429
+#: src/arm/gnunet-arm.c:427
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:467
+#: src/arm/gnunet-arm.c:466
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:478
+#: src/arm/gnunet-arm.c:477
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:519
+#: src/arm/gnunet-arm.c:517
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:528
+#: src/arm/gnunet-arm.c:527
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:534
+#: src/arm/gnunet-arm.c:533
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:623
+#: src/arm/gnunet-arm.c:615
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:649
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:659
+#: src/arm/gnunet-arm.c:652
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:662
+#: src/arm/gnunet-arm.c:655
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:676
+#: src/arm/gnunet-arm.c:667
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:766
+#: src/arm/gnunet-arm.c:744
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:749
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:754
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:759
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:784
+#: src/arm/gnunet-arm.c:764
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:788
+#: src/arm/gnunet-arm.c:769
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:792
+#: src/arm/gnunet-arm.c:773
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:796
+#: src/arm/gnunet-arm.c:777
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:801
+#: src/arm/gnunet-arm.c:784
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:805
+#: src/arm/gnunet-arm.c:789
 #, fuzzy
 msgid "list currently running services"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:809
+#: src/arm/gnunet-arm.c:794
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:813
+#: src/arm/gnunet-arm.c:799
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:828
+#: src/arm/gnunet-arm.c:811
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -1271,35 +1271,35 @@ msgstr "Skriv ut information om GNUnets motparter."
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-service-core.c:347
+#: src/core/gnunet-service-core.c:329
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:371
+#: src/core/gnunet-service-core.c:355
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:443
+#: src/core/gnunet-service-core.c:420
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core.c:541
+#: src/core/gnunet-service-core.c:508
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core.c:879
+#: src/core/gnunet-service-core.c:828
 #, fuzzy, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core.c:988
+#: src/core/gnunet-service-core.c:929
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/core/gnunet-service-core.c:1009
+#: src/core/gnunet-service-core.c:948
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "\"%s\" är inte en fil.\n"
@@ -1460,40 +1460,40 @@ msgstr "# byte kastade via UDP (utgående)"
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_sessions.c:260
-#: src/core/gnunet-service-core_sessions.c:350
+#: src/core/gnunet-service-core_sessions.c:254
+#: src/core/gnunet-service-core_sessions.c:339
 #: src/dht/gnunet-service-dht_neighbours.c:740
 #: src/dht/gnunet-service-dht_neighbours.c:803
 #: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1521
-#: src/topology/gnunet-daemon-topology.c:615
-#: src/topology/gnunet-daemon-topology.c:717
+#: src/topology/gnunet-daemon-topology.c:581
+#: src/topology/gnunet-daemon-topology.c:673
 #: src/transport/gnunet-service-transport_neighbours.c:720
 #: src/transport/gnunet-service-transport_neighbours.c:728
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
 
-#: src/core/gnunet-service-core_sessions.c:296
+#: src/core/gnunet-service-core_sessions.c:287
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:416
+#: src/core/gnunet-service-core_sessions.c:402
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/core/gnunet-service-core_sessions.c:433
+#: src/core/gnunet-service-core_sessions.c:420
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:181
+#: src/core/gnunet-service-core_typemap.c:170
+#: src/core/gnunet-service-core_typemap.c:183
 #, fuzzy
 msgid "# type maps received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_typemap.c:212
+#: src/core/gnunet-service-core_typemap.c:216
 msgid "# updates to my type map"
 msgstr ""
 
@@ -1502,7 +1502,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:264 src/namestore/gnunet-namestore.c:1005
+#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:991
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
@@ -1612,7 +1612,7 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/credential/gnunet-service-credential.c:1071
 #: src/namestore/gnunet-namestore-fcfsd.c:1138
-#: src/namestore/gnunet-namestore.c:1030
+#: src/namestore/gnunet-namestore.c:1015
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -3689,7 +3689,7 @@ msgid "FS service is lacking HOSTKEY configuration 
setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
 #: src/fs/gnunet-service-fs.c:1305 src/hostlist/gnunet-daemon-hostlist.c:353
-#: src/topology/gnunet-daemon-topology.c:1197
+#: src/topology/gnunet-daemon-topology.c:1100
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -4127,141 +4127,146 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:118
-#: src/hostlist/gnunet-daemon-hostlist_client.c:535
-#: src/hostlist/gnunet-daemon-hostlist_client.c:753
-#: src/hostlist/gnunet-daemon-hostlist_client.c:759
-#: src/hostlist/gnunet-daemon-hostlist_client.c:811
-#: src/hostlist/gnunet-daemon-hostlist_client.c:820
-#: src/hostlist/gnunet-daemon-hostlist_client.c:931
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/transport/plugin_transport_http_client.c:598
-#: src/transport/plugin_transport_http_client.c:616
+#: src/gns/gnunet-gns-proxy.c:115
+#: src/hostlist/gnunet-daemon-hostlist_client.c:532
+#: src/hostlist/gnunet-daemon-hostlist_client.c:750
+#: src/hostlist/gnunet-daemon-hostlist_client.c:756
+#: src/hostlist/gnunet-daemon-hostlist_client.c:808
+#: src/hostlist/gnunet-daemon-hostlist_client.c:817
+#: src/hostlist/gnunet-daemon-hostlist_client.c:928
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1023
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1028
+#: src/transport/plugin_transport_http_client.c:595
+#: src/transport/plugin_transport_http_client.c:613
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/gns/gnunet-gns-proxy.c:989
+#: src/gns/gnunet-gns-proxy.c:986
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1014
+#: src/gns/gnunet-gns-proxy.c:1011
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1035
+#: src/gns/gnunet-gns-proxy.c:1032
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1050
+#: src/gns/gnunet-gns-proxy.c:1047
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1065
+#: src/gns/gnunet-gns-proxy.c:1062
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:1075
+#: src/gns/gnunet-gns-proxy.c:1072
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1099
+#: src/gns/gnunet-gns-proxy.c:1096
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1230
+#: src/gns/gnunet-gns-proxy.c:1227
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2131
+#: src/gns/gnunet-gns-proxy.c:2128
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2652
+#: src/gns/gnunet-gns-proxy.c:2649
 #, 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:2684
+#: src/gns/gnunet-gns-proxy.c:2681
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:2885
+#: src/gns/gnunet-gns-proxy.c:2882
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2907 src/rest/gnunet-rest-server.c:668
+#: src/gns/gnunet-gns-proxy.c:2904 src/rest/gnunet-rest-server.c:668
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3243
+#: src/gns/gnunet-gns-proxy.c:3240
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3272
+#: src/gns/gnunet-gns-proxy.c:3269
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3355
+#: src/gns/gnunet-gns-proxy.c:3352
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3693
+#: src/gns/gnunet-gns-proxy.c:3690
 #, 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:3821
+#: src/gns/gnunet-gns-proxy.c:3818
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3826
+#: src/gns/gnunet-gns-proxy.c:3823
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3830
+#: src/gns/gnunet-gns-proxy.c:3827
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3856
+#: src/gns/gnunet-gns-proxy.c:3853
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199
+#: src/gns/gnunet-gns.c:178
+#, fuzzy, c-format
+msgid "`%s' is not a valid domain name\n"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/gns/gnunet-gns.c:196
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:233
+#: src/gns/gnunet-gns.c:230
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:238
+#: src/gns/gnunet-gns.c:236
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:242
+#: src/gns/gnunet-gns.c:240
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:258
+#: src/gns/gnunet-gns.c:252
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Spåra GNUnets nätverkstopologi."
@@ -4371,7 +4376,7 @@ 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:452
+#: src/gns/plugin_rest_gns.c:451
 #, fuzzy
 msgid "Gns REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -4544,199 +4549,199 @@ msgstr ""
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:349
+#: src/hostlist/gnunet-daemon-hostlist_client.c:346
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:370
-#: src/hostlist/gnunet-daemon-hostlist_client.c:403
+#: src/hostlist/gnunet-daemon-hostlist_client.c:367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:400
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:373
-#: src/hostlist/gnunet-daemon-hostlist_client.c:406
+#: src/hostlist/gnunet-daemon-hostlist_client.c:370
+#: src/hostlist/gnunet-daemon-hostlist_client.c:403
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:391
+#: src/hostlist/gnunet-daemon-hostlist_client.c:388
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:661
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
+#: src/hostlist/gnunet-daemon-hostlist_client.c:658
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:691
+#: src/hostlist/gnunet-daemon-hostlist_client.c:688
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:734
+#: src/hostlist/gnunet-daemon-hostlist_client.c:731
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:862
+#: src/hostlist/gnunet-daemon-hostlist_client.c:859
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:876
+#: src/hostlist/gnunet-daemon-hostlist_client.c:873
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:893
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:902
+#: src/hostlist/gnunet-daemon-hostlist_client.c:899
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:910
+#: src/hostlist/gnunet-daemon-hostlist_client.c:907
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:963
+#: src/hostlist/gnunet-daemon-hostlist_client.c:960
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:971
+#: src/hostlist/gnunet-daemon-hostlist_client.c:968
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1098
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1665
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1095
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1662
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1107
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1104
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1166
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1187
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1163
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1184
 #, fuzzy
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1350
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1355
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1364
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1447
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1454
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1478
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1495
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1490
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1595
-#: src/transport/plugin_transport_http_client.c:2274
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1592
+#: src/transport/plugin_transport_http_client.c:2271
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1624
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1621
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1638
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1651
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1648
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:176
+#: src/hostlist/gnunet-daemon-hostlist_server.c:172
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# byte krypterade"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:201
+#: src/hostlist/gnunet-daemon-hostlist_server.c:198
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:237
-#: src/hostlist/gnunet-daemon-hostlist_server.c:531
+#: src/hostlist/gnunet-daemon-hostlist_server.c:235
+#: src/hostlist/gnunet-daemon-hostlist_server.c:526
 #: src/peerinfo-tool/gnunet-peerinfo.c:385
 #: src/peerinfo-tool/gnunet-peerinfo.c:534
-#: src/topology/gnunet-daemon-topology.c:859
+#: src/topology/gnunet-daemon-topology.c:801
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:261
+#: src/hostlist/gnunet-daemon-hostlist_server.c:256
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:278
+#: src/hostlist/gnunet-daemon-hostlist_server.c:274
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:382
+#: src/hostlist/gnunet-daemon-hostlist_server.c:376
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:385
+#: src/hostlist/gnunet-daemon-hostlist_server.c:380
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:397
+#: src/hostlist/gnunet-daemon-hostlist_server.c:393
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:398
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
@@ -4748,60 +4753,60 @@ msgstr ""
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:416
+#: src/hostlist/gnunet-daemon-hostlist_server.c:417
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:418
+#: src/hostlist/gnunet-daemon-hostlist_server.c:419
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:466
+#: src/hostlist/gnunet-daemon-hostlist_server.c:460
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:679
+#: src/hostlist/gnunet-daemon-hostlist_server.c:673
 #: src/transport/gnunet-service-transport.c:2827
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:691
+#: src/hostlist/gnunet-daemon-hostlist_server.c:684
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:703
+#: src/hostlist/gnunet-daemon-hostlist_server.c:696
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:718
+#: src/hostlist/gnunet-daemon-hostlist_server.c:713
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:731
+#: src/hostlist/gnunet-daemon-hostlist_server.c:728
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:748
+#: src/hostlist/gnunet-daemon-hostlist_server.c:742
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:769
+#: src/hostlist/gnunet-daemon-hostlist_server.c:764
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:789
+#: src/hostlist/gnunet-daemon-hostlist_server.c:785
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#: src/hostlist/gnunet-daemon-hostlist_server.c:828
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4923,7 +4928,7 @@ msgstr "Kunde inte köra \"%s\": %s\n"
 msgid "No records found for `%s'"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:454
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:459
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4943,16 +4948,16 @@ msgstr "Ogiltigt argument: \"%s\"\n"
 msgid "You must specify a name\n"
 msgstr "Du måste ange en mottagare!\n"
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1586
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1536
 msgid "name of the record to add/delete/display"
 msgstr ""
 
 #: src/namecache/gnunet-namecache.c:238
 #, fuzzy
-msgid "spezifies the public key of the zone to look in"
+msgid "specifies the public key of the zone to look in"
 msgstr "ange prioritet för innehållet"
 
-#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1643
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1595
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
@@ -5066,221 +5071,221 @@ msgstr ""
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:341
+#: src/namestore/gnunet-namestore.c:334
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:371
+#: src/namestore/gnunet-namestore.c:362
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:378
+#: src/namestore/gnunet-namestore.c:369
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:660 src/namestore/gnunet-namestore.c:668
+#: src/namestore/gnunet-namestore.c:656 src/namestore/gnunet-namestore.c:666
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:682 src/namestore/gnunet-namestore.c:694
+#: src/namestore/gnunet-namestore.c:681 src/namestore/gnunet-namestore.c:694
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:707
+#: src/namestore/gnunet-namestore.c:709
 #, c-format
 msgid ""
 "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:837
+#: src/namestore/gnunet-namestore.c:829
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:878
+#: src/namestore/gnunet-namestore.c:872
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:965
+#: src/namestore/gnunet-namestore.c:953
 #, fuzzy, c-format
 msgid "Failed to replace records: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/namestore/gnunet-namestore.c:993
+#: src/namestore/gnunet-namestore.c:979
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1020
+#: src/namestore/gnunet-namestore.c:1006
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1043 src/namestore/gnunet-namestore.c:1076
-#: src/namestore/gnunet-namestore.c:1085 src/namestore/gnunet-namestore.c:1104
-#: src/namestore/gnunet-namestore.c:1127 src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1028 src/namestore/gnunet-namestore.c:1061
+#: src/namestore/gnunet-namestore.c:1071 src/namestore/gnunet-namestore.c:1089
+#: src/namestore/gnunet-namestore.c:1110 src/namestore/gnunet-namestore.c:1137
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore.c:1044
+#: src/namestore/gnunet-namestore.c:1030
 msgid "replace"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1077 src/namestore/gnunet-namestore.c:1086
-#: src/namestore/gnunet-namestore.c:1105 src/namestore/gnunet-namestore.c:1129
+#: src/namestore/gnunet-namestore.c:1063 src/namestore/gnunet-namestore.c:1073
+#: src/namestore/gnunet-namestore.c:1091 src/namestore/gnunet-namestore.c:1112
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1095
+#: src/namestore/gnunet-namestore.c:1081
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore.c:1117
+#: src/namestore/gnunet-namestore.c:1100
 #, 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:1140
+#: src/namestore/gnunet-namestore.c:1119
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:1160
+#: src/namestore/gnunet-namestore.c:1139
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1203
+#: src/namestore/gnunet-namestore.c:1182
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:1232
+#: src/namestore/gnunet-namestore.c:1205
 #: src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:1260
+#: src/namestore/gnunet-namestore.c:1231
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:1300
+#: src/namestore/gnunet-namestore.c:1269
 #, 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:1352
+#: src/namestore/gnunet-namestore.c:1320
 #, fuzzy, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr "Onödiga argument (ignorerade).\n"
 
-#: src/namestore/gnunet-namestore.c:1368
+#: src/namestore/gnunet-namestore.c:1331
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1418
+#: src/namestore/gnunet-namestore.c:1378
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1434
+#: src/namestore/gnunet-namestore.c:1390
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1446 src/namestore/gnunet-namestore.c:1464
-#: src/namestore/gnunet-namestore.c:1481
+#: src/namestore/gnunet-namestore.c:1402 src/namestore/gnunet-namestore.c:1418
+#: src/namestore/gnunet-namestore.c:1435
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/namestore/gnunet-namestore.c:1455
+#: src/namestore/gnunet-namestore.c:1410
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:1495
+#: src/namestore/gnunet-namestore.c:1448
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:1559
+#: src/namestore/gnunet-namestore.c:1505
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1563
+#: src/namestore/gnunet-namestore.c:1508
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1567
+#: src/namestore/gnunet-namestore.c:1512
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1572
+#: src/namestore/gnunet-namestore.c:1519
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1577
+#: src/namestore/gnunet-namestore.c:1525
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1581
+#: src/namestore/gnunet-namestore.c:1530
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1591
+#: src/namestore/gnunet-namestore.c:1542
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1596
+#: src/namestore/gnunet-namestore.c:1549
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1601
+#: src/namestore/gnunet-namestore.c:1555
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1606
+#: src/namestore/gnunet-namestore.c:1560
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1611
+#: src/namestore/gnunet-namestore.c:1566
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1615
+#: src/namestore/gnunet-namestore.c:1570
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1619
+#: src/namestore/gnunet-namestore.c:1576
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1624
+#: src/namestore/gnunet-namestore.c:1582
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
@@ -5306,7 +5311,7 @@ msgstr ""
 msgid "heap file database running\n"
 msgstr ""
 
-#: src/namestore/plugin_rest_namestore.c:1104
+#: src/namestore/plugin_rest_namestore.c:919
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -5628,7 +5633,7 @@ msgstr "Kan inte tillgå tjänsten"
 msgid "Show network size estimates from NSE service."
 msgstr "# byte mottogs via TCP"
 
-#: src/nse/gnunet-service-nse.c:1532
+#: src/nse/gnunet-service-nse.c:1438
 #: src/revocation/gnunet-service-revocation.c:841 src/util/gnunet-scrypt.c:276
 msgid "Value is too large.\n"
 msgstr ""
@@ -6908,72 +6913,72 @@ msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad 
%d.\n"
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:230
+#: src/topology/gnunet-daemon-topology.c:228
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:343
+#: src/topology/gnunet-daemon-topology.c:334
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# byte mottogs via TCP"
 
-#: src/topology/gnunet-daemon-topology.c:537
+#: src/topology/gnunet-daemon-topology.c:513
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:638
-#: src/topology/gnunet-daemon-topology.c:724
+#: src/topology/gnunet-daemon-topology.c:600
+#: src/topology/gnunet-daemon-topology.c:680
 #, fuzzy
 msgid "# friends connected"
 msgstr "# av anslutna parter"
 
-#: src/topology/gnunet-daemon-topology.c:919
+#: src/topology/gnunet-daemon-topology.c:851
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:951
+#: src/topology/gnunet-daemon-topology.c:877
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:958
+#: src/topology/gnunet-daemon-topology.c:884
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:980
+#: src/topology/gnunet-daemon-topology.c:902
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:983
+#: src/topology/gnunet-daemon-topology.c:905
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:990
+#: src/topology/gnunet-daemon-topology.c:913
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:921
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:968
 #: src/transport/plugin_transport_wlan.c:1517
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/topology/gnunet-daemon-topology.c:1228
+#: src/topology/gnunet-daemon-topology.c:1128
 msgid "GNUnet topology control"
 msgstr ""
 
 #: src/transport/gnunet-communicator-tcp.c:2162
-#: src/transport/gnunet-communicator-udp.c:2707
-#: src/transport/gnunet-service-tng.c:8884
+#: src/transport/gnunet-communicator-udp.c:2699
+#: src/transport/gnunet-service-tng.c:9110
 #: src/transport/gnunet-service-transport.c:2795
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
@@ -6983,7 +6988,7 @@ msgstr "GNUnet-konfiguration"
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2778
+#: src/transport/gnunet-communicator-udp.c:2770
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -7573,7 +7578,7 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1474
+#: src/transport/plugin_transport_http_client.c:1471
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3530
 #: src/transport/plugin_transport_tcp.c:3901
@@ -7581,25 +7586,25 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2115
+#: src/transport/plugin_transport_http_client.c:2112
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2164
+#: src/transport/plugin_transport_http_client.c:2161
 #: src/transport/plugin_transport_http_server.c:3245
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:2181
+#: src/transport/plugin_transport_http_client.c:2178
 #: src/transport/plugin_transport_http_server.c:3315
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/transport/plugin_transport_http_client.c:2215
+#: src/transport/plugin_transport_http_client.c:2212
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
@@ -8342,12 +8347,12 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: 
\"%s\".\n"
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/dnsparser.c:264
+#: src/util/dnsparser.c:261
 #, 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:954
+#: src/util/dnsparser.c:911
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -8788,17 +8793,17 @@ 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/program.c:283
+#: src/util/program.c:255
 #, fuzzy, c-format
 msgid "Unreadable or malformed configuration file `%s', exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/program.c:301
+#: src/util/program.c:272
 #, fuzzy, c-format
 msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/program.c:318
+#: src/util/program.c:287
 #, fuzzy
 msgid "Unreadable or malformed configuration, exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
diff --git a/po/vi.po b/po/vi.po
index a1496522f..3a7c1d908 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: 2019-04-30 07:47+0000\n"
+"POT-Creation-Date: 2019-05-08 11:34+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"
@@ -19,90 +19,90 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/arm/gnunet-arm.c:156
+#: src/arm/gnunet-arm.c:157
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:163
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
+#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
+#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1141
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
+#: src/arm/gnunet-arm.c:227 src/testbed/gnunet-service-testbed_peers.c:1143
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Không rõ người dùng « %s »\n"
 
-#: src/arm/gnunet-arm.c:242
+#: src/arm/gnunet-arm.c:243
 #, fuzzy
 msgid "is stopped"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/arm/gnunet-arm.c:244
+#: src/arm/gnunet-arm.c:245
 #, fuzzy
 msgid "is starting"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:246
+#: src/arm/gnunet-arm.c:247
 #, fuzzy
 msgid "is stopping"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/arm/gnunet-arm.c:248
+#: src/arm/gnunet-arm.c:249
 #, fuzzy
 msgid "is starting already"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:250
+#: src/arm/gnunet-arm.c:251
 #, fuzzy
 msgid "is stopping already"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:252
+#: src/arm/gnunet-arm.c:253
 #, fuzzy
 msgid "is started already"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:254
+#: src/arm/gnunet-arm.c:255
 #, fuzzy
 msgid "is stopped already"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:256
+#: src/arm/gnunet-arm.c:257
 #, fuzzy
 msgid "service is not known to ARM"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/arm/gnunet-arm.c:258
+#: src/arm/gnunet-arm.c:259
 #, fuzzy
 msgid "service failed to start"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:260
+#: src/arm/gnunet-arm.c:261
 #, fuzzy
 msgid "service cannot be manipulated because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
 
-#: src/arm/gnunet-arm.c:262
+#: src/arm/gnunet-arm.c:263
 #, fuzzy
 msgid "Unknown result code."
 msgstr "Không rõ người dùng « %s »\n"
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:294
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:323 src/arm/gnunet-arm.c:332
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
@@ -117,119 +117,119 @@ msgstr "Lỗi kết nối đến gnunetd.\n"
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "Lỗi vào phòng « %s »\n"
 
-#: src/arm/gnunet-arm.c:419
+#: src/arm/gnunet-arm.c:417
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:429
+#: src/arm/gnunet-arm.c:427
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:467
+#: src/arm/gnunet-arm.c:466
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:478
+#: src/arm/gnunet-arm.c:477
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/arm/gnunet-arm.c:519
+#: src/arm/gnunet-arm.c:517
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:528
+#: src/arm/gnunet-arm.c:527
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/arm/gnunet-arm.c:534
+#: src/arm/gnunet-arm.c:533
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:623
+#: src/arm/gnunet-arm.c:615
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:649
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:659
+#: src/arm/gnunet-arm.c:652
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-arm.c:662
+#: src/arm/gnunet-arm.c:655
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:676
+#: src/arm/gnunet-arm.c:667
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Không rõ người dùng « %s »\n"
 
-#: src/arm/gnunet-arm.c:766
+#: src/arm/gnunet-arm.c:744
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:749
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:754
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:759
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:784
+#: src/arm/gnunet-arm.c:764
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:788
+#: src/arm/gnunet-arm.c:769
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:792
+#: src/arm/gnunet-arm.c:773
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:796
+#: src/arm/gnunet-arm.c:777
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:801
+#: src/arm/gnunet-arm.c:784
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:805
+#: src/arm/gnunet-arm.c:789
 #, fuzzy
 msgid "list currently running services"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:809
+#: src/arm/gnunet-arm.c:794
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:813
+#: src/arm/gnunet-arm.c:799
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:828
+#: src/arm/gnunet-arm.c:811
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -1278,36 +1278,36 @@ msgstr "In ra thông tin về các đồng đẳng GNUnet."
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/core/gnunet-service-core.c:347
+#: src/core/gnunet-service-core.c:329
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core.c:371
+#: src/core/gnunet-service-core.c:355
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:443
+#: src/core/gnunet-service-core.c:420
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# các byte nhiễu được nhận"
 
-#: src/core/gnunet-service-core.c:541
+#: src/core/gnunet-service-core.c:508
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core.c:879
+#: src/core/gnunet-service-core.c:828
 #, fuzzy, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# các byte nhiễu được nhận"
 
-#: src/core/gnunet-service-core.c:988
+#: src/core/gnunet-service-core.c:929
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/core/gnunet-service-core.c:1009
+#: src/core/gnunet-service-core.c:948
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
@@ -1468,41 +1468,41 @@ msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_sessions.c:260
-#: src/core/gnunet-service-core_sessions.c:350
+#: src/core/gnunet-service-core_sessions.c:254
+#: src/core/gnunet-service-core_sessions.c:339
 #: src/dht/gnunet-service-dht_neighbours.c:740
 #: src/dht/gnunet-service-dht_neighbours.c:803
 #: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1521
-#: src/topology/gnunet-daemon-topology.c:615
-#: src/topology/gnunet-daemon-topology.c:717
+#: src/topology/gnunet-daemon-topology.c:581
+#: src/topology/gnunet-daemon-topology.c:673
 #: src/transport/gnunet-service-transport_neighbours.c:720
 #: src/transport/gnunet-service-transport_neighbours.c:728
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/core/gnunet-service-core_sessions.c:296
+#: src/core/gnunet-service-core_sessions.c:287
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# tổng số yêu cầu lỗ hổng được gửi"
 
-#: src/core/gnunet-service-core_sessions.c:416
+#: src/core/gnunet-service-core_sessions.c:402
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/core/gnunet-service-core_sessions.c:433
+#: src/core/gnunet-service-core_sessions.c:420
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:181
+#: src/core/gnunet-service-core_typemap.c:170
+#: src/core/gnunet-service-core_typemap.c:183
 #, fuzzy
 msgid "# type maps received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_typemap.c:212
+#: src/core/gnunet-service-core_typemap.c:216
 msgid "# updates to my type map"
 msgstr ""
 
@@ -1511,7 +1511,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:264 src/namestore/gnunet-namestore.c:1005
+#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:991
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
@@ -1621,7 +1621,7 @@ msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #: src/credential/gnunet-service-credential.c:1071
 #: src/namestore/gnunet-namestore-fcfsd.c:1138
-#: src/namestore/gnunet-namestore.c:1030
+#: src/namestore/gnunet-namestore.c:1015
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -3728,7 +3728,7 @@ msgid "FS service is lacking HOSTKEY configuration 
setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
 #: src/fs/gnunet-service-fs.c:1305 src/hostlist/gnunet-daemon-hostlist.c:353
-#: src/topology/gnunet-daemon-topology.c:1197
+#: src/topology/gnunet-daemon-topology.c:1100
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -4174,141 +4174,146 @@ msgstr "Lỗi kết nối đến gnunetd.\n"
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:118
-#: src/hostlist/gnunet-daemon-hostlist_client.c:535
-#: src/hostlist/gnunet-daemon-hostlist_client.c:753
-#: src/hostlist/gnunet-daemon-hostlist_client.c:759
-#: src/hostlist/gnunet-daemon-hostlist_client.c:811
-#: src/hostlist/gnunet-daemon-hostlist_client.c:820
-#: src/hostlist/gnunet-daemon-hostlist_client.c:931
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/transport/plugin_transport_http_client.c:598
-#: src/transport/plugin_transport_http_client.c:616
+#: src/gns/gnunet-gns-proxy.c:115
+#: src/hostlist/gnunet-daemon-hostlist_client.c:532
+#: src/hostlist/gnunet-daemon-hostlist_client.c:750
+#: src/hostlist/gnunet-daemon-hostlist_client.c:756
+#: src/hostlist/gnunet-daemon-hostlist_client.c:808
+#: src/hostlist/gnunet-daemon-hostlist_client.c:817
+#: src/hostlist/gnunet-daemon-hostlist_client.c:928
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1023
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1028
+#: src/transport/plugin_transport_http_client.c:595
+#: src/transport/plugin_transport_http_client.c:613
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:989
+#: src/gns/gnunet-gns-proxy.c:986
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1014
+#: src/gns/gnunet-gns-proxy.c:1011
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1035
+#: src/gns/gnunet-gns-proxy.c:1032
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/gns/gnunet-gns-proxy.c:1050
+#: src/gns/gnunet-gns-proxy.c:1047
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1065
+#: src/gns/gnunet-gns-proxy.c:1062
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/gns/gnunet-gns-proxy.c:1075
+#: src/gns/gnunet-gns-proxy.c:1072
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1099
+#: src/gns/gnunet-gns-proxy.c:1096
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1230
+#: src/gns/gnunet-gns-proxy.c:1227
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2131
+#: src/gns/gnunet-gns-proxy.c:2128
 #, 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:2652
+#: src/gns/gnunet-gns-proxy.c:2649
 #, 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:2684
+#: src/gns/gnunet-gns-proxy.c:2681
 #, 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:2885
+#: src/gns/gnunet-gns-proxy.c:2882
 #, 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:2907 src/rest/gnunet-rest-server.c:668
+#: src/gns/gnunet-gns-proxy.c:2904 src/rest/gnunet-rest-server.c:668
 #, 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:3243
+#: src/gns/gnunet-gns-proxy.c:3240
 #, 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:3272
+#: src/gns/gnunet-gns-proxy.c:3269
 #, 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:3355
+#: src/gns/gnunet-gns-proxy.c:3352
 #, 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:3693
+#: src/gns/gnunet-gns-proxy.c:3690
 #, 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:3821
+#: src/gns/gnunet-gns-proxy.c:3818
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3826
+#: src/gns/gnunet-gns-proxy.c:3823
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3830
+#: src/gns/gnunet-gns-proxy.c:3827
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3856
+#: src/gns/gnunet-gns-proxy.c:3853
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199
+#: src/gns/gnunet-gns.c:178
+#, fuzzy, c-format
+msgid "`%s' is not a valid domain name\n"
+msgstr "« %s » không sẵn sàng.\n"
+
+#: src/gns/gnunet-gns.c:196
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:233
+#: src/gns/gnunet-gns.c:230
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:238
+#: src/gns/gnunet-gns.c:236
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns.c:242
+#: src/gns/gnunet-gns.c:240
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:258
+#: src/gns/gnunet-gns.c:252
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Bản ghi lỗi GNUnet"
@@ -4419,7 +4424,7 @@ 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:452
+#: src/gns/plugin_rest_gns.c:451
 #, fuzzy
 msgid "Gns REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -4595,203 +4600,203 @@ msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:349
+#: src/hostlist/gnunet-daemon-hostlist_client.c:346
 #, fuzzy
 msgid "# bytes downloaded from hostlist servers"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:370
-#: src/hostlist/gnunet-daemon-hostlist_client.c:403
+#: src/hostlist/gnunet-daemon-hostlist_client.c:367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:400
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:373
-#: src/hostlist/gnunet-daemon-hostlist_client.c:406
+#: src/hostlist/gnunet-daemon-hostlist_client.c:370
+#: src/hostlist/gnunet-daemon-hostlist_client.c:403
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:391
+#: src/hostlist/gnunet-daemon-hostlist_client.c:388
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:661
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
+#: src/hostlist/gnunet-daemon-hostlist_client.c:658
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:691
+#: src/hostlist/gnunet-daemon-hostlist_client.c:688
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:734
+#: src/hostlist/gnunet-daemon-hostlist_client.c:731
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:862
+#: src/hostlist/gnunet-daemon-hostlist_client.c:859
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:876
+#: src/hostlist/gnunet-daemon-hostlist_client.c:873
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:893
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:902
+#: src/hostlist/gnunet-daemon-hostlist_client.c:899
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:910
+#: src/hostlist/gnunet-daemon-hostlist_client.c:907
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:963
+#: src/hostlist/gnunet-daemon-hostlist_client.c:960
 #, fuzzy, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:971
+#: src/hostlist/gnunet-daemon-hostlist_client.c:968
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1098
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1665
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1095
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1662
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1107
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1104
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1166
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1187
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1163
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1184
 #, fuzzy
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1350
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1355
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1364
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1447
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1454
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1478
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1495
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1490
 #, fuzzy
 msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1595
-#: src/transport/plugin_transport_http_client.c:2274
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1592
+#: src/transport/plugin_transport_http_client.c:2271
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1624
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1621
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1638
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1651
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1648
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:176
+#: src/hostlist/gnunet-daemon-hostlist_server.c:172
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:201
+#: src/hostlist/gnunet-daemon-hostlist_server.c:198
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:237
-#: src/hostlist/gnunet-daemon-hostlist_server.c:531
+#: src/hostlist/gnunet-daemon-hostlist_server.c:235
+#: src/hostlist/gnunet-daemon-hostlist_server.c:526
 #: src/peerinfo-tool/gnunet-peerinfo.c:385
 #: src/peerinfo-tool/gnunet-peerinfo.c:534
-#: src/topology/gnunet-daemon-topology.c:859
+#: src/topology/gnunet-daemon-topology.c:801
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:261
+#: src/hostlist/gnunet-daemon-hostlist_server.c:256
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:278
+#: src/hostlist/gnunet-daemon-hostlist_server.c:274
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:382
+#: src/hostlist/gnunet-daemon-hostlist_server.c:376
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:385
+#: src/hostlist/gnunet-daemon-hostlist_server.c:380
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:397
+#: src/hostlist/gnunet-daemon-hostlist_server.c:393
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:398
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# các yêu cầu danh sách máy được nhận"
@@ -4805,63 +4810,63 @@ msgstr ""
 msgid "hostlist requests refused (not ready)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:416
+#: src/hostlist/gnunet-daemon-hostlist_server.c:417
 #, fuzzy
 msgid "Received request for our hostlist\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:418
+#: src/hostlist/gnunet-daemon-hostlist_server.c:419
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:466
+#: src/hostlist/gnunet-daemon-hostlist_server.c:460
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:679
+#: src/hostlist/gnunet-daemon-hostlist_server.c:673
 #: src/transport/gnunet-service-transport.c:2827
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:691
+#: src/hostlist/gnunet-daemon-hostlist_server.c:684
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:703
+#: src/hostlist/gnunet-daemon-hostlist_server.c:696
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:718
+#: src/hostlist/gnunet-daemon-hostlist_server.c:713
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:731
+#: src/hostlist/gnunet-daemon-hostlist_server.c:728
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:748
+#: src/hostlist/gnunet-daemon-hostlist_server.c:742
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:769
+#: src/hostlist/gnunet-daemon-hostlist_server.c:764
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:789
+#: src/hostlist/gnunet-daemon-hostlist_server.c:785
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#: src/hostlist/gnunet-daemon-hostlist_server.c:828
 #, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
@@ -4983,7 +4988,7 @@ msgstr "Không thể truy cập đến « %s »: %s\n"
 msgid "No records found for `%s'"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:454
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:459
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -5003,16 +5008,16 @@ msgstr "Đối số không hợp lệ cho « %s ».\n"
 msgid "You must specify a name\n"
 msgstr "Phải ghi rõ tên hiệu\n"
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1586
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1536
 msgid "name of the record to add/delete/display"
 msgstr ""
 
 #: src/namecache/gnunet-namecache.c:238
 #, fuzzy
-msgid "spezifies the public key of the zone to look in"
+msgid "specifies the public key of the zone to look in"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1643
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1595
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
@@ -5127,215 +5132,215 @@ msgstr ""
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:341
+#: src/namestore/gnunet-namestore.c:334
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:371
+#: src/namestore/gnunet-namestore.c:362
 #, 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:378
+#: src/namestore/gnunet-namestore.c:369
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:660 src/namestore/gnunet-namestore.c:668
+#: src/namestore/gnunet-namestore.c:656 src/namestore/gnunet-namestore.c:666
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:682 src/namestore/gnunet-namestore.c:694
+#: src/namestore/gnunet-namestore.c:681 src/namestore/gnunet-namestore.c:694
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:707
+#: src/namestore/gnunet-namestore.c:709
 #, c-format
 msgid ""
 "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:837
+#: src/namestore/gnunet-namestore.c:829
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:878
+#: src/namestore/gnunet-namestore.c:872
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:965
+#: src/namestore/gnunet-namestore.c:953
 #, fuzzy, c-format
 msgid "Failed to replace records: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/namestore/gnunet-namestore.c:993
+#: src/namestore/gnunet-namestore.c:979
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1020
+#: src/namestore/gnunet-namestore.c:1006
 #, fuzzy, c-format
 msgid "No options given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/namestore/gnunet-namestore.c:1043 src/namestore/gnunet-namestore.c:1076
-#: src/namestore/gnunet-namestore.c:1085 src/namestore/gnunet-namestore.c:1104
-#: src/namestore/gnunet-namestore.c:1127 src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1028 src/namestore/gnunet-namestore.c:1061
+#: src/namestore/gnunet-namestore.c:1071 src/namestore/gnunet-namestore.c:1089
+#: src/namestore/gnunet-namestore.c:1110 src/namestore/gnunet-namestore.c:1137
 #, 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:1044
+#: src/namestore/gnunet-namestore.c:1030
 msgid "replace"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1077 src/namestore/gnunet-namestore.c:1086
-#: src/namestore/gnunet-namestore.c:1105 src/namestore/gnunet-namestore.c:1129
+#: src/namestore/gnunet-namestore.c:1063 src/namestore/gnunet-namestore.c:1073
+#: src/namestore/gnunet-namestore.c:1091 src/namestore/gnunet-namestore.c:1112
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1095
+#: src/namestore/gnunet-namestore.c:1081
 #, 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:1117
+#: src/namestore/gnunet-namestore.c:1100
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1140
+#: src/namestore/gnunet-namestore.c:1119
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1160
+#: src/namestore/gnunet-namestore.c:1139
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1203
+#: src/namestore/gnunet-namestore.c:1182
 #, 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:1232
+#: src/namestore/gnunet-namestore.c:1205
 #: src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/namestore/gnunet-namestore.c:1260
+#: src/namestore/gnunet-namestore.c:1231
 #, 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:1300
+#: src/namestore/gnunet-namestore.c:1269
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1352
+#: src/namestore/gnunet-namestore.c:1320
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1368
+#: src/namestore/gnunet-namestore.c:1331
 #, 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:1418
+#: src/namestore/gnunet-namestore.c:1378
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1434
+#: src/namestore/gnunet-namestore.c:1390
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1446 src/namestore/gnunet-namestore.c:1464
-#: src/namestore/gnunet-namestore.c:1481
+#: src/namestore/gnunet-namestore.c:1402 src/namestore/gnunet-namestore.c:1418
+#: src/namestore/gnunet-namestore.c:1435
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:1455
+#: src/namestore/gnunet-namestore.c:1410
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Không rõ câu lệnh « %s ».\n"
 
-#: src/namestore/gnunet-namestore.c:1495
+#: src/namestore/gnunet-namestore.c:1448
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1559
+#: src/namestore/gnunet-namestore.c:1505
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1563
+#: src/namestore/gnunet-namestore.c:1508
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1567
+#: src/namestore/gnunet-namestore.c:1512
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1572
+#: src/namestore/gnunet-namestore.c:1519
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1577
+#: src/namestore/gnunet-namestore.c:1525
 #, 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:1581
+#: src/namestore/gnunet-namestore.c:1530
 #, 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:1591
+#: src/namestore/gnunet-namestore.c:1542
 #, 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:1596
+#: src/namestore/gnunet-namestore.c:1549
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1601
+#: src/namestore/gnunet-namestore.c:1555
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1606
+#: src/namestore/gnunet-namestore.c:1560
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1611
+#: src/namestore/gnunet-namestore.c:1566
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1615
+#: src/namestore/gnunet-namestore.c:1570
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1619
+#: src/namestore/gnunet-namestore.c:1576
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1624
+#: src/namestore/gnunet-namestore.c:1582
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5361,7 +5366,7 @@ msgstr ""
 msgid "heap file database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/namestore/plugin_rest_namestore.c:1104
+#: src/namestore/plugin_rest_namestore.c:919
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -5679,7 +5684,7 @@ msgstr "Không thể truy cập đến dịch vụ"
 msgid "Show network size estimates from NSE service."
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/nse/gnunet-service-nse.c:1532
+#: src/nse/gnunet-service-nse.c:1438
 #: src/revocation/gnunet-service-revocation.c:841 src/util/gnunet-scrypt.c:276
 #, fuzzy
 msgid "Value is too large.\n"
@@ -6963,78 +6968,78 @@ msgstr ""
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:230
+#: src/topology/gnunet-daemon-topology.c:228
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:343
+#: src/topology/gnunet-daemon-topology.c:334
 #, fuzzy
 msgid "# connect requests issued to ATS"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/topology/gnunet-daemon-topology.c:537
+#: src/topology/gnunet-daemon-topology.c:513
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# các thông báo gửi đi bị loại bỏ"
 
-#: src/topology/gnunet-daemon-topology.c:638
-#: src/topology/gnunet-daemon-topology.c:724
+#: src/topology/gnunet-daemon-topology.c:600
+#: src/topology/gnunet-daemon-topology.c:680
 #, fuzzy
 msgid "# friends connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/topology/gnunet-daemon-topology.c:919
+#: src/topology/gnunet-daemon-topology.c:851
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:951
+#: src/topology/gnunet-daemon-topology.c:877
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:958
+#: src/topology/gnunet-daemon-topology.c:884
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:980
+#: src/topology/gnunet-daemon-topology.c:902
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:983
+#: src/topology/gnunet-daemon-topology.c:905
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:990
+#: src/topology/gnunet-daemon-topology.c:913
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 "Xác định quá ít bạn bè (dưới số tối thiểu). Sẽ chỉ kết nối tới bạn bè.\n"
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:921
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr "Cần thiết nhiều kết nối bạn bè hơn tổng số kết nối đích.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:968
 #: src/transport/plugin_transport_wlan.c:1517
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/topology/gnunet-daemon-topology.c:1228
+#: src/topology/gnunet-daemon-topology.c:1128
 msgid "GNUnet topology control"
 msgstr ""
 
 #: src/transport/gnunet-communicator-tcp.c:2162
-#: src/transport/gnunet-communicator-udp.c:2707
-#: src/transport/gnunet-service-tng.c:8884
+#: src/transport/gnunet-communicator-udp.c:2699
+#: src/transport/gnunet-service-tng.c:9110
 #: src/transport/gnunet-service-transport.c:2795
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
@@ -7044,7 +7049,7 @@ msgstr "Lưu cấu hình ngay bây giờ không?"
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2778
+#: src/transport/gnunet-communicator-udp.c:2770
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -7638,7 +7643,7 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1474
+#: src/transport/plugin_transport_http_client.c:1471
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3530
 #: src/transport/plugin_transport_tcp.c:3901
@@ -7646,24 +7651,24 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2115
+#: src/transport/plugin_transport_http_client.c:2112
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2164
+#: src/transport/plugin_transport_http_client.c:2161
 #: src/transport/plugin_transport_http_server.c:3245
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/plugin_transport_http_client.c:2181
+#: src/transport/plugin_transport_http_client.c:2178
 #: src/transport/plugin_transport_http_server.c:3315
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/transport/plugin_transport_http_client.c:2215
+#: src/transport/plugin_transport_http_client.c:2212
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
@@ -8400,12 +8405,12 @@ msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Mong đợi « %s » là một thư mục.\n"
 
-#: src/util/dnsparser.c:264
+#: src/util/dnsparser.c:261
 #, 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:954
+#: src/util/dnsparser.c:911
 #, 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"
@@ -8846,17 +8851,17 @@ 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/program.c:283
+#: src/util/program.c:255
 #, fuzzy, c-format
 msgid "Unreadable or malformed configuration file `%s', exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/util/program.c:301
+#: src/util/program.c:272
 #, fuzzy, c-format
 msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/util/program.c:318
+#: src/util/program.c:287
 #, fuzzy
 msgid "Unreadable or malformed configuration, exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 435f8690b..39cdb4e8e 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: 2019-04-30 07:47+0000\n"
+"POT-Creation-Date: 2019-05-08 11:34+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"
@@ -16,82 +16,82 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/gnunet-arm.c:156
+#: src/arm/gnunet-arm.c:157
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:163
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:222 src/testbed/gnunet-service-testbed_peers.c:1139
+#: src/arm/gnunet-arm.c:223 src/testbed/gnunet-service-testbed_peers.c:1139
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:1141
+#: src/arm/gnunet-arm.c:225 src/testbed/gnunet-service-testbed_peers.c:1141
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:1143
+#: src/arm/gnunet-arm.c:227 src/testbed/gnunet-service-testbed_peers.c:1143
 #, fuzzy
 msgid "Unknown request status"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:242
+#: src/arm/gnunet-arm.c:243
 #, fuzzy
 msgid "is stopped"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:244
+#: src/arm/gnunet-arm.c:245
 msgid "is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246
+#: src/arm/gnunet-arm.c:247
 msgid "is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:248
+#: src/arm/gnunet-arm.c:249
 msgid "is starting already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:250
+#: src/arm/gnunet-arm.c:251
 msgid "is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252
+#: src/arm/gnunet-arm.c:253
 msgid "is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254
+#: src/arm/gnunet-arm.c:255
 msgid "is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256
+#: src/arm/gnunet-arm.c:257
 #, fuzzy
 msgid "service is not known to ARM"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:258
+#: src/arm/gnunet-arm.c:259
 #, fuzzy
 msgid "service failed to start"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/arm/gnunet-arm.c:260
+#: src/arm/gnunet-arm.c:261
 msgid "service cannot be manipulated because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:262
+#: src/arm/gnunet-arm.c:263
 #, fuzzy
 msgid "Unknown result code."
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:295
+#: src/arm/gnunet-arm.c:294
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
+#: src/arm/gnunet-arm.c:323 src/arm/gnunet-arm.c:332
 #, fuzzy, c-format
 msgid "Failed to start the ARM service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -106,117 +106,117 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Failed to stop the ARM service: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/arm/gnunet-arm.c:419
+#: src/arm/gnunet-arm.c:417
 #, fuzzy, c-format
 msgid "Failed to send a request to start the `%s' service: %s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:429
+#: src/arm/gnunet-arm.c:427
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:467
+#: src/arm/gnunet-arm.c:466
 #, fuzzy, c-format
 msgid "Failed to send a request to kill the `%s' service: %%s\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:478
+#: src/arm/gnunet-arm.c:477
 #, fuzzy, c-format
 msgid "Failed to kill the `%s' service: %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/arm/gnunet-arm.c:519
+#: src/arm/gnunet-arm.c:517
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:528
+#: src/arm/gnunet-arm.c:527
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
 
-#: src/arm/gnunet-arm.c:534
+#: src/arm/gnunet-arm.c:533
 msgid "Running services:\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:623
+#: src/arm/gnunet-arm.c:615
 #, c-format
 msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:649
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:659
+#: src/arm/gnunet-arm.c:652
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/arm/gnunet-arm.c:662
+#: src/arm/gnunet-arm.c:655
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:676
+#: src/arm/gnunet-arm.c:667
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:766
+#: src/arm/gnunet-arm.c:744
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:771
+#: src/arm/gnunet-arm.c:749
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:776
+#: src/arm/gnunet-arm.c:754
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:780
+#: src/arm/gnunet-arm.c:759
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:784
+#: src/arm/gnunet-arm.c:764
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:788
+#: src/arm/gnunet-arm.c:769
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:792
+#: src/arm/gnunet-arm.c:773
 msgid "monitor ARM activities"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:796
+#: src/arm/gnunet-arm.c:777
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:801
+#: src/arm/gnunet-arm.c:784
 msgid "exit with error status if operation does not finish after DELAY"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:805
+#: src/arm/gnunet-arm.c:789
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:809
+#: src/arm/gnunet-arm.c:794
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:813
+#: src/arm/gnunet-arm.c:799
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:828
+#: src/arm/gnunet-arm.c:811
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -1253,34 +1253,34 @@ msgstr ""
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:347
+#: src/core/gnunet-service-core.c:329
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:371
+#: src/core/gnunet-service-core.c:355
 msgid "# dequeuing CAR (duplicate request)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:443
+#: src/core/gnunet-service-core.c:420
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:541
+#: src/core/gnunet-service-core.c:508
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:879
+#: src/core/gnunet-service-core.c:828
 #, c-format
 msgid "# messages of type %u discarded (client busy)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:988
+#: src/core/gnunet-service-core.c:929
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/core/gnunet-service-core.c:1009
+#: src/core/gnunet-service-core.c:948
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "服务已删除。\n"
@@ -1419,38 +1419,38 @@ msgstr ""
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:260
-#: src/core/gnunet-service-core_sessions.c:350
+#: src/core/gnunet-service-core_sessions.c:254
+#: src/core/gnunet-service-core_sessions.c:339
 #: src/dht/gnunet-service-dht_neighbours.c:740
 #: src/dht/gnunet-service-dht_neighbours.c:803
 #: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1521
-#: src/topology/gnunet-daemon-topology.c:615
-#: src/topology/gnunet-daemon-topology.c:717
+#: src/topology/gnunet-daemon-topology.c:581
+#: src/topology/gnunet-daemon-topology.c:673
 #: src/transport/gnunet-service-transport_neighbours.c:720
 #: src/transport/gnunet-service-transport_neighbours.c:728
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:296
+#: src/core/gnunet-service-core_sessions.c:287
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:416
+#: src/core/gnunet-service-core_sessions.c:402
 #, fuzzy
 msgid "# outdated typemap confirmations received"
 msgstr "保存配置失败。"
 
-#: src/core/gnunet-service-core_sessions.c:433
+#: src/core/gnunet-service-core_sessions.c:420
 #, fuzzy
 msgid "# valid typemap confirmations received"
 msgstr "保存配置失败。"
 
-#: src/core/gnunet-service-core_typemap.c:169
-#: src/core/gnunet-service-core_typemap.c:181
+#: src/core/gnunet-service-core_typemap.c:170
+#: src/core/gnunet-service-core_typemap.c:183
 msgid "# type maps received"
 msgstr ""
 
-#: src/core/gnunet-service-core_typemap.c:212
+#: src/core/gnunet-service-core_typemap.c:216
 msgid "# updates to my type map"
 msgstr ""
 
@@ -1459,7 +1459,7 @@ msgstr ""
 msgid "Unable to parse CRED record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:1005
+#: src/credential/gnunet-credential.c:264 src/namestore/gnunet-namestore.c:991
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
@@ -1567,7 +1567,7 @@ msgstr "初始化“%s”服务失败。\n"
 
 #: src/credential/gnunet-service-credential.c:1071
 #: src/namestore/gnunet-namestore-fcfsd.c:1138
-#: src/namestore/gnunet-namestore.c:1030
+#: src/namestore/gnunet-namestore.c:1015
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -3563,7 +3563,7 @@ msgid "FS service is lacking HOSTKEY configuration 
setting.  Exiting.\n"
 msgstr "立即保存配置?"
 
 #: src/fs/gnunet-service-fs.c:1305 src/hostlist/gnunet-daemon-hostlist.c:353
-#: src/topology/gnunet-daemon-topology.c:1197
+#: src/topology/gnunet-daemon-topology.c:1100
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -3979,140 +3979,145 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:118
-#: src/hostlist/gnunet-daemon-hostlist_client.c:535
-#: src/hostlist/gnunet-daemon-hostlist_client.c:753
-#: src/hostlist/gnunet-daemon-hostlist_client.c:759
-#: src/hostlist/gnunet-daemon-hostlist_client.c:811
-#: src/hostlist/gnunet-daemon-hostlist_client.c:820
-#: src/hostlist/gnunet-daemon-hostlist_client.c:931
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1026
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/transport/plugin_transport_http_client.c:598
-#: src/transport/plugin_transport_http_client.c:616
+#: src/gns/gnunet-gns-proxy.c:115
+#: src/hostlist/gnunet-daemon-hostlist_client.c:532
+#: src/hostlist/gnunet-daemon-hostlist_client.c:750
+#: src/hostlist/gnunet-daemon-hostlist_client.c:756
+#: src/hostlist/gnunet-daemon-hostlist_client.c:808
+#: src/hostlist/gnunet-daemon-hostlist_client.c:817
+#: src/hostlist/gnunet-daemon-hostlist_client.c:928
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1023
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1028
+#: src/transport/plugin_transport_http_client.c:595
+#: src/transport/plugin_transport_http_client.c:613
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:989
+#: src/gns/gnunet-gns-proxy.c:986
 #, fuzzy, c-format
 msgid "Unsupported CURL TLS backend %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:1014
+#: src/gns/gnunet-gns-proxy.c:1011
 #, fuzzy, c-format
 msgid "Failed to fetch CN from cert: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1035
+#: src/gns/gnunet-gns-proxy.c:1032
 #, fuzzy, c-format
 msgid "Failed to initialize DANE: %s\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/gns/gnunet-gns-proxy.c:1050
+#: src/gns/gnunet-gns-proxy.c:1047
 #, fuzzy, c-format
 msgid "Failed to parse DANE record: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-gns-proxy.c:1065
+#: src/gns/gnunet-gns-proxy.c:1062
 #, fuzzy, c-format
 msgid "Failed to verify TLS connection using DANE: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:1075
+#: src/gns/gnunet-gns-proxy.c:1072
 #, c-format
 msgid "Failed DANE verification failed with GnuTLS verify status code: %u\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1099
+#: src/gns/gnunet-gns-proxy.c:1096
 #, c-format
 msgid "TLS certificate subject name (%s) does not match `%s': %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:1230
+#: src/gns/gnunet-gns-proxy.c:1227
 #, c-format
 msgid "Cookie domain `%s' supplied by server is invalid\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2131
+#: src/gns/gnunet-gns-proxy.c:2128
 #, fuzzy, c-format
 msgid "Unsupported HTTP method `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2652
+#: src/gns/gnunet-gns-proxy.c:2649
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户:"
 
-#: src/gns/gnunet-gns-proxy.c:2684
+#: src/gns/gnunet-gns-proxy.c:2681
 #, fuzzy, c-format
 msgid "Unable to import certificate from `%s'\n"
 msgstr "无法保存配置文件“%s”:"
 
-#: src/gns/gnunet-gns-proxy.c:2885
+#: src/gns/gnunet-gns-proxy.c:2882
 #, fuzzy, c-format
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2907 src/rest/gnunet-rest-server.c:668
+#: src/gns/gnunet-gns-proxy.c:2904 src/rest/gnunet-rest-server.c:668
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3243
+#: src/gns/gnunet-gns-proxy.c:3240
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3272
+#: src/gns/gnunet-gns-proxy.c:3269
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3355
+#: src/gns/gnunet-gns-proxy.c:3352
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3693
+#: src/gns/gnunet-gns-proxy.c:3690
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3821
+#: src/gns/gnunet-gns-proxy.c:3818
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3826
+#: src/gns/gnunet-gns-proxy.c:3823
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3830
+#: src/gns/gnunet-gns-proxy.c:3827
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3856
+#: src/gns/gnunet-gns-proxy.c:3853
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:199
+#: src/gns/gnunet-gns.c:178
+#, fuzzy, c-format
+msgid "`%s' is not a valid domain name\n"
+msgstr "“%s”不可用。\n"
+
+#: src/gns/gnunet-gns.c:196
 #, c-format
 msgid "Invalid typename specified, assuming `ANY'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:233
+#: src/gns/gnunet-gns.c:230
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:238
+#: src/gns/gnunet-gns.c:236
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:242
+#: src/gns/gnunet-gns.c:240
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:258
+#: src/gns/gnunet-gns.c:252
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet 错误日志"
@@ -4222,7 +4227,7 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_rest_gns.c:452
+#: src/gns/plugin_rest_gns.c:451
 msgid "Gns REST API initialized\n"
 msgstr ""
 
@@ -4393,195 +4398,195 @@ msgstr ""
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:349
+#: src/hostlist/gnunet-daemon-hostlist_client.c:346
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:370
-#: src/hostlist/gnunet-daemon-hostlist_client.c:403
+#: src/hostlist/gnunet-daemon-hostlist_client.c:367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:400
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:373
-#: src/hostlist/gnunet-daemon-hostlist_client.c:406
+#: src/hostlist/gnunet-daemon-hostlist_client.c:370
+#: src/hostlist/gnunet-daemon-hostlist_client.c:403
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:391
+#: src/hostlist/gnunet-daemon-hostlist_client.c:388
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:661
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1407
+#: src/hostlist/gnunet-daemon-hostlist_client.c:658
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:691
+#: src/hostlist/gnunet-daemon-hostlist_client.c:688
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:734
+#: src/hostlist/gnunet-daemon-hostlist_client.c:731
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:862
+#: src/hostlist/gnunet-daemon-hostlist_client.c:859
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:876
+#: src/hostlist/gnunet-daemon-hostlist_client.c:873
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:896
+#: src/hostlist/gnunet-daemon-hostlist_client.c:893
 #, fuzzy, c-format
 msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:902
+#: src/hostlist/gnunet-daemon-hostlist_client.c:899
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:910
+#: src/hostlist/gnunet-daemon-hostlist_client.c:907
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:963
+#: src/hostlist/gnunet-daemon-hostlist_client.c:960
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:971
+#: src/hostlist/gnunet-daemon-hostlist_client.c:968
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1098
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1665
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1095
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1662
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1107
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1104
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1166
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1187
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1163
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1184
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1353
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1350
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1358
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1355
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1367
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1364
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1398
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1404
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1401
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1450
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1447
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1457
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1454
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1481
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1498
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1478
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1495
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1493
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1490
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1595
-#: src/transport/plugin_transport_http_client.c:2274
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1592
+#: src/transport/plugin_transport_http_client.c:2271
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1624
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1621
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1638
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1635
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1651
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1648
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:176
+#: src/hostlist/gnunet-daemon-hostlist_server.c:172
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:201
+#: src/hostlist/gnunet-daemon-hostlist_server.c:198
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:237
-#: src/hostlist/gnunet-daemon-hostlist_server.c:531
+#: src/hostlist/gnunet-daemon-hostlist_server.c:235
+#: src/hostlist/gnunet-daemon-hostlist_server.c:526
 #: src/peerinfo-tool/gnunet-peerinfo.c:385
 #: src/peerinfo-tool/gnunet-peerinfo.c:534
-#: src/topology/gnunet-daemon-topology.c:859
+#: src/topology/gnunet-daemon-topology.c:801
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:261
+#: src/hostlist/gnunet-daemon-hostlist_server.c:256
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:278
+#: src/hostlist/gnunet-daemon-hostlist_server.c:274
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:382
+#: src/hostlist/gnunet-daemon-hostlist_server.c:376
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:385
+#: src/hostlist/gnunet-daemon-hostlist_server.c:380
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:397
+#: src/hostlist/gnunet-daemon-hostlist_server.c:393
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:398
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
@@ -4593,59 +4598,59 @@ msgstr ""
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:416
+#: src/hostlist/gnunet-daemon-hostlist_server.c:417
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:418
+#: src/hostlist/gnunet-daemon-hostlist_server.c:419
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:466
+#: src/hostlist/gnunet-daemon-hostlist_server.c:460
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:679
+#: src/hostlist/gnunet-daemon-hostlist_server.c:673
 #: src/transport/gnunet-service-transport.c:2827
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:691
+#: src/hostlist/gnunet-daemon-hostlist_server.c:684
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:703
+#: src/hostlist/gnunet-daemon-hostlist_server.c:696
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:718
+#: src/hostlist/gnunet-daemon-hostlist_server.c:713
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:731
+#: src/hostlist/gnunet-daemon-hostlist_server.c:728
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:748
+#: src/hostlist/gnunet-daemon-hostlist_server.c:742
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:769
+#: src/hostlist/gnunet-daemon-hostlist_server.c:764
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:789
+#: src/hostlist/gnunet-daemon-hostlist_server.c:785
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:829
+#: src/hostlist/gnunet-daemon-hostlist_server.c:828
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4766,7 +4771,7 @@ msgstr "无法解析“%s”(%s):%s\n"
 msgid "No records found for `%s'"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:454
+#: src/namecache/gnunet-namecache.c:122 src/namestore/gnunet-namestore.c:459
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4786,15 +4791,15 @@ msgstr "“%s”的参数无效。\n"
 msgid "You must specify a name\n"
 msgstr "您必须指定一个接收方!\n"
 
-#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1586
+#: src/namecache/gnunet-namecache.c:232 src/namestore/gnunet-namestore.c:1536
 msgid "name of the record to add/delete/display"
 msgstr ""
 
 #: src/namecache/gnunet-namecache.c:238
-msgid "spezifies the public key of the zone to look in"
+msgid "specifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1643
+#: src/namecache/gnunet-namecache.c:250 src/namestore/gnunet-namestore.c:1595
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
@@ -4909,215 +4914,215 @@ msgstr ""
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:341
+#: src/namestore/gnunet-namestore.c:334
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:371
+#: src/namestore/gnunet-namestore.c:362
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:378
+#: src/namestore/gnunet-namestore.c:369
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:660 src/namestore/gnunet-namestore.c:668
+#: src/namestore/gnunet-namestore.c:656 src/namestore/gnunet-namestore.c:666
 #, c-format
 msgid "A %s record exists already under `%s', no other records can be added.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:682 src/namestore/gnunet-namestore.c:694
+#: src/namestore/gnunet-namestore.c:681 src/namestore/gnunet-namestore.c:694
 #, c-format
 msgid "Records already exist under `%s', cannot add `%s' record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:707
+#: src/namestore/gnunet-namestore.c:709
 #, c-format
 msgid ""
 "Non-GNS2DNS records already exist under `%s', cannot add GNS2DNS record.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:837
+#: src/namestore/gnunet-namestore.c:829
 #, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:878
+#: src/namestore/gnunet-namestore.c:872
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:965
+#: src/namestore/gnunet-namestore.c:953
 #, fuzzy, c-format
 msgid "Failed to replace records: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/namestore/gnunet-namestore.c:993
+#: src/namestore/gnunet-namestore.c:979
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1020
+#: src/namestore/gnunet-namestore.c:1006
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1043 src/namestore/gnunet-namestore.c:1076
-#: src/namestore/gnunet-namestore.c:1085 src/namestore/gnunet-namestore.c:1104
-#: src/namestore/gnunet-namestore.c:1127 src/namestore/gnunet-namestore.c:1159
+#: src/namestore/gnunet-namestore.c:1028 src/namestore/gnunet-namestore.c:1061
+#: src/namestore/gnunet-namestore.c:1071 src/namestore/gnunet-namestore.c:1089
+#: src/namestore/gnunet-namestore.c:1110 src/namestore/gnunet-namestore.c:1137
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore.c:1044
+#: src/namestore/gnunet-namestore.c:1030
 msgid "replace"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1077 src/namestore/gnunet-namestore.c:1086
-#: src/namestore/gnunet-namestore.c:1105 src/namestore/gnunet-namestore.c:1129
+#: src/namestore/gnunet-namestore.c:1063 src/namestore/gnunet-namestore.c:1073
+#: src/namestore/gnunet-namestore.c:1091 src/namestore/gnunet-namestore.c:1112
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1095
+#: src/namestore/gnunet-namestore.c:1081
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:1117
+#: src/namestore/gnunet-namestore.c:1100
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1140
+#: src/namestore/gnunet-namestore.c:1119
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:1160
+#: src/namestore/gnunet-namestore.c:1139
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1203
+#: src/namestore/gnunet-namestore.c:1182
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/namestore/gnunet-namestore.c:1232
+#: src/namestore/gnunet-namestore.c:1205
 #: src/peerinfo-tool/gnunet-peerinfo.c:775
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:1260
+#: src/namestore/gnunet-namestore.c:1231
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:1300
+#: src/namestore/gnunet-namestore.c:1269
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1352
+#: src/namestore/gnunet-namestore.c:1320
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1368
+#: src/namestore/gnunet-namestore.c:1331
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/namestore/gnunet-namestore.c:1418
+#: src/namestore/gnunet-namestore.c:1378
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1434
+#: src/namestore/gnunet-namestore.c:1390
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1446 src/namestore/gnunet-namestore.c:1464
-#: src/namestore/gnunet-namestore.c:1481
+#: src/namestore/gnunet-namestore.c:1402 src/namestore/gnunet-namestore.c:1418
+#: src/namestore/gnunet-namestore.c:1435
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore.c:1455
+#: src/namestore/gnunet-namestore.c:1410
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:1495
+#: src/namestore/gnunet-namestore.c:1448
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:1559
+#: src/namestore/gnunet-namestore.c:1505
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1563
+#: src/namestore/gnunet-namestore.c:1508
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1567
+#: src/namestore/gnunet-namestore.c:1512
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1572
+#: src/namestore/gnunet-namestore.c:1519
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1577
+#: src/namestore/gnunet-namestore.c:1525
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/namestore/gnunet-namestore.c:1581
+#: src/namestore/gnunet-namestore.c:1530
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:1591
+#: src/namestore/gnunet-namestore.c:1542
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/namestore/gnunet-namestore.c:1596
+#: src/namestore/gnunet-namestore.c:1549
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1601
+#: src/namestore/gnunet-namestore.c:1555
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1606
+#: src/namestore/gnunet-namestore.c:1560
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1611
+#: src/namestore/gnunet-namestore.c:1566
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1615
+#: src/namestore/gnunet-namestore.c:1570
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1619
+#: src/namestore/gnunet-namestore.c:1576
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1624
+#: src/namestore/gnunet-namestore.c:1582
 msgid "name of the ego controlling the zone"
 msgstr ""
 
@@ -5143,7 +5148,7 @@ msgstr ""
 msgid "heap file database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/namestore/plugin_rest_namestore.c:1104
+#: src/namestore/plugin_rest_namestore.c:919
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
@@ -5455,7 +5460,7 @@ msgstr "无法访问该服务"
 msgid "Show network size estimates from NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1532
+#: src/nse/gnunet-service-nse.c:1438
 #: src/revocation/gnunet-service-revocation.c:841 src/util/gnunet-scrypt.c:276
 #, fuzzy
 msgid "Value is too large.\n"
@@ -6715,73 +6720,73 @@ msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:230
+#: src/topology/gnunet-daemon-topology.c:228
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:343
+#: src/topology/gnunet-daemon-topology.c:334
 msgid "# connect requests issued to ATS"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:537
+#: src/topology/gnunet-daemon-topology.c:513
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:638
-#: src/topology/gnunet-daemon-topology.c:724
+#: src/topology/gnunet-daemon-topology.c:600
+#: src/topology/gnunet-daemon-topology.c:680
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:919
+#: src/topology/gnunet-daemon-topology.c:851
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:951
+#: src/topology/gnunet-daemon-topology.c:877
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:958
+#: src/topology/gnunet-daemon-topology.c:884
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:980
+#: src/topology/gnunet-daemon-topology.c:902
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:983
+#: src/topology/gnunet-daemon-topology.c:905
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:990
+#: src/topology/gnunet-daemon-topology.c:913
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:996
+#: src/topology/gnunet-daemon-topology.c:921
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:968
 #: src/transport/plugin_transport_wlan.c:1517
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1228
+#: src/topology/gnunet-daemon-topology.c:1128
 msgid "GNUnet topology control"
 msgstr ""
 
 #: src/transport/gnunet-communicator-tcp.c:2162
-#: src/transport/gnunet-communicator-udp.c:2707
-#: src/transport/gnunet-service-tng.c:8884
+#: src/transport/gnunet-communicator-udp.c:2699
+#: src/transport/gnunet-service-tng.c:9110
 #: src/transport/gnunet-service-transport.c:2795
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
@@ -6791,7 +6796,7 @@ msgstr "立即保存配置?"
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2778
+#: src/transport/gnunet-communicator-udp.c:2770
 msgid "GNUnet UDP communicator"
 msgstr ""
 
@@ -7345,7 +7350,7 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1474
+#: src/transport/plugin_transport_http_client.c:1471
 #: src/transport/plugin_transport_http_server.c:2312
 #: src/transport/plugin_transport_http_server.c:3530
 #: src/transport/plugin_transport_tcp.c:3901
@@ -7353,24 +7358,24 @@ msgstr ""
 msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2115
+#: src/transport/plugin_transport_http_client.c:2112
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2164
+#: src/transport/plugin_transport_http_client.c:2161
 #: src/transport/plugin_transport_http_server.c:3245
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:2181
+#: src/transport/plugin_transport_http_client.c:2178
 #: src/transport/plugin_transport_http_server.c:3315
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:2215
+#: src/transport/plugin_transport_http_client.c:2212
 #, fuzzy, c-format
 msgid "Maximum number of requests is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
@@ -8090,12 +8095,12 @@ msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录!\n"
 
-#: src/util/dnsparser.c:264
+#: src/util/dnsparser.c:261
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/util/dnsparser.c:954
+#: src/util/dnsparser.c:911
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -8532,17 +8537,17 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/program.c:283
+#: src/util/program.c:255
 #, fuzzy, c-format
 msgid "Unreadable or malformed configuration file `%s', exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/program.c:301
+#: src/util/program.c:272
 #, fuzzy, c-format
 msgid "Unreadable or malformed default configuration file `%s', exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/program.c:318
+#: src/util/program.c:287
 #, fuzzy
 msgid "Unreadable or malformed configuration, exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index 2dc2e3435..fb17a8174 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -129,8 +129,8 @@ gnunet_reclaim_LDADD = \
 check_SCRIPTS = \
   test_reclaim_attribute.sh \
   test_reclaim_issue.sh \
-  test_reclaim_consume.sh \
-  test_reclaim_revoke.sh
+  test_reclaim_consume.sh
+#  test_reclaim_revoke.sh
 
 if ENABLE_TEST_RUN
  AM_TESTS_ENVIRONMENT=export 
GNUNET_PREFIX=$${GNUNET_PREFIX:address@hidden@};export 
PATH=$${GNUNET_PREFIX:address@hidden@}/bin:$$PATH;unset XDG_DATA_HOME;unset 
XDG_CONFIG_HOME;
diff --git a/src/reclaim/gnunet-service-reclaim.c 
b/src/reclaim/gnunet-service-reclaim.c
index 6db97fe87..1447f71f6 100644
--- a/src/reclaim/gnunet-service-reclaim.c
+++ b/src/reclaim/gnunet-service-reclaim.c
@@ -51,21 +51,12 @@
  */
 #define MIN_WAIT_TIME GNUNET_TIME_UNIT_MINUTES
 
-/**
- * Standard token expiration time
- */
-#define DEFAULT_TOKEN_EXPIRATION_INTERVAL GNUNET_TIME_UNIT_HOURS
 
 /**
  * Identity handle
  */
 static struct GNUNET_IDENTITY_Handle *identity_handle;
 
-/**
- * Token expiration interval
- */
-static struct GNUNET_TIME_Relative token_expiration_interval;
-
 /**
  * Namestore handle
  */
@@ -165,6 +156,15 @@ struct AttributeIterator
  */
 struct IdpClient
 {
+  /**
+   * DLL
+   */
+  struct IdpClient *prev;
+
+  /**
+   * DLL
+   */
+  struct IdpClient *next;
 
   /**
    * The client
@@ -513,14 +513,139 @@ struct EgoEntry
 };
 
 
+/**
+ * Client list
+ */
+static struct IdpClient *client_list_head = NULL;
+
+/**
+ * Client list
+ */
+static struct IdpClient *client_list_tail = NULL;
+
+
+/**
+ * Cleanup attribute delete handle
+ *
+ * @param adh the attribute to cleanup
+ */
+static void
+cleanup_adh (struct AttributeDeleteHandle *adh)
+{
+  struct TicketRecordsEntry *le;
+  if (NULL != adh->ns_it)
+    GNUNET_NAMESTORE_zone_iteration_stop (adh->ns_it);
+  if (NULL != adh->ns_qe)
+    GNUNET_NAMESTORE_cancel (adh->ns_qe);
+  if (NULL != adh->label)
+    GNUNET_free (adh->label);
+  if (NULL != adh->claim)
+    GNUNET_free (adh->claim);
+  while (NULL != (le = adh->tickets_to_update_head)) {
+    GNUNET_CONTAINER_DLL_remove (adh->tickets_to_update_head,
+                                 adh->tickets_to_update_tail,
+                                 le);
+    if (NULL != le->label)
+      GNUNET_free (le->label);
+    if (NULL != le->data)
+      GNUNET_free (le->data);
+    GNUNET_free (le);
+  }
+  GNUNET_free (adh);
+}
+
+
+/**
+ * Cleanup attribute store handle
+ *
+ * @param handle handle to clean up
+ */
+static void
+cleanup_as_handle (struct AttributeStoreHandle *ash)
+{
+  if (NULL != ash->ns_qe)
+    GNUNET_NAMESTORE_cancel (ash->ns_qe);
+  if (NULL != ash->claim)
+    GNUNET_free (ash->claim);
+  GNUNET_free (ash);
+}
+
+
+/**
+ * Cleanup client
+ *
+ * @param idp the client to clean up
+ */
+static void
+cleanup_client (struct IdpClient *idp)
+{
+  struct AttributeIterator *ai;
+  struct TicketIteration *ti;
+  struct TicketRevocationOperation *rop;
+  struct TicketIssueOperation *iss;
+  struct ConsumeTicketOperation *ct;
+  struct AttributeStoreHandle *as;
+  struct AttributeDeleteHandle *adh;
+
+  while (NULL != (iss = idp->issue_op_head)) {
+    GNUNET_CONTAINER_DLL_remove (idp->issue_op_head, idp->issue_op_tail, iss);
+    GNUNET_free (iss);
+  }
+  while (NULL != (ct = idp->consume_op_head)) {
+    GNUNET_CONTAINER_DLL_remove (idp->consume_op_head,
+                                 idp->consume_op_tail,
+                                 ct);
+    if (NULL != ct->ch)
+      RECLAIM_TICKETS_consume_cancel (ct->ch);
+    GNUNET_free (ct);
+  }
+  while (NULL != (as = idp->store_op_head)) {
+    GNUNET_CONTAINER_DLL_remove (idp->store_op_head, idp->store_op_tail, as);
+    cleanup_as_handle (as);
+  }
+  while (NULL != (adh = idp->delete_op_head)) {
+    GNUNET_CONTAINER_DLL_remove (idp->delete_op_head, idp->delete_op_tail, 
adh);
+    cleanup_adh (adh);
+  }
+
+  while (NULL != (ai = idp->attr_iter_head)) {
+    GNUNET_CONTAINER_DLL_remove (idp->attr_iter_head, idp->attr_iter_tail, ai);
+    GNUNET_free (ai);
+  }
+  while (NULL != (rop = idp->revoke_op_head)) {
+    GNUNET_CONTAINER_DLL_remove (idp->revoke_op_head, idp->revoke_op_tail, 
rop);
+    if (NULL != rop->rh)
+      RECLAIM_TICKETS_revoke_cancel (rop->rh);
+    GNUNET_free (rop);
+  }
+  while (NULL != (ti = idp->ticket_iter_head)) {
+    GNUNET_CONTAINER_DLL_remove (idp->ticket_iter_head,
+                                 idp->ticket_iter_tail,
+                                 ti);
+    if (NULL != ti->iter)
+      RECLAIM_TICKETS_iteration_stop (ti->iter);
+    GNUNET_free (ti);
+  }
+  GNUNET_free (idp);
+}
+
+
 /**
  * Cleanup task
  */
 static void
 cleanup ()
 {
+  struct IdpClient *cl;
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Cleaning up\n");
 
+  while (NULL != (cl = client_list_head))
+  {
+    GNUNET_CONTAINER_DLL_remove (client_list_head,
+                                 client_list_tail,
+                                 cl);
+    cleanup_client (cl);
+  }
   RECLAIM_TICKETS_deinit ();
   if (NULL != timeout_task)
     GNUNET_SCHEDULER_cancel (timeout_task);
@@ -832,21 +957,6 @@ handle_consume_ticket_message (void *cls, const struct 
ConsumeTicketMessage *cm)
  * Attribute store
  *****************************************/
 
-/**
- * Cleanup attribute store handle
- *
- * @param handle handle to clean up
- */
-static void
-cleanup_as_handle (struct AttributeStoreHandle *ash)
-{
-  if (NULL != ash->ns_qe)
-    GNUNET_NAMESTORE_cancel (ash->ns_qe);
-  if (NULL != ash->claim)
-    GNUNET_free (ash->claim);
-  GNUNET_free (ash);
-}
-
 
 /**
  * Attribute store result handler
@@ -980,37 +1090,6 @@ handle_attribute_store_message (void *cls,
 }
 
 
-/**
- * Cleanup attribute delete handle
- *
- * @param adh the attribute to cleanup
- */
-static void
-cleanup_adh (struct AttributeDeleteHandle *adh)
-{
-  struct TicketRecordsEntry *le;
-  if (NULL != adh->ns_it)
-    GNUNET_NAMESTORE_zone_iteration_stop (adh->ns_it);
-  if (NULL != adh->ns_qe)
-    GNUNET_NAMESTORE_cancel (adh->ns_qe);
-  if (NULL != adh->label)
-    GNUNET_free (adh->label);
-  if (NULL != adh->claim)
-    GNUNET_free (adh->claim);
-  while (NULL != (le = adh->tickets_to_update_head)) {
-    GNUNET_CONTAINER_DLL_remove (adh->tickets_to_update_head,
-                                 adh->tickets_to_update_tail,
-                                 le);
-    if (NULL != le->label)
-      GNUNET_free (le->label);
-    if (NULL != le->data)
-      GNUNET_free (le->data);
-    GNUNET_free (le);
-  }
-  GNUNET_free (adh);
-}
-
-
 /**
  * Send a deletion success response
  *
@@ -1623,7 +1702,7 @@ run (void *cls,
 
   if (GNUNET_OK != RECLAIM_TICKETS_init (cfg)) {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "Unable to initialized TICKETS subsystem.\n");
+                "Unable to initialize TICKETS subsystem.\n");
     GNUNET_SCHEDULER_shutdown ();
     return;
   }
@@ -1636,20 +1715,6 @@ run (void *cls,
 
   identity_handle = GNUNET_IDENTITY_connect (cfg, NULL, NULL);
 
-  if (GNUNET_OK
-      == GNUNET_CONFIGURATION_get_value_time (cfg,
-                                              "reclaim",
-                                              "TOKEN_EXPIRATION_INTERVAL",
-                                              &token_expiration_interval)) {
-    GNUNET_log (
-      GNUNET_ERROR_TYPE_DEBUG,
-      "Time window for zone iteration: %s\n",
-      GNUNET_STRINGS_relative_time_to_string (token_expiration_interval,
-                                              GNUNET_YES));
-  } else {
-    token_expiration_interval = DEFAULT_TOKEN_EXPIRATION_INTERVAL;
-  }
-
   GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL);
 }
 
@@ -1667,54 +1732,11 @@ client_disconnect_cb (void *cls,
                       void *app_ctx)
 {
   struct IdpClient *idp = app_ctx;
-  struct AttributeIterator *ai;
-  struct TicketIteration *ti;
-  struct TicketRevocationOperation *rop;
-  struct TicketIssueOperation *iss;
-  struct ConsumeTicketOperation *ct;
-  struct AttributeStoreHandle *as;
-  struct AttributeDeleteHandle *adh;
-
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Client %p disconnected\n", client);
-
-  while (NULL != (iss = idp->issue_op_head)) {
-    GNUNET_CONTAINER_DLL_remove (idp->issue_op_head, idp->issue_op_tail, iss);
-    GNUNET_free (iss);
-  }
-  while (NULL != (ct = idp->consume_op_head)) {
-    GNUNET_CONTAINER_DLL_remove (idp->consume_op_head,
-                                 idp->consume_op_tail,
-                                 ct);
-    if (NULL != ct->ch)
-      RECLAIM_TICKETS_consume_cancel (ct->ch);
-    GNUNET_free (ct);
-  }
-  while (NULL != (as = idp->store_op_head)) {
-    GNUNET_CONTAINER_DLL_remove (idp->store_op_head, idp->store_op_tail, as);
-    cleanup_as_handle (as);
-  }
-  while (NULL != (adh = idp->delete_op_head)) {
-    GNUNET_CONTAINER_DLL_remove (idp->delete_op_head, idp->delete_op_tail, 
adh);
-    cleanup_adh (adh);
-  }
-
-  while (NULL != (ai = idp->attr_iter_head)) {
-    GNUNET_CONTAINER_DLL_remove (idp->attr_iter_head, idp->attr_iter_tail, ai);
-    GNUNET_free (ai);
-  }
-  while (NULL != (rop = idp->revoke_op_head)) {
-    GNUNET_CONTAINER_DLL_remove (idp->revoke_op_head, idp->revoke_op_tail, 
rop);
-    if (NULL != rop->rh)
-      RECLAIM_TICKETS_revoke_cancel (rop->rh);
-    GNUNET_free (rop);
-  }
-  while (NULL != (ti = idp->ticket_iter_head)) {
-    GNUNET_CONTAINER_DLL_remove (idp->ticket_iter_head,
-                                 idp->ticket_iter_tail,
-                                 ti);
-    GNUNET_free (ti);
-  }
-  GNUNET_free (idp);
+  GNUNET_CONTAINER_DLL_remove (client_list_head,
+                               client_list_tail,
+                               idp);
+  cleanup_client (idp);
 }
 
 
@@ -1736,6 +1758,9 @@ client_connect_cb (void *cls,
   idp = GNUNET_new (struct IdpClient);
   idp->client = client;
   idp->mq = mq;
+  GNUNET_CONTAINER_DLL_insert (client_list_head,
+                               client_list_tail,
+                               idp);
   return idp;
 }
 
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.c 
b/src/reclaim/gnunet-service-reclaim_tickets.c
index 75d9d3940..f18b11cb1 100644
--- a/src/reclaim/gnunet-service-reclaim_tickets.c
+++ b/src/reclaim/gnunet-service-reclaim_tickets.c
@@ -28,6 +28,8 @@
 
 #include "gnunet-service-reclaim_tickets.h"
 
+#define DEFAULT_TICKET_REFRESH_INTERVAL GNUNET_TIME_UNIT_HOURS
+
 struct ParallelLookup;
 
 
@@ -291,6 +293,10 @@ struct RECLAIM_TICKETS_RevokeHandle
   struct TicketRecordsEntry *tickets_to_update_tail;
 };
 
+/**
+ * Ticket expiration interval
+ */
+static struct GNUNET_TIME_Relative ticket_refresh_interval;
 
 /* Namestore handle */
 static struct GNUNET_NAMESTORE_Handle *nsh;
@@ -660,17 +666,17 @@ static void
 cleanup_cth (struct RECLAIM_TICKETS_ConsumeHandle *cth)
 {
   struct ParallelLookup *lu;
-  struct ParallelLookup *tmp;
   if (NULL != cth->lookup_request)
     GNUNET_GNS_lookup_cancel (cth->lookup_request);
-  for (lu = cth->parallel_lookups_head; NULL != lu;) {
-    GNUNET_GNS_lookup_cancel (lu->lookup_request);
-    GNUNET_free (lu->label);
-    tmp = lu->next;
+  if (NULL != cth->kill_task)
+    GNUNET_SCHEDULER_cancel (cth->kill_task);
+  while (NULL != (lu = cth->parallel_lookups_head)) {
+    if (NULL != lu->lookup_request)
+      GNUNET_GNS_lookup_cancel (lu->lookup_request);
+    GNUNET_free_non_null (lu->label);
     GNUNET_CONTAINER_DLL_remove (cth->parallel_lookups_head,
                                  cth->parallel_lookups_tail, lu);
     GNUNET_free (lu);
-    lu = tmp;
   }
 
   if (NULL != cth->attrs)
@@ -715,7 +721,6 @@ process_parallel_lookup_result (void *cls, uint32_t 
rd_count,
     return; // Wait for more
   /* Else we are done */
 
-  GNUNET_SCHEDULER_cancel (cth->kill_task);
   cth->cb (cth->cb_cls, &cth->ticket.identity, cth->attrs, GNUNET_OK, NULL);
   cleanup_cth (cth);
 }
@@ -872,14 +877,15 @@ issue_ticket (struct TicketIssueHandle *ih)
   for (le = ih->attrs->list_head; NULL != le; le = le->next) {
     attrs_record[i].data = &le->claim->id;
     attrs_record[i].data_size = sizeof (le->claim->id);
-    attrs_record[i].expiration_time = GNUNET_TIME_UNIT_DAYS.rel_value_us;
+    //FIXME: Should this be the attribute expiration time or ticket refresh 
intv
+    attrs_record[i].expiration_time = ticket_refresh_interval.rel_value_us;
     attrs_record[i].record_type = GNUNET_GNSRECORD_TYPE_RECLAIM_ATTR_REF;
     attrs_record[i].flags = GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
     i++;
   }
   attrs_record[i].data = &ih->ticket;
   attrs_record[i].data_size = sizeof (struct GNUNET_RECLAIM_Ticket);
-  attrs_record[i].expiration_time = GNUNET_TIME_UNIT_DAYS.rel_value_us;
+  attrs_record[i].expiration_time = ticket_refresh_interval.rel_value_us;
   attrs_record[i].record_type = GNUNET_GNSRECORD_TYPE_RECLAIM_TICKET;
   attrs_record[i].flags =
       GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION | GNUNET_GNSRECORD_RF_PRIVATE;
@@ -999,6 +1005,20 @@ RECLAIM_TICKETS_iteration_start (
 int
 RECLAIM_TICKETS_init (const struct GNUNET_CONFIGURATION_Handle *c)
 {
+  // Get ticket expiration time (relative) from config
+  if (GNUNET_OK
+      == GNUNET_CONFIGURATION_get_value_time (c,
+                                              "reclaim",
+                                              "TICKET_REFRESH_INTERVAL",
+                                              &ticket_refresh_interval)) {
+    GNUNET_log (
+      GNUNET_ERROR_TYPE_DEBUG,
+      "Configured refresh interval for tickets: %s\n",
+      GNUNET_STRINGS_relative_time_to_string (ticket_refresh_interval,
+                                              GNUNET_YES));
+  } else {
+    ticket_refresh_interval = DEFAULT_TICKET_REFRESH_INTERVAL;
+  }
   // Connect to identity and namestore services
   nsh = GNUNET_NAMESTORE_connect (c);
   if (NULL == nsh) {
diff --git a/src/reclaim/reclaim.conf b/src/reclaim/reclaim.conf
index c2af27442..8655f2e0b 100644
--- a/src/reclaim/reclaim.conf
+++ b/src/reclaim/reclaim.conf
@@ -9,7 +9,7 @@ ACCEPT_FROM6 = ::1;
 UNIXPATH = $GNUNET_USER_RUNTIME_DIR/gnunet-service-reclaim.sock
 UNIX_MATCH_UID = NO
 UNIX_MATCH_GID = YES
-TOKEN_EXPIRATION_INTERVAL = 30 m
+TICKET_REFRESH_INTERVAL = 6h
 
 [reclaim-rest-plugin]
 #ADDRESS = https://identity.gnu:8000#/login
diff --git a/src/reclaim/test_reclaim.conf b/src/reclaim/test_reclaim.conf
index 35e710177..ec19056e4 100644
--- a/src/reclaim/test_reclaim.conf
+++ b/src/reclaim/test_reclaim.conf
@@ -15,6 +15,7 @@ PLUGINS =
 
 [reclaim]
 START_ON_DEMAND = YES
+TICKET_REFRESH_INTERVAL = 15s
 #PREFIX = valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes 
--log-file=$GNUNET_TMP/idplog
 
 [gns]
diff --git a/src/reclaim/test_reclaim_revoke.sh 
b/src/reclaim/test_reclaim_revoke.sh
index 595752fd8..b20a27d12 100755
--- a/src/reclaim/test_reclaim_revoke.sh
+++ b/src/reclaim/test_reclaim_revoke.sh
@@ -30,22 +30,21 @@ gnunet-identity -C eve -c test_reclaim.conf
 ALICE_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep alice | awk '{print 
$3}')
 BOB_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep bob | awk '{print 
$3}')
 EVE_KEY=$(gnunet-identity -d -c test_reclaim.conf | grep eve | awk '{print 
$3}')
-
-gnunet-reclaim -e alice -E 15s -a email -V address@hidden -c test_reclaim.conf 
+gnunet-reclaim -e alice -E 15s -a email -V address@hidden -c test_reclaim.conf
 gnunet-reclaim -e alice -E 15s -a name -V John -c test_reclaim.conf
 TICKET_BOB=$(gnunet-reclaim -e alice -i "email,name" -r $BOB_KEY -c 
test_reclaim.conf | awk '{print $1}')
 #gnunet-reclaim -e bob -C $TICKET_BOB -c test_reclaim.conf
 TICKET_EVE=$(gnunet-reclaim -e alice -i "email" -r $EVE_KEY -c 
test_reclaim.conf | awk '{print $1}')
-
-#echo "Consuming $TICKET"
-#gnunet-reclaim -e eve -C $TICKET_EVE -c test_reclaim.conf
+gnunet-namestore -z alice -D
+echo "Revoking $TICKET"
 gnunet-reclaim -e alice -R $TICKET_EVE -c test_reclaim.conf
+gnunet-namestore -z alice -D
+sleep 16
+echo "Consuming $TICKET"
 
-#sleep 6
-
-gnunet-reclaim -e eve -C $TICKET_EVE -c test_reclaim.conf 2&>1 >/dev/null
+gnunet-reclaim -e eve -C $TICKET_EVE -c test_reclaim.conf
 if test $? == 0
-then 
+then
   echo "Eve can still resolve attributes..."
   gnunet-arm -e -c test_reclaim.conf
   exit 1
@@ -54,7 +53,8 @@ fi
 gnunet-arm -e -c test_reclaim.conf
 gnunet-arm -s -c test_reclaim.conf 2&>1 > /dev/null
 
-gnunet-reclaim -e bob -C $TICKET_BOB -c test_reclaim.conf 2&>1 >/dev/null
+gnunet-reclaim -e bob -C $TICKET_BOB -c test_reclaim.conf
+#gnunet-reclaim -e bob -C $TICKET_BOB -c test_reclaim.conf 2&>1 >/dev/null
 if test $? != 0
 then
   echo "Bob cannot resolve attributes..."

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



reply via email to

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