Imported Upstream version 0.9.3upstream/0.9.3

author: Bertrand Marc <beberking@gmail.com> 2012-06-06 20:47:48 +0200
committer: Bertrand Marc <beberking@gmail.com> 2012-06-06 20:47:48 +0200
commit: 740b30688bd745a527f96f9116c19acb3480971a (patch)
tree: 2709a3f4dba11c174aa9e1ba3612e30c578e76a9 /po
parent: 2b81464a43485fcc8ce079fafdee7b7a171835f4 (diff)
12 files changed, 10790 insertions, 8740 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a116284..198daf9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,8 +3,6 @@ src/arm/do_start_process.c
 src/arm/gnunet-arm.c
 src/arm/gnunet-service-arm.c
 src/arm/mockup-service.c
-src/ats/ats_api.c
-src/ats/ats_api_peer_change_preference.c
 src/ats/ats_api_performance.c
 src/ats/ats_api_scheduling.c
 src/ats/gnunet-service-ats_addresses.c
@@ -20,8 +18,9 @@ src/chat/chat.c
 src/chat/gnunet-chat.c
 src/chat/gnunet-service-chat.c
 src/core/core_api.c
+src/core/core_api_is_connected.c
 src/core/core_api_iterate_peers.c
-src/core/gnunet-core-list-connections.c
+src/core/gnunet-core.c
 src/core/gnunet-service-core.c
 src/core/gnunet-service-core_clients.c
 src/core/gnunet-service-core_kx.c
@@ -41,6 +40,7 @@ src/datastore/plugin_datastore_sqlite.c
 src/datastore/plugin_datastore_template.c
 src/dht/dht_api.c
 src/dht/gnunet-dht-get.c
+src/dht/gnunet-dht-monitor.c
 src/dht/gnunet-dht-put.c
 src/dht/gnunet-service-dht.c
 src/dht/gnunet-service-dht_clients.c
@@ -100,19 +100,32 @@ src/fs/gnunet-service-fs_put.c
 src/fs/gnunet-unindex.c
 src/fs/plugin_block_fs.c
 src/gns/gns_api.c
-src/gns/gnunet-gns-lookup.c
+src/gns/gnunet-gns.c
+src/gns/gnunet-gns-fcfsd.c
+src/gns/gnunet-gns-proxy.c
 src/gns/gnunet-service-gns.c
-src/gns/namestore_stub_api.c
+src/gns/gnunet-service-gns_interceptor.c
+src/gns/gnunet-service-gns_resolver.c
+src/gns/nss/nss_gns.c
+src/gns/nss/nss_gns_query.c
+src/gns/plugin_block_gns.c
 src/hello/address.c
+src/hello/gnunet-hello.c
 src/hello/hello.c
 src/hostlist/gnunet-daemon-hostlist.c
 src/hostlist/hostlist-client.c
 src/hostlist/hostlist-server.c
+src/integration-tests/connection_watchdog.c
+src/lockmanager/gnunet-service-lockmanager.c
+src/lockmanager/lockmanager_api.c
 src/mesh/gnunet-service-mesh.c
 src/mesh/mesh_api.c
 src/mesh/mesh_tunnel_tree.c
+src/mysql/mysql.c
+src/namestore/gnunet-namestore.c
 src/namestore/gnunet-service-namestore.c
 src/namestore/namestore_api.c
+src/namestore/namestore_common.c
 src/namestore/plugin_namestore_sqlite.c
 src/nat/gnunet-helper-nat-client.c
 src/nat/gnunet-helper-nat-client-windows.c
@@ -129,17 +142,29 @@ src/peerinfo/gnunet-service-peerinfo.c
 src/peerinfo/peerinfo_api.c
 src/peerinfo/peerinfo_api_notify.c
 src/peerinfo-tool/gnunet-peerinfo.c
+src/peerinfo-tool/gnunet-peerinfo_plugins.c
+src/postgres/postgres.c
 src/pt/gnunet-daemon-pt.c
+src/regex/regex.c
 src/statistics/gnunet-service-statistics.c
 src/statistics/gnunet-statistics.c
 src/statistics/statistics_api.c
 src/stream/stream_api.c
 src/template/gnunet-service-template.c
 src/template/gnunet-template.c
+src/testbed/testbed_api.c
+src/testbed/testbed_api_hosts.c
+src/testbed/testbed_api_operations.c
+src/testbed/testbed_api_peers.c
+src/testbed/testbed_api_services.c
+src/testbed/testbed_api_testbed.c
+src/testbed/testbed_api_test.c
+src/testbed/testbed_api_topology.c
 src/testing/gnunet-testing.c
 src/testing/helper.c
 src/testing/testing.c
 src/testing/testing_group.c
+src/testing/testing_new.c
 src/testing/testing_peergroup.c
 src/topology/gnunet-daemon-topology.c
 src/transport/gnunet-helper-transport-wlan.c
@@ -153,12 +178,10 @@ src/transport/gnunet-service-transport_plugins.c
 src/transport/gnunet-service-transport_validation.c
 src/transport/gnunet-transport.c
 src/transport/gnunet-transport-certificate-creation.c
-src/transport/gnunet-transport-connect-running-peers.c
 src/transport/gnunet-transport-wlan-sender.c
 src/transport/plugin_transport_http.c
 src/transport/plugin_transport_http_client.c
 src/transport/plugin_transport_http_server.c
-src/transport/plugin_transport_smtp.c
 src/transport/plugin_transport_tcp.c
 src/transport/plugin_transport_template.c
 src/transport/plugin_transport_udp_broadcasting.c
@@ -197,6 +220,7 @@ src/util/getopt.c
 src/util/getopt_helpers.c
 src/util/gnunet-config-diff.c
 src/util/gnunet-resolver.c
+src/util/gnunet-rsa.c
 src/util/gnunet-service-resolver.c
 src/util/helper.c
 src/util/load.c
@@ -216,6 +240,7 @@ src/util/server_nc.c
 src/util/server_tc.c
 src/util/service.c
 src/util/signal.c
+src/util/speedup.c
 src/util/strings.c
 src/util/time.c
 src/util/winproc.c
@@ -223,4 +248,7 @@ src/vpn/gnunet-helper-vpn.c
 src/vpn/gnunet-service-vpn.c
 src/vpn/gnunet-vpn.c
 src/vpn/vpn_api.c
+src/dht/dht.h
 src/include/gnunet_common.h
+src/include/gnunet_postgres_lib.h
+src/include/gnunet_time_lib.h
diff --git a/po/de.gmo b/po/de.gmo
index 7a939b9..729be3a 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index 1266419..7f15916 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2012-02-28 18:30+0100\n"
+"POT-Creation-Date: 2012-06-05 15:47+0200\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <durner@gnunet.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -17,264 +17,279 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/arm_api.c:187
+#: src/arm/arm_api.c:165
 #, fuzzy
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/arm/arm_api.c:378
+#: src/arm/arm_api.c:349
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/arm/arm_api.c:392
+#: src/arm/arm_api.c:363
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/arm/arm_api.c:467
+#: src/arm/arm_api.c:432
 #, fuzzy, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/arm/arm_api.c:523
+#: src/arm/arm_api.c:485
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:524
+#: src/arm/arm_api.c:486
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:546
+#: src/arm/arm_api.c:507
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:548
+#: src/arm/arm_api.c:508
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:581
+#: src/arm/arm_api.c:540
 #, fuzzy, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr "`%s': Nachricht wurde nicht innerhalb %llu ms empfangen.\n"
 
-#: src/arm/arm_api.c:654
+#: src/arm/arm_api.c:612
 #, fuzzy, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr "Keine Antwort innerhalb %llums erhalten.\n"
 
-#: src/arm/gnunet-arm.c:149
+#: src/arm/gnunet-arm.c:159
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/arm/gnunet-arm.c:154
+#: src/arm/gnunet-arm.c:164
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-arm.c:157
+#: src/arm/gnunet-arm.c:167
 #, fuzzy, c-format
 msgid "Service `%s' was already running.\n"
 msgstr "Diese Suche läuft bereits!\n"
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:172
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:179
 #, fuzzy, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr "Diese Suche läuft bereits!\n"
 
-#: src/arm/gnunet-arm.c:173
+#: src/arm/gnunet-arm.c:183
 #, fuzzy
 msgid "Request ignored as ARM is shutting down.\n"
 msgstr "`%s' fährt herunter.\n"
 
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:187
 #, fuzzy
 msgid "Error communicating with ARM service.\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/arm/gnunet-arm.c:181
+#: src/arm/gnunet-arm.c:191
 #, fuzzy
 msgid "Timeout communicating with ARM service.\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/arm/gnunet-arm.c:185
+#: src/arm/gnunet-arm.c:195
 #, fuzzy
 msgid "Operation failed.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:189
+#: src/arm/gnunet-arm.c:199
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:222
+#, fuzzy
+msgid "Error communicating with ARM. ARM not running?\n"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/arm/gnunet-arm.c:225
+#, fuzzy
+msgid "Running services:\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/arm/gnunet-arm.c:249
 #, fuzzy, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 "Es muss eine Liste von Freunden in der Konfigurationsdatei unter `%s' in der "
 "Sektion `%s' angegeben werden.\n"
 
-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+#: src/arm/gnunet-arm.c:257 src/arm/gnunet-arm.c:357 src/arm/gnunet-arm.c:373
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247
+#: src/arm/gnunet-arm.c:280
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/arm/gnunet-arm.c:253
+#: src/arm/gnunet-arm.c:286
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-arm.c:355
+#: src/arm/gnunet-arm.c:407
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:357
+#: src/arm/gnunet-arm.c:409
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:359
+#: src/arm/gnunet-arm.c:411
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:361
+#: src/arm/gnunet-arm.c:413
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:364
+#: src/arm/gnunet-arm.c:416
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:419
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:421
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:372
+#: src/arm/gnunet-arm.c:424
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in ms)"
 
-#: src/arm/gnunet-arm.c:383
+#: src/arm/gnunet-arm.c:426
+msgid "List currently running services"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:437
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:328
+#: src/arm/gnunet-service-arm.c:332
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:331
+#: src/arm/gnunet-service-arm.c:335
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:357
+#: src/arm/gnunet-service-arm.c:361
 #, fuzzy
 msgid "Could not send status result to client\n"
 msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:484
+#: src/arm/gnunet-service-arm.c:393
+#, fuzzy
+msgid "Could not send list result to client\n"
+msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
+
+#: src/arm/gnunet-service-arm.c:523
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/arm/gnunet-service-arm.c:506
+#: src/arm/gnunet-service-arm.c:545
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:520
+#: src/arm/gnunet-service-arm.c:559
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:628
+#: src/arm/gnunet-service-arm.c:667
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:782
+#: src/arm/gnunet-service-arm.c:878
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:877
+#: src/arm/gnunet-service-arm.c:970
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:882
+#: src/arm/gnunet-service-arm.c:975
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:887
+#: src/arm/gnunet-service-arm.c:980
 #, fuzzy
 msgid "unknown"
 msgstr "Unbekannter Fehler"
 
-#: src/arm/gnunet-service-arm.c:921
+#: src/arm/gnunet-service-arm.c:986
+#, fuzzy, c-format
+msgid "Service `%s' took %llu ms to terminate\n"
+msgstr "Dienst gelöscht.\n"
+
+#: src/arm/gnunet-service-arm.c:1021
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:967 src/arm/mockup-service.c:41
-#, fuzzy
-msgid "Failed to transmit shutdown ACK.\n"
-msgstr "Fehler beim Starten der Collection.\n"
-
-#: src/arm/gnunet-service-arm.c:1067
+#: src/arm/gnunet-service-arm.c:1127
 #, fuzzy, c-format
 msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/arm/gnunet-service-arm.c:1069
+#: src/arm/gnunet-service-arm.c:1129
 msgid "option missing"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1152
+#: src/arm/gnunet-service-arm.c:1213
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1224
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1177
+#: src/arm/gnunet-service-arm.c:1238
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:46
-msgid "Transmitting shutdown ACK.\n"
-msgstr ""
-
-#: src/arm/mockup-service.c:69
+#: src/arm/mockup-service.c:44
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
@@ -334,195 +349,198 @@ msgstr ""
 msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:92
+#: src/chat/gnunet-chat.c:93
 msgid "Joined\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:124
+#: src/chat/gnunet-chat.c:125 src/chat/gnunet-chat.c:133
+#: src/chat/gnunet-chat.c:213 src/chat/gnunet-chat.c:253
+#: src/chat/gnunet-chat.c:329 src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:400 src/chat/gnunet-chat.c:700
 msgid "anonymous"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:130
+#: src/chat/gnunet-chat.c:144
 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "`%s' %s schlug fehl: %s\n"
 
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: src/chat/gnunet-chat.c:147 src/chat/gnunet-chat.c:150
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr "`%s' %s schlug fehl: %s\n"
 
-#: src/chat/gnunet-chat.c:139
+#: src/chat/gnunet-chat.c:153
 #, fuzzy, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/chat/gnunet-chat.c:142
+#: src/chat/gnunet-chat.c:156
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:145
+#: src/chat/gnunet-chat.c:159
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:148
+#: src/chat/gnunet-chat.c:162
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:151
+#: src/chat/gnunet-chat.c:165
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:170
 #, fuzzy, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:173
 #, fuzzy, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:162
+#: src/chat/gnunet-chat.c:176
 #, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:193
+#: src/chat/gnunet-chat.c:217
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:260
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:260
 #, fuzzy, c-format
 msgid "`%s' left the room\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#: src/chat/gnunet-chat.c:321 src/chat/gnunet-chat.c:363
 #, fuzzy
 msgid "Could not change username\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#: src/chat/gnunet-chat.c:334 src/chat/gnunet-chat.c:702
 #, fuzzy, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr "Ungültige Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/chat/gnunet-chat.c:320
+#: src/chat/gnunet-chat.c:373
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/chat/gnunet-chat.c:333
+#: src/chat/gnunet-chat.c:388
 #, c-format
 msgid "Users in room `%s': "
 msgstr ""
 
-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:434
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:379
-#, fuzzy, c-format
-msgid "Unknown user `%s'\n"
-msgstr "Unbekannte Operation `%s'\n"
+#: src/chat/gnunet-chat.c:443
+#, c-format
+msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:395
+#: src/chat/gnunet-chat.c:460
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:448
+#: src/chat/gnunet-chat.c:513
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/chat/gnunet-chat.c:459
+#: src/chat/gnunet-chat.c:524
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:463
+#: src/chat/gnunet-chat.c:528
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:532
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:470
+#: src/chat/gnunet-chat.c:535
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:472
+#: src/chat/gnunet-chat.c:537
 msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:474
+#: src/chat/gnunet-chat.c:539
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:477
+#: src/chat/gnunet-chat.c:542
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:480
+#: src/chat/gnunet-chat.c:545
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:547
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:484
+#: src/chat/gnunet-chat.c:549
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:551
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:554
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:556
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:606
+#: src/chat/gnunet-chat.c:672
 #, fuzzy
 msgid "You must specify a nickname\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/chat/gnunet-chat.c:622
+#: src/chat/gnunet-chat.c:688
 #, fuzzy, c-format
 msgid "Failed to join room `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/chat/gnunet-chat.c:655
+#: src/chat/gnunet-chat.c:727
 msgid "set the nickname to use (required)"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:658
+#: src/chat/gnunet-chat.c:730
 msgid "set the chat room to join"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:670
+#: src/chat/gnunet-chat.c:742
 msgid "Join a chat on GNUnet."
 msgstr ""
 
@@ -546,184 +564,186 @@ msgstr "Fehler beim Speichern der Konfiguration!"
 msgid "Failed to queue a leave notification\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/core/core_api.c:798
+#: src/core/core_api.c:786
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core-list-connections.c:77
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
+#: src/core/gnunet-core.c:54 src/peerinfo-tool/gnunet-peerinfo.c:286
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/core/gnunet-core-list-connections.c:175
-#: src/peerinfo-tool/gnunet-peerinfo.c:194
+#: src/core/gnunet-core.c:72 src/peerinfo-tool/gnunet-peerinfo.c:817
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültige Kommandozeilen Parameter:\n"
 
-#: src/core/gnunet-core-list-connections.c:196
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
-msgid "don't resolve host names"
-msgstr ""
-
-#: src/core/gnunet-core-list-connections.c:203
+#: src/core/gnunet-core.c:95
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/core/gnunet-service-core.c:99
+#: src/core/gnunet-service-core.c:97
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:360
+#: src/core/gnunet-service-core_clients.c:370
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_clients.c:465
+#: src/core/gnunet-service-core_clients.c:475
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_clients.c:801
+#: src/core/gnunet-service-core_clients.c:818
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:493
+#: src/core/gnunet-service-core_kx.c:565
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:543
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
-#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
+#: src/core/gnunet-service-core_kx.c:681 src/dv/gnunet-service-dv.c:3003
 #, fuzzy
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/core/gnunet-service-core_kx.c:623
+#: src/core/gnunet-service-core_kx.c:700
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:753
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:694
+#: src/core/gnunet-service-core_kx.c:775
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:828
 #, fuzzy
 msgid "# session keys received"
 msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:845
 #, fuzzy, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr "Größe der `%s' Nachricht ist zu kurz. Nachricht wird ignoriert.\n"
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:890
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_kx.c:883
-#: src/transport/gnunet-service-transport_validation.c:803
+#: src/core/gnunet-service-core_kx.c:977
+#: src/transport/gnunet-service-transport_validation.c:810
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/core/gnunet-service-core_kx.c:1010
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:938
+#: src/core/gnunet-service-core_kx.c:1029
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1026
+#: src/core/gnunet-service-core_kx.c:1125
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1037
+#: src/core/gnunet-service-core_kx.c:1135
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1095
-#: src/transport/gnunet-service-transport_validation.c:1026
+#: src/core/gnunet-service-core_kx.c:1236
+#: src/transport/gnunet-service-transport_validation.c:1031
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:1275
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1157
+#: src/core/gnunet-service-core_kx.c:1303
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1223
+#: src/core/gnunet-service-core_kx.c:1329
+#, fuzzy
+msgid "# rekey operations confirmed via PONG"
+msgstr "# Knotenankündigungen empfangen"
+
+#: src/core/gnunet-service-core_kx.c:1381
+#: src/core/gnunet-service-core_kx.c:1398
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1402
+msgid "# REKEY operations performed"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1537
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1406
-#: src/core/gnunet-service-core_kx.c:1431
+#: src/core/gnunet-service-core_kx.c:1577
+#: src/core/gnunet-service-core_kx.c:1602
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1589
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1626
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1630
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1638
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1700
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/core/gnunet-service-core_kx.c:1536
+#: src/core/gnunet-service-core_kx.c:1708
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1546 src/hostlist/hostlist-server.c:555
-#: src/peerinfo-tool/gnunet-peerinfo.c:202
-#: src/transport/gnunet-service-transport.c:595
+#: src/core/gnunet-service-core_kx.c:1718 src/hostlist/hostlist-server.c:551
+#: src/peerinfo-tool/gnunet-peerinfo.c:823
+#: src/transport/gnunet-service-transport.c:611
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -734,30 +754,41 @@ msgid "# sessions terminated by transport disconnect"
 msgstr "# Knotenankündigungen empfangen"
 
 #: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:342
+#: src/core/gnunet-service-core_neighbours.c:334
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:247
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:430
+#: src/core/gnunet-service-core_neighbours.c:418
 #, fuzzy, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:273
-msgid "# entries in session map"
-msgstr ""
+#: src/core/gnunet-service-core_sessions.c:206
+#: src/core/gnunet-service-core_sessions.c:269
+#: src/dht/gnunet-service-dht_neighbours.c:625
+#: src/dht/gnunet-service-dht_neighbours.c:683
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
+#: src/topology/gnunet-daemon-topology.c:709
+#: src/topology/gnunet-daemon-topology.c:810
+#: src/transport/gnunet-service-transport_neighbours.c:874
+#: src/transport/gnunet-service-transport_neighbours.c:1080
+#: src/transport/gnunet-service-transport_neighbours.c:1089
+#: src/transport/gnunet-service-transport_neighbours.c:2568
+#: src/transport/gnunet-service-transport_neighbours.c:2814
+#, fuzzy
+msgid "# peers connected"
+msgstr "# verbundener Knoten"
 
-#: src/core/gnunet-service-core_sessions.c:238
+#: src/core/gnunet-service-core_sessions.c:236
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/core/gnunet-service-core_sessions.c:414
+#: src/core/gnunet-service-core_sessions.c:406
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -771,428 +802,407 @@ msgstr "# verschlüsselter PING Nachrichten empfangen"
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:118 src/datacache/datacache.c:255
-#: src/datastore/gnunet-service-datastore.c:854
+#: src/datacache/datacache.c:115 src/datacache/datacache.c:250
+#: src/datastore/gnunet-service-datastore.c:834
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# bytes in der Datenbank"
 
-#: src/datacache/datacache.c:144 src/datacache/datacache.c:151
-#: src/datastore/gnunet-service-datastore.c:1531
-#: src/datastore/gnunet-service-datastore.c:1542
+#: src/datacache/datacache.c:141 src/datacache/datacache.c:148
+#: src/datastore/gnunet-service-datastore.c:1483
+#: src/datastore/gnunet-service-datastore.c:1494
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/datacache/datacache.c:183
+#: src/datacache/datacache.c:180
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:191
+#: src/datacache/datacache.c:188
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/datacache/datacache.c:281
+#: src/datacache/datacache.c:276
 #, fuzzy
 msgid "# requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datacache/datacache.c:291
+#: src/datacache/datacache.c:284
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:103
-#: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:517
-#: src/datacache/plugin_datacache_mysql.c:526
-#: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614
-#: src/datacache/plugin_datacache_sqlite.c:71
-#: src/datacache/plugin_datacache_sqlite.c:74
-#: src/datastore/plugin_datastore_mysql.c:139
-#: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:613
-#: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685
-#: src/datastore/plugin_datastore_mysql.c:1362
-#: src/datastore/plugin_datastore_mysql.c:1376
-#: src/datastore/plugin_datastore_sqlite.c:61
-#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
-#: src/include/gnunet_common.h:514
+#: src/datacache/plugin_datacache_mysql.c:97
+#: src/datacache/plugin_datacache_mysql.c:104
+#: src/datacache/plugin_datacache_sqlite.c:69
+#: src/datacache/plugin_datacache_sqlite.c:72
+#: src/datastore/plugin_datastore_mysql.c:803
+#: src/datastore/plugin_datastore_mysql.c:817
+#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
+#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
+#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:525
+#: src/include/gnunet_common.h:532
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/datacache/plugin_datacache_mysql.c:224
-#: src/datastore/plugin_datastore_mysql.c:316
-#, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
-msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
-
-#: src/datacache/plugin_datacache_mysql.c:230
-#: src/datastore/plugin_datastore_mysql.c:322
-#, fuzzy, c-format
-msgid "Could not access file `%s': %s\n"
-msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
-
-#: src/datacache/plugin_datacache_mysql.c:979
+#: src/datacache/plugin_datacache_mysql.c:450
 msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:79
-#: src/datastore/plugin_datastore_postgres.c:93
-#, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
-
-#: src/datacache/plugin_datacache_postgres.c:149
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
-
-#: src/datacache/plugin_datacache_postgres.c:499
+#: src/datacache/plugin_datacache_postgres.c:367
 msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:424
+#: src/datacache/plugin_datacache_sqlite.c:410
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:457
-#: src/datastore/plugin_datastore_sqlite.c:414
-#: src/namestore/plugin_namestore_sqlite.c:381
+#: src/datacache/plugin_datacache_sqlite.c:443
+#: src/datastore/plugin_datastore_sqlite.c:408
+#: src/namestore/plugin_namestore_sqlite.c:370
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
+#: src/datacache/plugin_datacache_sqlite.c:450
+#, fuzzy, c-format
+msgid "Failed to close statement %p: %d\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
 #: src/datacache/plugin_datacache_template.c:121
 msgid "Template datacache running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:289
+#: src/datastore/datastore_api.c:305
 #, fuzzy
 msgid "Failed to transmit request to drop database.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/datastore/datastore_api.c:372
+#: src/datastore/datastore_api.c:388
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:418
+#: src/datastore/datastore_api.c:432
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:445
+#: src/datastore/datastore_api.c:459
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:465
+#: src/datastore/datastore_api.c:477
 #, fuzzy
 msgid "# Requests dropped from datastore queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/datastore/datastore_api.c:513
+#: src/datastore/datastore_api.c:525
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:540
+#: src/datastore/datastore_api.c:548
 msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608
+#: src/datastore/datastore_api.c:612
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/datastore/datastore_api.c:631
+#: src/datastore/datastore_api.c:633
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# bytes in der Datenbank"
 
-#: src/datastore/datastore_api.c:772
+#: src/datastore/datastore_api.c:764
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr ""
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:786
+#: src/datastore/datastore_api.c:778
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
+#: src/datastore/datastore_api.c:790 src/datastore/datastore_api.c:796
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/datastore/datastore_api.c:810
+#: src/datastore/datastore_api.c:800
 #, fuzzy
 msgid "# status messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/datastore/datastore_api.c:883
+#: src/datastore/datastore_api.c:869
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:954
+#: src/datastore/datastore_api.c:936
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1019
+#: src/datastore/datastore_api.c:997
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1080
+#: src/datastore/datastore_api.c:1054
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1148
+#: src/datastore/datastore_api.c:1118
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1193
+#: src/datastore/datastore_api.c:1163
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr ""
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1253
+#: src/datastore/datastore_api.c:1221
 #, fuzzy
 msgid "# Results received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/datastore/datastore_api.c:1324
+#: src/datastore/datastore_api.c:1286
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1391
+#: src/datastore/datastore_api.c:1349
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1455
+#: src/datastore/datastore_api.c:1409
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/datastore/gnunet-service-datastore.c:349
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/datastore/gnunet-service-datastore.c:426
+#: src/datastore/gnunet-service-datastore.c:422
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:486
+#: src/datastore/gnunet-service-datastore.c:480
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:640
+#: src/datastore/gnunet-service-datastore.c:511
+msgid "Shutdown in progress, aborting transmission.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:626
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:685
+#: src/datastore/gnunet-service-datastore.c:669
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:696
+#: src/datastore/gnunet-service-datastore.c:680
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:700
+#: src/datastore/gnunet-service-datastore.c:684
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:706
+#: src/datastore/gnunet-service-datastore.c:690
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
-#: src/datastore/gnunet-service-datastore.c:765
-#: src/datastore/gnunet-service-datastore.c:986
-#: src/datastore/gnunet-service-datastore.c:1465
+#: src/datastore/gnunet-service-datastore.c:695
+#: src/datastore/gnunet-service-datastore.c:747
+#: src/datastore/gnunet-service-datastore.c:960
+#: src/datastore/gnunet-service-datastore.c:1417
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:780
+#: src/datastore/gnunet-service-datastore.c:760
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:868
+#: src/datastore/gnunet-service-datastore.c:846
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1034
+#: src/datastore/gnunet-service-datastore.c:1006
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1048
+#: src/datastore/gnunet-service-datastore.c:1018
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1076
+#: src/datastore/gnunet-service-datastore.c:1046
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1110
+#: src/datastore/gnunet-service-datastore.c:1076
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1145
+#: src/datastore/gnunet-service-datastore.c:1109
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1172
+#: src/datastore/gnunet-service-datastore.c:1134
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1182
+#: src/datastore/gnunet-service-datastore.c:1142
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1216
+#: src/datastore/gnunet-service-datastore.c:1174
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1260
+#: src/datastore/gnunet-service-datastore.c:1216
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1323
+#: src/datastore/gnunet-service-datastore.c:1277
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1332
+#: src/datastore/gnunet-service-datastore.c:1286
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1536
+#: src/datastore/gnunet-service-datastore.c:1488
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/datastore/gnunet-service-datastore.c:1547
+#: src/datastore/gnunet-service-datastore.c:1499
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1549
+#: src/datastore/gnunet-service-datastore.c:1501
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1562
+#: src/datastore/gnunet-service-datastore.c:1514
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1580
-#: src/datastore/gnunet-service-datastore.c:1596
+#: src/datastore/gnunet-service-datastore.c:1532
+#: src/datastore/gnunet-service-datastore.c:1548
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/datastore/gnunet-service-datastore.c:1626
+#: src/datastore/gnunet-service-datastore.c:1578
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1655
+#: src/datastore/gnunet-service-datastore.c:1607
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1660
+#: src/datastore/gnunet-service-datastore.c:1612
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1663
+#: src/datastore/gnunet-service-datastore.c:1615
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:529
-#: src/datastore/plugin_datastore_mysql.c:1336
+#: src/datastore/plugin_datastore_mysql.c:780
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/datastore/plugin_datastore_mysql.c:622
-#: src/datastore/plugin_datastore_mysql.c:1346
+#: src/datastore/plugin_datastore_mysql.c:788
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1581
+#: src/datastore/plugin_datastore_mysql.c:1019
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:173
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+#: src/datastore/plugin_datastore_postgres.c:824
+#, fuzzy
+msgid "Failed to drop table from database.\n"
+msgstr ""
+"\n"
+"Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1017
+#: src/datastore/plugin_datastore_postgres.c:860
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/datastore/plugin_datastore_sqlite.c:57
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:239
-#: src/namestore/plugin_namestore_sqlite.c:223
+#: src/datastore/plugin_datastore_sqlite.c:233
+#: src/namestore/plugin_namestore_sqlite.c:204
 #, fuzzy, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:266
-#: src/namestore/plugin_namestore_sqlite.c:248
+#: src/datastore/plugin_datastore_sqlite.c:260
+#: src/namestore/plugin_namestore_sqlite.c:229
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:669
+#: src/datastore/plugin_datastore_sqlite.c:655
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1159
+#: src/datastore/plugin_datastore_sqlite.c:1139
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1178
+#: src/datastore/plugin_datastore_sqlite.c:1158
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1218
-#: src/namestore/plugin_namestore_sqlite.c:779
+#: src/datastore/plugin_datastore_sqlite.c:1198
+#: src/namestore/plugin_namestore_sqlite.c:829
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite Datenspeicher"
@@ -1201,33 +1211,32 @@ msgstr "sqlite Datenspeicher"
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:280
+#: src/dht/dht_api.c:348
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
-#: src/gns/gnunet-gns-lookup.c:179
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:293
+#: src/dht/gnunet-dht-put.c:192
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:182
+#: src/dht/gnunet-dht-get.c:204
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:207 src/gns/gnunet-gns-lookup.c:185
+#: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
-#: src/gns/gnunet-gns-lookup.c:188
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
-#: src/gns/gnunet-gns-lookup.c:191 src/nse/gnunet-nse-profiler.c:908
+#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-put.c:204 src/fs/gnunet-download.c:271
+#: src/fs/gnunet-publish.c:731 src/fs/gnunet-search.c:297
+#: src/fs/gnunet-unindex.c:169 src/nse/gnunet-nse-profiler.c:910
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1235,100 +1244,117 @@ msgstr ""
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:100
+#: src/dht/gnunet-dht-monitor.c:299
+msgid "how long to execute? 0 = forever"
+msgstr ""
+
+#: src/dht/gnunet-dht-monitor.c:321
+msgid "Prints all packets that go through the DHT."
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:108
 #, fuzzy
 msgid "PUT request sent!\n"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/dht/gnunet-dht-put.c:124
+#: src/dht/gnunet-dht-put.c:111
+msgid "Timeout sending PUT request!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:114
+#, fuzzy
+msgid "PUT request not confirmed!\n"
+msgstr "# gap Anfragen insgesamt empfangen"
+
+#: src/dht/gnunet-dht-put.c:144
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:132
+#: src/dht/gnunet-dht-put.c:152
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/dht/gnunet-dht-put.c:137
+#: src/dht/gnunet-dht-put.c:157
 #, fuzzy, c-format
 msgid "Connected to %s service!\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/dht/gnunet-dht-put.c:152
+#: src/dht/gnunet-dht-put.c:172
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:166
+#: src/dht/gnunet-dht-put.c:186
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:169
+#: src/dht/gnunet-dht-put.c:189
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:175
+#: src/dht/gnunet-dht-put.c:195
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:178
+#: src/dht/gnunet-dht-put.c:198
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:203
+#: src/dht/gnunet-dht-put.c:223
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:556
-#: src/testing/testing.c:1979 src/testing/testing.c:2009
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:544
+#: src/testing/testing.c:1968 src/testing/testing.c:1998
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:371
+#: src/dht/gnunet-service-dht_clients.c:407
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_clients.c:462
+#: src/dht/gnunet-service-dht_clients.c:500
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:529
+#: src/dht/gnunet-service-dht_clients.c:584
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:624
+#: src/dht/gnunet-service-dht_clients.c:682
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:854
+#: src/dht/gnunet-service-dht_clients.c:919
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:869
+#: src/dht/gnunet-service-dht_clients.c:932
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:906
+#: src/dht/gnunet-service-dht_clients.c:967
 #, fuzzy, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:928
+#: src/dht/gnunet-service-dht_clients.c:989
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:979
-#: src/dht/gnunet-service-dht_clients.c:1022
+#: src/dht/gnunet-service-dht_clients.c:1038
+#: src/dht/gnunet-service-dht_clients.c:1081
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:989
+#: src/dht/gnunet-service-dht_clients.c:1048
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
@@ -1342,28 +1368,28 @@ msgstr "# Bytes empfangen über TCP"
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:209
+#: src/dht/gnunet-service-dht_datacache.c:207
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:220
+#: src/dht/gnunet-service-dht_datacache.c:218
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:226
+#: src/dht/gnunet-service-dht_datacache.c:224
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:236
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:241
+#: src/dht/gnunet-service-dht_datacache.c:239
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:271
+#: src/dht/gnunet-service-dht_datacache.c:269
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# Client Trace-Anfragen empfangen"
@@ -1377,97 +1403,91 @@ msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:573
+#: src/dht/gnunet-service-dht_neighbours.c:571
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:629
-#: src/dht/gnunet-service-dht_neighbours.c:689
-#, fuzzy
-msgid "# Peers connected"
-msgstr "# verbundener Knoten"
-
-#: src/dht/gnunet-service-dht_neighbours.c:723
+#: src/dht/gnunet-service-dht_neighbours.c:717
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/dht/gnunet-service-dht_neighbours.c:778
+#: src/dht/gnunet-service-dht_neighbours.c:772
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:816
+#: src/dht/gnunet-service-dht_neighbours.c:810
 #, fuzzy
 msgid "# Bytes of bandwdith requested from core"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1040
-#: src/dht/gnunet-service-dht_neighbours.c:1068
+#: src/dht/gnunet-service-dht_neighbours.c:1032
+#: src/dht/gnunet-service-dht_neighbours.c:1060
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1049
-#: src/dht/gnunet-service-dht_neighbours.c:1085
+#: src/dht/gnunet-service-dht_neighbours.c:1041
+#: src/dht/gnunet-service-dht_neighbours.c:1075
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1221
+#: src/dht/gnunet-service-dht_neighbours.c:1207
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1252
+#: src/dht/gnunet-service-dht_neighbours.c:1236
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1333
+#: src/dht/gnunet-service-dht_neighbours.c:1315
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1364
+#: src/dht/gnunet-service-dht_neighbours.c:1342
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1467
+#: src/dht/gnunet-service-dht_neighbours.c:1443
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1555
+#: src/dht/gnunet-service-dht_neighbours.c:1531
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1668
+#: src/dht/gnunet-service-dht_neighbours.c:1647
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1676
+#: src/dht/gnunet-service-dht_neighbours.c:1655
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1767
+#: src/dht/gnunet-service-dht_neighbours.c:1746
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1788
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1825
+#: src/dht/gnunet-service-dht_neighbours.c:1802
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1895
+#: src/dht/gnunet-service-dht_neighbours.c:1876
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Bytes empfangen über TCP"
@@ -1489,29 +1509,28 @@ msgstr ""
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:236
+#: src/dht/gnunet-service-dht_routing.c:238
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:314
-#: src/dht/gnunet-service-dht_routing.c:368
+#: src/dht/gnunet-service-dht_routing.c:311
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
+#: src/dht/gnunet-service-dht_routing.c:352
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:124
+#: src/dht/plugin_block_dht.c:136
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/dht/plugin_block_dht.c:131
+#: src/dht/plugin_block_dht.c:143
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:140
+#: src/dht/plugin_block_dht.c:152
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -1540,68 +1559,69 @@ msgstr ""
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:480
+#: src/dns/gnunet-service-dns.c:485
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/dns/gnunet-service-dns.c:634
+#: src/dns/gnunet-service-dns.c:639
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:818
+#: src/dns/gnunet-service-dns.c:822
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1001
+#: src/dns/gnunet-service-dns.c:1005
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1046
+#: src/dns/gnunet-service-dns.c:1050
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1165
+#: src/dns/gnunet-service-dns.c:1168
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1198
-msgid "Changing DNS reply according to client specifications\n"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1279
+#: src/dns/gnunet-service-dns.c:1281
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1294
+#: src/dns/gnunet-service-dns.c:1297
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1303
+#: src/dns/gnunet-service-dns.c:1306
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1312
+#: src/dns/gnunet-service-dns.c:1315
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1377
+#: src/dns/gnunet-service-dns.c:1380
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dns/gnunet-service-dns.c:1461
+#: src/dns/gnunet-service-dns.c:1465
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1497 src/exit/gnunet-daemon-exit.c:2674
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1567
+#: src/dns/gnunet-service-dns.c:1561 src/exit/gnunet-daemon-exit.c:3032
+#, c-format
+msgid "`%s' must be installed SUID, refusing to run\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:1581
 msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
@@ -1625,15 +1645,15 @@ msgstr ""
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2068
-#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1388
-#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+#: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2069
+#: src/exit/gnunet-daemon-exit.c:2319 src/vpn/gnunet-service-vpn.c:1394
+#: src/vpn/gnunet-service-vpn.c:1795 src/vpn/gnunet-service-vpn.c:1958
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2127
-#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1444
-#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+#: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2128
+#: src/exit/gnunet-daemon-exit.c:2378 src/vpn/gnunet-service-vpn.c:1450
+#: src/vpn/gnunet-service-vpn.c:1854 src/vpn/gnunet-service-vpn.c:1991
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -1682,138 +1702,138 @@ msgstr ""
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1470
+#: src/exit/gnunet-daemon-exit.c:1471
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1570
+#: src/exit/gnunet-daemon-exit.c:1571
 #, fuzzy
 msgid "# TCP service creation requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1573 src/exit/gnunet-daemon-exit.c:1652
-#: src/exit/gnunet-daemon-exit.c:1762 src/exit/gnunet-daemon-exit.c:1992
-#: src/exit/gnunet-daemon-exit.c:2234 src/exit/gnunet-daemon-exit.c:2515
-#: src/exit/gnunet-daemon-exit.c:2615
+#: src/exit/gnunet-daemon-exit.c:1574 src/exit/gnunet-daemon-exit.c:1653
+#: src/exit/gnunet-daemon-exit.c:1763 src/exit/gnunet-daemon-exit.c:1993
+#: src/exit/gnunet-daemon-exit.c:2235 src/exit/gnunet-daemon-exit.c:2516
+#: src/exit/gnunet-daemon-exit.c:2616
 #, fuzzy
 msgid "# Bytes received from MESH"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1606 src/exit/gnunet-daemon-exit.c:2637
+#: src/exit/gnunet-daemon-exit.c:1607 src/exit/gnunet-daemon-exit.c:2638
 #, c-format
 msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1610
+#: src/exit/gnunet-daemon-exit.c:1611
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:1655
+#: src/exit/gnunet-daemon-exit.c:1656
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1766
 #, fuzzy
 msgid "# TCP data requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1779
+#: src/exit/gnunet-daemon-exit.c:1780
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:1829
+#: src/exit/gnunet-daemon-exit.c:1830
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1995
+#: src/exit/gnunet-daemon-exit.c:1996
 #, fuzzy
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2237
+#: src/exit/gnunet-daemon-exit.c:2238
 #, fuzzy
 msgid "# ICMP service requests received via mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1378
-#: src/vpn/gnunet-service-vpn.c:1945
+#: src/exit/gnunet-daemon-exit.c:2304 src/vpn/gnunet-service-vpn.c:1384
+#: src/vpn/gnunet-service-vpn.c:1952
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1414
-#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+#: src/exit/gnunet-daemon-exit.c:2363 src/vpn/gnunet-service-vpn.c:1420
+#: src/vpn/gnunet-service-vpn.c:1432 src/vpn/gnunet-service-vpn.c:1842
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2412
+#: src/exit/gnunet-daemon-exit.c:2413
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2518
+#: src/exit/gnunet-daemon-exit.c:2519
 #, fuzzy
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2618
+#: src/exit/gnunet-daemon-exit.c:2619
 #, fuzzy
 msgid "# UDP service requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2641
+#: src/exit/gnunet-daemon-exit.c:2642
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:2881
+#: src/exit/gnunet-daemon-exit.c:2882
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2895 src/exit/gnunet-daemon-exit.c:2907
+#: src/exit/gnunet-daemon-exit.c:2896 src/exit/gnunet-daemon-exit.c:2908
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2918
+#: src/exit/gnunet-daemon-exit.c:2919
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3047
+#: src/exit/gnunet-daemon-exit.c:3048
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3055
+#: src/exit/gnunet-daemon-exit.c:3056
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3062
+#: src/exit/gnunet-daemon-exit.c:3063
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3068
+#: src/exit/gnunet-daemon-exit.c:3069
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3074 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3075 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3235
+#: src/exit/gnunet-daemon-exit.c:3236
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1821,122 +1841,127 @@ msgstr ""
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:454
+#: src/fragmentation/defragmentation.c:456
 #, fuzzy
 msgid "# fragments received"
 msgstr "# verworfener Nachrichten"
 
-#: src/fragmentation/defragmentation.c:513
+#: src/fragmentation/defragmentation.c:521
 #, fuzzy
 msgid "# duplicate fragments received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fragmentation/defragmentation.c:526
+#: src/fragmentation/defragmentation.c:534
 msgid "# messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/fragmentation/fragmentation.c:188
+#: src/fragmentation/fragmentation.c:203
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/fragmentation/fragmentation.c:191
+#: src/fragmentation/fragmentation.c:206
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/fragmentation/fragmentation.c:255
+#: src/fragmentation/fragmentation.c:232
+#, fuzzy
+msgid "# fragments wrap arounds"
+msgstr "# Selbstbekanntmachungen übertragen"
+
+#: src/fragmentation/fragmentation.c:273
 msgid "# messages fragmented"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/fragmentation/fragmentation.c:258
+#: src/fragmentation/fragmentation.c:276
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:343
+#: src/fragmentation/fragmentation.c:363
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/fragmentation/fragmentation.c:349
+#: src/fragmentation/fragmentation.c:369
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:373
+#: src/fragmentation/fragmentation.c:393
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/fs/fs_api.c:284
+#: src/fs/fs_api.c:339
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:293
+#: src/fs/fs_api.c:348
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:299
+#: src/fs/fs_api.c:354
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:877
+#: src/fs/fs_api.c:938
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1334
+#: src/fs/fs_api.c:1395
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1376
+#: src/fs/fs_api.c:1437
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1392
+#: src/fs/fs_api.c:1453
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2004
+#: src/fs/fs_api.c:2106
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2014
+#: src/fs/fs_api.c:2116
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
+#: src/fs/fs_api.c:2241 src/fs/fs_api.c:2480
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2156
+#: src/fs/fs_api.c:2258
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
+#: src/fs/fs_api.c:2270 src/fs/fs_api.c:2289 src/fs/fs_api.c:2773
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2369
+#: src/fs/fs_api.c:2471
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2615
+#: src/fs/fs_api.c:2717
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2709
+#: src/fs/fs_api.c:2811
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1946,54 +1971,59 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:311
 #, fuzzy
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr "Rekursiver Download des Verzeichnisses `%s' bei %llu von %llu Bytes.\n"
 
-#: src/fs/fs_download.c:330
+#: src/fs/fs_download.c:331
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:488 src/fs/fs_download.c:500
+#: src/fs/fs_download.c:497 src/fs/fs_download.c:509
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:870
+#: src/fs/fs_download.c:878
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/fs/fs_download.c:951
+#: src/fs/fs_download.c:960
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
+"offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:986
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1000
+#: src/fs/fs_download.c:1009
 #, fuzzy, c-format
-msgid "Download failed: could not open file `%s': %s\n"
+msgid "Download failed: could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1010
+#: src/fs/fs_download.c:1019
 #, fuzzy, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1019
-#, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
-msgstr ""
+#: src/fs/fs_download.c:1028
+#, fuzzy, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/fs/fs_download.c:1125
+#, fuzzy
+msgid "internal error decoding tree"
+msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/fs_download.c:1835
+#: src/fs/fs_download.c:1888
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -2079,69 +2109,69 @@ msgstr "Unbekannter Fehler.\n"
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:395
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:397
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:616 src/fs/fs_publish.c:633 src/fs/fs_publish.c:672
-#: src/fs/fs_publish.c:692 src/fs/fs_publish.c:717 src/fs/fs_publish.c:857
+#: src/fs/fs_publish.c:621 src/fs/fs_publish.c:638 src/fs/fs_publish.c:677
+#: src/fs/fs_publish.c:697 src/fs/fs_publish.c:722 src/fs/fs_publish.c:862
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/fs/fs_publish.c:618
+#: src/fs/fs_publish.c:623
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:630
+#: src/fs/fs_publish.c:635
 #, fuzzy
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/fs_publish.c:673
+#: src/fs/fs_publish.c:678
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:693
+#: src/fs/fs_publish.c:698
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:718
+#: src/fs/fs_publish.c:723
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:741
+#: src/fs/fs_publish.c:746
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/fs_publish.c:806
+#: src/fs/fs_publish.c:811
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/fs/fs_publish.c:812
+#: src/fs/fs_publish.c:817
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:858
+#: src/fs/fs_publish.c:863
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/fs/fs_publish.c:1067
+#: src/fs/fs_publish.c:1071
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1138
+#: src/fs/fs_publish.c:1142
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2151,7 +2181,7 @@ msgstr ""
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_search.c:810
+#: src/fs/fs_search.c:829
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2161,44 +2191,64 @@ msgstr ""
 msgid "Failed to start daemon: %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/fs/fs_unindex.c:57
+#: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:62
+#: src/fs/fs_unindex.c:63
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/fs/fs_unindex.c:231
+#: src/fs/fs_unindex.c:233
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:239
+#: src/fs/fs_unindex.c:241
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:247
+#: src/fs/fs_unindex.c:249
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/fs/fs_unindex.c:292
+#: src/fs/fs_unindex.c:293
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:325
+#: src/fs/fs_unindex.c:344
+#, fuzzy
+msgid "Failed to get KSKs from directory scan."
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: src/fs/fs_unindex.c:356
+#, fuzzy, c-format
+msgid "Internal error scanning `%s'.\n"
+msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
+
+#: src/fs/fs_unindex.c:411
+#, fuzzy, c-format
+msgid "Failed to remove KBlock: %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/fs/fs_unindex.c:501
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s' from KBlock!\n"
+msgstr "Datei `%s' hat URI: %s\n"
+
+#: src/fs/fs_unindex.c:553 src/fs/fs_unindex.c:618
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_unindex.c:338
+#: src/fs/fs_unindex.c:631
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:665
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
@@ -2311,92 +2361,92 @@ msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 msgid "Display contents of a GNUnet directory"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/gnunet-download.c:100
+#: src/fs/gnunet-download.c:101
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/gnunet-download.c:109
+#: src/fs/gnunet-download.c:110
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/gnunet-download.c:118
+#: src/fs/gnunet-download.c:119
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:128
+#: src/fs/gnunet-download.c:129
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/fs/gnunet-download.c:136
+#: src/fs/gnunet-download.c:137
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Upload abgewiesen!"
 
-#: src/fs/gnunet-download.c:151 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-download.c:152 src/fs/gnunet-publish.c:190
 #: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:176
+#: src/fs/gnunet-download.c:177
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-download.c:183 src/fs/gnunet-publish.c:624
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/fs/gnunet-download.c:189
+#: src/fs/gnunet-download.c:190
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:196
+#: src/fs/gnunet-download.c:197
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:602
 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-download.c:247 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:248 src/fs/gnunet-search.c:285
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
 
-#: src/fs/gnunet-download.c:250
+#: src/fs/gnunet-download.c:251
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253 src/fs/gnunet-search.c:288
+#: src/fs/gnunet-download.c:254 src/fs/gnunet-search.c:288
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:256
+#: src/fs/gnunet-download.c:257
 msgid "write the file to FILENAME"
 msgstr "Schreibe die Datei in DATEINAME"
 
-#: src/fs/gnunet-download.c:260
+#: src/fs/gnunet-download.c:261
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:264
+#: src/fs/gnunet-download.c:265
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267
+#: src/fs/gnunet-download.c:268
 msgid "download a GNUnet directory recursively"
 msgstr "Das GNUnet Verzeichnis rekursiv herunterladen"
 
-#: src/fs/gnunet-download.c:277
+#: src/fs/gnunet-download.c:278
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2411,35 +2461,30 @@ msgstr ""
 msgid "Special file-sharing operations"
 msgstr "Alle Optionen anzeigen"
 
-#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:167
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/fs/gnunet-pseudonym.c:165
-#, fuzzy, c-format
-msgid "Namespace `%s' unknown.\n"
-msgstr "Namespace `%s' hat das Rating %d.\n"
-
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
+#: src/fs/gnunet-pseudonym.c:250 src/fs/gnunet-pseudonym.c:257
+#: src/fs/gnunet-pseudonym.c:259
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-pseudonym.c:279 src/fs/gnunet-publish.c:678
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
 
-#: src/fs/gnunet-pseudonym.c:272
+#: src/fs/gnunet-pseudonym.c:282
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:275
+#: src/fs/gnunet-pseudonym.c:285
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:278
+#: src/fs/gnunet-pseudonym.c:288
 #, fuzzy
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
@@ -2448,40 +2493,40 @@ msgstr ""
 "Ein zusätzliches Schlüsselwort für alle Dateien und Verzeichnisse hinzufügen "
 "(diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:697
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
 "setzen"
 
-#: src/fs/gnunet-pseudonym.c:285
+#: src/fs/gnunet-pseudonym.c:295
 #, fuzzy
 msgid "print names of local namespaces"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/fs/gnunet-pseudonym.c:288
+#: src/fs/gnunet-pseudonym.c:298
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:291
+#: src/fs/gnunet-pseudonym.c:301
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-pseudonym.c:304 src/fs/gnunet-publish.c:716
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:297
+#: src/fs/gnunet-pseudonym.c:307
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/fs/gnunet-pseudonym.c:300
+#: src/fs/gnunet-pseudonym.c:310
 #, fuzzy
 msgid "change rating of namespace ID by VALUE"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/fs/gnunet-pseudonym.c:308
+#: src/fs/gnunet-pseudonym.c:318
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2510,116 +2555,116 @@ msgstr "Ich bin Peer `%s'.\n"
 msgid "Cleanup after abort complete.\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:305
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:301
+#: src/fs/gnunet-publish.c:307
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/fs/gnunet-publish.c:352
+#: src/fs/gnunet-publish.c:358
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:433
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-publish.c:454
+#: src/fs/gnunet-publish.c:460
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-publish.c:485
+#: src/fs/gnunet-publish.c:491
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/gnunet-publish.c:487
+#: src/fs/gnunet-publish.c:493
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:498
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-publish.c:503
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/fs/gnunet-publish.c:501
+#: src/fs/gnunet-publish.c:507
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:505
+#: src/fs/gnunet-publish.c:511
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:518
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/gnunet-publish.c:546
+#: src/fs/gnunet-publish.c:552
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:559
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:565
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:573 src/vpn/gnunet-vpn.c:214
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
-#: src/transport/gnunet-transport.c:530
+#: src/fs/gnunet-publish.c:583 src/fs/gnunet-publish.c:590
+#: src/transport/gnunet-transport.c:560
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/fs/gnunet-publish.c:606
+#: src/fs/gnunet-publish.c:612
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-publish.c:639
+#: src/fs/gnunet-publish.c:645
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-publish.c:651
+#: src/fs/gnunet-publish.c:657
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:676
+#: src/fs/gnunet-publish.c:682
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:685
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-publish.c:689
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2627,7 +2672,7 @@ msgstr ""
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:687
+#: src/fs/gnunet-publish.c:693
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2635,7 +2680,7 @@ msgstr ""
 "Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der "
 "obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:700
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2643,7 +2688,7 @@ msgstr ""
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/fs/gnunet-publish.c:699
+#: src/fs/gnunet-publish.c:705
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2651,36 +2696,36 @@ msgstr ""
 "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlich "
 "werden soll. (nur für das Einfügen in Namespaces)"
 
-#: src/fs/gnunet-publish.c:703
+#: src/fs/gnunet-publish.c:709
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/fs/gnunet-publish.c:707
+#: src/fs/gnunet-publish.c:713
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "Die Datei unter dem Pseudonym NAME veröffentlichen (platziert die Datei in "
 "einem Namespace)"
 
-#: src/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:719
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:717
+#: src/fs/gnunet-publish.c:723
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in "
 "Namespaces)"
 
-#: src/fs/gnunet-publish.c:721
+#: src/fs/gnunet-publish.c:727
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:736
+#: src/fs/gnunet-publish.c:742
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2730,24 +2775,12 @@ msgid "# Loopback routes suppressed"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
 #: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1290
-#: src/topology/gnunet-daemon-topology.c:1297
+#: src/topology/gnunet-daemon-topology.c:1330
+#: src/topology/gnunet-daemon-topology.c:1337
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
-#: src/topology/gnunet-daemon-topology.c:654
-#: src/topology/gnunet-daemon-topology.c:756
-#: src/transport/gnunet-service-transport_neighbours.c:960
-#: src/transport/gnunet-service-transport_neighbours.c:1289
-#: src/transport/gnunet-service-transport_neighbours.c:1841
-#: src/transport/gnunet-service-transport_neighbours.c:2499
-#: src/transport/gnunet-service-transport_neighbours.c:2566
-#, fuzzy
-msgid "# peers connected"
-msgstr "# verbundener Knoten"
-
 #: src/fs/gnunet-service-fs_cp.c:696
 #, fuzzy
 msgid "# migration stop messages received"
@@ -3101,15 +3134,134 @@ msgstr ""
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gns_api.c:221
+#: src/gns/gnunet-gns.c:191
 #, fuzzy
-msgid "Failed to connect to the GNS service!\n"
+msgid "Failed to connect to GNS\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns-lookup.c:210
-msgid "Issue a request to the GNUnet Naming System, prints results."
+#: src/gns/gnunet-gns.c:232
+msgid "try to shorten a given GNS name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:235
+msgid "Lookup a record using GNS (NOT IMPLEMENTED)"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:238
+msgid "Get the authority of a particular name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:241
+#, fuzzy
+msgid "Specify the type of the record lookup"
+msgstr "Die Priorität des Inhalts angeben"
+
+#: src/gns/gnunet-gns.c:244
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:255
+msgid "GNUnet GNS access tool"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:280
+#, fuzzy, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:333
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:377
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:439
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:498
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:514
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:725 src/gns/gnunet-gns-fcfsd.c:737
+#, fuzzy, c-format
+msgid "Option `%s' not specified in configuration section `%s'\n"
+msgstr ""
+"Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
+"gesetzt, sie wird auf %dm gesetzt.\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:747 src/namestore/gnunet-namestore.c:299
+#, fuzzy
+msgid "Failed to read or create private zone key\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:757 src/namestore/gnunet-namestore.c:310
+#, fuzzy
+msgid "Failed to connect to namestore\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+
+#: src/gns/gnunet-gns-fcfsd.c:773 src/gns/gnunet-gns-proxy.c:525
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:804
+msgid "GNUnet GNS first come first serve registration service"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:800
+msgid "listen on specified port"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:811
+msgid "GNUnet GNS proxy"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:122
+msgid "Call with name of HELLO file to modify.\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:128
+#, fuzzy, c-format
+msgid "Error accessing file `%s': %s\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/hello/gnunet-hello.c:136
+#, c-format
+msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
+#: src/hello/gnunet-hello.c:143
+#, c-format
+msgid "File `%s' is too small to be a HELLO\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:153 src/hello/gnunet-hello.c:181
+#, fuzzy, c-format
+msgid "Error opening file `%s': %s\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/hello/gnunet-hello.c:169
+#, fuzzy, c-format
+msgid "Did not find well-formed HELLO in file `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/hello/gnunet-hello.c:193
+#, fuzzy, c-format
+msgid "Error writing HELLO to file `%s': %s\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
 #: src/hostlist/gnunet-daemon-hostlist.c:264
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
@@ -3138,195 +3290,197 @@ msgstr ""
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:286
+#: src/hostlist/hostlist-client.c:289
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:340
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#: src/hostlist/hostlist-client.c:313 src/hostlist/hostlist-client.c:343
 #, 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/hostlist-client.c:330
+#: src/hostlist/hostlist-client.c:331
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
+#: src/hostlist/hostlist-client.c:375 src/hostlist/hostlist-client.c:396
 #, c-format
 msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
-#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
-#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
-#: src/transport/plugin_transport_http_client.c:108
-#: src/transport/plugin_transport_http_client.c:123
+#: src/hostlist/hostlist-client.c:473 src/hostlist/hostlist-client.c:683
+#: src/hostlist/hostlist-client.c:689 src/hostlist/hostlist-client.c:741
+#: src/hostlist/hostlist-client.c:750 src/hostlist/hostlist-client.c:871
+#: src/hostlist/hostlist-client.c:961 src/hostlist/hostlist-client.c:966
+#: src/transport/plugin_transport_http_client.c:110
+#: src/transport/plugin_transport_http_client.c:125
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
+#: src/hostlist/hostlist-client.c:593 src/hostlist/hostlist-client.c:1331
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/hostlist/hostlist-client.c:623
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:663
+#: src/hostlist/hostlist-client.c:664
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:805
+#: src/hostlist/hostlist-client.c:802
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:822
+#: src/hostlist/hostlist-client.c:816
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/hostlist-client.c:836
 #, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+msgid "Download of hostlist from `%s' failed: `%s'\n"
+msgstr ""
+"Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
+"beträgt %8.3f KB/s.\n"
 
-#: src/hostlist/hostlist-client.c:848
+#: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
 "beträgt %8.3f KB/s.\n"
 
-#: src/hostlist/hostlist-client.c:856
+#: src/hostlist/hostlist-client.c:850
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:909
+#: src/hostlist/hostlist-client.c:903
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
+#: src/hostlist/hostlist-client.c:911
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1505
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1054
+#: src/hostlist/hostlist-client.c:1046
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
+#: src/hostlist/hostlist-client.c:1084
 msgid "Scheduled saving of hostlists\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1096
+#: src/hostlist/hostlist-client.c:1088
 #, c-format
 msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
+#: src/hostlist/hostlist-client.c:1111 src/hostlist/hostlist-client.c:1127
 #, fuzzy
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/hostlist-client.c:1253
+#: src/hostlist/hostlist-client.c:1242
 #, c-format
 msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1284
+#: src/hostlist/hostlist-client.c:1273
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/hostlist/hostlist-client.c:1279
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1283
 #, c-format
 msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1305
+#: src/hostlist/hostlist-client.c:1294
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-client.c:1338
+#: src/hostlist/hostlist-client.c:1327
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1340
+#: src/hostlist/hostlist-client.c:1329
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1362
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1387
+#: src/hostlist/hostlist-client.c:1376
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-client.c:1392
+#: src/hostlist/hostlist-client.c:1381
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1428
+#: src/hostlist/hostlist-client.c:1417
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1480
+#: src/hostlist/hostlist-client.c:1470
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/hostlist-client.c:1473
 #, c-format
 msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1482
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1504
+#: src/hostlist/hostlist-client.c:1494
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1508
+#: src/hostlist/hostlist-client.c:1498
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
@@ -3340,8 +3494,10 @@ msgstr "# bytes in der Datenbank"
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:184
-#: src/topology/gnunet-daemon-topology.c:875
+#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:425
+#: src/peerinfo-tool/gnunet-peerinfo.c:403
+#: src/peerinfo-tool/gnunet-peerinfo.c:519
+#: src/topology/gnunet-daemon-topology.c:927
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -3350,188 +3506,405 @@ msgstr "Informationen über andere GNUnet Knoten ausgeben."
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:221
+#: src/hostlist/hostlist-server.c:219
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:269
+#: src/hostlist/hostlist-server.c:263
 #, 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/hostlist-server.c:272
+#: src/hostlist/hostlist-server.c:266
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:280
+#: src/hostlist/hostlist-server.c:273
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:287
+#: src/hostlist/hostlist-server.c:279
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:291
+#: src/hostlist/hostlist-server.c:283
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/hostlist-server.c:291
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:294
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:306
+#: src/hostlist/hostlist-server.c:298
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:307
+#: src/hostlist/hostlist-server.c:299
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:350
+#: src/hostlist/hostlist-server.c:341
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/hostlist/hostlist-server.c:397
+#: src/hostlist/hostlist-server.c:388
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:565
+#: src/hostlist/hostlist-server.c:561
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/hostlist/hostlist-server.c:574
+#: src/hostlist/hostlist-server.c:570
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:588
+#: src/hostlist/hostlist-server.c:584
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-server.c:626
+#: src/hostlist/hostlist-server.c:624
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgstr "`%s' ist nicht verfügbar."
+
+#: src/hostlist/hostlist-server.c:666
 #, 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"
 
-#: src/mesh/gnunet-service-mesh.c:4595
+#: src/integration-tests/connection_watchdog.c:997
+#, fuzzy, c-format
+msgid "Transport plugin: `%s' port %llu\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#: src/integration-tests/connection_watchdog.c:1030
+#, fuzzy, c-format
+msgid "Found %u transport plugins: `%s'\n"
+msgstr "Teste Transport(e) %s\n"
+
+#: src/integration-tests/connection_watchdog.c:1089
+msgid "Send ping messages to test connectivity (default == NO)"
+msgstr ""
+
+#: src/integration-tests/connection_watchdog.c:1095
+#: src/template/gnunet-template.c:68
+#, fuzzy
+msgid "help text"
+msgstr "Hilfetext für -t"
+
+#: src/mesh/gnunet-service-mesh.c:4590
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4789
+#: src/mesh/gnunet-service-mesh.c:4784
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:4798
+#: src/mesh/gnunet-service-mesh.c:4793
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/namestore/namestore_api.c:272 src/namestore/namestore_api.c:313
+#: src/mysql/mysql.c:174
+#, c-format
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
+
+#: src/mysql/mysql.c:181
+#, fuzzy, c-format
+msgid "Could not access file `%s': %s\n"
+msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
+
+#: src/namestore/gnunet-namestore.c:157
+#, fuzzy, c-format
+msgid "Adding record failed: %s\n"
+msgstr ""
+"\n"
+"Fehler beim Uploaden der Datei: %s\n"
+
+#: src/namestore/gnunet-namestore.c:183
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr ""
+"\n"
+"Fehler beim Uploaden der Datei: %s\n"
+
+#: src/namestore/gnunet-namestore.c:239
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:276
+#, c-format
+msgid "Option `%s' not given, but I need a zone key file!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:281
+#, fuzzy, c-format
+msgid "Using default zone file `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/namestore/gnunet-namestore.c:291
+#, c-format
+msgid "No options given\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:321
+#, fuzzy, c-format
+msgid "Unsupported type `%s'\n"
+msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
+
+#: src/namestore/gnunet-namestore.c:328 src/namestore/gnunet-namestore.c:350
+#: src/namestore/gnunet-namestore.c:374 src/namestore/gnunet-namestore.c:384
+#: src/namestore/gnunet-namestore.c:409
+#, fuzzy, c-format
+msgid "Missing option `%s' for operation `%s'\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#: src/namestore/gnunet-namestore.c:329 src/namestore/gnunet-namestore.c:351
+msgid "add/del"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:341
+#, 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:366
+#, fuzzy, c-format
+msgid "Invalid time format `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/namestore/gnunet-namestore.c:375 src/namestore/gnunet-namestore.c:385
+msgid "add"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:410
+msgid "del"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:462
+msgid "add record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:465
+msgid "delete record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:468
+msgid "display records"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:471
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:474
+msgid "name of the record to add/delete/display"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:477
+msgid "type of the record to add/delete/display"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:480
+msgid "value of the record to add/delete"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:483
+msgid "create or list public record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:486
+msgid "create or list non-authority record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:489
+msgid "filename with the zone key"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:500
+#, fuzzy
+msgid "GNUnet zone manipulation tool"
+msgstr "GNUnet Konfiguration"
+
+#: src/namestore/gnunet-service-namestore.c:143
+#, c-format
+msgid "File zone `%s' but corrupt content already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:154
+#, c-format
+msgid "File zone `%s' containing this key already exists\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:160
+#, c-format
+msgid ""
+"File zone `%s' but different zone key already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:198
+#, fuzzy, c-format
+msgid "Stored zonekey for zone `%s' in file `%s'\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/namestore/gnunet-service-namestore.c:1909
+#, fuzzy
+msgid "No directory to load zonefiles specified in configuration\n"
+msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+
+#: src/namestore/gnunet-service-namestore.c:1918
+#, c-format
+msgid "Creating directory `%s' for zone files failed!\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:315 src/namestore/namestore_api.c:353
 msgid "Namestore added record successfully"
 msgstr ""
 
-#: src/namestore/namestore_api.c:281 src/namestore/namestore_api.c:322
+#: src/namestore/namestore_api.c:323
 msgid "Namestore failed to add record"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:289
+#: src/namestore/namestore_api.c:361
+msgid "Namestore record already existed"
+msgstr ""
+
+#: src/namestore/namestore_api.c:368
+msgid "Namestore failed to add record\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:401
+#, fuzzy
+msgid "Namestore removed record successfully"
+msgstr "Der GNUnet Dienst wurde erfolgreich installiert.\n"
+
+#: src/namestore/namestore_api.c:408
+msgid "No records for entry"
+msgstr ""
+
+#: src/namestore/namestore_api.c:415
+#, fuzzy
+msgid "Could not find record to remove"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#: src/namestore/namestore_api.c:422
+#, fuzzy
+msgid "Failed to create new signature"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#: src/namestore/namestore_api.c:429
+#, fuzzy
+msgid "Failed to put new set of records in database"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:328
+#: src/nat/gnunet-nat-server.c:318
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat.c:803
+#: src/nat/nat.c:799
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:852
+#: src/nat/nat.c:844
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/nat/nat.c:1121
+#: src/nat/nat.c:1111
 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/nat/nat.c:1187 src/nat/nat.c:1197
+#: src/nat/nat.c:1177 src/nat/nat.c:1187
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1329
+#: src/nat/nat.c:1321
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1341
+#: src/nat/nat.c:1332
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat_test.c:348
+#: src/nat/nat_test.c:341
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nat/nat_test.c:418
+#: src/nat/nat_test.c:411
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:926
+#: src/nse/gnunet-nse-profiler.c:928
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/nse/gnunet-service-nse.c:936
+#: src/nse/gnunet-service-nse.c:925
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
-#: src/nse/gnunet-service-nse.c:1431
+#: src/nse/gnunet-service-nse.c:1381 src/nse/gnunet-service-nse.c:1400
+#: src/nse/gnunet-service-nse.c:1421
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1398
+#: src/nse/gnunet-service-nse.c:1388
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/nse/gnunet-service-nse.c:1419
+#: src/nse/gnunet-service-nse.c:1409
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:133
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:195
+#: src/peerinfo/gnunet-service-peerinfo.c:203
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:229
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
+#: src/peerinfo/gnunet-service-peerinfo.c:254
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -3539,68 +3912,164 @@ msgstr ""
 "Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
 "Datei wurde entfernt.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:305
+#: src/peerinfo/gnunet-service-peerinfo.c:353
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/peerinfo/peerinfo_api.c:279
-#, fuzzy, c-format
-msgid "Failed to transmit message to `%s' service.\n"
-msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:710
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:238
+msgid "aborted due to explicit disconnect request"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:358
+#, fuzzy
+msgid "failed to transmit request (service down?)"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/peerinfo/peerinfo_api.c:435
+#: src/peerinfo/peerinfo_api.c:505
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
+#: src/peerinfo/peerinfo_api.c:531 src/peerinfo/peerinfo_api.c:550
+#: src/peerinfo/peerinfo_api.c:565 src/peerinfo/peerinfo_api.c:576
+#: src/peerinfo/peerinfo_api.c:587
 #, fuzzy
-msgid "Received invalid message from `PEERINFO' service.\n"
+msgid "Received invalid message from `PEERINFO' service."
 msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
 
-#: src/peerinfo/peerinfo_api.c:523
+#: src/peerinfo/peerinfo_api.c:663
 #, fuzzy
-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
+msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/peerinfo/peerinfo_api.c:557
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api_notify.c:258
+#: src/peerinfo/peerinfo_api_notify.c:256
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/peerinfo-tool/gnunet-peerinfo.c:581
+#, fuzzy
+msgid "Failed to parse HELLO message: missing expiration time\n"
+msgstr "Fehler beim Speichern der Konfiguration!"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:589
+#, fuzzy
+msgid "Failed to parse HELLO message: invalid expiration time\n"
+msgstr "Fehler beim Speichern der Konfiguration!"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:598
+#, fuzzy
+msgid "Failed to parse HELLO message: malformed\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:608
+#, fuzzy
+msgid "Failed to parse HELLO message: missing transport plugin\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:625
+#, c-format
+msgid "Plugin `%s' not found\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:634
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:653
+#, fuzzy, c-format
+msgid "Failed to parse `%s' as an address for plugin `%s'\n"
+msgstr "Fehler beim Binden an UDP Port %d.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:685
+#, fuzzy, c-format
+msgid "Failure adding HELLO: %s\n"
+msgstr "Fehler bei %s:%d.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:833
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#: src/peerinfo-tool/gnunet-peerinfo.c:840
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
+#: src/peerinfo-tool/gnunet-peerinfo.c:875
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:899
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
+#: src/peerinfo-tool/gnunet-peerinfo.c:936
+msgid "don't resolve host names"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:939
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:942
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:945
+msgid "list all known peers"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:948
+msgid "also output HELLO uri(s)"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:951
+msgid "add given HELLO uri to the database"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:957
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
+#: src/transport/gnunet-service-transport_plugins.c:118
+#, fuzzy, c-format
+msgid "Starting transport plugins `%s'\n"
+msgstr "Teste Transport(e) %s\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
+#: src/transport/gnunet-service-transport_plugins.c:122
+#, fuzzy, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr "Teste Transport(e) %s\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
+#: src/transport/gnunet-service-transport_plugins.c:150
+#, fuzzy, c-format
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+
+#: src/postgres/postgres.c:59
+#, fuzzy, c-format
+msgid "`%s:%s' failed at %s:%d with error: %s"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#: src/postgres/postgres.c:148
+#, fuzzy, c-format
+msgid "Unable to initialize Postgres: %s"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
+
 #: src/pt/gnunet-daemon-pt.c:264
 #, fuzzy
 msgid "Failed to pack DNS request.  Dropping.\n"
@@ -3668,50 +4137,67 @@ msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:209
+#: src/statistics/gnunet-service-statistics.c:271
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-service-statistics.c:267
+#: src/statistics/gnunet-service-statistics.c:330
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-statistics.c:98
+#: src/statistics/gnunet-statistics.c:122
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:164
+#: src/statistics/gnunet-statistics.c:199
+#, c-format
+msgid "No subsystem or name given\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:207
+#, fuzzy, c-format
+msgid "Failed to initialize watch routine\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
+#: src/statistics/gnunet-statistics.c:227
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:167
+#: src/statistics/gnunet-statistics.c:230
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:170
+#: src/statistics/gnunet-statistics.c:233
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:173
+#: src/statistics/gnunet-statistics.c:236
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:180
+#: src/statistics/gnunet-statistics.c:239
+msgid "watch value continously"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:246
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
 
-#: src/statistics/statistics_api.c:390
+#: src/statistics/statistics_api.c:456
 #, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+msgid "Could not save some persistent statistics\n"
+msgstr ""
+"IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
+"der Konfigurationsdatei an.\n"
 
-#: src/template/gnunet-template.c:68
-#, fuzzy
-msgid "help text"
-msgstr "Hilfetext für -t"
+#: src/statistics/statistics_api.c:999
+msgid ""
+"Failed to receive acknowledgement from statistics service, some statistics "
+"might have been lost!\n"
+msgstr ""
 
 #: src/testing/gnunet-testing.c:157
 #, fuzzy
@@ -3762,208 +4248,178 @@ msgstr "GNUnet Konfiguration"
 msgid "Could not access hostkey.\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/testing/testing.c:204
+#: src/testing/testing.c:200
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:218 src/testing/testing.c:808
+#: src/testing/testing.c:214 src/testing/testing.c:798
 #, fuzzy
 msgid "`scp' did not complete cleanly.\n"
 msgstr "`%s' ist zu keinem Knoten verbunden.\n"
 
-#: src/testing/testing.c:239
+#: src/testing/testing.c:237
 #, fuzzy
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/testing/testing.c:240
+#: src/testing/testing.c:238
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/testing/testing.c:292
+#: src/testing/testing.c:286
 #, fuzzy, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr ""
 "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
 "der Konfigurationsdatei an.\n"
 
-#: src/testing/testing.c:299
+#: src/testing/testing.c:293
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/testing/testing.c:300 src/testing/testing.c:488
+#: src/testing/testing.c:294 src/testing/testing.c:471
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/testing/testing.c:360
+#: src/testing/testing.c:354
 #, fuzzy, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
 
-#: src/testing/testing.c:364
+#: src/testing/testing.c:358
 #, fuzzy
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
 
-#: src/testing/testing.c:374
+#: src/testing/testing.c:368
 #, fuzzy
 msgid "Failed to get hostkey!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/testing/testing.c:406
+#: src/testing/testing.c:400
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:480
+#: src/testing/testing.c:463
 #, fuzzy, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr ""
 "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
 "der Konfigurationsdatei an.\n"
 
-#: src/testing/testing.c:487
+#: src/testing/testing.c:470
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/testing/testing.c:509 src/testing/testing.c:612
+#: src/testing/testing.c:493 src/testing/testing.c:600
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:510 src/testing/testing.c:613
-#: src/testing/testing.c:633
+#: src/testing/testing.c:494 src/testing/testing.c:601
+#: src/testing/testing.c:621
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:582
+#: src/testing/testing.c:570
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:632
+#: src/testing/testing.c:620
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/testing/testing.c:653 src/testing/testing.c:685
+#: src/testing/testing.c:643 src/testing/testing.c:675
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:668 src/testing/testing.c:723
+#: src/testing/testing.c:658 src/testing/testing.c:713
 #, fuzzy
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr "`%s' ist zu keinem Knoten verbunden.\n"
 
-#: src/testing/testing.c:796
+#: src/testing/testing.c:786
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:966
+#: src/testing/testing.c:948
 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/testing/testing.c:1237 src/testing/testing_group.c:6278
+#: src/testing/testing.c:1207 src/testing/testing_group.c:6154
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr ""
 "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
 "der Konfigurationsdatei an.\n"
 
-#: src/testing/testing.c:1322 src/testing/testing.c:1397
+#: src/testing/testing.c:1292 src/testing/testing.c:1359
 #, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/testing/testing.c:1480
+#: src/testing/testing.c:1448
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/testing/testing.c:1610
+#: src/testing/testing.c:1601
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1618
+#: src/testing/testing.c:1609
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1636
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr ""
 "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
 "der Konfigurationsdatei an.\n"
 
-#: src/testing/testing.c:1650
+#: src/testing/testing.c:1639
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/testing/testing.c:1805
+#: src/testing/testing.c:1794
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/testing/testing.c:1933
+#: src/testing/testing.c:1922
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/testing/testing.c:2156
+#: src/testing/testing.c:2145
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1910 src/testing/testing_group.c:1922
-#: src/testing/testing_group.c:2023 src/testing/testing_group.c:2082
-#: src/testing/testing_group.c:2171 src/testing/testing_group.c:2191
-#: src/testing/testing_group.c:2328 src/testing/testing_peergroup.c:940
+#: src/testing/testing_group.c:1895 src/testing/testing_group.c:1907
+#: src/testing/testing_group.c:2008 src/testing/testing_group.c:2065
+#: src/testing/testing_group.c:2152 src/testing/testing_group.c:2172
+#: src/testing/testing_group.c:2302 src/testing/testing_peergroup.c:950
 #, fuzzy, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/testing/testing_group.c:1932
-#, fuzzy, c-format
-msgid "Target is %d connections per peer."
-msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
-
-#: src/testing/testing_group.c:2179
+#: src/testing/testing_group.c:2160
 #, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2209 src/testing/testing_group.c:2402
-#, c-format
-msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2246
-#, c-format
-msgid "natural log of %d is %d, will run %d iterations\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2249
-#, c-format
-msgid "Total connections added thus far: %u!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2290
-#, c-format
-msgid "Total connections added for small world: %d!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2342
-#, c-format
-msgid "rand is %f probability is %f\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
+#: src/testing/testing_group.c:2877 src/testing/testing_group.c:3063
 #, fuzzy, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
@@ -3972,404 +4428,272 @@ msgstr ""
 "Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
 "gesetzt, sie wird auf %dm gesetzt.\n"
 
-#: src/testing/testing_group.c:3020
-msgid "Finished copying all friend files!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3133
-#, fuzzy, c-format
-msgid "Copying file with command cp %s %s\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
-
-#: src/testing/testing_group.c:3156
-#, fuzzy, c-format
-msgid "Copying file with command scp %s %s\n"
-msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
-
-#: src/testing/testing_group.c:3173
-#, c-format
-msgid "Checking copy status of file %d\n"
+#: src/testing/testing_group.c:3957
+msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3191
-#, c-format
-msgid "File %d copied\n"
-msgstr ""
+#: src/testing/testing_group.c:5226
+#, fuzzy
+msgid "Unknown topology specification, can't connect peers!\n"
+msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/testing/testing_group.c:3206
+#: src/testing/testing_group.c:5944 src/transport/transport-testing.c:636
 #, fuzzy
-msgid "Finished copying all blacklist files!\n"
+msgid "Could not read hostkeys file!\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
-#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
-msgid "Delaying connect, we have too many outstanding connections!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
-#: src/testing/testing_group.c:5035
-#, c-format
-msgid "Creating connection, outstanding_connections is %d\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3608
+#: src/testing/testing_group.c:6011
 #, fuzzy, c-format
-msgid "Offering HELLO of peer %s to peer %s\n"
-msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
-
-#: src/testing/testing_group.c:3734
-#, c-format
-msgid "Creating connection, outstanding_connections is %d (max %d)\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3988
-msgid "Creating clique topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3993
-msgid "Creating small world (ring) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3998
-msgid "Creating small world (2d-torus) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4002
-msgid "Creating ring topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4006
-msgid "Creating 2d torus topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4010
-msgid "Creating Erdos-Renyi topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4014
-msgid "Creating InterNAT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4018
-msgid "Creating Scale Free topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4023
-msgid "Creating straight line topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4027
-msgid "Creating topology from file!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4043
-msgid "Creating no allowed topology (all peers can connect at core level)\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4058
-msgid "Failed during friend file copying!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4064
-msgid "Friend files created/copied successfully!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4081
-msgid "Blacklisting all but clique topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4087
-msgid "Blacklisting all but small world (ring) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4093
-msgid "Blacklisting all but small world (2d-torus) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4099
-msgid "Blacklisting all but ring topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4105
-msgid "Blacklisting all but 2d torus topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4111
-msgid "Blacklisting all but Erdos-Renyi topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4117
-msgid "Blacklisting all but InterNAT topology\n"
-msgstr ""
+msgid "Could not create configuration for peer number %u on `%s'!\n"
+msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/testing/testing_group.c:4152
-msgid "Blacklisting all but Scale Free topology\n"
+#: src/testing/testing_new.c:169
+msgid "tmppath cannot be NULL\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4158
-msgid "Blacklisting all but straight line topology\n"
+#: src/testing/testing_new.c:356
+#, c-format
+msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4173
-#, fuzzy
-msgid "Failed during blacklist file copying!\n"
+#: src/testing/testing_new.c:365
+#, fuzzy, c-format
+msgid "Could not open hostkeys file: %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testing/testing_group.c:4179
-msgid "Blacklist files created/copied successfully!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5263
-msgid "Creating clique CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5270
-msgid "Creating small world (ring) CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5277
-msgid "Creating small world (2d-torus) CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5283
-msgid "Creating ring CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5290
-msgid "Creating 2d torus CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5297
-msgid "Creating Erdos-Renyi CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5304
-msgid "Creating InterNAT CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5311
-msgid "Creating Scale Free CONNECT topology\n"
+#: src/testing/testing_new.c:380
+#, c-format
+msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5318
-msgid "Creating straight line CONNECT topology\n"
-msgstr ""
+#: src/testing/testing_new.c:437
+#, fuzzy, c-format
+msgid "Key number %u does not exist\n"
+msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
 
-#: src/testing/testing_group.c:5324
-msgid "Creating no CONNECT topology\n"
-msgstr ""
+#: src/testing/testing_new.c:446
+#, fuzzy, c-format
+msgid "Error while decoding key %u\n"
+msgstr "Fehler beim Download: %s\n"
 
-#: src/testing/testing_group.c:5330
+#: src/testing/testing_new.c:680
 #, fuzzy
-msgid "Unknown topology specification, can't connect peers!\n"
-msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
+msgid "Failed to create configuration for peer (not enough free ports?)\n"
+msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/testing/testing_group.c:5340
+#: src/testing/testing_new.c:691
 #, c-format
-msgid "Connecting random subset (%'.2f percent) of possible peers\n"
+msgid ""
+"You attempted to create a testbed with more than %u hosts.  Please "
+"precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5348
-#, c-format
-msgid "Connecting a minimum of %u peers each (if possible)\n"
-msgstr ""
+#: src/testing/testing_new.c:704
+#, fuzzy, c-format
+msgid "Failed to initialize hostkey for peer %u\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/testing/testing_group.c:5357
-#, c-format
-msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
-msgstr ""
+#: src/testing/testing_new.c:734
+#, fuzzy, c-format
+msgid "Failed to write hostkey file for peer %u: %s\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/testing/testing_group.c:5367
-#, c-format
-msgid "Finding additional %u closest peers each (if possible)\n"
-msgstr ""
+#: src/testing/testing_new.c:751
+#, fuzzy, c-format
+msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:650
-#, fuzzy
-msgid "Could not read hostkeys file!\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+#: src/testing/testing_new.c:791
+#, fuzzy, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/testing/testing_group.c:6131
+#: src/testing/testing_new.c:959
 #, fuzzy, c-format
-msgid "Could not create configuration for peer number %u on `%s'!\n"
-msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+msgid "Failed to load configuration from %s\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/topology/gnunet-daemon-topology.c:244
+#: src/topology/gnunet-daemon-topology.c:259
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:380
+#: src/topology/gnunet-daemon-topology.c:392
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:675
-#: src/topology/gnunet-daemon-topology.c:761
+#: src/topology/gnunet-daemon-topology.c:730
+#: src/topology/gnunet-daemon-topology.c:815
 #, fuzzy
 msgid "# friends connected"
 msgstr "# verbundener Knoten"
 
-#: src/topology/gnunet-daemon-topology.c:950
+#: src/topology/gnunet-daemon-topology.c:996
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:982
+#: src/topology/gnunet-daemon-topology.c:1026
 #, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:994
+#: src/topology/gnunet-daemon-topology.c:1039
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1000
+#: src/topology/gnunet-daemon-topology.c:1045
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/topology/gnunet-daemon-topology.c:1054
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1017
+#: src/topology/gnunet-daemon-topology.c:1062
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1037
+#: src/topology/gnunet-daemon-topology.c:1082
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1050
+#: src/topology/gnunet-daemon-topology.c:1095
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1060
+#: src/topology/gnunet-daemon-topology.c:1105
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1066
+#: src/topology/gnunet-daemon-topology.c:1111
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1076
+#: src/topology/gnunet-daemon-topology.c:1121
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1082
+#: src/topology/gnunet-daemon-topology.c:1127
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1089
+#: src/topology/gnunet-daemon-topology.c:1134
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1169
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1183
+#: src/topology/gnunet-daemon-topology.c:1224
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/topology/gnunet-daemon-topology.c:1323
+#: src/topology/gnunet-daemon-topology.c:1363
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:247
+#: src/transport/gnunet-service-transport_blacklist.c:246
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:254
+#: src/transport/gnunet-service-transport_blacklist.c:252
 #, c-format
 msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
+#: src/transport/gnunet-service-transport_blacklist.c:263
 #, fuzzy, c-format
 msgid "Failed to read blacklist from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
+#: src/transport/gnunet-service-transport_blacklist.c:284
+#: src/transport/gnunet-service-transport_blacklist.c:308
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
+#: src/transport/gnunet-service-transport_blacklist.c:295
+#: src/transport/gnunet-service-transport_blacklist.c:331
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:350
+#: src/transport/gnunet-service-transport_blacklist.c:345
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:364
+#: src/transport/gnunet-service-transport_blacklist.c:359
 #, c-format
 msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:523
-#: src/transport/gnunet-service-transport_blacklist.c:764
+#: src/transport/gnunet-service-transport_blacklist.c:514
+#: src/transport/gnunet-service-transport_blacklist.c:747
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:158
+#: src/transport/gnunet-service-transport.c:163
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport.c:572
+#: src/transport/gnunet-service-transport.c:237
+#, fuzzy
+msgid "# bytes total received"
+msgstr "# gap Anfragen insgesamt empfangen"
+
+#: src/transport/gnunet-service-transport.c:284
+#, fuzzy
+msgid "# bytes payload received"
+msgstr "# Bytes entschlüsselt"
+
+#: src/transport/gnunet-service-transport.c:582
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:581
+#: src/transport/gnunet-service-transport.c:591
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:353
+#: src/transport/gnunet-service-transport_clients.c:352
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:358
+#: src/transport/gnunet-service-transport_clients.c:357
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_clients.c:510
+#: src/transport/gnunet-service-transport_clients.c:503
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:628
-#, fuzzy
-msgid "# bytes payload received for other peers"
-msgstr "# Bytes des Typs %d empfangen"
-
-#: src/transport/gnunet-service-transport_clients.c:645
+#: src/transport/gnunet-service-transport_clients.c:631
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:696
+#: src/transport/gnunet-service-transport_clients.c:682
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -4378,623 +4702,564 @@ msgstr "# verschlüsselter PONG Nachrichten empfangen"
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:482
-msgid "# failed connection attempts due to timeout"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:1032
+#, fuzzy
+msgid "# DISCONNECT messages sent"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:883
+#: src/transport/gnunet-service-transport_neighbours.c:1148
+#: src/transport/gnunet-service-transport_neighbours.c:1482
 #, fuzzy
-msgid "# peers disconnected due to external request"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
+msgid "# bytes in message queue for other peers"
+msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:966
+#: src/transport/gnunet-service-transport_neighbours.c:1153
 #, fuzzy
-msgid "# fast reconnects failed"
-msgstr "# verbundener Knoten"
+msgid "# messages transmitted to other peers"
+msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1022
+#: src/transport/gnunet-service-transport_neighbours.c:1158
 #, fuzzy
-msgid "# peers disconnected due to timeout"
-msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
+msgid "# transmission failures for messages to other peers"
+msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1215
+msgid "# messages timed out while in transport queue"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1254
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1088
+#: src/transport/gnunet-service-transport_neighbours.c:1278
 #, fuzzy
-msgid "# peers disconnected due to global disconnect"
-msgstr "# Knotenankündigungen empfangen"
+msgid "# KEEPALIVE messages discarded (peer unknown)"
+msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1888
-#: src/transport/gnunet-service-transport_neighbours.c:1909
+#: src/transport/gnunet-service-transport_neighbours.c:1286
 #, fuzzy
-msgid "# messages not sent (no such peer or not connected)"
+msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1925
+#: src/transport/gnunet-service-transport_neighbours.c:1323
 #, fuzzy
-msgid "# bytes in message queue for other peers"
-msgstr "# Bytes ausgehender Nachrichten verworfen"
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1977
+#: src/transport/gnunet-service-transport_neighbours.c:1332
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgstr "# defragmentierter Nachrichten"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1388
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2013
+#: src/transport/gnunet-service-transport_neighbours.c:1422
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2031
+#: src/transport/gnunet-service-transport_neighbours.c:1438
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2060
+#: src/transport/gnunet-service-transport_neighbours.c:2544
 #, fuzzy
-msgid "# KEEPALIVE messages discarded (not connected)"
-msgstr "# defragmentierter Nachrichten"
+msgid "# unexpected CONNECT_ACK messages (no peer)"
+msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2113
+#: src/transport/gnunet-service-transport_neighbours.c:2559
+#: src/transport/gnunet-service-transport_neighbours.c:2585
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
-msgstr "# defragmentierter Nachrichten"
+msgid "# unexpected CONNECT_ACK messages (not ready)"
+msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2121
+#: src/transport/gnunet-service-transport_neighbours.c:2598
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
-msgstr "# defragmentierter Nachrichten"
+msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
+msgstr "COUNT Nachrichten versenden"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2627
+#, fuzzy
+msgid "# unexpected CONNECT_ACK messages (disconnecting)"
+msgstr "COUNT Nachrichten versenden"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2807
+#, fuzzy
+msgid "# unexpected SESSION ACK messages"
+msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2187
+#: src/transport/gnunet-service-transport_neighbours.c:2856
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2205
+#: src/transport/gnunet-service-transport_neighbours.c:2870
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2323
+#: src/transport/gnunet-service-transport_neighbours.c:2901
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2336
+#: src/transport/gnunet-service-transport_neighbours.c:2912
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2411
-#, fuzzy
-msgid "# unexpected CONNECT_ACK messages (no peer)"
-msgstr "COUNT Nachrichten versenden"
-
-#: src/transport/gnunet-service-transport_neighbours.c:2453
-#, fuzzy
-msgid "# unexpected CONNECT_ACK messages"
-msgstr "COUNT Nachrichten versenden"
+#: src/transport/gnunet-service-transport_neighbours.c:2943
+msgid "# other peer asked to disconnect from us"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2544
+#: src/transport/gnunet-service-transport_neighbours.c:3020
 #, fuzzy
-msgid "# unexpected ACK messages"
-msgstr "# verschlüsselter PONG Nachrichten gesendet"
+msgid "# disconnected from peer upon explicit request"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
 
 #: src/transport/gnunet-service-transport_plugins.c:111
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:118
-#, fuzzy, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr "Teste Transport(e) %s\n"
-
-#: src/transport/gnunet-service-transport_plugins.c:122
-#, fuzzy, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr "Teste Transport(e) %s\n"
-
-#: src/transport/gnunet-service-transport_plugins.c:150
-#, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
-
-#: src/transport/gnunet-service-transport_validation.c:410
+#: src/transport/gnunet-service-transport_validation.c:414
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:459
+#: src/transport/gnunet-service-transport_validation.c:463
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:508
+#: src/transport/gnunet-service-transport_validation.c:512
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_validation.c:566
+#: src/transport/gnunet-service-transport_validation.c:570
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:798
+#: src/transport/gnunet-service-transport_validation.c:805
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_validation.c:833
+#: src/transport/gnunet-service-transport_validation.c:840
 #, c-format
 msgid ""
 "Not confirming PING with address `%s' since I cannot confirm having this "
 "address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:919
+#: src/transport/gnunet-service-transport_validation.c:924
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:928
+#: src/transport/gnunet-service-transport_validation.c:933
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1050
+#: src/transport/gnunet-service-transport_validation.c:1055
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1080
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1134
+#: src/transport/gnunet-service-transport_validation.c:1136
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/transport/gnunet-transport.c:256
+#: src/transport/gnunet-transport.c:260
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:269
+#: src/transport/gnunet-transport.c:273
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:319
+#: src/transport/gnunet-transport.c:323
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:326
+#: src/transport/gnunet-transport.c:330
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:359
+#: src/transport/gnunet-transport.c:363
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:379
+#: src/transport/gnunet-transport.c:383
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:410
+#: src/transport/gnunet-transport.c:414
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:439
+#: src/transport/gnunet-transport.c:443
 #, fuzzy, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/transport/gnunet-transport.c:453
+#: src/transport/gnunet-transport.c:466
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:483
+#: src/transport/gnunet-transport.c:473
+#, c-format
+msgid "Peer `%s': %s <unable to resolve address>\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:501
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# verbundener Knoten"
 
-#: src/transport/gnunet-transport.c:539
+#: src/transport/gnunet-transport.c:569
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:587
+#: src/transport/gnunet-transport.c:618
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:590
+#: src/transport/gnunet-transport.c:621
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:593
+#: src/transport/gnunet-transport.c:624
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:596
+#: src/transport/gnunet-transport.c:627
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:599
+#: src/transport/gnunet-transport.c:630
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:603
+#: src/transport/gnunet-transport.c:634
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:606
+#: src/transport/gnunet-transport.c:637
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:614
+#: src/transport/gnunet-transport.c:645
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_http.c:981
+#: src/transport/plugin_transport_http.c:1100
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1029
+#: src/transport/plugin_transport_http.c:1149
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/transport/plugin_transport_http.c:1054 src/util/service.c:986
+#: src/transport/plugin_transport_http.c:1174 src/util/service.c:1036
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_http.c:1071 src/util/service.c:1003
+#: src/transport/plugin_transport_http.c:1191 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transport/plugin_transport_http.c:1176
+#: src/transport/plugin_transport_http.c:1296
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1189
+#: src/transport/plugin_transport_http.c:1309
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1264
+#: src/transport/plugin_transport_http.c:1386
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
 
-#: src/transport/plugin_transport_http.c:1277
+#: src/transport/plugin_transport_http.c:1399
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/transport/plugin_transport_http.c:1288
+#: src/transport/plugin_transport_http.c:1410
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1308
+#: src/transport/plugin_transport_http.c:1430
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1338
+#: src/transport/plugin_transport_http.c:1460
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:621
+#: src/transport/plugin_transport_http_client.c:624
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:189
+#: src/transport/plugin_transport_http_server.c:178
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:213
+#: src/transport/plugin_transport_http_server.c:202
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:370
-#, fuzzy, c-format
-msgid "Received malformed message via %s. Ignored.\n"
-msgstr ""
-"Es wurde eine ungültige Nachricht per SMTP empfangen (ungültige Größe).\n"
-
-#: src/transport/plugin_transport_smtp.c:457
-#, fuzzy
-msgid "SMTP filter string to invalid, lacks ': '\n"
-msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n"
-
-#: src/transport/plugin_transport_smtp.c:466
-#, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
-msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n"
-
-#: src/transport/plugin_transport_smtp.c:561
-#: src/transport/plugin_transport_smtp.c:571
-#: src/transport/plugin_transport_smtp.c:584
-#: src/transport/plugin_transport_smtp.c:603
-#: src/transport/plugin_transport_smtp.c:626
-#: src/transport/plugin_transport_smtp.c:634
-#: src/transport/plugin_transport_smtp.c:647
-#: src/transport/plugin_transport_smtp.c:658
-#, fuzzy, c-format
-msgid "SMTP: `%s' failed: %s.\n"
-msgstr "`%s' schlug fehl: %s\n"
-
-#: src/transport/plugin_transport_smtp.c:801
-#, fuzzy
-msgid "No email-address specified, can not start SMTP transport.\n"
-msgstr ""
-"Kein Filter für E-Mail angegeben, es kann keine Bekanntmachung erstellt "
-"werden.\n"
-
-#: src/transport/plugin_transport_smtp.c:813
-#, fuzzy
-msgid "# bytes received via SMTP"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/transport/plugin_transport_smtp.c:814
-#, fuzzy
-msgid "# bytes sent via SMTP"
-msgstr "# Bytes gesendet über TCP"
-
-#: src/transport/plugin_transport_smtp.c:816
-#, fuzzy
-msgid "# bytes dropped by SMTP (outgoing)"
-msgstr "# Bytes verworfen von TCP (ausgehend)"
-
-#: src/transport/plugin_transport_tcp.c:512
+#: src/transport/plugin_transport_tcp.c:591
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:616
-#: src/transport/plugin_transport_tcp.c:705
-#: src/transport/plugin_transport_tcp.c:757
-#: src/transport/plugin_transport_tcp.c:830
-#: src/transport/plugin_transport_tcp.c:909
+#: src/transport/plugin_transport_tcp.c:767
+#: src/transport/plugin_transport_tcp.c:856
+#: src/transport/plugin_transport_tcp.c:906
+#: src/transport/plugin_transport_tcp.c:992
+#: src/transport/plugin_transport_tcp.c:1086
+#: src/transport/plugin_transport_tcp.c:1103
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transport/plugin_transport_tcp.c:622
-#: src/transport/plugin_transport_tcp.c:856
-#: src/transport/plugin_transport_tcp.c:1561
+#: src/transport/plugin_transport_tcp.c:774
+#: src/transport/plugin_transport_tcp.c:963
+#: src/transport/plugin_transport_tcp.c:1761
+#: src/transport/plugin_transport_tcp.c:2390
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_tcp.c:709
+#: src/transport/plugin_transport_tcp.c:860
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:760
+#: src/transport/plugin_transport_tcp.c:909
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:834
+#: src/transport/plugin_transport_tcp.c:996
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1081
+#: src/transport/plugin_transport_tcp.c:1290
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1116
-msgid "Found valid IPv4 NAT address (creating session)!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1186
+#: src/transport/plugin_transport_tcp.c:1401
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1603
+#: src/transport/plugin_transport_tcp.c:1802
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:1756
+#: src/transport/plugin_transport_tcp.c:1973
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:1823
+#: src/transport/plugin_transport_tcp.c:2043
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
+#: src/transport/plugin_transport_tcp.c:2279 src/util/service.c:940
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1976
+#: src/transport/plugin_transport_tcp.c:2293
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2039
+#: src/transport/plugin_transport_tcp.c:2355
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transport/plugin_transport_tcp.c:2062
+#: src/transport/plugin_transport_tcp.c:2378
 #, fuzzy, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_tcp.c:2066
+#: src/transport/plugin_transport_tcp.c:2382
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2386
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:130
+#: src/transport/plugin_transport_udp_broadcasting.c:128
 #, fuzzy
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:172
+#: src/transport/plugin_transport_udp_broadcasting.c:169
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:393
+#: src/transport/plugin_transport_udp_broadcasting.c:367
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1985
+#: src/transport/plugin_transport_udp.c:1894
+#, c-format
+msgid ""
+"UDP could not message to `%s': `%s'. Please check your network configuration "
+"and disable IPv6 if your connection does not have a global IPv6 address\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2138
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:2068
+#: src/transport/plugin_transport_udp.c:2306
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2112
+#: src/transport/plugin_transport_udp.c:2349
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_unix.c:1051
+#: src/transport/plugin_transport_unix.c:1356
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_wlan.c:875
+#: src/transport/plugin_transport_wlan.c:561
+msgid "# WLAN ACKs sent"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:580
 #, fuzzy
-msgid "# wlan session timeouts"
-msgstr "# Sitzungsschlüssel akzeptiert"
+msgid "# WLAN messages defragmented"
+msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:899
+#: src/transport/plugin_transport_wlan.c:626
+#: src/transport/plugin_transport_wlan.c:676
+#: src/transport/plugin_transport_wlan.c:1696
 #, fuzzy
-msgid "# wlan session created"
+msgid "# WLAN sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_wlan.c:980
-#: src/transport/plugin_transport_wlan.c:1138
-#: src/transport/plugin_transport_wlan.c:1159
-#: src/transport/plugin_transport_wlan.c:1190
-#: src/transport/plugin_transport_wlan.c:2334
-#: src/transport/plugin_transport_wlan.c:3142
-msgid "# wlan pending sessions"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:1233
-#: src/transport/plugin_transport_wlan.c:1888
+#: src/transport/plugin_transport_wlan.c:749
 #, fuzzy
-msgid "# wlan pending fragments"
-msgstr "# verworfener Nachrichten"
-
-#: src/transport/plugin_transport_wlan.c:1388
-#, c-format
-msgid ""
-"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
-msgstr ""
+msgid "# WLAN message fragments sent"
+msgstr "# fragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1732
-msgid "# wlan hello beacons send"
+#: src/transport/plugin_transport_wlan.c:767
+msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1765
-#: src/transport/plugin_transport_wlan.c:1968
-#: src/transport/plugin_transport_wlan.c:2059
-#, c-format
-msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:867
+#: src/transport/plugin_transport_wlan.c:948
+#: src/transport/plugin_transport_wlan.c:1698
+#, fuzzy
+msgid "# WLAN MAC endpoints allocated"
+msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1954
-msgid "# wlan acks send"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:1119
+#, fuzzy
+msgid "# HELLO messages received via WLAN"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:2025
+#: src/transport/plugin_transport_wlan.c:1140
 #, fuzzy
-msgid "# wlan fragments send"
+msgid "# fragments received via WLAN"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:2161
-#, c-format
-msgid "Wlan Address len %d is wrong\n"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:2295
-#: src/transport/plugin_transport_wlan.c:2919
-#: src/transport/plugin_transport_wlan.c:3145
-msgid "# wlan mac endpoints"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:1150
+#, fuzzy
+msgid "# ACKs received via WLAN"
+msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_wlan.c:2517
+#: src/transport/plugin_transport_wlan.c:1207
 #, fuzzy
-msgid "# wlan whole messages received"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
+msgid "# WLAN DATA messages discarded due to CRC32 error"
+msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:2708
+#: src/transport/plugin_transport_wlan.c:1306
 #, fuzzy
-msgid "# wlan hello messages received"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
+msgid "# DATA messages received via WLAN"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:2742
+#: src/transport/plugin_transport_wlan.c:1341
 #, fuzzy
-msgid "# wlan fragments received"
-msgstr "# verworfener Nachrichten"
+msgid "# WLAN DATA messages processed"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:2790
+#: src/transport/plugin_transport_wlan.c:1402
 #, fuzzy
-msgid "# wlan acks received"
-msgstr "# gap Anfragen insgesamt empfangen"
+msgid "# HELLO beacons sent via WLAN"
+msgstr "# Bytes gesendet über UDP"
 
-#: src/transport/plugin_transport_wlan.c:2879
-msgid "# wlan mac endpoints timeouts"
+#: src/transport/plugin_transport_wlan.c:1511
+msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2903
-#, fuzzy
-msgid "# wlan mac endpoints created"
-msgstr "# Client Trace-Anfragen empfangen"
+#: src/transport/plugin_transport_wlan.c:1668
+#, fuzzy, c-format
+msgid "Invalid configuration option `%s' in section `%s'\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/transport/plugin_transport_wlan.c:2956
-msgid "# wlan WLAN_HELPER_DATA received"
+#: src/transport/plugin_transport_wlan.c:1677
+#, c-format
+msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3010
-#, fuzzy
-msgid "# wlan messages for this client received"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
-
-#: src/transport/plugin_transport_wlan.c:3021
-#, fuzzy
-msgid "# wlan messages inside WLAN_HELPER_DATA received"
-msgstr "# verschlüsselter PING Nachrichten empfangen"
+#: src/transport/plugin_transport_wlan.c:1687
+#, fuzzy, c-format
+msgid "Missing configuration option `%s' in section `%s'\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/transport/transport_api.c:588
+#: src/transport/transport_api.c:570
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
@@ -5029,136 +5294,129 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:304
+#: src/util/client.c:359
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:312
+#: src/util/client.c:367
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:657
+#: src/util/client.c:685
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:717 src/util/service.c:919
+#: src/util/client.c:740 src/util/service.c:970
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:859
+#: src/util/client.c:882
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/util/client.c:875
+#: src/util/client.c:896
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/util/client.c:1143
+#: src/util/client.c:1149
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:889
+#: src/util/common_logging.c:239 src/util/common_logging.c:890
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:887
+#: src/util/common_logging.c:241 src/util/common_logging.c:888
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:243 src/util/common_logging.c:885
+#: src/util/common_logging.c:243 src/util/common_logging.c:886
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/common_logging.c:245 src/util/common_logging.c:883
+#: src/util/common_logging.c:245 src/util/common_logging.c:884
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/common_logging.c:247 src/util/common_logging.c:891
+#: src/util/common_logging.c:247 src/util/common_logging.c:892
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:609
+#: src/util/common_logging.c:610
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/common_logging.c:724
+#: src/util/common_logging.c:725
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:892
+#: src/util/common_logging.c:893
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:991
+#: src/util/common_logging.c:992
 #, fuzzy
 msgid "unknown address"
 msgstr "Unbekannter Fehler"
 
-#: src/util/common_logging.c:1029
+#: src/util/common_logging.c:1030
 #, fuzzy
 msgid "invalid address"
 msgstr "Ungültige Parameter: "
 
-#: src/util/configuration.c:245
+#: src/util/configuration.c:244
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/configuration.c:817
+#: src/util/configuration.c:816
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/connection.c:460
+#: src/util/connection.c:420
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/util/connection.c:475
+#: src/util/connection.c:435
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:629
+#: src/util/connection.c:550
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
-#: src/util/connection.c:821 src/util/connection.c:992
+#: src/util/connection.c:739 src/util/connection.c:909
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/connection.c:830
+#: src/util/connection.c:748
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' (%p)\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/connection.c:983
+#: src/util/connection.c:900
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/connection.c:1465
-#, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
-msgstr ""
-
-#: src/util/container_bloomfilter.c:507
+#: src/util/container_bloomfilter.c:510
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -5176,128 +5434,128 @@ msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#: src/util/crypto_rsa.c:661 src/util/crypto_rsa.c:708
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/util/crypto_rsa.c:623
+#: src/util/crypto_rsa.c:666
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
 
-#: src/util/crypto_rsa.c:641
+#: src/util/crypto_rsa.c:684
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+#: src/util/crypto_rsa.c:712 src/util/crypto_rsa.c:748
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:700
+#: src/util/crypto_rsa.c:743
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:720
+#: src/util/crypto_rsa.c:763
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/util/crypto_rsa.c:738
+#: src/util/crypto_rsa.c:781
 #, fuzzy, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr "Aufruf von `%s' mit Schlüssel `%s'.\n"
 
-#: src/util/crypto_rsa.c:959
+#: src/util/crypto_rsa.c:1032
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/disk.c:479
+#: src/util/disk.c:498
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/disk.c:1087
+#: src/util/disk.c:1062
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1441 src/util/service.c:1580
+#: src/util/disk.c:1416 src/util/service.c:1650
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#: src/util/disk.c:1759
+#: src/util/disk.c:1734
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/util/getopt.c:672
+#: src/util/getopt.c:669
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/util/getopt.c:696
+#: src/util/getopt.c:693
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: Option '--%s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt.c:701
+#: src/util/getopt.c:698
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: Option '%c%s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt.c:718 src/util/getopt.c:886
+#: src/util/getopt.c:715 src/util/getopt.c:883
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: Option `%s' benötigt einen Parameter\n"
 
-#: src/util/getopt.c:747
+#: src/util/getopt.c:744
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unbekannte Option '--%s'\n"
 
-#: src/util/getopt.c:751
+#: src/util/getopt.c:748
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unbekannte Option '%c%s'\n"
 
-#: src/util/getopt.c:776
+#: src/util/getopt.c:773
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: unerlaubte Option -- %c\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ungültige Option -- %c\n"
 
-#: src/util/getopt.c:806 src/util/getopt.c:934
+#: src/util/getopt.c:803 src/util/getopt.c:931
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: Option benötigt einen Parameter -- %c\n"
 
-#: src/util/getopt.c:854
+#: src/util/getopt.c:851
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: Option '-W %s' ist mehrdeutig\n"
 
-#: src/util/getopt.c:872
+#: src/util/getopt.c:869
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: Option '-W %s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt.c:1038
+#: src/util/getopt.c:1035
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
 
-#: src/util/getopt_helpers.c:84
+#: src/util/getopt_helpers.c:86
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -5305,7 +5563,7 @@ msgstr ""
 "Parameter, die für lange Optionen zwingend sind, sind auch für kurze "
 "Optionen zwingend.\n"
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
+#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:286
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Sie müssen für die Option `%s' zusätzlich eine Zahl angeben.\n"
@@ -5318,6 +5576,27 @@ msgstr ""
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
+#: src/util/gnunet-rsa.c:64
+#, c-format
+msgid "No hostkey file specified on command line\n"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:112
+msgid "print the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:115
+msgid "print the hash of the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:118
+msgid "print the short hash of the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:124
+msgid "Manipulate GNUnet private RSA key files"
+msgstr ""
+
 #: src/util/gnunet-service-resolver.c:288
 #, fuzzy, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
@@ -5329,42 +5608,37 @@ msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/util/gnunet-service-resolver.c:494
-#, c-format
-msgid "Resolver asked to look up `%s'.\n"
-msgstr ""
-
-#: src/util/gnunet-service-resolver.c:529
-#, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
-msgstr ""
-
-#: src/util/helper.c:239
+#: src/util/helper.c:244
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/helper.c:254
+#: src/util/helper.c:259
 #, c-format
 msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/util/helper.c:264
+#: src/util/helper.c:269
 #, fuzzy, c-format
 msgid "Got %u bytes from helper `%s'\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/util/helper.c:273
+#: src/util/helper.c:278
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/helper.c:432
+#: src/util/helper.c:310
+#, fuzzy, c-format
+msgid "Starting HELPER process `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/util/helper.c:440
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/network.c:1196
+#: src/util/network.c:1200
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -5392,12 +5666,12 @@ msgstr "`%s' schlug fehl: %s\n"
 msgid "stat (%s) failed: %s\n"
 msgstr "`%s' schlug fehl: %s\n"
 
-#: src/util/os_priority.c:304
+#: src/util/os_priority.c:305
 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for reading: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/util/os_priority.c:305
+#: src/util/os_priority.c:306
 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for writing: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -5423,12 +5697,12 @@ 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/pseudonym.c:273
+#: src/util/pseudonym.c:276
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/util/pseudonym.c:338
+#: src/util/pseudonym.c:407 src/util/pseudonym.c:433
 #, fuzzy
 msgid "no-name"
 msgstr "Name anzeigen"
@@ -5446,187 +5720,167 @@ msgstr ""
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/util/resolver_api.c:351
+#: src/util/resolver_api.c:347
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
 
-#: src/util/resolver_api.c:355
+#: src/util/resolver_api.c:351
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/resolver_api.c:426
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:807
-#, c-format
-msgid "Resolver returns `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:901
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
-msgstr ""
-
-#: src/util/resolver_api.c:906
+#: src/util/resolver_api.c:890
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/resolver_api.c:938
-#, c-format
-msgid "Resolving our hostname `%s'\n"
-msgstr ""
-
-#: src/util/scheduler.c:866
+#: src/util/scheduler.c:786
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:996
+#: src/util/scheduler.c:916
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:397
+#: src/util/server.c:483
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/server.c:406
+#: src/util/server.c:492
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/util/server.c:411
+#: src/util/server.c:497
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/util/server.c:640
+#: src/util/server.c:827
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
-#: src/util/service.c:207 src/util/service.c:214
+#: src/util/service.c:135 src/util/service.c:161 src/util/service.c:204
+#: src/util/service.c:225 src/util/service.c:232
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/service.c:170
+#: src/util/service.c:188
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ungültige Netzwerk Notation ('/%d ist nicht gültig in IPv4 CIDR)."
 
-#: src/util/service.c:263
+#: src/util/service.c:281
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
 
-#: src/util/service.c:296
+#: src/util/service.c:313
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/service.c:326
+#: src/util/service.c:343
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
 
-#: src/util/service.c:668
+#: src/util/service.c:698
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:673
+#: src/util/service.c:703
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/util/service.c:680
+#: src/util/service.c:710
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:724
+#: src/util/service.c:765
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:752
+#: src/util/service.c:802
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:869
+#: src/util/service.c:920
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:939
+#: src/util/service.c:990
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:956
+#: src/util/service.c:1007
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1191
+#: src/util/service.c:1241
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1242 src/util/service.c:1260
+#: src/util/service.c:1292 src/util/service.c:1310
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1287
+#: src/util/service.c:1337
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1442
+#: src/util/service.c:1506
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/service.c:1475
+#: src/util/service.c:1539
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/util/service.c:1521
+#: src/util/service.c:1588
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1525
+#: src/util/service.c:1592
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1529
+#: src/util/service.c:1596
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1581
+#: src/util/service.c:1651
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1594
+#: src/util/service.c:1664
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/util/service.c:1657
+#: src/util/service.c:1729
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5635,55 +5889,76 @@ msgstr ""
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
 
-#: src/util/strings.c:143
+#: src/util/strings.c:144
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:354
+#: src/util/strings.c:334
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:462
+#: src/util/strings.c:481
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:554
+#: src/util/strings.c:573
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:559
+#: src/util/strings.c:578
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:563
+#: src/util/strings.c:582
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:567
+#: src/util/strings.c:586
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:571
+#: src/util/strings.c:590
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:575
+#: src/util/strings.c:594
 msgid " days"
 msgstr " Tage"
 
-#: src/util/strings.c:599
+#: src/util/strings.c:618
 msgid "end of time"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
+#: src/util/strings.c:1012
+msgid "IPv6 address did not start with `['\n"
+msgstr ""
+
+#: src/util/strings.c:1020
+msgid "IPv6 address did contain ':' to separate port number\n"
+msgstr ""
+
+#: src/util/strings.c:1026
+msgid "IPv6 address did contain ']' before ':' to separate port number\n"
+msgstr ""
+
+#: src/util/strings.c:1033
+msgid "IPv6 address did contain a valid port number after the last ':'\n"
+msgstr ""
+
+#: src/util/strings.c:1042
+#, fuzzy, c-format
+msgid "Invalid IPv6 address `%s': %s\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1071
 #, fuzzy
 msgid "# Active tunnels"
 msgstr "GNUnet Konfiguration"
 
 #: src/vpn/gnunet-service-vpn.c:608 src/vpn/gnunet-service-vpn.c:645
 #, fuzzy
-msgid "# Peers connected to mesh tunnels"
+msgid "# peers connected to mesh tunnels"
 msgstr "# verbundener Knoten"
 
 #: src/vpn/gnunet-service-vpn.c:699
@@ -5706,76 +5981,76 @@ msgstr "# dht Anfragen weitergeleitet"
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/vpn/gnunet-service-vpn.c:967
+#: src/vpn/gnunet-service-vpn.c:973
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1285
+#: src/vpn/gnunet-service-vpn.c:1291
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1306
+#: src/vpn/gnunet-service-vpn.c:1312
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1517
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
+#: src/vpn/gnunet-service-vpn.c:1555 src/vpn/gnunet-service-vpn.c:1596
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1600
+#: src/vpn/gnunet-service-vpn.c:1606
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1614
+#: src/vpn/gnunet-service-vpn.c:1620
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1697
+#: src/vpn/gnunet-service-vpn.c:1704
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2038
+#: src/vpn/gnunet-service-vpn.c:2045
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2196
+#: src/vpn/gnunet-service-vpn.c:2203
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2347
+#: src/vpn/gnunet-service-vpn.c:2354
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2402
+#: src/vpn/gnunet-service-vpn.c:2409
 #, fuzzy
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden!\n"
 
-#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
+#: src/vpn/gnunet-service-vpn.c:2448 src/vpn/gnunet-service-vpn.c:2661
 #, fuzzy
 msgid "# Active destinations"
 msgstr "GNUnet Konfiguration"
 
-#: src/vpn/gnunet-service-vpn.c:2726
+#: src/vpn/gnunet-service-vpn.c:2734
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3141
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3165
+#: src/vpn/gnunet-service-vpn.c:3173
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -5851,23 +6126,177 @@ msgstr "# Bytes empfangen über UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
-#: src/include/gnunet_common.h:490
+#: src/include/gnunet_common.h:497 src/include/gnunet_common.h:502
+#: src/include/gnunet_common.h:508
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:500
+#: src/include/gnunet_common.h:518
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
+#: src/include/gnunet_common.h:539 src/include/gnunet_common.h:546
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
+#~ msgid "Received malformed message via %s. Ignored.\n"
+#~ msgstr ""
+#~ "Es wurde eine ungültige Nachricht per SMTP empfangen (ungültige Größe).\n"
+
+#, fuzzy
+#~ msgid "SMTP filter string to invalid, lacks ': '\n"
+#~ msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n"
+
+#~ msgid "SMTP filter string to long, capped to `%s'\n"
+#~ msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n"
+
+#, fuzzy
+#~ msgid "SMTP: `%s' failed: %s.\n"
+#~ msgstr "`%s' schlug fehl: %s\n"
+
+#, fuzzy
+#~ msgid "No email-address specified, can not start SMTP transport.\n"
+#~ msgstr ""
+#~ "Kein Filter für E-Mail angegeben, es kann keine Bekanntmachung erstellt "
+#~ "werden.\n"
+
+#, fuzzy
+#~ msgid "# bytes received via SMTP"
+#~ msgstr "# Bytes empfangen über TCP"
+
+#, fuzzy
+#~ msgid "# bytes sent via SMTP"
+#~ msgstr "# Bytes gesendet über TCP"
+
+#, fuzzy
+#~ msgid "# bytes dropped by SMTP (outgoing)"
+#~ msgstr "# Bytes verworfen von TCP (ausgehend)"
+
+#, fuzzy
+#~ msgid "# Peers connected"
+#~ msgstr "# verbundener Knoten"
+
+#, fuzzy
+#~ msgid "%s failed for `%s' at %s:%d: `%s'\n"
+#~ msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+
+#, fuzzy
+#~ msgid "Failed to transmit shutdown ACK.\n"
+#~ msgstr "Fehler beim Starten der Collection.\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize Postgres with configuration `%s': %s"
+#~ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#, fuzzy
+#~ msgid "Failed to transmit message to `%s' service.\n"
+#~ msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
+
+#, fuzzy
+#~ msgid "Target is %d connections per peer."
+#~ msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Copying file with RENAME (%s,%s)\n"
+#~ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#, fuzzy
+#~ msgid "Copying file with command scp %s %s\n"
+#~ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#, fuzzy
+#~ msgid "Finished copying all blacklist files!\n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#, fuzzy
+#~ msgid "Offering HELLO of peer %s to peer %s\n"
+#~ msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
+
+#, fuzzy
+#~ msgid "Failed during blacklist file copying!\n"
+#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#, fuzzy
+#~ msgid "# bytes payload received for other peers"
+#~ msgstr "# Bytes des Typs %d empfangen"
+
+#, fuzzy
+#~ msgid "# fast reconnects failed"
+#~ msgstr "# verbundener Knoten"
+
+#, fuzzy
+#~ msgid "# peers disconnected due to timeout"
+#~ msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
+
+#, fuzzy
+#~ msgid "# peers disconnected due to global disconnect"
+#~ msgstr "# Knotenankündigungen empfangen"
+
+#, fuzzy
+#~ msgid "# messages not sent (no such peer or not connected)"
+#~ msgstr "# defragmentierter Nachrichten"
+
+#, fuzzy
+#~ msgid "# unexpected CONNECT_ACK messages"
+#~ msgstr "COUNT Nachrichten versenden"
+
+#, fuzzy
+#~ msgid "# wlan session timeouts"
+#~ msgstr "# Sitzungsschlüssel akzeptiert"
+
+#, fuzzy
+#~ msgid "# wlan session created"
+#~ msgstr "# Sitzungsschlüssel akzeptiert"
+
+#, fuzzy
+#~ msgid "# wlan pending fragments"
+#~ msgstr "# verworfener Nachrichten"
+
+#, fuzzy
+#~ msgid "# wlan fragments send"
+#~ msgstr "# verworfener Nachrichten"
+
+#, fuzzy
+#~ msgid "# wlan whole messages received"
+#~ msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#, fuzzy
+#~ msgid "# wlan hello messages received"
+#~ msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#, fuzzy
+#~ msgid "# wlan fragments received"
+#~ msgstr "# verworfener Nachrichten"
+
+#, fuzzy
+#~ msgid "# wlan acks received"
+#~ msgstr "# gap Anfragen insgesamt empfangen"
+
+#, fuzzy
+#~ msgid "# wlan messages for this client received"
+#~ msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#, fuzzy
+#~ msgid "# wlan messages inside WLAN_HELPER_DATA received"
+#~ msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#, fuzzy
+#~ msgid "Unknown user `%s'\n"
+#~ msgstr "Unbekannte Operation `%s'\n"
+
+#, fuzzy
+#~ msgid "Namespace `%s' unknown.\n"
+#~ msgstr "Namespace `%s' hat das Rating %d.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to statistics service!\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
 #~ msgid "Failed to send to `%s': %s\n"
 #~ msgstr "Datei wurde als `%s' gespeichert.\n"
 
@@ -5934,10 +6363,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
 #, fuzzy
-#~ msgid "Service `%s' started\n"
-#~ msgstr "Dienst gelöscht.\n"
-
-#, fuzzy
 #~ msgid "Peer `%s' plugin: `%s' address `%s'\n"
 #~ msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
@@ -5962,14 +6387,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
 #, fuzzy
-#~ msgid "Failed to get full path for `%s'\n"
-#~ msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-
-#, fuzzy
-#~ msgid "Failed to create file for dhtlog.\n"
-#~ msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
-
-#, fuzzy
 #~ msgid "Found peer `%s'\n"
 #~ msgstr "Ich bin Peer `%s'.\n"
 
@@ -5982,10 +6399,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "Teste Transport(e) %s\n"
 
 #, fuzzy
-#~ msgid "Failed to load transport plugin for udp\n"
-#~ msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
-
-#, fuzzy
 #~ msgid "# SET QUOTA messages received"
 #~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
@@ -6111,9 +6524,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "Ok"
 #~ msgstr "k"
 
-#~ msgid "GNUnet configuration"
-#~ msgstr "GNUnet Konfiguration"
-
 #~ msgid ""
 #~ "Welcome to GNUnet!\n"
 #~ "\n"
@@ -6369,9 +6779,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ "Your configuration changes were NOT saved.\n"
 #~ msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#~ msgid "GNUnet service installed successfully.\n"
-#~ msgstr "Der GNUnet Dienst wurde erfolgreich installiert.\n"
-
 #~ msgid "This version of Windows doesn't support services.\n"
 #~ msgstr "Diese Version von Windows unterstützt keine Dienste.\n"
 
@@ -6597,10 +7004,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
 #, fuzzy
-#~ msgid "Invalid argument for `%s'.\n"
-#~ msgstr "Ungültiger Parameter: `%s'\n"
-
-#, fuzzy
 #~ msgid "Deadlock due to `%s'.\n"
 #~ msgstr "Durch `%s' ist ein Deadlock bei %s:%d entstanden\n"
 
@@ -6876,9 +7279,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 #~ msgstr "Kommando `%s' benötigt zwei zusätzliche Angaben (`%s' und `%s').\n"
 
-#~ msgid "Unsupported command `%s'.  Aborting.\n"
-#~ msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
-
 #, fuzzy
 #~ msgid "# dht discovery messages sent"
 #~ msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -7223,10 +7623,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "Downloading %d files from directory `%s'.\n"
 #~ msgstr "Dateien aus dem GNUnet herunterladen."
 
-#, fuzzy
-#~ msgid "Did not find any files in directory `%s'\n"
-#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
 #~ msgid "File stored as `%s'.\n"
 #~ msgstr "Datei wurde als `%s' gespeichert.\n"
 
@@ -7290,10 +7686,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "# gap Anfragen insgesamt empfangen"
 
 #, fuzzy
-#~ msgid "# gap content total received"
-#~ msgstr "# gap Anfragen insgesamt empfangen"
-
-#, fuzzy
 #~ msgid ""
 #~ "`%s' registering client handlers %d %d %d %d %d %d %d %d and P2P handlers "
 #~ "%d %d\n"
@@ -7350,10 +7742,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
 #, fuzzy
-#~ msgid "set number of daemons to start"
-#~ msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
-
-#, fuzzy
 #~ msgid "Waiting for peers to connect"
 #~ msgstr ""
 #~ "Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "
@@ -9027,9 +9415,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ "Der Assistent kann nur zur Einrichtung von gnunetd gestartet werden.\n"
 #~ "Haben Sie die `%s'-Option vergessen?\n"
 
-#~ msgid "%s: symbol value `%s' invalid for %s\n"
-#~ msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
-
 #~ msgid "Gtk GNUnet Configurator"
 #~ msgstr "Gtk GNUnet Konfigurator"
 
@@ -9376,6 +9761,3 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #~ msgid "Error: can't create service: %s (#%i)\n"
 #~ msgstr "Fehler: Dienst konnte nicht erzeugt werden: %s (#%i)\n"
-
-#~ msgid "Failure at at %s:%d.\n"
-#~ msgstr "Fehler bei %s:%d.\n"
diff --git a/po/es.gmo b/po/es.gmo
index a3b0ad6..07ff667 100644
--- a/po/es.gmo
+++ b/po/es.gmo
diff --git a/po/es.po b/po/es.po
index 83d1065..0174aca 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2012-02-28 18:30+0100\n"
+"POT-Creation-Date: 2012-06-05 15:47+0200\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <miguel.13@telefonica.net>\n"
 "Language-Team: Spanish\n"
@@ -17,260 +17,275 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/arm_api.c:187
+#: src/arm/arm_api.c:165
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:378
+#: src/arm/arm_api.c:349
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr ""
 "El fichero de configuración debe especificar el directorio para almacenar "
 "los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/arm/arm_api.c:392
+#: src/arm/arm_api.c:363
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "El fichero de configuración debe especificar el directorio para almacenar "
 "los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/arm/arm_api.c:467
+#: src/arm/arm_api.c:432
 #, fuzzy, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr "Recibida respuesta anómala a'%s' del par '%s'.\n"
 
-#: src/arm/arm_api.c:523
+#: src/arm/arm_api.c:485
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:524
+#: src/arm/arm_api.c:486
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:546
+#: src/arm/arm_api.c:507
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:548
+#: src/arm/arm_api.c:508
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:581
+#: src/arm/arm_api.c:540
 #, fuzzy, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr "'%s': No se recibió el mensaje en %llu ms.\n"
 
-#: src/arm/arm_api.c:654
+#: src/arm/arm_api.c:612
 #, fuzzy, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr "No se ha recibido una respuesta en %llums.\n"
 
-#: src/arm/gnunet-arm.c:149
+#: src/arm/gnunet-arm.c:159
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr "El espacio '%s' ha sido valorado con un %d.\n"
 
-#: src/arm/gnunet-arm.c:154
+#: src/arm/gnunet-arm.c:164
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "Servicio eliminado.\n"
 
-#: src/arm/gnunet-arm.c:157
+#: src/arm/gnunet-arm.c:167
 #, fuzzy, c-format
 msgid "Service `%s' was already running.\n"
 msgstr "¡Esta búsqueda está aún pendiente!\n"
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:172
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Servicio eliminado.\n"
 
-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr "Servicio eliminado.\n"
 
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:179
 #, fuzzy, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr "¡Esta búsqueda está aún pendiente!\n"
 
-#: src/arm/gnunet-arm.c:173
+#: src/arm/gnunet-arm.c:183
 #, fuzzy
 msgid "Request ignored as ARM is shutting down.\n"
 msgstr "'%s' se esta cerrando.\n"
 
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:187
 #, fuzzy
 msgid "Error communicating with ARM service.\n"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/arm/gnunet-arm.c:181
+#: src/arm/gnunet-arm.c:191
 #, fuzzy
 msgid "Timeout communicating with ARM service.\n"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/arm/gnunet-arm.c:185
+#: src/arm/gnunet-arm.c:195
 #, fuzzy
 msgid "Operation failed.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/arm/gnunet-arm.c:189
+#: src/arm/gnunet-arm.c:199
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:222
+#, fuzzy
+msgid "Error communicating with ARM. ARM not running?\n"
+msgstr "Imprime información de los pares de GNUnet."
+
+#: src/arm/gnunet-arm.c:225
+#, fuzzy
+msgid "Running services:\n"
+msgstr "Iniciada colección '%s'.\n"
+
+#: src/arm/gnunet-arm.c:249
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+#: src/arm/gnunet-arm.c:257 src/arm/gnunet-arm.c:357 src/arm/gnunet-arm.c:373
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247
+#: src/arm/gnunet-arm.c:280
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/arm/gnunet-arm.c:253
+#: src/arm/gnunet-arm.c:286
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/arm/gnunet-arm.c:355
+#: src/arm/gnunet-arm.c:407
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:357
+#: src/arm/gnunet-arm.c:409
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:359
+#: src/arm/gnunet-arm.c:411
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:361
+#: src/arm/gnunet-arm.c:413
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:364
+#: src/arm/gnunet-arm.c:416
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:419
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:421
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:372
+#: src/arm/gnunet-arm.c:424
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "tiempo para esperar hasta completar una iteración (en ms)"
 
-#: src/arm/gnunet-arm.c:383
+#: src/arm/gnunet-arm.c:426
+msgid "List currently running services"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:437
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:328
+#: src/arm/gnunet-service-arm.c:332
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/arm/gnunet-service-arm.c:331
+#: src/arm/gnunet-service-arm.c:335
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:357
+#: src/arm/gnunet-service-arm.c:361
 #, fuzzy
 msgid "Could not send status result to client\n"
 msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/arm/gnunet-service-arm.c:484
+#: src/arm/gnunet-service-arm.c:393
+#, fuzzy
+msgid "Could not send list result to client\n"
+msgstr "Imposible mandar el mensaje a gnunetd\n"
+
+#: src/arm/gnunet-service-arm.c:523
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Imposible crear la cuenta de usuario:"
 
-#: src/arm/gnunet-service-arm.c:506
+#: src/arm/gnunet-service-arm.c:545
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:520
+#: src/arm/gnunet-service-arm.c:559
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:628
+#: src/arm/gnunet-service-arm.c:667
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:782
+#: src/arm/gnunet-service-arm.c:878
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:877
+#: src/arm/gnunet-service-arm.c:970
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:882
+#: src/arm/gnunet-service-arm.c:975
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:887
+#: src/arm/gnunet-service-arm.c:980
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/arm/gnunet-service-arm.c:921
+#: src/arm/gnunet-service-arm.c:986
+#, fuzzy, c-format
+msgid "Service `%s' took %llu ms to terminate\n"
+msgstr "Servicio eliminado.\n"
+
+#: src/arm/gnunet-service-arm.c:1021
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:967 src/arm/mockup-service.c:41
-#, fuzzy
-msgid "Failed to transmit shutdown ACK.\n"
-msgstr "Falló al comenzar la recolección.\n"
-
-#: src/arm/gnunet-service-arm.c:1067
+#: src/arm/gnunet-service-arm.c:1127
 #, fuzzy, c-format
 msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/arm/gnunet-service-arm.c:1069
+#: src/arm/gnunet-service-arm.c:1129
 msgid "option missing"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1152
+#: src/arm/gnunet-service-arm.c:1213
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1224
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1177
+#: src/arm/gnunet-service-arm.c:1238
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:46
-msgid "Transmitting shutdown ACK.\n"
-msgstr ""
-
-#: src/arm/mockup-service.c:69
+#: src/arm/mockup-service.c:44
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
@@ -330,195 +345,198 @@ msgstr ""
 msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:92
+#: src/chat/gnunet-chat.c:93
 msgid "Joined\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:124
+#: src/chat/gnunet-chat.c:125 src/chat/gnunet-chat.c:133
+#: src/chat/gnunet-chat.c:213 src/chat/gnunet-chat.c:253
+#: src/chat/gnunet-chat.c:329 src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:400 src/chat/gnunet-chat.c:700
 msgid "anonymous"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:130
+#: src/chat/gnunet-chat.c:144
 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "'%s' %s falló: %s\n"
 
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: src/chat/gnunet-chat.c:147 src/chat/gnunet-chat.c:150
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr "'%s' %s falló: %s\n"
 
-#: src/chat/gnunet-chat.c:139
+#: src/chat/gnunet-chat.c:153
 #, fuzzy, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr "'%s' %s falló: %s\n"
 
-#: src/chat/gnunet-chat.c:142
+#: src/chat/gnunet-chat.c:156
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr "'%s' falló con el código de error %s: %s"
 
-#: src/chat/gnunet-chat.c:145
+#: src/chat/gnunet-chat.c:159
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/chat/gnunet-chat.c:148
+#: src/chat/gnunet-chat.c:162
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/chat/gnunet-chat.c:151
+#: src/chat/gnunet-chat.c:165
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:170
 #, fuzzy, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:173
 #, fuzzy, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr "'%s' falló con el código de error %s: %s"
 
-#: src/chat/gnunet-chat.c:162
+#: src/chat/gnunet-chat.c:176
 #, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:193
+#: src/chat/gnunet-chat.c:217
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:260
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:260
 #, c-format
 msgid "`%s' left the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#: src/chat/gnunet-chat.c:321 src/chat/gnunet-chat.c:363
 #, fuzzy
 msgid "Could not change username\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#: src/chat/gnunet-chat.c:334 src/chat/gnunet-chat.c:702
 #, fuzzy, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr "Respuesta inválida a '%s' del par '%s'.\n"
 
-#: src/chat/gnunet-chat.c:320
+#: src/chat/gnunet-chat.c:373
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
 
-#: src/chat/gnunet-chat.c:333
+#: src/chat/gnunet-chat.c:388
 #, fuzzy, c-format
 msgid "Users in room `%s': "
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:434
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:379
-#, fuzzy, c-format
-msgid "Unknown user `%s'\n"
-msgstr "Operación desconocida '%s'\n"
+#: src/chat/gnunet-chat.c:443
+#, c-format
+msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:395
+#: src/chat/gnunet-chat.c:460
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:448
+#: src/chat/gnunet-chat.c:513
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Operación desconocida '%s'\n"
 
-#: src/chat/gnunet-chat.c:459
+#: src/chat/gnunet-chat.c:524
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:463
+#: src/chat/gnunet-chat.c:528
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:532
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:470
+#: src/chat/gnunet-chat.c:535
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:472
+#: src/chat/gnunet-chat.c:537
 msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:474
+#: src/chat/gnunet-chat.c:539
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:477
+#: src/chat/gnunet-chat.c:542
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:480
+#: src/chat/gnunet-chat.c:545
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:547
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:484
+#: src/chat/gnunet-chat.c:549
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:551
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:554
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:556
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:606
+#: src/chat/gnunet-chat.c:672
 #, fuzzy
 msgid "You must specify a nickname\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/chat/gnunet-chat.c:622
+#: src/chat/gnunet-chat.c:688
 #, fuzzy, c-format
 msgid "Failed to join room `%s'\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/chat/gnunet-chat.c:655
+#: src/chat/gnunet-chat.c:727
 msgid "set the nickname to use (required)"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:658
+#: src/chat/gnunet-chat.c:730
 msgid "set the chat room to join"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:670
+#: src/chat/gnunet-chat.c:742
 msgid "Join a chat on GNUnet."
 msgstr ""
 
@@ -542,184 +560,186 @@ msgstr "Imposible guardar la configuración"
 msgid "Failed to queue a leave notification\n"
 msgstr "Imposible guardar la configuración"
 
-#: src/core/core_api.c:798
+#: src/core/core_api.c:786
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core-list-connections.c:77
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
+#: src/core/gnunet-core.c:54 src/peerinfo-tool/gnunet-peerinfo.c:286
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/core/gnunet-core-list-connections.c:175
-#: src/peerinfo-tool/gnunet-peerinfo.c:194
+#: src/core/gnunet-core.c:72 src/peerinfo-tool/gnunet-peerinfo.c:817
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Argumentos en la linea de comandos inválidos:\n"
 
-#: src/core/gnunet-core-list-connections.c:196
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
-msgid "don't resolve host names"
-msgstr ""
-
-#: src/core/gnunet-core-list-connections.c:203
+#: src/core/gnunet-core.c:95
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/core/gnunet-service-core.c:99
+#: src/core/gnunet-service-core.c:97
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:360
+#: src/core/gnunet-service-core_clients.c:370
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/core/gnunet-service-core_clients.c:465
+#: src/core/gnunet-service-core_clients.c:475
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "# mensajes defragmentados"
 
-#: src/core/gnunet-service-core_clients.c:801
+#: src/core/gnunet-service-core_clients.c:818
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de ruido recibidos"
 
-#: src/core/gnunet-service-core_kx.c:493
+#: src/core/gnunet-service-core_kx.c:565
 msgid "# bytes encrypted"
 msgstr "# bytes encriptados"
 
-#: src/core/gnunet-service-core_kx.c:543
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
-#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
+#: src/core/gnunet-service-core_kx.c:681 src/dv/gnunet-service-dv.c:3003
 #, fuzzy
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/core/gnunet-service-core_kx.c:623
+#: src/core/gnunet-service-core_kx.c:700
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:753
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:694
+#: src/core/gnunet-service-core_kx.c:775
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:828
 #, fuzzy
 msgid "# session keys received"
 msgstr "# claves de la sesión rechazadas"
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:845
 #, fuzzy, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr "el tamaño del '%s' mensaje es demasiado corto. Ignorandolo.\n"
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:890
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# mensajes defragmentados"
 
-#: src/core/gnunet-service-core_kx.c:883
-#: src/transport/gnunet-service-transport_validation.c:803
+#: src/core/gnunet-service-core_kx.c:977
+#: src/transport/gnunet-service-transport_validation.c:810
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/core/gnunet-service-core_kx.c:1010
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:938
+#: src/core/gnunet-service-core_kx.c:1029
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# mensajes fragmentados"
 
-#: src/core/gnunet-service-core_kx.c:1026
+#: src/core/gnunet-service-core_kx.c:1125
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1037
+#: src/core/gnunet-service-core_kx.c:1135
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1095
-#: src/transport/gnunet-service-transport_validation.c:1026
+#: src/core/gnunet-service-core_kx.c:1236
+#: src/transport/gnunet-service-transport_validation.c:1031
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:1275
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# mensajes defragmentados"
 
-#: src/core/gnunet-service-core_kx.c:1157
+#: src/core/gnunet-service-core_kx.c:1303
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1223
+#: src/core/gnunet-service-core_kx.c:1329
+#, fuzzy
+msgid "# rekey operations confirmed via PONG"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/core/gnunet-service-core_kx.c:1381
+#: src/core/gnunet-service-core_kx.c:1398
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1402
+msgid "# REKEY operations performed"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1537
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1406
-#: src/core/gnunet-service-core_kx.c:1431
+#: src/core/gnunet-service-core_kx.c:1577
+#: src/core/gnunet-service-core_kx.c:1602
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1589
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1626
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1630
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1638
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1700
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Configuración de GNUnet"
 
-#: src/core/gnunet-service-core_kx.c:1536
+#: src/core/gnunet-service-core_kx.c:1708
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1546 src/hostlist/hostlist-server.c:555
-#: src/peerinfo-tool/gnunet-peerinfo.c:202
-#: src/transport/gnunet-service-transport.c:595
+#: src/core/gnunet-service-core_kx.c:1718 src/hostlist/hostlist-server.c:551
+#: src/peerinfo-tool/gnunet-peerinfo.c:823
+#: src/transport/gnunet-service-transport.c:611
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
@@ -730,29 +750,40 @@ msgid "# sessions terminated by transport disconnect"
 msgstr "# Anuncios de los pares recibidos"
 
 #: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:342
+#: src/core/gnunet-service-core_neighbours.c:334
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:247
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:430
+#: src/core/gnunet-service-core_neighbours.c:418
 #, fuzzy, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
 
-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:273
-msgid "# entries in session map"
-msgstr ""
+#: src/core/gnunet-service-core_sessions.c:206
+#: src/core/gnunet-service-core_sessions.c:269
+#: src/dht/gnunet-service-dht_neighbours.c:625
+#: src/dht/gnunet-service-dht_neighbours.c:683
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
+#: src/topology/gnunet-daemon-topology.c:709
+#: src/topology/gnunet-daemon-topology.c:810
+#: src/transport/gnunet-service-transport_neighbours.c:874
+#: src/transport/gnunet-service-transport_neighbours.c:1080
+#: src/transport/gnunet-service-transport_neighbours.c:1089
+#: src/transport/gnunet-service-transport_neighbours.c:2568
+#: src/transport/gnunet-service-transport_neighbours.c:2814
+#, fuzzy
+msgid "# peers connected"
+msgstr "# de pares conectados"
 
-#: src/core/gnunet-service-core_sessions.c:238
+#: src/core/gnunet-service-core_sessions.c:236
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:414
+#: src/core/gnunet-service-core_sessions.c:406
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -766,426 +797,405 @@ msgstr "# mensajes PONG encriptados recibidos"
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:118 src/datacache/datacache.c:255
-#: src/datastore/gnunet-service-datastore.c:854
+#: src/datacache/datacache.c:115 src/datacache/datacache.c:250
+#: src/datastore/gnunet-service-datastore.c:834
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# bytes en la base de datos"
 
-#: src/datacache/datacache.c:144 src/datacache/datacache.c:151
-#: src/datastore/gnunet-service-datastore.c:1531
-#: src/datastore/gnunet-service-datastore.c:1542
+#: src/datacache/datacache.c:141 src/datacache/datacache.c:148
+#: src/datastore/gnunet-service-datastore.c:1483
+#: src/datastore/gnunet-service-datastore.c:1494
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/datacache/datacache.c:183
+#: src/datacache/datacache.c:180
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:191
+#: src/datacache/datacache.c:188
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/datacache/datacache.c:281
+#: src/datacache/datacache.c:276
 #, fuzzy
 msgid "# requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datacache/datacache.c:291
+#: src/datacache/datacache.c:284
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:103
-#: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:517
-#: src/datacache/plugin_datacache_mysql.c:526
-#: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614
-#: src/datacache/plugin_datacache_sqlite.c:71
-#: src/datacache/plugin_datacache_sqlite.c:74
-#: src/datastore/plugin_datastore_mysql.c:139
-#: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:613
-#: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685
-#: src/datastore/plugin_datastore_mysql.c:1362
-#: src/datastore/plugin_datastore_mysql.c:1376
-#: src/datastore/plugin_datastore_sqlite.c:61
-#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
-#: src/include/gnunet_common.h:514
+#: src/datacache/plugin_datacache_mysql.c:97
+#: src/datacache/plugin_datacache_mysql.c:104
+#: src/datacache/plugin_datacache_sqlite.c:69
+#: src/datacache/plugin_datacache_sqlite.c:72
+#: src/datastore/plugin_datastore_mysql.c:803
+#: src/datastore/plugin_datastore_mysql.c:817
+#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
+#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
+#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:525
+#: src/include/gnunet_common.h:532
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/datacache/plugin_datacache_mysql.c:224
-#: src/datastore/plugin_datastore_mysql.c:316
-#, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
-msgstr "Intentando usar el fichero '%s' para la configuración de MySQL.\n"
-
-#: src/datacache/plugin_datacache_mysql.c:230
-#: src/datastore/plugin_datastore_mysql.c:322
-#, fuzzy, c-format
-msgid "Could not access file `%s': %s\n"
-msgstr "Imposible ejecutar '%s': %s\n"
-
-#: src/datacache/plugin_datacache_mysql.c:979
+#: src/datacache/plugin_datacache_mysql.c:450
 msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:79
-#: src/datastore/plugin_datastore_postgres.c:93
-#, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr "'%s' falló en %s: %d con el error: %s\n"
-
-#: src/datacache/plugin_datacache_postgres.c:149
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "Imposible inicializar SQLite.\n"
-
-#: src/datacache/plugin_datacache_postgres.c:499
+#: src/datacache/plugin_datacache_postgres.c:367
 msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:424
+#: src/datacache/plugin_datacache_sqlite.c:410
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:457
-#: src/datastore/plugin_datastore_sqlite.c:414
-#: src/namestore/plugin_namestore_sqlite.c:381
+#: src/datacache/plugin_datacache_sqlite.c:443
+#: src/datastore/plugin_datastore_sqlite.c:408
+#: src/namestore/plugin_namestore_sqlite.c:370
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
+#: src/datacache/plugin_datacache_sqlite.c:450
+#, fuzzy, c-format
+msgid "Failed to close statement %p: %d\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
+
 #: src/datacache/plugin_datacache_template.c:121
 msgid "Template datacache running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:289
+#: src/datastore/datastore_api.c:305
 #, fuzzy
 msgid "Failed to transmit request to drop database.\n"
 msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
 
-#: src/datastore/datastore_api.c:372
+#: src/datastore/datastore_api.c:388
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:418
+#: src/datastore/datastore_api.c:432
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:445
+#: src/datastore/datastore_api.c:459
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:465
+#: src/datastore/datastore_api.c:477
 #, fuzzy
 msgid "# Requests dropped from datastore queue"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/datastore/datastore_api.c:513
+#: src/datastore/datastore_api.c:525
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:540
+#: src/datastore/datastore_api.c:548
 msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608
+#: src/datastore/datastore_api.c:612
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/datastore/datastore_api.c:631
+#: src/datastore/datastore_api.c:633
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# bytes en la base de datos"
 
-#: src/datastore/datastore_api.c:772
+#: src/datastore/datastore_api.c:764
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr ""
 "\n"
 "Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/datastore/datastore_api.c:786
+#: src/datastore/datastore_api.c:778
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
+#: src/datastore/datastore_api.c:790 src/datastore/datastore_api.c:796
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
 
-#: src/datastore/datastore_api.c:810
+#: src/datastore/datastore_api.c:800
 #, fuzzy
 msgid "# status messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:883
+#: src/datastore/datastore_api.c:869
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:954
+#: src/datastore/datastore_api.c:936
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1019
+#: src/datastore/datastore_api.c:997
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1080
+#: src/datastore/datastore_api.c:1054
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:1148
+#: src/datastore/datastore_api.c:1118
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:1193
+#: src/datastore/datastore_api.c:1163
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr ""
 "\n"
 "Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1253
+#: src/datastore/datastore_api.c:1221
 #, fuzzy
 msgid "# Results received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/datastore/datastore_api.c:1324
+#: src/datastore/datastore_api.c:1286
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1391
+#: src/datastore/datastore_api.c:1349
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1455
+#: src/datastore/datastore_api.c:1409
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/datastore/gnunet-service-datastore.c:349
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# bytes recibidos por TCP"
 
-#: src/datastore/gnunet-service-datastore.c:426
+#: src/datastore/gnunet-service-datastore.c:422
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:486
+#: src/datastore/gnunet-service-datastore.c:480
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:640
+#: src/datastore/gnunet-service-datastore.c:511
+msgid "Shutdown in progress, aborting transmission.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:626
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:685
+#: src/datastore/gnunet-service-datastore.c:669
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:696
+#: src/datastore/gnunet-service-datastore.c:680
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:700
+#: src/datastore/gnunet-service-datastore.c:684
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:706
+#: src/datastore/gnunet-service-datastore.c:690
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
-#: src/datastore/gnunet-service-datastore.c:765
-#: src/datastore/gnunet-service-datastore.c:986
-#: src/datastore/gnunet-service-datastore.c:1465
+#: src/datastore/gnunet-service-datastore.c:695
+#: src/datastore/gnunet-service-datastore.c:747
+#: src/datastore/gnunet-service-datastore.c:960
+#: src/datastore/gnunet-service-datastore.c:1417
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:780
+#: src/datastore/gnunet-service-datastore.c:760
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:868
+#: src/datastore/gnunet-service-datastore.c:846
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1034
+#: src/datastore/gnunet-service-datastore.c:1006
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/gnunet-service-datastore.c:1048
+#: src/datastore/gnunet-service-datastore.c:1018
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1076
+#: src/datastore/gnunet-service-datastore.c:1046
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/gnunet-service-datastore.c:1110
+#: src/datastore/gnunet-service-datastore.c:1076
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/gnunet-service-datastore.c:1145
+#: src/datastore/gnunet-service-datastore.c:1109
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/gnunet-service-datastore.c:1172
+#: src/datastore/gnunet-service-datastore.c:1134
 #, fuzzy
 msgid "Content not found"
 msgstr "¡Comando '%s' no encontrado!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1182
+#: src/datastore/gnunet-service-datastore.c:1142
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1216
+#: src/datastore/gnunet-service-datastore.c:1174
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/gnunet-service-datastore.c:1260
+#: src/datastore/gnunet-service-datastore.c:1216
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1323
+#: src/datastore/gnunet-service-datastore.c:1277
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1332
+#: src/datastore/gnunet-service-datastore.c:1286
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/datastore/gnunet-service-datastore.c:1536
+#: src/datastore/gnunet-service-datastore.c:1488
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes en la base de datos"
 
-#: src/datastore/gnunet-service-datastore.c:1547
+#: src/datastore/gnunet-service-datastore.c:1499
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1549
+#: src/datastore/gnunet-service-datastore.c:1501
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1562
+#: src/datastore/gnunet-service-datastore.c:1514
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1580
-#: src/datastore/gnunet-service-datastore.c:1596
+#: src/datastore/gnunet-service-datastore.c:1532
+#: src/datastore/gnunet-service-datastore.c:1548
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/datastore/gnunet-service-datastore.c:1626
+#: src/datastore/gnunet-service-datastore.c:1578
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1655
+#: src/datastore/gnunet-service-datastore.c:1607
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1660
+#: src/datastore/gnunet-service-datastore.c:1612
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1663
+#: src/datastore/gnunet-service-datastore.c:1615
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:529
-#: src/datastore/plugin_datastore_mysql.c:1336
+#: src/datastore/plugin_datastore_mysql.c:780
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/datastore/plugin_datastore_mysql.c:622
-#: src/datastore/plugin_datastore_mysql.c:1346
+#: src/datastore/plugin_datastore_mysql.c:788
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' a '%s' falló en %s: %d con error %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1581
+#: src/datastore/plugin_datastore_mysql.c:1019
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:173
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "Imposible guardar el fichero de configuración '%s':"
+#: src/datastore/plugin_datastore_postgres.c:824
+#, fuzzy
+msgid "Failed to drop table from database.\n"
+msgstr ""
+"\n"
+"Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1017
+#: src/datastore/plugin_datastore_postgres.c:860
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/datastore/plugin_datastore_sqlite.c:57
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:239
-#: src/namestore/plugin_namestore_sqlite.c:223
+#: src/datastore/plugin_datastore_sqlite.c:233
+#: src/namestore/plugin_namestore_sqlite.c:204
 #, fuzzy, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:266
-#: src/namestore/plugin_namestore_sqlite.c:248
+#: src/datastore/plugin_datastore_sqlite.c:260
+#: src/namestore/plugin_namestore_sqlite.c:229
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:669
+#: src/datastore/plugin_datastore_sqlite.c:655
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "Datos no válidos en %s.  Intentando fijar (por borrado).\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1159
+#: src/datastore/plugin_datastore_sqlite.c:1139
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1178
+#: src/datastore/plugin_datastore_sqlite.c:1158
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1218
-#: src/namestore/plugin_namestore_sqlite.c:779
+#: src/datastore/plugin_datastore_sqlite.c:1198
+#: src/namestore/plugin_namestore_sqlite.c:829
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "base de datos sqlite"
@@ -1194,33 +1204,32 @@ msgstr "base de datos sqlite"
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:280
+#: src/dht/dht_api.c:348
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
-#: src/gns/gnunet-gns-lookup.c:179
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:293
+#: src/dht/gnunet-dht-put.c:192
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:182
+#: src/dht/gnunet-dht-get.c:204
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:207 src/gns/gnunet-gns-lookup.c:185
+#: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
-#: src/gns/gnunet-gns-lookup.c:188
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
-#: src/gns/gnunet-gns-lookup.c:191 src/nse/gnunet-nse-profiler.c:908
+#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-put.c:204 src/fs/gnunet-download.c:271
+#: src/fs/gnunet-publish.c:731 src/fs/gnunet-search.c:297
+#: src/fs/gnunet-unindex.c:169 src/nse/gnunet-nse-profiler.c:910
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1228,99 +1237,116 @@ msgstr ""
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:100
+#: src/dht/gnunet-dht-monitor.c:299
+msgid "how long to execute? 0 = forever"
+msgstr ""
+
+#: src/dht/gnunet-dht-monitor.c:321
+msgid "Prints all packets that go through the DHT."
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:108
 msgid "PUT request sent!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:124
+#: src/dht/gnunet-dht-put.c:111
+msgid "Timeout sending PUT request!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:114
+#, fuzzy
+msgid "PUT request not confirmed!\n"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/dht/gnunet-dht-put.c:144
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:132
+#: src/dht/gnunet-dht-put.c:152
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/dht/gnunet-dht-put.c:137
+#: src/dht/gnunet-dht-put.c:157
 #, fuzzy, c-format
 msgid "Connected to %s service!\n"
 msgstr "'%s' conectado a '%s'.\n"
 
-#: src/dht/gnunet-dht-put.c:152
+#: src/dht/gnunet-dht-put.c:172
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:166
+#: src/dht/gnunet-dht-put.c:186
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:169
+#: src/dht/gnunet-dht-put.c:189
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:175
+#: src/dht/gnunet-dht-put.c:195
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:178
+#: src/dht/gnunet-dht-put.c:198
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:203
+#: src/dht/gnunet-dht-put.c:223
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:556
-#: src/testing/testing.c:1979 src/testing/testing.c:2009
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:544
+#: src/testing/testing.c:1968 src/testing/testing.c:1998
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:371
+#: src/dht/gnunet-service-dht_clients.c:407
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_clients.c:462
+#: src/dht/gnunet-service-dht_clients.c:500
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/dht/gnunet-service-dht_clients.c:529
+#: src/dht/gnunet-service-dht_clients.c:584
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/dht/gnunet-service-dht_clients.c:624
+#: src/dht/gnunet-service-dht_clients.c:682
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/dht/gnunet-service-dht_clients.c:854
+#: src/dht/gnunet-service-dht_clients.c:919
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:869
+#: src/dht/gnunet-service-dht_clients.c:932
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:906
+#: src/dht/gnunet-service-dht_clients.c:967
 #, fuzzy, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:928
+#: src/dht/gnunet-service-dht_clients.c:989
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/dht/gnunet-service-dht_clients.c:979
-#: src/dht/gnunet-service-dht_clients.c:1022
+#: src/dht/gnunet-service-dht_clients.c:1038
+#: src/dht/gnunet-service-dht_clients.c:1081
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:989
+#: src/dht/gnunet-service-dht_clients.c:1048
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "Imposible mandar el mensaje a gnunetd\n"
@@ -1334,28 +1360,28 @@ msgstr "# bytes recibidos por TCP"
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:209
+#: src/dht/gnunet-service-dht_datacache.c:207
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:220
+#: src/dht/gnunet-service-dht_datacache.c:218
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:226
+#: src/dht/gnunet-service-dht_datacache.c:224
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:236
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:241
+#: src/dht/gnunet-service-dht_datacache.c:239
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:271
+#: src/dht/gnunet-service-dht_datacache.c:269
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -1369,96 +1395,90 @@ msgstr "El mensaje recibido del cliente es inválido\n"
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:573
+#: src/dht/gnunet-service-dht_neighbours.c:571
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes fragmentados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:629
-#: src/dht/gnunet-service-dht_neighbours.c:689
-#, fuzzy
-msgid "# Peers connected"
-msgstr "# de pares conectados"
-
-#: src/dht/gnunet-service-dht_neighbours.c:723
+#: src/dht/gnunet-service-dht_neighbours.c:717
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# mensajes defragmentados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:778
+#: src/dht/gnunet-service-dht_neighbours.c:772
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# bytes recibidos por TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:816
+#: src/dht/gnunet-service-dht_neighbours.c:810
 #, fuzzy
 msgid "# Bytes of bandwdith requested from core"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1040
-#: src/dht/gnunet-service-dht_neighbours.c:1068
+#: src/dht/gnunet-service-dht_neighbours.c:1032
+#: src/dht/gnunet-service-dht_neighbours.c:1060
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1049
-#: src/dht/gnunet-service-dht_neighbours.c:1085
+#: src/dht/gnunet-service-dht_neighbours.c:1041
+#: src/dht/gnunet-service-dht_neighbours.c:1075
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr "Conexión fallida\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1221
+#: src/dht/gnunet-service-dht_neighbours.c:1207
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1252
+#: src/dht/gnunet-service-dht_neighbours.c:1236
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1333
+#: src/dht/gnunet-service-dht_neighbours.c:1315
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1364
+#: src/dht/gnunet-service-dht_neighbours.c:1342
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1467
+#: src/dht/gnunet-service-dht_neighbours.c:1443
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1555
+#: src/dht/gnunet-service-dht_neighbours.c:1531
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1668
+#: src/dht/gnunet-service-dht_neighbours.c:1647
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1676
+#: src/dht/gnunet-service-dht_neighbours.c:1655
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1767
+#: src/dht/gnunet-service-dht_neighbours.c:1746
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1788
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1825
+#: src/dht/gnunet-service-dht_neighbours.c:1802
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1895
+#: src/dht/gnunet-service-dht_neighbours.c:1876
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# bytes recibidos por TCP"
@@ -1480,29 +1500,28 @@ msgstr ""
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:236
+#: src/dht/gnunet-service-dht_routing.c:238
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:314
-#: src/dht/gnunet-service-dht_routing.c:368
+#: src/dht/gnunet-service-dht_routing.c:311
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
+#: src/dht/gnunet-service-dht_routing.c:352
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:124
+#: src/dht/plugin_block_dht.c:136
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:131
+#: src/dht/plugin_block_dht.c:143
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:140
+#: src/dht/plugin_block_dht.c:152
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -1531,68 +1550,69 @@ msgstr ""
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:480
+#: src/dns/gnunet-service-dns.c:485
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "Imposible encontrar la IP del host '%s': %s\n"
 
-#: src/dns/gnunet-service-dns.c:634
+#: src/dns/gnunet-service-dns.c:639
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:818
+#: src/dns/gnunet-service-dns.c:822
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1001
+#: src/dns/gnunet-service-dns.c:1005
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1046
+#: src/dns/gnunet-service-dns.c:1050
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1165
+#: src/dns/gnunet-service-dns.c:1168
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1198
-msgid "Changing DNS reply according to client specifications\n"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1279
+#: src/dns/gnunet-service-dns.c:1281
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1294
+#: src/dns/gnunet-service-dns.c:1297
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1303
+#: src/dns/gnunet-service-dns.c:1306
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1312
+#: src/dns/gnunet-service-dns.c:1315
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1377
+#: src/dns/gnunet-service-dns.c:1380
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/dns/gnunet-service-dns.c:1461
+#: src/dns/gnunet-service-dns.c:1465
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1497 src/exit/gnunet-daemon-exit.c:2674
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1567
+#: src/dns/gnunet-service-dns.c:1561 src/exit/gnunet-daemon-exit.c:3032
+#, c-format
+msgid "`%s' must be installed SUID, refusing to run\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:1581
 msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
@@ -1616,15 +1636,15 @@ msgstr ""
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr "# bytes desencriptados"
 
-#: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2068
-#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1388
-#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+#: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2069
+#: src/exit/gnunet-daemon-exit.c:2319 src/vpn/gnunet-service-vpn.c:1394
+#: src/vpn/gnunet-service-vpn.c:1795 src/vpn/gnunet-service-vpn.c:1958
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2127
-#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1444
-#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+#: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2128
+#: src/exit/gnunet-daemon-exit.c:2378 src/vpn/gnunet-service-vpn.c:1450
+#: src/vpn/gnunet-service-vpn.c:1854 src/vpn/gnunet-service-vpn.c:1991
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -1673,138 +1693,138 @@ msgstr ""
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1470
+#: src/exit/gnunet-daemon-exit.c:1471
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# bytes enviados vía UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1570
+#: src/exit/gnunet-daemon-exit.c:1571
 #, fuzzy
 msgid "# TCP service creation requests received via mesh"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/exit/gnunet-daemon-exit.c:1573 src/exit/gnunet-daemon-exit.c:1652
-#: src/exit/gnunet-daemon-exit.c:1762 src/exit/gnunet-daemon-exit.c:1992
-#: src/exit/gnunet-daemon-exit.c:2234 src/exit/gnunet-daemon-exit.c:2515
-#: src/exit/gnunet-daemon-exit.c:2615
+#: src/exit/gnunet-daemon-exit.c:1574 src/exit/gnunet-daemon-exit.c:1653
+#: src/exit/gnunet-daemon-exit.c:1763 src/exit/gnunet-daemon-exit.c:1993
+#: src/exit/gnunet-daemon-exit.c:2235 src/exit/gnunet-daemon-exit.c:2516
+#: src/exit/gnunet-daemon-exit.c:2616
 #, fuzzy
 msgid "# Bytes received from MESH"
 msgstr "# bytes recibidos vía HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1606 src/exit/gnunet-daemon-exit.c:2637
+#: src/exit/gnunet-daemon-exit.c:1607 src/exit/gnunet-daemon-exit.c:2638
 #, c-format
 msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1610
+#: src/exit/gnunet-daemon-exit.c:1611
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/exit/gnunet-daemon-exit.c:1655
+#: src/exit/gnunet-daemon-exit.c:1656
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1766
 #, fuzzy
 msgid "# TCP data requests received via mesh"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/exit/gnunet-daemon-exit.c:1779
+#: src/exit/gnunet-daemon-exit.c:1780
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/exit/gnunet-daemon-exit.c:1829
+#: src/exit/gnunet-daemon-exit.c:1830
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# bytes enviados vía UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1995
+#: src/exit/gnunet-daemon-exit.c:1996
 #, fuzzy
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/exit/gnunet-daemon-exit.c:2237
+#: src/exit/gnunet-daemon-exit.c:2238
 #, fuzzy
 msgid "# ICMP service requests received via mesh"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1378
-#: src/vpn/gnunet-service-vpn.c:1945
+#: src/exit/gnunet-daemon-exit.c:2304 src/vpn/gnunet-service-vpn.c:1384
+#: src/vpn/gnunet-service-vpn.c:1952
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1414
-#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+#: src/exit/gnunet-daemon-exit.c:2363 src/vpn/gnunet-service-vpn.c:1420
+#: src/vpn/gnunet-service-vpn.c:1432 src/vpn/gnunet-service-vpn.c:1842
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2412
+#: src/exit/gnunet-daemon-exit.c:2413
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# bytes enviados vía UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2518
+#: src/exit/gnunet-daemon-exit.c:2519
 #, fuzzy
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/exit/gnunet-daemon-exit.c:2618
+#: src/exit/gnunet-daemon-exit.c:2619
 #, fuzzy
 msgid "# UDP service requests received via mesh"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/exit/gnunet-daemon-exit.c:2641
+#: src/exit/gnunet-daemon-exit.c:2642
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/exit/gnunet-daemon-exit.c:2881
+#: src/exit/gnunet-daemon-exit.c:2882
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2895 src/exit/gnunet-daemon-exit.c:2907
+#: src/exit/gnunet-daemon-exit.c:2896 src/exit/gnunet-daemon-exit.c:2908
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2918
+#: src/exit/gnunet-daemon-exit.c:2919
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3047
+#: src/exit/gnunet-daemon-exit.c:3048
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3055
+#: src/exit/gnunet-daemon-exit.c:3056
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3062
+#: src/exit/gnunet-daemon-exit.c:3063
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3068
+#: src/exit/gnunet-daemon-exit.c:3069
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3074 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3075 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3235
+#: src/exit/gnunet-daemon-exit.c:3236
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1812,122 +1832,127 @@ msgstr ""
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:454
+#: src/fragmentation/defragmentation.c:456
 #, fuzzy
 msgid "# fragments received"
 msgstr "# fragmentos descartados"
 
-#: src/fragmentation/defragmentation.c:513
+#: src/fragmentation/defragmentation.c:521
 #, fuzzy
 msgid "# duplicate fragments received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/fragmentation/defragmentation.c:526
+#: src/fragmentation/defragmentation.c:534
 msgid "# messages defragmented"
 msgstr "# mensajes defragmentados"
 
-#: src/fragmentation/fragmentation.c:188
+#: src/fragmentation/fragmentation.c:203
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Auto-anuncios transmitidos"
 
-#: src/fragmentation/fragmentation.c:191
+#: src/fragmentation/fragmentation.c:206
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Auto-anuncios transmitidos"
 
-#: src/fragmentation/fragmentation.c:255
+#: src/fragmentation/fragmentation.c:232
+#, fuzzy
+msgid "# fragments wrap arounds"
+msgstr "# Auto-anuncios transmitidos"
+
+#: src/fragmentation/fragmentation.c:273
 msgid "# messages fragmented"
 msgstr "# mensajes fragmentados"
 
-#: src/fragmentation/fragmentation.c:258
+#: src/fragmentation/fragmentation.c:276
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:343
+#: src/fragmentation/fragmentation.c:363
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fragmentation/fragmentation.c:349
+#: src/fragmentation/fragmentation.c:369
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:373
+#: src/fragmentation/fragmentation.c:393
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/fs/fs_api.c:284
+#: src/fs/fs_api.c:339
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:293
+#: src/fs/fs_api.c:348
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:299
+#: src/fs/fs_api.c:354
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:877
+#: src/fs/fs_api.c:938
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:1334
+#: src/fs/fs_api.c:1395
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1376
+#: src/fs/fs_api.c:1437
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1392
+#: src/fs/fs_api.c:1453
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2004
+#: src/fs/fs_api.c:2106
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2014
+#: src/fs/fs_api.c:2116
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
+#: src/fs/fs_api.c:2241 src/fs/fs_api.c:2480
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2156
+#: src/fs/fs_api.c:2258
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
+#: src/fs/fs_api.c:2270 src/fs/fs_api.c:2289 src/fs/fs_api.c:2773
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2369
+#: src/fs/fs_api.c:2471
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2615
+#: src/fs/fs_api.c:2717
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2709
+#: src/fs/fs_api.c:2811
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1937,53 +1962,58 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:311
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:330
+#: src/fs/fs_download.c:331
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:488 src/fs/fs_download.c:500
+#: src/fs/fs_download.c:497 src/fs/fs_download.c:509
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_download.c:870
+#: src/fs/fs_download.c:878
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/fs/fs_download.c:951
+#: src/fs/fs_download.c:960
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
+"offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:986
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1000
+#: src/fs/fs_download.c:1009
 #, fuzzy, c-format
-msgid "Download failed: could not open file `%s': %s\n"
+msgid "Download failed: could not open file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_download.c:1010
+#: src/fs/fs_download.c:1019
 #, fuzzy, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_download.c:1019
-#, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
-msgstr ""
+#: src/fs/fs_download.c:1028
+#, fuzzy, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
+msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_download.c:1835
+#: src/fs/fs_download.c:1125
+#, fuzzy
+msgid "internal error decoding tree"
+msgstr "=\tError leyendo el directorio.\n"
+
+#: src/fs/fs_download.c:1888
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Argumento no válido: '%s'\n"
@@ -2069,69 +2099,69 @@ msgstr "Error desconocido.\n"
 msgid "Failed to connect to datastore."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:395
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:397
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/fs/fs_publish.c:616 src/fs/fs_publish.c:633 src/fs/fs_publish.c:672
-#: src/fs/fs_publish.c:692 src/fs/fs_publish.c:717 src/fs/fs_publish.c:857
+#: src/fs/fs_publish.c:621 src/fs/fs_publish.c:638 src/fs/fs_publish.c:677
+#: src/fs/fs_publish.c:697 src/fs/fs_publish.c:722 src/fs/fs_publish.c:862
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indexación del fichero '%s' fallida. Intentando insertar fichero...\n"
 
-#: src/fs/fs_publish.c:618
+#: src/fs/fs_publish.c:623
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:630
+#: src/fs/fs_publish.c:635
 #, fuzzy
 msgid "unknown error"
 msgstr "Error desconocido"
 
-#: src/fs/fs_publish.c:673
+#: src/fs/fs_publish.c:678
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:693
+#: src/fs/fs_publish.c:698
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:718
+#: src/fs/fs_publish.c:723
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/fs/fs_publish.c:741
+#: src/fs/fs_publish.c:746
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/fs/fs_publish.c:806
+#: src/fs/fs_publish.c:811
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/fs/fs_publish.c:812
+#: src/fs/fs_publish.c:817
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/fs/fs_publish.c:858
+#: src/fs/fs_publish.c:863
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "'%s' no es un fichero regular.\n"
 
-#: src/fs/fs_publish.c:1067
+#: src/fs/fs_publish.c:1071
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1138
+#: src/fs/fs_publish.c:1142
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2141,7 +2171,7 @@ msgstr ""
 msgid "Could not connect to datastore."
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/fs/fs_search.c:810
+#: src/fs/fs_search.c:829
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2151,44 +2181,64 @@ msgstr ""
 msgid "Failed to start daemon: %s\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/fs/fs_unindex.c:57
+#: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:62
+#: src/fs/fs_unindex.c:63
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Falló al entregar el mensaje '%s'.\n"
 
-#: src/fs/fs_unindex.c:231
+#: src/fs/fs_unindex.c:233
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:239
+#: src/fs/fs_unindex.c:241
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:247
+#: src/fs/fs_unindex.c:249
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Respuesta inválida a '%s'.\n"
 
-#: src/fs/fs_unindex.c:292
+#: src/fs/fs_unindex.c:293
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/fs/fs_unindex.c:325
+#: src/fs/fs_unindex.c:344
+#, fuzzy
+msgid "Failed to get KSKs from directory scan."
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#: src/fs/fs_unindex.c:356
+#, fuzzy, c-format
+msgid "Internal error scanning `%s'.\n"
+msgstr "=\tError leyendo el directorio.\n"
+
+#: src/fs/fs_unindex.c:411
+#, fuzzy, c-format
+msgid "Failed to remove KBlock: %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/fs/fs_unindex.c:501
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s' from KBlock!\n"
+msgstr "El fichero '%s' tiene la URI: '%s'\n"
+
+#: src/fs/fs_unindex.c:553 src/fs/fs_unindex.c:618
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/fs/fs_unindex.c:338
+#: src/fs/fs_unindex.c:631
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:665
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Fallo al conectarse a gnunetd"
@@ -2301,92 +2351,92 @@ msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 msgid "Display contents of a GNUnet directory"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/gnunet-download.c:100
+#: src/fs/gnunet-download.c:101
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/fs/gnunet-download.c:109
+#: src/fs/gnunet-download.c:110
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Error desconocido"
 
-#: src/fs/gnunet-download.c:118
+#: src/fs/gnunet-download.c:119
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:128
+#: src/fs/gnunet-download.c:129
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Error descargando: %s\n"
 
-#: src/fs/gnunet-download.c:136
+#: src/fs/gnunet-download.c:137
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "¡Subida rechazada!"
 
-#: src/fs/gnunet-download.c:151 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-download.c:152 src/fs/gnunet-publish.c:190
 #: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Estado de descarga inesperado."
 
-#: src/fs/gnunet-download.c:176
+#: src/fs/gnunet-download.c:177
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-download.c:183 src/fs/gnunet-publish.c:624
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "El fichero '%s' tiene la URI: '%s'\n"
 
-#: src/fs/gnunet-download.c:189
+#: src/fs/gnunet-download.c:190
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:196
+#: src/fs/gnunet-download.c:197
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:602
 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/fs/gnunet-download.c:247 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:248 src/fs/gnunet-search.c:285
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "seleccione el NIVEL deseado de anonimidad-del-receptor"
 
-#: src/fs/gnunet-download.c:250
+#: src/fs/gnunet-download.c:251
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253 src/fs/gnunet-search.c:288
+#: src/fs/gnunet-download.c:254 src/fs/gnunet-search.c:288
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:256
+#: src/fs/gnunet-download.c:257
 msgid "write the file to FILENAME"
 msgstr "escribe el fichero al FICHERO"
 
-#: src/fs/gnunet-download.c:260
+#: src/fs/gnunet-download.c:261
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:264
+#: src/fs/gnunet-download.c:265
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267
+#: src/fs/gnunet-download.c:268
 msgid "download a GNUnet directory recursively"
 msgstr "descarga un directorio de GNUnet recursivamente"
 
-#: src/fs/gnunet-download.c:277
+#: src/fs/gnunet-download.c:278
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2400,35 +2450,30 @@ msgstr ""
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:167
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/fs/gnunet-pseudonym.c:165
-#, fuzzy, c-format
-msgid "Namespace `%s' unknown.\n"
-msgstr "El espacio '%s' ha sido valorado con un %d.\n"
-
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
+#: src/fs/gnunet-pseudonym.c:250 src/fs/gnunet-pseudonym.c:257
+#: src/fs/gnunet-pseudonym.c:259
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: la opción '%s' es ambigua\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-pseudonym.c:279 src/fs/gnunet-publish.c:678
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "seleccione el NIVEL deseado de anonimato al enviar"
 
-#: src/fs/gnunet-pseudonym.c:272
+#: src/fs/gnunet-pseudonym.c:282
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:275
+#: src/fs/gnunet-pseudonym.c:285
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:278
+#: src/fs/gnunet-pseudonym.c:288
 #, fuzzy
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
@@ -2437,38 +2482,38 @@ msgstr ""
 "añade una clave adicional para todos los ficheros y directorios (esta opción "
 "puede ser especificada varias veces)"
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:697
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "cambia el meta-dato para el TIPO dado al VALOR dado"
 
-#: src/fs/gnunet-pseudonym.c:285
+#: src/fs/gnunet-pseudonym.c:295
 #, fuzzy
 msgid "print names of local namespaces"
 msgstr "cambia la valoración de un espacio"
 
-#: src/fs/gnunet-pseudonym.c:288
+#: src/fs/gnunet-pseudonym.c:298
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:291
+#: src/fs/gnunet-pseudonym.c:301
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-pseudonym.c:304 src/fs/gnunet-publish.c:716
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:297
+#: src/fs/gnunet-pseudonym.c:307
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "cambia la valoración de un espacio"
 
-#: src/fs/gnunet-pseudonym.c:300
+#: src/fs/gnunet-pseudonym.c:310
 #, fuzzy
 msgid "change rating of namespace ID by VALUE"
 msgstr "cambia la valoración de un espacio"
 
-#: src/fs/gnunet-pseudonym.c:308
+#: src/fs/gnunet-pseudonym.c:318
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2497,116 +2542,116 @@ msgstr "Yo soy el par '%s'.\n"
 msgid "Cleanup after abort complete.\n"
 msgstr "'%s' comienzo completo.\n"
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:305
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Actualizando los datos del módulo '%s'\n"
 
-#: src/fs/gnunet-publish.c:301
+#: src/fs/gnunet-publish.c:307
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Claves para los ficheros '%s':\n"
 
-#: src/fs/gnunet-publish.c:352
+#: src/fs/gnunet-publish.c:358
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:433
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Imposible ejecutar '%s': %s\n"
 
-#: src/fs/gnunet-publish.c:454
+#: src/fs/gnunet-publish.c:460
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/fs/gnunet-publish.c:485
+#: src/fs/gnunet-publish.c:491
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/gnunet-publish.c:487
+#: src/fs/gnunet-publish.c:493
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:498
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-publish.c:503
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "Cierre completado.\n"
 
-#: src/fs/gnunet-publish.c:501
+#: src/fs/gnunet-publish.c:507
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Actualizando los datos del módulo '%s'\n"
 
-#: src/fs/gnunet-publish.c:505
+#: src/fs/gnunet-publish.c:511
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:518
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tError leyendo el directorio.\n"
 
-#: src/fs/gnunet-publish.c:546
+#: src/fs/gnunet-publish.c:552
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:559
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
 
-#: src/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:565
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:573 src/vpn/gnunet-vpn.c:214
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
 
-#: src/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
-#: src/transport/gnunet-transport.c:530
+#: src/fs/gnunet-publish.c:583 src/fs/gnunet-publish.c:590
+#: src/transport/gnunet-transport.c:560
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
 
-#: src/fs/gnunet-publish.c:606
+#: src/fs/gnunet-publish.c:612
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-publish.c:639
+#: src/fs/gnunet-publish.c:645
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-publish.c:651
+#: src/fs/gnunet-publish.c:657
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:676
+#: src/fs/gnunet-publish.c:682
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:685
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-publish.c:689
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2614,7 +2659,7 @@ msgstr ""
 "imprime la lista de las claves extraidas que podrían ser usadas, pero no "
 "realiza la subida"
 
-#: src/fs/gnunet-publish.c:687
+#: src/fs/gnunet-publish.c:693
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2622,7 +2667,7 @@ msgstr ""
 "añade una clave adicional para el fichero del nivel más alto o el directorio "
 "(esta opción puede ser especificada varias veces)"
 
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:700
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2630,7 +2675,7 @@ msgstr ""
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "encriptada en la base de datos de GNUnet)"
 
-#: src/fs/gnunet-publish.c:699
+#: src/fs/gnunet-publish.c:705
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2638,36 +2683,36 @@ msgstr ""
 "especifica la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:703
+#: src/fs/gnunet-publish.c:709
 msgid "specify the priority of the content"
 msgstr "especifica la prioridad del contenido"
 
-#: src/fs/gnunet-publish.c:707
+#: src/fs/gnunet-publish.c:713
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publica los ficheros bajo el pseudónimo NOMBRE (coloca el fichero en el "
 "espacio)"
 
-#: src/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:719
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:717
+#: src/fs/gnunet-publish.c:723
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "cambia la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:721
+#: src/fs/gnunet-publish.c:727
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:736
+#: src/fs/gnunet-publish.c:742
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2716,24 +2761,12 @@ msgid "# Loopback routes suppressed"
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1290
-#: src/topology/gnunet-daemon-topology.c:1297
+#: src/topology/gnunet-daemon-topology.c:1330
+#: src/topology/gnunet-daemon-topology.c:1337
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
-#: src/topology/gnunet-daemon-topology.c:654
-#: src/topology/gnunet-daemon-topology.c:756
-#: src/transport/gnunet-service-transport_neighbours.c:960
-#: src/transport/gnunet-service-transport_neighbours.c:1289
-#: src/transport/gnunet-service-transport_neighbours.c:1841
-#: src/transport/gnunet-service-transport_neighbours.c:2499
-#: src/transport/gnunet-service-transport_neighbours.c:2566
-#, fuzzy
-msgid "# peers connected"
-msgstr "# de pares conectados"
-
 #: src/fs/gnunet-service-fs_cp.c:696
 #, fuzzy
 msgid "# migration stop messages received"
@@ -3084,15 +3117,132 @@ msgstr ""
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gns_api.c:221
+#: src/gns/gnunet-gns.c:191
 #, fuzzy
-msgid "Failed to connect to the GNS service!\n"
+msgid "Failed to connect to GNS\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/gns/gnunet-gns-lookup.c:210
-msgid "Issue a request to the GNUnet Naming System, prints results."
+#: src/gns/gnunet-gns.c:232
+msgid "try to shorten a given GNS name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:235
+msgid "Lookup a record using GNS (NOT IMPLEMENTED)"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:238
+msgid "Get the authority of a particular name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:241
+#, fuzzy
+msgid "Specify the type of the record lookup"
+msgstr "especifica la prioridad del contenido"
+
+#: src/gns/gnunet-gns.c:244
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:255
+msgid "GNUnet GNS access tool"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:280
+#, fuzzy, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "Comando inesperado '%s'.   Abortando.\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:333
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "Imposible pasar el fichero de configuración '%s'.\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:377
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:439
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:498
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:514
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:725 src/gns/gnunet-gns-fcfsd.c:737
+#, fuzzy, c-format
+msgid "Option `%s' not specified in configuration section `%s'\n"
+msgstr "¡Ninguna aplicación definida en la configuración!\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:747 src/namestore/gnunet-namestore.c:299
+#, fuzzy
+msgid "Failed to read or create private zone key\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:757 src/namestore/gnunet-namestore.c:310
+#, fuzzy
+msgid "Failed to connect to namestore\n"
+msgstr "Fallo al conectarse a gnunetd"
+
+#: src/gns/gnunet-gns-fcfsd.c:773 src/gns/gnunet-gns-proxy.c:525
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "Falló al comenzar la recolección.\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:804
+msgid "GNUnet GNS first come first serve registration service"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:800
+msgid "listen on specified port"
 msgstr ""
 
+#: src/gns/gnunet-gns-proxy.c:811
+msgid "GNUnet GNS proxy"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:122
+msgid "Call with name of HELLO file to modify.\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:128
+#, fuzzy, c-format
+msgid "Error accessing file `%s': %s\n"
+msgstr "Error creando usuario"
+
+#: src/hello/gnunet-hello.c:136
+#, c-format
+msgid "File `%s' is too big to be a HELLO\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:143
+#, c-format
+msgid "File `%s' is too small to be a HELLO\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:153 src/hello/gnunet-hello.c:181
+#, fuzzy, c-format
+msgid "Error opening file `%s': %s\n"
+msgstr "Error creando usuario"
+
+#: src/hello/gnunet-hello.c:169
+#, fuzzy, c-format
+msgid "Did not find well-formed HELLO in file `%s'\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
+
+#: src/hello/gnunet-hello.c:193
+#, fuzzy, c-format
+msgid "Error writing HELLO to file `%s': %s\n"
+msgstr "Error creando usuario"
+
 #: src/hostlist/gnunet-daemon-hostlist.c:264
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
@@ -3121,195 +3271,197 @@ msgstr ""
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:286
+#: src/hostlist/hostlist-client.c:289
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:340
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# saludos descargados vía HTTP"
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#: src/hostlist/hostlist-client.c:313 src/hostlist/hostlist-client.c:343
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
 
-#: src/hostlist/hostlist-client.c:330
+#: src/hostlist/hostlist-client.c:331
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# saludos descargados vía HTTP"
 
-#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
+#: src/hostlist/hostlist-client.c:375 src/hostlist/hostlist-client.c:396
 #, c-format
 msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
-#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
-#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
-#: src/transport/plugin_transport_http_client.c:108
-#: src/transport/plugin_transport_http_client.c:123
+#: src/hostlist/hostlist-client.c:473 src/hostlist/hostlist-client.c:683
+#: src/hostlist/hostlist-client.c:689 src/hostlist/hostlist-client.c:741
+#: src/hostlist/hostlist-client.c:750 src/hostlist/hostlist-client.c:871
+#: src/hostlist/hostlist-client.c:961 src/hostlist/hostlist-client.c:966
+#: src/transport/plugin_transport_http_client.c:110
+#: src/transport/plugin_transport_http_client.c:125
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
+#: src/hostlist/hostlist-client.c:593 src/hostlist/hostlist-client.c:1331
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/hostlist/hostlist-client.c:623
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:663
+#: src/hostlist/hostlist-client.c:664
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:805
+#: src/hostlist/hostlist-client.c:802
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:822
+#: src/hostlist/hostlist-client.c:816
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/hostlist-client.c:836
 #, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "'%s' falló en %s: %d con error: '%s'.\n"
+msgid "Download of hostlist from `%s' failed: `%s'\n"
+msgstr ""
+"Subida de '%s' completada, la velocidad media de subida actual es %8.3f "
+"kbps.\n"
 
-#: src/hostlist/hostlist-client.c:848
+#: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Subida de '%s' completada, la velocidad media de subida actual es %8.3f "
 "kbps.\n"
 
-#: src/hostlist/hostlist-client.c:856
+#: src/hostlist/hostlist-client.c:850
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:909
+#: src/hostlist/hostlist-client.c:903
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
+#: src/hostlist/hostlist-client.c:911
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1505
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1054
+#: src/hostlist/hostlist-client.c:1046
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
+#: src/hostlist/hostlist-client.c:1084
 msgid "Scheduled saving of hostlists\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1096
+#: src/hostlist/hostlist-client.c:1088
 #, c-format
 msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
+#: src/hostlist/hostlist-client.c:1111 src/hostlist/hostlist-client.c:1127
 #, fuzzy
 msgid "# active connections"
 msgstr "Configuración de GNUnet"
 
-#: src/hostlist/hostlist-client.c:1253
+#: src/hostlist/hostlist-client.c:1242
 #, c-format
 msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1284
+#: src/hostlist/hostlist-client.c:1273
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/hostlist/hostlist-client.c:1279
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1283
 #, c-format
 msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1305
+#: src/hostlist/hostlist-client.c:1294
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/hostlist/hostlist-client.c:1338
+#: src/hostlist/hostlist-client.c:1327
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1340
+#: src/hostlist/hostlist-client.c:1329
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1362
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1387
+#: src/hostlist/hostlist-client.c:1376
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/hostlist/hostlist-client.c:1392
+#: src/hostlist/hostlist-client.c:1381
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
 #, fuzzy, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Error creando usuario"
 
-#: src/hostlist/hostlist-client.c:1428
+#: src/hostlist/hostlist-client.c:1417
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1480
+#: src/hostlist/hostlist-client.c:1470
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/hostlist-client.c:1473
 #, c-format
 msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1482
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1504
+#: src/hostlist/hostlist-client.c:1494
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1508
+#: src/hostlist/hostlist-client.c:1498
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
@@ -3323,8 +3475,10 @@ msgstr "# bytes en la base de datos"
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:184
-#: src/topology/gnunet-daemon-topology.c:875
+#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:425
+#: src/peerinfo-tool/gnunet-peerinfo.c:403
+#: src/peerinfo-tool/gnunet-peerinfo.c:519
+#: src/topology/gnunet-daemon-topology.c:927
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Imprime información de los pares de GNUnet."
@@ -3333,189 +3487,406 @@ msgstr "Imprime información de los pares de GNUnet."
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:221
+#: src/hostlist/hostlist-server.c:219
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:269
+#: src/hostlist/hostlist-server.c:263
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:272
+#: src/hostlist/hostlist-server.c:266
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/hostlist/hostlist-server.c:280
+#: src/hostlist/hostlist-server.c:273
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:287
+#: src/hostlist/hostlist-server.c:279
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:291
+#: src/hostlist/hostlist-server.c:283
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/hostlist-server.c:291
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:294
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/hostlist/hostlist-server.c:306
+#: src/hostlist/hostlist-server.c:298
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:307
+#: src/hostlist/hostlist-server.c:299
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/hostlist/hostlist-server.c:350
+#: src/hostlist/hostlist-server.c:341
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Anuncios a extraños mandados"
 
-#: src/hostlist/hostlist-server.c:397
+#: src/hostlist/hostlist-server.c:388
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:565
+#: src/hostlist/hostlist-server.c:561
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Argumentos no válidos. Saliendo.\n"
 
-#: src/hostlist/hostlist-server.c:574
+#: src/hostlist/hostlist-server.c:570
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:588
+#: src/hostlist/hostlist-server.c:584
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:626
+#: src/hostlist/hostlist-server.c:624
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgstr "'%s' no esta disponible."
+
+#: src/hostlist/hostlist-server.c:666
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4595
+#: src/integration-tests/connection_watchdog.c:997
+#, fuzzy, c-format
+msgid "Transport plugin: `%s' port %llu\n"
+msgstr "Probando transporte(s) %s\n"
+
+#: src/integration-tests/connection_watchdog.c:1030
+#, fuzzy, c-format
+msgid "Found %u transport plugins: `%s'\n"
+msgstr "Probando transporte(s) %s\n"
+
+#: src/integration-tests/connection_watchdog.c:1089
+msgid "Send ping messages to test connectivity (default == NO)"
+msgstr ""
+
+#: src/integration-tests/connection_watchdog.c:1095
+#: src/template/gnunet-template.c:68
+#, fuzzy
+msgid "help text"
+msgstr "texto de ayuda para -t"
+
+#: src/mesh/gnunet-service-mesh.c:4590
 #, fuzzy
 msgid "Wrong CORE service\n"
 msgstr "Deteniendo cron\n"
 
-#: src/mesh/gnunet-service-mesh.c:4789
+#: src/mesh/gnunet-service-mesh.c:4784
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "Configuración de GNUnet"
 
-#: src/mesh/gnunet-service-mesh.c:4798
+#: src/mesh/gnunet-service-mesh.c:4793
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/namestore/namestore_api.c:272 src/namestore/namestore_api.c:313
+#: src/mysql/mysql.c:174
+#, c-format
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr "Intentando usar el fichero '%s' para la configuración de MySQL.\n"
+
+#: src/mysql/mysql.c:181
+#, fuzzy, c-format
+msgid "Could not access file `%s': %s\n"
+msgstr "Imposible ejecutar '%s': %s\n"
+
+#: src/namestore/gnunet-namestore.c:157
+#, fuzzy, c-format
+msgid "Adding record failed: %s\n"
+msgstr ""
+"\n"
+"Error subiendo el fichero %s\n"
+
+#: src/namestore/gnunet-namestore.c:183
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr ""
+"\n"
+"Error subiendo el fichero %s\n"
+
+#: src/namestore/gnunet-namestore.c:239
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:276
+#, c-format
+msgid "Option `%s' not given, but I need a zone key file!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:281
+#, fuzzy, c-format
+msgid "Using default zone file `%s'\n"
+msgstr "Iniciada colección '%s'.\n"
+
+#: src/namestore/gnunet-namestore.c:291
+#, c-format
+msgid "No options given\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:321
+#, fuzzy, c-format
+msgid "Unsupported type `%s'\n"
+msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
+
+#: src/namestore/gnunet-namestore.c:328 src/namestore/gnunet-namestore.c:350
+#: src/namestore/gnunet-namestore.c:374 src/namestore/gnunet-namestore.c:384
+#: src/namestore/gnunet-namestore.c:409
+#, fuzzy, c-format
+msgid "Missing option `%s' for operation `%s'\n"
+msgstr "Fichero de configuración '%s' creado.\n"
+
+#: src/namestore/gnunet-namestore.c:329 src/namestore/gnunet-namestore.c:351
+msgid "add/del"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:341
+#, fuzzy, c-format
+msgid "Value `%s' invalid for record type `%s'\n"
+msgstr "%s: valor del símbolo '%s' no válido para %s\n"
+
+#: src/namestore/gnunet-namestore.c:366
+#, fuzzy, c-format
+msgid "Invalid time format `%s'\n"
+msgstr "Argumento no válido: '%s'\n"
+
+#: src/namestore/gnunet-namestore.c:375 src/namestore/gnunet-namestore.c:385
+msgid "add"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:410
+msgid "del"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:462
+msgid "add record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:465
+msgid "delete record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:468
+msgid "display records"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:471
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:474
+msgid "name of the record to add/delete/display"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:477
+msgid "type of the record to add/delete/display"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:480
+msgid "value of the record to add/delete"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:483
+msgid "create or list public record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:486
+msgid "create or list non-authority record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:489
+msgid "filename with the zone key"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:500
+#, fuzzy
+msgid "GNUnet zone manipulation tool"
+msgstr "Configuración de GNUnet"
+
+#: src/namestore/gnunet-service-namestore.c:143
+#, c-format
+msgid "File zone `%s' but corrupt content already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:154
+#, c-format
+msgid "File zone `%s' containing this key already exists\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:160
+#, c-format
+msgid ""
+"File zone `%s' but different zone key already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:198
+#, fuzzy, c-format
+msgid "Stored zonekey for zone `%s' in file `%s'\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/namestore/gnunet-service-namestore.c:1909
+#, fuzzy
+msgid "No directory to load zonefiles specified in configuration\n"
+msgstr "¡Ninguna aplicación definida en la configuración!\n"
+
+#: src/namestore/gnunet-service-namestore.c:1918
+#, c-format
+msgid "Creating directory `%s' for zone files failed!\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:315 src/namestore/namestore_api.c:353
 msgid "Namestore added record successfully"
 msgstr ""
 
-#: src/namestore/namestore_api.c:281 src/namestore/namestore_api.c:322
+#: src/namestore/namestore_api.c:323
 msgid "Namestore failed to add record"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:289
+#: src/namestore/namestore_api.c:361
+msgid "Namestore record already existed"
+msgstr ""
+
+#: src/namestore/namestore_api.c:368
+msgid "Namestore failed to add record\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:401
+#, fuzzy
+msgid "Namestore removed record successfully"
+msgstr "Servicio de GNUnet instalado satisfactoriamente.\n"
+
+#: src/namestore/namestore_api.c:408
+msgid "No records for entry"
+msgstr ""
+
+#: src/namestore/namestore_api.c:415
+#, fuzzy
+msgid "Could not find record to remove"
+msgstr "Imposible conectar con gnunetd.\n"
+
+#: src/namestore/namestore_api.c:422
+#, fuzzy
+msgid "Failed to create new signature"
+msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
+
+#: src/namestore/namestore_api.c:429
+#, fuzzy
+msgid "Failed to put new set of records in database"
+msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
+
+#: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:328
+#: src/nat/gnunet-nat-server.c:318
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat.c:803
+#: src/nat/nat.c:799
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:852
+#: src/nat/nat.c:844
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/nat/nat.c:1121
+#: src/nat/nat.c:1111
 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "Imposible guardar la configuración"
 
-#: src/nat/nat.c:1187 src/nat/nat.c:1197
+#: src/nat/nat.c:1177 src/nat/nat.c:1187
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1329
+#: src/nat/nat.c:1321
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1341
+#: src/nat/nat.c:1332
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat_test.c:348
+#: src/nat/nat_test.c:341
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/nat/nat_test.c:418
+#: src/nat/nat_test.c:411
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:926
+#: src/nse/gnunet-nse-profiler.c:928
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Imposible acceder al servicio"
 
-#: src/nse/gnunet-service-nse.c:936
+#: src/nse/gnunet-service-nse.c:925
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
-#: src/nse/gnunet-service-nse.c:1431
+#: src/nse/gnunet-service-nse.c:1381 src/nse/gnunet-service-nse.c:1400
+#: src/nse/gnunet-service-nse.c:1421
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1398
+#: src/nse/gnunet-service-nse.c:1388
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Argumentos no válidos. Saliendo.\n"
 
-#: src/nse/gnunet-service-nse.c:1419
+#: src/nse/gnunet-service-nse.c:1409
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:133
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Transporte(s) disponible(s): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:195
+#: src/peerinfo/gnunet-service-peerinfo.c:203
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "Falló al actualizar los datos del módulo '%s'\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:229
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
+#: src/peerinfo/gnunet-service-peerinfo.c:254
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -3523,68 +3894,164 @@ msgstr ""
 "El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
 "Eliminando.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:305
+#: src/peerinfo/gnunet-service-peerinfo.c:353
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
 
-#: src/peerinfo/peerinfo_api.c:279
-#, fuzzy, c-format
-msgid "Failed to transmit message to `%s' service.\n"
-msgstr "Falló al inicializar el servicio '%s'.\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:710
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:238
+msgid "aborted due to explicit disconnect request"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:358
+#, fuzzy
+msgid "failed to transmit request (service down?)"
+msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
 
-#: src/peerinfo/peerinfo_api.c:435
+#: src/peerinfo/peerinfo_api.c:505
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
 
-#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
+#: src/peerinfo/peerinfo_api.c:531 src/peerinfo/peerinfo_api.c:550
+#: src/peerinfo/peerinfo_api.c:565 src/peerinfo/peerinfo_api.c:576
+#: src/peerinfo/peerinfo_api.c:587
 #, fuzzy
-msgid "Received invalid message from `PEERINFO' service.\n"
+msgid "Received invalid message from `PEERINFO' service."
 msgstr "Recibido mensaje UDP6 inválido de %s:%d, omitiendo.\n"
 
-#: src/peerinfo/peerinfo_api.c:523
+#: src/peerinfo/peerinfo_api.c:663
 #, fuzzy
-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
+msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/peerinfo/peerinfo_api.c:557
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api_notify.c:258
+#: src/peerinfo/peerinfo_api_notify.c:256
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/peerinfo-tool/gnunet-peerinfo.c:581
+#, fuzzy
+msgid "Failed to parse HELLO message: missing expiration time\n"
+msgstr "Imposible guardar la configuración"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:589
+#, fuzzy
+msgid "Failed to parse HELLO message: invalid expiration time\n"
+msgstr "Imposible guardar la configuración"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:598
+#, fuzzy
+msgid "Failed to parse HELLO message: malformed\n"
+msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:608
+#, fuzzy
+msgid "Failed to parse HELLO message: missing transport plugin\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:625
+#, c-format
+msgid "Plugin `%s' not found\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:634
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:653
+#, fuzzy, c-format
+msgid "Failed to parse `%s' as an address for plugin `%s'\n"
+msgstr "Fallo al conectar a gnunetd.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:685
+#, fuzzy, c-format
+msgid "Failure adding HELLO: %s\n"
+msgstr "Fallo en %s:%d.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:833
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#: src/peerinfo-tool/gnunet-peerinfo.c:840
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Analizando saludo de '%s' se produjo un fallo.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
+#: src/peerinfo-tool/gnunet-peerinfo.c:875
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Argumento no válido: '%s'\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:899
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
+#: src/peerinfo-tool/gnunet-peerinfo.c:936
+msgid "don't resolve host names"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:939
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:942
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:945
+msgid "list all known peers"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:948
+msgid "also output HELLO uri(s)"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:951
+msgid "add given HELLO uri to the database"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:957
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Imprime información de los pares de GNUnet."
 
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
+#: src/transport/gnunet-service-transport_plugins.c:118
+#, fuzzy, c-format
+msgid "Starting transport plugins `%s'\n"
+msgstr "Probando transporte(s) %s\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
+#: src/transport/gnunet-service-transport_plugins.c:122
+#, fuzzy, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr "Probando transporte(s) %s\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
+#: src/transport/gnunet-service-transport_plugins.c:150
+#, fuzzy, c-format
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
+
+#: src/postgres/postgres.c:59
+#, fuzzy, c-format
+msgid "`%s:%s' failed at %s:%d with error: %s"
+msgstr "'%s' falló en %s: %d con el error: %s\n"
+
+#: src/postgres/postgres.c:148
+#, fuzzy, c-format
+msgid "Unable to initialize Postgres: %s"
+msgstr "Imposible inicializar SQLite.\n"
+
 #: src/pt/gnunet-daemon-pt.c:264
 #, fuzzy
 msgid "Failed to pack DNS request.  Dropping.\n"
@@ -3652,50 +4119,65 @@ msgstr "Fallo al conectar a gnunetd.\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:209
+#: src/statistics/gnunet-service-statistics.c:271
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Descarga los ficheros de GNUnet"
 
-#: src/statistics/gnunet-service-statistics.c:267
+#: src/statistics/gnunet-service-statistics.c:330
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Descarga los ficheros de GNUnet"
 
-#: src/statistics/gnunet-statistics.c:98
+#: src/statistics/gnunet-statistics.c:122
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/statistics/gnunet-statistics.c:164
+#: src/statistics/gnunet-statistics.c:199
+#, c-format
+msgid "No subsystem or name given\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:207
+#, fuzzy, c-format
+msgid "Failed to initialize watch routine\n"
+msgstr "Imposible inicializar SQLite.\n"
+
+#: src/statistics/gnunet-statistics.c:227
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:167
+#: src/statistics/gnunet-statistics.c:230
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:170
+#: src/statistics/gnunet-statistics.c:233
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:173
+#: src/statistics/gnunet-statistics.c:236
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:180
+#: src/statistics/gnunet-statistics.c:239
+msgid "watch value continously"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:246
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
-#: src/statistics/statistics_api.c:390
+#: src/statistics/statistics_api.c:456
 #, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "Fallo al conectar a gnunetd.\n"
+msgid "Could not save some persistent statistics\n"
+msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/template/gnunet-template.c:68
-#, fuzzy
-msgid "help text"
-msgstr "texto de ayuda para -t"
+#: src/statistics/statistics_api.c:999
+msgid ""
+"Failed to receive acknowledgement from statistics service, some statistics "
+"might have been lost!\n"
+msgstr ""
 
 #: src/testing/gnunet-testing.c:157
 #, fuzzy
@@ -3744,605 +4226,443 @@ msgstr "Configuración de GNUnet"
 msgid "Could not access hostkey.\n"
 msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/testing/testing.c:204
+#: src/testing/testing.c:200
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:218 src/testing/testing.c:808
+#: src/testing/testing.c:214 src/testing/testing.c:798
 #, fuzzy
 msgid "`scp' did not complete cleanly.\n"
 msgstr "'%s' no esta conectado a ningún par.\n"
 
-#: src/testing/testing.c:239
+#: src/testing/testing.c:237
 #, fuzzy
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/testing/testing.c:240
+#: src/testing/testing.c:238
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/testing/testing.c:292
+#: src/testing/testing.c:286
 #, fuzzy, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/testing/testing.c:299
+#: src/testing/testing.c:293
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/testing/testing.c:300 src/testing/testing.c:488
+#: src/testing/testing.c:294 src/testing/testing.c:471
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/testing/testing.c:360
+#: src/testing/testing.c:354
 #, fuzzy, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr "Se produjo un error leyendo información de gnunetd.\n"
 
-#: src/testing/testing.c:364
+#: src/testing/testing.c:358
 #, fuzzy
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr "Se produjo un error leyendo información de gnunetd.\n"
 
-#: src/testing/testing.c:374
+#: src/testing/testing.c:368
 #, fuzzy
 msgid "Failed to get hostkey!\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/testing/testing.c:406
+#: src/testing/testing.c:400
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:480
+#: src/testing/testing.c:463
 #, fuzzy, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/testing/testing.c:487
+#: src/testing/testing.c:470
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing.c:509 src/testing/testing.c:612
+#: src/testing/testing.c:493 src/testing/testing.c:600
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:510 src/testing/testing.c:613
-#: src/testing/testing.c:633
+#: src/testing/testing.c:494 src/testing/testing.c:601
+#: src/testing/testing.c:621
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:582
+#: src/testing/testing.c:570
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:632
+#: src/testing/testing.c:620
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/testing/testing.c:653 src/testing/testing.c:685
+#: src/testing/testing.c:643 src/testing/testing.c:675
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:668 src/testing/testing.c:723
+#: src/testing/testing.c:658 src/testing/testing.c:713
 #, fuzzy
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr "'%s' no esta conectado a ningún par.\n"
 
-#: src/testing/testing.c:796
+#: src/testing/testing.c:786
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:966
+#: src/testing/testing.c:948
 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/testing/testing.c:1237 src/testing/testing_group.c:6278
+#: src/testing/testing.c:1207 src/testing/testing_group.c:6154
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/testing/testing.c:1322 src/testing/testing.c:1397
+#: src/testing/testing.c:1292 src/testing/testing.c:1359
 #, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "Permiso denegado para '%s' en %s:%d.\n"
 
-#: src/testing/testing.c:1480
+#: src/testing/testing.c:1448
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/testing/testing.c:1610
+#: src/testing/testing.c:1601
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1618
+#: src/testing/testing.c:1609
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "Imposible guardar la configuración"
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1636
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
 
-#: src/testing/testing.c:1650
+#: src/testing/testing.c:1639
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "Imposible guardar la configuración"
 
-#: src/testing/testing.c:1805
+#: src/testing/testing.c:1794
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing.c:1933
+#: src/testing/testing.c:1922
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing.c:2156
+#: src/testing/testing.c:2145
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1910 src/testing/testing_group.c:1922
-#: src/testing/testing_group.c:2023 src/testing/testing_group.c:2082
-#: src/testing/testing_group.c:2171 src/testing/testing_group.c:2191
-#: src/testing/testing_group.c:2328 src/testing/testing_peergroup.c:940
+#: src/testing/testing_group.c:1895 src/testing/testing_group.c:1907
+#: src/testing/testing_group.c:2008 src/testing/testing_group.c:2065
+#: src/testing/testing_group.c:2152 src/testing/testing_group.c:2172
+#: src/testing/testing_group.c:2302 src/testing/testing_peergroup.c:950
 #, fuzzy, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr ""
 "El fichero de configuración debe especificar el directorio para almacenar "
 "los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/testing/testing_group.c:1932
-#, fuzzy, c-format
-msgid "Target is %d connections per peer."
-msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
-
-#: src/testing/testing_group.c:2179
+#: src/testing/testing_group.c:2160
 #, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2209 src/testing/testing_group.c:2402
-#, c-format
-msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2246
-#, c-format
-msgid "natural log of %d is %d, will run %d iterations\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2249
-#, c-format
-msgid "Total connections added thus far: %u!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2290
-#, c-format
-msgid "Total connections added for small world: %d!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2342
-#, c-format
-msgid "rand is %f probability is %f\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
+#: src/testing/testing_group.c:2877 src/testing/testing_group.c:3063
 #, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
 "file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3020
-msgid "Finished copying all friend files!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3133
-#, fuzzy, c-format
-msgid "Copying file with command cp %s %s\n"
-msgstr "'%s' falló con el código de error %s: %s"
-
-#: src/testing/testing_group.c:3156
-#, fuzzy, c-format
-msgid "Copying file with command scp %s %s\n"
-msgstr "'%s' falló con el código de error %s: %s"
-
-#: src/testing/testing_group.c:3173
-#, c-format
-msgid "Checking copy status of file %d\n"
+#: src/testing/testing_group.c:3957
+msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3191
-#, c-format
-msgid "File %d copied\n"
+#: src/testing/testing_group.c:5226
+msgid "Unknown topology specification, can't connect peers!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3206
+#: src/testing/testing_group.c:5944 src/transport/transport-testing.c:636
 #, fuzzy
-msgid "Finished copying all blacklist files!\n"
+msgid "Could not read hostkeys file!\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
-#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
-msgid "Delaying connect, we have too many outstanding connections!\n"
+#: src/testing/testing_group.c:6011
+#, fuzzy, c-format
+msgid "Could not create configuration for peer number %u on `%s'!\n"
+msgstr "Imposible acceder a la información del espacio.\n"
+
+#: src/testing/testing_new.c:169
+msgid "tmppath cannot be NULL\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
-#: src/testing/testing_group.c:5035
+#: src/testing/testing_new.c:356
 #, c-format
-msgid "Creating connection, outstanding_connections is %d\n"
+msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3608
+#: src/testing/testing_new.c:365
 #, fuzzy, c-format
-msgid "Offering HELLO of peer %s to peer %s\n"
-msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
+msgid "Could not open hostkeys file: %s\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/testing/testing_group.c:3734
+#: src/testing/testing_new.c:380
 #, c-format
-msgid "Creating connection, outstanding_connections is %d (max %d)\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3988
-msgid "Creating clique topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3993
-msgid "Creating small world (ring) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3998
-msgid "Creating small world (2d-torus) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4002
-msgid "Creating ring topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4006
-msgid "Creating 2d torus topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4010
-msgid "Creating Erdos-Renyi topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4014
-msgid "Creating InterNAT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4018
-msgid "Creating Scale Free topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4023
-msgid "Creating straight line topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4027
-msgid "Creating topology from file!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4043
-msgid "Creating no allowed topology (all peers can connect at core level)\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4058
-msgid "Failed during friend file copying!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4064
-msgid "Friend files created/copied successfully!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4081
-msgid "Blacklisting all but clique topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4087
-msgid "Blacklisting all but small world (ring) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4093
-msgid "Blacklisting all but small world (2d-torus) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4099
-msgid "Blacklisting all but ring topology\n"
+msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4105
-msgid "Blacklisting all but 2d torus topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4111
-msgid "Blacklisting all but Erdos-Renyi topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4117
-msgid "Blacklisting all but InterNAT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4152
-msgid "Blacklisting all but Scale Free topology\n"
-msgstr ""
+#: src/testing/testing_new.c:437
+#, fuzzy, c-format
+msgid "Key number %u does not exist\n"
+msgstr "número de mensajes a usar por iteración"
 
-#: src/testing/testing_group.c:4158
-msgid "Blacklisting all but straight line topology\n"
-msgstr ""
+#: src/testing/testing_new.c:446
+#, fuzzy, c-format
+msgid "Error while decoding key %u\n"
+msgstr "Error descargando: %s\n"
 
-#: src/testing/testing_group.c:4173
+#: src/testing/testing_new.c:680
 #, fuzzy
-msgid "Failed during blacklist file copying!\n"
-msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
-
-#: src/testing/testing_group.c:4179
-msgid "Blacklist files created/copied successfully!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5263
-msgid "Creating clique CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5270
-msgid "Creating small world (ring) CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5277
-msgid "Creating small world (2d-torus) CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5283
-msgid "Creating ring CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5290
-msgid "Creating 2d torus CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5297
-msgid "Creating Erdos-Renyi CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5304
-msgid "Creating InterNAT CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5311
-msgid "Creating Scale Free CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5318
-msgid "Creating straight line CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5324
-msgid "Creating no CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5330
-msgid "Unknown topology specification, can't connect peers!\n"
-msgstr ""
+msgid "Failed to create configuration for peer (not enough free ports?)\n"
+msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/testing/testing_group.c:5340
+#: src/testing/testing_new.c:691
 #, c-format
-msgid "Connecting random subset (%'.2f percent) of possible peers\n"
+msgid ""
+"You attempted to create a testbed with more than %u hosts.  Please "
+"precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5348
-#, c-format
-msgid "Connecting a minimum of %u peers each (if possible)\n"
-msgstr ""
+#: src/testing/testing_new.c:704
+#, fuzzy, c-format
+msgid "Failed to initialize hostkey for peer %u\n"
+msgstr "Imposible inicializar SQLite.\n"
 
-#: src/testing/testing_group.c:5357
-#, c-format
-msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
-msgstr ""
+#: src/testing/testing_new.c:734
+#, fuzzy, c-format
+msgid "Failed to write hostkey file for peer %u: %s\n"
+msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/testing/testing_group.c:5367
-#, c-format
-msgid "Finding additional %u closest peers each (if possible)\n"
-msgstr ""
+#: src/testing/testing_new.c:751
+#, fuzzy, c-format
+msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:650
-#, fuzzy
-msgid "Could not read hostkeys file!\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
+#: src/testing/testing_new.c:791
+#, fuzzy, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing_group.c:6131
+#: src/testing/testing_new.c:959
 #, fuzzy, c-format
-msgid "Could not create configuration for peer number %u on `%s'!\n"
-msgstr "Imposible acceder a la información del espacio.\n"
+msgid "Failed to load configuration from %s\n"
+msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/topology/gnunet-daemon-topology.c:244
+#: src/topology/gnunet-daemon-topology.c:259
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:380
+#: src/topology/gnunet-daemon-topology.c:392
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/topology/gnunet-daemon-topology.c:675
-#: src/topology/gnunet-daemon-topology.c:761
+#: src/topology/gnunet-daemon-topology.c:730
+#: src/topology/gnunet-daemon-topology.c:815
 #, fuzzy
 msgid "# friends connected"
 msgstr "# de pares conectados"
 
-#: src/topology/gnunet-daemon-topology.c:950
+#: src/topology/gnunet-daemon-topology.c:996
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:982
+#: src/topology/gnunet-daemon-topology.c:1026
 #, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:994
+#: src/topology/gnunet-daemon-topology.c:1039
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1000
+#: src/topology/gnunet-daemon-topology.c:1045
 #, fuzzy, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr "El formato del fichero '%s' no es válido.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/topology/gnunet-daemon-topology.c:1054
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1017
+#: src/topology/gnunet-daemon-topology.c:1062
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1037
+#: src/topology/gnunet-daemon-topology.c:1082
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1050
+#: src/topology/gnunet-daemon-topology.c:1095
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1060
+#: src/topology/gnunet-daemon-topology.c:1105
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/topology/gnunet-daemon-topology.c:1066
+#: src/topology/gnunet-daemon-topology.c:1111
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1076
+#: src/topology/gnunet-daemon-topology.c:1121
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/topology/gnunet-daemon-topology.c:1082
+#: src/topology/gnunet-daemon-topology.c:1127
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1089
+#: src/topology/gnunet-daemon-topology.c:1134
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1169
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/topology/gnunet-daemon-topology.c:1183
+#: src/topology/gnunet-daemon-topology.c:1224
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# mensajes salientes omitidos"
 
-#: src/topology/gnunet-daemon-topology.c:1323
+#: src/topology/gnunet-daemon-topology.c:1363
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:247
+#: src/transport/gnunet-service-transport_blacklist.c:246
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:254
+#: src/transport/gnunet-service-transport_blacklist.c:252
 #, c-format
 msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
+#: src/transport/gnunet-service-transport_blacklist.c:263
 #, fuzzy, c-format
 msgid "Failed to read blacklist from `%s'\n"
 msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
+#: src/transport/gnunet-service-transport_blacklist.c:284
+#: src/transport/gnunet-service-transport_blacklist.c:308
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr ""
 "Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
+#: src/transport/gnunet-service-transport_blacklist.c:295
+#: src/transport/gnunet-service-transport_blacklist.c:331
 #, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:350
+#: src/transport/gnunet-service-transport_blacklist.c:345
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 "Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:364
+#: src/transport/gnunet-service-transport_blacklist.c:359
 #, c-format
 msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:523
-#: src/transport/gnunet-service-transport_blacklist.c:764
+#: src/transport/gnunet-service-transport_blacklist.c:514
+#: src/transport/gnunet-service-transport_blacklist.c:747
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:158
+#: src/transport/gnunet-service-transport.c:163
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/gnunet-service-transport.c:572
+#: src/transport/gnunet-service-transport.c:237
+#, fuzzy
+msgid "# bytes total received"
+msgstr "# bytes en la base de datos"
+
+#: src/transport/gnunet-service-transport.c:284
+#, fuzzy
+msgid "# bytes payload received"
+msgstr "# bytes desencriptados"
+
+#: src/transport/gnunet-service-transport.c:582
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:581
+#: src/transport/gnunet-service-transport.c:591
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:353
+#: src/transport/gnunet-service-transport_clients.c:352
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:358
+#: src/transport/gnunet-service-transport_clients.c:357
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/gnunet-service-transport_clients.c:510
+#: src/transport/gnunet-service-transport_clients.c:503
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:628
-#, fuzzy
-msgid "# bytes payload received for other peers"
-msgstr "# bytes recibidos por TCP"
-
-#: src/transport/gnunet-service-transport_clients.c:645
+#: src/transport/gnunet-service-transport_clients.c:631
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:696
+#: src/transport/gnunet-service-transport_clients.c:682
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -4351,616 +4671,562 @@ msgstr "# mensajes PONG encriptados recibidos"
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:482
-msgid "# failed connection attempts due to timeout"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:1032
+#, fuzzy
+msgid "# DISCONNECT messages sent"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:883
+#: src/transport/gnunet-service-transport_neighbours.c:1148
+#: src/transport/gnunet-service-transport_neighbours.c:1482
 #, fuzzy
-msgid "# peers disconnected due to external request"
-msgstr "# Anuncios de los pares recibidos"
+msgid "# bytes in message queue for other peers"
+msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:966
+#: src/transport/gnunet-service-transport_neighbours.c:1153
 #, fuzzy
-msgid "# fast reconnects failed"
-msgstr "# de pares conectados"
+msgid "# messages transmitted to other peers"
+msgstr "# bytes recibidos por TCP"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1022
+#: src/transport/gnunet-service-transport_neighbours.c:1158
 #, fuzzy
-msgid "# peers disconnected due to timeout"
-msgstr "# de pares conectados"
+msgid "# transmission failures for messages to other peers"
+msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1215
+msgid "# messages timed out while in transport queue"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1254
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# claves de la sesión mandadas"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1088
+#: src/transport/gnunet-service-transport_neighbours.c:1278
 #, fuzzy
-msgid "# peers disconnected due to global disconnect"
-msgstr "# Anuncios de los pares recibidos"
+msgid "# KEEPALIVE messages discarded (peer unknown)"
+msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1888
-#: src/transport/gnunet-service-transport_neighbours.c:1909
+#: src/transport/gnunet-service-transport_neighbours.c:1286
 #, fuzzy
-msgid "# messages not sent (no such peer or not connected)"
+msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1925
+#: src/transport/gnunet-service-transport_neighbours.c:1323
 #, fuzzy
-msgid "# bytes in message queue for other peers"
-msgstr "# bytes de mensajes salientes omitidos"
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgstr "# mensajes defragmentados"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1332
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1977
+#: src/transport/gnunet-service-transport_neighbours.c:1388
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2013
+#: src/transport/gnunet-service-transport_neighbours.c:1422
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2031
+#: src/transport/gnunet-service-transport_neighbours.c:1438
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2060
+#: src/transport/gnunet-service-transport_neighbours.c:2544
 #, fuzzy
-msgid "# KEEPALIVE messages discarded (not connected)"
-msgstr "# mensajes defragmentados"
+msgid "# unexpected CONNECT_ACK messages (no peer)"
+msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2113
+#: src/transport/gnunet-service-transport_neighbours.c:2559
+#: src/transport/gnunet-service-transport_neighbours.c:2585
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
-msgstr "# mensajes defragmentados"
+msgid "# unexpected CONNECT_ACK messages (not ready)"
+msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2121
+#: src/transport/gnunet-service-transport_neighbours.c:2598
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
-msgstr "# mensajes defragmentados"
+msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
+msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2187
+#: src/transport/gnunet-service-transport_neighbours.c:2627
+#, fuzzy
+msgid "# unexpected CONNECT_ACK messages (disconnecting)"
+msgstr "envia COUNT mensajes"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2807
+#, fuzzy
+msgid "# unexpected SESSION ACK messages"
+msgstr "# de pares conectados"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2856
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2205
+#: src/transport/gnunet-service-transport_neighbours.c:2870
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2323
+#: src/transport/gnunet-service-transport_neighbours.c:2901
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2336
+#: src/transport/gnunet-service-transport_neighbours.c:2912
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2411
-#, fuzzy
-msgid "# unexpected CONNECT_ACK messages (no peer)"
-msgstr "envia COUNT mensajes"
-
-#: src/transport/gnunet-service-transport_neighbours.c:2453
-#, fuzzy
-msgid "# unexpected CONNECT_ACK messages"
-msgstr "envia COUNT mensajes"
+#: src/transport/gnunet-service-transport_neighbours.c:2943
+msgid "# other peer asked to disconnect from us"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2544
+#: src/transport/gnunet-service-transport_neighbours.c:3020
 #, fuzzy
-msgid "# unexpected ACK messages"
-msgstr "# de pares conectados"
+msgid "# disconnected from peer upon explicit request"
+msgstr "# Anuncios de los pares recibidos"
 
 #: src/transport/gnunet-service-transport_plugins.c:111
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:118
-#, fuzzy, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr "Probando transporte(s) %s\n"
-
-#: src/transport/gnunet-service-transport_plugins.c:122
-#, fuzzy, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr "Probando transporte(s) %s\n"
-
-#: src/transport/gnunet-service-transport_plugins.c:150
-#, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
-
-#: src/transport/gnunet-service-transport_validation.c:410
+#: src/transport/gnunet-service-transport_validation.c:414
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:459
+#: src/transport/gnunet-service-transport_validation.c:463
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:508
+#: src/transport/gnunet-service-transport_validation.c:512
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/transport/gnunet-service-transport_validation.c:566
+#: src/transport/gnunet-service-transport_validation.c:570
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:798
+#: src/transport/gnunet-service-transport_validation.c:805
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/gnunet-service-transport_validation.c:833
+#: src/transport/gnunet-service-transport_validation.c:840
 #, c-format
 msgid ""
 "Not confirming PING with address `%s' since I cannot confirm having this "
 "address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:919
+#: src/transport/gnunet-service-transport_validation.c:924
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:928
+#: src/transport/gnunet-service-transport_validation.c:933
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1050
+#: src/transport/gnunet-service-transport_validation.c:1055
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1080
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1134
+#: src/transport/gnunet-service-transport_validation.c:1136
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Imposible obtener la dirección del par '%s'.\n"
 
-#: src/transport/gnunet-transport.c:256
+#: src/transport/gnunet-transport.c:260
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:269
+#: src/transport/gnunet-transport.c:273
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:319
+#: src/transport/gnunet-transport.c:323
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:326
+#: src/transport/gnunet-transport.c:330
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:359
+#: src/transport/gnunet-transport.c:363
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:379
+#: src/transport/gnunet-transport.c:383
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "'%s' conectado a '%s'.\n"
 
-#: src/transport/gnunet-transport.c:410
+#: src/transport/gnunet-transport.c:414
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "'%s' conectado a '%s'.\n"
 
-#: src/transport/gnunet-transport.c:439
+#: src/transport/gnunet-transport.c:443
 #, fuzzy, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "GAP recibido contenido no válido de '%s'\n"
 
-#: src/transport/gnunet-transport.c:453
+#: src/transport/gnunet-transport.c:466
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/transport/gnunet-transport.c:483
+#: src/transport/gnunet-transport.c:473
+#, c-format
+msgid "Peer `%s': %s <unable to resolve address>\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:501
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# de pares conectados"
 
-#: src/transport/gnunet-transport.c:539
+#: src/transport/gnunet-transport.c:569
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/transport/gnunet-transport.c:587
+#: src/transport/gnunet-transport.c:618
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:590
+#: src/transport/gnunet-transport.c:621
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:593
+#: src/transport/gnunet-transport.c:624
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/transport/gnunet-transport.c:596
+#: src/transport/gnunet-transport.c:627
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/transport/gnunet-transport.c:599
+#: src/transport/gnunet-transport.c:630
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:603
+#: src/transport/gnunet-transport.c:634
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:606
+#: src/transport/gnunet-transport.c:637
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:614
+#: src/transport/gnunet-transport.c:645
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/plugin_transport_http.c:981
+#: src/transport/plugin_transport_http.c:1100
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1029
+#: src/transport/plugin_transport_http.c:1149
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/transport/plugin_transport_http.c:1054 src/util/service.c:986
+#: src/transport/plugin_transport_http.c:1174 src/util/service.c:1036
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/transport/plugin_transport_http.c:1071 src/util/service.c:1003
+#: src/transport/plugin_transport_http.c:1191 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/plugin_transport_http.c:1176
+#: src/transport/plugin_transport_http.c:1296
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1189
+#: src/transport/plugin_transport_http.c:1309
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1264
+#: src/transport/plugin_transport_http.c:1386
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "¡Advertencias de la red desconectadas por configuración!\n"
 
-#: src/transport/plugin_transport_http.c:1277
+#: src/transport/plugin_transport_http.c:1399
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/transport/plugin_transport_http.c:1288
+#: src/transport/plugin_transport_http.c:1410
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1308
+#: src/transport/plugin_transport_http.c:1430
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1338
+#: src/transport/plugin_transport_http.c:1460
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:621
+#: src/transport/plugin_transport_http_client.c:624
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:189
+#: src/transport/plugin_transport_http_server.c:178
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:213
+#: src/transport/plugin_transport_http_server.c:202
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:370
-#, fuzzy, c-format
-msgid "Received malformed message via %s. Ignored.\n"
-msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
-
-#: src/transport/plugin_transport_smtp.c:457
-msgid "SMTP filter string to invalid, lacks ': '\n"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:466
-#, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:561
-#: src/transport/plugin_transport_smtp.c:571
-#: src/transport/plugin_transport_smtp.c:584
-#: src/transport/plugin_transport_smtp.c:603
-#: src/transport/plugin_transport_smtp.c:626
-#: src/transport/plugin_transport_smtp.c:634
-#: src/transport/plugin_transport_smtp.c:647
-#: src/transport/plugin_transport_smtp.c:658
-#, fuzzy, c-format
-msgid "SMTP: `%s' failed: %s.\n"
-msgstr "'%s' %s falló: %s\n"
-
-#: src/transport/plugin_transport_smtp.c:801
-msgid "No email-address specified, can not start SMTP transport.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:813
-#, fuzzy
-msgid "# bytes received via SMTP"
-msgstr "# bytes recibidos por TCP"
-
-#: src/transport/plugin_transport_smtp.c:814
-#, fuzzy
-msgid "# bytes sent via SMTP"
-msgstr "# bytes enviados por TCP"
-
-#: src/transport/plugin_transport_smtp.c:816
-#, fuzzy
-msgid "# bytes dropped by SMTP (outgoing)"
-msgstr "# bytes omitidos por TCP (salientes)"
-
-#: src/transport/plugin_transport_tcp.c:512
+#: src/transport/plugin_transport_tcp.c:591
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:616
-#: src/transport/plugin_transport_tcp.c:705
-#: src/transport/plugin_transport_tcp.c:757
-#: src/transport/plugin_transport_tcp.c:830
-#: src/transport/plugin_transport_tcp.c:909
+#: src/transport/plugin_transport_tcp.c:767
+#: src/transport/plugin_transport_tcp.c:856
+#: src/transport/plugin_transport_tcp.c:906
+#: src/transport/plugin_transport_tcp.c:992
+#: src/transport/plugin_transport_tcp.c:1086
+#: src/transport/plugin_transport_tcp.c:1103
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes enviados por TCP"
 
-#: src/transport/plugin_transport_tcp.c:622
-#: src/transport/plugin_transport_tcp.c:856
-#: src/transport/plugin_transport_tcp.c:1561
+#: src/transport/plugin_transport_tcp.c:774
+#: src/transport/plugin_transport_tcp.c:963
+#: src/transport/plugin_transport_tcp.c:1761
+#: src/transport/plugin_transport_tcp.c:2390
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/transport/plugin_transport_tcp.c:709
+#: src/transport/plugin_transport_tcp.c:860
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:760
+#: src/transport/plugin_transport_tcp.c:909
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes desencriptados"
 
-#: src/transport/plugin_transport_tcp.c:834
+#: src/transport/plugin_transport_tcp.c:996
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:1081
+#: src/transport/plugin_transport_tcp.c:1290
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1116
-msgid "Found valid IPv4 NAT address (creating session)!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1186
+#: src/transport/plugin_transport_tcp.c:1401
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1603
+#: src/transport/plugin_transport_tcp.c:1802
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_tcp.c:1756
+#: src/transport/plugin_transport_tcp.c:1973
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_tcp.c:1823
+#: src/transport/plugin_transport_tcp.c:2043
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
+#: src/transport/plugin_transport_tcp.c:2279 src/util/service.c:940
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1976
+#: src/transport/plugin_transport_tcp.c:2293
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/transport/plugin_transport_tcp.c:2039
+#: src/transport/plugin_transport_tcp.c:2355
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/plugin_transport_tcp.c:2062
+#: src/transport/plugin_transport_tcp.c:2378
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2066
+#: src/transport/plugin_transport_tcp.c:2382
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2386
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:130
+#: src/transport/plugin_transport_udp_broadcasting.c:128
 #, fuzzy
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:172
+#: src/transport/plugin_transport_udp_broadcasting.c:169
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:393
+#: src/transport/plugin_transport_udp_broadcasting.c:367
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1985
+#: src/transport/plugin_transport_udp.c:1894
+#, c-format
+msgid ""
+"UDP could not message to `%s': `%s'. Please check your network configuration "
+"and disable IPv6 if your connection does not have a global IPv6 address\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2138
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/transport/plugin_transport_udp.c:2068
+#: src/transport/plugin_transport_udp.c:2306
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2112
+#: src/transport/plugin_transport_udp.c:2349
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/transport/plugin_transport_unix.c:1051
+#: src/transport/plugin_transport_unix.c:1356
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/transport/plugin_transport_wlan.c:875
+#: src/transport/plugin_transport_wlan.c:561
+msgid "# WLAN ACKs sent"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:580
 #, fuzzy
-msgid "# wlan session timeouts"
-msgstr "# claves de la sesión aceptadas"
+msgid "# WLAN messages defragmented"
+msgstr "# mensajes defragmentados"
 
-#: src/transport/plugin_transport_wlan.c:899
+#: src/transport/plugin_transport_wlan.c:626
+#: src/transport/plugin_transport_wlan.c:676
+#: src/transport/plugin_transport_wlan.c:1696
 #, fuzzy
-msgid "# wlan session created"
+msgid "# WLAN sessions allocated"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/transport/plugin_transport_wlan.c:980
-#: src/transport/plugin_transport_wlan.c:1138
-#: src/transport/plugin_transport_wlan.c:1159
-#: src/transport/plugin_transport_wlan.c:1190
-#: src/transport/plugin_transport_wlan.c:2334
-#: src/transport/plugin_transport_wlan.c:3142
-msgid "# wlan pending sessions"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:1233
-#: src/transport/plugin_transport_wlan.c:1888
+#: src/transport/plugin_transport_wlan.c:749
 #, fuzzy
-msgid "# wlan pending fragments"
-msgstr "# fragmentos descartados"
-
-#: src/transport/plugin_transport_wlan.c:1388
-#, c-format
-msgid ""
-"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
-msgstr ""
+msgid "# WLAN message fragments sent"
+msgstr "# mensajes fragmentados"
 
-#: src/transport/plugin_transport_wlan.c:1732
-msgid "# wlan hello beacons send"
+#: src/transport/plugin_transport_wlan.c:767
+msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1765
-#: src/transport/plugin_transport_wlan.c:1968
-#: src/transport/plugin_transport_wlan.c:2059
-#, c-format
-msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:867
+#: src/transport/plugin_transport_wlan.c:948
+#: src/transport/plugin_transport_wlan.c:1698
+#, fuzzy
+msgid "# WLAN MAC endpoints allocated"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1954
-msgid "# wlan acks send"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:1119
+#, fuzzy
+msgid "# HELLO messages received via WLAN"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:2025
+#: src/transport/plugin_transport_wlan.c:1140
 #, fuzzy
-msgid "# wlan fragments send"
+msgid "# fragments received via WLAN"
 msgstr "# fragmentos descartados"
 
-#: src/transport/plugin_transport_wlan.c:2161
-#, c-format
-msgid "Wlan Address len %d is wrong\n"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:2295
-#: src/transport/plugin_transport_wlan.c:2919
-#: src/transport/plugin_transport_wlan.c:3145
-msgid "# wlan mac endpoints"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:1150
+#, fuzzy
+msgid "# ACKs received via WLAN"
+msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_wlan.c:2517
+#: src/transport/plugin_transport_wlan.c:1207
 #, fuzzy
-msgid "# wlan whole messages received"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "# WLAN DATA messages discarded due to CRC32 error"
+msgstr "# mensajes defragmentados"
 
-#: src/transport/plugin_transport_wlan.c:2708
+#: src/transport/plugin_transport_wlan.c:1306
 #, fuzzy
-msgid "# wlan hello messages received"
+msgid "# DATA messages received via WLAN"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:2742
+#: src/transport/plugin_transport_wlan.c:1341
 #, fuzzy
-msgid "# wlan fragments received"
-msgstr "# fragmentos descartados"
+msgid "# WLAN DATA messages processed"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:2790
+#: src/transport/plugin_transport_wlan.c:1402
 #, fuzzy
-msgid "# wlan acks received"
-msgstr "# mensajes PONG encriptados recibidos"
+msgid "# HELLO beacons sent via WLAN"
+msgstr "# bytes enviados vía UDP"
 
-#: src/transport/plugin_transport_wlan.c:2879
-msgid "# wlan mac endpoints timeouts"
+#: src/transport/plugin_transport_wlan.c:1511
+msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2903
-#, fuzzy
-msgid "# wlan mac endpoints created"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/transport/plugin_transport_wlan.c:1668
+#, fuzzy, c-format
+msgid "Invalid configuration option `%s' in section `%s'\n"
+msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/transport/plugin_transport_wlan.c:2956
-msgid "# wlan WLAN_HELPER_DATA received"
+#: src/transport/plugin_transport_wlan.c:1677
+#, c-format
+msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3010
-#, fuzzy
-msgid "# wlan messages for this client received"
-msgstr "# mensajes PONG encriptados recibidos"
-
-#: src/transport/plugin_transport_wlan.c:3021
-#, fuzzy
-msgid "# wlan messages inside WLAN_HELPER_DATA received"
-msgstr "# mensajes PONG encriptados recibidos"
+#: src/transport/plugin_transport_wlan.c:1687
+#, fuzzy, c-format
+msgid "Missing configuration option `%s' in section `%s'\n"
+msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/transport/transport_api.c:588
+#: src/transport/transport_api.c:570
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Recibido mensaje corrupto del par '%s' en %s:%d.\n"
@@ -4995,137 +5261,130 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:304
+#: src/util/client.c:359
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:312
+#: src/util/client.c:367
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:657
+#: src/util/client.c:685
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:717 src/util/service.c:919
+#: src/util/client.c:740 src/util/service.c:970
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:859
+#: src/util/client.c:882
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/util/client.c:875
+#: src/util/client.c:896
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
 
-#: src/util/client.c:1143
+#: src/util/client.c:1149
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:889
+#: src/util/common_logging.c:239 src/util/common_logging.c:890
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:887
+#: src/util/common_logging.c:241 src/util/common_logging.c:888
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/common_logging.c:243 src/util/common_logging.c:885
+#: src/util/common_logging.c:243 src/util/common_logging.c:886
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/common_logging.c:245 src/util/common_logging.c:883
+#: src/util/common_logging.c:245 src/util/common_logging.c:884
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/common_logging.c:247 src/util/common_logging.c:891
+#: src/util/common_logging.c:247 src/util/common_logging.c:892
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:609
+#: src/util/common_logging.c:610
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/util/common_logging.c:724
+#: src/util/common_logging.c:725
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:892
+#: src/util/common_logging.c:893
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:991
+#: src/util/common_logging.c:992
 #, fuzzy
 msgid "unknown address"
 msgstr "desconocido"
 
-#: src/util/common_logging.c:1029
+#: src/util/common_logging.c:1030
 #, fuzzy
 msgid "invalid address"
 msgstr "Argumentos inválidos: "
 
-#: src/util/configuration.c:245
+#: src/util/configuration.c:244
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr ""
 "Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/util/configuration.c:817
+#: src/util/configuration.c:816
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/connection.c:460
+#: src/util/connection.c:420
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Permiso denegado para '%s' en %s:%d.\n"
 
-#: src/util/connection.c:475
+#: src/util/connection.c:435
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:629
+#: src/util/connection.c:550
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
 
-#: src/util/connection.c:821 src/util/connection.c:992
+#: src/util/connection.c:739 src/util/connection.c:909
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/connection.c:830
+#: src/util/connection.c:748
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' (%p)\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/connection.c:983
+#: src/util/connection.c:900
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/connection.c:1465
-#, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
-msgstr ""
-
-#: src/util/container_bloomfilter.c:507
+#: src/util/container_bloomfilter.c:510
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -5143,134 +5402,134 @@ msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 "libgcrypt no está en la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#: src/util/crypto_rsa.c:661 src/util/crypto_rsa.c:708
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "Imposible escribir PID al fichero '%s': %s.\n"
 
-#: src/util/crypto_rsa.c:623
+#: src/util/crypto_rsa.c:666
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Creando nueva clave local (esto puede llevar un tiempo).\n"
 
-#: src/util/crypto_rsa.c:641
+#: src/util/crypto_rsa.c:684
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+#: src/util/crypto_rsa.c:712 src/util/crypto_rsa.c:748
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:700
+#: src/util/crypto_rsa.c:743
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:720
+#: src/util/crypto_rsa.c:763
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "El fichero '%s' no contiene un pseudónimo.\n"
 
-#: src/util/crypto_rsa.c:738
+#: src/util/crypto_rsa.c:781
 #, fuzzy, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr "Llamada a '%s' con la clave '%s'.\n"
 
-#: src/util/crypto_rsa.c:959
+#: src/util/crypto_rsa.c:1032
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/util/disk.c:479
+#: src/util/disk.c:498
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/util/disk.c:1087
+#: src/util/disk.c:1062
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
 
-#: src/util/disk.c:1441 src/util/service.c:1580
+#: src/util/disk.c:1416 src/util/service.c:1650
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
 
-#: src/util/disk.c:1759
+#: src/util/disk.c:1734
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/util/getopt.c:672
+#: src/util/getopt.c:669
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: la opción '%s' es ambigua\n"
 
-#: src/util/getopt.c:696
+#: src/util/getopt.c:693
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: la opción '--%s' no permite un argumento\n"
 
-#: src/util/getopt.c:701
+#: src/util/getopt.c:698
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: la opción '%c%s' no permite un argumento\n"
 
-#: src/util/getopt.c:718 src/util/getopt.c:886
+#: src/util/getopt.c:715 src/util/getopt.c:883
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: la opción '%s' requiere un argumento\n"
 
-#: src/util/getopt.c:747
+#: src/util/getopt.c:744
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción no reconocida '--%s'\n"
 
-#: src/util/getopt.c:751
+#: src/util/getopt.c:748
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opción no reconocida '%c%s'\n"
 
-#: src/util/getopt.c:776
+#: src/util/getopt.c:773
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción ilegal -- %c\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción no válida -- %c\n"
 
-#: src/util/getopt.c:806 src/util/getopt.c:934
+#: src/util/getopt.c:803 src/util/getopt.c:931
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: la opción requiere un argumento --%c\n"
 
-#: src/util/getopt.c:854
+#: src/util/getopt.c:851
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: la opción '-W %s' es ambigua\n"
 
-#: src/util/getopt.c:872
+#: src/util/getopt.c:869
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: la opción '-W %s' no permite un argumento\n"
 
-#: src/util/getopt.c:1038
+#: src/util/getopt.c:1035
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "Usar --help para obtener una lista de opciones.\n"
 
-#: src/util/getopt_helpers.c:84
+#: src/util/getopt_helpers.c:86
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
+#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:286
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Tienes que introducir un número en la opción '%s'.\n"
@@ -5283,6 +5542,27 @@ msgstr ""
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
+#: src/util/gnunet-rsa.c:64
+#, c-format
+msgid "No hostkey file specified on command line\n"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:112
+msgid "print the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:115
+msgid "print the hash of the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:118
+msgid "print the short hash of the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:124
+msgid "Manipulate GNUnet private RSA key files"
+msgstr ""
+
 #: src/util/gnunet-service-resolver.c:288
 #, fuzzy, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
@@ -5294,42 +5574,37 @@ msgstr "Imposible resolver '%s': %s\n"
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Imposible encontrar la IP del host '%s': %s\n"
 
-#: src/util/gnunet-service-resolver.c:494
-#, c-format
-msgid "Resolver asked to look up `%s'.\n"
-msgstr ""
-
-#: src/util/gnunet-service-resolver.c:529
-#, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
-msgstr ""
-
-#: src/util/helper.c:239
+#: src/util/helper.c:244
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Error creando usuario"
 
-#: src/util/helper.c:254
+#: src/util/helper.c:259
 #, c-format
 msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/util/helper.c:264
+#: src/util/helper.c:269
 #, fuzzy, c-format
 msgid "Got %u bytes from helper `%s'\n"
 msgstr "GAP recibido contenido no válido de '%s'\n"
 
-#: src/util/helper.c:273
+#: src/util/helper.c:278
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/util/helper.c:432
+#: src/util/helper.c:310
+#, fuzzy, c-format
+msgid "Starting HELPER process `%s'\n"
+msgstr "Iniciada colección '%s'.\n"
+
+#: src/util/helper.c:440
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Error creando usuario"
 
-#: src/util/network.c:1196
+#: src/util/network.c:1200
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -5357,12 +5632,12 @@ msgstr "'%s' %s falló: %s\n"
 msgid "stat (%s) failed: %s\n"
 msgstr "'%s' %s falló: %s\n"
 
-#: src/util/os_priority.c:304
+#: src/util/os_priority.c:305
 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for reading: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/util/os_priority.c:305
+#: src/util/os_priority.c:306
 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for writing: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
@@ -5387,12 +5662,12 @@ msgstr "'%s' falló en la biblioteca '%s' en %s:%d con un error: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "Imposible determinar mi dirección IPv6 pública.\n"
 
-#: src/util/pseudonym.c:273
+#: src/util/pseudonym.c:276
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/util/pseudonym.c:338
+#: src/util/pseudonym.c:407 src/util/pseudonym.c:433
 #, fuzzy
 msgid "no-name"
 msgstr "Mostrar el nombre"
@@ -5410,189 +5685,169 @@ msgstr ""
 "Debes especificar un número positivo para '%s' en la configuración en la "
 "sección '%s'.\n"
 
-#: src/util/resolver_api.c:351
+#: src/util/resolver_api.c:347
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet usa ahora la dirección IP %u.%u.%u.%u.\n"
 
-#: src/util/resolver_api.c:355
+#: src/util/resolver_api.c:351
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:426
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:807
-#, c-format
-msgid "Resolver returns `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:901
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
-msgstr ""
-
-#: src/util/resolver_api.c:906
+#: src/util/resolver_api.c:890
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Imposible resolver '%s': %s\n"
 
-#: src/util/resolver_api.c:938
-#, c-format
-msgid "Resolving our hostname `%s'\n"
-msgstr ""
-
-#: src/util/scheduler.c:866
+#: src/util/scheduler.c:786
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:996
+#: src/util/scheduler.c:916
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:397
+#: src/util/server.c:483
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/util/server.c:406
+#: src/util/server.c:492
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/util/server.c:411
+#: src/util/server.c:497
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/util/server.c:640
+#: src/util/server.c:827
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
-#: src/util/service.c:207 src/util/service.c:214
+#: src/util/service.c:135 src/util/service.c:161 src/util/service.c:204
+#: src/util/service.c:225 src/util/service.c:232
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: '%s'\n"
 
-#: src/util/service.c:170
+#: src/util/service.c:188
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Notación de red no válida ('/%d' no es válido en IPv4 CIDR)."
 
-#: src/util/service.c:263
+#: src/util/service.c:281
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Notación de red no válida (no termina con ';': '%s')\n"
 
-#: src/util/service.c:296
+#: src/util/service.c:313
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Formato '%s' erróneo para la máscara de red: %s\n"
 
-#: src/util/service.c:326
+#: src/util/service.c:343
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato '%s' erróneo para la red: %s\n"
 
-#: src/util/service.c:668
+#: src/util/service.c:698
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:673
+#: src/util/service.c:703
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Operación desconocida '%s'\n"
 
-#: src/util/service.c:680
+#: src/util/service.c:710
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:724
+#: src/util/service.c:765
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:752
+#: src/util/service.c:802
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:869
+#: src/util/service.c:920
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:939
+#: src/util/service.c:990
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:956
+#: src/util/service.c:1007
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1191
+#: src/util/service.c:1241
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1242 src/util/service.c:1260
+#: src/util/service.c:1292 src/util/service.c:1310
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1287
+#: src/util/service.c:1337
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1442
+#: src/util/service.c:1506
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/service.c:1475
+#: src/util/service.c:1539
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
-#: src/util/service.c:1521
+#: src/util/service.c:1588
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1525
+#: src/util/service.c:1592
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1529
+#: src/util/service.c:1596
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1581
+#: src/util/service.c:1651
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1594
+#: src/util/service.c:1664
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
 
-#: src/util/service.c:1657
+#: src/util/service.c:1729
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5601,55 +5856,76 @@ msgstr ""
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "La llamada a '%s' devuelve %d.\n"
 
-#: src/util/strings.c:143
+#: src/util/strings.c:144
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:354
+#: src/util/strings.c:334
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:462
+#: src/util/strings.c:481
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:554
+#: src/util/strings.c:573
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:559
+#: src/util/strings.c:578
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:563
+#: src/util/strings.c:582
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:567
+#: src/util/strings.c:586
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:571
+#: src/util/strings.c:590
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:575
+#: src/util/strings.c:594
 msgid " days"
 msgstr " días"
 
-#: src/util/strings.c:599
+#: src/util/strings.c:618
 msgid "end of time"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
+#: src/util/strings.c:1012
+msgid "IPv6 address did not start with `['\n"
+msgstr ""
+
+#: src/util/strings.c:1020
+msgid "IPv6 address did contain ':' to separate port number\n"
+msgstr ""
+
+#: src/util/strings.c:1026
+msgid "IPv6 address did contain ']' before ':' to separate port number\n"
+msgstr ""
+
+#: src/util/strings.c:1033
+msgid "IPv6 address did contain a valid port number after the last ':'\n"
+msgstr ""
+
+#: src/util/strings.c:1042
+#, fuzzy, c-format
+msgid "Invalid IPv6 address `%s': %s\n"
+msgstr "Argumento no válido: '%s'\n"
+
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1071
 #, fuzzy
 msgid "# Active tunnels"
 msgstr "Configuración de GNUnet"
 
 #: src/vpn/gnunet-service-vpn.c:608 src/vpn/gnunet-service-vpn.c:645
 #, fuzzy
-msgid "# Peers connected to mesh tunnels"
+msgid "# peers connected to mesh tunnels"
 msgstr "# de pares conectados"
 
 #: src/vpn/gnunet-service-vpn.c:699
@@ -5672,76 +5948,76 @@ msgstr "# mensajes PONG encriptados recibidos"
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/vpn/gnunet-service-vpn.c:967
+#: src/vpn/gnunet-service-vpn.c:973
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1285
+#: src/vpn/gnunet-service-vpn.c:1291
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1306
+#: src/vpn/gnunet-service-vpn.c:1312
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1517
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
+#: src/vpn/gnunet-service-vpn.c:1555 src/vpn/gnunet-service-vpn.c:1596
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1600
+#: src/vpn/gnunet-service-vpn.c:1606
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1614
+#: src/vpn/gnunet-service-vpn.c:1620
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1697
+#: src/vpn/gnunet-service-vpn.c:1704
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/vpn/gnunet-service-vpn.c:2038
+#: src/vpn/gnunet-service-vpn.c:2045
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/vpn/gnunet-service-vpn.c:2196
+#: src/vpn/gnunet-service-vpn.c:2203
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/vpn/gnunet-service-vpn.c:2347
+#: src/vpn/gnunet-service-vpn.c:2354
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2402
+#: src/vpn/gnunet-service-vpn.c:2409
 #, fuzzy
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr "¡Falló al obtener mi dirección IPv6 (externa)!\n"
 
-#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
+#: src/vpn/gnunet-service-vpn.c:2448 src/vpn/gnunet-service-vpn.c:2661
 #, fuzzy
 msgid "# Active destinations"
 msgstr "Configuración de GNUnet"
 
-#: src/vpn/gnunet-service-vpn.c:2726
+#: src/vpn/gnunet-service-vpn.c:2734
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3141
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3165
+#: src/vpn/gnunet-service-vpn.c:3173
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -5817,23 +6093,163 @@ msgstr "# bytes recibidos vía UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
-#: src/include/gnunet_common.h:490
+#: src/include/gnunet_common.h:497 src/include/gnunet_common.h:502
+#: src/include/gnunet_common.h:508
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/include/gnunet_common.h:500
+#: src/include/gnunet_common.h:518
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
+#: src/include/gnunet_common.h:539 src/include/gnunet_common.h:546
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 
 #, fuzzy
+#~ msgid "Received malformed message via %s. Ignored.\n"
+#~ msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
+
+#, fuzzy
+#~ msgid "SMTP: `%s' failed: %s.\n"
+#~ msgstr "'%s' %s falló: %s\n"
+
+#, fuzzy
+#~ msgid "# bytes received via SMTP"
+#~ msgstr "# bytes recibidos por TCP"
+
+#, fuzzy
+#~ msgid "# bytes sent via SMTP"
+#~ msgstr "# bytes enviados por TCP"
+
+#, fuzzy
+#~ msgid "# bytes dropped by SMTP (outgoing)"
+#~ msgstr "# bytes omitidos por TCP (salientes)"
+
+#, fuzzy
+#~ msgid "# Peers connected"
+#~ msgstr "# de pares conectados"
+
+#, fuzzy
+#~ msgid "%s failed for `%s' at %s:%d: `%s'\n"
+#~ msgstr "'%s' falló en %s: %d con error: '%s'.\n"
+
+#, fuzzy
+#~ msgid "Failed to transmit shutdown ACK.\n"
+#~ msgstr "Falló al comenzar la recolección.\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize Postgres with configuration `%s': %s"
+#~ msgstr "Imposible guardar el fichero de configuración '%s':"
+
+#, fuzzy
+#~ msgid "Failed to transmit message to `%s' service.\n"
+#~ msgstr "Falló al inicializar el servicio '%s'.\n"
+
+#, fuzzy
+#~ msgid "Target is %d connections per peer."
+#~ msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Copying file with RENAME (%s,%s)\n"
+#~ msgstr "'%s' falló con el código de error %s: %s"
+
+#, fuzzy
+#~ msgid "Copying file with command scp %s %s\n"
+#~ msgstr "'%s' falló con el código de error %s: %s"
+
+#, fuzzy
+#~ msgid "Finished copying all blacklist files!\n"
+#~ msgstr "Imposible inicializar la aplicación '%s'\n"
+
+#, fuzzy
+#~ msgid "Offering HELLO of peer %s to peer %s\n"
+#~ msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
+
+#, fuzzy
+#~ msgid "Failed during blacklist file copying!\n"
+#~ msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
+
+#, fuzzy
+#~ msgid "# bytes payload received for other peers"
+#~ msgstr "# bytes recibidos por TCP"
+
+#, fuzzy
+#~ msgid "# fast reconnects failed"
+#~ msgstr "# de pares conectados"
+
+#, fuzzy
+#~ msgid "# peers disconnected due to timeout"
+#~ msgstr "# de pares conectados"
+
+#, fuzzy
+#~ msgid "# peers disconnected due to global disconnect"
+#~ msgstr "# Anuncios de los pares recibidos"
+
+#, fuzzy
+#~ msgid "# messages not sent (no such peer or not connected)"
+#~ msgstr "# mensajes defragmentados"
+
+#, fuzzy
+#~ msgid "# unexpected CONNECT_ACK messages"
+#~ msgstr "envia COUNT mensajes"
+
+#, fuzzy
+#~ msgid "# wlan session timeouts"
+#~ msgstr "# claves de la sesión aceptadas"
+
+#, fuzzy
+#~ msgid "# wlan session created"
+#~ msgstr "# claves de la sesión aceptadas"
+
+#, fuzzy
+#~ msgid "# wlan pending fragments"
+#~ msgstr "# fragmentos descartados"
+
+#, fuzzy
+#~ msgid "# wlan fragments send"
+#~ msgstr "# fragmentos descartados"
+
+#, fuzzy
+#~ msgid "# wlan whole messages received"
+#~ msgstr "# mensajes PONG encriptados recibidos"
+
+#, fuzzy
+#~ msgid "# wlan hello messages received"
+#~ msgstr "# mensajes PONG encriptados recibidos"
+
+#, fuzzy
+#~ msgid "# wlan fragments received"
+#~ msgstr "# fragmentos descartados"
+
+#, fuzzy
+#~ msgid "# wlan acks received"
+#~ msgstr "# mensajes PONG encriptados recibidos"
+
+#, fuzzy
+#~ msgid "# wlan messages for this client received"
+#~ msgstr "# mensajes PONG encriptados recibidos"
+
+#, fuzzy
+#~ msgid "# wlan messages inside WLAN_HELPER_DATA received"
+#~ msgstr "# mensajes PONG encriptados recibidos"
+
+#, fuzzy
+#~ msgid "Unknown user `%s'\n"
+#~ msgstr "Operación desconocida '%s'\n"
+
+#, fuzzy
+#~ msgid "Namespace `%s' unknown.\n"
+#~ msgstr "El espacio '%s' ha sido valorado con un %d.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to statistics service!\n"
+#~ msgstr "Fallo al conectar a gnunetd.\n"
+
+#, fuzzy
 #~ msgid "Failed to send to `%s': %s\n"
 #~ msgstr "Fichero almacenado en '%s'.\n"
 
@@ -5896,10 +6312,6 @@ msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 #~ msgstr "Imposible guardar el fichero de configuración '%s':"
 
 #, fuzzy
-#~ msgid "Service `%s' started\n"
-#~ msgstr "Servicio eliminado.\n"
-
-#, fuzzy
 #~ msgid "Peer `%s' plugin: `%s' address `%s'\n"
 #~ msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
@@ -5932,14 +6344,6 @@ msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 #~ msgstr "Imposible inicializar la aplicación '%s'\n"
 
 #, fuzzy
-#~ msgid "Failed to get full path for `%s'\n"
-#~ msgstr "Falló al actualizar los datos del módulo '%s'\n"
-
-#, fuzzy
-#~ msgid "Failed to create file for dhtlog.\n"
-#~ msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
-
-#, fuzzy
 #~ msgid "Found peer `%s'\n"
 #~ msgstr "Yo soy el par '%s'.\n"
 
@@ -5952,10 +6356,6 @@ msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 #~ msgstr "Probando transporte(s) %s\n"
 
 #, fuzzy
-#~ msgid "Failed to load transport plugin for udp\n"
-#~ msgstr "Imposible inicializar la aplicación '%s'\n"
-
-#, fuzzy
 #~ msgid "# SET QUOTA messages received"
 #~ msgstr "# mensajes PONG encriptados recibidos"
 
@@ -6000,10 +6400,6 @@ msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 #~ msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
 #, fuzzy
-#~ msgid "Loading HTTP transport plugin `%s'\n"
-#~ msgstr "Probando transporte(s) %s\n"
-
-#, fuzzy
 #~ msgid "Failed to load transport plugin for http\n"
 #~ msgstr "Imposible inicializar la aplicación '%s'\n"
 
@@ -6070,9 +6466,6 @@ msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 #~ msgid "Ok"
 #~ msgstr "k"
 
-#~ msgid "GNUnet configuration"
-#~ msgstr "Configuración de GNUnet"
-
 #~ msgid ""
 #~ "Welcome to GNUnet!\n"
 #~ "\n"
@@ -6326,9 +6719,6 @@ msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 #~ "Your configuration changes were NOT saved.\n"
 #~ msgstr "Fichero de configuración '%s' creado.\n"
 
-#~ msgid "GNUnet service installed successfully.\n"
-#~ msgstr "Servicio de GNUnet instalado satisfactoriamente.\n"
-
 #~ msgid "This version of Windows doesn't support services.\n"
 #~ msgstr "Esta versión de Windows no soporta servicios.\n"
 
@@ -6526,10 +6916,6 @@ msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 #~ msgid "`%s' failed with error code %d: %s\n"
 #~ msgstr "'%s' falló con el código de error %d: %s"
 
-#, fuzzy
-#~ msgid "Invalid argument for `%s'.\n"
-#~ msgstr "Argumento no válido: '%s'\n"
-
 #~ msgid "Availability test failed for `%s' at %s:%d.\n"
 #~ msgstr "Test de disponibilidad fallido para '%s' en %s:%d.\n"
 
@@ -6746,9 +7132,6 @@ msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 #~ msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 #~ msgstr "El comando '%s' requiere dos argumentos ('%s' y '%s').\n"
 
-#~ msgid "Unsupported command `%s'.  Aborting.\n"
-#~ msgstr "Comando inesperado '%s'.   Abortando.\n"
-
 #, fuzzy
 #~ msgid "# dht put requests received"
 #~ msgstr "# bytes recibidos por TCP"
@@ -7065,10 +7448,6 @@ msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 #~ msgid "Downloading %d files from directory `%s'.\n"
 #~ msgstr "Descarga los ficheros de GNUnet"
 
-#, fuzzy
-#~ msgid "Did not find any files in directory `%s'\n"
-#~ msgstr "Falló al actualizar los datos del módulo '%s'\n"
-
 #~ msgid "File stored as `%s'.\n"
 #~ msgstr "Fichero almacenado en '%s'.\n"
 
@@ -7177,10 +7556,6 @@ msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 #~ msgstr "Fallo al conectar a gnunetd.\n"
 
 #, fuzzy
-#~ msgid "set number of daemons to start"
-#~ msgstr "número de mensajes a usar por iteración"
-
-#, fuzzy
 #~ msgid "Waiting for peers to connect"
 #~ msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
 
@@ -8578,9 +8953,6 @@ msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 #~ "Solo se puede arrancar wizard para configurar gnunetd.\n"
 #~ "¿Te olvidaste de la opción %s'?\n"
 
-#~ msgid "%s: symbol value `%s' invalid for %s\n"
-#~ msgstr "%s: valor del símbolo '%s' no válido para %s\n"
-
 #~ msgid "Gtk GNUnet Configurator"
 #~ msgstr "Configurador Gtk de GNUnet"
 
@@ -8752,9 +9124,6 @@ msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 #~ msgid "Invalid LOGLEVEL `%s' specified.\n"
 #~ msgstr "LOGLEVEL inválido '%s' especificado.\n"
 
-#~ msgid "Failure at %s:%d.\n"
-#~ msgstr "Fallo en %s:%d.\n"
-
 #~ msgid ""
 #~ "Cannot determine port of gnunetd server. Define in configuration file in "
 #~ "section `%s' under `%s'.\n"
diff --git a/po/gnunet.pot b/po/gnunet.pot
index 9dcff6a..652e579 100644
--- a/po/gnunet.pot
+++ b/po/gnunet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2012-02-28 18:30+0100\n"
+"POT-Creation-Date: 2012-06-05 15:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,249 +17,262 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:187
+#: src/arm/arm_api.c:165
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:378
+#: src/arm/arm_api.c:349
 #, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/arm/arm_api.c:392
+#: src/arm/arm_api.c:363
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/arm/arm_api.c:467
+#: src/arm/arm_api.c:432
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:523
+#: src/arm/arm_api.c:485
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:524
+#: src/arm/arm_api.c:486
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:546
+#: src/arm/arm_api.c:507
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:548
+#: src/arm/arm_api.c:508
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:581
+#: src/arm/arm_api.c:540
 #, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/arm/arm_api.c:654
+#: src/arm/arm_api.c:612
 #, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:149
+#: src/arm/gnunet-arm.c:159
 #, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:154
+#: src/arm/gnunet-arm.c:164
 #, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:157
+#: src/arm/gnunet-arm.c:167
 #, c-format
 msgid "Service `%s' was already running.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:172
 #, c-format
 msgid "Service `%s' has been started.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:175
 #, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:179
 #, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:173
+#: src/arm/gnunet-arm.c:183
 msgid "Request ignored as ARM is shutting down.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:187
 msgid "Error communicating with ARM service.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:181
+#: src/arm/gnunet-arm.c:191
 msgid "Timeout communicating with ARM service.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:185
+#: src/arm/gnunet-arm.c:195
 msgid "Operation failed.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:189
+#: src/arm/gnunet-arm.c:199
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:222
+msgid "Error communicating with ARM. ARM not running?\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:225
+msgid "Running services:\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:249
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+#: src/arm/gnunet-arm.c:257 src/arm/gnunet-arm.c:357 src/arm/gnunet-arm.c:373
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247
+#: src/arm/gnunet-arm.c:280
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:253
+#: src/arm/gnunet-arm.c:286
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:355
+#: src/arm/gnunet-arm.c:407
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:357
+#: src/arm/gnunet-arm.c:409
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:359
+#: src/arm/gnunet-arm.c:411
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:361
+#: src/arm/gnunet-arm.c:413
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:364
+#: src/arm/gnunet-arm.c:416
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:419
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:421
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:372
+#: src/arm/gnunet-arm.c:424
 msgid "timeout for completing current operation"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:383
+#: src/arm/gnunet-arm.c:426
+msgid "List currently running services"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:437
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:328
+#: src/arm/gnunet-service-arm.c:332
 #, c-format
 msgid "Failed to start service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:331
+#: src/arm/gnunet-service-arm.c:335
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:357
+#: src/arm/gnunet-service-arm.c:361
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:484
+#: src/arm/gnunet-service-arm.c:393
+msgid "Could not send list result to client\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:523
 #, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:506
+#: src/arm/gnunet-service-arm.c:545
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:520
+#: src/arm/gnunet-service-arm.c:559
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:628
+#: src/arm/gnunet-service-arm.c:667
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:782
+#: src/arm/gnunet-service-arm.c:878
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:877
+#: src/arm/gnunet-service-arm.c:970
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:882
+#: src/arm/gnunet-service-arm.c:975
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:887
+#: src/arm/gnunet-service-arm.c:980
 msgid "unknown"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:921
+#: src/arm/gnunet-service-arm.c:986
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+msgid "Service `%s' took %llu ms to terminate\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:967 src/arm/mockup-service.c:41
-msgid "Failed to transmit shutdown ACK.\n"
+#: src/arm/gnunet-service-arm.c:1021
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1067
+#: src/arm/gnunet-service-arm.c:1127
 #, c-format
 msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1069
+#: src/arm/gnunet-service-arm.c:1129
 msgid "option missing"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1152
+#: src/arm/gnunet-service-arm.c:1213
 #, c-format
 msgid "Starting default services `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1224
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1177
+#: src/arm/gnunet-service-arm.c:1238
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:46
-msgid "Transmitting shutdown ACK.\n"
-msgstr ""
-
-#: src/arm/mockup-service.c:69
+#: src/arm/mockup-service.c:44
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
@@ -316,193 +329,196 @@ msgstr ""
 msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:92
+#: src/chat/gnunet-chat.c:93
 msgid "Joined\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:124
+#: src/chat/gnunet-chat.c:125 src/chat/gnunet-chat.c:133
+#: src/chat/gnunet-chat.c:213 src/chat/gnunet-chat.c:253
+#: src/chat/gnunet-chat.c:329 src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:400 src/chat/gnunet-chat.c:700
 msgid "anonymous"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:130
+#: src/chat/gnunet-chat.c:144
 #, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: src/chat/gnunet-chat.c:147 src/chat/gnunet-chat.c:150
 #, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:139
+#: src/chat/gnunet-chat.c:153
 #, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:142
+#: src/chat/gnunet-chat.c:156
 #, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:145
+#: src/chat/gnunet-chat.c:159
 #, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:148
+#: src/chat/gnunet-chat.c:162
 #, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:151
+#: src/chat/gnunet-chat.c:165
 #, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:170
 #, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:173
 #, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:162
+#: src/chat/gnunet-chat.c:176
 #, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:193
+#: src/chat/gnunet-chat.c:217
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:260
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:260
 #, c-format
 msgid "`%s' left the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#: src/chat/gnunet-chat.c:321 src/chat/gnunet-chat.c:363
 msgid "Could not change username\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#: src/chat/gnunet-chat.c:334 src/chat/gnunet-chat.c:702
 #, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:320
+#: src/chat/gnunet-chat.c:373
 #, c-format
 msgid "Changed username to `%s'\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:333
+#: src/chat/gnunet-chat.c:388
 #, c-format
 msgid "Users in room `%s': "
 msgstr ""
 
-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:434
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:379
+#: src/chat/gnunet-chat.c:443
 #, c-format
-msgid "Unknown user `%s'\n"
+msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:395
+#: src/chat/gnunet-chat.c:460
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:448
+#: src/chat/gnunet-chat.c:513
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:459
+#: src/chat/gnunet-chat.c:524
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:463
+#: src/chat/gnunet-chat.c:528
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:532
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:470
+#: src/chat/gnunet-chat.c:535
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:472
+#: src/chat/gnunet-chat.c:537
 msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:474
+#: src/chat/gnunet-chat.c:539
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:477
+#: src/chat/gnunet-chat.c:542
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:480
+#: src/chat/gnunet-chat.c:545
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:547
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:484
+#: src/chat/gnunet-chat.c:549
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:551
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:554
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:556
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:606
+#: src/chat/gnunet-chat.c:672
 msgid "You must specify a nickname\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:622
+#: src/chat/gnunet-chat.c:688
 #, c-format
 msgid "Failed to join room `%s'\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:655
+#: src/chat/gnunet-chat.c:727
 msgid "set the nickname to use (required)"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:658
+#: src/chat/gnunet-chat.c:730
 msgid "set the chat room to join"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:670
+#: src/chat/gnunet-chat.c:742
 msgid "Join a chat on GNUnet."
 msgstr ""
 
@@ -522,165 +538,166 @@ msgstr ""
 msgid "Failed to queue a leave notification\n"
 msgstr ""
 
-#: src/core/core_api.c:798
+#: src/core/core_api.c:786
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core-list-connections.c:77
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
+#: src/core/gnunet-core.c:54 src/peerinfo-tool/gnunet-peerinfo.c:286
 #, c-format
 msgid "Peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-core-list-connections.c:175
-#: src/peerinfo-tool/gnunet-peerinfo.c:194
+#: src/core/gnunet-core.c:72 src/peerinfo-tool/gnunet-peerinfo.c:817
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-core-list-connections.c:196
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
-msgid "don't resolve host names"
-msgstr ""
-
-#: src/core/gnunet-core-list-connections.c:203
+#: src/core/gnunet-core.c:95
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:99
+#: src/core/gnunet-service-core.c:97
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:360
+#: src/core/gnunet-service-core_clients.c:370
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:465
+#: src/core/gnunet-service-core_clients.c:475
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:801
+#: src/core/gnunet-service-core_clients.c:818
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:493
+#: src/core/gnunet-service-core_kx.c:565
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:543
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
-#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
+#: src/core/gnunet-service-core_kx.c:681 src/dv/gnunet-service-dv.c:3003
 msgid "Error in communication with PEERINFO service\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:623
+#: src/core/gnunet-service-core_kx.c:700
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:753
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:694
+#: src/core/gnunet-service-core_kx.c:775
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:828
 msgid "# session keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:845
 #, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:890
 msgid "# SET_KEY messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:883
-#: src/transport/gnunet-service-transport_validation.c:803
+#: src/core/gnunet-service-core_kx.c:977
+#: src/transport/gnunet-service-transport_validation.c:810
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/core/gnunet-service-core_kx.c:1010
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:938
+#: src/core/gnunet-service-core_kx.c:1029
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1026
+#: src/core/gnunet-service-core_kx.c:1125
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1037
+#: src/core/gnunet-service-core_kx.c:1135
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1095
-#: src/transport/gnunet-service-transport_validation.c:1026
+#: src/core/gnunet-service-core_kx.c:1236
+#: src/transport/gnunet-service-transport_validation.c:1031
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:1275
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1157
+#: src/core/gnunet-service-core_kx.c:1303
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1223
+#: src/core/gnunet-service-core_kx.c:1329
+msgid "# rekey operations confirmed via PONG"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1381
+#: src/core/gnunet-service-core_kx.c:1398
 msgid "# SET_KEY and PING messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1402
+msgid "# REKEY operations performed"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1537
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1406
-#: src/core/gnunet-service-core_kx.c:1431
+#: src/core/gnunet-service-core_kx.c:1577
+#: src/core/gnunet-service-core_kx.c:1602
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1589
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1626
 #, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1630
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1638
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1700
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1536
+#: src/core/gnunet-service-core_kx.c:1708
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1546 src/hostlist/hostlist-server.c:555
-#: src/peerinfo-tool/gnunet-peerinfo.c:202
-#: src/transport/gnunet-service-transport.c:595
+#: src/core/gnunet-service-core_kx.c:1718 src/hostlist/hostlist-server.c:551
+#: src/peerinfo-tool/gnunet-peerinfo.c:823
+#: src/transport/gnunet-service-transport.c:611
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -689,29 +706,39 @@ msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
 #: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:342
+#: src/core/gnunet-service-core_neighbours.c:334
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:247
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:430
+#: src/core/gnunet-service-core_neighbours.c:418
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:273
-msgid "# entries in session map"
+#: src/core/gnunet-service-core_sessions.c:206
+#: src/core/gnunet-service-core_sessions.c:269
+#: src/dht/gnunet-service-dht_neighbours.c:625
+#: src/dht/gnunet-service-dht_neighbours.c:683
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
+#: src/topology/gnunet-daemon-topology.c:709
+#: src/topology/gnunet-daemon-topology.c:810
+#: src/transport/gnunet-service-transport_neighbours.c:874
+#: src/transport/gnunet-service-transport_neighbours.c:1080
+#: src/transport/gnunet-service-transport_neighbours.c:1089
+#: src/transport/gnunet-service-transport_neighbours.c:2568
+#: src/transport/gnunet-service-transport_neighbours.c:2814
+msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:238
+#: src/core/gnunet-service-core_sessions.c:236
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:414
+#: src/core/gnunet-service-core_sessions.c:406
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -724,398 +751,374 @@ msgstr ""
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:118 src/datacache/datacache.c:255
-#: src/datastore/gnunet-service-datastore.c:854
+#: src/datacache/datacache.c:115 src/datacache/datacache.c:250
+#: src/datastore/gnunet-service-datastore.c:834
 msgid "# bytes stored"
 msgstr ""
 
-#: src/datacache/datacache.c:144 src/datacache/datacache.c:151
-#: src/datastore/gnunet-service-datastore.c:1531
-#: src/datastore/gnunet-service-datastore.c:1542
+#: src/datacache/datacache.c:141 src/datacache/datacache.c:148
+#: src/datastore/gnunet-service-datastore.c:1483
+#: src/datastore/gnunet-service-datastore.c:1494
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
 
-#: src/datacache/datacache.c:183
+#: src/datacache/datacache.c:180
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:191
+#: src/datacache/datacache.c:188
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:281
+#: src/datacache/datacache.c:276
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:291
+#: src/datacache/datacache.c:284
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:103
-#: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:517
-#: src/datacache/plugin_datacache_mysql.c:526
-#: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614
-#: src/datacache/plugin_datacache_sqlite.c:71
-#: src/datacache/plugin_datacache_sqlite.c:74
-#: src/datastore/plugin_datastore_mysql.c:139
-#: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:613
-#: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685
-#: src/datastore/plugin_datastore_mysql.c:1362
-#: src/datastore/plugin_datastore_mysql.c:1376
-#: src/datastore/plugin_datastore_sqlite.c:61
-#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
-#: src/include/gnunet_common.h:514
+#: src/datacache/plugin_datacache_mysql.c:97
+#: src/datacache/plugin_datacache_mysql.c:104
+#: src/datacache/plugin_datacache_sqlite.c:69
+#: src/datacache/plugin_datacache_sqlite.c:72
+#: src/datastore/plugin_datastore_mysql.c:803
+#: src/datastore/plugin_datastore_mysql.c:817
+#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
+#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
+#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:525
+#: src/include/gnunet_common.h:532
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:224
-#: src/datastore/plugin_datastore_mysql.c:316
-#, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_mysql.c:230
-#: src/datastore/plugin_datastore_mysql.c:322
-#, c-format
-msgid "Could not access file `%s': %s\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_mysql.c:979
+#: src/datacache/plugin_datacache_mysql.c:450
 msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:79
-#: src/datastore/plugin_datastore_postgres.c:93
-#, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr ""
-
-#: src/datacache/plugin_datacache_postgres.c:149
-#, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr ""
-
-#: src/datacache/plugin_datacache_postgres.c:499
+#: src/datacache/plugin_datacache_postgres.c:367
 msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:424
+#: src/datacache/plugin_datacache_sqlite.c:410
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:457
-#: src/datastore/plugin_datastore_sqlite.c:414
-#: src/namestore/plugin_namestore_sqlite.c:381
+#: src/datacache/plugin_datacache_sqlite.c:443
+#: src/datastore/plugin_datastore_sqlite.c:408
+#: src/namestore/plugin_namestore_sqlite.c:370
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
+#: src/datacache/plugin_datacache_sqlite.c:450
+#, c-format
+msgid "Failed to close statement %p: %d\n"
+msgstr ""
+
 #: src/datacache/plugin_datacache_template.c:121
 msgid "Template datacache running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:289
+#: src/datastore/datastore_api.c:305
 msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:372
+#: src/datastore/datastore_api.c:388
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:418
+#: src/datastore/datastore_api.c:432
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:445
+#: src/datastore/datastore_api.c:459
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:465
+#: src/datastore/datastore_api.c:477
 msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/datastore/datastore_api.c:513
+#: src/datastore/datastore_api.c:525
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:540
+#: src/datastore/datastore_api.c:548
 msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608
+#: src/datastore/datastore_api.c:612
 msgid "# transmission request failures"
 msgstr ""
 
-#: src/datastore/datastore_api.c:631
+#: src/datastore/datastore_api.c:633
 msgid "# bytes sent to datastore"
 msgstr ""
 
-#: src/datastore/datastore_api.c:772
+#: src/datastore/datastore_api.c:764
 msgid "Failed to receive status response from database."
 msgstr ""
 
-#: src/datastore/datastore_api.c:786
+#: src/datastore/datastore_api.c:778
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
+#: src/datastore/datastore_api.c:790 src/datastore/datastore_api.c:796
 msgid "Invalid error message received from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:810
+#: src/datastore/datastore_api.c:800
 msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:883
+#: src/datastore/datastore_api.c:869
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:954
+#: src/datastore/datastore_api.c:936
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1019
+#: src/datastore/datastore_api.c:997
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1080
+#: src/datastore/datastore_api.c:1054
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1148
+#: src/datastore/datastore_api.c:1118
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1193
+#: src/datastore/datastore_api.c:1163
 msgid "Failed to receive response from database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1253
+#: src/datastore/datastore_api.c:1221
 msgid "# Results received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1324
+#: src/datastore/datastore_api.c:1286
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1391
+#: src/datastore/datastore_api.c:1349
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1455
+#: src/datastore/datastore_api.c:1409
 msgid "# GET requests executed"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/datastore/gnunet-service-datastore.c:349
 msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:426
+#: src/datastore/gnunet-service-datastore.c:422
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:486
+#: src/datastore/gnunet-service-datastore.c:480
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:640
+#: src/datastore/gnunet-service-datastore.c:511
+msgid "Shutdown in progress, aborting transmission.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:626
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:685
+#: src/datastore/gnunet-service-datastore.c:669
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:696
+#: src/datastore/gnunet-service-datastore.c:680
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:700
+#: src/datastore/gnunet-service-datastore.c:684
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:706
+#: src/datastore/gnunet-service-datastore.c:690
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
-#: src/datastore/gnunet-service-datastore.c:765
-#: src/datastore/gnunet-service-datastore.c:986
-#: src/datastore/gnunet-service-datastore.c:1465
+#: src/datastore/gnunet-service-datastore.c:695
+#: src/datastore/gnunet-service-datastore.c:747
+#: src/datastore/gnunet-service-datastore.c:960
+#: src/datastore/gnunet-service-datastore.c:1417
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:780
+#: src/datastore/gnunet-service-datastore.c:760
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:868
+#: src/datastore/gnunet-service-datastore.c:846
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1034
+#: src/datastore/gnunet-service-datastore.c:1006
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1048
+#: src/datastore/gnunet-service-datastore.c:1018
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1076
+#: src/datastore/gnunet-service-datastore.c:1046
 msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1110
+#: src/datastore/gnunet-service-datastore.c:1076
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1145
+#: src/datastore/gnunet-service-datastore.c:1109
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1172
+#: src/datastore/gnunet-service-datastore.c:1134
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1182
+#: src/datastore/gnunet-service-datastore.c:1142
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1216
+#: src/datastore/gnunet-service-datastore.c:1174
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1260
+#: src/datastore/gnunet-service-datastore.c:1216
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1323
+#: src/datastore/gnunet-service-datastore.c:1277
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1332
+#: src/datastore/gnunet-service-datastore.c:1286
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1536
+#: src/datastore/gnunet-service-datastore.c:1488
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1547
+#: src/datastore/gnunet-service-datastore.c:1499
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1549
+#: src/datastore/gnunet-service-datastore.c:1501
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1562
+#: src/datastore/gnunet-service-datastore.c:1514
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1580
-#: src/datastore/gnunet-service-datastore.c:1596
+#: src/datastore/gnunet-service-datastore.c:1532
+#: src/datastore/gnunet-service-datastore.c:1548
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1626
+#: src/datastore/gnunet-service-datastore.c:1578
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1655
+#: src/datastore/gnunet-service-datastore.c:1607
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1660
+#: src/datastore/gnunet-service-datastore.c:1612
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1663
+#: src/datastore/gnunet-service-datastore.c:1615
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:529
-#: src/datastore/plugin_datastore_mysql.c:1336
+#: src/datastore/plugin_datastore_mysql.c:780
 #, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:622
-#: src/datastore/plugin_datastore_mysql.c:1346
+#: src/datastore/plugin_datastore_mysql.c:788
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:1581
+#: src/datastore/plugin_datastore_mysql.c:1019
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:173
-#, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
+#: src/datastore/plugin_datastore_postgres.c:824
+msgid "Failed to drop table from database.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:1017
+#: src/datastore/plugin_datastore_postgres.c:860
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/datastore/plugin_datastore_sqlite.c:57
 #, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:239
-#: src/namestore/plugin_namestore_sqlite.c:223
+#: src/datastore/plugin_datastore_sqlite.c:233
+#: src/namestore/plugin_namestore_sqlite.c:204
 #, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:266
-#: src/namestore/plugin_namestore_sqlite.c:248
+#: src/datastore/plugin_datastore_sqlite.c:260
+#: src/namestore/plugin_namestore_sqlite.c:229
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:669
+#: src/datastore/plugin_datastore_sqlite.c:655
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1159
+#: src/datastore/plugin_datastore_sqlite.c:1139
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1178
+#: src/datastore/plugin_datastore_sqlite.c:1158
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1218
-#: src/namestore/plugin_namestore_sqlite.c:779
+#: src/datastore/plugin_datastore_sqlite.c:1198
+#: src/namestore/plugin_namestore_sqlite.c:829
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -1123,32 +1126,31 @@ msgstr ""
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:280
+#: src/dht/dht_api.c:348
 msgid "Failed to connect to the DHT service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
-#: src/gns/gnunet-gns-lookup.c:179
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:293
+#: src/dht/gnunet-dht-put.c:192
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:182
+#: src/dht/gnunet-dht-get.c:204
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:207 src/gns/gnunet-gns-lookup.c:185
+#: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
-#: src/gns/gnunet-gns-lookup.c:188
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
-#: src/gns/gnunet-gns-lookup.c:191 src/nse/gnunet-nse-profiler.c:908
+#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-put.c:204 src/fs/gnunet-download.c:271
+#: src/fs/gnunet-publish.c:731 src/fs/gnunet-search.c:297
+#: src/fs/gnunet-unindex.c:169 src/nse/gnunet-nse-profiler.c:910
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1156,93 +1158,109 @@ msgstr ""
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:100
+#: src/dht/gnunet-dht-monitor.c:299
+msgid "how long to execute? 0 = forever"
+msgstr ""
+
+#: src/dht/gnunet-dht-monitor.c:321
+msgid "Prints all packets that go through the DHT."
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:108
 msgid "PUT request sent!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:124
+#: src/dht/gnunet-dht-put.c:111
+msgid "Timeout sending PUT request!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:114
+msgid "PUT request not confirmed!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:144
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:132
+#: src/dht/gnunet-dht-put.c:152
 #, c-format
 msgid "Could not connect to %s service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:137
+#: src/dht/gnunet-dht-put.c:157
 #, c-format
 msgid "Connected to %s service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:152
+#: src/dht/gnunet-dht-put.c:172
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:166
+#: src/dht/gnunet-dht-put.c:186
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:169
+#: src/dht/gnunet-dht-put.c:189
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:175
+#: src/dht/gnunet-dht-put.c:195
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:178
+#: src/dht/gnunet-dht-put.c:198
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:203
+#: src/dht/gnunet-dht-put.c:223
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:556
-#: src/testing/testing.c:1979 src/testing/testing.c:2009
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:544
+#: src/testing/testing.c:1968 src/testing/testing.c:1998
 msgid "Failed to connect to transport service!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:371
+#: src/dht/gnunet-service-dht_clients.c:407
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:462
+#: src/dht/gnunet-service-dht_clients.c:500
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:529
+#: src/dht/gnunet-service-dht_clients.c:584
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:624
+#: src/dht/gnunet-service-dht_clients.c:682
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:854
+#: src/dht/gnunet-service-dht_clients.c:919
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:869
+#: src/dht/gnunet-service-dht_clients.c:932
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:906
+#: src/dht/gnunet-service-dht_clients.c:967
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:928
+#: src/dht/gnunet-service-dht_clients.c:989
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:979
-#: src/dht/gnunet-service-dht_clients.c:1022
+#: src/dht/gnunet-service-dht_clients.c:1038
+#: src/dht/gnunet-service-dht_clients.c:1081
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:989
+#: src/dht/gnunet-service-dht_clients.c:1048
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -1255,28 +1273,28 @@ msgstr ""
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:209
+#: src/dht/gnunet-service-dht_datacache.c:207
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:220
+#: src/dht/gnunet-service-dht_datacache.c:218
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:226
+#: src/dht/gnunet-service-dht_datacache.c:224
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:236
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:241
+#: src/dht/gnunet-service-dht_datacache.c:239
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:271
+#: src/dht/gnunet-service-dht_datacache.c:269
 msgid "# GET requests given to datacache"
 msgstr ""
 
@@ -1288,82 +1306,77 @@ msgstr ""
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:573
+#: src/dht/gnunet-service-dht_neighbours.c:571
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:629
-#: src/dht/gnunet-service-dht_neighbours.c:689
-msgid "# Peers connected"
-msgstr ""
-
-#: src/dht/gnunet-service-dht_neighbours.c:723
+#: src/dht/gnunet-service-dht_neighbours.c:717
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:778
+#: src/dht/gnunet-service-dht_neighbours.c:772
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:816
+#: src/dht/gnunet-service-dht_neighbours.c:810
 msgid "# Bytes of bandwdith requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1040
-#: src/dht/gnunet-service-dht_neighbours.c:1068
+#: src/dht/gnunet-service-dht_neighbours.c:1032
+#: src/dht/gnunet-service-dht_neighbours.c:1060
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1049
-#: src/dht/gnunet-service-dht_neighbours.c:1085
+#: src/dht/gnunet-service-dht_neighbours.c:1041
+#: src/dht/gnunet-service-dht_neighbours.c:1075
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1221
+#: src/dht/gnunet-service-dht_neighbours.c:1207
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1252
+#: src/dht/gnunet-service-dht_neighbours.c:1236
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1333
+#: src/dht/gnunet-service-dht_neighbours.c:1315
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1364
+#: src/dht/gnunet-service-dht_neighbours.c:1342
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1467
+#: src/dht/gnunet-service-dht_neighbours.c:1443
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1555
+#: src/dht/gnunet-service-dht_neighbours.c:1531
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1668
+#: src/dht/gnunet-service-dht_neighbours.c:1647
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1676
+#: src/dht/gnunet-service-dht_neighbours.c:1655
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1767
+#: src/dht/gnunet-service-dht_neighbours.c:1746
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1788
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1825
+#: src/dht/gnunet-service-dht_neighbours.c:1802
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1895
+#: src/dht/gnunet-service-dht_neighbours.c:1876
 msgid "# P2P RESULTS received"
 msgstr ""
 
@@ -1383,29 +1396,28 @@ msgstr ""
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:236
+#: src/dht/gnunet-service-dht_routing.c:238
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:314
-#: src/dht/gnunet-service-dht_routing.c:368
+#: src/dht/gnunet-service-dht_routing.c:311
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
+#: src/dht/gnunet-service-dht_routing.c:352
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:124
+#: src/dht/plugin_block_dht.c:136
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:131
+#: src/dht/plugin_block_dht.c:143
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:140
+#: src/dht/plugin_block_dht.c:152
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -1434,67 +1446,68 @@ msgstr ""
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:480
+#: src/dns/gnunet-service-dns.c:485
 #, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:634
+#: src/dns/gnunet-service-dns.c:639
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:818
+#: src/dns/gnunet-service-dns.c:822
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1001
+#: src/dns/gnunet-service-dns.c:1005
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1046
+#: src/dns/gnunet-service-dns.c:1050
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1165
+#: src/dns/gnunet-service-dns.c:1168
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1198
-msgid "Changing DNS reply according to client specifications\n"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1279
+#: src/dns/gnunet-service-dns.c:1281
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1294
+#: src/dns/gnunet-service-dns.c:1297
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1303
+#: src/dns/gnunet-service-dns.c:1306
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1312
+#: src/dns/gnunet-service-dns.c:1315
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1377
+#: src/dns/gnunet-service-dns.c:1380
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1461
+#: src/dns/gnunet-service-dns.c:1465
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1497 src/exit/gnunet-daemon-exit.c:2674
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1567
+#: src/dns/gnunet-service-dns.c:1561 src/exit/gnunet-daemon-exit.c:3032
+#, c-format
+msgid "`%s' must be installed SUID, refusing to run\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:1581
 msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
@@ -1516,15 +1529,15 @@ msgstr ""
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2068
-#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1388
-#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+#: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2069
+#: src/exit/gnunet-daemon-exit.c:2319 src/vpn/gnunet-service-vpn.c:1394
+#: src/vpn/gnunet-service-vpn.c:1795 src/vpn/gnunet-service-vpn.c:1958
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2127
-#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1444
-#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+#: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2128
+#: src/exit/gnunet-daemon-exit.c:2378 src/vpn/gnunet-service-vpn.c:1450
+#: src/vpn/gnunet-service-vpn.c:1854 src/vpn/gnunet-service-vpn.c:1991
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -1571,124 +1584,124 @@ msgstr ""
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1470
+#: src/exit/gnunet-daemon-exit.c:1471
 msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1570
+#: src/exit/gnunet-daemon-exit.c:1571
 msgid "# TCP service creation requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1573 src/exit/gnunet-daemon-exit.c:1652
-#: src/exit/gnunet-daemon-exit.c:1762 src/exit/gnunet-daemon-exit.c:1992
-#: src/exit/gnunet-daemon-exit.c:2234 src/exit/gnunet-daemon-exit.c:2515
-#: src/exit/gnunet-daemon-exit.c:2615
+#: src/exit/gnunet-daemon-exit.c:1574 src/exit/gnunet-daemon-exit.c:1653
+#: src/exit/gnunet-daemon-exit.c:1763 src/exit/gnunet-daemon-exit.c:1993
+#: src/exit/gnunet-daemon-exit.c:2235 src/exit/gnunet-daemon-exit.c:2516
+#: src/exit/gnunet-daemon-exit.c:2616
 msgid "# Bytes received from MESH"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1606 src/exit/gnunet-daemon-exit.c:2637
+#: src/exit/gnunet-daemon-exit.c:1607 src/exit/gnunet-daemon-exit.c:2638
 #, c-format
 msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1610
+#: src/exit/gnunet-daemon-exit.c:1611
 msgid "# TCP requests dropped (no such service)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1655
+#: src/exit/gnunet-daemon-exit.c:1656
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1766
 msgid "# TCP data requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1779
+#: src/exit/gnunet-daemon-exit.c:1780
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1829
+#: src/exit/gnunet-daemon-exit.c:1830
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1995
+#: src/exit/gnunet-daemon-exit.c:1996
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2237
+#: src/exit/gnunet-daemon-exit.c:2238
 msgid "# ICMP service requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1378
-#: src/vpn/gnunet-service-vpn.c:1945
+#: src/exit/gnunet-daemon-exit.c:2304 src/vpn/gnunet-service-vpn.c:1384
+#: src/vpn/gnunet-service-vpn.c:1952
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1414
-#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+#: src/exit/gnunet-daemon-exit.c:2363 src/vpn/gnunet-service-vpn.c:1420
+#: src/vpn/gnunet-service-vpn.c:1432 src/vpn/gnunet-service-vpn.c:1842
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2412
+#: src/exit/gnunet-daemon-exit.c:2413
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2518
+#: src/exit/gnunet-daemon-exit.c:2519
 msgid "# UDP IP-exit requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2618
+#: src/exit/gnunet-daemon-exit.c:2619
 msgid "# UDP service requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2641
+#: src/exit/gnunet-daemon-exit.c:2642
 msgid "# UDP requests dropped (no such service)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2881
+#: src/exit/gnunet-daemon-exit.c:2882
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2895 src/exit/gnunet-daemon-exit.c:2907
+#: src/exit/gnunet-daemon-exit.c:2896 src/exit/gnunet-daemon-exit.c:2908
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2918
+#: src/exit/gnunet-daemon-exit.c:2919
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3047
+#: src/exit/gnunet-daemon-exit.c:3048
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3055
+#: src/exit/gnunet-daemon-exit.c:3056
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3062
+#: src/exit/gnunet-daemon-exit.c:3063
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3068
+#: src/exit/gnunet-daemon-exit.c:3069
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3074 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3075 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3235
+#: src/exit/gnunet-daemon-exit.c:3236
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1696,116 +1709,120 @@ msgstr ""
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:454
+#: src/fragmentation/defragmentation.c:456
 msgid "# fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:513
+#: src/fragmentation/defragmentation.c:521
 msgid "# duplicate fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:526
+#: src/fragmentation/defragmentation.c:534
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:188
+#: src/fragmentation/fragmentation.c:203
 msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:191
+#: src/fragmentation/fragmentation.c:206
 msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:255
+#: src/fragmentation/fragmentation.c:232
+msgid "# fragments wrap arounds"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:273
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:258
+#: src/fragmentation/fragmentation.c:276
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:343
+#: src/fragmentation/fragmentation.c:363
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:349
+#: src/fragmentation/fragmentation.c:369
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:373
+#: src/fragmentation/fragmentation.c:393
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:284
+#: src/fs/fs_api.c:339
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:293
+#: src/fs/fs_api.c:348
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_api.c:299
+#: src/fs/fs_api.c:354
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:877
+#: src/fs/fs_api.c:938
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1334
+#: src/fs/fs_api.c:1395
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1376
+#: src/fs/fs_api.c:1437
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1392
+#: src/fs/fs_api.c:1453
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2004
+#: src/fs/fs_api.c:2106
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2014
+#: src/fs/fs_api.c:2116
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
+#: src/fs/fs_api.c:2241 src/fs/fs_api.c:2480
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2156
+#: src/fs/fs_api.c:2258
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
+#: src/fs/fs_api.c:2270 src/fs/fs_api.c:2289 src/fs/fs_api.c:2773
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2369
+#: src/fs/fs_api.c:2471
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2615
+#: src/fs/fs_api.c:2717
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2709
+#: src/fs/fs_api.c:2811
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1814,53 +1831,57 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:311
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:330
+#: src/fs/fs_download.c:331
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:488 src/fs/fs_download.c:500
+#: src/fs/fs_download.c:497 src/fs/fs_download.c:509
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr ""
 
-#: src/fs/fs_download.c:870
+#: src/fs/fs_download.c:878
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:951
+#: src/fs/fs_download.c:960
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
+"offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:986
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1000
+#: src/fs/fs_download.c:1009
 #, c-format
-msgid "Download failed: could not open file `%s': %s\n"
+msgid "Download failed: could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1010
+#: src/fs/fs_download.c:1019
 #, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1028
 #, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
+msgstr ""
+
+#: src/fs/fs_download.c:1125
+msgid "internal error decoding tree"
 msgstr ""
 
-#: src/fs/fs_download.c:1835
+#: src/fs/fs_download.c:1888
 msgid "Invalid URI"
 msgstr ""
 
@@ -1936,62 +1957,62 @@ msgstr ""
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:395
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:397
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:616 src/fs/fs_publish.c:633 src/fs/fs_publish.c:672
-#: src/fs/fs_publish.c:692 src/fs/fs_publish.c:717 src/fs/fs_publish.c:857
+#: src/fs/fs_publish.c:621 src/fs/fs_publish.c:638 src/fs/fs_publish.c:677
+#: src/fs/fs_publish.c:697 src/fs/fs_publish.c:722 src/fs/fs_publish.c:862
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:618
+#: src/fs/fs_publish.c:623
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:630
+#: src/fs/fs_publish.c:635
 msgid "unknown error"
 msgstr ""
 
-#: src/fs/fs_publish.c:673
+#: src/fs/fs_publish.c:678
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:693
+#: src/fs/fs_publish.c:698
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:718
+#: src/fs/fs_publish.c:723
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:741
+#: src/fs/fs_publish.c:746
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:806
+#: src/fs/fs_publish.c:811
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:812
+#: src/fs/fs_publish.c:817
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:858
+#: src/fs/fs_publish.c:863
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1067
+#: src/fs/fs_publish.c:1071
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1138
+#: src/fs/fs_publish.c:1142
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2000,7 +2021,7 @@ msgstr ""
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_search.c:810
+#: src/fs/fs_search.c:829
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2010,39 +2031,58 @@ msgstr ""
 msgid "Failed to start daemon: %s\n"
 msgstr ""
 
-#: src/fs/fs_unindex.c:57
+#: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:62
+#: src/fs/fs_unindex.c:63
 msgid "Failed to read file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:231
+#: src/fs/fs_unindex.c:233
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:239
+#: src/fs/fs_unindex.c:241
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:247
+#: src/fs/fs_unindex.c:249
 msgid "Invalid response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:292
+#: src/fs/fs_unindex.c:293
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:325
+#: src/fs/fs_unindex.c:344
+msgid "Failed to get KSKs from directory scan."
+msgstr ""
+
+#: src/fs/fs_unindex.c:356
+#, c-format
+msgid "Internal error scanning `%s'.\n"
+msgstr ""
+
+#: src/fs/fs_unindex.c:411
+#, c-format
+msgid "Failed to remove KBlock: %s\n"
+msgstr ""
+
+#: src/fs/fs_unindex.c:501
+#, c-format
+msgid "Failed to parse URI `%s' from KBlock!\n"
+msgstr ""
+
+#: src/fs/fs_unindex.c:553 src/fs/fs_unindex.c:618
 msgid "Failed to connect to `datastore' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:338
+#: src/fs/fs_unindex.c:631
 msgid "Failed to open file for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:665
 msgid "Failed to compute hash of file."
 msgstr ""
 
@@ -2150,90 +2190,90 @@ msgstr ""
 msgid "Display contents of a GNUnet directory"
 msgstr ""
 
-#: src/fs/gnunet-download.c:100
+#: src/fs/gnunet-download.c:101
 #, c-format
 msgid "Starting download `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:109
+#: src/fs/gnunet-download.c:110
 msgid "<unknown time>"
 msgstr ""
 
-#: src/fs/gnunet-download.c:118
+#: src/fs/gnunet-download.c:119
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:128
+#: src/fs/gnunet-download.c:129
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:136
+#: src/fs/gnunet-download.c:137
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:151 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-download.c:152 src/fs/gnunet-publish.c:190
 #: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:176
+#: src/fs/gnunet-download.c:177
 msgid "You need to specify a URI argument.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-download.c:183 src/fs/gnunet-publish.c:624
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:189
+#: src/fs/gnunet-download.c:190
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:196
+#: src/fs/gnunet-download.c:197
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:602
 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:247 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:248 src/fs/gnunet-search.c:285
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:250
+#: src/fs/gnunet-download.c:251
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253 src/fs/gnunet-search.c:288
+#: src/fs/gnunet-download.c:254 src/fs/gnunet-search.c:288
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:256
+#: src/fs/gnunet-download.c:257
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:260
+#: src/fs/gnunet-download.c:261
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:264
+#: src/fs/gnunet-download.c:265
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267
+#: src/fs/gnunet-download.c:268
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:277
+#: src/fs/gnunet-download.c:278
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2247,69 +2287,64 @@ msgstr ""
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:167
 #, c-format
 msgid "Invalid argument `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:165
-#, c-format
-msgid "Namespace `%s' unknown.\n"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
+#: src/fs/gnunet-pseudonym.c:250 src/fs/gnunet-pseudonym.c:257
+#: src/fs/gnunet-pseudonym.c:259
 #, c-format
 msgid "Option `%s' ignored\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-pseudonym.c:279 src/fs/gnunet-publish.c:678
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:272
+#: src/fs/gnunet-pseudonym.c:282
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:275
+#: src/fs/gnunet-pseudonym.c:285
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:278
+#: src/fs/gnunet-pseudonym.c:288
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:697
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:285
+#: src/fs/gnunet-pseudonym.c:295
 msgid "print names of local namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:288
+#: src/fs/gnunet-pseudonym.c:298
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:291
+#: src/fs/gnunet-pseudonym.c:301
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-pseudonym.c:304 src/fs/gnunet-publish.c:716
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:297
+#: src/fs/gnunet-pseudonym.c:307
 msgid "specify ID of the root of the namespace"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:300
+#: src/fs/gnunet-pseudonym.c:310
 msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:308
+#: src/fs/gnunet-pseudonym.c:318
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2337,161 +2372,161 @@ msgstr ""
 msgid "Cleanup after abort complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:305
 #, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:301
+#: src/fs/gnunet-publish.c:307
 #, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:352
+#: src/fs/gnunet-publish.c:358
 #, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:433
 msgid "Could not publish\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:454
+#: src/fs/gnunet-publish.c:460
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:485
+#: src/fs/gnunet-publish.c:491
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:487
+#: src/fs/gnunet-publish.c:493
 #, c-format
 msgid "Scanning file `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:498
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-publish.c:503
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:501
+#: src/fs/gnunet-publish.c:507
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:505
+#: src/fs/gnunet-publish.c:511
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:518
 msgid "Internal error scanning directory.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:546
+#: src/fs/gnunet-publish.c:552
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:559
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:565
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:573 src/vpn/gnunet-vpn.c:214
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
-#: src/transport/gnunet-transport.c:530
+#: src/fs/gnunet-publish.c:583 src/fs/gnunet-publish.c:590
+#: src/transport/gnunet-transport.c:560
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:606
+#: src/fs/gnunet-publish.c:612
 #, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:639
+#: src/fs/gnunet-publish.c:645
 #, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:651
+#: src/fs/gnunet-publish.c:657
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:676
+#: src/fs/gnunet-publish.c:682
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:685
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-publish.c:689
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:687
+#: src/fs/gnunet-publish.c:693
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:700
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:699
+#: src/fs/gnunet-publish.c:705
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:703
+#: src/fs/gnunet-publish.c:709
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:707
+#: src/fs/gnunet-publish.c:713
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:719
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:717
+#: src/fs/gnunet-publish.c:723
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:721
+#: src/fs/gnunet-publish.c:727
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:736
+#: src/fs/gnunet-publish.c:742
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2538,23 +2573,12 @@ msgid "# Loopback routes suppressed"
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1290
-#: src/topology/gnunet-daemon-topology.c:1297
+#: src/topology/gnunet-daemon-topology.c:1330
+#: src/topology/gnunet-daemon-topology.c:1337
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
-#: src/topology/gnunet-daemon-topology.c:654
-#: src/topology/gnunet-daemon-topology.c:756
-#: src/transport/gnunet-service-transport_neighbours.c:960
-#: src/transport/gnunet-service-transport_neighbours.c:1289
-#: src/transport/gnunet-service-transport_neighbours.c:1841
-#: src/transport/gnunet-service-transport_neighbours.c:2499
-#: src/transport/gnunet-service-transport_neighbours.c:2566
-msgid "# peers connected"
-msgstr ""
-
 #: src/fs/gnunet-service-fs_cp.c:696
 msgid "# migration stop messages received"
 msgstr ""
@@ -2877,12 +2901,125 @@ msgstr ""
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gns_api.c:221
-msgid "Failed to connect to the GNS service!\n"
+#: src/gns/gnunet-gns.c:191
+msgid "Failed to connect to GNS\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:232
+msgid "try to shorten a given GNS name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:235
+msgid "Lookup a record using GNS (NOT IMPLEMENTED)"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:238
+msgid "Get the authority of a particular name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:241
+msgid "Specify the type of the record lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:244
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:255
+msgid "GNUnet GNS access tool"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:280
+#, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:333
+#, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:377
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:439
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:498
+#, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:514
+#, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:725 src/gns/gnunet-gns-fcfsd.c:737
+#, c-format
+msgid "Option `%s' not specified in configuration section `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:747 src/namestore/gnunet-namestore.c:299
+msgid "Failed to read or create private zone key\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:757 src/namestore/gnunet-namestore.c:310
+msgid "Failed to connect to namestore\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:773 src/gns/gnunet-gns-proxy.c:525
+msgid "Failed to start HTTP server\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:804
+msgid "GNUnet GNS first come first serve registration service"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:800
+msgid "listen on specified port"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:811
+msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns-lookup.c:210
-msgid "Issue a request to the GNUnet Naming System, prints results."
+#: src/hello/gnunet-hello.c:122
+msgid "Call with name of HELLO file to modify.\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:128
+#, c-format
+msgid "Error accessing file `%s': %s\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:136
+#, c-format
+msgid "File `%s' is too big to be a HELLO\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:143
+#, c-format
+msgid "File `%s' is too small to be a HELLO\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:153 src/hello/gnunet-hello.c:181
+#, c-format
+msgid "Error opening file `%s': %s\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:169
+#, c-format
+msgid "Did not find well-formed HELLO in file `%s'\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:193
+#, c-format
+msgid "Error writing HELLO to file `%s': %s\n"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist.c:264
@@ -2913,190 +3050,190 @@ msgstr ""
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:286
+#: src/hostlist/hostlist-client.c:289
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:340
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#: src/hostlist/hostlist-client.c:313 src/hostlist/hostlist-client.c:343
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:330
+#: src/hostlist/hostlist-client.c:331
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
+#: src/hostlist/hostlist-client.c:375 src/hostlist/hostlist-client.c:396
 #, c-format
 msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
-#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
-#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
-#: src/transport/plugin_transport_http_client.c:108
-#: src/transport/plugin_transport_http_client.c:123
+#: src/hostlist/hostlist-client.c:473 src/hostlist/hostlist-client.c:683
+#: src/hostlist/hostlist-client.c:689 src/hostlist/hostlist-client.c:741
+#: src/hostlist/hostlist-client.c:750 src/hostlist/hostlist-client.c:871
+#: src/hostlist/hostlist-client.c:961 src/hostlist/hostlist-client.c:966
+#: src/transport/plugin_transport_http_client.c:110
+#: src/transport/plugin_transport_http_client.c:125
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
+#: src/hostlist/hostlist-client.c:593 src/hostlist/hostlist-client.c:1331
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/hostlist/hostlist-client.c:623
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:663
+#: src/hostlist/hostlist-client.c:664
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:805
+#: src/hostlist/hostlist-client.c:802
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:822
+#: src/hostlist/hostlist-client.c:816
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/hostlist-client.c:836
 #, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
+msgid "Download of hostlist from `%s' failed: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:848
+#: src/hostlist/hostlist-client.c:842
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:856
+#: src/hostlist/hostlist-client.c:850
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:909
+#: src/hostlist/hostlist-client.c:903
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
+#: src/hostlist/hostlist-client.c:911
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1505
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1054
+#: src/hostlist/hostlist-client.c:1046
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
+#: src/hostlist/hostlist-client.c:1084
 msgid "Scheduled saving of hostlists\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1096
+#: src/hostlist/hostlist-client.c:1088
 #, c-format
 msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
+#: src/hostlist/hostlist-client.c:1111 src/hostlist/hostlist-client.c:1127
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1253
+#: src/hostlist/hostlist-client.c:1242
 #, c-format
 msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1284
+#: src/hostlist/hostlist-client.c:1273
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/hostlist/hostlist-client.c:1279
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1283
 #, c-format
 msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1305
+#: src/hostlist/hostlist-client.c:1294
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1338
+#: src/hostlist/hostlist-client.c:1327
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1340
+#: src/hostlist/hostlist-client.c:1329
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1362
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1387
+#: src/hostlist/hostlist-client.c:1376
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1392
+#: src/hostlist/hostlist-client.c:1381
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1428
+#: src/hostlist/hostlist-client.c:1417
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1480
+#: src/hostlist/hostlist-client.c:1470
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/hostlist-client.c:1473
 #, c-format
 msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1482
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1504
+#: src/hostlist/hostlist-client.c:1494
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1508
+#: src/hostlist/hostlist-client.c:1498
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
@@ -3109,8 +3246,10 @@ msgstr ""
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:184
-#: src/topology/gnunet-daemon-topology.c:875
+#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:425
+#: src/peerinfo-tool/gnunet-peerinfo.c:403
+#: src/peerinfo-tool/gnunet-peerinfo.c:519
+#: src/topology/gnunet-daemon-topology.c:927
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
@@ -3119,240 +3258,537 @@ msgstr ""
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:221
+#: src/hostlist/hostlist-server.c:219
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:269
+#: src/hostlist/hostlist-server.c:263
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:272
+#: src/hostlist/hostlist-server.c:266
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:280
+#: src/hostlist/hostlist-server.c:273
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:287
+#: src/hostlist/hostlist-server.c:279
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:291
+#: src/hostlist/hostlist-server.c:283
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/hostlist-server.c:291
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:294
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:306
+#: src/hostlist/hostlist-server.c:298
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:307
+#: src/hostlist/hostlist-server.c:299
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:350
+#: src/hostlist/hostlist-server.c:341
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:397
+#: src/hostlist/hostlist-server.c:388
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:565
+#: src/hostlist/hostlist-server.c:561
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:574
+#: src/hostlist/hostlist-server.c:570
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:588
+#: src/hostlist/hostlist-server.c:584
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:626
+#: src/hostlist/hostlist-server.c:624
+#, c-format
+msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgstr ""
+
+#: src/hostlist/hostlist-server.c:666
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4595
+#: src/integration-tests/connection_watchdog.c:997
+#, c-format
+msgid "Transport plugin: `%s' port %llu\n"
+msgstr ""
+
+#: src/integration-tests/connection_watchdog.c:1030
+#, c-format
+msgid "Found %u transport plugins: `%s'\n"
+msgstr ""
+
+#: src/integration-tests/connection_watchdog.c:1089
+msgid "Send ping messages to test connectivity (default == NO)"
+msgstr ""
+
+#: src/integration-tests/connection_watchdog.c:1095
+#: src/template/gnunet-template.c:68
+msgid "help text"
+msgstr ""
+
+#: src/mesh/gnunet-service-mesh.c:4590
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4789
+#: src/mesh/gnunet-service-mesh.c:4784
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4798
+#: src/mesh/gnunet-service-mesh.c:4793
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:272 src/namestore/namestore_api.c:313
+#: src/mysql/mysql.c:174
+#, c-format
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr ""
+
+#: src/mysql/mysql.c:181
+#, c-format
+msgid "Could not access file `%s': %s\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:157
+#, c-format
+msgid "Adding record failed: %s\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:183
+#, c-format
+msgid "Deleting record failed: %s\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:239
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:276
+#, c-format
+msgid "Option `%s' not given, but I need a zone key file!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:281
+#, c-format
+msgid "Using default zone file `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:291
+#, c-format
+msgid "No options given\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:321
+#, c-format
+msgid "Unsupported type `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:328 src/namestore/gnunet-namestore.c:350
+#: src/namestore/gnunet-namestore.c:374 src/namestore/gnunet-namestore.c:384
+#: src/namestore/gnunet-namestore.c:409
+#, c-format
+msgid "Missing option `%s' for operation `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:329 src/namestore/gnunet-namestore.c:351
+msgid "add/del"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:341
+#, c-format
+msgid "Value `%s' invalid for record type `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:366
+#, c-format
+msgid "Invalid time format `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:375 src/namestore/gnunet-namestore.c:385
+msgid "add"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:410
+msgid "del"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:462
+msgid "add record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:465
+msgid "delete record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:468
+msgid "display records"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:471
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:474
+msgid "name of the record to add/delete/display"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:477
+msgid "type of the record to add/delete/display"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:480
+msgid "value of the record to add/delete"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:483
+msgid "create or list public record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:486
+msgid "create or list non-authority record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:489
+msgid "filename with the zone key"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:500
+msgid "GNUnet zone manipulation tool"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:143
+#, c-format
+msgid "File zone `%s' but corrupt content already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:154
+#, c-format
+msgid "File zone `%s' containing this key already exists\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:160
+#, c-format
+msgid ""
+"File zone `%s' but different zone key already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:198
+#, c-format
+msgid "Stored zonekey for zone `%s' in file `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:1909
+msgid "No directory to load zonefiles specified in configuration\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:1918
+#, c-format
+msgid "Creating directory `%s' for zone files failed!\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:315 src/namestore/namestore_api.c:353
 msgid "Namestore added record successfully"
 msgstr ""
 
-#: src/namestore/namestore_api.c:281 src/namestore/namestore_api.c:322
+#: src/namestore/namestore_api.c:323
 msgid "Namestore failed to add record"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:289
+#: src/namestore/namestore_api.c:361
+msgid "Namestore record already existed"
+msgstr ""
+
+#: src/namestore/namestore_api.c:368
+msgid "Namestore failed to add record\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:401
+msgid "Namestore removed record successfully"
+msgstr ""
+
+#: src/namestore/namestore_api.c:408
+msgid "No records for entry"
+msgstr ""
+
+#: src/namestore/namestore_api.c:415
+msgid "Could not find record to remove"
+msgstr ""
+
+#: src/namestore/namestore_api.c:422
+msgid "Failed to create new signature"
+msgstr ""
+
+#: src/namestore/namestore_api.c:429
+msgid "Failed to put new set of records in database"
+msgstr ""
+
+#: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:328
+#: src/nat/gnunet-nat-server.c:318
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat.c:803
+#: src/nat/nat.c:799
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:852
+#: src/nat/nat.c:844
 #, c-format
 msgid "Failed to start %s\n"
 msgstr ""
 
-#: src/nat/nat.c:1121
+#: src/nat/nat.c:1111
 #, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr ""
 
-#: src/nat/nat.c:1187 src/nat/nat.c:1197
+#: src/nat/nat.c:1177 src/nat/nat.c:1187
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1329
+#: src/nat/nat.c:1321
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1341
+#: src/nat/nat.c:1332
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat_test.c:348
+#: src/nat/nat_test.c:341
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/nat/nat_test.c:418
+#: src/nat/nat_test.c:411
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:926
+#: src/nse/gnunet-nse-profiler.c:928
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:936
+#: src/nse/gnunet-service-nse.c:925
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
-#: src/nse/gnunet-service-nse.c:1431
+#: src/nse/gnunet-service-nse.c:1381 src/nse/gnunet-service-nse.c:1400
+#: src/nse/gnunet-service-nse.c:1421
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1398
+#: src/nse/gnunet-service-nse.c:1388
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1419
+#: src/nse/gnunet-service-nse.c:1409
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:133
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:195
+#: src/peerinfo/gnunet-service-peerinfo.c:203
+#, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:229
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
+#: src/peerinfo/gnunet-service-peerinfo.c:254
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:305
+#: src/peerinfo/gnunet-service-peerinfo.c:353
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:279
+#: src/peerinfo/gnunet-service-peerinfo.c:710
 #, c-format
-msgid "Failed to transmit message to `%s' service.\n"
+msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:435
-msgid "Failed to receive response from `PEERINFO' service."
+#: src/peerinfo/peerinfo_api.c:238
+msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
-msgid "Received invalid message from `PEERINFO' service.\n"
+#: src/peerinfo/peerinfo_api.c:358
+msgid "failed to transmit request (service down?)"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:505
+msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:523
-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
+#: src/peerinfo/peerinfo_api.c:531 src/peerinfo/peerinfo_api.c:550
+#: src/peerinfo/peerinfo_api.c:565 src/peerinfo/peerinfo_api.c:576
+#: src/peerinfo/peerinfo_api.c:587
+msgid "Received invalid message from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:557
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
+#: src/peerinfo/peerinfo_api.c:663
+msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api_notify.c:258
+#: src/peerinfo/peerinfo_api_notify.c:256
 #, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/peerinfo-tool/gnunet-peerinfo.c:581
+msgid "Failed to parse HELLO message: missing expiration time\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:589
+msgid "Failed to parse HELLO message: invalid expiration time\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:598
+msgid "Failed to parse HELLO message: malformed\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:608
+msgid "Failed to parse HELLO message: missing transport plugin\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:625
+#, c-format
+msgid "Plugin `%s' not found\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:634
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:653
+#, c-format
+msgid "Failed to parse `%s' as an address for plugin `%s'\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:685
+#, c-format
+msgid "Failure adding HELLO: %s\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:833
 #, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#: src/peerinfo-tool/gnunet-peerinfo.c:840
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
+#: src/peerinfo-tool/gnunet-peerinfo.c:875
+#, c-format
+msgid "Invalid URI `%s'\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:899
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
+#: src/peerinfo-tool/gnunet-peerinfo.c:936
+msgid "don't resolve host names"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:939
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:942
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:945
+msgid "list all known peers"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:948
+msgid "also output HELLO uri(s)"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:951
+msgid "add given HELLO uri to the database"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:957
 msgid "Print information about peers."
 msgstr ""
 
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
+#: src/transport/gnunet-service-transport_plugins.c:118
+#, c-format
+msgid "Starting transport plugins `%s'\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
+#: src/transport/gnunet-service-transport_plugins.c:122
+#, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
+#: src/transport/gnunet-service-transport_plugins.c:150
+#, c-format
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr ""
+
+#: src/postgres/postgres.c:59
+#, c-format
+msgid "`%s:%s' failed at %s:%d with error: %s"
+msgstr ""
+
+#: src/postgres/postgres.c:148
+#, c-format
+msgid "Unable to initialize Postgres: %s"
+msgstr ""
+
 #: src/pt/gnunet-daemon-pt.c:264
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
@@ -3411,46 +3847,62 @@ msgstr ""
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:209
+#: src/statistics/gnunet-service-statistics.c:271
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:267
+#: src/statistics/gnunet-service-statistics.c:330
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:98
+#: src/statistics/gnunet-statistics.c:122
 msgid "Failed to obtain statistics.\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:164
+#: src/statistics/gnunet-statistics.c:199
+#, c-format
+msgid "No subsystem or name given\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:207
+#, c-format
+msgid "Failed to initialize watch routine\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:227
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:167
+#: src/statistics/gnunet-statistics.c:230
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:170
+#: src/statistics/gnunet-statistics.c:233
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:173
+#: src/statistics/gnunet-statistics.c:236
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:180
+#: src/statistics/gnunet-statistics.c:239
+msgid "watch value continously"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:246
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/statistics_api.c:390
-msgid "Failed to connect to statistics service!\n"
+#: src/statistics/statistics_api.c:456
+msgid "Could not save some persistent statistics\n"
 msgstr ""
 
-#: src/template/gnunet-template.c:68
-msgid "help text"
+#: src/statistics/statistics_api.c:999
+msgid ""
+"Failed to receive acknowledgement from statistics service, some statistics "
+"might have been lost!\n"
 msgstr ""
 
 #: src/testing/gnunet-testing.c:157
@@ -3494,577 +3946,415 @@ msgstr ""
 msgid "Could not access hostkey.\n"
 msgstr ""
 
-#: src/testing/testing.c:204
+#: src/testing/testing.c:200
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:218 src/testing/testing.c:808
+#: src/testing/testing.c:214 src/testing/testing.c:798
 msgid "`scp' did not complete cleanly.\n"
 msgstr ""
 
-#: src/testing/testing.c:239
+#: src/testing/testing.c:237
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:240
+#: src/testing/testing.c:238
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:292
+#: src/testing/testing.c:286
 #, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr ""
 
-#: src/testing/testing.c:299
+#: src/testing/testing.c:293
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:300 src/testing/testing.c:488
+#: src/testing/testing.c:294 src/testing/testing.c:471
 msgid "Failed to start `ssh' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:360
+#: src/testing/testing.c:354
 #, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:364
+#: src/testing/testing.c:358
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr ""
 
-#: src/testing/testing.c:374
+#: src/testing/testing.c:368
 msgid "Failed to get hostkey!\n"
 msgstr ""
 
-#: src/testing/testing.c:406
+#: src/testing/testing.c:400
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:480
+#: src/testing/testing.c:463
 #, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr ""
 
-#: src/testing/testing.c:487
+#: src/testing/testing.c:470
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:509 src/testing/testing.c:612
+#: src/testing/testing.c:493 src/testing/testing.c:600
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:510 src/testing/testing.c:613
-#: src/testing/testing.c:633
+#: src/testing/testing.c:494 src/testing/testing.c:601
+#: src/testing/testing.c:621
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:582
+#: src/testing/testing.c:570
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:632
+#: src/testing/testing.c:620
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/testing/testing.c:653 src/testing/testing.c:685
+#: src/testing/testing.c:643 src/testing/testing.c:675
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:668 src/testing/testing.c:723
+#: src/testing/testing.c:658 src/testing/testing.c:713
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr ""
 
-#: src/testing/testing.c:796
+#: src/testing/testing.c:786
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:966
+#: src/testing/testing.c:948
 #, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr ""
 
-#: src/testing/testing.c:1237 src/testing/testing_group.c:6278
+#: src/testing/testing.c:1207 src/testing/testing_group.c:6154
 #, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr ""
 
-#: src/testing/testing.c:1322 src/testing/testing.c:1397
+#: src/testing/testing.c:1292 src/testing/testing.c:1359
 #, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr ""
 
-#: src/testing/testing.c:1480
+#: src/testing/testing.c:1448
 #, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr ""
 
-#: src/testing/testing.c:1610
+#: src/testing/testing.c:1601
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1618
+#: src/testing/testing.c:1609
 msgid "Failed to write new configuration to disk."
 msgstr ""
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1636
 #, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr ""
 
-#: src/testing/testing.c:1650
+#: src/testing/testing.c:1639
 msgid "Failed to copy new configuration to remote machine."
 msgstr ""
 
-#: src/testing/testing.c:1805
+#: src/testing/testing.c:1794
 msgid "Peers failed to connect"
 msgstr ""
 
-#: src/testing/testing.c:1933
+#: src/testing/testing.c:1922
 msgid "Failed to connect to core service of first peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:2156
+#: src/testing/testing.c:2145
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1910 src/testing/testing_group.c:1922
-#: src/testing/testing_group.c:2023 src/testing/testing_group.c:2082
-#: src/testing/testing_group.c:2171 src/testing/testing_group.c:2191
-#: src/testing/testing_group.c:2328 src/testing/testing_peergroup.c:940
+#: src/testing/testing_group.c:1895 src/testing/testing_group.c:1907
+#: src/testing/testing_group.c:2008 src/testing/testing_group.c:2065
+#: src/testing/testing_group.c:2152 src/testing/testing_group.c:2172
+#: src/testing/testing_group.c:2302 src/testing/testing_peergroup.c:950
 #, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1932
-#, c-format
-msgid "Target is %d connections per peer."
-msgstr ""
-
-#: src/testing/testing_group.c:2179
+#: src/testing/testing_group.c:2160
 #, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2209 src/testing/testing_group.c:2402
-#, c-format
-msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2246
-#, c-format
-msgid "natural log of %d is %d, will run %d iterations\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2249
-#, c-format
-msgid "Total connections added thus far: %u!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2290
-#, c-format
-msgid "Total connections added for small world: %d!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2342
-#, c-format
-msgid "rand is %f probability is %f\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
+#: src/testing/testing_group.c:2877 src/testing/testing_group.c:3063
 #, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
 "file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3020
-msgid "Finished copying all friend files!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3133
-#, c-format
-msgid "Copying file with command cp %s %s\n"
+#: src/testing/testing_group.c:3957
+msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3156
-#, c-format
-msgid "Copying file with command scp %s %s\n"
+#: src/testing/testing_group.c:5226
+msgid "Unknown topology specification, can't connect peers!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3173
-#, c-format
-msgid "Checking copy status of file %d\n"
+#: src/testing/testing_group.c:5944 src/transport/transport-testing.c:636
+msgid "Could not read hostkeys file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3191
+#: src/testing/testing_group.c:6011
 #, c-format
-msgid "File %d copied\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3206
-msgid "Finished copying all blacklist files!\n"
+msgid "Could not create configuration for peer number %u on `%s'!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
-#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
-msgid "Delaying connect, we have too many outstanding connections!\n"
+#: src/testing/testing_new.c:169
+msgid "tmppath cannot be NULL\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
-#: src/testing/testing_group.c:5035
+#: src/testing/testing_new.c:356
 #, c-format
-msgid "Creating connection, outstanding_connections is %d\n"
+msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3608
+#: src/testing/testing_new.c:365
 #, c-format
-msgid "Offering HELLO of peer %s to peer %s\n"
+msgid "Could not open hostkeys file: %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3734
+#: src/testing/testing_new.c:380
 #, c-format
-msgid "Creating connection, outstanding_connections is %d (max %d)\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3988
-msgid "Creating clique topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3993
-msgid "Creating small world (ring) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3998
-msgid "Creating small world (2d-torus) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4002
-msgid "Creating ring topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4006
-msgid "Creating 2d torus topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4010
-msgid "Creating Erdos-Renyi topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4014
-msgid "Creating InterNAT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4018
-msgid "Creating Scale Free topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4023
-msgid "Creating straight line topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4027
-msgid "Creating topology from file!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4043
-msgid "Creating no allowed topology (all peers can connect at core level)\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4058
-msgid "Failed during friend file copying!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4064
-msgid "Friend files created/copied successfully!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4081
-msgid "Blacklisting all but clique topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4087
-msgid "Blacklisting all but small world (ring) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4093
-msgid "Blacklisting all but small world (2d-torus) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4099
-msgid "Blacklisting all but ring topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4105
-msgid "Blacklisting all but 2d torus topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4111
-msgid "Blacklisting all but Erdos-Renyi topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4117
-msgid "Blacklisting all but InterNAT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4152
-msgid "Blacklisting all but Scale Free topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4158
-msgid "Blacklisting all but straight line topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4173
-msgid "Failed during blacklist file copying!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4179
-msgid "Blacklist files created/copied successfully!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5263
-msgid "Creating clique CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5270
-msgid "Creating small world (ring) CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5277
-msgid "Creating small world (2d-torus) CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5283
-msgid "Creating ring CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5290
-msgid "Creating 2d torus CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5297
-msgid "Creating Erdos-Renyi CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5304
-msgid "Creating InterNAT CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5311
-msgid "Creating Scale Free CONNECT topology\n"
+msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5318
-msgid "Creating straight line CONNECT topology\n"
+#: src/testing/testing_new.c:437
+#, c-format
+msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5324
-msgid "Creating no CONNECT topology\n"
+#: src/testing/testing_new.c:446
+#, c-format
+msgid "Error while decoding key %u\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5330
-msgid "Unknown topology specification, can't connect peers!\n"
+#: src/testing/testing_new.c:680
+msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5340
+#: src/testing/testing_new.c:691
 #, c-format
-msgid "Connecting random subset (%'.2f percent) of possible peers\n"
+msgid ""
+"You attempted to create a testbed with more than %u hosts.  Please "
+"precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5348
+#: src/testing/testing_new.c:704
 #, c-format
-msgid "Connecting a minimum of %u peers each (if possible)\n"
+msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5357
+#: src/testing/testing_new.c:734
 #, c-format
-msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
+msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5367
+#: src/testing/testing_new.c:751
 #, c-format
-msgid "Finding additional %u closest peers each (if possible)\n"
+msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:650
-msgid "Could not read hostkeys file!\n"
+#: src/testing/testing_new.c:791
+#, c-format
+msgid "Failed to start `%s': %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6131
+#: src/testing/testing_new.c:959
 #, c-format
-msgid "Could not create configuration for peer number %u on `%s'!\n"
+msgid "Failed to load configuration from %s\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:244
+#: src/topology/gnunet-daemon-topology.c:259
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:380
+#: src/topology/gnunet-daemon-topology.c:392
 msgid "# connect requests issued to transport"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:675
-#: src/topology/gnunet-daemon-topology.c:761
+#: src/topology/gnunet-daemon-topology.c:730
+#: src/topology/gnunet-daemon-topology.c:815
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:950
+#: src/topology/gnunet-daemon-topology.c:996
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:982
+#: src/topology/gnunet-daemon-topology.c:1026
 #, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:994
+#: src/topology/gnunet-daemon-topology.c:1039
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1000
+#: src/topology/gnunet-daemon-topology.c:1045
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/topology/gnunet-daemon-topology.c:1054
 #, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1017
+#: src/topology/gnunet-daemon-topology.c:1062
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1037
+#: src/topology/gnunet-daemon-topology.c:1082
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1050
+#: src/topology/gnunet-daemon-topology.c:1095
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1060
+#: src/topology/gnunet-daemon-topology.c:1105
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1066
+#: src/topology/gnunet-daemon-topology.c:1111
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1076
+#: src/topology/gnunet-daemon-topology.c:1121
 msgid "# friends in configuration"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1082
+#: src/topology/gnunet-daemon-topology.c:1127
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1089
+#: src/topology/gnunet-daemon-topology.c:1134
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1169
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1183
+#: src/topology/gnunet-daemon-topology.c:1224
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1323
+#: src/topology/gnunet-daemon-topology.c:1363
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:247
+#: src/transport/gnunet-service-transport_blacklist.c:246
 #, c-format
 msgid "Could not read blacklist file `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:254
+#: src/transport/gnunet-service-transport_blacklist.c:252
 #, c-format
 msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
+#: src/transport/gnunet-service-transport_blacklist.c:263
 #, c-format
 msgid "Failed to read blacklist from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
+#: src/transport/gnunet-service-transport_blacklist.c:284
+#: src/transport/gnunet-service-transport_blacklist.c:308
 #, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
+#: src/transport/gnunet-service-transport_blacklist.c:295
+#: src/transport/gnunet-service-transport_blacklist.c:331
 #, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:350
+#: src/transport/gnunet-service-transport_blacklist.c:345
 #, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:364
+#: src/transport/gnunet-service-transport_blacklist.c:359
 #, c-format
 msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:523
-#: src/transport/gnunet-service-transport_blacklist.c:764
+#: src/transport/gnunet-service-transport_blacklist.c:514
+#: src/transport/gnunet-service-transport_blacklist.c:747
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:158
+#: src/transport/gnunet-service-transport.c:163
 msgid "# bytes payload discarded due to not connected peer "
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:572
+#: src/transport/gnunet-service-transport.c:237
+msgid "# bytes total received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:284
+msgid "# bytes payload received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:582
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:581
+#: src/transport/gnunet-service-transport.c:591
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:353
+#: src/transport/gnunet-service-transport_clients.c:352
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:358
+#: src/transport/gnunet-service-transport_clients.c:357
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:510
+#: src/transport/gnunet-service-transport_clients.c:503
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:628
-msgid "# bytes payload received for other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:645
+#: src/transport/gnunet-service-transport_clients.c:631
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:696
+#: src/transport/gnunet-service-transport_clients.c:682
 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
@@ -4072,568 +4362,515 @@ msgstr ""
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:482
-msgid "# failed connection attempts due to timeout"
+#: src/transport/gnunet-service-transport_neighbours.c:1032
+msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:883
-msgid "# peers disconnected due to external request"
+#: src/transport/gnunet-service-transport_neighbours.c:1148
+#: src/transport/gnunet-service-transport_neighbours.c:1482
+msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:966
-msgid "# fast reconnects failed"
+#: src/transport/gnunet-service-transport_neighbours.c:1153
+msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1022
-msgid "# peers disconnected due to timeout"
+#: src/transport/gnunet-service-transport_neighbours.c:1158
+msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1215
+msgid "# messages timed out while in transport queue"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1254
 msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1088
-msgid "# peers disconnected due to global disconnect"
+#: src/transport/gnunet-service-transport_neighbours.c:1278
+msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1888
-#: src/transport/gnunet-service-transport_neighbours.c:1909
-msgid "# messages not sent (no such peer or not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1286
+msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1925
-msgid "# bytes in message queue for other peers"
+#: src/transport/gnunet-service-transport_neighbours.c:1323
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1977
+#: src/transport/gnunet-service-transport_neighbours.c:1332
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1388
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2013
+#: src/transport/gnunet-service-transport_neighbours.c:1422
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2031
+#: src/transport/gnunet-service-transport_neighbours.c:1438
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2060
-msgid "# KEEPALIVE messages discarded (not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:2544
+msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2113
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:2559
+#: src/transport/gnunet-service-transport_neighbours.c:2585
+msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2121
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+#: src/transport/gnunet-service-transport_neighbours.c:2598
+msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2627
+msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2187
+#: src/transport/gnunet-service-transport_neighbours.c:2807
+msgid "# unexpected SESSION ACK messages"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2856
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2205
+#: src/transport/gnunet-service-transport_neighbours.c:2870
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2323
+#: src/transport/gnunet-service-transport_neighbours.c:2901
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2336
+#: src/transport/gnunet-service-transport_neighbours.c:2912
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2411
-msgid "# unexpected CONNECT_ACK messages (no peer)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:2453
-msgid "# unexpected CONNECT_ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:2943
+msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2544
-msgid "# unexpected ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:3020
+msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
 #: src/transport/gnunet-service-transport_plugins.c:111
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:118
-#, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_plugins.c:122
-#, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_plugins.c:150
-#, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_validation.c:410
+#: src/transport/gnunet-service-transport_validation.c:414
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:459
+#: src/transport/gnunet-service-transport_validation.c:463
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:508
+#: src/transport/gnunet-service-transport_validation.c:512
 msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:566
+#: src/transport/gnunet-service-transport_validation.c:570
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:798
+#: src/transport/gnunet-service-transport_validation.c:805
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:833
+#: src/transport/gnunet-service-transport_validation.c:840
 #, c-format
 msgid ""
 "Not confirming PING with address `%s' since I cannot confirm having this "
 "address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:919
+#: src/transport/gnunet-service-transport_validation.c:924
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:928
+#: src/transport/gnunet-service-transport_validation.c:933
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1050
+#: src/transport/gnunet-service-transport_validation.c:1055
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1080
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1134
+#: src/transport/gnunet-service-transport_validation.c:1136
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:256
+#: src/transport/gnunet-transport.c:260
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:269
+#: src/transport/gnunet-transport.c:273
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:319
+#: src/transport/gnunet-transport.c:323
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:326
+#: src/transport/gnunet-transport.c:330
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:359
+#: src/transport/gnunet-transport.c:363
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:379
+#: src/transport/gnunet-transport.c:383
 #, c-format
 msgid "Connected to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:410
+#: src/transport/gnunet-transport.c:414
 #, c-format
 msgid "Disconnected from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:439
+#: src/transport/gnunet-transport.c:443
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:453
+#: src/transport/gnunet-transport.c:466
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:483
+#: src/transport/gnunet-transport.c:473
+#, c-format
+msgid "Peer `%s': %s <unable to resolve address>\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:501
 #, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:539
+#: src/transport/gnunet-transport.c:569
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:587
+#: src/transport/gnunet-transport.c:618
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:590
+#: src/transport/gnunet-transport.c:621
 msgid "try to connect to the given peer"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:593
+#: src/transport/gnunet-transport.c:624
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:596
+#: src/transport/gnunet-transport.c:627
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:599
+#: src/transport/gnunet-transport.c:630
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:603
+#: src/transport/gnunet-transport.c:634
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:606
+#: src/transport/gnunet-transport.c:637
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:614
+#: src/transport/gnunet-transport.c:645
 msgid "Direct access to transport service."
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:981
+#: src/transport/plugin_transport_http.c:1100
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1029
+#: src/transport/plugin_transport_http.c:1149
 msgid "Require valid port number for service in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1054 src/util/service.c:986
+#: src/transport/plugin_transport_http.c:1174 src/util/service.c:1036
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1071 src/util/service.c:1003
+#: src/transport/plugin_transport_http.c:1191 src/util/service.c:1053
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1176
+#: src/transport/plugin_transport_http.c:1296
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1189
+#: src/transport/plugin_transport_http.c:1309
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1264
+#: src/transport/plugin_transport_http.c:1386
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1277
+#: src/transport/plugin_transport_http.c:1399
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1288
+#: src/transport/plugin_transport_http.c:1410
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1308
+#: src/transport/plugin_transport_http.c:1430
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1338
+#: src/transport/plugin_transport_http.c:1460
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:621
+#: src/transport/plugin_transport_http_client.c:624
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:189
+#: src/transport/plugin_transport_http_server.c:178
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:213
+#: src/transport/plugin_transport_http_server.c:202
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:370
-#, c-format
-msgid "Received malformed message via %s. Ignored.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:457
-msgid "SMTP filter string to invalid, lacks ': '\n"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:466
-#, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:561
-#: src/transport/plugin_transport_smtp.c:571
-#: src/transport/plugin_transport_smtp.c:584
-#: src/transport/plugin_transport_smtp.c:603
-#: src/transport/plugin_transport_smtp.c:626
-#: src/transport/plugin_transport_smtp.c:634
-#: src/transport/plugin_transport_smtp.c:647
-#: src/transport/plugin_transport_smtp.c:658
-#, c-format
-msgid "SMTP: `%s' failed: %s.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:801
-msgid "No email-address specified, can not start SMTP transport.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:813
-msgid "# bytes received via SMTP"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:814
-msgid "# bytes sent via SMTP"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:816
-msgid "# bytes dropped by SMTP (outgoing)"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:512
+#: src/transport/plugin_transport_tcp.c:591
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:616
-#: src/transport/plugin_transport_tcp.c:705
-#: src/transport/plugin_transport_tcp.c:757
-#: src/transport/plugin_transport_tcp.c:830
-#: src/transport/plugin_transport_tcp.c:909
+#: src/transport/plugin_transport_tcp.c:767
+#: src/transport/plugin_transport_tcp.c:856
+#: src/transport/plugin_transport_tcp.c:906
+#: src/transport/plugin_transport_tcp.c:992
+#: src/transport/plugin_transport_tcp.c:1086
+#: src/transport/plugin_transport_tcp.c:1103
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:622
-#: src/transport/plugin_transport_tcp.c:856
-#: src/transport/plugin_transport_tcp.c:1561
+#: src/transport/plugin_transport_tcp.c:774
+#: src/transport/plugin_transport_tcp.c:963
+#: src/transport/plugin_transport_tcp.c:1761
+#: src/transport/plugin_transport_tcp.c:2390
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:709
+#: src/transport/plugin_transport_tcp.c:860
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:760
+#: src/transport/plugin_transport_tcp.c:909
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:834
+#: src/transport/plugin_transport_tcp.c:996
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1081
+#: src/transport/plugin_transport_tcp.c:1290
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1116
-msgid "Found valid IPv4 NAT address (creating session)!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1186
+#: src/transport/plugin_transport_tcp.c:1401
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1603
+#: src/transport/plugin_transport_tcp.c:1802
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1756
+#: src/transport/plugin_transport_tcp.c:1973
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1823
+#: src/transport/plugin_transport_tcp.c:2043
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
+#: src/transport/plugin_transport_tcp.c:2279 src/util/service.c:940
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1976
+#: src/transport/plugin_transport_tcp.c:2293
 msgid "Failed to start service.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2039
+#: src/transport/plugin_transport_tcp.c:2355
 #, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2062
+#: src/transport/plugin_transport_tcp.c:2378
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2066
+#: src/transport/plugin_transport_tcp.c:2382
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2386
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:130
+#: src/transport/plugin_transport_udp_broadcasting.c:128
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:172
+#: src/transport/plugin_transport_udp_broadcasting.c:169
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:393
+#: src/transport/plugin_transport_udp_broadcasting.c:367
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1985
+#: src/transport/plugin_transport_udp.c:1894
+#, c-format
+msgid ""
+"UDP could not message to `%s': `%s'. Please check your network configuration "
+"and disable IPv6 if your connection does not have a global IPv6 address\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2138
 msgid "Failed to open UDP sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2068
+#: src/transport/plugin_transport_udp.c:2306
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2112
+#: src/transport/plugin_transport_udp.c:2349
 #, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1051
+#: src/transport/plugin_transport_unix.c:1356
 msgid "Failed to open UNIX sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:875
-msgid "# wlan session timeouts"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:899
-msgid "# wlan session created"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:980
-#: src/transport/plugin_transport_wlan.c:1138
-#: src/transport/plugin_transport_wlan.c:1159
-#: src/transport/plugin_transport_wlan.c:1190
-#: src/transport/plugin_transport_wlan.c:2334
-#: src/transport/plugin_transport_wlan.c:3142
-msgid "# wlan pending sessions"
+#: src/transport/plugin_transport_wlan.c:561
+msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1233
-#: src/transport/plugin_transport_wlan.c:1888
-msgid "# wlan pending fragments"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:1388
-#, c-format
-msgid ""
-"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
+#: src/transport/plugin_transport_wlan.c:580
+msgid "# WLAN messages defragmented"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1732
-msgid "# wlan hello beacons send"
+#: src/transport/plugin_transport_wlan.c:626
+#: src/transport/plugin_transport_wlan.c:676
+#: src/transport/plugin_transport_wlan.c:1696
+msgid "# WLAN sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1765
-#: src/transport/plugin_transport_wlan.c:1968
-#: src/transport/plugin_transport_wlan.c:2059
-#, c-format
-msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
+#: src/transport/plugin_transport_wlan.c:749
+msgid "# WLAN message fragments sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1954
-msgid "# wlan acks send"
+#: src/transport/plugin_transport_wlan.c:767
+msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2025
-msgid "# wlan fragments send"
+#: src/transport/plugin_transport_wlan.c:867
+#: src/transport/plugin_transport_wlan.c:948
+#: src/transport/plugin_transport_wlan.c:1698
+msgid "# WLAN MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2161
-#, c-format
-msgid "Wlan Address len %d is wrong\n"
+#: src/transport/plugin_transport_wlan.c:1119
+msgid "# HELLO messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2295
-#: src/transport/plugin_transport_wlan.c:2919
-#: src/transport/plugin_transport_wlan.c:3145
-msgid "# wlan mac endpoints"
+#: src/transport/plugin_transport_wlan.c:1140
+msgid "# fragments received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2517
-msgid "# wlan whole messages received"
+#: src/transport/plugin_transport_wlan.c:1150
+msgid "# ACKs received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2708
-msgid "# wlan hello messages received"
+#: src/transport/plugin_transport_wlan.c:1207
+msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2742
-msgid "# wlan fragments received"
+#: src/transport/plugin_transport_wlan.c:1306
+msgid "# DATA messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2790
-msgid "# wlan acks received"
+#: src/transport/plugin_transport_wlan.c:1341
+msgid "# WLAN DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2879
-msgid "# wlan mac endpoints timeouts"
+#: src/transport/plugin_transport_wlan.c:1402
+msgid "# HELLO beacons sent via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2903
-msgid "# wlan mac endpoints created"
+#: src/transport/plugin_transport_wlan.c:1511
+msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2956
-msgid "# wlan WLAN_HELPER_DATA received"
+#: src/transport/plugin_transport_wlan.c:1668
+#, c-format
+msgid "Invalid configuration option `%s' in section `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3010
-msgid "# wlan messages for this client received"
+#: src/transport/plugin_transport_wlan.c:1677
+#, c-format
+msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3021
-msgid "# wlan messages inside WLAN_HELPER_DATA received"
+#: src/transport/plugin_transport_wlan.c:1687
+#, c-format
+msgid "Missing configuration option `%s' in section `%s'\n"
 msgstr ""
 
-#: src/transport/transport_api.c:588
+#: src/transport/transport_api.c:570
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
@@ -4667,134 +4904,127 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:304
+#: src/util/client.c:359
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:312
+#: src/util/client.c:367
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:657
+#: src/util/client.c:685
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:717 src/util/service.c:919
+#: src/util/client.c:740 src/util/service.c:970
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:859
+#: src/util/client.c:882
 #, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/util/client.c:875
+#: src/util/client.c:896
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1143
+#: src/util/client.c:1149
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:889
+#: src/util/common_logging.c:239 src/util/common_logging.c:890
 msgid "DEBUG"
 msgstr ""
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:887
+#: src/util/common_logging.c:241 src/util/common_logging.c:888
 msgid "INFO"
 msgstr ""
 
-#: src/util/common_logging.c:243 src/util/common_logging.c:885
+#: src/util/common_logging.c:243 src/util/common_logging.c:886
 msgid "WARNING"
 msgstr ""
 
-#: src/util/common_logging.c:245 src/util/common_logging.c:883
+#: src/util/common_logging.c:245 src/util/common_logging.c:884
 msgid "ERROR"
 msgstr ""
 
-#: src/util/common_logging.c:247 src/util/common_logging.c:891
+#: src/util/common_logging.c:247 src/util/common_logging.c:892
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:609
+#: src/util/common_logging.c:610
 #, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:724
+#: src/util/common_logging.c:725
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:892
+#: src/util/common_logging.c:893
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:991
+#: src/util/common_logging.c:992
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1029
+#: src/util/common_logging.c:1030
 msgid "invalid address"
 msgstr ""
 
-#: src/util/configuration.c:245
+#: src/util/configuration.c:244
 #, c-format
 msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr ""
 
-#: src/util/configuration.c:817
+#: src/util/configuration.c:816
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/connection.c:460
+#: src/util/connection.c:420
 #, c-format
 msgid "Access denied to `%s'\n"
 msgstr ""
 
-#: src/util/connection.c:475
+#: src/util/connection.c:435
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:629
+#: src/util/connection.c:550
 #, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
-#: src/util/connection.c:821 src/util/connection.c:992
+#: src/util/connection.c:739 src/util/connection.c:909
 #, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr ""
 
-#: src/util/connection.c:830
+#: src/util/connection.c:748
 #, c-format
 msgid "Failed to connect to `%s' (%p)\n"
 msgstr ""
 
-#: src/util/connection.c:983
+#: src/util/connection.c:900
 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
-#: src/util/connection.c:1465
-#, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
-msgstr ""
-
-#: src/util/container_bloomfilter.c:507
+#: src/util/container_bloomfilter.c:510
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -4811,133 +5041,133 @@ msgstr ""
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#: src/util/crypto_rsa.c:661 src/util/crypto_rsa.c:708
 #, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:623
+#: src/util/crypto_rsa.c:666
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:641
+#: src/util/crypto_rsa.c:684
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+#: src/util/crypto_rsa.c:712 src/util/crypto_rsa.c:748
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:700
+#: src/util/crypto_rsa.c:743
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:720
+#: src/util/crypto_rsa.c:763
 #, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:738
+#: src/util/crypto_rsa.c:781
 #, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:959
+#: src/util/crypto_rsa.c:1032
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:479
+#: src/util/disk.c:498
 #, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr ""
 
-#: src/util/disk.c:1087
+#: src/util/disk.c:1062
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/disk.c:1441 src/util/service.c:1580
+#: src/util/disk.c:1416 src/util/service.c:1650
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/util/disk.c:1759
+#: src/util/disk.c:1734
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
-#: src/util/getopt.c:672
+#: src/util/getopt.c:669
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: src/util/getopt.c:696
+#: src/util/getopt.c:693
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:701
+#: src/util/getopt.c:698
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:718 src/util/getopt.c:886
+#: src/util/getopt.c:715 src/util/getopt.c:883
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:747
+#: src/util/getopt.c:744
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: src/util/getopt.c:751
+#: src/util/getopt.c:748
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: src/util/getopt.c:776
+#: src/util/getopt.c:773
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: src/util/getopt.c:806 src/util/getopt.c:934
+#: src/util/getopt.c:803 src/util/getopt.c:931
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: src/util/getopt.c:854
+#: src/util/getopt.c:851
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: src/util/getopt.c:872
+#: src/util/getopt.c:869
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:1038
+#: src/util/getopt.c:1035
 #, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:84
+#: src/util/getopt_helpers.c:86
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
+#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:286
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
@@ -4950,53 +5180,69 @@ msgstr ""
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:288
+#: src/util/gnunet-rsa.c:64
 #, c-format
-msgid "Could not resolve `%s' (%s): %s\n"
+msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:358
-#: src/util/gnunet-service-resolver.c:399
-#, c-format
-msgid "Could not find IP of host `%s': %s\n"
+#: src/util/gnunet-rsa.c:112
+msgid "print the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:115
+msgid "print the hash of the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:118
+msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:494
+#: src/util/gnunet-rsa.c:124
+msgid "Manipulate GNUnet private RSA key files"
+msgstr ""
+
+#: src/util/gnunet-service-resolver.c:288
 #, c-format
-msgid "Resolver asked to look up `%s'.\n"
+msgid "Could not resolve `%s' (%s): %s\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:529
+#: src/util/gnunet-service-resolver.c:358
+#: src/util/gnunet-service-resolver.c:399
 #, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
+msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/util/helper.c:239
+#: src/util/helper.c:244
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr ""
 
-#: src/util/helper.c:254
+#: src/util/helper.c:259
 #, c-format
 msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/util/helper.c:264
+#: src/util/helper.c:269
 #, c-format
 msgid "Got %u bytes from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:273
+#: src/util/helper.c:278
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:432
+#: src/util/helper.c:310
+#, c-format
+msgid "Starting HELPER process `%s'\n"
+msgstr ""
+
+#: src/util/helper.c:440
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr ""
 
-#: src/util/network.c:1196
+#: src/util/network.c:1200
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -5024,12 +5270,12 @@ msgstr ""
 msgid "stat (%s) failed: %s\n"
 msgstr ""
 
-#: src/util/os_priority.c:304
+#: src/util/os_priority.c:305
 #, c-format
 msgid "Failed to open named pipe `%s' for reading: %s\n"
 msgstr ""
 
-#: src/util/os_priority.c:305
+#: src/util/os_priority.c:306
 #, c-format
 msgid "Failed to open named pipe `%s' for writing: %s\n"
 msgstr ""
@@ -5053,12 +5299,12 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr ""
 
-#: src/util/pseudonym.c:273
+#: src/util/pseudonym.c:276
 #, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr ""
 
-#: src/util/pseudonym.c:338
+#: src/util/pseudonym.c:407 src/util/pseudonym.c:433
 msgid "no-name"
 msgstr ""
 
@@ -5073,187 +5319,167 @@ msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:351
+#: src/util/resolver_api.c:347
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:355
+#: src/util/resolver_api.c:351
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:426
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:807
-#, c-format
-msgid "Resolver returns `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:901
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
-msgstr ""
-
-#: src/util/resolver_api.c:906
+#: src/util/resolver_api.c:890
 #, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr ""
 
-#: src/util/resolver_api.c:938
-#, c-format
-msgid "Resolving our hostname `%s'\n"
-msgstr ""
-
-#: src/util/scheduler.c:866
+#: src/util/scheduler.c:786
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:996
+#: src/util/scheduler.c:916
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:397
+#: src/util/server.c:483
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/util/server.c:406
+#: src/util/server.c:492
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/server.c:411
+#: src/util/server.c:497
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 
-#: src/util/server.c:640
+#: src/util/server.c:827
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
-#: src/util/service.c:207 src/util/service.c:214
+#: src/util/service.c:135 src/util/service.c:161 src/util/service.c:204
+#: src/util/service.c:225 src/util/service.c:232
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/service.c:170
+#: src/util/service.c:188
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/service.c:263
+#: src/util/service.c:281
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/service.c:296
+#: src/util/service.c:313
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/service.c:326
+#: src/util/service.c:343
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/util/service.c:668
+#: src/util/service.c:698
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:673
+#: src/util/service.c:703
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/util/service.c:680
+#: src/util/service.c:710
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:724
+#: src/util/service.c:765
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:752
+#: src/util/service.c:802
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:869
+#: src/util/service.c:920
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:939
+#: src/util/service.c:990
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:956
+#: src/util/service.c:1007
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1191
+#: src/util/service.c:1241
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1242 src/util/service.c:1260
+#: src/util/service.c:1292 src/util/service.c:1310
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1287
+#: src/util/service.c:1337
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1442
+#: src/util/service.c:1506
 #, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr ""
 
-#: src/util/service.c:1475
+#: src/util/service.c:1539
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1521
+#: src/util/service.c:1588
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1525
+#: src/util/service.c:1592
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1529
+#: src/util/service.c:1596
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1581
+#: src/util/service.c:1651
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1594
+#: src/util/service.c:1664
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/util/service.c:1657
+#: src/util/service.c:1729
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5262,53 +5488,74 @@ msgstr ""
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/strings.c:143
+#: src/util/strings.c:144
 msgid "b"
 msgstr ""
 
-#: src/util/strings.c:354
+#: src/util/strings.c:334
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:462
+#: src/util/strings.c:481
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:554
+#: src/util/strings.c:573
 msgid "ms"
 msgstr ""
 
-#: src/util/strings.c:559
+#: src/util/strings.c:578
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:563
+#: src/util/strings.c:582
 msgid "s"
 msgstr ""
 
-#: src/util/strings.c:567
+#: src/util/strings.c:586
 msgid "m"
 msgstr ""
 
-#: src/util/strings.c:571
+#: src/util/strings.c:590
 msgid "h"
 msgstr ""
 
-#: src/util/strings.c:575
+#: src/util/strings.c:594
 msgid " days"
 msgstr ""
 
-#: src/util/strings.c:599
+#: src/util/strings.c:618
 msgid "end of time"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
+#: src/util/strings.c:1012
+msgid "IPv6 address did not start with `['\n"
+msgstr ""
+
+#: src/util/strings.c:1020
+msgid "IPv6 address did contain ':' to separate port number\n"
+msgstr ""
+
+#: src/util/strings.c:1026
+msgid "IPv6 address did contain ']' before ':' to separate port number\n"
+msgstr ""
+
+#: src/util/strings.c:1033
+msgid "IPv6 address did contain a valid port number after the last ':'\n"
+msgstr ""
+
+#: src/util/strings.c:1042
+#, c-format
+msgid "Invalid IPv6 address `%s': %s\n"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1071
 msgid "# Active tunnels"
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:608 src/vpn/gnunet-service-vpn.c:645
-msgid "# Peers connected to mesh tunnels"
+msgid "# peers connected to mesh tunnels"
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:699
@@ -5327,70 +5574,70 @@ msgstr ""
 msgid "Failed to setup mesh tunnel!\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:967
+#: src/vpn/gnunet-service-vpn.c:973
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1285
+#: src/vpn/gnunet-service-vpn.c:1291
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1306
+#: src/vpn/gnunet-service-vpn.c:1312
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1517
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
+#: src/vpn/gnunet-service-vpn.c:1555 src/vpn/gnunet-service-vpn.c:1596
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1600
+#: src/vpn/gnunet-service-vpn.c:1606
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1614
+#: src/vpn/gnunet-service-vpn.c:1620
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1697
+#: src/vpn/gnunet-service-vpn.c:1704
 msgid "# ICMP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2038
+#: src/vpn/gnunet-service-vpn.c:2045
 msgid "# UDP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2196
+#: src/vpn/gnunet-service-vpn.c:2203
 msgid "# TCP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2347
+#: src/vpn/gnunet-service-vpn.c:2354
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2402
+#: src/vpn/gnunet-service-vpn.c:2409
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
+#: src/vpn/gnunet-service-vpn.c:2448 src/vpn/gnunet-service-vpn.c:2661
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2726
+#: src/vpn/gnunet-service-vpn.c:2734
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3141
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3165
+#: src/vpn/gnunet-service-vpn.c:3173
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -5463,18 +5710,18 @@ msgstr ""
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
-#: src/include/gnunet_common.h:490
+#: src/include/gnunet_common.h:497 src/include/gnunet_common.h:502
+#: src/include/gnunet_common.h:508
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:500
+#: src/include/gnunet_common.h:518
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
+#: src/include/gnunet_common.h:539 src/include/gnunet_common.h:546
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
diff --git a/po/sv.gmo b/po/sv.gmo
index 8e049a7..5f03fca 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index b475a4e..e3e5bc3 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2012-02-28 18:30+0100\n"
+"POT-Creation-Date: 2012-06-05 15:47+0200\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -16,255 +16,270 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:187
+#: src/arm/arm_api.c:165
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:378
+#: src/arm/arm_api.c:349
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 
-#: src/arm/arm_api.c:392
+#: src/arm/arm_api.c:363
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/arm/arm_api.c:467
+#: src/arm/arm_api.c:432
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:523
+#: src/arm/arm_api.c:485
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:524
+#: src/arm/arm_api.c:486
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:546
+#: src/arm/arm_api.c:507
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:548
+#: src/arm/arm_api.c:508
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:581
+#: src/arm/arm_api.c:540
 #, fuzzy, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr "\"%s\": Mottog inte meddelande inom %llu ms.\n"
 
-#: src/arm/arm_api.c:654
+#: src/arm/arm_api.c:612
 #, fuzzy, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr "Inget svar mottaget inom %llums.\n"
 
-#: src/arm/gnunet-arm.c:149
+#: src/arm/gnunet-arm.c:159
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:154
+#: src/arm/gnunet-arm.c:164
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-arm.c:157
+#: src/arm/gnunet-arm.c:167
 #, fuzzy, c-format
 msgid "Service `%s' was already running.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:172
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:179
 #, fuzzy, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:173
+#: src/arm/gnunet-arm.c:183
 msgid "Request ignored as ARM is shutting down.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:187
 #, fuzzy
 msgid "Error communicating with ARM service.\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:181
+#: src/arm/gnunet-arm.c:191
 #, fuzzy
 msgid "Timeout communicating with ARM service.\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:185
+#: src/arm/gnunet-arm.c:195
 #, fuzzy
 msgid "Operation failed.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:189
+#: src/arm/gnunet-arm.c:199
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:222
+#, fuzzy
+msgid "Error communicating with ARM. ARM not running?\n"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/arm/gnunet-arm.c:225
+#, fuzzy
+msgid "Running services:\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/arm/gnunet-arm.c:249
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+#: src/arm/gnunet-arm.c:257 src/arm/gnunet-arm.c:357 src/arm/gnunet-arm.c:373
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247
+#: src/arm/gnunet-arm.c:280
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/arm/gnunet-arm.c:253
+#: src/arm/gnunet-arm.c:286
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:355
+#: src/arm/gnunet-arm.c:407
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:357
+#: src/arm/gnunet-arm.c:409
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:359
+#: src/arm/gnunet-arm.c:411
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:361
+#: src/arm/gnunet-arm.c:413
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:364
+#: src/arm/gnunet-arm.c:416
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:419
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:421
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:372
+#: src/arm/gnunet-arm.c:424
 msgid "timeout for completing current operation"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:383
+#: src/arm/gnunet-arm.c:426
+msgid "List currently running services"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:437
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:328
+#: src/arm/gnunet-service-arm.c:332
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-service-arm.c:331
+#: src/arm/gnunet-service-arm.c:335
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:357
+#: src/arm/gnunet-service-arm.c:361
 #, fuzzy
 msgid "Could not send status result to client\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/arm/gnunet-service-arm.c:484
+#: src/arm/gnunet-service-arm.c:393
+#, fuzzy
+msgid "Could not send list result to client\n"
+msgstr "Kunde inte skicka begäran till gnunetd.\n"
+
+#: src/arm/gnunet-service-arm.c:523
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/arm/gnunet-service-arm.c:506
+#: src/arm/gnunet-service-arm.c:545
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:520
+#: src/arm/gnunet-service-arm.c:559
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:628
+#: src/arm/gnunet-service-arm.c:667
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:782
+#: src/arm/gnunet-service-arm.c:878
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:877
+#: src/arm/gnunet-service-arm.c:970
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:882
+#: src/arm/gnunet-service-arm.c:975
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:887
+#: src/arm/gnunet-service-arm.c:980
 #, fuzzy
 msgid "unknown"
 msgstr "Okänt fel"
 
-#: src/arm/gnunet-service-arm.c:921
+#: src/arm/gnunet-service-arm.c:986
+#, fuzzy, c-format
+msgid "Service `%s' took %llu ms to terminate\n"
+msgstr "Tjänst borttagen.\n"
+
+#: src/arm/gnunet-service-arm.c:1021
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:967 src/arm/mockup-service.c:41
-#, fuzzy
-msgid "Failed to transmit shutdown ACK.\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/arm/gnunet-service-arm.c:1067
+#: src/arm/gnunet-service-arm.c:1127
 #, fuzzy, c-format
 msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/arm/gnunet-service-arm.c:1069
+#: src/arm/gnunet-service-arm.c:1129
 msgid "option missing"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1152
+#: src/arm/gnunet-service-arm.c:1213
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1224
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1177
+#: src/arm/gnunet-service-arm.c:1238
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:46
-msgid "Transmitting shutdown ACK.\n"
-msgstr ""
-
-#: src/arm/mockup-service.c:69
+#: src/arm/mockup-service.c:44
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
@@ -324,197 +339,200 @@ msgstr ""
 msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:92
+#: src/chat/gnunet-chat.c:93
 msgid "Joined\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:124
+#: src/chat/gnunet-chat.c:125 src/chat/gnunet-chat.c:133
+#: src/chat/gnunet-chat.c:213 src/chat/gnunet-chat.c:253
+#: src/chat/gnunet-chat.c:329 src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:400 src/chat/gnunet-chat.c:700
 msgid "anonymous"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:130
+#: src/chat/gnunet-chat.c:144
 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: src/chat/gnunet-chat.c:147 src/chat/gnunet-chat.c:150
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
 # drive = hard drive ?
-#: src/chat/gnunet-chat.c:139
+#: src/chat/gnunet-chat.c:153
 #, fuzzy, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
 # drive = hard drive ?
-#: src/chat/gnunet-chat.c:142
+#: src/chat/gnunet-chat.c:156
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/chat/gnunet-chat.c:145
+#: src/chat/gnunet-chat.c:159
 #, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:148
+#: src/chat/gnunet-chat.c:162
 #, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:151
+#: src/chat/gnunet-chat.c:165
 #, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:170
 #, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:173
 #, fuzzy, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/chat/gnunet-chat.c:162
+#: src/chat/gnunet-chat.c:176
 #, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:193
+#: src/chat/gnunet-chat.c:217
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:260
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:260
 #, c-format
 msgid "`%s' left the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#: src/chat/gnunet-chat.c:321 src/chat/gnunet-chat.c:363
 #, fuzzy
 msgid "Could not change username\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#: src/chat/gnunet-chat.c:334 src/chat/gnunet-chat.c:702
 #, fuzzy, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr "Ogiltigt svar till \"%s\" från motpart \"%s\".\n"
 
-#: src/chat/gnunet-chat.c:320
+#: src/chat/gnunet-chat.c:373
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/chat/gnunet-chat.c:333
+#: src/chat/gnunet-chat.c:388
 #, c-format
 msgid "Users in room `%s': "
 msgstr ""
 
-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:434
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:379
-#, fuzzy, c-format
-msgid "Unknown user `%s'\n"
-msgstr "Okänd operation \"%s\"\n"
+#: src/chat/gnunet-chat.c:443
+#, c-format
+msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:395
+#: src/chat/gnunet-chat.c:460
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:448
+#: src/chat/gnunet-chat.c:513
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/chat/gnunet-chat.c:459
+#: src/chat/gnunet-chat.c:524
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:463
+#: src/chat/gnunet-chat.c:528
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:532
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:470
+#: src/chat/gnunet-chat.c:535
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:472
+#: src/chat/gnunet-chat.c:537
 msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:474
+#: src/chat/gnunet-chat.c:539
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:477
+#: src/chat/gnunet-chat.c:542
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:480
+#: src/chat/gnunet-chat.c:545
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:547
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:484
+#: src/chat/gnunet-chat.c:549
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:551
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:554
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:556
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:606
+#: src/chat/gnunet-chat.c:672
 #, fuzzy
 msgid "You must specify a nickname\n"
 msgstr "Du måste ange en mottagare!\n"
 
-#: src/chat/gnunet-chat.c:622
+#: src/chat/gnunet-chat.c:688
 #, fuzzy, c-format
 msgid "Failed to join room `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/chat/gnunet-chat.c:655
+#: src/chat/gnunet-chat.c:727
 msgid "set the nickname to use (required)"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:658
+#: src/chat/gnunet-chat.c:730
 msgid "set the chat room to join"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:670
+#: src/chat/gnunet-chat.c:742
 msgid "Join a chat on GNUnet."
 msgstr ""
 
@@ -538,183 +556,185 @@ msgstr "Kunde inte spara konfiguration!"
 msgid "Failed to queue a leave notification\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/core/core_api.c:798
+#: src/core/core_api.c:786
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core-list-connections.c:77
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
+#: src/core/gnunet-core.c:54 src/peerinfo-tool/gnunet-peerinfo.c:286
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/core/gnunet-core-list-connections.c:175
-#: src/peerinfo-tool/gnunet-peerinfo.c:194
+#: src/core/gnunet-core.c:72 src/peerinfo-tool/gnunet-peerinfo.c:817
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
-#: src/core/gnunet-core-list-connections.c:196
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
-msgid "don't resolve host names"
-msgstr ""
-
-#: src/core/gnunet-core-list-connections.c:203
+#: src/core/gnunet-core.c:95
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-service-core.c:99
+#: src/core/gnunet-service-core.c:97
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:360
+#: src/core/gnunet-service-core_clients.c:370
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:465
+#: src/core/gnunet-service-core_clients.c:475
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_clients.c:801
+#: src/core/gnunet-service-core_clients.c:818
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:493
+#: src/core/gnunet-service-core_kx.c:565
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/core/gnunet-service-core_kx.c:543
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
-#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
+#: src/core/gnunet-service-core_kx.c:681 src/dv/gnunet-service-dv.c:3003
 #, fuzzy
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-service-core_kx.c:623
+#: src/core/gnunet-service-core_kx.c:700
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:753
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:694
+#: src/core/gnunet-service-core_kx.c:775
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:828
 #, fuzzy
 msgid "# session keys received"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:845
 #, fuzzy, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr "storlek på \"%s\" meddelande är för litet. Ignorerar.\n"
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:890
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:883
-#: src/transport/gnunet-service-transport_validation.c:803
+#: src/core/gnunet-service-core_kx.c:977
+#: src/transport/gnunet-service-transport_validation.c:810
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/core/gnunet-service-core_kx.c:1010
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:938
+#: src/core/gnunet-service-core_kx.c:1029
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1026
+#: src/core/gnunet-service-core_kx.c:1125
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1037
+#: src/core/gnunet-service-core_kx.c:1135
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1095
-#: src/transport/gnunet-service-transport_validation.c:1026
+#: src/core/gnunet-service-core_kx.c:1236
+#: src/transport/gnunet-service-transport_validation.c:1031
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:1275
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1157
+#: src/core/gnunet-service-core_kx.c:1303
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1223
+#: src/core/gnunet-service-core_kx.c:1329
+#, fuzzy
+msgid "# rekey operations confirmed via PONG"
+msgstr "# sessionnycklar vägrade"
+
+#: src/core/gnunet-service-core_kx.c:1381
+#: src/core/gnunet-service-core_kx.c:1398
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1402
+msgid "# REKEY operations performed"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1537
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1406
-#: src/core/gnunet-service-core_kx.c:1431
+#: src/core/gnunet-service-core_kx.c:1577
+#: src/core/gnunet-service-core_kx.c:1602
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1589
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1626
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1630
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1638
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1700
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/core/gnunet-service-core_kx.c:1536
+#: src/core/gnunet-service-core_kx.c:1708
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1546 src/hostlist/hostlist-server.c:555
-#: src/peerinfo-tool/gnunet-peerinfo.c:202
-#: src/transport/gnunet-service-transport.c:595
+#: src/core/gnunet-service-core_kx.c:1718 src/hostlist/hostlist-server.c:551
+#: src/peerinfo-tool/gnunet-peerinfo.c:823
+#: src/transport/gnunet-service-transport.c:611
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -725,29 +745,40 @@ msgid "# sessions terminated by transport disconnect"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
 #: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:342
+#: src/core/gnunet-service-core_neighbours.c:334
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:247
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:430
+#: src/core/gnunet-service-core_neighbours.c:418
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:273
-msgid "# entries in session map"
-msgstr ""
+#: src/core/gnunet-service-core_sessions.c:206
+#: src/core/gnunet-service-core_sessions.c:269
+#: src/dht/gnunet-service-dht_neighbours.c:625
+#: src/dht/gnunet-service-dht_neighbours.c:683
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
+#: src/topology/gnunet-daemon-topology.c:709
+#: src/topology/gnunet-daemon-topology.c:810
+#: src/transport/gnunet-service-transport_neighbours.c:874
+#: src/transport/gnunet-service-transport_neighbours.c:1080
+#: src/transport/gnunet-service-transport_neighbours.c:1089
+#: src/transport/gnunet-service-transport_neighbours.c:2568
+#: src/transport/gnunet-service-transport_neighbours.c:2814
+#, fuzzy
+msgid "# peers connected"
+msgstr "# av anslutna parter"
 
-#: src/core/gnunet-service-core_sessions.c:238
+#: src/core/gnunet-service-core_sessions.c:236
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:414
+#: src/core/gnunet-service-core_sessions.c:406
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -761,416 +792,393 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:118 src/datacache/datacache.c:255
-#: src/datastore/gnunet-service-datastore.c:854
+#: src/datacache/datacache.c:115 src/datacache/datacache.c:250
+#: src/datastore/gnunet-service-datastore.c:834
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# byte krypterade"
 
-#: src/datacache/datacache.c:144 src/datacache/datacache.c:151
-#: src/datastore/gnunet-service-datastore.c:1531
-#: src/datastore/gnunet-service-datastore.c:1542
+#: src/datacache/datacache.c:141 src/datacache/datacache.c:148
+#: src/datastore/gnunet-service-datastore.c:1483
+#: src/datastore/gnunet-service-datastore.c:1494
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/datacache/datacache.c:183
+#: src/datacache/datacache.c:180
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:191
+#: src/datacache/datacache.c:188
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/datacache/datacache.c:281
+#: src/datacache/datacache.c:276
 #, fuzzy
 msgid "# requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datacache/datacache.c:291
+#: src/datacache/datacache.c:284
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:103
-#: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:517
-#: src/datacache/plugin_datacache_mysql.c:526
-#: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614
-#: src/datacache/plugin_datacache_sqlite.c:71
-#: src/datacache/plugin_datacache_sqlite.c:74
-#: src/datastore/plugin_datastore_mysql.c:139
-#: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:613
-#: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685
-#: src/datastore/plugin_datastore_mysql.c:1362
-#: src/datastore/plugin_datastore_mysql.c:1376
-#: src/datastore/plugin_datastore_sqlite.c:61
-#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
-#: src/include/gnunet_common.h:514
+#: src/datacache/plugin_datacache_mysql.c:97
+#: src/datacache/plugin_datacache_mysql.c:104
+#: src/datacache/plugin_datacache_sqlite.c:69
+#: src/datacache/plugin_datacache_sqlite.c:72
+#: src/datastore/plugin_datastore_mysql.c:803
+#: src/datastore/plugin_datastore_mysql.c:817
+#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
+#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
+#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:525
+#: src/include/gnunet_common.h:532
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/datacache/plugin_datacache_mysql.c:224
-#: src/datastore/plugin_datastore_mysql.c:316
-#, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
-msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
-
-#: src/datacache/plugin_datacache_mysql.c:230
-#: src/datastore/plugin_datastore_mysql.c:322
-#, fuzzy, c-format
-msgid "Could not access file `%s': %s\n"
-msgstr "Kunde inte köra \"%s\": %s\n"
-
-#: src/datacache/plugin_datacache_mysql.c:979
+#: src/datacache/plugin_datacache_mysql.c:450
 msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:79
-#: src/datastore/plugin_datastore_postgres.c:93
-#, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-
-#: src/datacache/plugin_datacache_postgres.c:149
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "Kunde inte initiera SQLite.\n"
-
-#: src/datacache/plugin_datacache_postgres.c:499
+#: src/datacache/plugin_datacache_postgres.c:367
 msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:424
+#: src/datacache/plugin_datacache_sqlite.c:410
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:457
-#: src/datastore/plugin_datastore_sqlite.c:414
-#: src/namestore/plugin_namestore_sqlite.c:381
+#: src/datacache/plugin_datacache_sqlite.c:443
+#: src/datastore/plugin_datastore_sqlite.c:408
+#: src/namestore/plugin_namestore_sqlite.c:370
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
+#: src/datacache/plugin_datacache_sqlite.c:450
+#, fuzzy, c-format
+msgid "Failed to close statement %p: %d\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
 #: src/datacache/plugin_datacache_template.c:121
 msgid "Template datacache running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:289
+#: src/datastore/datastore_api.c:305
 #, fuzzy
 msgid "Failed to transmit request to drop database.\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/datastore/datastore_api.c:372
+#: src/datastore/datastore_api.c:388
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:418
+#: src/datastore/datastore_api.c:432
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:445
+#: src/datastore/datastore_api.c:459
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/datastore/datastore_api.c:465
+#: src/datastore/datastore_api.c:477
 msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/datastore/datastore_api.c:513
+#: src/datastore/datastore_api.c:525
 #, fuzzy
 msgid "# datastore connections (re)created"
 msgstr "Nätverksanslutning"
 
-#: src/datastore/datastore_api.c:540
+#: src/datastore/datastore_api.c:548
 msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608
+#: src/datastore/datastore_api.c:612
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/datastore/datastore_api.c:631
+#: src/datastore/datastore_api.c:633
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# byte krypterade"
 
-#: src/datastore/datastore_api.c:772
+#: src/datastore/datastore_api.c:764
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/datastore_api.c:786
+#: src/datastore/datastore_api.c:778
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
+#: src/datastore/datastore_api.c:790 src/datastore/datastore_api.c:796
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/datastore/datastore_api.c:810
+#: src/datastore/datastore_api.c:800
 #, fuzzy
 msgid "# status messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/datastore/datastore_api.c:883
+#: src/datastore/datastore_api.c:869
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:954
+#: src/datastore/datastore_api.c:936
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1019
+#: src/datastore/datastore_api.c:997
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1080
+#: src/datastore/datastore_api.c:1054
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1148
+#: src/datastore/datastore_api.c:1118
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1193
+#: src/datastore/datastore_api.c:1163
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/datastore_api.c:1253
+#: src/datastore/datastore_api.c:1221
 #, fuzzy
 msgid "# Results received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/datastore_api.c:1324
+#: src/datastore/datastore_api.c:1286
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1391
+#: src/datastore/datastore_api.c:1349
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1455
+#: src/datastore/datastore_api.c:1409
 msgid "# GET requests executed"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/datastore/gnunet-service-datastore.c:349
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:426
+#: src/datastore/gnunet-service-datastore.c:422
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:486
+#: src/datastore/gnunet-service-datastore.c:480
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:640
+#: src/datastore/gnunet-service-datastore.c:511
+msgid "Shutdown in progress, aborting transmission.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:626
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:685
+#: src/datastore/gnunet-service-datastore.c:669
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:696
+#: src/datastore/gnunet-service-datastore.c:680
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:700
+#: src/datastore/gnunet-service-datastore.c:684
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:706
+#: src/datastore/gnunet-service-datastore.c:690
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
-#: src/datastore/gnunet-service-datastore.c:765
-#: src/datastore/gnunet-service-datastore.c:986
-#: src/datastore/gnunet-service-datastore.c:1465
+#: src/datastore/gnunet-service-datastore.c:695
+#: src/datastore/gnunet-service-datastore.c:747
+#: src/datastore/gnunet-service-datastore.c:960
+#: src/datastore/gnunet-service-datastore.c:1417
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:780
+#: src/datastore/gnunet-service-datastore.c:760
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:868
+#: src/datastore/gnunet-service-datastore.c:846
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1034
+#: src/datastore/gnunet-service-datastore.c:1006
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1048
+#: src/datastore/gnunet-service-datastore.c:1018
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1076
+#: src/datastore/gnunet-service-datastore.c:1046
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1110
+#: src/datastore/gnunet-service-datastore.c:1076
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1145
+#: src/datastore/gnunet-service-datastore.c:1109
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1172
+#: src/datastore/gnunet-service-datastore.c:1134
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1182
+#: src/datastore/gnunet-service-datastore.c:1142
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1216
+#: src/datastore/gnunet-service-datastore.c:1174
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1260
+#: src/datastore/gnunet-service-datastore.c:1216
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1323
+#: src/datastore/gnunet-service-datastore.c:1277
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1332
+#: src/datastore/gnunet-service-datastore.c:1286
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1536
+#: src/datastore/gnunet-service-datastore.c:1488
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# byte krypterade"
 
-#: src/datastore/gnunet-service-datastore.c:1547
+#: src/datastore/gnunet-service-datastore.c:1499
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1549
+#: src/datastore/gnunet-service-datastore.c:1501
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1562
+#: src/datastore/gnunet-service-datastore.c:1514
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1580
-#: src/datastore/gnunet-service-datastore.c:1596
+#: src/datastore/gnunet-service-datastore.c:1532
+#: src/datastore/gnunet-service-datastore.c:1548
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/datastore/gnunet-service-datastore.c:1626
+#: src/datastore/gnunet-service-datastore.c:1578
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/datastore/gnunet-service-datastore.c:1655
+#: src/datastore/gnunet-service-datastore.c:1607
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1660
+#: src/datastore/gnunet-service-datastore.c:1612
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1663
+#: src/datastore/gnunet-service-datastore.c:1615
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:529
-#: src/datastore/plugin_datastore_mysql.c:1336
+#: src/datastore/plugin_datastore_mysql.c:780
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/datastore/plugin_datastore_mysql.c:622
-#: src/datastore/plugin_datastore_mysql.c:1346
+#: src/datastore/plugin_datastore_mysql.c:788
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1581
+#: src/datastore/plugin_datastore_mysql.c:1019
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:173
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+#: src/datastore/plugin_datastore_postgres.c:824
+#, fuzzy
+msgid "Failed to drop table from database.\n"
+msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1017
+#: src/datastore/plugin_datastore_postgres.c:860
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/datastore/plugin_datastore_sqlite.c:57
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:239
-#: src/namestore/plugin_namestore_sqlite.c:223
+#: src/datastore/plugin_datastore_sqlite.c:233
+#: src/namestore/plugin_namestore_sqlite.c:204
 #, fuzzy, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:266
-#: src/namestore/plugin_namestore_sqlite.c:248
+#: src/datastore/plugin_datastore_sqlite.c:260
+#: src/namestore/plugin_namestore_sqlite.c:229
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:669
+#: src/datastore/plugin_datastore_sqlite.c:655
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1159
+#: src/datastore/plugin_datastore_sqlite.c:1139
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1178
+#: src/datastore/plugin_datastore_sqlite.c:1158
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1218
-#: src/namestore/plugin_namestore_sqlite.c:779
+#: src/datastore/plugin_datastore_sqlite.c:1198
+#: src/namestore/plugin_namestore_sqlite.c:829
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -1178,33 +1186,32 @@ msgstr ""
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:280
+#: src/dht/dht_api.c:348
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
-#: src/gns/gnunet-gns-lookup.c:179
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:293
+#: src/dht/gnunet-dht-put.c:192
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:182
+#: src/dht/gnunet-dht-get.c:204
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:207 src/gns/gnunet-gns-lookup.c:185
+#: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
-#: src/gns/gnunet-gns-lookup.c:188
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
-#: src/gns/gnunet-gns-lookup.c:191 src/nse/gnunet-nse-profiler.c:908
+#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-put.c:204 src/fs/gnunet-download.c:271
+#: src/fs/gnunet-publish.c:731 src/fs/gnunet-search.c:297
+#: src/fs/gnunet-unindex.c:169 src/nse/gnunet-nse-profiler.c:910
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1212,99 +1219,116 @@ msgstr ""
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:100
+#: src/dht/gnunet-dht-monitor.c:299
+msgid "how long to execute? 0 = forever"
+msgstr ""
+
+#: src/dht/gnunet-dht-monitor.c:321
+msgid "Prints all packets that go through the DHT."
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:108
 msgid "PUT request sent!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:124
+#: src/dht/gnunet-dht-put.c:111
+msgid "Timeout sending PUT request!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:114
+#, fuzzy
+msgid "PUT request not confirmed!\n"
+msgstr "# byte mottogs via TCP"
+
+#: src/dht/gnunet-dht-put.c:144
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:132
+#: src/dht/gnunet-dht-put.c:152
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-put.c:137
+#: src/dht/gnunet-dht-put.c:157
 #, fuzzy, c-format
 msgid "Connected to %s service!\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/dht/gnunet-dht-put.c:152
+#: src/dht/gnunet-dht-put.c:172
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:166
+#: src/dht/gnunet-dht-put.c:186
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:169
+#: src/dht/gnunet-dht-put.c:189
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:175
+#: src/dht/gnunet-dht-put.c:195
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:178
+#: src/dht/gnunet-dht-put.c:198
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:203
+#: src/dht/gnunet-dht-put.c:223
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:556
-#: src/testing/testing.c:1979 src/testing/testing.c:2009
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:544
+#: src/testing/testing.c:1968 src/testing/testing.c:1998
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:371
+#: src/dht/gnunet-service-dht_clients.c:407
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_clients.c:462
+#: src/dht/gnunet-service-dht_clients.c:500
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:529
+#: src/dht/gnunet-service-dht_clients.c:584
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:624
+#: src/dht/gnunet-service-dht_clients.c:682
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:854
+#: src/dht/gnunet-service-dht_clients.c:919
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:869
+#: src/dht/gnunet-service-dht_clients.c:932
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:906
+#: src/dht/gnunet-service-dht_clients.c:967
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:928
+#: src/dht/gnunet-service-dht_clients.c:989
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:979
-#: src/dht/gnunet-service-dht_clients.c:1022
+#: src/dht/gnunet-service-dht_clients.c:1038
+#: src/dht/gnunet-service-dht_clients.c:1081
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:989
+#: src/dht/gnunet-service-dht_clients.c:1048
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "Kunde inte skicka meddelande till gnunetd\n"
@@ -1318,28 +1342,28 @@ msgstr "# byte mottagna av typen %d"
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:209
+#: src/dht/gnunet-service-dht_datacache.c:207
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:220
+#: src/dht/gnunet-service-dht_datacache.c:218
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:226
+#: src/dht/gnunet-service-dht_datacache.c:224
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:236
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:241
+#: src/dht/gnunet-service-dht_datacache.c:239
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:271
+#: src/dht/gnunet-service-dht_datacache.c:269
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# byte mottogs via TCP"
@@ -1353,95 +1377,89 @@ msgstr "Meddelande mottaget från klient är ogiltig.\n"
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:573
+#: src/dht/gnunet-service-dht_neighbours.c:571
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:629
-#: src/dht/gnunet-service-dht_neighbours.c:689
-#, fuzzy
-msgid "# Peers connected"
-msgstr "# av anslutna parter"
-
-#: src/dht/gnunet-service-dht_neighbours.c:723
+#: src/dht/gnunet-service-dht_neighbours.c:717
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:778
+#: src/dht/gnunet-service-dht_neighbours.c:772
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/dht/gnunet-service-dht_neighbours.c:816
+#: src/dht/gnunet-service-dht_neighbours.c:810
 msgid "# Bytes of bandwdith requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1040
-#: src/dht/gnunet-service-dht_neighbours.c:1068
+#: src/dht/gnunet-service-dht_neighbours.c:1032
+#: src/dht/gnunet-service-dht_neighbours.c:1060
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1049
-#: src/dht/gnunet-service-dht_neighbours.c:1085
+#: src/dht/gnunet-service-dht_neighbours.c:1041
+#: src/dht/gnunet-service-dht_neighbours.c:1075
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1221
+#: src/dht/gnunet-service-dht_neighbours.c:1207
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1252
+#: src/dht/gnunet-service-dht_neighbours.c:1236
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1333
+#: src/dht/gnunet-service-dht_neighbours.c:1315
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1364
+#: src/dht/gnunet-service-dht_neighbours.c:1342
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1467
+#: src/dht/gnunet-service-dht_neighbours.c:1443
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1555
+#: src/dht/gnunet-service-dht_neighbours.c:1531
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1668
+#: src/dht/gnunet-service-dht_neighbours.c:1647
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1676
+#: src/dht/gnunet-service-dht_neighbours.c:1655
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1767
+#: src/dht/gnunet-service-dht_neighbours.c:1746
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1788
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1825
+#: src/dht/gnunet-service-dht_neighbours.c:1802
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1895
+#: src/dht/gnunet-service-dht_neighbours.c:1876
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -1463,29 +1481,28 @@ msgstr ""
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:236
+#: src/dht/gnunet-service-dht_routing.c:238
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:314
-#: src/dht/gnunet-service-dht_routing.c:368
+#: src/dht/gnunet-service-dht_routing.c:311
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
+#: src/dht/gnunet-service-dht_routing.c:352
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:124
+#: src/dht/plugin_block_dht.c:136
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/dht/plugin_block_dht.c:131
+#: src/dht/plugin_block_dht.c:143
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:140
+#: src/dht/plugin_block_dht.c:152
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -1514,68 +1531,69 @@ msgstr ""
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:480
+#: src/dns/gnunet-service-dns.c:485
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/dns/gnunet-service-dns.c:634
+#: src/dns/gnunet-service-dns.c:639
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:818
+#: src/dns/gnunet-service-dns.c:822
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1001
+#: src/dns/gnunet-service-dns.c:1005
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1046
+#: src/dns/gnunet-service-dns.c:1050
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1165
+#: src/dns/gnunet-service-dns.c:1168
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1198
-msgid "Changing DNS reply according to client specifications\n"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1279
+#: src/dns/gnunet-service-dns.c:1281
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1294
+#: src/dns/gnunet-service-dns.c:1297
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1303
+#: src/dns/gnunet-service-dns.c:1306
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1312
+#: src/dns/gnunet-service-dns.c:1315
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1377
+#: src/dns/gnunet-service-dns.c:1380
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dns/gnunet-service-dns.c:1461
+#: src/dns/gnunet-service-dns.c:1465
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1497 src/exit/gnunet-daemon-exit.c:2674
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1567
+#: src/dns/gnunet-service-dns.c:1561 src/exit/gnunet-daemon-exit.c:3032
+#, c-format
+msgid "`%s' must be installed SUID, refusing to run\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:1581
 msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
@@ -1599,15 +1617,15 @@ msgstr ""
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr "# byte skickade av typen %d"
 
-#: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2068
-#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1388
-#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+#: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2069
+#: src/exit/gnunet-daemon-exit.c:2319 src/vpn/gnunet-service-vpn.c:1394
+#: src/vpn/gnunet-service-vpn.c:1795 src/vpn/gnunet-service-vpn.c:1958
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2127
-#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1444
-#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+#: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2128
+#: src/exit/gnunet-daemon-exit.c:2378 src/vpn/gnunet-service-vpn.c:1450
+#: src/vpn/gnunet-service-vpn.c:1854 src/vpn/gnunet-service-vpn.c:1991
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -1656,137 +1674,137 @@ msgstr ""
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1470
+#: src/exit/gnunet-daemon-exit.c:1471
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1570
+#: src/exit/gnunet-daemon-exit.c:1571
 msgid "# TCP service creation requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1573 src/exit/gnunet-daemon-exit.c:1652
-#: src/exit/gnunet-daemon-exit.c:1762 src/exit/gnunet-daemon-exit.c:1992
-#: src/exit/gnunet-daemon-exit.c:2234 src/exit/gnunet-daemon-exit.c:2515
-#: src/exit/gnunet-daemon-exit.c:2615
+#: src/exit/gnunet-daemon-exit.c:1574 src/exit/gnunet-daemon-exit.c:1653
+#: src/exit/gnunet-daemon-exit.c:1763 src/exit/gnunet-daemon-exit.c:1993
+#: src/exit/gnunet-daemon-exit.c:2235 src/exit/gnunet-daemon-exit.c:2516
+#: src/exit/gnunet-daemon-exit.c:2616
 #, fuzzy
 msgid "# Bytes received from MESH"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1606 src/exit/gnunet-daemon-exit.c:2637
+#: src/exit/gnunet-daemon-exit.c:1607 src/exit/gnunet-daemon-exit.c:2638
 #, c-format
 msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1610
+#: src/exit/gnunet-daemon-exit.c:1611
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1655
+#: src/exit/gnunet-daemon-exit.c:1656
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1766
 #, fuzzy
 msgid "# TCP data requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1779
+#: src/exit/gnunet-daemon-exit.c:1780
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1829
+#: src/exit/gnunet-daemon-exit.c:1830
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1995
+#: src/exit/gnunet-daemon-exit.c:1996
 #, fuzzy
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2237
+#: src/exit/gnunet-daemon-exit.c:2238
 #, fuzzy
 msgid "# ICMP service requests received via mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1378
-#: src/vpn/gnunet-service-vpn.c:1945
+#: src/exit/gnunet-daemon-exit.c:2304 src/vpn/gnunet-service-vpn.c:1384
+#: src/vpn/gnunet-service-vpn.c:1952
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1414
-#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+#: src/exit/gnunet-daemon-exit.c:2363 src/vpn/gnunet-service-vpn.c:1420
+#: src/vpn/gnunet-service-vpn.c:1432 src/vpn/gnunet-service-vpn.c:1842
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2412
+#: src/exit/gnunet-daemon-exit.c:2413
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2518
+#: src/exit/gnunet-daemon-exit.c:2519
 #, fuzzy
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2618
+#: src/exit/gnunet-daemon-exit.c:2619
 #, fuzzy
 msgid "# UDP service requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2641
+#: src/exit/gnunet-daemon-exit.c:2642
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2881
+#: src/exit/gnunet-daemon-exit.c:2882
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2895 src/exit/gnunet-daemon-exit.c:2907
+#: src/exit/gnunet-daemon-exit.c:2896 src/exit/gnunet-daemon-exit.c:2908
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2918
+#: src/exit/gnunet-daemon-exit.c:2919
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3047
+#: src/exit/gnunet-daemon-exit.c:3048
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3055
+#: src/exit/gnunet-daemon-exit.c:3056
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3062
+#: src/exit/gnunet-daemon-exit.c:3063
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3068
+#: src/exit/gnunet-daemon-exit.c:3069
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3074 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3075 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3235
+#: src/exit/gnunet-daemon-exit.c:3236
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1794,121 +1812,126 @@ msgstr ""
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:454
+#: src/fragmentation/defragmentation.c:456
 #, fuzzy
 msgid "# fragments received"
 msgstr "# byte mottogs via TCP"
 
-#: src/fragmentation/defragmentation.c:513
+#: src/fragmentation/defragmentation.c:521
 #, fuzzy
 msgid "# duplicate fragments received"
 msgstr "# byte mottogs via TCP"
 
-#: src/fragmentation/defragmentation.c:526
+#: src/fragmentation/defragmentation.c:534
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:188
+#: src/fragmentation/fragmentation.c:203
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/fragmentation/fragmentation.c:191
+#: src/fragmentation/fragmentation.c:206
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/fragmentation/fragmentation.c:255
+#: src/fragmentation/fragmentation.c:232
+#, fuzzy
+msgid "# fragments wrap arounds"
+msgstr "# byte skickade av typen %d"
+
+#: src/fragmentation/fragmentation.c:273
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:258
+#: src/fragmentation/fragmentation.c:276
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:343
+#: src/fragmentation/fragmentation.c:363
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:349
+#: src/fragmentation/fragmentation.c:369
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:373
+#: src/fragmentation/fragmentation.c:393
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/fs_api.c:284
+#: src/fs/fs_api.c:339
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:293
+#: src/fs/fs_api.c:348
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:299
+#: src/fs/fs_api.c:354
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:877
+#: src/fs/fs_api.c:938
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:1334
+#: src/fs/fs_api.c:1395
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1376
+#: src/fs/fs_api.c:1437
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1392
+#: src/fs/fs_api.c:1453
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2004
+#: src/fs/fs_api.c:2106
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2014
+#: src/fs/fs_api.c:2116
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
+#: src/fs/fs_api.c:2241 src/fs/fs_api.c:2480
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2156
+#: src/fs/fs_api.c:2258
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
+#: src/fs/fs_api.c:2270 src/fs/fs_api.c:2289 src/fs/fs_api.c:2773
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2369
+#: src/fs/fs_api.c:2471
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2615
+#: src/fs/fs_api.c:2717
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2709
+#: src/fs/fs_api.c:2811
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1918,53 +1941,58 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:311
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:330
+#: src/fs/fs_download.c:331
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:488 src/fs/fs_download.c:500
+#: src/fs/fs_download.c:497 src/fs/fs_download.c:509
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:870
+#: src/fs/fs_download.c:878
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_download.c:951
+#: src/fs/fs_download.c:960
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
+"offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:986
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1000
+#: src/fs/fs_download.c:1009
 #, fuzzy, c-format
-msgid "Download failed: could not open file `%s': %s\n"
+msgid "Download failed: could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_download.c:1010
+#: src/fs/fs_download.c:1019
 #, fuzzy, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1019
-#, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
-msgstr ""
+#: src/fs/fs_download.c:1028
+#, fuzzy, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1835
+#: src/fs/fs_download.c:1125
+#, fuzzy
+msgid "internal error decoding tree"
+msgstr "=\tFel vid läsning av katalog.\n"
+
+#: src/fs/fs_download.c:1888
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ogiltiga argument: "
@@ -2046,68 +2074,68 @@ msgstr "Okänt fel.\n"
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:395
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:397
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:616 src/fs/fs_publish.c:633 src/fs/fs_publish.c:672
-#: src/fs/fs_publish.c:692 src/fs/fs_publish.c:717 src/fs/fs_publish.c:857
+#: src/fs/fs_publish.c:621 src/fs/fs_publish.c:638 src/fs/fs_publish.c:677
+#: src/fs/fs_publish.c:697 src/fs/fs_publish.c:722 src/fs/fs_publish.c:862
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/fs/fs_publish.c:618
+#: src/fs/fs_publish.c:623
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:630
+#: src/fs/fs_publish.c:635
 #, fuzzy
 msgid "unknown error"
 msgstr "Okänt fel"
 
-#: src/fs/fs_publish.c:673
+#: src/fs/fs_publish.c:678
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:693
+#: src/fs/fs_publish.c:698
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:718
+#: src/fs/fs_publish.c:723
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:741
+#: src/fs/fs_publish.c:746
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_publish.c:806
+#: src/fs/fs_publish.c:811
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/fs/fs_publish.c:812
+#: src/fs/fs_publish.c:817
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:858
+#: src/fs/fs_publish.c:863
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1067
+#: src/fs/fs_publish.c:1071
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1138
+#: src/fs/fs_publish.c:1142
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2117,7 +2145,7 @@ msgstr ""
 msgid "Could not connect to datastore."
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_search.c:810
+#: src/fs/fs_search.c:829
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2127,44 +2155,64 @@ msgstr ""
 msgid "Failed to start daemon: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/fs/fs_unindex.c:57
+#: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:62
+#: src/fs/fs_unindex.c:63
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_unindex.c:231
+#: src/fs/fs_unindex.c:233
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:239
+#: src/fs/fs_unindex.c:241
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:247
+#: src/fs/fs_unindex.c:249
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
 
-#: src/fs/fs_unindex.c:292
+#: src/fs/fs_unindex.c:293
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:325
+#: src/fs/fs_unindex.c:344
+#, fuzzy
+msgid "Failed to get KSKs from directory scan."
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+
+#: src/fs/fs_unindex.c:356
+#, fuzzy, c-format
+msgid "Internal error scanning `%s'.\n"
+msgstr "=\tFel vid läsning av katalog.\n"
+
+#: src/fs/fs_unindex.c:411
+#, fuzzy, c-format
+msgid "Failed to remove KBlock: %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/fs/fs_unindex.c:501
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s' from KBlock!\n"
+msgstr "Fil \"%s\" har URI: %s\n"
+
+#: src/fs/fs_unindex.c:553 src/fs/fs_unindex.c:618
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/fs_unindex.c:338
+#: src/fs/fs_unindex.c:631
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:665
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -2277,92 +2325,92 @@ msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 msgid "Display contents of a GNUnet directory"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/gnunet-download.c:100
+#: src/fs/gnunet-download.c:101
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-download.c:109
+#: src/fs/gnunet-download.c:110
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Okänt fel"
 
-#: src/fs/gnunet-download.c:118
+#: src/fs/gnunet-download.c:119
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:128
+#: src/fs/gnunet-download.c:129
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-download.c:136
+#: src/fs/gnunet-download.c:137
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Uppladdning vägrades!"
 
-#: src/fs/gnunet-download.c:151 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-download.c:152 src/fs/gnunet-publish.c:190
 #: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:176
+#: src/fs/gnunet-download.c:177
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-download.c:183 src/fs/gnunet-publish.c:624
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/gnunet-download.c:189
+#: src/fs/gnunet-download.c:190
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:196
+#: src/fs/gnunet-download.c:197
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:602
 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-download.c:247 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:248 src/fs/gnunet-search.c:285
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:250
+#: src/fs/gnunet-download.c:251
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253 src/fs/gnunet-search.c:288
+#: src/fs/gnunet-download.c:254 src/fs/gnunet-search.c:288
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:256
+#: src/fs/gnunet-download.c:257
 msgid "write the file to FILENAME"
 msgstr "skriv filen till FILNAMN"
 
-#: src/fs/gnunet-download.c:260
+#: src/fs/gnunet-download.c:261
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:264
+#: src/fs/gnunet-download.c:265
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267
+#: src/fs/gnunet-download.c:268
 msgid "download a GNUnet directory recursively"
 msgstr "hämta en GNUnet-katalog rekursivt"
 
-#: src/fs/gnunet-download.c:277
+#: src/fs/gnunet-download.c:278
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2377,70 +2425,65 @@ msgstr ""
 msgid "Special file-sharing operations"
 msgstr "Visa alla alternativ"
 
-#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:167
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/fs/gnunet-pseudonym.c:165
-#, fuzzy, c-format
-msgid "Namespace `%s' unknown.\n"
-msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
-
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
+#: src/fs/gnunet-pseudonym.c:250 src/fs/gnunet-pseudonym.c:257
+#: src/fs/gnunet-pseudonym.c:259
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-pseudonym.c:279 src/fs/gnunet-publish.c:678
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:272
+#: src/fs/gnunet-pseudonym.c:282
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:275
+#: src/fs/gnunet-pseudonym.c:285
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:278
+#: src/fs/gnunet-pseudonym.c:288
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:697
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:285
+#: src/fs/gnunet-pseudonym.c:295
 msgid "print names of local namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:288
+#: src/fs/gnunet-pseudonym.c:298
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:291
+#: src/fs/gnunet-pseudonym.c:301
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-pseudonym.c:304 src/fs/gnunet-publish.c:716
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:297
+#: src/fs/gnunet-pseudonym.c:307
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-pseudonym.c:300
+#: src/fs/gnunet-pseudonym.c:310
 msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:308
+#: src/fs/gnunet-pseudonym.c:318
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2469,165 +2512,165 @@ msgstr "Jag är ändpunkt \"%s\".\n"
 msgid "Cleanup after abort complete.\n"
 msgstr "\"%s\" uppstart klar.\n"
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:305
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:301
+#: src/fs/gnunet-publish.c:307
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/fs/gnunet-publish.c:352
+#: src/fs/gnunet-publish.c:358
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:433
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:454
+#: src/fs/gnunet-publish.c:460
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:485
+#: src/fs/gnunet-publish.c:491
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:487
+#: src/fs/gnunet-publish.c:493
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:498
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-publish.c:503
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "Nedstängning klar.\n"
 
-#: src/fs/gnunet-publish.c:501
+#: src/fs/gnunet-publish.c:507
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:505
+#: src/fs/gnunet-publish.c:511
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:518
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/gnunet-publish.c:546
+#: src/fs/gnunet-publish.c:552
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:559
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:565
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:573 src/vpn/gnunet-vpn.c:214
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
-#: src/transport/gnunet-transport.c:530
+#: src/fs/gnunet-publish.c:583 src/fs/gnunet-publish.c:590
+#: src/transport/gnunet-transport.c:560
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:606
+#: src/fs/gnunet-publish.c:612
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-publish.c:639
+#: src/fs/gnunet-publish.c:645
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-publish.c:651
+#: src/fs/gnunet-publish.c:657
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:676
+#: src/fs/gnunet-publish.c:682
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:685
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-publish.c:689
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:687
+#: src/fs/gnunet-publish.c:693
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:700
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:699
+#: src/fs/gnunet-publish.c:705
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:703
+#: src/fs/gnunet-publish.c:709
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-publish.c:707
+#: src/fs/gnunet-publish.c:713
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:719
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:717
+#: src/fs/gnunet-publish.c:723
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:721
+#: src/fs/gnunet-publish.c:727
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:736
+#: src/fs/gnunet-publish.c:742
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2676,24 +2719,12 @@ msgid "# Loopback routes suppressed"
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1290
-#: src/topology/gnunet-daemon-topology.c:1297
+#: src/topology/gnunet-daemon-topology.c:1330
+#: src/topology/gnunet-daemon-topology.c:1337
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
-#: src/topology/gnunet-daemon-topology.c:654
-#: src/topology/gnunet-daemon-topology.c:756
-#: src/transport/gnunet-service-transport_neighbours.c:960
-#: src/transport/gnunet-service-transport_neighbours.c:1289
-#: src/transport/gnunet-service-transport_neighbours.c:1841
-#: src/transport/gnunet-service-transport_neighbours.c:2499
-#: src/transport/gnunet-service-transport_neighbours.c:2566
-#, fuzzy
-msgid "# peers connected"
-msgstr "# av anslutna parter"
-
 #: src/fs/gnunet-service-fs_cp.c:696
 #, fuzzy
 msgid "# migration stop messages received"
@@ -3039,15 +3070,132 @@ msgstr ""
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gns_api.c:221
+#: src/gns/gnunet-gns.c:191
 #, fuzzy
-msgid "Failed to connect to the GNS service!\n"
+msgid "Failed to connect to GNS\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-lookup.c:210
-msgid "Issue a request to the GNUnet Naming System, prints results."
+#: src/gns/gnunet-gns.c:232
+msgid "try to shorten a given GNS name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:235
+msgid "Lookup a record using GNS (NOT IMPLEMENTED)"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:238
+msgid "Get the authority of a particular name"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:241
+#, fuzzy
+msgid "Specify the type of the record lookup"
+msgstr "ange prioritet för innehållet"
+
+#: src/gns/gnunet-gns.c:244
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:255
+msgid "GNUnet GNS access tool"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:280
+#, fuzzy, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:333
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:377
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:439
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:498
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:514
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:725 src/gns/gnunet-gns-fcfsd.c:737
+#, fuzzy, c-format
+msgid "Option `%s' not specified in configuration section `%s'\n"
+msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:747 src/namestore/gnunet-namestore.c:299
+#, fuzzy
+msgid "Failed to read or create private zone key\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:757 src/namestore/gnunet-namestore.c:310
+#, fuzzy
+msgid "Failed to connect to namestore\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:773 src/gns/gnunet-gns-proxy.c:525
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:804
+msgid "GNUnet GNS first come first serve registration service"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:800
+msgid "listen on specified port"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:811
+msgid "GNUnet GNS proxy"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:122
+msgid "Call with name of HELLO file to modify.\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:128
+#, fuzzy, c-format
+msgid "Error accessing file `%s': %s\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/hello/gnunet-hello.c:136
+#, c-format
+msgid "File `%s' is too big to be a HELLO\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:143
+#, c-format
+msgid "File `%s' is too small to be a HELLO\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:153 src/hello/gnunet-hello.c:181
+#, fuzzy, c-format
+msgid "Error opening file `%s': %s\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/hello/gnunet-hello.c:169
+#, fuzzy, c-format
+msgid "Did not find well-formed HELLO in file `%s'\n"
+msgstr "%d filer hittades i katalog.\n"
+
+#: src/hello/gnunet-hello.c:193
+#, fuzzy, c-format
+msgid "Error writing HELLO to file `%s': %s\n"
+msgstr "Fel vid skapandet av användare"
+
 #: src/hostlist/gnunet-daemon-hostlist.c:264
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
@@ -3076,192 +3224,193 @@ msgstr ""
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:286
+#: src/hostlist/hostlist-client.c:289
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:340
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#: src/hostlist/hostlist-client.c:313 src/hostlist/hostlist-client.c:343
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/hostlist/hostlist-client.c:330
+#: src/hostlist/hostlist-client.c:331
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
+#: src/hostlist/hostlist-client.c:375 src/hostlist/hostlist-client.c:396
 #, c-format
 msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
-#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
-#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
-#: src/transport/plugin_transport_http_client.c:108
-#: src/transport/plugin_transport_http_client.c:123
+#: src/hostlist/hostlist-client.c:473 src/hostlist/hostlist-client.c:683
+#: src/hostlist/hostlist-client.c:689 src/hostlist/hostlist-client.c:741
+#: src/hostlist/hostlist-client.c:750 src/hostlist/hostlist-client.c:871
+#: src/hostlist/hostlist-client.c:961 src/hostlist/hostlist-client.c:966
+#: src/transport/plugin_transport_http_client.c:110
+#: src/transport/plugin_transport_http_client.c:125
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
+#: src/hostlist/hostlist-client.c:593 src/hostlist/hostlist-client.c:1331
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/hostlist/hostlist-client.c:623
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:663
+#: src/hostlist/hostlist-client.c:664
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:805
+#: src/hostlist/hostlist-client.c:802
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:822
+#: src/hostlist/hostlist-client.c:816
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/hostlist-client.c:836
 #, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+msgid "Download of hostlist from `%s' failed: `%s'\n"
+msgstr ""
+"Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/hostlist-client.c:848
+#: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/hostlist-client.c:856
+#: src/hostlist/hostlist-client.c:850
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:909
+#: src/hostlist/hostlist-client.c:903
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
+#: src/hostlist/hostlist-client.c:911
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1505
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1054
+#: src/hostlist/hostlist-client.c:1046
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
+#: src/hostlist/hostlist-client.c:1084
 msgid "Scheduled saving of hostlists\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1096
+#: src/hostlist/hostlist-client.c:1088
 #, c-format
 msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
+#: src/hostlist/hostlist-client.c:1111 src/hostlist/hostlist-client.c:1127
 #, fuzzy
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: src/hostlist/hostlist-client.c:1253
+#: src/hostlist/hostlist-client.c:1242
 #, c-format
 msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1284
+#: src/hostlist/hostlist-client.c:1273
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/hostlist/hostlist-client.c:1279
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1283
 #, c-format
 msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1305
+#: src/hostlist/hostlist-client.c:1294
 #, 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/hostlist-client.c:1338
+#: src/hostlist/hostlist-client.c:1327
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1340
+#: src/hostlist/hostlist-client.c:1329
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1362
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1387
+#: src/hostlist/hostlist-client.c:1376
 #, 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/hostlist-client.c:1392
+#: src/hostlist/hostlist-client.c:1381
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1428
+#: src/hostlist/hostlist-client.c:1417
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1480
+#: src/hostlist/hostlist-client.c:1470
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/hostlist-client.c:1473
 #, c-format
 msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1482
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1504
+#: src/hostlist/hostlist-client.c:1494
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1508
+#: src/hostlist/hostlist-client.c:1498
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
@@ -3275,8 +3424,10 @@ msgstr "# byte krypterade"
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:184
-#: src/topology/gnunet-daemon-topology.c:875
+#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:425
+#: src/peerinfo-tool/gnunet-peerinfo.c:403
+#: src/peerinfo-tool/gnunet-peerinfo.c:519
+#: src/topology/gnunet-daemon-topology.c:927
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -3285,250 +3436,562 @@ msgstr "Skriv ut information om GNUnets motparter."
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:221
+#: src/hostlist/hostlist-server.c:219
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:269
+#: src/hostlist/hostlist-server.c:263
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:272
+#: src/hostlist/hostlist-server.c:266
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:280
+#: src/hostlist/hostlist-server.c:273
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:287
+#: src/hostlist/hostlist-server.c:279
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:291
+#: src/hostlist/hostlist-server.c:283
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/hostlist-server.c:291
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:294
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:306
+#: src/hostlist/hostlist-server.c:298
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:307
+#: src/hostlist/hostlist-server.c:299
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:350
+#: src/hostlist/hostlist-server.c:341
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:397
+#: src/hostlist/hostlist-server.c:388
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:565
+#: src/hostlist/hostlist-server.c:561
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/hostlist/hostlist-server.c:574
+#: src/hostlist/hostlist-server.c:570
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:588
+#: src/hostlist/hostlist-server.c:584
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-server.c:626
+#: src/hostlist/hostlist-server.c:624
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/hostlist/hostlist-server.c:666
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4595
+#: src/integration-tests/connection_watchdog.c:997
+#, fuzzy, c-format
+msgid "Transport plugin: `%s' port %llu\n"
+msgstr "Testar transport(er) %s\n"
+
+#: src/integration-tests/connection_watchdog.c:1030
+#, fuzzy, c-format
+msgid "Found %u transport plugins: `%s'\n"
+msgstr "Testar transport(er) %s\n"
+
+#: src/integration-tests/connection_watchdog.c:1089
+msgid "Send ping messages to test connectivity (default == NO)"
+msgstr ""
+
+#: src/integration-tests/connection_watchdog.c:1095
+#: src/template/gnunet-template.c:68
+#, fuzzy
+msgid "help text"
+msgstr "hjälptext för -t"
+
+#: src/mesh/gnunet-service-mesh.c:4590
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4789
+#: src/mesh/gnunet-service-mesh.c:4784
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:4798
+#: src/mesh/gnunet-service-mesh.c:4793
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/namestore/namestore_api.c:272 src/namestore/namestore_api.c:313
+#: src/mysql/mysql.c:174
+#, c-format
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
+
+#: src/mysql/mysql.c:181
+#, fuzzy, c-format
+msgid "Could not access file `%s': %s\n"
+msgstr "Kunde inte köra \"%s\": %s\n"
+
+#: src/namestore/gnunet-namestore.c:157
+#, fuzzy, c-format
+msgid "Adding record failed: %s\n"
+msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
+
+#: src/namestore/gnunet-namestore.c:183
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
+
+#: src/namestore/gnunet-namestore.c:239
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:276
+#, c-format
+msgid "Option `%s' not given, but I need a zone key file!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:281
+#, fuzzy, c-format
+msgid "Using default zone file `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/namestore/gnunet-namestore.c:291
+#, c-format
+msgid "No options given\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:321
+#, fuzzy, c-format
+msgid "Unsupported type `%s'\n"
+msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
+
+#: src/namestore/gnunet-namestore.c:328 src/namestore/gnunet-namestore.c:350
+#: src/namestore/gnunet-namestore.c:374 src/namestore/gnunet-namestore.c:384
+#: src/namestore/gnunet-namestore.c:409
+#, fuzzy, c-format
+msgid "Missing option `%s' for operation `%s'\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/namestore/gnunet-namestore.c:329 src/namestore/gnunet-namestore.c:351
+msgid "add/del"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:341
+#, 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:366
+#, fuzzy, c-format
+msgid "Invalid time format `%s'\n"
+msgstr "Ogiltigt format för IP: \"%s\"\n"
+
+#: src/namestore/gnunet-namestore.c:375 src/namestore/gnunet-namestore.c:385
+msgid "add"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:410
+msgid "del"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:462
+msgid "add record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:465
+msgid "delete record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:468
+msgid "display records"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:471
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:474
+msgid "name of the record to add/delete/display"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:477
+msgid "type of the record to add/delete/display"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:480
+msgid "value of the record to add/delete"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:483
+msgid "create or list public record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:486
+msgid "create or list non-authority record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:489
+msgid "filename with the zone key"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:500
+#, fuzzy
+msgid "GNUnet zone manipulation tool"
+msgstr "GNUnet-konfiguration"
+
+#: src/namestore/gnunet-service-namestore.c:143
+#, c-format
+msgid "File zone `%s' but corrupt content already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:154
+#, c-format
+msgid "File zone `%s' containing this key already exists\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:160
+#, c-format
+msgid ""
+"File zone `%s' but different zone key already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:198
+#, fuzzy, c-format
+msgid "Stored zonekey for zone `%s' in file `%s'\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/namestore/gnunet-service-namestore.c:1909
+#, fuzzy
+msgid "No directory to load zonefiles specified in configuration\n"
+msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#: src/namestore/gnunet-service-namestore.c:1918
+#, c-format
+msgid "Creating directory `%s' for zone files failed!\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:315 src/namestore/namestore_api.c:353
 msgid "Namestore added record successfully"
 msgstr ""
 
-#: src/namestore/namestore_api.c:281 src/namestore/namestore_api.c:322
+#: src/namestore/namestore_api.c:323
 msgid "Namestore failed to add record"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:289
+#: src/namestore/namestore_api.c:361
+msgid "Namestore record already existed"
+msgstr ""
+
+#: src/namestore/namestore_api.c:368
+msgid "Namestore failed to add record\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:401
+msgid "Namestore removed record successfully"
+msgstr ""
+
+#: src/namestore/namestore_api.c:408
+msgid "No records for entry"
+msgstr ""
+
+#: src/namestore/namestore_api.c:415
+#, fuzzy
+msgid "Could not find record to remove"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/namestore/namestore_api.c:422
+#, fuzzy
+msgid "Failed to create new signature"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/namestore/namestore_api.c:429
+#, fuzzy
+msgid "Failed to put new set of records in database"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:328
+#: src/nat/gnunet-nat-server.c:318
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat.c:803
+#: src/nat/nat.c:799
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:852
+#: src/nat/nat.c:844
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:1121
+#: src/nat/nat.c:1111
 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/nat/nat.c:1187 src/nat/nat.c:1197
+#: src/nat/nat.c:1177 src/nat/nat.c:1187
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1329
+#: src/nat/nat.c:1321
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1341
+#: src/nat/nat.c:1332
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat_test.c:348
+#: src/nat/nat_test.c:341
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/nat/nat_test.c:418
+#: src/nat/nat_test.c:411
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:926
+#: src/nse/gnunet-nse-profiler.c:928
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:936
+#: src/nse/gnunet-service-nse.c:925
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
-#: src/nse/gnunet-service-nse.c:1431
+#: src/nse/gnunet-service-nse.c:1381 src/nse/gnunet-service-nse.c:1400
+#: src/nse/gnunet-service-nse.c:1421
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1398
+#: src/nse/gnunet-service-nse.c:1388
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/nse/gnunet-service-nse.c:1419
+#: src/nse/gnunet-service-nse.c:1409
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:133
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:195
+#: src/peerinfo/gnunet-service-peerinfo.c:203
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:229
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
+#: src/peerinfo/gnunet-service-peerinfo.c:254
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:305
+#: src/peerinfo/gnunet-service-peerinfo.c:353
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:279
-#, fuzzy, c-format
-msgid "Failed to transmit message to `%s' service.\n"
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:710
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:238
+msgid "aborted due to explicit disconnect request"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:358
+#, fuzzy
+msgid "failed to transmit request (service down?)"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/peerinfo/peerinfo_api.c:435
+#: src/peerinfo/peerinfo_api.c:505
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
+#: src/peerinfo/peerinfo_api.c:531 src/peerinfo/peerinfo_api.c:550
+#: src/peerinfo/peerinfo_api.c:565 src/peerinfo/peerinfo_api.c:576
+#: src/peerinfo/peerinfo_api.c:587
 #, fuzzy
-msgid "Received invalid message from `PEERINFO' service.\n"
+msgid "Received invalid message from `PEERINFO' service."
 msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
 
-#: src/peerinfo/peerinfo_api.c:523
+#: src/peerinfo/peerinfo_api.c:663
 #, fuzzy
-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
+msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/peerinfo/peerinfo_api.c:557
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api_notify.c:258
+#: src/peerinfo/peerinfo_api_notify.c:256
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/peerinfo-tool/gnunet-peerinfo.c:581
+#, fuzzy
+msgid "Failed to parse HELLO message: missing expiration time\n"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:589
+#, fuzzy
+msgid "Failed to parse HELLO message: invalid expiration time\n"
+msgstr "Kunde inte spara konfiguration!"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:598
+#, fuzzy
+msgid "Failed to parse HELLO message: malformed\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:608
+#, fuzzy
+msgid "Failed to parse HELLO message: missing transport plugin\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:625
+#, c-format
+msgid "Plugin `%s' not found\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:634
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:653
+#, fuzzy, c-format
+msgid "Failed to parse `%s' as an address for plugin `%s'\n"
+msgstr "Misslyckades att binda till UDP-port %d.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:685
+#, c-format
+msgid "Failure adding HELLO: %s\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:833
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#: src/peerinfo-tool/gnunet-peerinfo.c:840
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
+#: src/peerinfo-tool/gnunet-peerinfo.c:875
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Ogiltiga argument: "
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:899
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
+#: src/peerinfo-tool/gnunet-peerinfo.c:936
+msgid "don't resolve host names"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:939
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:942
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:945
+msgid "list all known peers"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:948
+msgid "also output HELLO uri(s)"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:951
+msgid "add given HELLO uri to the database"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:957
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
+#: src/transport/gnunet-service-transport_plugins.c:118
+#, fuzzy, c-format
+msgid "Starting transport plugins `%s'\n"
+msgstr "Testar transport(er) %s\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
+#: src/transport/gnunet-service-transport_plugins.c:122
+#, fuzzy, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr "Testar transport(er) %s\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
+#: src/transport/gnunet-service-transport_plugins.c:150
+#, fuzzy, c-format
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/postgres/postgres.c:59
+#, fuzzy, c-format
+msgid "`%s:%s' failed at %s:%d with error: %s"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/postgres/postgres.c:148
+#, fuzzy, c-format
+msgid "Unable to initialize Postgres: %s"
+msgstr "Kunde inte initiera SQLite.\n"
+
 #: src/pt/gnunet-daemon-pt.c:264
 #, fuzzy
 msgid "Failed to pack DNS request.  Dropping.\n"
@@ -3595,50 +4058,65 @@ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:209
+#: src/statistics/gnunet-service-statistics.c:271
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-service-statistics.c:267
+#: src/statistics/gnunet-service-statistics.c:330
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-statistics.c:98
+#: src/statistics/gnunet-statistics.c:122
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:164
+#: src/statistics/gnunet-statistics.c:199
+#, c-format
+msgid "No subsystem or name given\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:207
+#, fuzzy, c-format
+msgid "Failed to initialize watch routine\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/statistics/gnunet-statistics.c:227
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:167
+#: src/statistics/gnunet-statistics.c:230
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:170
+#: src/statistics/gnunet-statistics.c:233
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:173
+#: src/statistics/gnunet-statistics.c:236
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:180
+#: src/statistics/gnunet-statistics.c:239
+msgid "watch value continously"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:246
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
-#: src/statistics/statistics_api.c:390
+#: src/statistics/statistics_api.c:456
 #, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+msgid "Could not save some persistent statistics\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/template/gnunet-template.c:68
-#, fuzzy
-msgid "help text"
-msgstr "hjälptext för -t"
+#: src/statistics/statistics_api.c:999
+msgid ""
+"Failed to receive acknowledgement from statistics service, some statistics "
+"might have been lost!\n"
+msgstr ""
 
 #: src/testing/gnunet-testing.c:157
 #, fuzzy
@@ -3687,599 +4165,437 @@ msgstr "GNUnet-konfiguration"
 msgid "Could not access hostkey.\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/testing/testing.c:204
+#: src/testing/testing.c:200
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:218 src/testing/testing.c:808
+#: src/testing/testing.c:214 src/testing/testing.c:798
 #, fuzzy
 msgid "`scp' did not complete cleanly.\n"
 msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
 
-#: src/testing/testing.c:239
+#: src/testing/testing.c:237
 #, fuzzy
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:240
+#: src/testing/testing.c:238
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/testing/testing.c:292
+#: src/testing/testing.c:286
 #, fuzzy, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:299
+#: src/testing/testing.c:293
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:300 src/testing/testing.c:488
+#: src/testing/testing.c:294 src/testing/testing.c:471
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:360
+#: src/testing/testing.c:354
 #, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:364
+#: src/testing/testing.c:358
 #, fuzzy
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:374
+#: src/testing/testing.c:368
 #, fuzzy
 msgid "Failed to get hostkey!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:406
+#: src/testing/testing.c:400
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:480
+#: src/testing/testing.c:463
 #, fuzzy, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:487
+#: src/testing/testing.c:470
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/testing/testing.c:509 src/testing/testing.c:612
+#: src/testing/testing.c:493 src/testing/testing.c:600
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:510 src/testing/testing.c:613
-#: src/testing/testing.c:633
+#: src/testing/testing.c:494 src/testing/testing.c:601
+#: src/testing/testing.c:621
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:582
+#: src/testing/testing.c:570
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:632
+#: src/testing/testing.c:620
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/testing/testing.c:653 src/testing/testing.c:685
+#: src/testing/testing.c:643 src/testing/testing.c:675
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:668 src/testing/testing.c:723
+#: src/testing/testing.c:658 src/testing/testing.c:713
 #, fuzzy
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
 
-#: src/testing/testing.c:796
+#: src/testing/testing.c:786
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:966
+#: src/testing/testing.c:948
 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/testing/testing.c:1237 src/testing/testing_group.c:6278
+#: src/testing/testing.c:1207 src/testing/testing_group.c:6154
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:1322 src/testing/testing.c:1397
+#: src/testing/testing.c:1292 src/testing/testing.c:1359
 #, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/testing/testing.c:1480
+#: src/testing/testing.c:1448
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/testing/testing.c:1610
+#: src/testing/testing.c:1601
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1618
+#: src/testing/testing.c:1609
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1636
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:1650
+#: src/testing/testing.c:1639
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/testing/testing.c:1805
+#: src/testing/testing.c:1794
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/testing/testing.c:1933
+#: src/testing/testing.c:1922
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:2156
+#: src/testing/testing.c:2145
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1910 src/testing/testing_group.c:1922
-#: src/testing/testing_group.c:2023 src/testing/testing_group.c:2082
-#: src/testing/testing_group.c:2171 src/testing/testing_group.c:2191
-#: src/testing/testing_group.c:2328 src/testing/testing_peergroup.c:940
+#: src/testing/testing_group.c:1895 src/testing/testing_group.c:1907
+#: src/testing/testing_group.c:2008 src/testing/testing_group.c:2065
+#: src/testing/testing_group.c:2152 src/testing/testing_group.c:2172
+#: src/testing/testing_group.c:2302 src/testing/testing_peergroup.c:950
 #, fuzzy, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 
-#: src/testing/testing_group.c:1932
-#, fuzzy, c-format
-msgid "Target is %d connections per peer."
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/testing/testing_group.c:2179
+#: src/testing/testing_group.c:2160
 #, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2209 src/testing/testing_group.c:2402
-#, c-format
-msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2246
-#, c-format
-msgid "natural log of %d is %d, will run %d iterations\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2249
-#, c-format
-msgid "Total connections added thus far: %u!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2290
-#, c-format
-msgid "Total connections added for small world: %d!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2342
-#, c-format
-msgid "rand is %f probability is %f\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
+#: src/testing/testing_group.c:2877 src/testing/testing_group.c:3063
 #, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
 "file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3020
-msgid "Finished copying all friend files!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3133
-#, fuzzy, c-format
-msgid "Copying file with command cp %s %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-
-#: src/testing/testing_group.c:3156
-#, fuzzy, c-format
-msgid "Copying file with command scp %s %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-
-#: src/testing/testing_group.c:3173
-#, c-format
-msgid "Checking copy status of file %d\n"
+#: src/testing/testing_group.c:3957
+msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3191
-#, c-format
-msgid "File %d copied\n"
+#: src/testing/testing_group.c:5226
+msgid "Unknown topology specification, can't connect peers!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3206
+#: src/testing/testing_group.c:5944 src/transport/transport-testing.c:636
 #, fuzzy
-msgid "Finished copying all blacklist files!\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
-#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
-msgid "Delaying connect, we have too many outstanding connections!\n"
-msgstr ""
+msgid "Could not read hostkeys file!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
-#: src/testing/testing_group.c:5035
-#, c-format
-msgid "Creating connection, outstanding_connections is %d\n"
-msgstr ""
+#: src/testing/testing_group.c:6011
+#, fuzzy, c-format
+msgid "Could not create configuration for peer number %u on `%s'!\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/testing/testing_group.c:3608
-#, c-format
-msgid "Offering HELLO of peer %s to peer %s\n"
+#: src/testing/testing_new.c:169
+msgid "tmppath cannot be NULL\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3734
+#: src/testing/testing_new.c:356
 #, c-format
-msgid "Creating connection, outstanding_connections is %d (max %d)\n"
+msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3988
-msgid "Creating clique topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3993
-msgid "Creating small world (ring) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3998
-msgid "Creating small world (2d-torus) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4002
-msgid "Creating ring topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4006
-msgid "Creating 2d torus topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4010
-msgid "Creating Erdos-Renyi topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4014
-msgid "Creating InterNAT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4018
-msgid "Creating Scale Free topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4023
-msgid "Creating straight line topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4027
-msgid "Creating topology from file!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4043
-msgid "Creating no allowed topology (all peers can connect at core level)\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4058
-msgid "Failed during friend file copying!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4064
-msgid "Friend files created/copied successfully!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4081
-msgid "Blacklisting all but clique topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4087
-msgid "Blacklisting all but small world (ring) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4093
-msgid "Blacklisting all but small world (2d-torus) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4099
-msgid "Blacklisting all but ring topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4105
-msgid "Blacklisting all but 2d torus topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4111
-msgid "Blacklisting all but Erdos-Renyi topology\n"
-msgstr ""
+#: src/testing/testing_new.c:365
+#, fuzzy, c-format
+msgid "Could not open hostkeys file: %s\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing_group.c:4117
-msgid "Blacklisting all but InterNAT topology\n"
+#: src/testing/testing_new.c:380
+#, c-format
+msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4152
-msgid "Blacklisting all but Scale Free topology\n"
-msgstr ""
+#: src/testing/testing_new.c:437
+#, fuzzy, c-format
+msgid "Key number %u does not exist\n"
+msgstr "antal meddelanden att använda per iteration"
 
-#: src/testing/testing_group.c:4158
-msgid "Blacklisting all but straight line topology\n"
-msgstr ""
+#: src/testing/testing_new.c:446
+#, fuzzy, c-format
+msgid "Error while decoding key %u\n"
+msgstr "Fel vid nedladdning: %s\n"
 
-#: src/testing/testing_group.c:4173
+#: src/testing/testing_new.c:680
 #, fuzzy
-msgid "Failed during blacklist file copying!\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/testing/testing_group.c:4179
-msgid "Blacklist files created/copied successfully!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5263
-msgid "Creating clique CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5270
-msgid "Creating small world (ring) CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5277
-msgid "Creating small world (2d-torus) CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5283
-msgid "Creating ring CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5290
-msgid "Creating 2d torus CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5297
-msgid "Creating Erdos-Renyi CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5304
-msgid "Creating InterNAT CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5311
-msgid "Creating Scale Free CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5318
-msgid "Creating straight line CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5324
-msgid "Creating no CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5330
-msgid "Unknown topology specification, can't connect peers!\n"
-msgstr ""
+msgid "Failed to create configuration for peer (not enough free ports?)\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/testing/testing_group.c:5340
+#: src/testing/testing_new.c:691
 #, c-format
-msgid "Connecting random subset (%'.2f percent) of possible peers\n"
+msgid ""
+"You attempted to create a testbed with more than %u hosts.  Please "
+"precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5348
-#, c-format
-msgid "Connecting a minimum of %u peers each (if possible)\n"
-msgstr ""
+#: src/testing/testing_new.c:704
+#, fuzzy, c-format
+msgid "Failed to initialize hostkey for peer %u\n"
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/testing/testing_group.c:5357
-#, c-format
-msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
-msgstr ""
+#: src/testing/testing_new.c:734
+#, fuzzy, c-format
+msgid "Failed to write hostkey file for peer %u: %s\n"
+msgstr "Kunde inte skapa användarkonto:"
 
-#: src/testing/testing_group.c:5367
-#, c-format
-msgid "Finding additional %u closest peers each (if possible)\n"
-msgstr ""
+#: src/testing/testing_new.c:751
+#, fuzzy, c-format
+msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:650
-#, fuzzy
-msgid "Could not read hostkeys file!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
+#: src/testing/testing_new.c:791
+#, fuzzy, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr "Fel vid %s:%d.\n"
 
-#: src/testing/testing_group.c:6131
+#: src/testing/testing_new.c:959
 #, fuzzy, c-format
-msgid "Could not create configuration for peer number %u on `%s'!\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+msgid "Failed to load configuration from %s\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/topology/gnunet-daemon-topology.c:244
+#: src/topology/gnunet-daemon-topology.c:259
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:380
+#: src/topology/gnunet-daemon-topology.c:392
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# byte mottogs via TCP"
 
-#: src/topology/gnunet-daemon-topology.c:675
-#: src/topology/gnunet-daemon-topology.c:761
+#: src/topology/gnunet-daemon-topology.c:730
+#: src/topology/gnunet-daemon-topology.c:815
 #, fuzzy
 msgid "# friends connected"
 msgstr "# av anslutna parter"
 
-#: src/topology/gnunet-daemon-topology.c:950
+#: src/topology/gnunet-daemon-topology.c:996
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:982
+#: src/topology/gnunet-daemon-topology.c:1026
 #, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:994
+#: src/topology/gnunet-daemon-topology.c:1039
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1000
+#: src/topology/gnunet-daemon-topology.c:1045
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/topology/gnunet-daemon-topology.c:1054
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1017
+#: src/topology/gnunet-daemon-topology.c:1062
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1037
+#: src/topology/gnunet-daemon-topology.c:1082
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1050
+#: src/topology/gnunet-daemon-topology.c:1095
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1060
+#: src/topology/gnunet-daemon-topology.c:1105
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1066
+#: src/topology/gnunet-daemon-topology.c:1111
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1076
+#: src/topology/gnunet-daemon-topology.c:1121
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1082
+#: src/topology/gnunet-daemon-topology.c:1127
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1089
+#: src/topology/gnunet-daemon-topology.c:1134
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1169
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/topology/gnunet-daemon-topology.c:1183
+#: src/topology/gnunet-daemon-topology.c:1224
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1323
+#: src/topology/gnunet-daemon-topology.c:1363
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:247
+#: src/transport/gnunet-service-transport_blacklist.c:246
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:254
+#: src/transport/gnunet-service-transport_blacklist.c:252
 #, c-format
 msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
+#: src/transport/gnunet-service-transport_blacklist.c:263
 #, fuzzy, c-format
 msgid "Failed to read blacklist from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
+#: src/transport/gnunet-service-transport_blacklist.c:284
+#: src/transport/gnunet-service-transport_blacklist.c:308
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
+#: src/transport/gnunet-service-transport_blacklist.c:295
+#: src/transport/gnunet-service-transport_blacklist.c:331
 #, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:350
+#: src/transport/gnunet-service-transport_blacklist.c:345
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:364
+#: src/transport/gnunet-service-transport_blacklist.c:359
 #, c-format
 msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:523
-#: src/transport/gnunet-service-transport_blacklist.c:764
+#: src/transport/gnunet-service-transport_blacklist.c:514
+#: src/transport/gnunet-service-transport_blacklist.c:747
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:158
+#: src/transport/gnunet-service-transport.c:163
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport.c:572
+#: src/transport/gnunet-service-transport.c:237
+#, fuzzy
+msgid "# bytes total received"
+msgstr "# byte krypterade"
+
+#: src/transport/gnunet-service-transport.c:284
+#, fuzzy
+msgid "# bytes payload received"
+msgstr "# byte dekrypterade"
+
+#: src/transport/gnunet-service-transport.c:582
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:581
+#: src/transport/gnunet-service-transport.c:591
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:353
+#: src/transport/gnunet-service-transport_clients.c:352
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:358
+#: src/transport/gnunet-service-transport_clients.c:357
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:510
+#: src/transport/gnunet-service-transport_clients.c:503
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:628
-#, fuzzy
-msgid "# bytes payload received for other peers"
-msgstr "# byte mottagna av typen %d"
-
-#: src/transport/gnunet-service-transport_clients.c:645
+#: src/transport/gnunet-service-transport_clients.c:631
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:696
+#: src/transport/gnunet-service-transport_clients.c:682
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -4288,616 +4604,561 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:482
-msgid "# failed connection attempts due to timeout"
+#: src/transport/gnunet-service-transport_neighbours.c:1032
+#, fuzzy
+msgid "# DISCONNECT messages sent"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1148
+#: src/transport/gnunet-service-transport_neighbours.c:1482
+msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:883
+#: src/transport/gnunet-service-transport_neighbours.c:1153
 #, fuzzy
-msgid "# peers disconnected due to external request"
-msgstr "# av anslutna parter"
+msgid "# messages transmitted to other peers"
+msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:966
+#: src/transport/gnunet-service-transport_neighbours.c:1158
 #, fuzzy
-msgid "# fast reconnects failed"
-msgstr "# av anslutna parter"
+msgid "# transmission failures for messages to other peers"
+msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1022
-#, fuzzy
-msgid "# peers disconnected due to timeout"
-msgstr "# av anslutna parter"
+#: src/transport/gnunet-service-transport_neighbours.c:1215
+msgid "# messages timed out while in transport queue"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1254
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1088
+#: src/transport/gnunet-service-transport_neighbours.c:1278
 #, fuzzy
-msgid "# peers disconnected due to global disconnect"
+msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1888
-#: src/transport/gnunet-service-transport_neighbours.c:1909
-msgid "# messages not sent (no such peer or not connected)"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:1286
+#, fuzzy
+msgid "# KEEPALIVE messages discarded (no session)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1925
-msgid "# bytes in message queue for other peers"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:1323
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1977
+#: src/transport/gnunet-service-transport_neighbours.c:1332
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1388
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2013
+#: src/transport/gnunet-service-transport_neighbours.c:1422
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2031
+#: src/transport/gnunet-service-transport_neighbours.c:1438
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2060
-msgid "# KEEPALIVE messages discarded (not connected)"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:2544
+#, fuzzy
+msgid "# unexpected CONNECT_ACK messages (no peer)"
+msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2113
+#: src/transport/gnunet-service-transport_neighbours.c:2559
+#: src/transport/gnunet-service-transport_neighbours.c:2585
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+msgid "# unexpected CONNECT_ACK messages (not ready)"
+msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2121
+#: src/transport/gnunet-service-transport_neighbours.c:2598
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
+msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2187
+#: src/transport/gnunet-service-transport_neighbours.c:2627
+#, fuzzy
+msgid "# unexpected CONNECT_ACK messages (disconnecting)"
+msgstr "skicka ANTAL meddelanden"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2807
+#, fuzzy
+msgid "# unexpected SESSION ACK messages"
+msgstr "# krypterade PONG-meddelanden skickade"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2856
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2205
+#: src/transport/gnunet-service-transport_neighbours.c:2870
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2323
+#: src/transport/gnunet-service-transport_neighbours.c:2901
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2336
+#: src/transport/gnunet-service-transport_neighbours.c:2912
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2411
-#, fuzzy
-msgid "# unexpected CONNECT_ACK messages (no peer)"
-msgstr "skicka ANTAL meddelanden"
-
-#: src/transport/gnunet-service-transport_neighbours.c:2453
-#, fuzzy
-msgid "# unexpected CONNECT_ACK messages"
-msgstr "skicka ANTAL meddelanden"
+#: src/transport/gnunet-service-transport_neighbours.c:2943
+msgid "# other peer asked to disconnect from us"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2544
+#: src/transport/gnunet-service-transport_neighbours.c:3020
 #, fuzzy
-msgid "# unexpected ACK messages"
-msgstr "# krypterade PONG-meddelanden skickade"
+msgid "# disconnected from peer upon explicit request"
+msgstr "# av anslutna parter"
 
 #: src/transport/gnunet-service-transport_plugins.c:111
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:118
-#, fuzzy, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr "Testar transport(er) %s\n"
-
-#: src/transport/gnunet-service-transport_plugins.c:122
-#, fuzzy, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr "Testar transport(er) %s\n"
-
-#: src/transport/gnunet-service-transport_plugins.c:150
-#, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/transport/gnunet-service-transport_validation.c:410
+#: src/transport/gnunet-service-transport_validation.c:414
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:459
+#: src/transport/gnunet-service-transport_validation.c:463
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:508
+#: src/transport/gnunet-service-transport_validation.c:512
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/transport/gnunet-service-transport_validation.c:566
+#: src/transport/gnunet-service-transport_validation.c:570
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:798
+#: src/transport/gnunet-service-transport_validation.c:805
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_validation.c:833
+#: src/transport/gnunet-service-transport_validation.c:840
 #, c-format
 msgid ""
 "Not confirming PING with address `%s' since I cannot confirm having this "
 "address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:919
+#: src/transport/gnunet-service-transport_validation.c:924
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:928
+#: src/transport/gnunet-service-transport_validation.c:933
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1050
+#: src/transport/gnunet-service-transport_validation.c:1055
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1080
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1134
+#: src/transport/gnunet-service-transport_validation.c:1136
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:256
+#: src/transport/gnunet-transport.c:260
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:269
+#: src/transport/gnunet-transport.c:273
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:319
+#: src/transport/gnunet-transport.c:323
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:326
+#: src/transport/gnunet-transport.c:330
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:359
+#: src/transport/gnunet-transport.c:363
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:379
+#: src/transport/gnunet-transport.c:383
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:410
+#: src/transport/gnunet-transport.c:414
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:439
+#: src/transport/gnunet-transport.c:443
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:453
+#: src/transport/gnunet-transport.c:466
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:483
+#: src/transport/gnunet-transport.c:473
+#, c-format
+msgid "Peer `%s': %s <unable to resolve address>\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:501
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-transport.c:539
+#: src/transport/gnunet-transport.c:569
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:587
+#: src/transport/gnunet-transport.c:618
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:590
+#: src/transport/gnunet-transport.c:621
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:593
+#: src/transport/gnunet-transport.c:624
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:596
+#: src/transport/gnunet-transport.c:627
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:599
+#: src/transport/gnunet-transport.c:630
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:603
+#: src/transport/gnunet-transport.c:634
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:606
+#: src/transport/gnunet-transport.c:637
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:614
+#: src/transport/gnunet-transport.c:645
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/plugin_transport_http.c:981
+#: src/transport/plugin_transport_http.c:1100
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1029
+#: src/transport/plugin_transport_http.c:1149
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/transport/plugin_transport_http.c:1054 src/util/service.c:986
+#: src/transport/plugin_transport_http.c:1174 src/util/service.c:1036
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_http.c:1071 src/util/service.c:1003
+#: src/transport/plugin_transport_http.c:1191 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/plugin_transport_http.c:1176
+#: src/transport/plugin_transport_http.c:1296
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1189
+#: src/transport/plugin_transport_http.c:1309
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1264
+#: src/transport/plugin_transport_http.c:1386
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1277
+#: src/transport/plugin_transport_http.c:1399
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/plugin_transport_http.c:1288
+#: src/transport/plugin_transport_http.c:1410
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1308
+#: src/transport/plugin_transport_http.c:1430
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1338
+#: src/transport/plugin_transport_http.c:1460
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:621
+#: src/transport/plugin_transport_http_client.c:624
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:189
+#: src/transport/plugin_transport_http_server.c:178
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:213
+#: src/transport/plugin_transport_http_server.c:202
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:370
-#, fuzzy, c-format
-msgid "Received malformed message via %s. Ignored.\n"
-msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
-
-# capped är inte ett bra ord IMHO
-#: src/transport/plugin_transport_smtp.c:457
-#, fuzzy
-msgid "SMTP filter string to invalid, lacks ': '\n"
-msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
-
-# capped är inte ett bra ord IMHO
-#: src/transport/plugin_transport_smtp.c:466
-#, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
-msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
-
-#: src/transport/plugin_transport_smtp.c:561
-#: src/transport/plugin_transport_smtp.c:571
-#: src/transport/plugin_transport_smtp.c:584
-#: src/transport/plugin_transport_smtp.c:603
-#: src/transport/plugin_transport_smtp.c:626
-#: src/transport/plugin_transport_smtp.c:634
-#: src/transport/plugin_transport_smtp.c:647
-#: src/transport/plugin_transport_smtp.c:658
-#, fuzzy, c-format
-msgid "SMTP: `%s' failed: %s.\n"
-msgstr "\"%s\" %s misslyckades: %s\n"
-
-#: src/transport/plugin_transport_smtp.c:801
-msgid "No email-address specified, can not start SMTP transport.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:813
-#, fuzzy
-msgid "# bytes received via SMTP"
-msgstr "# byte mottogs via TCP"
-
-#: src/transport/plugin_transport_smtp.c:814
-#, fuzzy
-msgid "# bytes sent via SMTP"
-msgstr "# byte skickades via TCP"
-
-#: src/transport/plugin_transport_smtp.c:816
-#, fuzzy
-msgid "# bytes dropped by SMTP (outgoing)"
-msgstr "# byte kastade via TCP (utgående)"
-
-#: src/transport/plugin_transport_tcp.c:512
+#: src/transport/plugin_transport_tcp.c:591
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:616
-#: src/transport/plugin_transport_tcp.c:705
-#: src/transport/plugin_transport_tcp.c:757
-#: src/transport/plugin_transport_tcp.c:830
-#: src/transport/plugin_transport_tcp.c:909
+#: src/transport/plugin_transport_tcp.c:767
+#: src/transport/plugin_transport_tcp.c:856
+#: src/transport/plugin_transport_tcp.c:906
+#: src/transport/plugin_transport_tcp.c:992
+#: src/transport/plugin_transport_tcp.c:1086
+#: src/transport/plugin_transport_tcp.c:1103
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_tcp.c:622
-#: src/transport/plugin_transport_tcp.c:856
-#: src/transport/plugin_transport_tcp.c:1561
+#: src/transport/plugin_transport_tcp.c:774
+#: src/transport/plugin_transport_tcp.c:963
+#: src/transport/plugin_transport_tcp.c:1761
+#: src/transport/plugin_transport_tcp.c:2390
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:709
+#: src/transport/plugin_transport_tcp.c:860
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:760
+#: src/transport/plugin_transport_tcp.c:909
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:834
+#: src/transport/plugin_transport_tcp.c:996
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1081
+#: src/transport/plugin_transport_tcp.c:1290
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1116
-msgid "Found valid IPv4 NAT address (creating session)!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1186
+#: src/transport/plugin_transport_tcp.c:1401
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1603
+#: src/transport/plugin_transport_tcp.c:1802
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:1756
+#: src/transport/plugin_transport_tcp.c:1973
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:1823
+#: src/transport/plugin_transport_tcp.c:2043
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
+#: src/transport/plugin_transport_tcp.c:2279 src/util/service.c:940
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1976
+#: src/transport/plugin_transport_tcp.c:2293
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2039
+#: src/transport/plugin_transport_tcp.c:2355
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/plugin_transport_tcp.c:2062
+#: src/transport/plugin_transport_tcp.c:2378
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2066
+#: src/transport/plugin_transport_tcp.c:2382
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2386
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:130
+#: src/transport/plugin_transport_udp_broadcasting.c:128
 #, fuzzy
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:172
+#: src/transport/plugin_transport_udp_broadcasting.c:169
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:393
+#: src/transport/plugin_transport_udp_broadcasting.c:367
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1985
+#: src/transport/plugin_transport_udp.c:1894
+#, c-format
+msgid ""
+"UDP could not message to `%s': `%s'. Please check your network configuration "
+"and disable IPv6 if your connection does not have a global IPv6 address\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2138
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:2068
+#: src/transport/plugin_transport_udp.c:2306
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2112
+#: src/transport/plugin_transport_udp.c:2349
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_unix.c:1051
+#: src/transport/plugin_transport_unix.c:1356
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_wlan.c:875
+#: src/transport/plugin_transport_wlan.c:561
+msgid "# WLAN ACKs sent"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:580
 #, fuzzy
-msgid "# wlan session timeouts"
-msgstr "# sessionsnycklar accepterade"
+msgid "# WLAN messages defragmented"
+msgstr "# PING-meddelanden skapade"
 
-#: src/transport/plugin_transport_wlan.c:899
+#: src/transport/plugin_transport_wlan.c:626
+#: src/transport/plugin_transport_wlan.c:676
+#: src/transport/plugin_transport_wlan.c:1696
 #, fuzzy
-msgid "# wlan session created"
+msgid "# WLAN sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_wlan.c:980
-#: src/transport/plugin_transport_wlan.c:1138
-#: src/transport/plugin_transport_wlan.c:1159
-#: src/transport/plugin_transport_wlan.c:1190
-#: src/transport/plugin_transport_wlan.c:2334
-#: src/transport/plugin_transport_wlan.c:3142
-msgid "# wlan pending sessions"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:1233
-#: src/transport/plugin_transport_wlan.c:1888
+#: src/transport/plugin_transport_wlan.c:749
 #, fuzzy
-msgid "# wlan pending fragments"
+msgid "# WLAN message fragments sent"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1388
-#, c-format
-msgid ""
-"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:1732
-msgid "# wlan hello beacons send"
+#: src/transport/plugin_transport_wlan.c:767
+msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1765
-#: src/transport/plugin_transport_wlan.c:1968
-#: src/transport/plugin_transport_wlan.c:2059
-#, c-format
-msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:867
+#: src/transport/plugin_transport_wlan.c:948
+#: src/transport/plugin_transport_wlan.c:1698
+#, fuzzy
+msgid "# WLAN MAC endpoints allocated"
+msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1954
-msgid "# wlan acks send"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:1119
+#, fuzzy
+msgid "# HELLO messages received via WLAN"
+msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:2025
+#: src/transport/plugin_transport_wlan.c:1140
 #, fuzzy
-msgid "# wlan fragments send"
+msgid "# fragments received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:2161
-#, c-format
-msgid "Wlan Address len %d is wrong\n"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:2295
-#: src/transport/plugin_transport_wlan.c:2919
-#: src/transport/plugin_transport_wlan.c:3145
-msgid "# wlan mac endpoints"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:1150
+#, fuzzy
+msgid "# ACKs received via WLAN"
+msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:2517
+#: src/transport/plugin_transport_wlan.c:1207
 #, fuzzy
-msgid "# wlan whole messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+msgid "# WLAN DATA messages discarded due to CRC32 error"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_wlan.c:2708
+#: src/transport/plugin_transport_wlan.c:1306
 #, fuzzy
-msgid "# wlan hello messages received"
+msgid "# DATA messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:2742
+#: src/transport/plugin_transport_wlan.c:1341
 #, fuzzy
-msgid "# wlan fragments received"
-msgstr "# byte mottogs via TCP"
+msgid "# WLAN DATA messages processed"
+msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:2790
+#: src/transport/plugin_transport_wlan.c:1402
 #, fuzzy
-msgid "# wlan acks received"
-msgstr "# klartext PONG-meddelanden mottagna"
+msgid "# HELLO beacons sent via WLAN"
+msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_wlan.c:2879
-msgid "# wlan mac endpoints timeouts"
+#: src/transport/plugin_transport_wlan.c:1511
+msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2903
-#, fuzzy
-msgid "# wlan mac endpoints created"
-msgstr "# byte mottogs via TCP"
+#: src/transport/plugin_transport_wlan.c:1668
+#, fuzzy, c-format
+msgid "Invalid configuration option `%s' in section `%s'\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/transport/plugin_transport_wlan.c:2956
-msgid "# wlan WLAN_HELPER_DATA received"
+#: src/transport/plugin_transport_wlan.c:1677
+#, c-format
+msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3010
-#, fuzzy
-msgid "# wlan messages for this client received"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/transport/plugin_transport_wlan.c:3021
-#, fuzzy
-msgid "# wlan messages inside WLAN_HELPER_DATA received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+#: src/transport/plugin_transport_wlan.c:1687
+#, fuzzy, c-format
+msgid "Missing configuration option `%s' in section `%s'\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/transport/transport_api.c:588
+#: src/transport/transport_api.c:570
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
@@ -4932,134 +5193,127 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:304
+#: src/util/client.c:359
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:312
+#: src/util/client.c:367
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:657
+#: src/util/client.c:685
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:717 src/util/service.c:919
+#: src/util/client.c:740 src/util/service.c:970
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:859
+#: src/util/client.c:882
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/util/client.c:875
+#: src/util/client.c:896
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/util/client.c:1143
+#: src/util/client.c:1149
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:889
+#: src/util/common_logging.c:239 src/util/common_logging.c:890
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:887
+#: src/util/common_logging.c:241 src/util/common_logging.c:888
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:243 src/util/common_logging.c:885
+#: src/util/common_logging.c:243 src/util/common_logging.c:886
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/common_logging.c:245 src/util/common_logging.c:883
+#: src/util/common_logging.c:245 src/util/common_logging.c:884
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/common_logging.c:247 src/util/common_logging.c:891
+#: src/util/common_logging.c:247 src/util/common_logging.c:892
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:609
+#: src/util/common_logging.c:610
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/common_logging.c:724
+#: src/util/common_logging.c:725
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:892
+#: src/util/common_logging.c:893
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:991
+#: src/util/common_logging.c:992
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1029
+#: src/util/common_logging.c:1030
 msgid "invalid address"
 msgstr ""
 
-#: src/util/configuration.c:245
+#: src/util/configuration.c:244
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/configuration.c:817
+#: src/util/configuration.c:816
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/connection.c:460
+#: src/util/connection.c:420
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/util/connection.c:475
+#: src/util/connection.c:435
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:629
+#: src/util/connection.c:550
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/connection.c:821 src/util/connection.c:992
+#: src/util/connection.c:739 src/util/connection.c:909
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/connection.c:830
+#: src/util/connection.c:748
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' (%p)\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/connection.c:983
+#: src/util/connection.c:900
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/util/connection.c:1465
-#, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
-msgstr ""
-
-#: src/util/container_bloomfilter.c:507
+#: src/util/container_bloomfilter.c:510
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -5076,129 +5330,129 @@ msgstr ""
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 
-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#: src/util/crypto_rsa.c:661 src/util/crypto_rsa.c:708
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/crypto_rsa.c:623
+#: src/util/crypto_rsa.c:666
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
 
-#: src/util/crypto_rsa.c:641
+#: src/util/crypto_rsa.c:684
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+#: src/util/crypto_rsa.c:712 src/util/crypto_rsa.c:748
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:700
+#: src/util/crypto_rsa.c:743
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:720
+#: src/util/crypto_rsa.c:763
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
-#: src/util/crypto_rsa.c:738
+#: src/util/crypto_rsa.c:781
 #, fuzzy, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr "Anrop till \"%s\" med nyckel \"%s\".\n"
 
-#: src/util/crypto_rsa.c:959
+#: src/util/crypto_rsa.c:1032
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/disk.c:479
+#: src/util/disk.c:498
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/disk.c:1087
+#: src/util/disk.c:1062
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/disk.c:1441 src/util/service.c:1580
+#: src/util/disk.c:1416 src/util/service.c:1650
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/util/disk.c:1759
+#: src/util/disk.c:1734
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/util/getopt.c:672
+#: src/util/getopt.c:669
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/util/getopt.c:696
+#: src/util/getopt.c:693
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: flagga \"--%s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:701
+#: src/util/getopt.c:698
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: flagga \"%c%s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:718 src/util/getopt.c:886
+#: src/util/getopt.c:715 src/util/getopt.c:883
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: flagga \"%s\" kräver ett argument\n"
 
-#: src/util/getopt.c:747
+#: src/util/getopt.c:744
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: src/util/getopt.c:751
+#: src/util/getopt.c:748
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#: src/util/getopt.c:776
+#: src/util/getopt.c:773
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: otillåten flagga -- %c\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ogiltig flagga -- %c\n"
 
-#: src/util/getopt.c:806 src/util/getopt.c:934
+#: src/util/getopt.c:803 src/util/getopt.c:931
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: flagga kräver ett argument -- %c\n"
 
-#: src/util/getopt.c:854
+#: src/util/getopt.c:851
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: flagga \"-W %s\" är tvetydig\n"
 
-#: src/util/getopt.c:872
+#: src/util/getopt.c:869
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:1038
+#: src/util/getopt.c:1035
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "Använd --help för att få en lista på flaggor.\n"
 
-#: src/util/getopt_helpers.c:84
+#: src/util/getopt_helpers.c:86
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -5206,7 +5460,7 @@ msgstr ""
 "Argument som är obligatoriska för långa flaggor är också obligatoriska för "
 "korta flaggor.\n"
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
+#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:286
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
@@ -5219,6 +5473,27 @@ msgstr ""
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
+#: src/util/gnunet-rsa.c:64
+#, c-format
+msgid "No hostkey file specified on command line\n"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:112
+msgid "print the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:115
+msgid "print the hash of the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:118
+msgid "print the short hash of the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:124
+msgid "Manipulate GNUnet private RSA key files"
+msgstr ""
+
 #: src/util/gnunet-service-resolver.c:288
 #, fuzzy, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
@@ -5230,42 +5505,37 @@ msgstr "Kunde inte slå upp \"%s\": %s\n"
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:494
-#, c-format
-msgid "Resolver asked to look up `%s'.\n"
-msgstr ""
-
-#: src/util/gnunet-service-resolver.c:529
-#, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
-msgstr ""
-
-#: src/util/helper.c:239
+#: src/util/helper.c:244
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/helper.c:254
+#: src/util/helper.c:259
 #, c-format
 msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/util/helper.c:264
+#: src/util/helper.c:269
 #, c-format
 msgid "Got %u bytes from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:273
+#: src/util/helper.c:278
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/helper.c:432
+#: src/util/helper.c:310
+#, fuzzy, c-format
+msgid "Starting HELPER process `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/util/helper.c:440
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/network.c:1196
+#: src/util/network.c:1200
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -5293,12 +5563,12 @@ msgstr "\"%s\" %s misslyckades: %s\n"
 msgid "stat (%s) failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/util/os_priority.c:304
+#: src/util/os_priority.c:305
 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for reading: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/os_priority.c:305
+#: src/util/os_priority.c:306
 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for writing: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -5323,12 +5593,12 @@ 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/pseudonym.c:273
+#: src/util/pseudonym.c:276
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/pseudonym.c:338
+#: src/util/pseudonym.c:407 src/util/pseudonym.c:433
 #, fuzzy
 msgid "no-name"
 msgstr "Visa namn"
@@ -5346,188 +5616,168 @@ msgstr ""
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/util/resolver_api.c:351
+#: src/util/resolver_api.c:347
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:355
+#: src/util/resolver_api.c:351
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/resolver_api.c:426
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:807
-#, c-format
-msgid "Resolver returns `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:901
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
-msgstr ""
-
-#: src/util/resolver_api.c:906
+#: src/util/resolver_api.c:890
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/resolver_api.c:938
-#, c-format
-msgid "Resolving our hostname `%s'\n"
-msgstr ""
-
-#: src/util/scheduler.c:866
+#: src/util/scheduler.c:786
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:996
+#: src/util/scheduler.c:916
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/server.c:397
+#: src/util/server.c:483
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/server.c:406
+#: src/util/server.c:492
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/util/server.c:411
+#: src/util/server.c:497
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/util/server.c:640
+#: src/util/server.c:827
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
-#: src/util/service.c:207 src/util/service.c:214
+#: src/util/service.c:135 src/util/service.c:161 src/util/service.c:204
+#: src/util/service.c:225 src/util/service.c:232
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/service.c:170
+#: src/util/service.c:188
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
 
-#: src/util/service.c:263
+#: src/util/service.c:281
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/util/service.c:296
+#: src/util/service.c:313
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/util/service.c:326
+#: src/util/service.c:343
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
 
-#: src/util/service.c:668
+#: src/util/service.c:698
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:673
+#: src/util/service.c:703
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/util/service.c:680
+#: src/util/service.c:710
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:724
+#: src/util/service.c:765
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:752
+#: src/util/service.c:802
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:869
+#: src/util/service.c:920
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:939
+#: src/util/service.c:990
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:956
+#: src/util/service.c:1007
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1191
+#: src/util/service.c:1241
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1242 src/util/service.c:1260
+#: src/util/service.c:1292 src/util/service.c:1310
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1287
+#: src/util/service.c:1337
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1442
+#: src/util/service.c:1506
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/service.c:1475
+#: src/util/service.c:1539
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/util/service.c:1521
+#: src/util/service.c:1588
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1525
+#: src/util/service.c:1592
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1529
+#: src/util/service.c:1596
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1581
+#: src/util/service.c:1651
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1594
+#: src/util/service.c:1664
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/util/service.c:1657
+#: src/util/service.c:1729
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5536,55 +5786,76 @@ msgstr ""
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Anrop till \"%s\" returnerade %d.\n"
 
-#: src/util/strings.c:143
+#: src/util/strings.c:144
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:354
+#: src/util/strings.c:334
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:462
+#: src/util/strings.c:481
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:554
+#: src/util/strings.c:573
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:559
+#: src/util/strings.c:578
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:563
+#: src/util/strings.c:582
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:567
+#: src/util/strings.c:586
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:571
+#: src/util/strings.c:590
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:575
+#: src/util/strings.c:594
 msgid " days"
 msgstr " dagar"
 
-#: src/util/strings.c:599
+#: src/util/strings.c:618
 msgid "end of time"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
+#: src/util/strings.c:1012
+msgid "IPv6 address did not start with `['\n"
+msgstr ""
+
+#: src/util/strings.c:1020
+msgid "IPv6 address did contain ':' to separate port number\n"
+msgstr ""
+
+#: src/util/strings.c:1026
+msgid "IPv6 address did contain ']' before ':' to separate port number\n"
+msgstr ""
+
+#: src/util/strings.c:1033
+msgid "IPv6 address did contain a valid port number after the last ':'\n"
+msgstr ""
+
+#: src/util/strings.c:1042
+#, fuzzy, c-format
+msgid "Invalid IPv6 address `%s': %s\n"
+msgstr "Ogiltigt svar på \"%s\".\n"
+
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1071
 #, fuzzy
 msgid "# Active tunnels"
 msgstr "Nätverksanslutning"
 
 #: src/vpn/gnunet-service-vpn.c:608 src/vpn/gnunet-service-vpn.c:645
 #, fuzzy
-msgid "# Peers connected to mesh tunnels"
+msgid "# peers connected to mesh tunnels"
 msgstr "# av anslutna parter"
 
 #: src/vpn/gnunet-service-vpn.c:699
@@ -5607,75 +5878,75 @@ msgstr "# PING-meddelanden skapade"
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/vpn/gnunet-service-vpn.c:967
+#: src/vpn/gnunet-service-vpn.c:973
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1285
+#: src/vpn/gnunet-service-vpn.c:1291
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1306
+#: src/vpn/gnunet-service-vpn.c:1312
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1517
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
+#: src/vpn/gnunet-service-vpn.c:1555 src/vpn/gnunet-service-vpn.c:1596
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1600
+#: src/vpn/gnunet-service-vpn.c:1606
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1614
+#: src/vpn/gnunet-service-vpn.c:1620
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1697
+#: src/vpn/gnunet-service-vpn.c:1704
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2038
+#: src/vpn/gnunet-service-vpn.c:2045
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2196
+#: src/vpn/gnunet-service-vpn.c:2203
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2347
+#: src/vpn/gnunet-service-vpn.c:2354
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2402
+#: src/vpn/gnunet-service-vpn.c:2409
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
+#: src/vpn/gnunet-service-vpn.c:2448 src/vpn/gnunet-service-vpn.c:2661
 #, fuzzy
 msgid "# Active destinations"
 msgstr "Nätverksanslutning"
 
-#: src/vpn/gnunet-service-vpn.c:2726
+#: src/vpn/gnunet-service-vpn.c:2734
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3141
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3165
+#: src/vpn/gnunet-service-vpn.c:3173
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -5751,23 +6022,160 @@ msgstr "# byte mottagna via UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
-#: src/include/gnunet_common.h:490
+#: src/include/gnunet_common.h:497 src/include/gnunet_common.h:502
+#: src/include/gnunet_common.h:508
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/include/gnunet_common.h:500
+#: src/include/gnunet_common.h:518
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
+#: src/include/gnunet_common.h:539 src/include/gnunet_common.h:546
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid "Received malformed message via %s. Ignored.\n"
+#~ msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
+
+# capped är inte ett bra ord IMHO
+#, fuzzy
+#~ msgid "SMTP filter string to invalid, lacks ': '\n"
+#~ msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
+
+# capped är inte ett bra ord IMHO
+#~ msgid "SMTP filter string to long, capped to `%s'\n"
+#~ msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
+
+#, fuzzy
+#~ msgid "SMTP: `%s' failed: %s.\n"
+#~ msgstr "\"%s\" %s misslyckades: %s\n"
+
+#, fuzzy
+#~ msgid "# bytes received via SMTP"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# bytes sent via SMTP"
+#~ msgstr "# byte skickades via TCP"
+
+#, fuzzy
+#~ msgid "# bytes dropped by SMTP (outgoing)"
+#~ msgstr "# byte kastade via TCP (utgående)"
+
+#, fuzzy
+#~ msgid "# Peers connected"
+#~ msgstr "# av anslutna parter"
+
+#, fuzzy
+#~ msgid "%s failed for `%s' at %s:%d: `%s'\n"
+#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Failed to transmit shutdown ACK.\n"
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize Postgres with configuration `%s': %s"
+#~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#, fuzzy
+#~ msgid "Failed to transmit message to `%s' service.\n"
+#~ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Target is %d connections per peer."
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy
+#~ msgid "Copying file with RENAME (%s,%s)\n"
+#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#, fuzzy
+#~ msgid "Copying file with command scp %s %s\n"
+#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#, fuzzy
+#~ msgid "Finished copying all blacklist files!\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Failed during blacklist file copying!\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "# bytes payload received for other peers"
+#~ msgstr "# byte mottagna av typen %d"
+
+#, fuzzy
+#~ msgid "# fast reconnects failed"
+#~ msgstr "# av anslutna parter"
+
+#, fuzzy
+#~ msgid "# peers disconnected due to timeout"
+#~ msgstr "# av anslutna parter"
+
+#, fuzzy
+#~ msgid "# peers disconnected due to global disconnect"
+#~ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#, fuzzy
+#~ msgid "# unexpected CONNECT_ACK messages"
+#~ msgstr "skicka ANTAL meddelanden"
+
+#, fuzzy
+#~ msgid "# wlan session timeouts"
+#~ msgstr "# sessionsnycklar accepterade"
+
+#, fuzzy
+#~ msgid "# wlan session created"
+#~ msgstr "# sessionsnycklar accepterade"
+
+#, fuzzy
+#~ msgid "# wlan pending fragments"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# wlan whole messages received"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "# wlan hello messages received"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "# wlan fragments received"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# wlan acks received"
+#~ msgstr "# klartext PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "# wlan messages for this client received"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "# wlan messages inside WLAN_HELPER_DATA received"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "Unknown user `%s'\n"
+#~ msgstr "Okänd operation \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Namespace `%s' unknown.\n"
+#~ msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to statistics service!\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
 #~ msgid "Failed to send to `%s': %s\n"
 #~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
@@ -5825,10 +6233,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
 #, fuzzy
-#~ msgid "Service `%s' started\n"
-#~ msgstr "Tjänst borttagen.\n"
-
-#, fuzzy
 #~ msgid "Peer `%s' plugin: `%s' address `%s'\n"
 #~ msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
@@ -5849,14 +6253,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
 #, fuzzy
-#~ msgid "Failed to get full path for `%s'\n"
-#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#, fuzzy
-#~ msgid "Failed to create file for dhtlog.\n"
-#~ msgstr "Kunde inte skapa användarkonto:"
-
-#, fuzzy
 #~ msgid "Found peer `%s'\n"
 #~ msgstr "Jag är ändpunkt \"%s\".\n"
 
@@ -5865,10 +6261,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Testar transport(er) %s\n"
 
 #, fuzzy
-#~ msgid "Failed to load transport plugin for udp\n"
-#~ msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#, fuzzy
 #~ msgid "# SET QUOTA messages received"
 #~ msgstr "# krypterade PONG-meddelanden mottagna"
 
@@ -5909,10 +6301,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Inga applikationer definierade i konfiguration!\n"
 
 #, fuzzy
-#~ msgid "Loading HTTP transport plugin `%s'\n"
-#~ msgstr "Testar transport(er) %s\n"
-
-#, fuzzy
 #~ msgid "Failed to load transport plugin for http\n"
 #~ msgstr "Kunde inte slå upp \"%s\": %s\n"
 
@@ -5972,9 +6360,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Ok"
 #~ msgstr "k"
 
-#~ msgid "GNUnet configuration"
-#~ msgstr "GNUnet-konfiguration"
-
 #~ msgid ""
 #~ "Welcome to GNUnet!\n"
 #~ "\n"
@@ -6316,9 +6701,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 #~ msgstr "Kommando \"%s\" kräver två argument (\"%s\" och \"%s\").\n"
 
-#~ msgid "Unsupported command `%s'.  Aborting.\n"
-#~ msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
-
 #, fuzzy
 #~ msgid "# dht discovery messages sent"
 #~ msgstr "# krypterade PONG-meddelanden skickade"
@@ -6529,10 +6911,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Downloading %d files from directory `%s'.\n"
 #~ msgstr "Ladda ner filer från GNUnet."
 
-#, fuzzy
-#~ msgid "Did not find any files in directory `%s'\n"
-#~ msgstr "%d filer hittades i katalog.\n"
-
 #~ msgid "File stored as `%s'.\n"
 #~ msgstr "Fil lagrad som \"%s\".\n"
 
@@ -6586,10 +6964,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Fel vid %s:%d.\n"
 
 #, fuzzy
-#~ msgid "set number of daemons to start"
-#~ msgstr "antal meddelanden att använda per iteration"
-
-#, fuzzy
 #~ msgid "Waiting for peers to connect"
 #~ msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
 
@@ -6974,9 +7348,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgid "Peer `%s' did not report back.\n"
 #~ msgstr "Motpart \"%s\" rapporterade inte tillbaka.\n"
 
-#~ msgid "%s: symbol value `%s' invalid for %s\n"
-#~ msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
-
 #~ msgid "Sorry, no help is available for this option.\n"
 #~ msgstr "Tyvärr, ingen hjälp är tillgänglig för den här flaggan.\n"
 
diff --git a/po/vi.gmo b/po/vi.gmo
index e205a02..fe4edd8 100644
--- a/po/vi.gmo
+++ b/po/vi.gmo
diff --git a/po/vi.po b/po/vi.po
index bfa7f9d..6ee9cf4 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2012-02-28 18:30+0100\n"
+"POT-Creation-Date: 2012-06-05 15:47+0200\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -19,261 +19,276 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/arm/arm_api.c:187
+#: src/arm/arm_api.c:165
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:378
+#: src/arm/arm_api.c:349
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/arm/arm_api.c:392
+#: src/arm/arm_api.c:363
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/arm/arm_api.c:467
+#: src/arm/arm_api.c:432
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:523
+#: src/arm/arm_api.c:485
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:524
+#: src/arm/arm_api.c:486
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:546
+#: src/arm/arm_api.c:507
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:548
+#: src/arm/arm_api.c:508
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:581
+#: src/arm/arm_api.c:540
 #, fuzzy, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr "« %s »: Chưa nhận thông báo sau %llu miligiây.\n"
 
-#: src/arm/arm_api.c:654
+#: src/arm/arm_api.c:612
 #, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:149
+#: src/arm/gnunet-arm.c:159
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/arm/gnunet-arm.c:154
+#: src/arm/gnunet-arm.c:164
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-arm.c:157
+#: src/arm/gnunet-arm.c:167
 #, fuzzy, c-format
 msgid "Service `%s' was already running.\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:172
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:179
 #, fuzzy, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/arm/gnunet-arm.c:173
+#: src/arm/gnunet-arm.c:183
 #, fuzzy
 msgid "Request ignored as ARM is shutting down.\n"
 msgstr "« %s » đang tắt.\n"
 
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:187
 #, fuzzy
 msgid "Error communicating with ARM service.\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/arm/gnunet-arm.c:181
+#: src/arm/gnunet-arm.c:191
 #, fuzzy
 msgid "Timeout communicating with ARM service.\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/arm/gnunet-arm.c:185
+#: src/arm/gnunet-arm.c:195
 #, fuzzy
 msgid "Operation failed.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:189
+#: src/arm/gnunet-arm.c:199
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:222
+#, 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:225
+#, fuzzy
+msgid "Running services:\n"
+msgstr "Đang nạp và khởi động dùng « %s ».\n"
+
+#: src/arm/gnunet-arm.c:249
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+#: src/arm/gnunet-arm.c:257 src/arm/gnunet-arm.c:357 src/arm/gnunet-arm.c:373
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247
+#: src/arm/gnunet-arm.c:280
 #, 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:253
+#: src/arm/gnunet-arm.c:286
 #, 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:355
+#: src/arm/gnunet-arm.c:407
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:357
+#: src/arm/gnunet-arm.c:409
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:359
+#: src/arm/gnunet-arm.c:411
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:361
+#: src/arm/gnunet-arm.c:413
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:364
+#: src/arm/gnunet-arm.c:416
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:419
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:421
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:372
+#: src/arm/gnunet-arm.c:424
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "thời gian chờ sự hoàn thành của một lần lặp (theo miligiây)"
 
-#: src/arm/gnunet-arm.c:383
+#: src/arm/gnunet-arm.c:426
+msgid "List currently running services"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:437
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:328
+#: src/arm/gnunet-service-arm.c:332
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-service-arm.c:331
+#: src/arm/gnunet-service-arm.c:335
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:357
+#: src/arm/gnunet-service-arm.c:361
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:484
+#: src/arm/gnunet-service-arm.c:393
+#, fuzzy
+msgid "Could not send list result to client\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#: src/arm/gnunet-service-arm.c:523
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/arm/gnunet-service-arm.c:506
+#: src/arm/gnunet-service-arm.c:545
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:520
+#: src/arm/gnunet-service-arm.c:559
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:628
+#: src/arm/gnunet-service-arm.c:667
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:782
+#: src/arm/gnunet-service-arm.c:878
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:877
+#: src/arm/gnunet-service-arm.c:970
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:882
+#: src/arm/gnunet-service-arm.c:975
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:887
+#: src/arm/gnunet-service-arm.c:980
 #, fuzzy
 msgid "unknown"
 msgstr "Lỗi không rõ"
 
-#: src/arm/gnunet-service-arm.c:921
+#: src/arm/gnunet-service-arm.c:986
+#, fuzzy, c-format
+msgid "Service `%s' took %llu ms to terminate\n"
+msgstr "Dịch vụ đã bị xoá.\n"
+
+#: src/arm/gnunet-service-arm.c:1021
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:967 src/arm/mockup-service.c:41
-#, fuzzy
-msgid "Failed to transmit shutdown ACK.\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/arm/gnunet-service-arm.c:1067
+#: src/arm/gnunet-service-arm.c:1127
 #, fuzzy, c-format
 msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/arm/gnunet-service-arm.c:1069
+#: src/arm/gnunet-service-arm.c:1129
 msgid "option missing"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1152
+#: src/arm/gnunet-service-arm.c:1213
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1224
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1177
+#: src/arm/gnunet-service-arm.c:1238
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:46
-msgid "Transmitting shutdown ACK.\n"
-msgstr ""
-
-#: src/arm/mockup-service.c:69
+#: src/arm/mockup-service.c:44
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
@@ -333,120 +348,123 @@ msgstr ""
 msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:92
+#: src/chat/gnunet-chat.c:93
 msgid "Joined\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:124
+#: src/chat/gnunet-chat.c:125 src/chat/gnunet-chat.c:133
+#: src/chat/gnunet-chat.c:213 src/chat/gnunet-chat.c:253
+#: src/chat/gnunet-chat.c:329 src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:400 src/chat/gnunet-chat.c:700
 msgid "anonymous"
 msgstr "nặc danh"
 
-#: src/chat/gnunet-chat.c:130
+#: src/chat/gnunet-chat.c:144
 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "« %s » nói: %s\n"
 
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: src/chat/gnunet-chat.c:147 src/chat/gnunet-chat.c:150
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr "« %s » nói cho bạn: %s\n"
 
-#: src/chat/gnunet-chat.c:139
+#: src/chat/gnunet-chat.c:153
 #, fuzzy, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr "« %s » nói thật: %s\n"
 
-#: src/chat/gnunet-chat.c:142
+#: src/chat/gnunet-chat.c:156
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr "« %s » nói thật cho bạn: %s\n"
 
-#: src/chat/gnunet-chat.c:145
+#: src/chat/gnunet-chat.c:159
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr "« %s » xác nhận bạn đã nhận được: %s\n"
 
-#: src/chat/gnunet-chat.c:148
+#: src/chat/gnunet-chat.c:162
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr "« %s » xác nhận mà chỉ bạn đã nhận được: %s\n"
 
-#: src/chat/gnunet-chat.c:151
+#: src/chat/gnunet-chat.c:165
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr "« %s » xác nhận mà bạn đã nhận được từ họ : %s\n"
 
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:170
 #, fuzzy, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr "« %s » xác nhận mà chỉ bạn đa nhận được từ họ : %s\n"
 
-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:173
 #, fuzzy, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr "« %s » nói không chính thức: %s\n"
 
-#: src/chat/gnunet-chat.c:162
+#: src/chat/gnunet-chat.c:176
 #, fuzzy, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr "<%s> đã nói bằng một kiểu tin nhẳn không rõ : %s\n"
 
-#: src/chat/gnunet-chat.c:193
+#: src/chat/gnunet-chat.c:217
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:260
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr "« %s » vào phòng\n"
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:260
 #, c-format
 msgid "`%s' left the room\n"
 msgstr "« %s » rời phòng\n"
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#: src/chat/gnunet-chat.c:321 src/chat/gnunet-chat.c:363
 #, fuzzy
 msgid "Could not change username\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#: src/chat/gnunet-chat.c:334 src/chat/gnunet-chat.c:702
 #, fuzzy, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr "Đã vào phòng « %s » là người dùng « %s ».\n"
 
-#: src/chat/gnunet-chat.c:320
+#: src/chat/gnunet-chat.c:373
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "Đã thay đổi tên người dùng thành « %s ».\n"
 
-#: src/chat/gnunet-chat.c:333
+#: src/chat/gnunet-chat.c:388
 #, c-format
 msgid "Users in room `%s': "
 msgstr "Người dùng trong phòng « %s »:"
 
-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:434
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr "Cú pháp: /msg TÊN_NGƯỜI_DÙNG TIN_NHẲN"
 
-#: src/chat/gnunet-chat.c:379
+#: src/chat/gnunet-chat.c:443
 #, c-format
-msgid "Unknown user `%s'\n"
-msgstr "Không rõ người dùng « %s »\n"
+msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:395
+#: src/chat/gnunet-chat.c:460
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr "Người dùng « %s » hiện thời không có trong phòng này.\n"
 
-#: src/chat/gnunet-chat.c:448
+#: src/chat/gnunet-chat.c:513
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Không rõ câu lệnh « %s ».\n"
 
-#: src/chat/gnunet-chat.c:459
+#: src/chat/gnunet-chat.c:524
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
@@ -454,7 +472,7 @@ msgstr ""
 "Gõ chuỗi « /join #tên_phòng » để vào một phòng trò chuyện nào đó (việc này "
 "cũng gây ra bạn ra khỏi phòng hiện tại)"
 
-#: src/chat/gnunet-chat.c:463
+#: src/chat/gnunet-chat.c:528
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
@@ -462,77 +480,77 @@ msgstr ""
 "Gõ chuỗi « /nick tên_hiệu » để thay đổi tên hiệu của mình (việc này cũng gây "
 "ra bạn ra khỏi phòng hiện tại, sau đó vào lại ngay với tên mới)"
 
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:532
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 "Gõ chuỗi « /msg tên_hiệu tin_nhẳn » để gửi một tin nhẳn riêng cho người dùng "
 "có tên đó"
 
-#: src/chat/gnunet-chat.c:470
+#: src/chat/gnunet-chat.c:535
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr "Lệnh « /notice » là một biệt hiệu cho « /msg »"
 
-#: src/chat/gnunet-chat.c:472
+#: src/chat/gnunet-chat.c:537
 msgid "The `/query' command is an alias for `/msg'"
 msgstr "Lệnh « /query » là một biệt hiệu cho « /msg »"
 
-#: src/chat/gnunet-chat.c:474
+#: src/chat/gnunet-chat.c:539
 #, fuzzy
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 "Gõ chuỗi « /msg tên_hiệu tin_nhẳn » để gửi một tin nhẳn riêng cho người dùng "
 "có tên đó"
 
-#: src/chat/gnunet-chat.c:477
+#: src/chat/gnunet-chat.c:542
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:480
+#: src/chat/gnunet-chat.c:545
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:547
 #, fuzzy
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr "Lệnh « /notice » là một biệt hiệu cho « /msg »"
 
-#: src/chat/gnunet-chat.c:484
+#: src/chat/gnunet-chat.c:549
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat"
 
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:551
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr "Lệnh « /leave » là một biệt hiệu cho « /quit »"
 
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:554
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 "Gõ chuỗi « /names » để liệt kê tất cả các thành viên hiện thời trong phòng "
 "trò chuyện đó"
 
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:556
 msgid "Use `/help command' to get help for a specific command"
 msgstr "Gõ chuỗi « /help LỆNH » để xem trợ giúp về lệnh đó"
 
-#: src/chat/gnunet-chat.c:606
+#: src/chat/gnunet-chat.c:672
 msgid "You must specify a nickname\n"
 msgstr "Phải ghi rõ tên hiệu\n"
 
-#: src/chat/gnunet-chat.c:622
+#: src/chat/gnunet-chat.c:688
 #, c-format
 msgid "Failed to join room `%s'\n"
 msgstr "Lỗi vào phòng « %s »\n"
 
-#: src/chat/gnunet-chat.c:655
+#: src/chat/gnunet-chat.c:727
 msgid "set the nickname to use (required)"
 msgstr "đặt tên hiệu cần dùng (cần thiết)"
 
-#: src/chat/gnunet-chat.c:658
+#: src/chat/gnunet-chat.c:730
 msgid "set the chat room to join"
 msgstr "đặt phòng trò chuyện cần vào"
 
-#: src/chat/gnunet-chat.c:670
+#: src/chat/gnunet-chat.c:742
 msgid "Join a chat on GNUnet."
 msgstr "Vào phòng trò chuyện trên GNUnet."
 
@@ -556,184 +574,186 @@ msgstr "Lỗi lưu cấu hình."
 msgid "Failed to queue a leave notification\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/core/core_api.c:798
+#: src/core/core_api.c:786
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core-list-connections.c:77
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
+#: src/core/gnunet-core.c:54 src/peerinfo-tool/gnunet-peerinfo.c:286
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/core/gnunet-core-list-connections.c:175
-#: src/peerinfo-tool/gnunet-peerinfo.c:194
+#: src/core/gnunet-core.c:72 src/peerinfo-tool/gnunet-peerinfo.c:817
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/core/gnunet-core-list-connections.c:196
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
-msgid "don't resolve host names"
-msgstr "không quyết định các tên máy"
-
-#: src/core/gnunet-core-list-connections.c:203
+#: src/core/gnunet-core.c:95
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/core/gnunet-service-core.c:99
+#: src/core/gnunet-service-core.c:97
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:360
+#: src/core/gnunet-service-core_clients.c:370
 #, 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_clients.c:465
+#: src/core/gnunet-service-core_clients.c:475
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_clients.c:801
+#: src/core/gnunet-service-core_clients.c:818
 #, 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_kx.c:493
+#: src/core/gnunet-service-core_kx.c:565
 msgid "# bytes encrypted"
 msgstr "# các byte đã mã hoá"
 
-#: src/core/gnunet-service-core_kx.c:543
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
-#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
+#: src/core/gnunet-service-core_kx.c:681 src/dv/gnunet-service-dv.c:3003
 #, fuzzy
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/core/gnunet-service-core_kx.c:623
+#: src/core/gnunet-service-core_kx.c:700
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:753
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:694
+#: src/core/gnunet-service-core_kx.c:775
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:828
 #, fuzzy
 msgid "# session keys received"
 msgstr "# các khoá phiên chạy bị từ chối"
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:845
 #, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:890
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_kx.c:883
-#: src/transport/gnunet-service-transport_validation.c:803
+#: src/core/gnunet-service-core_kx.c:977
+#: src/transport/gnunet-service-transport_validation.c:810
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/core/gnunet-service-core_kx.c:1010
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:938
+#: src/core/gnunet-service-core_kx.c:1029
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1026
+#: src/core/gnunet-service-core_kx.c:1125
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1037
+#: src/core/gnunet-service-core_kx.c:1135
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# các thông báo PING nhập thô được gửi"
 
-#: src/core/gnunet-service-core_kx.c:1095
-#: src/transport/gnunet-service-transport_validation.c:1026
+#: src/core/gnunet-service-core_kx.c:1236
+#: src/transport/gnunet-service-transport_validation.c:1031
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:1275
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1157
+#: src/core/gnunet-service-core_kx.c:1303
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1223
+#: src/core/gnunet-service-core_kx.c:1329
+#, fuzzy
+msgid "# rekey operations confirmed via PONG"
+msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
+
+#: src/core/gnunet-service-core_kx.c:1381
+#: src/core/gnunet-service-core_kx.c:1398
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1402
+msgid "# REKEY operations performed"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1537
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1406
-#: src/core/gnunet-service-core_kx.c:1431
+#: src/core/gnunet-service-core_kx.c:1577
+#: src/core/gnunet-service-core_kx.c:1602
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1589
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1626
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "Thông báo nhận được cũ hơn một ngày. Đã loại bỏ.\n"
 
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1630
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1638
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1700
 #, 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_kx.c:1536
+#: src/core/gnunet-service-core_kx.c:1708
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1546 src/hostlist/hostlist-server.c:555
-#: src/peerinfo-tool/gnunet-peerinfo.c:202
-#: src/transport/gnunet-service-transport.c:595
+#: src/core/gnunet-service-core_kx.c:1718 src/hostlist/hostlist-server.c:551
+#: src/peerinfo-tool/gnunet-peerinfo.c:823
+#: src/transport/gnunet-service-transport.c:611
 #, 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"
@@ -744,30 +764,41 @@ msgid "# sessions terminated by transport disconnect"
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
 #: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:342
+#: src/core/gnunet-service-core_neighbours.c:334
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:247
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:430
+#: src/core/gnunet-service-core_neighbours.c:418
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:273
-msgid "# entries in session map"
-msgstr ""
+#: src/core/gnunet-service-core_sessions.c:206
+#: src/core/gnunet-service-core_sessions.c:269
+#: src/dht/gnunet-service-dht_neighbours.c:625
+#: src/dht/gnunet-service-dht_neighbours.c:683
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
+#: src/topology/gnunet-daemon-topology.c:709
+#: src/topology/gnunet-daemon-topology.c:810
+#: src/transport/gnunet-service-transport_neighbours.c:874
+#: src/transport/gnunet-service-transport_neighbours.c:1080
+#: src/transport/gnunet-service-transport_neighbours.c:1089
+#: src/transport/gnunet-service-transport_neighbours.c:2568
+#: src/transport/gnunet-service-transport_neighbours.c:2814
+#, fuzzy
+msgid "# peers connected"
+msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/core/gnunet-service-core_sessions.c:238
+#: src/core/gnunet-service-core_sessions.c:236
 #, 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:414
+#: src/core/gnunet-service-core_sessions.c:406
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -781,428 +812,407 @@ msgstr "# các thông báo phát hiện dht được nhận"
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:118 src/datacache/datacache.c:255
-#: src/datastore/gnunet-service-datastore.c:854
+#: src/datacache/datacache.c:115 src/datacache/datacache.c:250
+#: src/datastore/gnunet-service-datastore.c:834
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/datacache/datacache.c:144 src/datacache/datacache.c:151
-#: src/datastore/gnunet-service-datastore.c:1531
-#: src/datastore/gnunet-service-datastore.c:1542
+#: src/datacache/datacache.c:141 src/datacache/datacache.c:148
+#: src/datastore/gnunet-service-datastore.c:1483
+#: src/datastore/gnunet-service-datastore.c:1494
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
 
-#: src/datacache/datacache.c:183
+#: src/datacache/datacache.c:180
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:191
+#: src/datacache/datacache.c:188
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/datacache/datacache.c:281
+#: src/datacache/datacache.c:276
 #, fuzzy
 msgid "# requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datacache/datacache.c:291
+#: src/datacache/datacache.c:284
 msgid "# requests filtered by bloom filter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/datacache/plugin_datacache_mysql.c:103
-#: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:517
-#: src/datacache/plugin_datacache_mysql.c:526
-#: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614
-#: src/datacache/plugin_datacache_sqlite.c:71
-#: src/datacache/plugin_datacache_sqlite.c:74
-#: src/datastore/plugin_datastore_mysql.c:139
-#: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:613
-#: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685
-#: src/datastore/plugin_datastore_mysql.c:1362
-#: src/datastore/plugin_datastore_mysql.c:1376
-#: src/datastore/plugin_datastore_sqlite.c:61
-#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
-#: src/include/gnunet_common.h:514
+#: src/datacache/plugin_datacache_mysql.c:97
+#: src/datacache/plugin_datacache_mysql.c:104
+#: src/datacache/plugin_datacache_sqlite.c:69
+#: src/datacache/plugin_datacache_sqlite.c:72
+#: src/datastore/plugin_datastore_mysql.c:803
+#: src/datastore/plugin_datastore_mysql.c:817
+#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
+#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
+#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:525
+#: src/include/gnunet_common.h:532
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/datacache/plugin_datacache_mysql.c:224
-#: src/datastore/plugin_datastore_mysql.c:316
-#, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
-msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
-
-#: src/datacache/plugin_datacache_mysql.c:230
-#: src/datastore/plugin_datastore_mysql.c:322
-#, fuzzy, c-format
-msgid "Could not access file `%s': %s\n"
-msgstr "Không thể truy cập đến « %s »: %s\n"
-
-#: src/datacache/plugin_datacache_mysql.c:979
+#: src/datacache/plugin_datacache_mysql.c:450
 msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:79
-#: src/datastore/plugin_datastore_postgres.c:93
-#, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
-
-#: src/datacache/plugin_datacache_postgres.c:149
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "Không thể sơ khởi SQLite: %s.\n"
-
-#: src/datacache/plugin_datacache_postgres.c:499
+#: src/datacache/plugin_datacache_postgres.c:367
 msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:424
+#: src/datacache/plugin_datacache_sqlite.c:410
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:457
-#: src/datastore/plugin_datastore_sqlite.c:414
-#: src/namestore/plugin_namestore_sqlite.c:381
+#: src/datacache/plugin_datacache_sqlite.c:443
+#: src/datastore/plugin_datastore_sqlite.c:408
+#: src/namestore/plugin_namestore_sqlite.c:370
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
+#: src/datacache/plugin_datacache_sqlite.c:450
+#, fuzzy, c-format
+msgid "Failed to close statement %p: %d\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
 #: src/datacache/plugin_datacache_template.c:121
 msgid "Template datacache running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:289
+#: src/datastore/datastore_api.c:305
 msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:372
+#: src/datastore/datastore_api.c:388
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:418
+#: src/datastore/datastore_api.c:432
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:445
+#: src/datastore/datastore_api.c:459
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/datastore/datastore_api.c:465
+#: src/datastore/datastore_api.c:477
 #, fuzzy
 msgid "# Requests dropped from datastore queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/datastore/datastore_api.c:513
+#: src/datastore/datastore_api.c:525
 #, fuzzy
 msgid "# datastore connections (re)created"
 msgstr "# các kết nối dht"
 
-#: src/datastore/datastore_api.c:540
+#: src/datastore/datastore_api.c:548
 msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608
+#: src/datastore/datastore_api.c:612
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/datastore/datastore_api.c:631
+#: src/datastore/datastore_api.c:633
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/datastore/datastore_api.c:772
+#: src/datastore/datastore_api.c:764
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/datastore_api.c:786
+#: src/datastore/datastore_api.c:778
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
+#: src/datastore/datastore_api.c:790 src/datastore/datastore_api.c:796
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/datastore/datastore_api.c:810
+#: src/datastore/datastore_api.c:800
 #, fuzzy
 msgid "# status messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/datastore/datastore_api.c:883
+#: src/datastore/datastore_api.c:869
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:954
+#: src/datastore/datastore_api.c:936
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1019
+#: src/datastore/datastore_api.c:997
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1080
+#: src/datastore/datastore_api.c:1054
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1148
+#: src/datastore/datastore_api.c:1118
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1193
+#: src/datastore/datastore_api.c:1163
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1253
+#: src/datastore/datastore_api.c:1221
 #, fuzzy
 msgid "# Results received"
 msgstr "# các kết quả dht được nhận"
 
-#: src/datastore/datastore_api.c:1324
+#: src/datastore/datastore_api.c:1286
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1391
+#: src/datastore/datastore_api.c:1349
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1455
+#: src/datastore/datastore_api.c:1409
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/datastore/gnunet-service-datastore.c:349
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# các byte được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:426
+#: src/datastore/gnunet-service-datastore.c:422
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:486
+#: src/datastore/gnunet-service-datastore.c:480
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:640
+#: src/datastore/gnunet-service-datastore.c:511
+msgid "Shutdown in progress, aborting transmission.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:626
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:685
+#: src/datastore/gnunet-service-datastore.c:669
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:696
+#: src/datastore/gnunet-service-datastore.c:680
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:700
+#: src/datastore/gnunet-service-datastore.c:684
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:706
+#: src/datastore/gnunet-service-datastore.c:690
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
-#: src/datastore/gnunet-service-datastore.c:765
-#: src/datastore/gnunet-service-datastore.c:986
-#: src/datastore/gnunet-service-datastore.c:1465
+#: src/datastore/gnunet-service-datastore.c:695
+#: src/datastore/gnunet-service-datastore.c:747
+#: src/datastore/gnunet-service-datastore.c:960
+#: src/datastore/gnunet-service-datastore.c:1417
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:780
+#: src/datastore/gnunet-service-datastore.c:760
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:868
+#: src/datastore/gnunet-service-datastore.c:846
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1034
+#: src/datastore/gnunet-service-datastore.c:1006
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1048
+#: src/datastore/gnunet-service-datastore.c:1018
 #, fuzzy
 msgid "# requests filtered by bloomfilter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/datastore/gnunet-service-datastore.c:1076
+#: src/datastore/gnunet-service-datastore.c:1046
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1110
+#: src/datastore/gnunet-service-datastore.c:1076
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1145
+#: src/datastore/gnunet-service-datastore.c:1109
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1172
+#: src/datastore/gnunet-service-datastore.c:1134
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1182
+#: src/datastore/gnunet-service-datastore.c:1142
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1216
+#: src/datastore/gnunet-service-datastore.c:1174
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1260
+#: src/datastore/gnunet-service-datastore.c:1216
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1323
+#: src/datastore/gnunet-service-datastore.c:1277
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1332
+#: src/datastore/gnunet-service-datastore.c:1286
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/datastore/gnunet-service-datastore.c:1536
+#: src/datastore/gnunet-service-datastore.c:1488
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# các byte được phép trong kho dữ liệu"
 
-#: src/datastore/gnunet-service-datastore.c:1547
+#: src/datastore/gnunet-service-datastore.c:1499
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1549
+#: src/datastore/gnunet-service-datastore.c:1501
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1562
+#: src/datastore/gnunet-service-datastore.c:1514
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1580
-#: src/datastore/gnunet-service-datastore.c:1596
+#: src/datastore/gnunet-service-datastore.c:1532
+#: src/datastore/gnunet-service-datastore.c:1548
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/datastore/gnunet-service-datastore.c:1626
+#: src/datastore/gnunet-service-datastore.c:1578
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/datastore/gnunet-service-datastore.c:1655
+#: src/datastore/gnunet-service-datastore.c:1607
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1660
+#: src/datastore/gnunet-service-datastore.c:1612
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1663
+#: src/datastore/gnunet-service-datastore.c:1615
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:529
-#: src/datastore/plugin_datastore_mysql.c:1336
+#: src/datastore/plugin_datastore_mysql.c:780
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/datastore/plugin_datastore_mysql.c:622
-#: src/datastore/plugin_datastore_mysql.c:1346
+#: src/datastore/plugin_datastore_mysql.c:788
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1581
+#: src/datastore/plugin_datastore_mysql.c:1019
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:173
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
+#: src/datastore/plugin_datastore_postgres.c:824
+#, fuzzy
+msgid "Failed to drop table from database.\n"
+msgstr ""
+"\n"
+"Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1017
+#: src/datastore/plugin_datastore_postgres.c:860
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/datastore/plugin_datastore_sqlite.c:57
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
 
-#: src/datastore/plugin_datastore_sqlite.c:239
-#: src/namestore/plugin_namestore_sqlite.c:223
+#: src/datastore/plugin_datastore_sqlite.c:233
+#: src/namestore/plugin_namestore_sqlite.c:204
 #, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:266
-#: src/namestore/plugin_namestore_sqlite.c:248
+#: src/datastore/plugin_datastore_sqlite.c:260
+#: src/namestore/plugin_namestore_sqlite.c:229
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:669
+#: src/datastore/plugin_datastore_sqlite.c:655
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "Dữ liệu sai trong %s. Đang thử sửa chữa (bằng cách xoá).\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1159
+#: src/datastore/plugin_datastore_sqlite.c:1139
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1178
+#: src/datastore/plugin_datastore_sqlite.c:1158
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1218
-#: src/namestore/plugin_namestore_sqlite.c:779
+#: src/datastore/plugin_datastore_sqlite.c:1198
+#: src/namestore/plugin_namestore_sqlite.c:829
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -1211,33 +1221,32 @@ msgstr "kho dữ liệu sqlite"
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:280
+#: src/dht/dht_api.c:348
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
-#: src/gns/gnunet-gns-lookup.c:179
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:293
+#: src/dht/gnunet-dht-put.c:192
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:182
+#: src/dht/gnunet-dht-get.c:204
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:207 src/gns/gnunet-gns-lookup.c:185
+#: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
-#: src/gns/gnunet-gns-lookup.c:188
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
-#: src/gns/gnunet-gns-lookup.c:191 src/nse/gnunet-nse-profiler.c:908
+#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-put.c:204 src/fs/gnunet-download.c:271
+#: src/fs/gnunet-publish.c:731 src/fs/gnunet-search.c:297
+#: src/fs/gnunet-unindex.c:169 src/nse/gnunet-nse-profiler.c:910
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1245,99 +1254,116 @@ msgstr ""
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:100
+#: src/dht/gnunet-dht-monitor.c:299
+msgid "how long to execute? 0 = forever"
+msgstr ""
+
+#: src/dht/gnunet-dht-monitor.c:321
+msgid "Prints all packets that go through the DHT."
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:108
 #, fuzzy
 msgid "PUT request sent!\n"
 msgstr "# độ tin cậy được tiêu phí"
 
-#: src/dht/gnunet-dht-put.c:124
+#: src/dht/gnunet-dht-put.c:111
+msgid "Timeout sending PUT request!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:114
+#, fuzzy
+msgid "PUT request not confirmed!\n"
+msgstr "# độ tin cậy được tiêu phí"
+
+#: src/dht/gnunet-dht-put.c:144
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:132
+#: src/dht/gnunet-dht-put.c:152
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/dht/gnunet-dht-put.c:137
+#: src/dht/gnunet-dht-put.c:157
 #, fuzzy, c-format
 msgid "Connected to %s service!\n"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/dht/gnunet-dht-put.c:152
+#: src/dht/gnunet-dht-put.c:172
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:166
+#: src/dht/gnunet-dht-put.c:186
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:169
+#: src/dht/gnunet-dht-put.c:189
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:175
+#: src/dht/gnunet-dht-put.c:195
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:178
+#: src/dht/gnunet-dht-put.c:198
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:203
+#: src/dht/gnunet-dht-put.c:223
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:556
-#: src/testing/testing.c:1979 src/testing/testing.c:2009
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:544
+#: src/testing/testing.c:1968 src/testing/testing.c:1998
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:371
+#: src/dht/gnunet-service-dht_clients.c:407
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:462
+#: src/dht/gnunet-service-dht_clients.c:500
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/dht/gnunet-service-dht_clients.c:529
+#: src/dht/gnunet-service-dht_clients.c:584
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:624
+#: src/dht/gnunet-service-dht_clients.c:682
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:854
+#: src/dht/gnunet-service-dht_clients.c:919
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:869
+#: src/dht/gnunet-service-dht_clients.c:932
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:906
+#: src/dht/gnunet-service-dht_clients.c:967
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:928
+#: src/dht/gnunet-service-dht_clients.c:989
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:979
-#: src/dht/gnunet-service-dht_clients.c:1022
+#: src/dht/gnunet-service-dht_clients.c:1038
+#: src/dht/gnunet-service-dht_clients.c:1081
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:989
+#: src/dht/gnunet-service-dht_clients.c:1048
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -1350,28 +1376,28 @@ msgstr "# các byte kiểu %d được nhận"
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:209
+#: src/dht/gnunet-service-dht_datacache.c:207
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:220
+#: src/dht/gnunet-service-dht_datacache.c:218
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:226
+#: src/dht/gnunet-service-dht_datacache.c:224
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:236
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:241
+#: src/dht/gnunet-service-dht_datacache.c:239
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:271
+#: src/dht/gnunet-service-dht_datacache.c:269
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
@@ -1385,98 +1411,92 @@ msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:573
+#: src/dht/gnunet-service-dht_neighbours.c:571
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:629
-#: src/dht/gnunet-service-dht_neighbours.c:689
-#, fuzzy
-msgid "# Peers connected"
-msgstr "# của các đồng đẳng đã kết nối"
-
-#: src/dht/gnunet-service-dht_neighbours.c:723
+#: src/dht/gnunet-service-dht_neighbours.c:717
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/dht/gnunet-service-dht_neighbours.c:778
+#: src/dht/gnunet-service-dht_neighbours.c:772
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/dht/gnunet-service-dht_neighbours.c:816
+#: src/dht/gnunet-service-dht_neighbours.c:810
 #, fuzzy
 msgid "# Bytes of bandwdith requested from core"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1040
-#: src/dht/gnunet-service-dht_neighbours.c:1068
+#: src/dht/gnunet-service-dht_neighbours.c:1032
+#: src/dht/gnunet-service-dht_neighbours.c:1060
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1049
-#: src/dht/gnunet-service-dht_neighbours.c:1085
+#: src/dht/gnunet-service-dht_neighbours.c:1041
+#: src/dht/gnunet-service-dht_neighbours.c:1075
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr "# các cuộc gọi HTTP select (lựa chọn)"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1221
+#: src/dht/gnunet-service-dht_neighbours.c:1207
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1252
+#: src/dht/gnunet-service-dht_neighbours.c:1236
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1333
+#: src/dht/gnunet-service-dht_neighbours.c:1315
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1364
+#: src/dht/gnunet-service-dht_neighbours.c:1342
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1467
+#: src/dht/gnunet-service-dht_neighbours.c:1443
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1555
+#: src/dht/gnunet-service-dht_neighbours.c:1531
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1668
+#: src/dht/gnunet-service-dht_neighbours.c:1647
 #, fuzzy
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1676
+#: src/dht/gnunet-service-dht_neighbours.c:1655
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1767
+#: src/dht/gnunet-service-dht_neighbours.c:1746
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1788
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1825
+#: src/dht/gnunet-service-dht_neighbours.c:1802
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1895
+#: src/dht/gnunet-service-dht_neighbours.c:1876
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -1498,29 +1518,28 @@ msgstr ""
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:236
+#: src/dht/gnunet-service-dht_routing.c:238
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:314
-#: src/dht/gnunet-service-dht_routing.c:368
+#: src/dht/gnunet-service-dht_routing.c:311
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
+#: src/dht/gnunet-service-dht_routing.c:352
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:124
+#: src/dht/plugin_block_dht.c:136
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Không biết truyền tải nào kiểu %d.\n"
 
-#: src/dht/plugin_block_dht.c:131
+#: src/dht/plugin_block_dht.c:143
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:140
+#: src/dht/plugin_block_dht.c:152
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -1549,68 +1568,69 @@ msgstr ""
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:480
+#: src/dns/gnunet-service-dns.c:485
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
-#: src/dns/gnunet-service-dns.c:634
+#: src/dns/gnunet-service-dns.c:639
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:818
+#: src/dns/gnunet-service-dns.c:822
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1001
+#: src/dns/gnunet-service-dns.c:1005
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1046
+#: src/dns/gnunet-service-dns.c:1050
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1165
+#: src/dns/gnunet-service-dns.c:1168
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1198
-msgid "Changing DNS reply according to client specifications\n"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1279
+#: src/dns/gnunet-service-dns.c:1281
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1294
+#: src/dns/gnunet-service-dns.c:1297
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1303
+#: src/dns/gnunet-service-dns.c:1306
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1312
+#: src/dns/gnunet-service-dns.c:1315
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1377
+#: src/dns/gnunet-service-dns.c:1380
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/dns/gnunet-service-dns.c:1461
+#: src/dns/gnunet-service-dns.c:1465
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1497 src/exit/gnunet-daemon-exit.c:2674
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1567
+#: src/dns/gnunet-service-dns.c:1561 src/exit/gnunet-daemon-exit.c:3032
+#, c-format
+msgid "`%s' must be installed SUID, refusing to run\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:1581
 msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
@@ -1634,15 +1654,15 @@ msgstr ""
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr "# các byte được gửi"
 
-#: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2068
-#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1388
-#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+#: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2069
+#: src/exit/gnunet-daemon-exit.c:2319 src/vpn/gnunet-service-vpn.c:1394
+#: src/vpn/gnunet-service-vpn.c:1795 src/vpn/gnunet-service-vpn.c:1958
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2127
-#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1444
-#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+#: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2128
+#: src/exit/gnunet-daemon-exit.c:2378 src/vpn/gnunet-service-vpn.c:1450
+#: src/vpn/gnunet-service-vpn.c:1854 src/vpn/gnunet-service-vpn.c:1991
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -1691,138 +1711,138 @@ msgstr ""
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1470
+#: src/exit/gnunet-daemon-exit.c:1471
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1570
+#: src/exit/gnunet-daemon-exit.c:1571
 #, fuzzy
 msgid "# TCP service creation requests received via mesh"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1573 src/exit/gnunet-daemon-exit.c:1652
-#: src/exit/gnunet-daemon-exit.c:1762 src/exit/gnunet-daemon-exit.c:1992
-#: src/exit/gnunet-daemon-exit.c:2234 src/exit/gnunet-daemon-exit.c:2515
-#: src/exit/gnunet-daemon-exit.c:2615
+#: src/exit/gnunet-daemon-exit.c:1574 src/exit/gnunet-daemon-exit.c:1653
+#: src/exit/gnunet-daemon-exit.c:1763 src/exit/gnunet-daemon-exit.c:1993
+#: src/exit/gnunet-daemon-exit.c:2235 src/exit/gnunet-daemon-exit.c:2516
+#: src/exit/gnunet-daemon-exit.c:2616
 #, fuzzy
 msgid "# Bytes received from MESH"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1606 src/exit/gnunet-daemon-exit.c:2637
+#: src/exit/gnunet-daemon-exit.c:1607 src/exit/gnunet-daemon-exit.c:2638
 #, c-format
 msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1610
+#: src/exit/gnunet-daemon-exit.c:1611
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:1655
+#: src/exit/gnunet-daemon-exit.c:1656
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1766
 #, fuzzy
 msgid "# TCP data requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1779
+#: src/exit/gnunet-daemon-exit.c:1780
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:1829
+#: src/exit/gnunet-daemon-exit.c:1830
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1995
+#: src/exit/gnunet-daemon-exit.c:1996
 #, fuzzy
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2237
+#: src/exit/gnunet-daemon-exit.c:2238
 #, fuzzy
 msgid "# ICMP service requests received via mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1378
-#: src/vpn/gnunet-service-vpn.c:1945
+#: src/exit/gnunet-daemon-exit.c:2304 src/vpn/gnunet-service-vpn.c:1384
+#: src/vpn/gnunet-service-vpn.c:1952
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1414
-#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+#: src/exit/gnunet-daemon-exit.c:2363 src/vpn/gnunet-service-vpn.c:1420
+#: src/vpn/gnunet-service-vpn.c:1432 src/vpn/gnunet-service-vpn.c:1842
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2412
+#: src/exit/gnunet-daemon-exit.c:2413
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2518
+#: src/exit/gnunet-daemon-exit.c:2519
 #, fuzzy
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2618
+#: src/exit/gnunet-daemon-exit.c:2619
 #, fuzzy
 msgid "# UDP service requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2641
+#: src/exit/gnunet-daemon-exit.c:2642
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:2881
+#: src/exit/gnunet-daemon-exit.c:2882
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2895 src/exit/gnunet-daemon-exit.c:2907
+#: src/exit/gnunet-daemon-exit.c:2896 src/exit/gnunet-daemon-exit.c:2908
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2918
+#: src/exit/gnunet-daemon-exit.c:2919
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3047
+#: src/exit/gnunet-daemon-exit.c:3048
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3055
+#: src/exit/gnunet-daemon-exit.c:3056
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3062
+#: src/exit/gnunet-daemon-exit.c:3063
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3068
+#: src/exit/gnunet-daemon-exit.c:3069
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3074 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3075 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3235
+#: src/exit/gnunet-daemon-exit.c:3236
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1830,122 +1850,127 @@ msgstr ""
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:454
+#: src/fragmentation/defragmentation.c:456
 #, fuzzy
 msgid "# fragments received"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/fragmentation/defragmentation.c:513
+#: src/fragmentation/defragmentation.c:521
 #, fuzzy
 msgid "# duplicate fragments received"
 msgstr "# các kết quả dht được nhận"
 
-#: src/fragmentation/defragmentation.c:526
+#: src/fragmentation/defragmentation.c:534
 msgid "# messages defragmented"
 msgstr "# các thông báo được chắp liền"
 
-#: src/fragmentation/fragmentation.c:188
+#: src/fragmentation/fragmentation.c:203
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Các tự quảng cáo được truyền"
 
-#: src/fragmentation/fragmentation.c:191
+#: src/fragmentation/fragmentation.c:206
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Các tự quảng cáo được truyền"
 
-#: src/fragmentation/fragmentation.c:255
+#: src/fragmentation/fragmentation.c:232
+#, fuzzy
+msgid "# fragments wrap arounds"
+msgstr "# Các tự quảng cáo được truyền"
+
+#: src/fragmentation/fragmentation.c:273
 msgid "# messages fragmented"
 msgstr "# các thông báo bị tế phân"
 
-#: src/fragmentation/fragmentation.c:258
+#: src/fragmentation/fragmentation.c:276
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:343
+#: src/fragmentation/fragmentation.c:363
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Các quảng cáo đồng đẳng được nhận"
 
-#: src/fragmentation/fragmentation.c:349
+#: src/fragmentation/fragmentation.c:369
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:373
+#: src/fragmentation/fragmentation.c:393
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/fs/fs_api.c:284
+#: src/fs/fs_api.c:339
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:293
+#: src/fs/fs_api.c:348
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:299
+#: src/fs/fs_api.c:354
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:877
+#: src/fs/fs_api.c:938
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:1334
+#: src/fs/fs_api.c:1395
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1376
+#: src/fs/fs_api.c:1437
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1392
+#: src/fs/fs_api.c:1453
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2004
+#: src/fs/fs_api.c:2106
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2014
+#: src/fs/fs_api.c:2116
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
+#: src/fs/fs_api.c:2241 src/fs/fs_api.c:2480
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2156
+#: src/fs/fs_api.c:2258
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
+#: src/fs/fs_api.c:2270 src/fs/fs_api.c:2289 src/fs/fs_api.c:2773
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2369
+#: src/fs/fs_api.c:2471
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2615
+#: src/fs/fs_api.c:2717
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2709
+#: src/fs/fs_api.c:2811
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1955,53 +1980,58 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:311
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:330
+#: src/fs/fs_download.c:331
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:488 src/fs/fs_download.c:500
+#: src/fs/fs_download.c:497 src/fs/fs_download.c:509
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:870
+#: src/fs/fs_download.c:878
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/fs_download.c:951
+#: src/fs/fs_download.c:960
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
+"offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:986
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1000
+#: src/fs/fs_download.c:1009
 #, fuzzy, c-format
-msgid "Download failed: could not open file `%s': %s\n"
+msgid "Download failed: could not open file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_download.c:1010
+#: src/fs/fs_download.c:1019
 #, fuzzy, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:1019
-#, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
-msgstr ""
+#: src/fs/fs_download.c:1028
+#, fuzzy, c-format
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/fs/fs_download.c:1125
+#, fuzzy
+msgid "internal error decoding tree"
+msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_download.c:1835
+#: src/fs/fs_download.c:1888
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
@@ -2085,64 +2115,64 @@ msgstr "Lỗi VR."
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:395
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:397
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:616 src/fs/fs_publish.c:633 src/fs/fs_publish.c:672
-#: src/fs/fs_publish.c:692 src/fs/fs_publish.c:717 src/fs/fs_publish.c:857
+#: src/fs/fs_publish.c:621 src/fs/fs_publish.c:638 src/fs/fs_publish.c:677
+#: src/fs/fs_publish.c:697 src/fs/fs_publish.c:722 src/fs/fs_publish.c:862
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Lỗi đánh chỉ mục tập tin « %s ». Đề nghị: thử chèn tập tin.\n"
 
-#: src/fs/fs_publish.c:618
+#: src/fs/fs_publish.c:623
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:630
+#: src/fs/fs_publish.c:635
 #, fuzzy
 msgid "unknown error"
 msgstr "Lỗi không rõ"
 
-#: src/fs/fs_publish.c:673
+#: src/fs/fs_publish.c:678
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:693
+#: src/fs/fs_publish.c:698
 #, fuzzy
 msgid "filename too long"
 msgstr "tên tập tin"
 
-#: src/fs/fs_publish.c:718
+#: src/fs/fs_publish.c:723
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:741
+#: src/fs/fs_publish.c:746
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/fs_publish.c:806
+#: src/fs/fs_publish.c:811
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/fs/fs_publish.c:812
+#: src/fs/fs_publish.c:817
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:858
+#: src/fs/fs_publish.c:863
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1067
+#: src/fs/fs_publish.c:1071
 #, fuzzy, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr "Không đủ quyền truy cập cho « %s »: %s\n"
 
-#: src/fs/fs_publish.c:1138
+#: src/fs/fs_publish.c:1142
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2152,7 +2182,7 @@ msgstr ""
 msgid "Could not connect to datastore."
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/fs/fs_search.c:810
+#: src/fs/fs_search.c:829
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2162,44 +2192,64 @@ msgstr ""
 msgid "Failed to start daemon: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/fs/fs_unindex.c:57
+#: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:62
+#: src/fs/fs_unindex.c:63
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Lỗi gửi tin nhẳn.\n"
 
-#: src/fs/fs_unindex.c:231
+#: src/fs/fs_unindex.c:233
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:239
+#: src/fs/fs_unindex.c:241
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:247
+#: src/fs/fs_unindex.c:249
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/fs/fs_unindex.c:292
+#: src/fs/fs_unindex.c:293
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_unindex.c:325
+#: src/fs/fs_unindex.c:344
+#, fuzzy
+msgid "Failed to get KSKs from directory scan."
+msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
+
+#: src/fs/fs_unindex.c:356
+#, fuzzy, c-format
+msgid "Internal error scanning `%s'.\n"
+msgstr "=\tLỗi đọc thư mục.\n"
+
+#: src/fs/fs_unindex.c:411
+#, fuzzy, c-format
+msgid "Failed to remove KBlock: %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/fs/fs_unindex.c:501
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s' from KBlock!\n"
+msgstr "Tập tin « %s » có URI: %s\n"
+
+#: src/fs/fs_unindex.c:553 src/fs/fs_unindex.c:618
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/fs_unindex.c:338
+#: src/fs/fs_unindex.c:631
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:665
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -2311,95 +2361,95 @@ msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n
 msgid "Display contents of a GNUnet directory"
 msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
 
-#: src/fs/gnunet-download.c:100
+#: src/fs/gnunet-download.c:101
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-download.c:109
+#: src/fs/gnunet-download.c:110
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Lỗi không rõ"
 
-#: src/fs/gnunet-download.c:118
+#: src/fs/gnunet-download.c:119
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:128
+#: src/fs/gnunet-download.c:129
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-download.c:136
+#: src/fs/gnunet-download.c:137
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
 
-#: src/fs/gnunet-download.c:151 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-download.c:152 src/fs/gnunet-publish.c:190
 #: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/fs/gnunet-download.c:176
+#: src/fs/gnunet-download.c:177
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-download.c:183 src/fs/gnunet-publish.c:624
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/fs/gnunet-download.c:189
+#: src/fs/gnunet-download.c:190
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:196
+#: src/fs/gnunet-download.c:197
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:602
 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-download.c:247 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:248 src/fs/gnunet-search.c:285
 #, fuzzy
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: src/fs/gnunet-download.c:250
+#: src/fs/gnunet-download.c:251
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "xoá việc tải về không hoàn thành (khi hủy bở dùng CTRL-C)"
 
-#: src/fs/gnunet-download.c:253 src/fs/gnunet-search.c:288
+#: src/fs/gnunet-download.c:254 src/fs/gnunet-search.c:288
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:256
+#: src/fs/gnunet-download.c:257
 msgid "write the file to FILENAME"
 msgstr "ghi tập tin vào TÊN_TẬP_TIN"
 
-#: src/fs/gnunet-download.c:260
+#: src/fs/gnunet-download.c:261
 #, fuzzy
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
 
-#: src/fs/gnunet-download.c:264
+#: src/fs/gnunet-download.c:265
 #, fuzzy
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
 
-#: src/fs/gnunet-download.c:267
+#: src/fs/gnunet-download.c:268
 msgid "download a GNUnet directory recursively"
 msgstr "tải xuống đệ quy một thư mục GNUnet"
 
-#: src/fs/gnunet-download.c:277
+#: src/fs/gnunet-download.c:278
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2414,35 +2464,30 @@ msgstr ""
 msgid "Special file-sharing operations"
 msgstr "Tùy chọn chia sẻ tập tin"
 
-#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:167
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/fs/gnunet-pseudonym.c:165
-#, fuzzy, c-format
-msgid "Namespace `%s' unknown.\n"
-msgstr "Không gian tên « %s » có đánh giá %d.\n"
-
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
+#: src/fs/gnunet-pseudonym.c:250 src/fs/gnunet-pseudonym.c:257
+#: src/fs/gnunet-pseudonym.c:259
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-pseudonym.c:279 src/fs/gnunet-publish.c:678
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: src/fs/gnunet-pseudonym.c:272
+#: src/fs/gnunet-pseudonym.c:282
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:275
+#: src/fs/gnunet-pseudonym.c:285
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:278
+#: src/fs/gnunet-pseudonym.c:288
 #, fuzzy
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
@@ -2451,38 +2496,38 @@ msgstr ""
 "thêm một từ khóa bổ sung cho tất cả tập tin và thư mục (có thể chỉ ra tùy "
 "chọn này nhiều lần)"
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:697
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "đặt siêu dữ liệu cho KIỂU đưa ra thành GIÁ_TRỊ chỉ ra"
 
-#: src/fs/gnunet-pseudonym.c:285
+#: src/fs/gnunet-pseudonym.c:295
 #, fuzzy
 msgid "print names of local namespaces"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: src/fs/gnunet-pseudonym.c:288
+#: src/fs/gnunet-pseudonym.c:298
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:291
+#: src/fs/gnunet-pseudonym.c:301
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-pseudonym.c:304 src/fs/gnunet-publish.c:716
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:297
+#: src/fs/gnunet-pseudonym.c:307
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: src/fs/gnunet-pseudonym.c:300
+#: src/fs/gnunet-pseudonym.c:310
 #, fuzzy
 msgid "change rating of namespace ID by VALUE"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: src/fs/gnunet-pseudonym.c:308
+#: src/fs/gnunet-pseudonym.c:318
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2511,115 +2556,115 @@ msgstr "Tôi là đồng đẳng « %s ».\n"
 msgid "Cleanup after abort complete.\n"
 msgstr "Hoàn thành khởi chạy « %s ».\n"
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:305
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:301
+#: src/fs/gnunet-publish.c:307
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Từ khoá cho tập tin « %s »:\n"
 
-#: src/fs/gnunet-publish.c:352
+#: src/fs/gnunet-publish.c:358
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:433
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:454
+#: src/fs/gnunet-publish.c:460
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/fs/gnunet-publish.c:485
+#: src/fs/gnunet-publish.c:491
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/gnunet-publish.c:487
+#: src/fs/gnunet-publish.c:493
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:498
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-publish.c:503
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:501
+#: src/fs/gnunet-publish.c:507
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:505
+#: src/fs/gnunet-publish.c:511
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:518
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/gnunet-publish.c:546
+#: src/fs/gnunet-publish.c:552
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "Không thể trích siêu dữ liệu ra một địa chỉ URI.\n"
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:559
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:565
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:573 src/vpn/gnunet-vpn.c:214
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
-#: src/transport/gnunet-transport.c:530
+#: src/fs/gnunet-publish.c:583 src/fs/gnunet-publish.c:590
+#: src/transport/gnunet-transport.c:560
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:606
+#: src/fs/gnunet-publish.c:612
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-publish.c:639
+#: src/fs/gnunet-publish.c:645
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:651
+#: src/fs/gnunet-publish.c:657
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:676
+#: src/fs/gnunet-publish.c:682
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên"
 
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:685
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-publish.c:689
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2627,7 +2672,7 @@ msgstr ""
 "in ra danh sách các từ khóa đã giải phóng cần sử dụng, nhưng không thực hiện "
 "tải lên"
 
-#: src/fs/gnunet-publish.c:687
+#: src/fs/gnunet-publish.c:693
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2635,7 +2680,7 @@ msgstr ""
 "thêm một từ khoá bổ sung cho tập tin hoặc thư mục ở cấp đầu (có thể chỉ ra "
 "tùy chọn này nhiều lần)"
 
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:700
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2643,7 +2688,7 @@ msgstr ""
 "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng "
 "mã hóa trong cơ sở dữ liệu GNUnet)"
 
-#: src/fs/gnunet-publish.c:699
+#: src/fs/gnunet-publish.c:705
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2651,16 +2696,16 @@ msgstr ""
 "chỉ ra mã số của một phiên bản đã cập nhật để công bố trong tương lai (chỉ "
 "cho sự chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:703
+#: src/fs/gnunet-publish.c:709
 msgid "specify the priority of the content"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/fs/gnunet-publish.c:707
+#: src/fs/gnunet-publish.c:713
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "công bố các tập tin dưới biệt hiệu TÊN (đặt tập tin vào không gian tên)"
 
-#: src/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:719
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -2668,13 +2713,13 @@ msgid ""
 msgstr ""
 "chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
 
-#: src/fs/gnunet-publish.c:717
+#: src/fs/gnunet-publish.c:723
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "đặt mã số của phiên bản này của sự công bố (chỉ cho chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:721
+#: src/fs/gnunet-publish.c:727
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -2682,7 +2727,7 @@ msgstr ""
 "Địa chỉ URI cần công bố (có thể được dùng thay vào gửi một tập tin để thêm "
 "từ khoá vào tập tin có địa chỉ URI tương ứng)"
 
-#: src/fs/gnunet-publish.c:736
+#: src/fs/gnunet-publish.c:742
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2733,24 +2778,12 @@ msgid "# Loopback routes suppressed"
 msgstr "# tổng số định tuyến lỗ hổng thành công"
 
 #: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1290
-#: src/topology/gnunet-daemon-topology.c:1297
+#: src/topology/gnunet-daemon-topology.c:1330
+#: src/topology/gnunet-daemon-topology.c:1337
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
-#: src/topology/gnunet-daemon-topology.c:654
-#: src/topology/gnunet-daemon-topology.c:756
-#: src/transport/gnunet-service-transport_neighbours.c:960
-#: src/transport/gnunet-service-transport_neighbours.c:1289
-#: src/transport/gnunet-service-transport_neighbours.c:1841
-#: src/transport/gnunet-service-transport_neighbours.c:2499
-#: src/transport/gnunet-service-transport_neighbours.c:2566
-#, fuzzy
-msgid "# peers connected"
-msgstr "# của các đồng đẳng đã kết nối"
-
 #: src/fs/gnunet-service-fs_cp.c:696
 #, fuzzy
 msgid "# migration stop messages received"
@@ -3106,15 +3139,133 @@ msgstr ""
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gns_api.c:221
+#: src/gns/gnunet-gns.c:191
 #, fuzzy
-msgid "Failed to connect to the GNS service!\n"
+msgid "Failed to connect to GNS\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns-lookup.c:210
-msgid "Issue a request to the GNUnet Naming System, prints results."
+#: src/gns/gnunet-gns.c:232
+msgid "try to shorten a given GNS name"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:235
+msgid "Lookup a record using GNS (NOT IMPLEMENTED)"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:238
+msgid "Get the authority of a particular name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:241
+#, fuzzy
+msgid "Specify the type of the record lookup"
+msgstr "xác định mức ưu tiên của nội dung"
+
+#: src/gns/gnunet-gns.c:244
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:255
+msgid "GNUnet GNS access tool"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:280
+#, fuzzy, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:333
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:377
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:439
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:498
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:514
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:725 src/gns/gnunet-gns-fcfsd.c:737
+#, fuzzy, c-format
+msgid "Option `%s' not specified in configuration section `%s'\n"
+msgstr ""
+"Đặc tả mạng dạng sai trong cấu hình phần « %s » cho mục nhập « %s »: %s\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:747 src/namestore/gnunet-namestore.c:299
+#, fuzzy
+msgid "Failed to read or create private zone key\n"
+msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:757 src/namestore/gnunet-namestore.c:310
+#, fuzzy
+msgid "Failed to connect to namestore\n"
+msgstr "Không kết nối được đến trình nền gnunetd."
+
+#: src/gns/gnunet-gns-fcfsd.c:773 src/gns/gnunet-gns-proxy.c:525
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:804
+msgid "GNUnet GNS first come first serve registration service"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:800
+msgid "listen on specified port"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:811
+msgid "GNUnet GNS proxy"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:122
+msgid "Call with name of HELLO file to modify.\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:128
+#, fuzzy, c-format
+msgid "Error accessing file `%s': %s\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/hello/gnunet-hello.c:136
+#, c-format
+msgid "File `%s' is too big to be a HELLO\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:143
+#, c-format
+msgid "File `%s' is too small to be a HELLO\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:153 src/hello/gnunet-hello.c:181
+#, fuzzy, c-format
+msgid "Error opening file `%s': %s\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/hello/gnunet-hello.c:169
+#, fuzzy, c-format
+msgid "Did not find well-formed HELLO in file `%s'\n"
+msgstr "Không tìm thấy tập tin nào trong thư mục « %s »\n"
+
+#: src/hello/gnunet-hello.c:193
+#, fuzzy, c-format
+msgid "Error writing HELLO to file `%s': %s\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
 #: src/hostlist/gnunet-daemon-hostlist.c:264
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
@@ -3146,199 +3297,199 @@ 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/hostlist-client.c:286
+#: src/hostlist/hostlist-client.c:289
 #, 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/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:340
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#: src/hostlist/hostlist-client.c:313 src/hostlist/hostlist-client.c:343
 #, 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/hostlist-client.c:330
+#: src/hostlist/hostlist-client.c:331
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
+#: src/hostlist/hostlist-client.c:375 src/hostlist/hostlist-client.c:396
 #, fuzzy, c-format
 msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 "Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi động.\n"
 
-#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
-#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
-#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
-#: src/transport/plugin_transport_http_client.c:108
-#: src/transport/plugin_transport_http_client.c:123
+#: src/hostlist/hostlist-client.c:473 src/hostlist/hostlist-client.c:683
+#: src/hostlist/hostlist-client.c:689 src/hostlist/hostlist-client.c:741
+#: src/hostlist/hostlist-client.c:750 src/hostlist/hostlist-client.c:871
+#: src/hostlist/hostlist-client.c:961 src/hostlist/hostlist-client.c:966
+#: src/transport/plugin_transport_http_client.c:110
+#: src/transport/plugin_transport_http_client.c:125
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
+#: src/hostlist/hostlist-client.c:593 src/hostlist/hostlist-client.c:1331
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/hostlist/hostlist-client.c:623
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:663
+#: src/hostlist/hostlist-client.c:664
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:805
+#: src/hostlist/hostlist-client.c:802
 #, 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/hostlist-client.c:822
+#: src/hostlist/hostlist-client.c:816
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/hostlist-client.c:836
 #, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+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/hostlist-client.c:848
+#: src/hostlist/hostlist-client.c:842
 #, 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/hostlist-client.c:856
+#: src/hostlist/hostlist-client.c:850
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:909
+#: src/hostlist/hostlist-client.c:903
 #, fuzzy, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/hostlist/hostlist-client.c:917
+#: src/hostlist/hostlist-client.c:911
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1505
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1054
+#: src/hostlist/hostlist-client.c:1046
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
+#: src/hostlist/hostlist-client.c:1084
 msgid "Scheduled saving of hostlists\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1096
+#: src/hostlist/hostlist-client.c:1088
 #, c-format
 msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
+#: src/hostlist/hostlist-client.c:1111 src/hostlist/hostlist-client.c:1127
 #, fuzzy
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: src/hostlist/hostlist-client.c:1253
+#: src/hostlist/hostlist-client.c:1242
 #, c-format
 msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1284
+#: src/hostlist/hostlist-client.c:1273
 #, fuzzy, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 "Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi động.\n"
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/hostlist/hostlist-client.c:1279
 #, 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/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1283
 #, c-format
 msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1305
+#: src/hostlist/hostlist-client.c:1294
 #, 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/hostlist-client.c:1338
+#: src/hostlist/hostlist-client.c:1327
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1340
+#: src/hostlist/hostlist-client.c:1329
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1362
 #, fuzzy, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 "Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi động.\n"
 
-#: src/hostlist/hostlist-client.c:1387
+#: src/hostlist/hostlist-client.c:1376
 #, 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/hostlist-client.c:1392
+#: src/hostlist/hostlist-client.c:1381
 #, 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/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1428
+#: src/hostlist/hostlist-client.c:1417
 #, fuzzy
 msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/hostlist-client.c:1480
+#: src/hostlist/hostlist-client.c:1470
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/hostlist-client.c:1473
 #, c-format
 msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1482
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1504
+#: src/hostlist/hostlist-client.c:1494
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1508
+#: src/hostlist/hostlist-client.c:1498
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
@@ -3352,8 +3503,10 @@ msgstr "# các byte trong kho dữ liệu"
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:184
-#: src/topology/gnunet-daemon-topology.c:875
+#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:425
+#: src/peerinfo-tool/gnunet-peerinfo.c:403
+#: src/peerinfo-tool/gnunet-peerinfo.c:519
+#: src/topology/gnunet-daemon-topology.c:927
 #, 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"
@@ -3362,188 +3515,402 @@ msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:221
+#: src/hostlist/hostlist-server.c:219
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:269
+#: src/hostlist/hostlist-server.c:263
 #, 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/hostlist-server.c:272
+#: src/hostlist/hostlist-server.c:266
 #, 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/hostlist-server.c:280
+#: src/hostlist/hostlist-server.c:273
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:287
+#: src/hostlist/hostlist-server.c:279
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:291
+#: src/hostlist/hostlist-server.c:283
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/hostlist-server.c:291
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:294
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/hostlist-server.c:306
+#: src/hostlist/hostlist-server.c:298
 #, fuzzy
 msgid "Received request for our hostlist\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/hostlist/hostlist-server.c:307
+#: src/hostlist/hostlist-server.c:299
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/hostlist-server.c:350
+#: src/hostlist/hostlist-server.c:341
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
-#: src/hostlist/hostlist-server.c:397
+#: src/hostlist/hostlist-server.c:388
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:565
+#: src/hostlist/hostlist-server.c:561
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:574
+#: src/hostlist/hostlist-server.c:570
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:588
+#: src/hostlist/hostlist-server.c:584
 #, 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/hostlist-server.c:626
+#: src/hostlist/hostlist-server.c:624
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgstr "« %s » không sẵn sàng.\n"
+
+#: src/hostlist/hostlist-server.c:666
 #, 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"
 
-#: src/mesh/gnunet-service-mesh.c:4595
+#: src/integration-tests/connection_watchdog.c:997
+#, fuzzy, c-format
+msgid "Transport plugin: `%s' port %llu\n"
+msgstr "Đang nạp các truyền tải « %s »\n"
+
+#: src/integration-tests/connection_watchdog.c:1030
+#, fuzzy, c-format
+msgid "Found %u transport plugins: `%s'\n"
+msgstr "Đang nạp các truyền tải « %s »\n"
+
+#: src/integration-tests/connection_watchdog.c:1089
+msgid "Send ping messages to test connectivity (default == NO)"
+msgstr ""
+
+#: src/integration-tests/connection_watchdog.c:1095
+#: src/template/gnunet-template.c:68
+msgid "help text"
+msgstr ""
+
+#: src/mesh/gnunet-service-mesh.c:4590
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4789
+#: src/mesh/gnunet-service-mesh.c:4784
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/mesh/gnunet-service-mesh.c:4798
+#: src/mesh/gnunet-service-mesh.c:4793
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/namestore/namestore_api.c:272 src/namestore/namestore_api.c:313
+#: src/mysql/mysql.c:174
+#, c-format
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
+
+#: src/mysql/mysql.c:181
+#, fuzzy, c-format
+msgid "Could not access file `%s': %s\n"
+msgstr "Không thể truy cập đến « %s »: %s\n"
+
+#: src/namestore/gnunet-namestore.c:157
+#, 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:183
+#, fuzzy, c-format
+msgid "Deleting record failed: %s\n"
+msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
+
+#: src/namestore/gnunet-namestore.c:239
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:276
+#, c-format
+msgid "Option `%s' not given, but I need a zone key file!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:281
+#, fuzzy, c-format
+msgid "Using default zone file `%s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/namestore/gnunet-namestore.c:291
+#, fuzzy, c-format
+msgid "No options given\n"
+msgstr "chưa đưa ra tên"
+
+#: src/namestore/gnunet-namestore.c:321
+#, 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:328 src/namestore/gnunet-namestore.c:350
+#: src/namestore/gnunet-namestore.c:374 src/namestore/gnunet-namestore.c:384
+#: src/namestore/gnunet-namestore.c:409
+#, 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:329 src/namestore/gnunet-namestore.c:351
+msgid "add/del"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:341
+#, c-format
+msgid "Value `%s' invalid for record type `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:366
+#, fuzzy, c-format
+msgid "Invalid time format `%s'\n"
+msgstr "Địa chỉ IP định dạng sai: %s\n"
+
+#: src/namestore/gnunet-namestore.c:375 src/namestore/gnunet-namestore.c:385
+msgid "add"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:410
+msgid "del"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:462
+msgid "add record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:465
+msgid "delete record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:468
+msgid "display records"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:471
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:474
+msgid "name of the record to add/delete/display"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:477
+msgid "type of the record to add/delete/display"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:480
+msgid "value of the record to add/delete"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:483
+msgid "create or list public record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:486
+msgid "create or list non-authority record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:489
+#, fuzzy
+msgid "filename with the zone key"
+msgstr "tên tập tin"
+
+#: src/namestore/gnunet-namestore.c:500
+#, fuzzy
+msgid "GNUnet zone manipulation tool"
+msgstr "Cấu hình GNUnet"
+
+#: src/namestore/gnunet-service-namestore.c:143
+#, c-format
+msgid "File zone `%s' but corrupt content already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:154
+#, c-format
+msgid "File zone `%s' containing this key already exists\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:160
+#, c-format
+msgid ""
+"File zone `%s' but different zone key already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:198
+#, fuzzy, c-format
+msgid "Stored zonekey for zone `%s' in file `%s'\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/namestore/gnunet-service-namestore.c:1909
+msgid "No directory to load zonefiles specified in configuration\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:1918
+#, c-format
+msgid "Creating directory `%s' for zone files failed!\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:315 src/namestore/namestore_api.c:353
 msgid "Namestore added record successfully"
 msgstr ""
 
-#: src/namestore/namestore_api.c:281 src/namestore/namestore_api.c:322
+#: src/namestore/namestore_api.c:323
 msgid "Namestore failed to add record"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:289
+#: src/namestore/namestore_api.c:361
+msgid "Namestore record already existed"
+msgstr ""
+
+#: src/namestore/namestore_api.c:368
+msgid "Namestore failed to add record\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:401
+#, fuzzy
+msgid "Namestore removed record successfully"
+msgstr "Dịch vụ GNUnet đã được cài đặt.\n"
+
+#: src/namestore/namestore_api.c:408
+msgid "No records for entry"
+msgstr ""
+
+#: src/namestore/namestore_api.c:415
+#, fuzzy
+msgid "Could not find record to remove"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/namestore/namestore_api.c:422
+#, fuzzy
+msgid "Failed to create new signature"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/namestore/namestore_api.c:429
+#, fuzzy
+msgid "Failed to put new set of records in database"
+msgstr ""
+"\n"
+"Không nhận được đáp ứng từ gnunetd.\n"
+
+#: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:328
+#: src/nat/gnunet-nat-server.c:318
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat.c:803
+#: src/nat/nat.c:799
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:852
+#: src/nat/nat.c:844
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/nat.c:1121
+#: src/nat/nat.c:1111
 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/nat/nat.c:1187 src/nat/nat.c:1197
+#: src/nat/nat.c:1177 src/nat/nat.c:1187
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1329
+#: src/nat/nat.c:1321
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1341
+#: src/nat/nat.c:1332
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat_test.c:348
+#: src/nat/nat_test.c:341
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/nat/nat_test.c:418
+#: src/nat/nat_test.c:411
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:926
+#: src/nse/gnunet-nse-profiler.c:928
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/nse/gnunet-service-nse.c:936
+#: src/nse/gnunet-service-nse.c:925
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
-#: src/nse/gnunet-service-nse.c:1431
+#: src/nse/gnunet-service-nse.c:1381 src/nse/gnunet-service-nse.c:1400
+#: src/nse/gnunet-service-nse.c:1421
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1398
+#: src/nse/gnunet-service-nse.c:1388
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1419
+#: src/nse/gnunet-service-nse.c:1409
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:133
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Đã nạp truyền tải « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:195
+#: src/peerinfo/gnunet-service-peerinfo.c:203
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:229
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
+#: src/peerinfo/gnunet-service-peerinfo.c:254
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -3551,69 +3918,169 @@ msgstr ""
 "Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ "
 "bỏ.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:305
+#: src/peerinfo/gnunet-service-peerinfo.c:353
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/peerinfo/peerinfo_api.c:279
-#, fuzzy, c-format
-msgid "Failed to transmit message to `%s' service.\n"
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:710
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:435
+#: src/peerinfo/peerinfo_api.c:238
+msgid "aborted due to explicit disconnect request"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:358
+#, fuzzy
+msgid "failed to transmit request (service down?)"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/peerinfo/peerinfo_api.c:505
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
-msgid "Received invalid message from `PEERINFO' service.\n"
+#: src/peerinfo/peerinfo_api.c:531 src/peerinfo/peerinfo_api.c:550
+#: src/peerinfo/peerinfo_api.c:565 src/peerinfo/peerinfo_api.c:576
+#: src/peerinfo/peerinfo_api.c:587
+#, fuzzy
+msgid "Received invalid message from `PEERINFO' service."
 msgstr ""
+"\n"
+"Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/peerinfo/peerinfo_api.c:523
+#: src/peerinfo/peerinfo_api.c:663
 #, fuzzy
-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
+msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/peerinfo/peerinfo_api.c:557
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api_notify.c:258
+#: src/peerinfo/peerinfo_api_notify.c:256
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/peerinfo-tool/gnunet-peerinfo.c:581
+#, fuzzy
+msgid "Failed to parse HELLO message: missing expiration time\n"
+msgstr "Lỗi lưu cấu hình."
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:589
+#, fuzzy
+msgid "Failed to parse HELLO message: invalid expiration time\n"
+msgstr "Lỗi lưu cấu hình."
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:598
+#, fuzzy
+msgid "Failed to parse HELLO message: malformed\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:608
+#, fuzzy
+msgid "Failed to parse HELLO message: missing transport plugin\n"
+msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:625
+#, c-format
+msgid "Plugin `%s' not found\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:634
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:653
+#, fuzzy, c-format
+msgid "Failed to parse `%s' as an address for plugin `%s'\n"
+msgstr "Lỗi đóng kết đến cổng %s %d.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:685
+#, c-format
+msgid "Failure adding HELLO: %s\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:833
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#: src/peerinfo-tool/gnunet-peerinfo.c:840
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
+#: src/peerinfo-tool/gnunet-peerinfo.c:875
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "Dữ liệu nhập không hợp lệ.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:899
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
+#: src/peerinfo-tool/gnunet-peerinfo.c:936
+msgid "don't resolve host names"
+msgstr "không quyết định các tên máy"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:939
 msgid "output only the identity strings"
 msgstr "chỉ xuất những chuỗi nhận diện"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:942
 msgid "output our own identity only"
 msgstr "chỉ xuất nhận diện mình"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:945
+#, fuzzy
+msgid "list all known peers"
+msgstr "liệt kê mọi bộ tiếp hợp mạng"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:948
+msgid "also output HELLO uri(s)"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:951
+msgid "add given HELLO uri to the database"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:957
 #, fuzzy
 msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
+#: src/transport/gnunet-service-transport_plugins.c:118
+#, fuzzy, c-format
+msgid "Starting transport plugins `%s'\n"
+msgstr "Đang nạp các truyền tải « %s »\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
+#: src/transport/gnunet-service-transport_plugins.c:122
+#, fuzzy, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr "Đang nạp các truyền tải « %s »\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
+#: src/transport/gnunet-service-transport_plugins.c:150
+#, fuzzy, c-format
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
+
+#: src/postgres/postgres.c:59
+#, fuzzy, c-format
+msgid "`%s:%s' failed at %s:%d with error: %s"
+msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
+
+#: src/postgres/postgres.c:148
+#, fuzzy, c-format
+msgid "Unable to initialize Postgres: %s"
+msgstr "Không thể sơ khởi SQLite: %s.\n"
+
 #: src/pt/gnunet-daemon-pt.c:264
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
@@ -3680,48 +4147,64 @@ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:209
+#: src/statistics/gnunet-service-statistics.c:271
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-service-statistics.c:267
+#: src/statistics/gnunet-service-statistics.c:330
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:98
+#: src/statistics/gnunet-statistics.c:122
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:164
+#: src/statistics/gnunet-statistics.c:199
+#, fuzzy, c-format
+msgid "No subsystem or name given\n"
+msgstr "chưa đưa ra tên"
+
+#: src/statistics/gnunet-statistics.c:207
+#, fuzzy, c-format
+msgid "Failed to initialize watch routine\n"
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#: src/statistics/gnunet-statistics.c:227
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:167
+#: src/statistics/gnunet-statistics.c:230
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:170
+#: src/statistics/gnunet-statistics.c:233
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:173
+#: src/statistics/gnunet-statistics.c:236
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:180
+#: src/statistics/gnunet-statistics.c:239
+msgid "watch value continously"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:246
 msgid "Print statistics about GNUnet operations."
 msgstr "In ra thống kê về các thao tác GNUnet."
 
-#: src/statistics/statistics_api.c:390
+#: src/statistics/statistics_api.c:456
 #, fuzzy
-msgid "Failed to connect to statistics service!\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
+msgid "Could not save some persistent statistics\n"
+msgstr "Không thể tạo miền tên.\n"
 
-#: src/template/gnunet-template.c:68
-msgid "help text"
+#: src/statistics/statistics_api.c:999
+msgid ""
+"Failed to receive acknowledgement from statistics service, some statistics "
+"might have been lost!\n"
 msgstr ""
 
 #: src/testing/gnunet-testing.c:157
@@ -3771,200 +4254,168 @@ msgstr "Lưu cấu hình ngay bây giờ không?"
 msgid "Could not access hostkey.\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/testing/testing.c:204
+#: src/testing/testing.c:200
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:218 src/testing/testing.c:808
+#: src/testing/testing.c:214 src/testing/testing.c:798
 #, fuzzy
 msgid "`scp' did not complete cleanly.\n"
 msgstr "« %s » không phải được kết nối tới đồng đẳng nào.\n"
 
-#: src/testing/testing.c:239
+#: src/testing/testing.c:237
 #, fuzzy
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/testing/testing.c:240
+#: src/testing/testing.c:238
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/testing/testing.c:292
+#: src/testing/testing.c:286
 #, fuzzy, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/testing/testing.c:299
+#: src/testing/testing.c:293
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/testing/testing.c:300 src/testing/testing.c:488
+#: src/testing/testing.c:294 src/testing/testing.c:471
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/testing/testing.c:360
+#: src/testing/testing.c:354
 #, fuzzy, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr "Gặp lỗi khi đọc thông tin từ gnunetd.\n"
 
-#: src/testing/testing.c:364
+#: src/testing/testing.c:358
 #, fuzzy
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr "Gặp lỗi khi đọc thông tin từ gnunetd.\n"
 
-#: src/testing/testing.c:374
+#: src/testing/testing.c:368
 #, fuzzy
 msgid "Failed to get hostkey!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/testing/testing.c:406
+#: src/testing/testing.c:400
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:480
+#: src/testing/testing.c:463
 #, fuzzy, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/testing/testing.c:487
+#: src/testing/testing.c:470
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "Lỗi dừng chạy gnunet-auto-share.\n"
 
-#: src/testing/testing.c:509 src/testing/testing.c:612
+#: src/testing/testing.c:493 src/testing/testing.c:600
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:510 src/testing/testing.c:613
-#: src/testing/testing.c:633
+#: src/testing/testing.c:494 src/testing/testing.c:601
+#: src/testing/testing.c:621
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:582
+#: src/testing/testing.c:570
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:632
+#: src/testing/testing.c:620
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/testing/testing.c:653 src/testing/testing.c:685
+#: src/testing/testing.c:643 src/testing/testing.c:675
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:668 src/testing/testing.c:723
+#: src/testing/testing.c:658 src/testing/testing.c:713
 #, fuzzy
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr "« %s » không phải được kết nối tới đồng đẳng nào.\n"
 
-#: src/testing/testing.c:796
+#: src/testing/testing.c:786
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:966
+#: src/testing/testing.c:948
 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/testing/testing.c:1237 src/testing/testing_group.c:6278
+#: src/testing/testing.c:1207 src/testing/testing_group.c:6154
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/testing/testing.c:1322 src/testing/testing.c:1397
+#: src/testing/testing.c:1292 src/testing/testing.c:1359
 #, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/testing/testing.c:1480
+#: src/testing/testing.c:1448
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/testing/testing.c:1610
+#: src/testing/testing.c:1601
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1618
+#: src/testing/testing.c:1609
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "Lỗi lưu cấu hình."
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1636
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
 
-#: src/testing/testing.c:1650
+#: src/testing/testing.c:1639
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "Lỗi lưu cấu hình."
 
-#: src/testing/testing.c:1805
+#: src/testing/testing.c:1794
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/testing/testing.c:1933
+#: src/testing/testing.c:1922
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "Lỗi nạp dịch vụ sqstore. Hãy kiểm tra lại cấu hình.\n"
 
-#: src/testing/testing.c:2156
+#: src/testing/testing.c:2145
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1910 src/testing/testing_group.c:1922
-#: src/testing/testing_group.c:2023 src/testing/testing_group.c:2082
-#: src/testing/testing_group.c:2171 src/testing/testing_group.c:2191
-#: src/testing/testing_group.c:2328 src/testing/testing_peergroup.c:940
+#: src/testing/testing_group.c:1895 src/testing/testing_group.c:1907
+#: src/testing/testing_group.c:2008 src/testing/testing_group.c:2065
+#: src/testing/testing_group.c:2152 src/testing/testing_group.c:2172
+#: src/testing/testing_group.c:2302 src/testing/testing_peergroup.c:950
 #, fuzzy, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/testing/testing_group.c:1932
-#, fuzzy, c-format
-msgid "Target is %d connections per peer."
-msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
-
-#: src/testing/testing_group.c:2179
+#: src/testing/testing_group.c:2160
 #, fuzzy, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/testing/testing_group.c:2209 src/testing/testing_group.c:2402
-#, c-format
-msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
-msgstr ""
-"Đang kết nối các điểm nút theo địa hình học hình xuyến hai chiều: %u hàng, "
-"%u cột\n"
-
-#: src/testing/testing_group.c:2246
-#, c-format
-msgid "natural log of %d is %d, will run %d iterations\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2249
-#, c-format
-msgid "Total connections added thus far: %u!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2290
-#, c-format
-msgid "Total connections added for small world: %d!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2342
-#, c-format
-msgid "rand is %f probability is %f\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
+#: src/testing/testing_group.c:2877 src/testing/testing_group.c:3063
 #, fuzzy, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
@@ -3972,411 +4423,279 @@ msgid ""
 msgstr ""
 "Đặc tả mạng dạng sai trong cấu hình phần « %s » cho mục nhập « %s »: %s\n"
 
-#: src/testing/testing_group.c:3020
-msgid "Finished copying all friend files!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3133
-#, fuzzy, c-format
-msgid "Copying file with command cp %s %s\n"
-msgstr "« %s » thất bại với mã lỗi %s: %s\n"
-
-#: src/testing/testing_group.c:3156
-#, fuzzy, c-format
-msgid "Copying file with command scp %s %s\n"
-msgstr "« %s » thất bại với mã lỗi %s: %s\n"
-
-#: src/testing/testing_group.c:3173
-#, c-format
-msgid "Checking copy status of file %d\n"
+#: src/testing/testing_group.c:3957
+msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3191
-#, c-format
-msgid "File %d copied\n"
-msgstr ""
+#: src/testing/testing_group.c:5226
+#, fuzzy
+msgid "Unknown topology specification, can't connect peers!\n"
+msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
 
-#: src/testing/testing_group.c:3206
+#: src/testing/testing_group.c:5944 src/transport/transport-testing.c:636
 #, fuzzy
-msgid "Finished copying all blacklist files!\n"
+msgid "Could not read hostkeys file!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
-#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
-msgid "Delaying connect, we have too many outstanding connections!\n"
+#: src/testing/testing_group.c:6011
+#, fuzzy, c-format
+msgid "Could not create configuration for peer number %u on `%s'!\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
+#: src/testing/testing_new.c:169
+msgid "tmppath cannot be NULL\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
-#: src/testing/testing_group.c:5035
+#: src/testing/testing_new.c:356
 #, c-format
-msgid "Creating connection, outstanding_connections is %d\n"
+msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3608
+#: src/testing/testing_new.c:365
 #, fuzzy, c-format
-msgid "Offering HELLO of peer %s to peer %s\n"
-msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
+msgid "Could not open hostkeys file: %s\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/testing/testing_group.c:3734
+#: src/testing/testing_new.c:380
 #, c-format
-msgid "Creating connection, outstanding_connections is %d (max %d)\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3988
-msgid "Creating clique topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3993
-msgid "Creating small world (ring) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3998
-msgid "Creating small world (2d-torus) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4002
-msgid "Creating ring topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4006
-msgid "Creating 2d torus topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4010
-msgid "Creating Erdos-Renyi topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4014
-msgid "Creating InterNAT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4018
-msgid "Creating Scale Free topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4023
-msgid "Creating straight line topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4027
-msgid "Creating topology from file!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4043
-msgid "Creating no allowed topology (all peers can connect at core level)\n"
+msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4058
-msgid "Failed during friend file copying!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4064
-msgid "Friend files created/copied successfully!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4081
-msgid "Blacklisting all but clique topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4087
-msgid "Blacklisting all but small world (ring) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4093
-msgid "Blacklisting all but small world (2d-torus) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4099
-msgid "Blacklisting all but ring topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4105
-msgid "Blacklisting all but 2d torus topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4111
-msgid "Blacklisting all but Erdos-Renyi topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4117
-msgid "Blacklisting all but InterNAT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4152
-msgid "Blacklisting all but Scale Free topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4158
-msgid "Blacklisting all but straight line topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4173
-#, fuzzy
-msgid "Failed during blacklist file copying!\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/testing/testing_group.c:4179
-msgid "Blacklist files created/copied successfully!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5263
-msgid "Creating clique CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5270
-msgid "Creating small world (ring) CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5277
-msgid "Creating small world (2d-torus) CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5283
-msgid "Creating ring CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5290
-msgid "Creating 2d torus CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5297
-msgid "Creating Erdos-Renyi CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5304
-msgid "Creating InterNAT CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5311
-msgid "Creating Scale Free CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5318
-msgid "Creating straight line CONNECT topology\n"
-msgstr ""
+#: src/testing/testing_new.c:437
+#, fuzzy, c-format
+msgid "Key number %u does not exist\n"
+msgstr "đặt số trình nền cần khởi chạy"
 
-#: src/testing/testing_group.c:5324
-msgid "Creating no CONNECT topology\n"
-msgstr ""
+#: src/testing/testing_new.c:446
+#, fuzzy, c-format
+msgid "Error while decoding key %u\n"
+msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/testing/testing_group.c:5330
+#: src/testing/testing_new.c:680
 #, fuzzy
-msgid "Unknown topology specification, can't connect peers!\n"
-msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
+msgid "Failed to create configuration for peer (not enough free ports?)\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/testing/testing_group.c:5340
+#: src/testing/testing_new.c:691
 #, c-format
-msgid "Connecting random subset (%'.2f percent) of possible peers\n"
+msgid ""
+"You attempted to create a testbed with more than %u hosts.  Please "
+"precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5348
-#, c-format
-msgid "Connecting a minimum of %u peers each (if possible)\n"
-msgstr ""
+#: src/testing/testing_new.c:704
+#, fuzzy, c-format
+msgid "Failed to initialize hostkey for peer %u\n"
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/testing/testing_group.c:5357
-#, c-format
-msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
-msgstr ""
+#: src/testing/testing_new.c:734
+#, fuzzy, c-format
+msgid "Failed to write hostkey file for peer %u: %s\n"
+msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/testing/testing_group.c:5367
-#, c-format
-msgid "Finding additional %u closest peers each (if possible)\n"
-msgstr ""
+#: src/testing/testing_new.c:751
+#, fuzzy, c-format
+msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:650
-#, fuzzy
-msgid "Could not read hostkeys file!\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+#: src/testing/testing_new.c:791
+#, fuzzy, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/testing/testing_group.c:6131
+#: src/testing/testing_new.c:959
 #, fuzzy, c-format
-msgid "Could not create configuration for peer number %u on `%s'!\n"
-msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+msgid "Failed to load configuration from %s\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/topology/gnunet-daemon-topology.c:244
+#: src/topology/gnunet-daemon-topology.c:259
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:380
+#: src/topology/gnunet-daemon-topology.c:392
 #, fuzzy
 msgid "# connect requests issued to transport"
 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:675
-#: src/topology/gnunet-daemon-topology.c:761
+#: src/topology/gnunet-daemon-topology.c:730
+#: src/topology/gnunet-daemon-topology.c:815
 #, fuzzy
 msgid "# friends connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/topology/gnunet-daemon-topology.c:950
+#: src/topology/gnunet-daemon-topology.c:996
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:982
+#: src/topology/gnunet-daemon-topology.c:1026
 #, fuzzy, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/topology/gnunet-daemon-topology.c:994
+#: src/topology/gnunet-daemon-topology.c:1039
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1000
+#: src/topology/gnunet-daemon-topology.c:1045
 #, fuzzy, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/topology/gnunet-daemon-topology.c:1054
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1017
+#: src/topology/gnunet-daemon-topology.c:1062
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1037
+#: src/topology/gnunet-daemon-topology.c:1082
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1050
+#: src/topology/gnunet-daemon-topology.c:1095
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
 
-#: src/topology/gnunet-daemon-topology.c:1060
+#: src/topology/gnunet-daemon-topology.c:1105
 #, 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:1066
+#: src/topology/gnunet-daemon-topology.c:1111
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1076
+#: src/topology/gnunet-daemon-topology.c:1121
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1082
+#: src/topology/gnunet-daemon-topology.c:1127
 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:1089
+#: src/topology/gnunet-daemon-topology.c:1134
 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:1126
+#: src/topology/gnunet-daemon-topology.c:1169
 #, 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:1183
+#: src/topology/gnunet-daemon-topology.c:1224
 #, 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:1323
+#: src/topology/gnunet-daemon-topology.c:1363
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:247
+#: src/transport/gnunet-service-transport_blacklist.c:246
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:254
+#: src/transport/gnunet-service-transport_blacklist.c:252
 #, c-format
 msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
+#: src/transport/gnunet-service-transport_blacklist.c:263
 #, fuzzy, c-format
 msgid "Failed to read blacklist from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
+#: src/transport/gnunet-service-transport_blacklist.c:284
+#: src/transport/gnunet-service-transport_blacklist.c:308
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
+#: src/transport/gnunet-service-transport_blacklist.c:295
+#: src/transport/gnunet-service-transport_blacklist.c:331
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:350
+#: src/transport/gnunet-service-transport_blacklist.c:345
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:364
+#: src/transport/gnunet-service-transport_blacklist.c:359
 #, c-format
 msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:523
-#: src/transport/gnunet-service-transport_blacklist.c:764
+#: src/transport/gnunet-service-transport_blacklist.c:514
+#: src/transport/gnunet-service-transport_blacklist.c:747
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:158
+#: src/transport/gnunet-service-transport.c:163
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/transport/gnunet-service-transport.c:572
+#: src/transport/gnunet-service-transport.c:237
+#, fuzzy
+msgid "# bytes total received"
+msgstr "# tổng số nội dung lỗ hổng được nhận"
+
+#: src/transport/gnunet-service-transport.c:284
+#, fuzzy
+msgid "# bytes payload received"
+msgstr "# các byte đã giải mã"
+
+#: src/transport/gnunet-service-transport.c:582
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:581
+#: src/transport/gnunet-service-transport.c:591
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:353
+#: src/transport/gnunet-service-transport_clients.c:352
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:358
+#: src/transport/gnunet-service-transport_clients.c:357
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_clients.c:510
+#: src/transport/gnunet-service-transport_clients.c:503
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:628
-#, fuzzy
-msgid "# bytes payload received for other peers"
-msgstr "# các byte kiểu %d được nhận"
-
-#: src/transport/gnunet-service-transport_clients.c:645
+#: src/transport/gnunet-service-transport_clients.c:631
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:696
+#: src/transport/gnunet-service-transport_clients.c:682
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -4385,616 +4704,565 @@ msgstr "# các thông báo PONG đã mật mã được nhận"
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:482
-msgid "# failed connection attempts due to timeout"
-msgstr ""
+#: src/transport/gnunet-service-transport_neighbours.c:1032
+#, fuzzy
+msgid "# DISCONNECT messages sent"
+msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:883
+#: src/transport/gnunet-service-transport_neighbours.c:1148
+#: src/transport/gnunet-service-transport_neighbours.c:1482
 #, fuzzy
-msgid "# peers disconnected due to external request"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+msgid "# bytes in message queue for other peers"
+msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:966
+#: src/transport/gnunet-service-transport_neighbours.c:1153
 #, fuzzy
-msgid "# fast reconnects failed"
-msgstr "# của các đồng đẳng đã kết nối"
+msgid "# messages transmitted to other peers"
+msgstr "# các byte kiểu %d được gửi "
 
-#: src/transport/gnunet-service-transport_neighbours.c:1022
+#: src/transport/gnunet-service-transport_neighbours.c:1158
 #, fuzzy
-msgid "# peers disconnected due to timeout"
-msgstr "# các kết nối bị đóng (vấn đề truyền tải)"
+msgid "# transmission failures for messages to other peers"
+msgstr "# các byte thông báo gửi đi bị loại bỏ"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1215
+msgid "# messages timed out while in transport queue"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1254
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# các khoá phiên chạy được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1088
+#: src/transport/gnunet-service-transport_neighbours.c:1278
 #, fuzzy
-msgid "# peers disconnected due to global disconnect"
-msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
+msgid "# KEEPALIVE messages discarded (peer unknown)"
+msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1888
-#: src/transport/gnunet-service-transport_neighbours.c:1909
+#: src/transport/gnunet-service-transport_neighbours.c:1286
 #, fuzzy
-msgid "# messages not sent (no such peer or not connected)"
+msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1925
+#: src/transport/gnunet-service-transport_neighbours.c:1323
 #, fuzzy
-msgid "# bytes in message queue for other peers"
-msgstr "# các byte thông báo gửi đi bị loại bỏ"
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1977
+#: src/transport/gnunet-service-transport_neighbours.c:1332
+#, fuzzy
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+msgstr "# các thông báo được chắp liền"
+
+#: src/transport/gnunet-service-transport_neighbours.c:1388
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2013
+#: src/transport/gnunet-service-transport_neighbours.c:1422
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "theo dõi gnunetd sử dụng dải thông"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2031
+#: src/transport/gnunet-service-transport_neighbours.c:1438
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2060
+#: src/transport/gnunet-service-transport_neighbours.c:2544
 #, fuzzy
-msgid "# KEEPALIVE messages discarded (not connected)"
-msgstr "# các thông báo được chắp liền"
+msgid "# unexpected CONNECT_ACK messages (no peer)"
+msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2113
+#: src/transport/gnunet-service-transport_neighbours.c:2559
+#: src/transport/gnunet-service-transport_neighbours.c:2585
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
-msgstr "# các thông báo được chắp liền"
+msgid "# unexpected CONNECT_ACK messages (not ready)"
+msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2121
+#: src/transport/gnunet-service-transport_neighbours.c:2598
 #, fuzzy
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
-msgstr "# các thông báo được chắp liền"
+msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
+msgstr "gửi ĐẾM thông báo"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2627
+#, fuzzy
+msgid "# unexpected CONNECT_ACK messages (disconnecting)"
+msgstr "gửi ĐẾM thông báo"
+
+#: src/transport/gnunet-service-transport_neighbours.c:2807
+#, fuzzy
+msgid "# unexpected SESSION ACK messages"
+msgstr "# các thông báo PONG đã mật mã được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2187
+#: src/transport/gnunet-service-transport_neighbours.c:2856
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2205
+#: src/transport/gnunet-service-transport_neighbours.c:2870
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2323
+#: src/transport/gnunet-service-transport_neighbours.c:2901
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2336
+#: src/transport/gnunet-service-transport_neighbours.c:2912
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2411
-#, fuzzy
-msgid "# unexpected CONNECT_ACK messages (no peer)"
-msgstr "gửi ĐẾM thông báo"
+#: src/transport/gnunet-service-transport_neighbours.c:2943
+msgid "# other peer asked to disconnect from us"
+msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2453
+#: src/transport/gnunet-service-transport_neighbours.c:3020
 #, fuzzy
-msgid "# unexpected CONNECT_ACK messages"
-msgstr "gửi ĐẾM thông báo"
-
-#: src/transport/gnunet-service-transport_neighbours.c:2544
-#, fuzzy
-msgid "# unexpected ACK messages"
-msgstr "# các thông báo PONG đã mật mã được gửi"
+msgid "# disconnected from peer upon explicit request"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
 #: src/transport/gnunet-service-transport_plugins.c:111
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:118
-#, fuzzy, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr "Đang nạp các truyền tải « %s »\n"
-
-#: src/transport/gnunet-service-transport_plugins.c:122
-#, fuzzy, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr "Đang nạp các truyền tải « %s »\n"
-
-#: src/transport/gnunet-service-transport_plugins.c:150
-#, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
-
-#: src/transport/gnunet-service-transport_validation.c:410
+#: src/transport/gnunet-service-transport_validation.c:414
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:459
+#: src/transport/gnunet-service-transport_validation.c:463
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:508
+#: src/transport/gnunet-service-transport_validation.c:512
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# các thông báo PONG nhập thô được gửi"
 
-#: src/transport/gnunet-service-transport_validation.c:566
+#: src/transport/gnunet-service-transport_validation.c:570
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:798
+#: src/transport/gnunet-service-transport_validation.c:805
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_validation.c:833
+#: src/transport/gnunet-service-transport_validation.c:840
 #, c-format
 msgid ""
 "Not confirming PING with address `%s' since I cannot confirm having this "
 "address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:919
+#: src/transport/gnunet-service-transport_validation.c:924
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:928
+#: src/transport/gnunet-service-transport_validation.c:933
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1050
+#: src/transport/gnunet-service-transport_validation.c:1055
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1080
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1134
+#: src/transport/gnunet-service-transport_validation.c:1136
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:256
+#: src/transport/gnunet-transport.c:260
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:269
+#: src/transport/gnunet-transport.c:273
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:319
+#: src/transport/gnunet-transport.c:323
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:326
+#: src/transport/gnunet-transport.c:330
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:359
+#: src/transport/gnunet-transport.c:363
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/gnunet-transport.c:379
+#: src/transport/gnunet-transport.c:383
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/transport/gnunet-transport.c:410
+#: src/transport/gnunet-transport.c:414
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:439
+#: src/transport/gnunet-transport.c:443
 #, fuzzy, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:453
+#: src/transport/gnunet-transport.c:466
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:483
+#: src/transport/gnunet-transport.c:473
+#, c-format
+msgid "Peer `%s': %s <unable to resolve address>\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:501
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/transport/gnunet-transport.c:539
+#: src/transport/gnunet-transport.c:569
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/transport/gnunet-transport.c:587
+#: src/transport/gnunet-transport.c:618
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:590
+#: src/transport/gnunet-transport.c:621
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:593
+#: src/transport/gnunet-transport.c:624
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:596
+#: src/transport/gnunet-transport.c:627
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:599
+#: src/transport/gnunet-transport.c:630
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:603
+#: src/transport/gnunet-transport.c:634
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:606
+#: src/transport/gnunet-transport.c:637
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:614
+#: src/transport/gnunet-transport.c:645
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/plugin_transport_http.c:981
+#: src/transport/plugin_transport_http.c:1100
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1029
+#: src/transport/plugin_transport_http.c:1149
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/transport/plugin_transport_http.c:1054 src/util/service.c:986
+#: src/transport/plugin_transport_http.c:1174 src/util/service.c:1036
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_http.c:1071 src/util/service.c:1003
+#: src/transport/plugin_transport_http.c:1191 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/plugin_transport_http.c:1176
+#: src/transport/plugin_transport_http.c:1296
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1189
+#: src/transport/plugin_transport_http.c:1309
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1264
+#: src/transport/plugin_transport_http.c:1386
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1277
+#: src/transport/plugin_transport_http.c:1399
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/transport/plugin_transport_http.c:1288
+#: src/transport/plugin_transport_http.c:1410
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1308
+#: src/transport/plugin_transport_http.c:1430
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1338
+#: src/transport/plugin_transport_http.c:1460
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:621
+#: src/transport/plugin_transport_http_client.c:624
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:189
+#: src/transport/plugin_transport_http_server.c:178
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:213
+#: src/transport/plugin_transport_http_server.c:202
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:370
-#, c-format
-msgid "Received malformed message via %s. Ignored.\n"
-msgstr "Nhận được thông báo dạng sai qua %s. Bị bỏ qua.\n"
-
-#: src/transport/plugin_transport_smtp.c:457
-msgid "SMTP filter string to invalid, lacks ': '\n"
-msgstr "Chuỗi lọc vào SMTP không hợp lệ, còn thiếu « : »\n"
-
-#: src/transport/plugin_transport_smtp.c:466
-#, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
-msgstr "Chuỗi lọc vào SMTP quá dài, tối đa « %s »\n"
-
-#: src/transport/plugin_transport_smtp.c:561
-#: src/transport/plugin_transport_smtp.c:571
-#: src/transport/plugin_transport_smtp.c:584
-#: src/transport/plugin_transport_smtp.c:603
-#: src/transport/plugin_transport_smtp.c:626
-#: src/transport/plugin_transport_smtp.c:634
-#: src/transport/plugin_transport_smtp.c:647
-#: src/transport/plugin_transport_smtp.c:658
-#, c-format
-msgid "SMTP: `%s' failed: %s.\n"
-msgstr "SMTP: « %s » bị lỗi: %s\n"
-
-#: src/transport/plugin_transport_smtp.c:801
-msgid "No email-address specified, can not start SMTP transport.\n"
-msgstr "Chưa ghi rõ địa chỉ thư điện tử nên không tạo được truyền tải SMTP.\n"
-
-#: src/transport/plugin_transport_smtp.c:813
-msgid "# bytes received via SMTP"
-msgstr "# các byte đã nhận qua SMTP"
-
-#: src/transport/plugin_transport_smtp.c:814
-msgid "# bytes sent via SMTP"
-msgstr "# các byte đã gửi qua SMTP"
-
-#: src/transport/plugin_transport_smtp.c:816
-msgid "# bytes dropped by SMTP (outgoing)"
-msgstr "# các byte loại đi bởi SMTP (đi ra)"
-
-#: src/transport/plugin_transport_tcp.c:512
+#: src/transport/plugin_transport_tcp.c:591
 #, fuzzy, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/transport/plugin_transport_tcp.c:616
-#: src/transport/plugin_transport_tcp.c:705
-#: src/transport/plugin_transport_tcp.c:757
-#: src/transport/plugin_transport_tcp.c:830
-#: src/transport/plugin_transport_tcp.c:909
+#: src/transport/plugin_transport_tcp.c:767
+#: src/transport/plugin_transport_tcp.c:856
+#: src/transport/plugin_transport_tcp.c:906
+#: src/transport/plugin_transport_tcp.c:992
+#: src/transport/plugin_transport_tcp.c:1086
+#: src/transport/plugin_transport_tcp.c:1103
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:622
-#: src/transport/plugin_transport_tcp.c:856
-#: src/transport/plugin_transport_tcp.c:1561
+#: src/transport/plugin_transport_tcp.c:774
+#: src/transport/plugin_transport_tcp.c:963
+#: src/transport/plugin_transport_tcp.c:1761
+#: src/transport/plugin_transport_tcp.c:2390
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_tcp.c:709
+#: src/transport/plugin_transport_tcp.c:860
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:760
+#: src/transport/plugin_transport_tcp.c:909
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:834
+#: src/transport/plugin_transport_tcp.c:996
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1081
+#: src/transport/plugin_transport_tcp.c:1290
 #, fuzzy, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/transport/plugin_transport_tcp.c:1116
-msgid "Found valid IPv4 NAT address (creating session)!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1186
+#: src/transport/plugin_transport_tcp.c:1401
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1603
+#: src/transport/plugin_transport_tcp.c:1802
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_tcp.c:1756
+#: src/transport/plugin_transport_tcp.c:1973
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:1823
+#: src/transport/plugin_transport_tcp.c:2043
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
+#: src/transport/plugin_transport_tcp.c:2279 src/util/service.c:940
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1976
+#: src/transport/plugin_transport_tcp.c:2293
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2039
+#: src/transport/plugin_transport_tcp.c:2355
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/plugin_transport_tcp.c:2062
+#: src/transport/plugin_transport_tcp.c:2378
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2066
+#: src/transport/plugin_transport_tcp.c:2382
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2386
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:130
+#: src/transport/plugin_transport_udp_broadcasting.c:128
 #, fuzzy
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:172
+#: src/transport/plugin_transport_udp_broadcasting.c:169
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:393
+#: src/transport/plugin_transport_udp_broadcasting.c:367
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1985
+#: src/transport/plugin_transport_udp.c:1894
+#, c-format
+msgid ""
+"UDP could not message to `%s': `%s'. Please check your network configuration "
+"and disable IPv6 if your connection does not have a global IPv6 address\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2138
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_udp.c:2068
+#: src/transport/plugin_transport_udp.c:2306
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2112
+#: src/transport/plugin_transport_udp.c:2349
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/transport/plugin_transport_unix.c:1051
+#: src/transport/plugin_transport_unix.c:1356
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_wlan.c:875
+#: src/transport/plugin_transport_wlan.c:561
+msgid "# WLAN ACKs sent"
+msgstr ""
+
+#: src/transport/plugin_transport_wlan.c:580
 #, fuzzy
-msgid "# wlan session timeouts"
-msgstr "# các khoá phiên chạy được chấp nhận"
+msgid "# WLAN messages defragmented"
+msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:899
+#: src/transport/plugin_transport_wlan.c:626
+#: src/transport/plugin_transport_wlan.c:676
+#: src/transport/plugin_transport_wlan.c:1696
 #, fuzzy
-msgid "# wlan session created"
+msgid "# WLAN sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_wlan.c:980
-#: src/transport/plugin_transport_wlan.c:1138
-#: src/transport/plugin_transport_wlan.c:1159
-#: src/transport/plugin_transport_wlan.c:1190
-#: src/transport/plugin_transport_wlan.c:2334
-#: src/transport/plugin_transport_wlan.c:3142
-msgid "# wlan pending sessions"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:1233
-#: src/transport/plugin_transport_wlan.c:1888
+#: src/transport/plugin_transport_wlan.c:749
 #, fuzzy
-msgid "# wlan pending fragments"
-msgstr "# các mảnh bị loại bỏ"
-
-#: src/transport/plugin_transport_wlan.c:1388
-#, c-format
-msgid ""
-"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
-msgstr ""
+msgid "# WLAN message fragments sent"
+msgstr "# các thông báo bị tế phân"
 
-#: src/transport/plugin_transport_wlan.c:1732
-msgid "# wlan hello beacons send"
+#: src/transport/plugin_transport_wlan.c:767
+msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1765
-#: src/transport/plugin_transport_wlan.c:1968
-#: src/transport/plugin_transport_wlan.c:2059
-#, c-format
-msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:867
+#: src/transport/plugin_transport_wlan.c:948
+#: src/transport/plugin_transport_wlan.c:1698
+#, fuzzy
+msgid "# WLAN MAC endpoints allocated"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1954
-msgid "# wlan acks send"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:1119
+#, fuzzy
+msgid "# HELLO messages received via WLAN"
+msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2025
+#: src/transport/plugin_transport_wlan.c:1140
 #, fuzzy
-msgid "# wlan fragments send"
+msgid "# fragments received via WLAN"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:2161
-#, c-format
-msgid "Wlan Address len %d is wrong\n"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:2295
-#: src/transport/plugin_transport_wlan.c:2919
-#: src/transport/plugin_transport_wlan.c:3145
-msgid "# wlan mac endpoints"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:1150
+#, fuzzy
+msgid "# ACKs received via WLAN"
+msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_wlan.c:2517
+#: src/transport/plugin_transport_wlan.c:1207
 #, fuzzy
-msgid "# wlan whole messages received"
-msgstr "# các thông báo phát hiện dht được nhận"
+msgid "# WLAN DATA messages discarded due to CRC32 error"
+msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:2708
+#: src/transport/plugin_transport_wlan.c:1306
 #, fuzzy
-msgid "# wlan hello messages received"
-msgstr "# các thông báo phát hiện dht được nhận"
+msgid "# DATA messages received via WLAN"
+msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2742
+#: src/transport/plugin_transport_wlan.c:1341
 #, fuzzy
-msgid "# wlan fragments received"
-msgstr "# các mảnh bị loại bỏ"
+msgid "# WLAN DATA messages processed"
+msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:2790
+#: src/transport/plugin_transport_wlan.c:1402
 #, fuzzy
-msgid "# wlan acks received"
-msgstr "# các yêu cầu khách lỗ hổng được nhận"
+msgid "# HELLO beacons sent via WLAN"
+msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_wlan.c:2879
-msgid "# wlan mac endpoints timeouts"
+#: src/transport/plugin_transport_wlan.c:1511
+msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2903
-#, fuzzy
-msgid "# wlan mac endpoints created"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
+#: src/transport/plugin_transport_wlan.c:1668
+#, fuzzy, c-format
+msgid "Invalid configuration option `%s' in section `%s'\n"
+msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/transport/plugin_transport_wlan.c:2956
-msgid "# wlan WLAN_HELPER_DATA received"
+#: src/transport/plugin_transport_wlan.c:1677
+#, c-format
+msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3010
-#, fuzzy
-msgid "# wlan messages for this client received"
-msgstr "# các thông báo phát hiện dht được nhận"
-
-#: src/transport/plugin_transport_wlan.c:3021
-#, fuzzy
-msgid "# wlan messages inside WLAN_HELPER_DATA received"
-msgstr "# các thông báo phát hiện dht được nhận"
+#: src/transport/plugin_transport_wlan.c:1687
+#, fuzzy, c-format
+msgid "Missing configuration option `%s' in section `%s'\n"
+msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/transport/transport_api.c:588
+#: src/transport/transport_api.c:570
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Nhận được thông báo bị hỏng từ đồng đẳng « %s » trong %s:%d.\n"
@@ -5028,89 +5296,89 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:304
+#: src/util/client.c:359
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:312
+#: src/util/client.c:367
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:657
+#: src/util/client.c:685
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:717 src/util/service.c:919
+#: src/util/client.c:740 src/util/service.c:970
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:859
+#: src/util/client.c:882
 #, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/util/client.c:875
+#: src/util/client.c:896
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/client.c:1143
+#: src/util/client.c:1149
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:889
+#: src/util/common_logging.c:239 src/util/common_logging.c:890
 msgid "DEBUG"
 msgstr "GỠ LỖI"
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:887
+#: src/util/common_logging.c:241 src/util/common_logging.c:888
 msgid "INFO"
 msgstr "TIN"
 
-#: src/util/common_logging.c:243 src/util/common_logging.c:885
+#: src/util/common_logging.c:243 src/util/common_logging.c:886
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/common_logging.c:245 src/util/common_logging.c:883
+#: src/util/common_logging.c:245 src/util/common_logging.c:884
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/common_logging.c:247 src/util/common_logging.c:891
+#: src/util/common_logging.c:247 src/util/common_logging.c:892
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:609
+#: src/util/common_logging.c:610
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/util/common_logging.c:724
+#: src/util/common_logging.c:725
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n"
 
-#: src/util/common_logging.c:892
+#: src/util/common_logging.c:893
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:991
+#: src/util/common_logging.c:992
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1029
+#: src/util/common_logging.c:1030
 msgid "invalid address"
 msgstr ""
 
-#: src/util/configuration.c:245
+#: src/util/configuration.c:244
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
 
-#: src/util/configuration.c:817
+#: src/util/configuration.c:816
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -5119,45 +5387,38 @@ msgstr ""
 "Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong "
 "tập hợp các sự chọn được phép\n"
 
-#: src/util/connection.c:460
+#: src/util/connection.c:420
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/util/connection.c:475
+#: src/util/connection.c:435
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:629
+#: src/util/connection.c:550
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
 
-#: src/util/connection.c:821 src/util/connection.c:992
+#: src/util/connection.c:739 src/util/connection.c:909
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/util/connection.c:830
+#: src/util/connection.c:748
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' (%p)\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/util/connection.c:983
+#: src/util/connection.c:900
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Lỗi kết nối\n"
 
-#: src/util/connection.c:1465
-#, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
-msgstr ""
-
-#: src/util/container_bloomfilter.c:507
+#: src/util/container_bloomfilter.c:510
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -5174,129 +5435,129 @@ msgstr ""
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#: src/util/crypto_rsa.c:661 src/util/crypto_rsa.c:708
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/util/crypto_rsa.c:623
+#: src/util/crypto_rsa.c:666
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
 
-#: src/util/crypto_rsa.c:641
+#: src/util/crypto_rsa.c:684
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+#: src/util/crypto_rsa.c:712 src/util/crypto_rsa.c:748
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:700
+#: src/util/crypto_rsa.c:743
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:720
+#: src/util/crypto_rsa.c:763
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
 
-#: src/util/crypto_rsa.c:738
+#: src/util/crypto_rsa.c:781
 #, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:959
+#: src/util/crypto_rsa.c:1032
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/util/disk.c:479
+#: src/util/disk.c:498
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/disk.c:1087
+#: src/util/disk.c:1062
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Mong đợi « %s » là một thư mục.\n"
 
-#: src/util/disk.c:1441 src/util/service.c:1580
+#: src/util/disk.c:1416 src/util/service.c:1650
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Không thể lấy thông tin về người dùng « %s »: %s\n"
 
-#: src/util/disk.c:1759
+#: src/util/disk.c:1734
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
-#: src/util/getopt.c:672
+#: src/util/getopt.c:669
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/util/getopt.c:696
+#: src/util/getopt.c:693
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: tùy chọn « --%s » không cho phép đối số\n"
 
-#: src/util/getopt.c:701
+#: src/util/getopt.c:698
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n"
 
-#: src/util/getopt.c:718 src/util/getopt.c:886
+#: src/util/getopt.c:715 src/util/getopt.c:883
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: tùy chọn « %s » cần thiết đối số\n"
 
-#: src/util/getopt.c:747
+#: src/util/getopt.c:744
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: không nhận ra tùy chọn « --%s »\n"
 
-#: src/util/getopt.c:751
+#: src/util/getopt.c:748
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: không nhận ra tùy chọn « %c%s »\n"
 
-#: src/util/getopt.c:776
+#: src/util/getopt.c:773
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: tùy chọn không được phép -- %c\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: tùy chọn không hợp lệ -- %c\n"
 
-#: src/util/getopt.c:806 src/util/getopt.c:934
+#: src/util/getopt.c:803 src/util/getopt.c:931
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: tùy chọn cần thiết đối số -- %c\n"
 
-#: src/util/getopt.c:854
+#: src/util/getopt.c:851
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
 
-#: src/util/getopt.c:872
+#: src/util/getopt.c:869
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
 
-#: src/util/getopt.c:1038
+#: src/util/getopt.c:1035
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr ""
 "Hãy sử dụng câu lệnh trợ giúp « --help » để xem danh sách các tùy chọn.\n"
 
-#: src/util/getopt_helpers.c:84
+#: src/util/getopt_helpers.c:86
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -5304,7 +5565,7 @@ msgstr ""
 "Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn "
 "ngắn.\n"
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
+#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:286
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
@@ -5317,6 +5578,27 @@ msgstr ""
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
+#: src/util/gnunet-rsa.c:64
+#, c-format
+msgid "No hostkey file specified on command line\n"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:112
+msgid "print the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:115
+msgid "print the hash of the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:118
+msgid "print the short hash of the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:124
+msgid "Manipulate GNUnet private RSA key files"
+msgstr ""
+
 #: src/util/gnunet-service-resolver.c:288
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
@@ -5328,42 +5610,37 @@ msgstr "Không thể giải quyết « %s » (%s): %s\n"
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
-#: src/util/gnunet-service-resolver.c:494
-#, c-format
-msgid "Resolver asked to look up `%s'.\n"
-msgstr ""
-
-#: src/util/gnunet-service-resolver.c:529
-#, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
-msgstr ""
-
-#: src/util/helper.c:239
+#: src/util/helper.c:244
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/helper.c:254
+#: src/util/helper.c:259
 #, c-format
 msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/util/helper.c:264
+#: src/util/helper.c:269
 #, fuzzy, c-format
 msgid "Got %u bytes from helper `%s'\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/util/helper.c:273
+#: src/util/helper.c:278
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/helper.c:432
+#: src/util/helper.c:310
+#, fuzzy, c-format
+msgid "Starting HELPER process `%s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/util/helper.c:440
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/network.c:1196
+#: src/util/network.c:1200
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -5391,12 +5668,12 @@ msgstr "SMTP: « %s » bị lỗi: %s\n"
 msgid "stat (%s) failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/util/os_priority.c:304
+#: src/util/os_priority.c:305
 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for reading: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/util/os_priority.c:305
+#: src/util/os_priority.c:306
 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for writing: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -5421,12 +5698,12 @@ 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/pseudonym.c:273
+#: src/util/pseudonym.c:276
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Lỗi phân tích dữ liệu giao diện từ « %s ».\n"
 
-#: src/util/pseudonym.c:338
+#: src/util/pseudonym.c:407 src/util/pseudonym.c:433
 msgid "no-name"
 msgstr "không-tên"
 
@@ -5441,187 +5718,167 @@ msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:351
+#: src/util/resolver_api.c:347
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/util/resolver_api.c:355
+#: src/util/resolver_api.c:351
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "không quyết định các tên máy"
 
-#: src/util/resolver_api.c:426
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:807
-#, c-format
-msgid "Resolver returns `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:901
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
-msgstr ""
-
-#: src/util/resolver_api.c:906
+#: src/util/resolver_api.c:890
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/resolver_api.c:938
-#, c-format
-msgid "Resolving our hostname `%s'\n"
-msgstr ""
-
-#: src/util/scheduler.c:866
+#: src/util/scheduler.c:786
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:996
+#: src/util/scheduler.c:916
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:397
+#: src/util/server.c:483
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/server.c:406
+#: src/util/server.c:492
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/util/server.c:411
+#: src/util/server.c:497
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/util/server.c:640
+#: src/util/server.c:827
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
-#: src/util/service.c:207 src/util/service.c:214
+#: src/util/service.c:135 src/util/service.c:161 src/util/service.c:204
+#: src/util/service.c:225 src/util/service.c:232
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/service.c:170
+#: src/util/service.c:188
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
 
-#: src/util/service.c:263
+#: src/util/service.c:281
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
 
-#: src/util/service.c:296
+#: src/util/service.c:313
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/service.c:326
+#: src/util/service.c:343
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/service.c:668
+#: src/util/service.c:698
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:673
+#: src/util/service.c:703
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "\tKhông rõ miền tên « %s »\n"
 
-#: src/util/service.c:680
+#: src/util/service.c:710
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:724
+#: src/util/service.c:765
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:752
+#: src/util/service.c:802
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:869
+#: src/util/service.c:920
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:939
+#: src/util/service.c:990
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:956
+#: src/util/service.c:1007
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1191
+#: src/util/service.c:1241
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1242 src/util/service.c:1260
+#: src/util/service.c:1292 src/util/service.c:1310
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1287
+#: src/util/service.c:1337
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1442
+#: src/util/service.c:1506
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/service.c:1475
+#: src/util/service.c:1539
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Đồng đẳng « %s » có mức tin cậy %8u\n"
 
-#: src/util/service.c:1521
+#: src/util/service.c:1588
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1525
+#: src/util/service.c:1592
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1529
+#: src/util/service.c:1596
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1581
+#: src/util/service.c:1651
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/util/service.c:1594
+#: src/util/service.c:1664
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n"
 
-#: src/util/service.c:1657
+#: src/util/service.c:1729
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5630,56 +5887,77 @@ msgstr ""
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/strings.c:143
+#: src/util/strings.c:144
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:354
+#: src/util/strings.c:334
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:462
+#: src/util/strings.c:481
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Lỗi mở rộng biến môi trường « $HOME »: chưa đặt biến môi trường « HOME »"
 
-#: src/util/strings.c:554
+#: src/util/strings.c:573
 msgid "ms"
 msgstr "mg"
 
-#: src/util/strings.c:559
+#: src/util/strings.c:578
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:563
+#: src/util/strings.c:582
 msgid "s"
 msgstr "g"
 
-#: src/util/strings.c:567
+#: src/util/strings.c:586
 msgid "m"
 msgstr "p"
 
-#: src/util/strings.c:571
+#: src/util/strings.c:590
 msgid "h"
 msgstr "g"
 
-#: src/util/strings.c:575
+#: src/util/strings.c:594
 msgid " days"
 msgstr " ngày"
 
-#: src/util/strings.c:599
+#: src/util/strings.c:618
 msgid "end of time"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
+#: src/util/strings.c:1012
+msgid "IPv6 address did not start with `['\n"
+msgstr ""
+
+#: src/util/strings.c:1020
+msgid "IPv6 address did contain ':' to separate port number\n"
+msgstr ""
+
+#: src/util/strings.c:1026
+msgid "IPv6 address did contain ']' before ':' to separate port number\n"
+msgstr ""
+
+#: src/util/strings.c:1033
+msgid "IPv6 address did contain a valid port number after the last ':'\n"
+msgstr ""
+
+#: src/util/strings.c:1042
+#, fuzzy, c-format
+msgid "Invalid IPv6 address `%s': %s\n"
+msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
+
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1071
 #, fuzzy
 msgid "# Active tunnels"
 msgstr "# các kết nối dht"
 
 #: src/vpn/gnunet-service-vpn.c:608 src/vpn/gnunet-service-vpn.c:645
 #, fuzzy
-msgid "# Peers connected to mesh tunnels"
+msgid "# peers connected to mesh tunnels"
 msgstr "# của các đồng đẳng đã kết nối"
 
 #: src/vpn/gnunet-service-vpn.c:699
@@ -5702,75 +5980,75 @@ msgstr "# các truy vấn lỗ hổng được định tuyến"
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/vpn/gnunet-service-vpn.c:967
+#: src/vpn/gnunet-service-vpn.c:973
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1285
+#: src/vpn/gnunet-service-vpn.c:1291
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1306
+#: src/vpn/gnunet-service-vpn.c:1312
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1517
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
+#: src/vpn/gnunet-service-vpn.c:1555 src/vpn/gnunet-service-vpn.c:1596
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1600
+#: src/vpn/gnunet-service-vpn.c:1606
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1614
+#: src/vpn/gnunet-service-vpn.c:1620
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1697
+#: src/vpn/gnunet-service-vpn.c:1704
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2038
+#: src/vpn/gnunet-service-vpn.c:2045
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2196
+#: src/vpn/gnunet-service-vpn.c:2203
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2347
+#: src/vpn/gnunet-service-vpn.c:2354
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2402
+#: src/vpn/gnunet-service-vpn.c:2409
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
+#: src/vpn/gnunet-service-vpn.c:2448 src/vpn/gnunet-service-vpn.c:2661
 #, fuzzy
 msgid "# Active destinations"
 msgstr "# các kết nối dht"
 
-#: src/vpn/gnunet-service-vpn.c:2726
+#: src/vpn/gnunet-service-vpn.c:2734
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3141
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3165
+#: src/vpn/gnunet-service-vpn.c:3173
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -5846,22 +6124,171 @@ msgstr "# các byte đã nhận qua UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
-#: src/include/gnunet_common.h:490
+#: src/include/gnunet_common.h:497 src/include/gnunet_common.h:502
+#: src/include/gnunet_common.h:508
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:500
+#: src/include/gnunet_common.h:518
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
+#: src/include/gnunet_common.h:539 src/include/gnunet_common.h:546
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
+#~ msgid "Received malformed message via %s. Ignored.\n"
+#~ msgstr "Nhận được thông báo dạng sai qua %s. Bị bỏ qua.\n"
+
+#~ msgid "SMTP filter string to invalid, lacks ': '\n"
+#~ msgstr "Chuỗi lọc vào SMTP không hợp lệ, còn thiếu « : »\n"
+
+#~ msgid "SMTP filter string to long, capped to `%s'\n"
+#~ msgstr "Chuỗi lọc vào SMTP quá dài, tối đa « %s »\n"
+
+#~ msgid "SMTP: `%s' failed: %s.\n"
+#~ msgstr "SMTP: « %s » bị lỗi: %s\n"
+
+#~ msgid "No email-address specified, can not start SMTP transport.\n"
+#~ msgstr ""
+#~ "Chưa ghi rõ địa chỉ thư điện tử nên không tạo được truyền tải SMTP.\n"
+
+#~ msgid "# bytes received via SMTP"
+#~ msgstr "# các byte đã nhận qua SMTP"
+
+#~ msgid "# bytes sent via SMTP"
+#~ msgstr "# các byte đã gửi qua SMTP"
+
+#~ msgid "# bytes dropped by SMTP (outgoing)"
+#~ msgstr "# các byte loại đi bởi SMTP (đi ra)"
+
+#, fuzzy
+#~ msgid "# Peers connected"
+#~ msgstr "# của các đồng đẳng đã kết nối"
+
+#, fuzzy
+#~ msgid "%s failed for `%s' at %s:%d: `%s'\n"
+#~ msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+
+#, fuzzy
+#~ msgid "Failed to transmit shutdown ACK.\n"
+#~ msgstr "Lỗi bắt đầu thu thập.\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize Postgres with configuration `%s': %s"
+#~ msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#, fuzzy
+#~ msgid "Failed to transmit message to `%s' service.\n"
+#~ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#, fuzzy
+#~ msgid "Target is %d connections per peer."
+#~ msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
+
+#~ msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
+#~ msgstr ""
+#~ "Đang kết nối các điểm nút theo địa hình học hình xuyến hai chiều: %u "
+#~ "hàng, %u cột\n"
+
+#, fuzzy
+#~ msgid "Copying file with RENAME (%s,%s)\n"
+#~ msgstr "« %s » thất bại với mã lỗi %s: %s\n"
+
+#, fuzzy
+#~ msgid "Copying file with command scp %s %s\n"
+#~ msgstr "« %s » thất bại với mã lỗi %s: %s\n"
+
+#, fuzzy
+#~ msgid "Finished copying all blacklist files!\n"
+#~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#, fuzzy
+#~ msgid "Offering HELLO of peer %s to peer %s\n"
+#~ msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
+
+#, fuzzy
+#~ msgid "Failed during blacklist file copying!\n"
+#~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#, fuzzy
+#~ msgid "# bytes payload received for other peers"
+#~ msgstr "# các byte kiểu %d được nhận"
+
+#, fuzzy
+#~ msgid "# fast reconnects failed"
+#~ msgstr "# của các đồng đẳng đã kết nối"
+
+#, fuzzy
+#~ msgid "# peers disconnected due to timeout"
+#~ msgstr "# các kết nối bị đóng (vấn đề truyền tải)"
+
+#, fuzzy
+#~ msgid "# peers disconnected due to global disconnect"
+#~ msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
+
+#, fuzzy
+#~ msgid "# messages not sent (no such peer or not connected)"
+#~ msgstr "# các thông báo được chắp liền"
+
+#, fuzzy
+#~ msgid "# unexpected CONNECT_ACK messages"
+#~ msgstr "gửi ĐẾM thông báo"
+
+#, fuzzy
+#~ msgid "# wlan session timeouts"
+#~ msgstr "# các khoá phiên chạy được chấp nhận"
+
+#, fuzzy
+#~ msgid "# wlan session created"
+#~ msgstr "# các khoá phiên chạy được chấp nhận"
+
+#, fuzzy
+#~ msgid "# wlan pending fragments"
+#~ msgstr "# các mảnh bị loại bỏ"
+
+#, fuzzy
+#~ msgid "# wlan fragments send"
+#~ msgstr "# các mảnh bị loại bỏ"
+
+#, fuzzy
+#~ msgid "# wlan whole messages received"
+#~ msgstr "# các thông báo phát hiện dht được nhận"
+
+#, fuzzy
+#~ msgid "# wlan hello messages received"
+#~ msgstr "# các thông báo phát hiện dht được nhận"
+
+#, fuzzy
+#~ msgid "# wlan fragments received"
+#~ msgstr "# các mảnh bị loại bỏ"
+
+#, fuzzy
+#~ msgid "# wlan acks received"
+#~ msgstr "# các yêu cầu khách lỗ hổng được nhận"
+
+#, fuzzy
+#~ msgid "# wlan messages for this client received"
+#~ msgstr "# các thông báo phát hiện dht được nhận"
+
+#, fuzzy
+#~ msgid "# wlan messages inside WLAN_HELPER_DATA received"
+#~ msgstr "# các thông báo phát hiện dht được nhận"
+
+#~ msgid "Unknown user `%s'\n"
+#~ msgstr "Không rõ người dùng « %s »\n"
+
+#, fuzzy
+#~ msgid "Namespace `%s' unknown.\n"
+#~ msgstr "Không gian tên « %s » có đánh giá %d.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to statistics service!\n"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+
 #, fuzzy
 #~ msgid "Failed to send to `%s': %s\n"
 #~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -5930,10 +6357,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
 #, fuzzy
-#~ msgid "Service `%s' started\n"
-#~ msgstr "Dịch vụ đã bị xoá.\n"
-
-#, fuzzy
 #~ msgid "Peer `%s' plugin: `%s' address `%s'\n"
 #~ msgstr "Đồng đẳng « %s » có mức tin cậy %8u và địa chỉ « %s »\n"
 
@@ -5966,14 +6389,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
 #, fuzzy
-#~ msgid "Failed to get full path for `%s'\n"
-#~ msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
-
-#, fuzzy
-#~ msgid "Failed to create file for dhtlog.\n"
-#~ msgstr "Lỗi tạo thư mục tạm thời."
-
-#, fuzzy
 #~ msgid "Found peer `%s'\n"
 #~ msgstr "Tôi là đồng đẳng « %s ».\n"
 
@@ -5986,10 +6401,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "Đang nạp các truyền tải « %s »\n"
 
 #, fuzzy
-#~ msgid "Failed to load transport plugin for udp\n"
-#~ msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
-
-#, fuzzy
 #~ msgid "# SET QUOTA messages received"
 #~ msgstr "# các thông báo PONG đã mật mã được nhận"
 
@@ -6030,10 +6441,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
 #, fuzzy
-#~ msgid "Loading HTTP transport plugin `%s'\n"
-#~ msgstr "Đang nạp các truyền tải « %s »\n"
-
-#, fuzzy
 #~ msgid "Failed to load transport plugin for http\n"
 #~ msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
@@ -6097,9 +6504,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "Ok"
 #~ msgstr "OK"
 
-#~ msgid "GNUnet configuration"
-#~ msgstr "Cấu hình GNUnet"
-
 #~ msgid ""
 #~ "Welcome to GNUnet!\n"
 #~ "\n"
@@ -6343,9 +6747,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ "\n"
 #~ "CHƯA lưu các thay đổi trong cấu hình.\n"
 
-#~ msgid "list all network adapters"
-#~ msgstr "liệt kê mọi bộ tiếp hợp mạng"
-
 #~ msgid "install GNUnet as Windows service"
 #~ msgstr "cài đặt GNUnet như là một dịch vụ Windows"
 
@@ -6355,9 +6756,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "display a file's hash value"
 #~ msgstr "hiển thị giá trị tổng kiểm của tập tin"
 
-#~ msgid "GNUnet service installed successfully.\n"
-#~ msgstr "Dịch vụ GNUnet đã được cài đặt.\n"
-
 #~ msgid "This version of Windows doesn't support services.\n"
 #~ msgstr "Phiên bản Windows này không hỗ trợ dịch vụ.\n"
 
@@ -6964,9 +7362,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 #~ msgstr "Câu lệnh « %s » cần đến hai đối số (« %s » và « %s »).\n"
 
-#~ msgid "Unsupported command `%s'.  Aborting.\n"
-#~ msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
-
 #~ msgid "# dht route host lookups performed"
 #~ msgstr "# các việc tra tìm đường tới máy dht được làm"
 
@@ -7314,9 +7709,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr ""
 #~ "Hoàn thành tải xuống tập tin « %s ». Tốc độ là %8.3f KiB một giây.\n"
 
-#~ msgid "no name given"
-#~ msgstr "chưa đưa ra tên"
-
 #~ msgid "Not enough arguments. You must specify a GNUnet file URI\n"
 #~ msgstr "Không đủ đối số. Phải ghi rõ một địa chỉ URI tập tin GNUnet\n"
 
@@ -7329,9 +7721,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "Downloading %d files from directory `%s'.\n"
 #~ msgstr "Đang tải %d tập tin xuống thư mục « %s ».\n"
 
-#~ msgid "Did not find any files in directory `%s'\n"
-#~ msgstr "Không tìm thấy tập tin nào trong thư mục « %s »\n"
-
 #~ msgid "File stored as `%s'.\n"
 #~ msgstr "Tập tin được lưu dạng « %s ».\n"
 
@@ -7399,9 +7788,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "# gap requests total received"
 #~ msgstr "# tổng số yêu cầu lỗ hổng được nhận"
 
-#~ msgid "# gap content total received"
-#~ msgstr "# tổng số nội dung lỗ hổng được nhận"
-
 #~ msgid "# gap total trust awarded"
 #~ msgstr "# tổng số tin cậy lỗ hổng được cấp"
 
@@ -7484,9 +7870,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "Set up multiple gnunetd daemons across multiple hosts."
 #~ msgstr "Thiết lập nhiều trình nền gnunetd qua nhiều máy khác nhau."
 
-#~ msgid "set number of daemons to start"
-#~ msgstr "đặt số trình nền cần khởi chạy"
-
 #~ msgid "Waiting for peers to connect"
 #~ msgstr "Đang đợi các đồng đẳng kết nối"
 
diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo
index 005c77e..6db97d6 100644
--- a/po/zh_CN.gmo
+++ b/po/zh_CN.gmo
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cb4721c..b50a113 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2012-02-28 18:30+0100\n"
+"POT-Creation-Date: 2012-06-05 15:47+0200\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -16,254 +16,269 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:187
+#: src/arm/arm_api.c:165
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:378
+#: src/arm/arm_api.c:349
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/arm/arm_api.c:392
+#: src/arm/arm_api.c:363
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/arm/arm_api.c:467
+#: src/arm/arm_api.c:432
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:523
+#: src/arm/arm_api.c:485
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:524
+#: src/arm/arm_api.c:486
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:546
+#: src/arm/arm_api.c:507
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:548
+#: src/arm/arm_api.c:508
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:581
+#: src/arm/arm_api.c:540
 #, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/arm/arm_api.c:654
+#: src/arm/arm_api.c:612
 #, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:149
+#: src/arm/gnunet-arm.c:159
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:154
+#: src/arm/gnunet-arm.c:164
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:157
+#: src/arm/gnunet-arm.c:167
 #, fuzzy, c-format
 msgid "Service `%s' was already running.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:162
+#: src/arm/gnunet-arm.c:172
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Service `%s' was already being stopped.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:169
+#: src/arm/gnunet-arm.c:179
 #, fuzzy, c-format
 msgid "Service `%s' was already not running.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:173
+#: src/arm/gnunet-arm.c:183
 msgid "Request ignored as ARM is shutting down.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:187
 msgid "Error communicating with ARM service.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:181
+#: src/arm/gnunet-arm.c:191
 msgid "Timeout communicating with ARM service.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:185
+#: src/arm/gnunet-arm.c:195
 msgid "Operation failed.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:189
+#: src/arm/gnunet-arm.c:199
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216
+#: src/arm/gnunet-arm.c:222
+#, fuzzy
+msgid "Error communicating with ARM. ARM not running?\n"
+msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
+
+#: src/arm/gnunet-arm.c:225
+msgid "Running services:\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:249
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/arm/gnunet-arm.c:324
+#: src/arm/gnunet-arm.c:257 src/arm/gnunet-arm.c:357 src/arm/gnunet-arm.c:373
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:247
+#: src/arm/gnunet-arm.c:280
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:253
+#: src/arm/gnunet-arm.c:286
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:355
+#: src/arm/gnunet-arm.c:407
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:357
+#: src/arm/gnunet-arm.c:409
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:359
+#: src/arm/gnunet-arm.c:411
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:361
+#: src/arm/gnunet-arm.c:413
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:364
+#: src/arm/gnunet-arm.c:416
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:419
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:421
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:372
+#: src/arm/gnunet-arm.c:424
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "等待一次迭代完成的时间(毫秒)"
 
-#: src/arm/gnunet-arm.c:383
+#: src/arm/gnunet-arm.c:426
+msgid "List currently running services"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:437
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:328
+#: src/arm/gnunet-service-arm.c:332
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-service-arm.c:331
+#: src/arm/gnunet-service-arm.c:335
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:357
+#: src/arm/gnunet-service-arm.c:361
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:484
+#: src/arm/gnunet-service-arm.c:393
+#, fuzzy
+msgid "Could not send list result to client\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/arm/gnunet-service-arm.c:523
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户："
 
-#: src/arm/gnunet-service-arm.c:506
+#: src/arm/gnunet-service-arm.c:545
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:520
+#: src/arm/gnunet-service-arm.c:559
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:628
+#: src/arm/gnunet-service-arm.c:667
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:782
+#: src/arm/gnunet-service-arm.c:878
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:877
+#: src/arm/gnunet-service-arm.c:970
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:882
+#: src/arm/gnunet-service-arm.c:975
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:887
+#: src/arm/gnunet-service-arm.c:980
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:921
+#: src/arm/gnunet-service-arm.c:986
+#, fuzzy, c-format
+msgid "Service `%s' took %llu ms to terminate\n"
+msgstr "服务已删除。\n"
+
+#: src/arm/gnunet-service-arm.c:1021
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:967 src/arm/mockup-service.c:41
-msgid "Failed to transmit shutdown ACK.\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:1067
+#: src/arm/gnunet-service-arm.c:1127
 #, fuzzy, c-format
 msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/arm/gnunet-service-arm.c:1069
+#: src/arm/gnunet-service-arm.c:1129
 msgid "option missing"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1152
+#: src/arm/gnunet-service-arm.c:1213
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-service-arm.c:1163
+#: src/arm/gnunet-service-arm.c:1224
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1177
+#: src/arm/gnunet-service-arm.c:1238
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:46
-msgid "Transmitting shutdown ACK.\n"
-msgstr ""
-
-#: src/arm/mockup-service.c:69
+#: src/arm/mockup-service.c:44
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
@@ -321,194 +336,197 @@ msgstr ""
 msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:92
+#: src/chat/gnunet-chat.c:93
 msgid "Joined\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:124
+#: src/chat/gnunet-chat.c:125 src/chat/gnunet-chat.c:133
+#: src/chat/gnunet-chat.c:213 src/chat/gnunet-chat.c:253
+#: src/chat/gnunet-chat.c:329 src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:400 src/chat/gnunet-chat.c:700
 msgid "anonymous"
 msgstr "匿名"
 
-#: src/chat/gnunet-chat.c:130
+#: src/chat/gnunet-chat.c:144
 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
+#: src/chat/gnunet-chat.c:147 src/chat/gnunet-chat.c:150
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr "“%s”对您说：%s\n"
 
-#: src/chat/gnunet-chat.c:139
+#: src/chat/gnunet-chat.c:153
 #, fuzzy, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr "“%s”对您说：%s\n"
 
-#: src/chat/gnunet-chat.c:142
+#: src/chat/gnunet-chat.c:156
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr "“%s”对您说：%s\n"
 
-#: src/chat/gnunet-chat.c:145
+#: src/chat/gnunet-chat.c:159
 #, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:148
+#: src/chat/gnunet-chat.c:162
 #, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:151
+#: src/chat/gnunet-chat.c:165
 #, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:170
 #, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:173
 #, fuzzy, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr "“%s”对您说：%s\n"
 
-#: src/chat/gnunet-chat.c:162
+#: src/chat/gnunet-chat.c:176
 #, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:193
+#: src/chat/gnunet-chat.c:217
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:260
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr "“%s”进入了房间\n"
 
-#: src/chat/gnunet-chat.c:224
+#: src/chat/gnunet-chat.c:260
 #, c-format
 msgid "`%s' left the room\n"
 msgstr "“%s”离开了房间\n"
 
-#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
+#: src/chat/gnunet-chat.c:321 src/chat/gnunet-chat.c:363
 #, fuzzy
 msgid "Could not change username\n"
 msgstr "已将用户名改为“%s”。\n"
 
-#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:630
+#: src/chat/gnunet-chat.c:334 src/chat/gnunet-chat.c:702
 #, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:320
+#: src/chat/gnunet-chat.c:373
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "已将用户名改为“%s”。\n"
 
-#: src/chat/gnunet-chat.c:333
+#: src/chat/gnunet-chat.c:388
 #, c-format
 msgid "Users in room `%s': "
 msgstr "房间“%s”中的用户："
 
-#: src/chat/gnunet-chat.c:371
+#: src/chat/gnunet-chat.c:434
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr "语法：/msg 用户名 消息"
 
-#: src/chat/gnunet-chat.c:379
+#: src/chat/gnunet-chat.c:443
 #, c-format
-msgid "Unknown user `%s'\n"
-msgstr "未知的用户“%s”\n"
+msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
+msgstr ""
 
-#: src/chat/gnunet-chat.c:395
+#: src/chat/gnunet-chat.c:460
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr "用户“%s”当前不在房间里！\n"
 
-#: src/chat/gnunet-chat.c:448
+#: src/chat/gnunet-chat.c:513
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/chat/gnunet-chat.c:459
+#: src/chat/gnunet-chat.c:524
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:463
+#: src/chat/gnunet-chat.c:528
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:532
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:470
+#: src/chat/gnunet-chat.c:535
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:472
+#: src/chat/gnunet-chat.c:537
 msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:474
+#: src/chat/gnunet-chat.c:539
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:477
+#: src/chat/gnunet-chat.c:542
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:480
+#: src/chat/gnunet-chat.c:545
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:547
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:484
+#: src/chat/gnunet-chat.c:549
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:551
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:554
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:556
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:606
+#: src/chat/gnunet-chat.c:672
 msgid "You must specify a nickname\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/chat/gnunet-chat.c:622
+#: src/chat/gnunet-chat.c:688
 #, c-format
 msgid "Failed to join room `%s'\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:655
+#: src/chat/gnunet-chat.c:727
 msgid "set the nickname to use (required)"
 msgstr "设置要使用的昵称(必须)"
 
-#: src/chat/gnunet-chat.c:658
+#: src/chat/gnunet-chat.c:730
 msgid "set the chat room to join"
 msgstr "设置要加入的聊天室"
 
-#: src/chat/gnunet-chat.c:670
+#: src/chat/gnunet-chat.c:742
 msgid "Join a chat on GNUnet."
 msgstr ""
 
@@ -532,166 +550,167 @@ msgstr "保存配置失败。"
 msgid "Failed to queue a leave notification\n"
 msgstr "保存配置失败。"
 
-#: src/core/core_api.c:798
+#: src/core/core_api.c:786
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core-list-connections.c:77
-#: src/peerinfo-tool/gnunet-peerinfo.c:60
+#: src/core/gnunet-core.c:54 src/peerinfo-tool/gnunet-peerinfo.c:286
 #, c-format
 msgid "Peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-core-list-connections.c:175
-#: src/peerinfo-tool/gnunet-peerinfo.c:194
+#: src/core/gnunet-core.c:72 src/peerinfo-tool/gnunet-peerinfo.c:817
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/core/gnunet-core-list-connections.c:196
-#: src/peerinfo-tool/gnunet-peerinfo.c:252
-msgid "don't resolve host names"
-msgstr ""
-
-#: src/core/gnunet-core-list-connections.c:203
+#: src/core/gnunet-core.c:95
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:99
+#: src/core/gnunet-service-core.c:97
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:360
+#: src/core/gnunet-service-core_clients.c:370
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:465
+#: src/core/gnunet-service-core_clients.c:475
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:801
+#: src/core/gnunet-service-core_clients.c:818
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:493
+#: src/core/gnunet-service-core_kx.c:565
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:543
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:604 src/dv/gnunet-service-dv.c:3002
-#: src/hostlist/hostlist-server.c:436 src/peerinfo-tool/gnunet-peerinfo.c:151
+#: src/core/gnunet-service-core_kx.c:681 src/dv/gnunet-service-dv.c:3003
 msgid "Error in communication with PEERINFO service\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:623
+#: src/core/gnunet-service-core_kx.c:700
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:673
+#: src/core/gnunet-service-core_kx.c:753
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:694
+#: src/core/gnunet-service-core_kx.c:775
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:746
+#: src/core/gnunet-service-core_kx.c:828
 msgid "# session keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:765
+#: src/core/gnunet-service-core_kx.c:845
 #, c-format
 msgid "`%s' is for `%s', not for me.  Ignoring.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:803
+#: src/core/gnunet-service-core_kx.c:890
 msgid "# SET_KEY messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:883
-#: src/transport/gnunet-service-transport_validation.c:803
+#: src/core/gnunet-service-core_kx.c:977
+#: src/transport/gnunet-service-transport_validation.c:810
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:917
+#: src/core/gnunet-service-core_kx.c:1010
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:938
+#: src/core/gnunet-service-core_kx.c:1029
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1026
+#: src/core/gnunet-service-core_kx.c:1125
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1037
+#: src/core/gnunet-service-core_kx.c:1135
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1095
-#: src/transport/gnunet-service-transport_validation.c:1026
+#: src/core/gnunet-service-core_kx.c:1236
+#: src/transport/gnunet-service-transport_validation.c:1031
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:1275
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1157
+#: src/core/gnunet-service-core_kx.c:1303
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1223
+#: src/core/gnunet-service-core_kx.c:1329
+msgid "# rekey operations confirmed via PONG"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1381
+#: src/core/gnunet-service-core_kx.c:1398
 msgid "# SET_KEY and PING messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1364
+#: src/core/gnunet-service-core_kx.c:1402
+msgid "# REKEY operations performed"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1537
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1406
-#: src/core/gnunet-service-core_kx.c:1431
+#: src/core/gnunet-service-core_kx.c:1577
+#: src/core/gnunet-service-core_kx.c:1602
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1589
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1626
 #, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1630
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1467
+#: src/core/gnunet-service-core_kx.c:1638
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1528
+#: src/core/gnunet-service-core_kx.c:1700
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/core/gnunet-service-core_kx.c:1536
+#: src/core/gnunet-service-core_kx.c:1708
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1546 src/hostlist/hostlist-server.c:555
-#: src/peerinfo-tool/gnunet-peerinfo.c:202
-#: src/transport/gnunet-service-transport.c:595
+#: src/core/gnunet-service-core_kx.c:1718 src/hostlist/hostlist-server.c:551
+#: src/peerinfo-tool/gnunet-peerinfo.c:823
+#: src/transport/gnunet-service-transport.c:611
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -700,29 +719,39 @@ msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
 #: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:342
+#: src/core/gnunet-service-core_neighbours.c:334
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:251
+#: src/core/gnunet-service-core_neighbours.c:247
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:430
+#: src/core/gnunet-service-core_neighbours.c:418
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:273
-msgid "# entries in session map"
+#: src/core/gnunet-service-core_sessions.c:206
+#: src/core/gnunet-service-core_sessions.c:269
+#: src/dht/gnunet-service-dht_neighbours.c:625
+#: src/dht/gnunet-service-dht_neighbours.c:683
+#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
+#: src/topology/gnunet-daemon-topology.c:709
+#: src/topology/gnunet-daemon-topology.c:810
+#: src/transport/gnunet-service-transport_neighbours.c:874
+#: src/transport/gnunet-service-transport_neighbours.c:1080
+#: src/transport/gnunet-service-transport_neighbours.c:1089
+#: src/transport/gnunet-service-transport_neighbours.c:2568
+#: src/transport/gnunet-service-transport_neighbours.c:2814
+msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:238
+#: src/core/gnunet-service-core_sessions.c:236
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:414
+#: src/core/gnunet-service-core_sessions.c:406
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -735,400 +764,377 @@ msgstr ""
 msgid "# updates to my type map"
 msgstr ""
 
-#: src/datacache/datacache.c:118 src/datacache/datacache.c:255
-#: src/datastore/gnunet-service-datastore.c:854
+#: src/datacache/datacache.c:115 src/datacache/datacache.c:250
+#: src/datastore/gnunet-service-datastore.c:834
 msgid "# bytes stored"
 msgstr ""
 
-#: src/datacache/datacache.c:144 src/datacache/datacache.c:151
-#: src/datastore/gnunet-service-datastore.c:1531
-#: src/datastore/gnunet-service-datastore.c:1542
+#: src/datacache/datacache.c:141 src/datacache/datacache.c:148
+#: src/datastore/gnunet-service-datastore.c:1483
+#: src/datastore/gnunet-service-datastore.c:1494
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
 
-#: src/datacache/datacache.c:183
+#: src/datacache/datacache.c:180
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:191
+#: src/datacache/datacache.c:188
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:281
+#: src/datacache/datacache.c:276
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:291
+#: src/datacache/datacache.c:284
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:103
-#: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:517
-#: src/datacache/plugin_datacache_mysql.c:526
-#: src/datacache/plugin_datacache_mysql.c:598
-#: src/datacache/plugin_datacache_mysql.c:614
-#: src/datacache/plugin_datacache_sqlite.c:71
-#: src/datacache/plugin_datacache_sqlite.c:74
-#: src/datastore/plugin_datastore_mysql.c:139
-#: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:613
-#: src/datastore/plugin_datastore_mysql.c:673
-#: src/datastore/plugin_datastore_mysql.c:685
-#: src/datastore/plugin_datastore_mysql.c:1362
-#: src/datastore/plugin_datastore_mysql.c:1376
-#: src/datastore/plugin_datastore_sqlite.c:61
-#: src/namestore/plugin_namestore_sqlite.c:49 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:92 src/include/gnunet_common.h:507
-#: src/include/gnunet_common.h:514
+#: src/datacache/plugin_datacache_mysql.c:97
+#: src/datacache/plugin_datacache_mysql.c:104
+#: src/datacache/plugin_datacache_sqlite.c:69
+#: src/datacache/plugin_datacache_sqlite.c:72
+#: src/datastore/plugin_datastore_mysql.c:803
+#: src/datastore/plugin_datastore_mysql.c:817
+#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
+#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
+#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
+#: src/util/crypto_rsa.c:67 src/include/gnunet_common.h:525
+#: src/include/gnunet_common.h:532
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/datacache/plugin_datacache_mysql.c:224
-#: src/datastore/plugin_datastore_mysql.c:316
-#, c-format
-msgid "Trying to use file `%s' for MySQL configuration.\n"
-msgstr ""
-
-#: src/datacache/plugin_datacache_mysql.c:230
-#: src/datastore/plugin_datastore_mysql.c:322
-#, fuzzy, c-format
-msgid "Could not access file `%s': %s\n"
-msgstr "无法解析“%s”(%s)：%s\n"
-
-#: src/datacache/plugin_datacache_mysql.c:979
+#: src/datacache/plugin_datacache_mysql.c:450
 msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:79
-#: src/datastore/plugin_datastore_postgres.c:93
-#, fuzzy, c-format
-msgid "`%s:%s' failed at %s:%d with error: %s"
-msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
-
-#: src/datacache/plugin_datacache_postgres.c:149
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres: %s"
-msgstr "无法初始化 SQLite：%s。\n"
-
-#: src/datacache/plugin_datacache_postgres.c:499
+#: src/datacache/plugin_datacache_postgres.c:367
 msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:424
+#: src/datacache/plugin_datacache_sqlite.c:410
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:457
-#: src/datastore/plugin_datastore_sqlite.c:414
-#: src/namestore/plugin_namestore_sqlite.c:381
+#: src/datacache/plugin_datacache_sqlite.c:443
+#: src/datastore/plugin_datastore_sqlite.c:408
+#: src/namestore/plugin_namestore_sqlite.c:370
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
+#: src/datacache/plugin_datacache_sqlite.c:450
+#, fuzzy, c-format
+msgid "Failed to close statement %p: %d\n"
+msgstr "解析配置文件“%s”失败\n"
+
 #: src/datacache/plugin_datacache_template.c:121
 msgid "Template datacache running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:289
+#: src/datastore/datastore_api.c:305
 msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:372
+#: src/datastore/datastore_api.c:388
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:418
+#: src/datastore/datastore_api.c:432
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:445
+#: src/datastore/datastore_api.c:459
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:465
+#: src/datastore/datastore_api.c:477
 msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/datastore/datastore_api.c:513
+#: src/datastore/datastore_api.c:525
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:540
+#: src/datastore/datastore_api.c:548
 msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608
+#: src/datastore/datastore_api.c:612
 msgid "# transmission request failures"
 msgstr ""
 
-#: src/datastore/datastore_api.c:631
+#: src/datastore/datastore_api.c:633
 msgid "# bytes sent to datastore"
 msgstr ""
 
-#: src/datastore/datastore_api.c:772
+#: src/datastore/datastore_api.c:764
 msgid "Failed to receive status response from database."
 msgstr ""
 
-#: src/datastore/datastore_api.c:786
+#: src/datastore/datastore_api.c:778
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:798 src/datastore/datastore_api.c:804
+#: src/datastore/datastore_api.c:790 src/datastore/datastore_api.c:796
 msgid "Invalid error message received from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:810
+#: src/datastore/datastore_api.c:800
 msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:883
+#: src/datastore/datastore_api.c:869
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:954
+#: src/datastore/datastore_api.c:936
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1019
+#: src/datastore/datastore_api.c:997
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1080
+#: src/datastore/datastore_api.c:1054
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1148
+#: src/datastore/datastore_api.c:1118
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1193
+#: src/datastore/datastore_api.c:1163
 msgid "Failed to receive response from database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1253
+#: src/datastore/datastore_api.c:1221
 msgid "# Results received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1324
+#: src/datastore/datastore_api.c:1286
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1391
+#: src/datastore/datastore_api.c:1349
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1455
+#: src/datastore/datastore_api.c:1409
 msgid "# GET requests executed"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:351
+#: src/datastore/gnunet-service-datastore.c:349
 msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:426
+#: src/datastore/gnunet-service-datastore.c:422
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:486
+#: src/datastore/gnunet-service-datastore.c:480
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:640
+#: src/datastore/gnunet-service-datastore.c:511
+msgid "Shutdown in progress, aborting transmission.\n"
+msgstr ""
+
+#: src/datastore/gnunet-service-datastore.c:626
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:685
+#: src/datastore/gnunet-service-datastore.c:669
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:696
+#: src/datastore/gnunet-service-datastore.c:680
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:700
+#: src/datastore/gnunet-service-datastore.c:684
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:706
+#: src/datastore/gnunet-service-datastore.c:690
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:711
-#: src/datastore/gnunet-service-datastore.c:765
-#: src/datastore/gnunet-service-datastore.c:986
-#: src/datastore/gnunet-service-datastore.c:1465
+#: src/datastore/gnunet-service-datastore.c:695
+#: src/datastore/gnunet-service-datastore.c:747
+#: src/datastore/gnunet-service-datastore.c:960
+#: src/datastore/gnunet-service-datastore.c:1417
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:780
+#: src/datastore/gnunet-service-datastore.c:760
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:868
+#: src/datastore/gnunet-service-datastore.c:846
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1034
+#: src/datastore/gnunet-service-datastore.c:1006
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1048
+#: src/datastore/gnunet-service-datastore.c:1018
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1076
+#: src/datastore/gnunet-service-datastore.c:1046
 msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1110
+#: src/datastore/gnunet-service-datastore.c:1076
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1145
+#: src/datastore/gnunet-service-datastore.c:1109
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1172
+#: src/datastore/gnunet-service-datastore.c:1134
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1182
+#: src/datastore/gnunet-service-datastore.c:1142
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1216
+#: src/datastore/gnunet-service-datastore.c:1174
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1260
+#: src/datastore/gnunet-service-datastore.c:1216
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1323
+#: src/datastore/gnunet-service-datastore.c:1277
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1332
+#: src/datastore/gnunet-service-datastore.c:1286
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1536
+#: src/datastore/gnunet-service-datastore.c:1488
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1547
+#: src/datastore/gnunet-service-datastore.c:1499
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1549
+#: src/datastore/gnunet-service-datastore.c:1501
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1562
+#: src/datastore/gnunet-service-datastore.c:1514
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1580
-#: src/datastore/gnunet-service-datastore.c:1596
+#: src/datastore/gnunet-service-datastore.c:1532
+#: src/datastore/gnunet-service-datastore.c:1548
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1626
+#: src/datastore/gnunet-service-datastore.c:1578
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/datastore/gnunet-service-datastore.c:1655
+#: src/datastore/gnunet-service-datastore.c:1607
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1660
+#: src/datastore/gnunet-service-datastore.c:1612
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1663
+#: src/datastore/gnunet-service-datastore.c:1615
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:529
-#: src/datastore/plugin_datastore_mysql.c:1336
+#: src/datastore/plugin_datastore_mysql.c:780
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/plugin_datastore_mysql.c:622
-#: src/datastore/plugin_datastore_mysql.c:1346
+#: src/datastore/plugin_datastore_mysql.c:788
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1581
+#: src/datastore/plugin_datastore_mysql.c:1019
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:173
-#, fuzzy, c-format
-msgid "Unable to initialize Postgres with configuration `%s': %s"
-msgstr "无法保存配置文件“%s”："
+#: src/datastore/plugin_datastore_postgres.c:824
+#, fuzzy
+msgid "Failed to drop table from database.\n"
+msgstr "发送消息失败。\n"
 
-#: src/datastore/plugin_datastore_postgres.c:1017
+#: src/datastore/plugin_datastore_postgres.c:860
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:61
+#: src/datastore/plugin_datastore_sqlite.c:57
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:239
-#: src/namestore/plugin_namestore_sqlite.c:223
+#: src/datastore/plugin_datastore_sqlite.c:233
+#: src/namestore/plugin_namestore_sqlite.c:204
 #, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:266
-#: src/namestore/plugin_namestore_sqlite.c:248
+#: src/datastore/plugin_datastore_sqlite.c:260
+#: src/namestore/plugin_namestore_sqlite.c:229
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:669
+#: src/datastore/plugin_datastore_sqlite.c:655
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1159
+#: src/datastore/plugin_datastore_sqlite.c:1139
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1178
+#: src/datastore/plugin_datastore_sqlite.c:1158
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1218
-#: src/namestore/plugin_namestore_sqlite.c:779
+#: src/datastore/plugin_datastore_sqlite.c:1198
+#: src/namestore/plugin_namestore_sqlite.c:829
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
@@ -1137,33 +1143,32 @@ msgstr "sqlite 数据仓库"
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:280
+#: src/dht/dht_api.c:348
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:172
-#: src/gns/gnunet-gns-lookup.c:179
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:293
+#: src/dht/gnunet-dht-put.c:192
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204 src/gns/gnunet-gns-lookup.c:182
+#: src/dht/gnunet-dht-get.c:204
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:207 src/gns/gnunet-gns-lookup.c:185
+#: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:181
-#: src/gns/gnunet-gns-lookup.c:188
+#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-put.c:184
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-publish.c:725
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
-#: src/gns/gnunet-gns-lookup.c:191 src/nse/gnunet-nse-profiler.c:908
+#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-monitor.c:302
+#: src/dht/gnunet-dht-put.c:204 src/fs/gnunet-download.c:271
+#: src/fs/gnunet-publish.c:731 src/fs/gnunet-search.c:297
+#: src/fs/gnunet-unindex.c:169 src/nse/gnunet-nse-profiler.c:910
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1171,94 +1176,110 @@ msgstr ""
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:100
+#: src/dht/gnunet-dht-monitor.c:299
+msgid "how long to execute? 0 = forever"
+msgstr ""
+
+#: src/dht/gnunet-dht-monitor.c:321
+msgid "Prints all packets that go through the DHT."
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:108
 msgid "PUT request sent!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:124
+#: src/dht/gnunet-dht-put.c:111
+msgid "Timeout sending PUT request!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:114
+msgid "PUT request not confirmed!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-put.c:144
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:132
+#: src/dht/gnunet-dht-put.c:152
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/dht/gnunet-dht-put.c:137
+#: src/dht/gnunet-dht-put.c:157
 #, fuzzy, c-format
 msgid "Connected to %s service!\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/dht/gnunet-dht-put.c:152
+#: src/dht/gnunet-dht-put.c:172
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:166
+#: src/dht/gnunet-dht-put.c:186
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:169
+#: src/dht/gnunet-dht-put.c:189
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:175
+#: src/dht/gnunet-dht-put.c:195
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:178
+#: src/dht/gnunet-dht-put.c:198
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:203
+#: src/dht/gnunet-dht-put.c:223
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:556
-#: src/testing/testing.c:1979 src/testing/testing.c:2009
+#: src/dht/gnunet-service-dht.c:163 src/testing/testing.c:544
+#: src/testing/testing.c:1968 src/testing/testing.c:1998
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-service-dht_clients.c:371
+#: src/dht/gnunet-service-dht_clients.c:407
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:462
+#: src/dht/gnunet-service-dht_clients.c:500
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:529
+#: src/dht/gnunet-service-dht_clients.c:584
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:624
+#: src/dht/gnunet-service-dht_clients.c:682
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:854
+#: src/dht/gnunet-service-dht_clients.c:919
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:869
+#: src/dht/gnunet-service-dht_clients.c:932
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:906
+#: src/dht/gnunet-service-dht_clients.c:967
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:928
+#: src/dht/gnunet-service-dht_clients.c:989
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:979
-#: src/dht/gnunet-service-dht_clients.c:1022
+#: src/dht/gnunet-service-dht_clients.c:1038
+#: src/dht/gnunet-service-dht_clients.c:1081
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:989
+#: src/dht/gnunet-service-dht_clients.c:1048
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -1271,28 +1292,28 @@ msgstr ""
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:209
+#: src/dht/gnunet-service-dht_datacache.c:207
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:220
+#: src/dht/gnunet-service-dht_datacache.c:218
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:226
+#: src/dht/gnunet-service-dht_datacache.c:224
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:238
+#: src/dht/gnunet-service-dht_datacache.c:236
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:241
+#: src/dht/gnunet-service-dht_datacache.c:239
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:271
+#: src/dht/gnunet-service-dht_datacache.c:269
 msgid "# GET requests given to datacache"
 msgstr ""
 
@@ -1304,85 +1325,77 @@ msgstr ""
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:573
+#: src/dht/gnunet-service-dht_neighbours.c:571
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:629
-#: src/dht/gnunet-service-dht_neighbours.c:689
-#, fuzzy
-msgid "# Peers connected"
-msgstr ""
-"\n"
-"按任意键继续\n"
-
-#: src/dht/gnunet-service-dht_neighbours.c:723
+#: src/dht/gnunet-service-dht_neighbours.c:717
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:778
+#: src/dht/gnunet-service-dht_neighbours.c:772
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:816
+#: src/dht/gnunet-service-dht_neighbours.c:810
 msgid "# Bytes of bandwdith requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1040
-#: src/dht/gnunet-service-dht_neighbours.c:1068
+#: src/dht/gnunet-service-dht_neighbours.c:1032
+#: src/dht/gnunet-service-dht_neighbours.c:1060
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1049
-#: src/dht/gnunet-service-dht_neighbours.c:1085
+#: src/dht/gnunet-service-dht_neighbours.c:1041
+#: src/dht/gnunet-service-dht_neighbours.c:1075
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1221
+#: src/dht/gnunet-service-dht_neighbours.c:1207
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1252
+#: src/dht/gnunet-service-dht_neighbours.c:1236
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1333
+#: src/dht/gnunet-service-dht_neighbours.c:1315
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1364
+#: src/dht/gnunet-service-dht_neighbours.c:1342
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1467
+#: src/dht/gnunet-service-dht_neighbours.c:1443
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1555
+#: src/dht/gnunet-service-dht_neighbours.c:1531
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1668
+#: src/dht/gnunet-service-dht_neighbours.c:1647
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1676
+#: src/dht/gnunet-service-dht_neighbours.c:1655
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1767
+#: src/dht/gnunet-service-dht_neighbours.c:1746
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1811
+#: src/dht/gnunet-service-dht_neighbours.c:1788
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1825
+#: src/dht/gnunet-service-dht_neighbours.c:1802
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1895
+#: src/dht/gnunet-service-dht_neighbours.c:1876
 msgid "# P2P RESULTS received"
 msgstr ""
 
@@ -1402,29 +1415,28 @@ msgstr ""
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:236
+#: src/dht/gnunet-service-dht_routing.c:238
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:314
-#: src/dht/gnunet-service-dht_routing.c:368
+#: src/dht/gnunet-service-dht_routing.c:311
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:324
+#: src/dht/gnunet-service-dht_routing.c:352
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:124
+#: src/dht/plugin_block_dht.c:136
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:131
+#: src/dht/plugin_block_dht.c:143
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/dht/plugin_block_dht.c:140
+#: src/dht/plugin_block_dht.c:152
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
@@ -1453,67 +1465,68 @@ msgstr ""
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:480
+#: src/dns/gnunet-service-dns.c:485
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/dns/gnunet-service-dns.c:634
+#: src/dns/gnunet-service-dns.c:639
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:818
+#: src/dns/gnunet-service-dns.c:822
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1001
+#: src/dns/gnunet-service-dns.c:1005
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1046
+#: src/dns/gnunet-service-dns.c:1050
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1165
+#: src/dns/gnunet-service-dns.c:1168
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1198
-msgid "Changing DNS reply according to client specifications\n"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1279
+#: src/dns/gnunet-service-dns.c:1281
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1294
+#: src/dns/gnunet-service-dns.c:1297
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1303
+#: src/dns/gnunet-service-dns.c:1306
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1312
+#: src/dns/gnunet-service-dns.c:1315
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1377
+#: src/dns/gnunet-service-dns.c:1380
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1461
+#: src/dns/gnunet-service-dns.c:1465
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1493 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1497 src/exit/gnunet-daemon-exit.c:2674
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1567
+#: src/dns/gnunet-service-dns.c:1561 src/exit/gnunet-daemon-exit.c:3032
+#, c-format
+msgid "`%s' must be installed SUID, refusing to run\n"
+msgstr ""
+
+#: src/dns/gnunet-service-dns.c:1581
 msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
@@ -1536,15 +1549,15 @@ msgstr ""
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2068
-#: src/exit/gnunet-daemon-exit.c:2318 src/vpn/gnunet-service-vpn.c:1388
-#: src/vpn/gnunet-service-vpn.c:1788 src/vpn/gnunet-service-vpn.c:1951
+#: src/exit/gnunet-daemon-exit.c:679 src/exit/gnunet-daemon-exit.c:2069
+#: src/exit/gnunet-daemon-exit.c:2319 src/vpn/gnunet-service-vpn.c:1394
+#: src/vpn/gnunet-service-vpn.c:1795 src/vpn/gnunet-service-vpn.c:1958
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2127
-#: src/exit/gnunet-daemon-exit.c:2377 src/vpn/gnunet-service-vpn.c:1444
-#: src/vpn/gnunet-service-vpn.c:1847 src/vpn/gnunet-service-vpn.c:1984
+#: src/exit/gnunet-daemon-exit.c:716 src/exit/gnunet-daemon-exit.c:2128
+#: src/exit/gnunet-daemon-exit.c:2378 src/vpn/gnunet-service-vpn.c:1450
+#: src/vpn/gnunet-service-vpn.c:1854 src/vpn/gnunet-service-vpn.c:1991
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -1591,124 +1604,124 @@ msgstr ""
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1470
+#: src/exit/gnunet-daemon-exit.c:1471
 msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1570
+#: src/exit/gnunet-daemon-exit.c:1571
 msgid "# TCP service creation requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1573 src/exit/gnunet-daemon-exit.c:1652
-#: src/exit/gnunet-daemon-exit.c:1762 src/exit/gnunet-daemon-exit.c:1992
-#: src/exit/gnunet-daemon-exit.c:2234 src/exit/gnunet-daemon-exit.c:2515
-#: src/exit/gnunet-daemon-exit.c:2615
+#: src/exit/gnunet-daemon-exit.c:1574 src/exit/gnunet-daemon-exit.c:1653
+#: src/exit/gnunet-daemon-exit.c:1763 src/exit/gnunet-daemon-exit.c:1993
+#: src/exit/gnunet-daemon-exit.c:2235 src/exit/gnunet-daemon-exit.c:2516
+#: src/exit/gnunet-daemon-exit.c:2616
 msgid "# Bytes received from MESH"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1606 src/exit/gnunet-daemon-exit.c:2637
+#: src/exit/gnunet-daemon-exit.c:1607 src/exit/gnunet-daemon-exit.c:2638
 #, c-format
 msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1610
+#: src/exit/gnunet-daemon-exit.c:1611
 msgid "# TCP requests dropped (no such service)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1655
+#: src/exit/gnunet-daemon-exit.c:1656
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1765
+#: src/exit/gnunet-daemon-exit.c:1766
 msgid "# TCP data requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1779
+#: src/exit/gnunet-daemon-exit.c:1780
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1829
+#: src/exit/gnunet-daemon-exit.c:1830
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1995
+#: src/exit/gnunet-daemon-exit.c:1996
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2237
+#: src/exit/gnunet-daemon-exit.c:2238
 msgid "# ICMP service requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2303 src/vpn/gnunet-service-vpn.c:1378
-#: src/vpn/gnunet-service-vpn.c:1945
+#: src/exit/gnunet-daemon-exit.c:2304 src/vpn/gnunet-service-vpn.c:1384
+#: src/vpn/gnunet-service-vpn.c:1952
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2362 src/vpn/gnunet-service-vpn.c:1414
-#: src/vpn/gnunet-service-vpn.c:1426 src/vpn/gnunet-service-vpn.c:1835
+#: src/exit/gnunet-daemon-exit.c:2363 src/vpn/gnunet-service-vpn.c:1420
+#: src/vpn/gnunet-service-vpn.c:1432 src/vpn/gnunet-service-vpn.c:1842
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2412
+#: src/exit/gnunet-daemon-exit.c:2413
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2518
+#: src/exit/gnunet-daemon-exit.c:2519
 msgid "# UDP IP-exit requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2618
+#: src/exit/gnunet-daemon-exit.c:2619
 msgid "# UDP service requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2641
+#: src/exit/gnunet-daemon-exit.c:2642
 msgid "# UDP requests dropped (no such service)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2881
+#: src/exit/gnunet-daemon-exit.c:2882
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2895 src/exit/gnunet-daemon-exit.c:2907
+#: src/exit/gnunet-daemon-exit.c:2896 src/exit/gnunet-daemon-exit.c:2908
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2918
+#: src/exit/gnunet-daemon-exit.c:2919
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3047
+#: src/exit/gnunet-daemon-exit.c:3048
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3055
+#: src/exit/gnunet-daemon-exit.c:3056
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3062
+#: src/exit/gnunet-daemon-exit.c:3063
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3068
+#: src/exit/gnunet-daemon-exit.c:3069
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3074 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3075 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3235
+#: src/exit/gnunet-daemon-exit.c:3236
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1716,116 +1729,120 @@ msgstr ""
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:454
+#: src/fragmentation/defragmentation.c:456
 msgid "# fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:513
+#: src/fragmentation/defragmentation.c:521
 msgid "# duplicate fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:526
+#: src/fragmentation/defragmentation.c:534
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:188
+#: src/fragmentation/fragmentation.c:203
 msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:191
+#: src/fragmentation/fragmentation.c:206
 msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:255
+#: src/fragmentation/fragmentation.c:232
+msgid "# fragments wrap arounds"
+msgstr ""
+
+#: src/fragmentation/fragmentation.c:273
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:258
+#: src/fragmentation/fragmentation.c:276
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:343
+#: src/fragmentation/fragmentation.c:363
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:349
+#: src/fragmentation/fragmentation.c:369
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:373
+#: src/fragmentation/fragmentation.c:393
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:284
+#: src/fs/fs_api.c:339
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:293
+#: src/fs/fs_api.c:348
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/fs_api.c:299
+#: src/fs/fs_api.c:354
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:877
+#: src/fs/fs_api.c:938
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:1334
+#: src/fs/fs_api.c:1395
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1376
+#: src/fs/fs_api.c:1437
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1392
+#: src/fs/fs_api.c:1453
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2004
+#: src/fs/fs_api.c:2106
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2014
+#: src/fs/fs_api.c:2116
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2139 src/fs/fs_api.c:2378
+#: src/fs/fs_api.c:2241 src/fs/fs_api.c:2480
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:2156
+#: src/fs/fs_api.c:2258
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:2168 src/fs/fs_api.c:2187 src/fs/fs_api.c:2671
+#: src/fs/fs_api.c:2270 src/fs/fs_api.c:2289 src/fs/fs_api.c:2773
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2369
+#: src/fs/fs_api.c:2471
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2615
+#: src/fs/fs_api.c:2717
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2709
+#: src/fs/fs_api.c:2811
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1834,53 +1851,58 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:310
+#: src/fs/fs_download.c:311
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:330
+#: src/fs/fs_download.c:331
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:488 src/fs/fs_download.c:500
+#: src/fs/fs_download.c:497 src/fs/fs_download.c:509
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_download.c:870
+#: src/fs/fs_download.c:878
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:951
+#: src/fs/fs_download.c:960
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
-"offset %llu/%llu, got %u bytes)\n"
+"offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:986
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1000
+#: src/fs/fs_download.c:1009
 #, fuzzy, c-format
-msgid "Download failed: could not open file `%s': %s\n"
+msgid "Download failed: could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_download.c:1010
+#: src/fs/fs_download.c:1019
 #, fuzzy, c-format
-msgid "Failed to seek to offset %llu in file `%s': %s\n"
+msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1028
 #, fuzzy, c-format
-msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
+msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_download.c:1835
+#: src/fs/fs_download.c:1125
+#, fuzzy
+msgid "internal error decoding tree"
+msgstr "未知错误。\n"
+
+#: src/fs/fs_download.c:1888
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
@@ -1961,63 +1983,63 @@ msgstr "未知错误。\n"
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:395
+#: src/fs/fs_publish.c:129 src/fs/fs_publish.c:397
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:616 src/fs/fs_publish.c:633 src/fs/fs_publish.c:672
-#: src/fs/fs_publish.c:692 src/fs/fs_publish.c:717 src/fs/fs_publish.c:857
+#: src/fs/fs_publish.c:621 src/fs/fs_publish.c:638 src/fs/fs_publish.c:677
+#: src/fs/fs_publish.c:697 src/fs/fs_publish.c:722 src/fs/fs_publish.c:862
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:618
+#: src/fs/fs_publish.c:623
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:630
+#: src/fs/fs_publish.c:635
 #, fuzzy
 msgid "unknown error"
 msgstr "未知错误"
 
-#: src/fs/fs_publish.c:673
+#: src/fs/fs_publish.c:678
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:693
+#: src/fs/fs_publish.c:698
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:718
+#: src/fs/fs_publish.c:723
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:741
+#: src/fs/fs_publish.c:746
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_publish.c:806
+#: src/fs/fs_publish.c:811
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:812
+#: src/fs/fs_publish.c:817
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:858
+#: src/fs/fs_publish.c:863
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1067
+#: src/fs/fs_publish.c:1071
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1138
+#: src/fs/fs_publish.c:1142
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2026,7 +2048,7 @@ msgstr ""
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_search.c:810
+#: src/fs/fs_search.c:829
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2036,43 +2058,63 @@ msgstr ""
 msgid "Failed to start daemon: %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_unindex.c:57
+#: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:62
+#: src/fs/fs_unindex.c:63
 #, fuzzy
 msgid "Failed to read file"
 msgstr "发送消息失败。\n"
 
-#: src/fs/fs_unindex.c:231
+#: src/fs/fs_unindex.c:233
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:239
+#: src/fs/fs_unindex.c:241
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:247
+#: src/fs/fs_unindex.c:249
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "“%s”的参数无效。\n"
 
-#: src/fs/fs_unindex.c:292
+#: src/fs/fs_unindex.c:293
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:325
+#: src/fs/fs_unindex.c:344
+#, fuzzy
+msgid "Failed to get KSKs from directory scan."
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/fs/fs_unindex.c:356
+#, fuzzy, c-format
+msgid "Internal error scanning `%s'.\n"
+msgstr "未知错误。\n"
+
+#: src/fs/fs_unindex.c:411
+#, fuzzy, c-format
+msgid "Failed to remove KBlock: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/fs_unindex.c:501
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s' from KBlock!\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/fs/fs_unindex.c:553 src/fs/fs_unindex.c:618
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_unindex.c:338
+#: src/fs/fs_unindex.c:631
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_unindex.c:372
+#: src/fs/fs_unindex.c:665
 msgid "Failed to compute hash of file."
 msgstr ""
 
@@ -2183,92 +2225,92 @@ msgstr "更改 GNUnet 目录的权限出错"
 msgid "Display contents of a GNUnet directory"
 msgstr "更改 GNUnet 目录的权限出错"
 
-#: src/fs/gnunet-download.c:100
+#: src/fs/gnunet-download.c:101
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-download.c:109
+#: src/fs/gnunet-download.c:110
 #, fuzzy
 msgid "<unknown time>"
 msgstr "未知错误"
 
-#: src/fs/gnunet-download.c:118
+#: src/fs/gnunet-download.c:119
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:128
+#: src/fs/gnunet-download.c:129
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:136
+#: src/fs/gnunet-download.c:137
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:151 src/fs/gnunet-publish.c:190
+#: src/fs/gnunet-download.c:152 src/fs/gnunet-publish.c:190
 #: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:176
+#: src/fs/gnunet-download.c:177
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-download.c:182 src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-download.c:183 src/fs/gnunet-publish.c:624
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/gnunet-download.c:189
+#: src/fs/gnunet-download.c:190
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:196
+#: src/fs/gnunet-download.c:197
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:210 src/fs/gnunet-publish.c:596
+#: src/fs/gnunet-download.c:211 src/fs/gnunet-publish.c:602
 #: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-download.c:247 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:248 src/fs/gnunet-search.c:285
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:250
+#: src/fs/gnunet-download.c:251
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253 src/fs/gnunet-search.c:288
+#: src/fs/gnunet-download.c:254 src/fs/gnunet-search.c:288
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:256
+#: src/fs/gnunet-download.c:257
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:260
+#: src/fs/gnunet-download.c:261
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:264
+#: src/fs/gnunet-download.c:265
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267
+#: src/fs/gnunet-download.c:268
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:277
+#: src/fs/gnunet-download.c:278
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2282,69 +2324,64 @@ msgstr ""
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:151 src/statistics/gnunet-statistics.c:126
+#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:167
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/fs/gnunet-pseudonym.c:165
-#, c-format
-msgid "Namespace `%s' unknown.\n"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
-#: src/fs/gnunet-pseudonym.c:249
+#: src/fs/gnunet-pseudonym.c:250 src/fs/gnunet-pseudonym.c:257
+#: src/fs/gnunet-pseudonym.c:259
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-pseudonym.c:279 src/fs/gnunet-publish.c:678
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:272
+#: src/fs/gnunet-pseudonym.c:282
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:275
+#: src/fs/gnunet-pseudonym.c:285
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:278
+#: src/fs/gnunet-pseudonym.c:288
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:691
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:697
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:285
+#: src/fs/gnunet-pseudonym.c:295
 msgid "print names of local namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:288
+#: src/fs/gnunet-pseudonym.c:298
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:291
+#: src/fs/gnunet-pseudonym.c:301
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-pseudonym.c:304 src/fs/gnunet-publish.c:716
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:297
+#: src/fs/gnunet-pseudonym.c:307
 msgid "specify ID of the root of the namespace"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:300
+#: src/fs/gnunet-pseudonym.c:310
 msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:308
+#: src/fs/gnunet-pseudonym.c:318
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2372,163 +2409,163 @@ msgstr ""
 msgid "Cleanup after abort complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:305
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:301
+#: src/fs/gnunet-publish.c:307
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:352
+#: src/fs/gnunet-publish.c:358
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/fs/gnunet-publish.c:427
+#: src/fs/gnunet-publish.c:433
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:454
+#: src/fs/gnunet-publish.c:460
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:485
+#: src/fs/gnunet-publish.c:491
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:487
+#: src/fs/gnunet-publish.c:493
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:498
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-publish.c:503
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:501
+#: src/fs/gnunet-publish.c:507
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:505
+#: src/fs/gnunet-publish.c:511
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:518
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/gnunet-publish.c:546
+#: src/fs/gnunet-publish.c:552
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:559
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:559
+#: src/fs/gnunet-publish.c:565
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:567 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:573 src/vpn/gnunet-vpn.c:214
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:577 src/fs/gnunet-publish.c:584
-#: src/transport/gnunet-transport.c:530
+#: src/fs/gnunet-publish.c:583 src/fs/gnunet-publish.c:590
+#: src/transport/gnunet-transport.c:560
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:606
+#: src/fs/gnunet-publish.c:612
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:639
+#: src/fs/gnunet-publish.c:645
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:651
+#: src/fs/gnunet-publish.c:657
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:676
+#: src/fs/gnunet-publish.c:682
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:685
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-publish.c:689
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:687
+#: src/fs/gnunet-publish.c:693
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:700
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:699
+#: src/fs/gnunet-publish.c:705
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:703
+#: src/fs/gnunet-publish.c:709
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:707
+#: src/fs/gnunet-publish.c:713
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:713
+#: src/fs/gnunet-publish.c:719
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:717
+#: src/fs/gnunet-publish.c:723
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:721
+#: src/fs/gnunet-publish.c:727
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:736
+#: src/fs/gnunet-publish.c:742
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2575,23 +2612,12 @@ msgid "# Loopback routes suppressed"
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1290
-#: src/topology/gnunet-daemon-topology.c:1297
+#: src/topology/gnunet-daemon-topology.c:1330
+#: src/topology/gnunet-daemon-topology.c:1337
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-service-fs_cp.c:615 src/fs/gnunet-service-fs_cp.c:1532
-#: src/topology/gnunet-daemon-topology.c:654
-#: src/topology/gnunet-daemon-topology.c:756
-#: src/transport/gnunet-service-transport_neighbours.c:960
-#: src/transport/gnunet-service-transport_neighbours.c:1289
-#: src/transport/gnunet-service-transport_neighbours.c:1841
-#: src/transport/gnunet-service-transport_neighbours.c:2499
-#: src/transport/gnunet-service-transport_neighbours.c:2566
-msgid "# peers connected"
-msgstr ""
-
 #: src/fs/gnunet-service-fs_cp.c:696
 msgid "# migration stop messages received"
 msgstr ""
@@ -2914,15 +2940,131 @@ msgstr ""
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gns_api.c:221
+#: src/gns/gnunet-gns.c:191
 #, fuzzy
-msgid "Failed to connect to the GNS service!\n"
+msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-lookup.c:210
-msgid "Issue a request to the GNUnet Naming System, prints results."
+#: src/gns/gnunet-gns.c:232
+msgid "try to shorten a given GNS name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:235
+msgid "Lookup a record using GNS (NOT IMPLEMENTED)"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:238
+msgid "Get the authority of a particular name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:241
+msgid "Specify the type of the record lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:244
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:255
+msgid "GNUnet GNS access tool"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:280
+#, fuzzy, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:333
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:377
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:439
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns-fcfsd.c:498
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "发送消息失败。\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:514
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:725 src/gns/gnunet-gns-fcfsd.c:737
+#, fuzzy, c-format
+msgid "Option `%s' not specified in configuration section `%s'\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:747 src/namestore/gnunet-namestore.c:299
+#, fuzzy
+msgid "Failed to read or create private zone key\n"
+msgstr "无法为守护程序创建用户账户。"
+
+#: src/gns/gnunet-gns-fcfsd.c:757 src/namestore/gnunet-namestore.c:310
+#, fuzzy
+msgid "Failed to connect to namestore\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:773 src/gns/gnunet-gns-proxy.c:525
+#, fuzzy
+msgid "Failed to start HTTP server\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-gns-fcfsd.c:804
+msgid "GNUnet GNS first come first serve registration service"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:800
+msgid "listen on specified port"
+msgstr ""
+
+#: src/gns/gnunet-gns-proxy.c:811
+msgid "GNUnet GNS proxy"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:122
+msgid "Call with name of HELLO file to modify.\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:128
+#, fuzzy, c-format
+msgid "Error accessing file `%s': %s\n"
+msgstr "创建用户出错"
+
+#: src/hello/gnunet-hello.c:136
+#, c-format
+msgid "File `%s' is too big to be a HELLO\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:143
+#, c-format
+msgid "File `%s' is too small to be a HELLO\n"
+msgstr ""
+
+#: src/hello/gnunet-hello.c:153 src/hello/gnunet-hello.c:181
+#, fuzzy, c-format
+msgid "Error opening file `%s': %s\n"
+msgstr "创建用户出错"
+
+#: src/hello/gnunet-hello.c:169
+#, c-format
+msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr ""
 
+#: src/hello/gnunet-hello.c:193
+#, fuzzy, c-format
+msgid "Error writing HELLO to file `%s': %s\n"
+msgstr "创建用户出错"
+
 #: src/hostlist/gnunet-daemon-hostlist.c:264
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
@@ -2951,190 +3093,190 @@ msgstr ""
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:286
+#: src/hostlist/hostlist-client.c:289
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:340
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
+#: src/hostlist/hostlist-client.c:313 src/hostlist/hostlist-client.c:343
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:330
+#: src/hostlist/hostlist-client.c:331
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
+#: src/hostlist/hostlist-client.c:375 src/hostlist/hostlist-client.c:396
 #, c-format
 msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
-#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
-#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
-#: src/transport/plugin_transport_http_client.c:108
-#: src/transport/plugin_transport_http_client.c:123
+#: src/hostlist/hostlist-client.c:473 src/hostlist/hostlist-client.c:683
+#: src/hostlist/hostlist-client.c:689 src/hostlist/hostlist-client.c:741
+#: src/hostlist/hostlist-client.c:750 src/hostlist/hostlist-client.c:871
+#: src/hostlist/hostlist-client.c:961 src/hostlist/hostlist-client.c:966
+#: src/transport/plugin_transport_http_client.c:110
+#: src/transport/plugin_transport_http_client.c:125
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1342
+#: src/hostlist/hostlist-client.c:593 src/hostlist/hostlist-client.c:1331
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:622
+#: src/hostlist/hostlist-client.c:623
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:663
+#: src/hostlist/hostlist-client.c:664
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:805
+#: src/hostlist/hostlist-client.c:802
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:822
+#: src/hostlist/hostlist-client.c:816
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:842
+#: src/hostlist/hostlist-client.c:836
 #, fuzzy, c-format
-msgid "%s failed for `%s' at %s:%d: `%s'\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+msgid "Download of hostlist from `%s' failed: `%s'\n"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/hostlist/hostlist-client.c:848
+#: src/hostlist/hostlist-client.c:842
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:856
+#: src/hostlist/hostlist-client.c:850
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:909
+#: src/hostlist/hostlist-client.c:903
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
+#: src/hostlist/hostlist-client.c:911
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1515
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1505
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1054
+#: src/hostlist/hostlist-client.c:1046
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1092
+#: src/hostlist/hostlist-client.c:1084
 msgid "Scheduled saving of hostlists\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1096
+#: src/hostlist/hostlist-client.c:1088
 #, c-format
 msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1119 src/hostlist/hostlist-client.c:1135
+#: src/hostlist/hostlist-client.c:1111 src/hostlist/hostlist-client.c:1127
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1253
+#: src/hostlist/hostlist-client.c:1242
 #, c-format
 msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1284
+#: src/hostlist/hostlist-client.c:1273
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/hostlist/hostlist-client.c:1279
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1283
 #, c-format
 msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1305
+#: src/hostlist/hostlist-client.c:1294
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
-#: src/hostlist/hostlist-client.c:1338
+#: src/hostlist/hostlist-client.c:1327
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1340
+#: src/hostlist/hostlist-client.c:1329
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1362
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1387
+#: src/hostlist/hostlist-client.c:1376
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址：%s\n"
 
-#: src/hostlist/hostlist-client.c:1392
+#: src/hostlist/hostlist-client.c:1381
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1416 src/hostlist/hostlist-client.c:1433
+#: src/hostlist/hostlist-client.c:1405 src/hostlist/hostlist-client.c:1422
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1428
+#: src/hostlist/hostlist-client.c:1417
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1480
+#: src/hostlist/hostlist-client.c:1470
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1483
+#: src/hostlist/hostlist-client.c:1473
 #, c-format
 msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1482
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1504
+#: src/hostlist/hostlist-client.c:1494
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1508
+#: src/hostlist/hostlist-client.c:1498
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
@@ -3147,8 +3289,10 @@ msgstr ""
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:184
-#: src/topology/gnunet-daemon-topology.c:875
+#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:425
+#: src/peerinfo-tool/gnunet-peerinfo.c:403
+#: src/peerinfo-tool/gnunet-peerinfo.c:519
+#: src/topology/gnunet-daemon-topology.c:927
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
@@ -3157,246 +3301,553 @@ msgstr ""
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:221
+#: src/hostlist/hostlist-server.c:219
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:269
+#: src/hostlist/hostlist-server.c:263
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:272
+#: src/hostlist/hostlist-server.c:266
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:280
+#: src/hostlist/hostlist-server.c:273
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:287
+#: src/hostlist/hostlist-server.c:279
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:291
+#: src/hostlist/hostlist-server.c:283
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:299
+#: src/hostlist/hostlist-server.c:291
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:294
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:306
+#: src/hostlist/hostlist-server.c:298
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:307
+#: src/hostlist/hostlist-server.c:299
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:350
+#: src/hostlist/hostlist-server.c:341
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:397
+#: src/hostlist/hostlist-server.c:388
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:565
+#: src/hostlist/hostlist-server.c:561
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:574
+#: src/hostlist/hostlist-server.c:570
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:588
+#: src/hostlist/hostlist-server.c:584
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:626
+#: src/hostlist/hostlist-server.c:624
+#, fuzzy, c-format
+msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/hostlist/hostlist-server.c:666
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4595
+#: src/integration-tests/connection_watchdog.c:997
+#, c-format
+msgid "Transport plugin: `%s' port %llu\n"
+msgstr ""
+
+#: src/integration-tests/connection_watchdog.c:1030
+#, fuzzy, c-format
+msgid "Found %u transport plugins: `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/integration-tests/connection_watchdog.c:1089
+msgid "Send ping messages to test connectivity (default == NO)"
+msgstr ""
+
+#: src/integration-tests/connection_watchdog.c:1095
+#: src/template/gnunet-template.c:68
+msgid "help text"
+msgstr ""
+
+#: src/mesh/gnunet-service-mesh.c:4590
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:4789
+#: src/mesh/gnunet-service-mesh.c:4784
 #, fuzzy
 msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/mesh/gnunet-service-mesh.c:4798
+#: src/mesh/gnunet-service-mesh.c:4793
 #, fuzzy
 msgid "Mesh service could not access hostkey.  Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/namestore/namestore_api.c:272 src/namestore/namestore_api.c:313
+#: src/mysql/mysql.c:174
+#, c-format
+msgid "Trying to use file `%s' for MySQL configuration.\n"
+msgstr ""
+
+#: src/mysql/mysql.c:181
+#, fuzzy, c-format
+msgid "Could not access file `%s': %s\n"
+msgstr "无法解析“%s”(%s)：%s\n"
+
+#: src/namestore/gnunet-namestore.c:157
+#, c-format
+msgid "Adding record failed: %s\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:183
+#, c-format
+msgid "Deleting record failed: %s\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:239
+#, c-format
+msgid "\tCorrupt or unsupported record of type %u\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:276
+#, c-format
+msgid "Option `%s' not given, but I need a zone key file!\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:281
+#, fuzzy, c-format
+msgid "Using default zone file `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
+#: src/namestore/gnunet-namestore.c:291
+#, c-format
+msgid "No options given\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:321
+#, fuzzy, c-format
+msgid "Unsupported type `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/namestore/gnunet-namestore.c:328 src/namestore/gnunet-namestore.c:350
+#: src/namestore/gnunet-namestore.c:374 src/namestore/gnunet-namestore.c:384
+#: src/namestore/gnunet-namestore.c:409
+#, fuzzy, c-format
+msgid "Missing option `%s' for operation `%s'\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/namestore/gnunet-namestore.c:329 src/namestore/gnunet-namestore.c:351
+msgid "add/del"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:341
+#, c-format
+msgid "Value `%s' invalid for record type `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:366
+#, fuzzy, c-format
+msgid "Invalid time format `%s'\n"
+msgstr "IP 格式无效：“%s”\n"
+
+#: src/namestore/gnunet-namestore.c:375 src/namestore/gnunet-namestore.c:385
+msgid "add"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:410
+msgid "del"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:462
+msgid "add record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:465
+msgid "delete record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:468
+msgid "display records"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:471
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:474
+msgid "name of the record to add/delete/display"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:477
+msgid "type of the record to add/delete/display"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:480
+msgid "value of the record to add/delete"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:483
+msgid "create or list public record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:486
+msgid "create or list non-authority record"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:489
+msgid "filename with the zone key"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:500
+#, fuzzy
+msgid "GNUnet zone manipulation tool"
+msgstr "GNUnet 配置"
+
+#: src/namestore/gnunet-service-namestore.c:143
+#, c-format
+msgid "File zone `%s' but corrupt content already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:154
+#, c-format
+msgid "File zone `%s' containing this key already exists\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:160
+#, c-format
+msgid ""
+"File zone `%s' but different zone key already exists, failed to write! \n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:198
+#, fuzzy, c-format
+msgid "Stored zonekey for zone `%s' in file `%s'\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/namestore/gnunet-service-namestore.c:1909
+msgid "No directory to load zonefiles specified in configuration\n"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:1918
+#, c-format
+msgid "Creating directory `%s' for zone files failed!\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:315 src/namestore/namestore_api.c:353
 msgid "Namestore added record successfully"
 msgstr ""
 
-#: src/namestore/namestore_api.c:281 src/namestore/namestore_api.c:322
+#: src/namestore/namestore_api.c:323
 msgid "Namestore failed to add record"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:289
+#: src/namestore/namestore_api.c:361
+msgid "Namestore record already existed"
+msgstr ""
+
+#: src/namestore/namestore_api.c:368
+msgid "Namestore failed to add record\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:401
+#, fuzzy
+msgid "Namestore removed record successfully"
+msgstr "GNUnet 服务安装成功。\n"
+
+#: src/namestore/namestore_api.c:408
+msgid "No records for entry"
+msgstr ""
+
+#: src/namestore/namestore_api.c:415
+#, fuzzy
+msgid "Could not find record to remove"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/namestore/namestore_api.c:422
+#, fuzzy
+msgid "Failed to create new signature"
+msgstr "发送消息失败。\n"
+
+#: src/namestore/namestore_api.c:429
+msgid "Failed to put new set of records in database"
+msgstr ""
+
+#: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:328
+#: src/nat/gnunet-nat-server.c:318
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat.c:803
+#: src/nat/nat.c:799
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:852
+#: src/nat/nat.c:844
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/nat/nat.c:1121
+#: src/nat/nat.c:1111
 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/nat/nat.c:1187 src/nat/nat.c:1197
+#: src/nat/nat.c:1177 src/nat/nat.c:1187
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1329
+#: src/nat/nat.c:1321
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1341
+#: src/nat/nat.c:1332
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/nat_test.c:348
+#: src/nat/nat_test.c:341
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/nat/nat_test.c:418
+#: src/nat/nat_test.c:411
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:926
+#: src/nse/gnunet-nse-profiler.c:928
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-service-nse.c:936
+#: src/nse/gnunet-service-nse.c:925
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1391 src/nse/gnunet-service-nse.c:1410
-#: src/nse/gnunet-service-nse.c:1431
+#: src/nse/gnunet-service-nse.c:1381 src/nse/gnunet-service-nse.c:1400
+#: src/nse/gnunet-service-nse.c:1421
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1398
+#: src/nse/gnunet-service-nse.c:1388
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1419
+#: src/nse/gnunet-service-nse.c:1409
 #, fuzzy
 msgid "NSE service could not access hostkey.  Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:133
+#: src/peerinfo/gnunet-service-peerinfo.c:134
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:195
+#: src/peerinfo/gnunet-service-peerinfo.c:203
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:229
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:239
+#: src/peerinfo/gnunet-service-peerinfo.c:254
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:305
+#: src/peerinfo/gnunet-service-peerinfo.c:353
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:279
-#, fuzzy, c-format
-msgid "Failed to transmit message to `%s' service.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/peerinfo/peerinfo_api.c:435
-msgid "Failed to receive response from `PEERINFO' service."
+#: src/peerinfo/gnunet-service-peerinfo.c:710
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:463 src/peerinfo/peerinfo_api.c:481
-msgid "Received invalid message from `PEERINFO' service.\n"
+#: src/peerinfo/peerinfo_api.c:238
+msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:523
+#: src/peerinfo/peerinfo_api.c:358
 #, fuzzy
-msgid "Failed to transmit iteration request to `PEERINFO' service\n"
+msgid "failed to transmit request (service down?)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/peerinfo/peerinfo_api.c:557
-msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
+#: src/peerinfo/peerinfo_api.c:505
+msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api_notify.c:258
+#: src/peerinfo/peerinfo_api.c:531 src/peerinfo/peerinfo_api.c:550
+#: src/peerinfo/peerinfo_api.c:565 src/peerinfo/peerinfo_api.c:576
+#: src/peerinfo/peerinfo_api.c:587
+#, fuzzy
+msgid "Received invalid message from `PEERINFO' service."
+msgstr "“%s”的参数无效。\n"
+
+#: src/peerinfo/peerinfo_api.c:663
+#, fuzzy
+msgid "Timeout transmitting iteration request to `PEERINFO' service."
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/peerinfo/peerinfo_api_notify.c:256
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:216
+#: src/peerinfo-tool/gnunet-peerinfo.c:581
+#, fuzzy
+msgid "Failed to parse HELLO message: missing expiration time\n"
+msgstr "保存配置失败。"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:589
+#, fuzzy
+msgid "Failed to parse HELLO message: invalid expiration time\n"
+msgstr "保存配置失败。"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:598
+#, fuzzy
+msgid "Failed to parse HELLO message: malformed\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:608
+msgid "Failed to parse HELLO message: missing transport plugin\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:625
+#, c-format
+msgid "Plugin `%s' not found\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:634
+#, c-format
+msgid "Plugin `%s' does not support URIs yet\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:653
+#, fuzzy, c-format
+msgid "Failed to parse `%s' as an address for plugin `%s'\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:685
+#, c-format
+msgid "Failure adding HELLO: %s\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:833
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:223
+#: src/peerinfo-tool/gnunet-peerinfo.c:840
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:235
+#: src/peerinfo-tool/gnunet-peerinfo.c:875
+#, fuzzy, c-format
+msgid "Invalid URI `%s'\n"
+msgstr "无效条目。\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:899
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:255
+#: src/peerinfo-tool/gnunet-peerinfo.c:936
+msgid "don't resolve host names"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:939
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/peerinfo-tool/gnunet-peerinfo.c:942
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:264
+#: src/peerinfo-tool/gnunet-peerinfo.c:945
+#, fuzzy
+msgid "list all known peers"
+msgstr "列出所有网络适配器"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:948
+msgid "also output HELLO uri(s)"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:951
+msgid "add given HELLO uri to the database"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:957
 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
+#: src/transport/gnunet-service-transport_plugins.c:118
+#, c-format
+msgid "Starting transport plugins `%s'\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
+#: src/transport/gnunet-service-transport_plugins.c:122
+#, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
+#: src/transport/gnunet-service-transport_plugins.c:150
+#, fuzzy, c-format
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/postgres/postgres.c:59
+#, fuzzy, c-format
+msgid "`%s:%s' failed at %s:%d with error: %s"
+msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
+
+#: src/postgres/postgres.c:148
+#, fuzzy, c-format
+msgid "Unable to initialize Postgres: %s"
+msgstr "无法初始化 SQLite：%s。\n"
+
 #: src/pt/gnunet-daemon-pt.c:264
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
@@ -3455,48 +3906,64 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:209
+#: src/statistics/gnunet-service-statistics.c:271
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:267
+#: src/statistics/gnunet-service-statistics.c:330
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:98
+#: src/statistics/gnunet-statistics.c:122
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:164
+#: src/statistics/gnunet-statistics.c:199
+#, c-format
+msgid "No subsystem or name given\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:207
+#, fuzzy, c-format
+msgid "Failed to initialize watch routine\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/statistics/gnunet-statistics.c:227
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:167
+#: src/statistics/gnunet-statistics.c:230
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:170
+#: src/statistics/gnunet-statistics.c:233
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:173
+#: src/statistics/gnunet-statistics.c:236
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:180
+#: src/statistics/gnunet-statistics.c:239
+msgid "watch value continously"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:246
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/statistics_api.c:390
+#: src/statistics/statistics_api.c:456
 #, fuzzy
-msgid "Failed to connect to statistics service!\n"
+msgid "Could not save some persistent statistics\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/template/gnunet-template.c:68
-msgid "help text"
+#: src/statistics/statistics_api.c:999
+msgid ""
+"Failed to receive acknowledgement from statistics service, some statistics "
+"might have been lost!\n"
 msgstr ""
 
 #: src/testing/gnunet-testing.c:157
@@ -3546,597 +4013,434 @@ msgstr "立即保存配置？"
 msgid "Could not access hostkey.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/testing.c:204
+#: src/testing/testing.c:200
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:218 src/testing/testing.c:808
+#: src/testing/testing.c:214 src/testing/testing.c:798
 msgid "`scp' did not complete cleanly.\n"
 msgstr ""
 
-#: src/testing/testing.c:239
+#: src/testing/testing.c:237
 #, fuzzy
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:240
+#: src/testing/testing.c:238
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:292
+#: src/testing/testing.c:286
 #, fuzzy, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:299
+#: src/testing/testing.c:293
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:300 src/testing/testing.c:488
+#: src/testing/testing.c:294 src/testing/testing.c:471
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:360
+#: src/testing/testing.c:354
 #, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:364
+#: src/testing/testing.c:358
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr ""
 
-#: src/testing/testing.c:374
+#: src/testing/testing.c:368
 #, fuzzy
 msgid "Failed to get hostkey!\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:406
+#: src/testing/testing.c:400
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:480
+#: src/testing/testing.c:463
 #, fuzzy, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:487
+#: src/testing/testing.c:470
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:509 src/testing/testing.c:612
+#: src/testing/testing.c:493 src/testing/testing.c:600
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:510 src/testing/testing.c:613
-#: src/testing/testing.c:633
+#: src/testing/testing.c:494 src/testing/testing.c:601
+#: src/testing/testing.c:621
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:582
+#: src/testing/testing.c:570
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:632
+#: src/testing/testing.c:620
 msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
 msgstr ""
 
-#: src/testing/testing.c:653 src/testing/testing.c:685
+#: src/testing/testing.c:643 src/testing/testing.c:675
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:668 src/testing/testing.c:723
+#: src/testing/testing.c:658 src/testing/testing.c:713
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr ""
 
-#: src/testing/testing.c:796
+#: src/testing/testing.c:786
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:966
+#: src/testing/testing.c:948
 #, fuzzy, c-format
 msgid "Starting service %s for peer `%4s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/testing/testing.c:1237 src/testing/testing_group.c:6278
+#: src/testing/testing.c:1207 src/testing/testing_group.c:6154
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/testing/testing.c:1322 src/testing/testing.c:1397
+#: src/testing/testing.c:1292 src/testing/testing.c:1359
 #, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "未知的用户“%s”\n"
 
-#: src/testing/testing.c:1480
+#: src/testing/testing.c:1448
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/testing/testing.c:1610
+#: src/testing/testing.c:1601
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1618
+#: src/testing/testing.c:1609
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "保存配置失败。"
 
-#: src/testing/testing.c:1647
+#: src/testing/testing.c:1636
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/testing/testing.c:1650
+#: src/testing/testing.c:1639
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "保存配置失败。"
 
-#: src/testing/testing.c:1805
+#: src/testing/testing.c:1794
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/testing/testing.c:1933
+#: src/testing/testing.c:1922
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "加载 sqstore 服务失败。检查您的配置！\n"
 
-#: src/testing/testing.c:2156
+#: src/testing/testing.c:2145
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1910 src/testing/testing_group.c:1922
-#: src/testing/testing_group.c:2023 src/testing/testing_group.c:2082
-#: src/testing/testing_group.c:2171 src/testing/testing_group.c:2191
-#: src/testing/testing_group.c:2328 src/testing/testing_peergroup.c:940
+#: src/testing/testing_group.c:1895 src/testing/testing_group.c:1907
+#: src/testing/testing_group.c:2008 src/testing/testing_group.c:2065
+#: src/testing/testing_group.c:2152 src/testing/testing_group.c:2172
+#: src/testing/testing_group.c:2302 src/testing/testing_peergroup.c:950
 #, fuzzy, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr "配置不满足配置规范文件“%s”的约束！\n"
 
-#: src/testing/testing_group.c:1932
-#, c-format
-msgid "Target is %d connections per peer."
-msgstr ""
-
-#: src/testing/testing_group.c:2179
+#: src/testing/testing_group.c:2160
 #, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2209 src/testing/testing_group.c:2402
-#, c-format
-msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2246
-#, c-format
-msgid "natural log of %d is %d, will run %d iterations\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2249
-#, c-format
-msgid "Total connections added thus far: %u!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2290
-#, c-format
-msgid "Total connections added for small world: %d!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2342
-#, c-format
-msgid "rand is %f probability is %f\n"
-msgstr ""
-
-#: src/testing/testing_group.c:2919 src/testing/testing_group.c:3118
+#: src/testing/testing_group.c:2877 src/testing/testing_group.c:3063
 #, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
 "file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3020
-msgid "Finished copying all friend files!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3133
-#, fuzzy, c-format
-msgid "Copying file with command cp %s %s\n"
-msgstr "“%s”以错误码 %s 失败：%s\n"
-
-#: src/testing/testing_group.c:3156
-#, fuzzy, c-format
-msgid "Copying file with command scp %s %s\n"
-msgstr "“%s”以错误码 %s 失败：%s\n"
-
-#: src/testing/testing_group.c:3173
-#, c-format
-msgid "Checking copy status of file %d\n"
+#: src/testing/testing_group.c:3957
+msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3191
-#, c-format
-msgid "File %d copied\n"
+#: src/testing/testing_group.c:5226
+msgid "Unknown topology specification, can't connect peers!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3206
+#: src/testing/testing_group.c:5944 src/transport/transport-testing.c:636
 #, fuzzy
-msgid "Finished copying all blacklist files!\n"
-msgstr "无法解析“%s”(%s)：%s\n"
-
-#: src/testing/testing_group.c:3586 src/testing/testing_group.c:3723
-#: src/testing/testing_group.c:4884 src/testing/testing_group.c:5025
-msgid "Delaying connect, we have too many outstanding connections!\n"
-msgstr ""
+msgid "Could not read hostkeys file!\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/testing_group.c:3596 src/testing/testing_group.c:4894
-#: src/testing/testing_group.c:5035
-#, c-format
-msgid "Creating connection, outstanding_connections is %d\n"
-msgstr ""
+#: src/testing/testing_group.c:6011
+#, fuzzy, c-format
+msgid "Could not create configuration for peer number %u on `%s'!\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing_group.c:3608
-#, c-format
-msgid "Offering HELLO of peer %s to peer %s\n"
+#: src/testing/testing_new.c:169
+msgid "tmppath cannot be NULL\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3734
+#: src/testing/testing_new.c:356
 #, c-format
-msgid "Creating connection, outstanding_connections is %d (max %d)\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3988
-msgid "Creating clique topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3993
-msgid "Creating small world (ring) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:3998
-msgid "Creating small world (2d-torus) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4002
-msgid "Creating ring topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4006
-msgid "Creating 2d torus topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4010
-msgid "Creating Erdos-Renyi topology\n"
+msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4014
-msgid "Creating InterNAT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4018
-msgid "Creating Scale Free topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4023
-msgid "Creating straight line topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4027
-msgid "Creating topology from file!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4043
-msgid "Creating no allowed topology (all peers can connect at core level)\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4058
-msgid "Failed during friend file copying!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4064
-msgid "Friend files created/copied successfully!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4081
-msgid "Blacklisting all but clique topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4087
-msgid "Blacklisting all but small world (ring) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4093
-msgid "Blacklisting all but small world (2d-torus) topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4099
-msgid "Blacklisting all but ring topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4105
-msgid "Blacklisting all but 2d torus topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:4111
-msgid "Blacklisting all but Erdos-Renyi topology\n"
-msgstr ""
+#: src/testing/testing_new.c:365
+#, fuzzy, c-format
+msgid "Could not open hostkeys file: %s\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/testing_group.c:4117
-msgid "Blacklisting all but InterNAT topology\n"
+#: src/testing/testing_new.c:380
+#, c-format
+msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4152
-msgid "Blacklisting all but Scale Free topology\n"
+#: src/testing/testing_new.c:437
+#, c-format
+msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4158
-msgid "Blacklisting all but straight line topology\n"
-msgstr ""
+#: src/testing/testing_new.c:446
+#, fuzzy, c-format
+msgid "Error while decoding key %u\n"
+msgstr "解析 dscl 输出时出错。\n"
 
-#: src/testing/testing_group.c:4173
+#: src/testing/testing_new.c:680
 #, fuzzy
-msgid "Failed during blacklist file copying!\n"
+msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing_group.c:4179
-msgid "Blacklist files created/copied successfully!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5263
-msgid "Creating clique CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5270
-msgid "Creating small world (ring) CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5277
-msgid "Creating small world (2d-torus) CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5283
-msgid "Creating ring CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5290
-msgid "Creating 2d torus CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5297
-msgid "Creating Erdos-Renyi CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5304
-msgid "Creating InterNAT CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5311
-msgid "Creating Scale Free CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5318
-msgid "Creating straight line CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5324
-msgid "Creating no CONNECT topology\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5330
-msgid "Unknown topology specification, can't connect peers!\n"
-msgstr ""
-
-#: src/testing/testing_group.c:5340
+#: src/testing/testing_new.c:691
 #, c-format
-msgid "Connecting random subset (%'.2f percent) of possible peers\n"
+msgid ""
+"You attempted to create a testbed with more than %u hosts.  Please "
+"precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5348
-#, c-format
-msgid "Connecting a minimum of %u peers each (if possible)\n"
-msgstr ""
+#: src/testing/testing_new.c:704
+#, fuzzy, c-format
+msgid "Failed to initialize hostkey for peer %u\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing_group.c:5357
-#, c-format
-msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
-msgstr ""
+#: src/testing/testing_new.c:734
+#, fuzzy, c-format
+msgid "Failed to write hostkey file for peer %u: %s\n"
+msgstr "发送消息失败。\n"
 
-#: src/testing/testing_group.c:5367
-#, c-format
-msgid "Finding additional %u closest peers each (if possible)\n"
-msgstr ""
+#: src/testing/testing_new.c:751
+#, fuzzy, c-format
+msgid "Failed to write configuration file `%s' for peer %u: %s\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing_group.c:6062 src/transport/transport-testing.c:650
-#, fuzzy
-msgid "Could not read hostkeys file!\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+#: src/testing/testing_new.c:791
+#, fuzzy, c-format
+msgid "Failed to start `%s': %s\n"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/testing/testing_group.c:6131
+#: src/testing/testing_new.c:959
 #, fuzzy, c-format
-msgid "Could not create configuration for peer number %u on `%s'!\n"
+msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/topology/gnunet-daemon-topology.c:244
+#: src/topology/gnunet-daemon-topology.c:259
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:380
+#: src/topology/gnunet-daemon-topology.c:392
 msgid "# connect requests issued to transport"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:675
-#: src/topology/gnunet-daemon-topology.c:761
+#: src/topology/gnunet-daemon-topology.c:730
+#: src/topology/gnunet-daemon-topology.c:815
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:950
+#: src/topology/gnunet-daemon-topology.c:996
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:982
+#: src/topology/gnunet-daemon-topology.c:1026
 #, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:994
+#: src/topology/gnunet-daemon-topology.c:1039
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1000
+#: src/topology/gnunet-daemon-topology.c:1045
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1009
+#: src/topology/gnunet-daemon-topology.c:1054
 #, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1017
+#: src/topology/gnunet-daemon-topology.c:1062
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1037
+#: src/topology/gnunet-daemon-topology.c:1082
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1050
+#: src/topology/gnunet-daemon-topology.c:1095
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1060
+#: src/topology/gnunet-daemon-topology.c:1105
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1066
+#: src/topology/gnunet-daemon-topology.c:1111
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1076
+#: src/topology/gnunet-daemon-topology.c:1121
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1082
+#: src/topology/gnunet-daemon-topology.c:1127
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1089
+#: src/topology/gnunet-daemon-topology.c:1134
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1169
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1183
+#: src/topology/gnunet-daemon-topology.c:1224
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1323
+#: src/topology/gnunet-daemon-topology.c:1363
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:247
+#: src/transport/gnunet-service-transport_blacklist.c:246
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:254
+#: src/transport/gnunet-service-transport_blacklist.c:252
 #, c-format
 msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:266
+#: src/transport/gnunet-service-transport_blacklist.c:263
 #, fuzzy, c-format
 msgid "Failed to read blacklist from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:287
-#: src/transport/gnunet-service-transport_blacklist.c:311
+#: src/transport/gnunet-service-transport_blacklist.c:284
+#: src/transport/gnunet-service-transport_blacklist.c:308
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:298
-#: src/transport/gnunet-service-transport_blacklist.c:336
+#: src/transport/gnunet-service-transport_blacklist.c:295
+#: src/transport/gnunet-service-transport_blacklist.c:331
 #, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:350
+#: src/transport/gnunet-service-transport_blacklist.c:345
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:364
+#: src/transport/gnunet-service-transport_blacklist.c:359
 #, c-format
 msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:523
-#: src/transport/gnunet-service-transport_blacklist.c:764
+#: src/transport/gnunet-service-transport_blacklist.c:514
+#: src/transport/gnunet-service-transport_blacklist.c:747
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:158
+#: src/transport/gnunet-service-transport.c:163
 msgid "# bytes payload discarded due to not connected peer "
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:572
+#: src/transport/gnunet-service-transport.c:237
+msgid "# bytes total received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:284
+msgid "# bytes payload received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:582
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:581
+#: src/transport/gnunet-service-transport.c:591
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:353
+#: src/transport/gnunet-service-transport_clients.c:352
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:358
+#: src/transport/gnunet-service-transport_clients.c:357
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:510
+#: src/transport/gnunet-service-transport_clients.c:503
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:628
-msgid "# bytes payload received for other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_clients.c:645
+#: src/transport/gnunet-service-transport_clients.c:631
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:696
+#: src/transport/gnunet-service-transport_clients.c:682
 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
@@ -4144,582 +4448,526 @@ msgstr ""
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:482
-msgid "# failed connection attempts due to timeout"
+#: src/transport/gnunet-service-transport_neighbours.c:1032
+msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:883
-msgid "# peers disconnected due to external request"
+#: src/transport/gnunet-service-transport_neighbours.c:1148
+#: src/transport/gnunet-service-transport_neighbours.c:1482
+msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:966
-#, fuzzy
-msgid "# fast reconnects failed"
+#: src/transport/gnunet-service-transport_neighbours.c:1153
+msgid "# messages transmitted to other peers"
 msgstr ""
-"\n"
-"按任意键继续\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1022
-msgid "# peers disconnected due to timeout"
+#: src/transport/gnunet-service-transport_neighbours.c:1158
+msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1215
+msgid "# messages timed out while in transport queue"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1254
 msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1088
-msgid "# peers disconnected due to global disconnect"
+#: src/transport/gnunet-service-transport_neighbours.c:1278
+msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1888
-#: src/transport/gnunet-service-transport_neighbours.c:1909
-msgid "# messages not sent (no such peer or not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:1286
+msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1925
-msgid "# bytes in message queue for other peers"
+#: src/transport/gnunet-service-transport_neighbours.c:1323
+msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:1332
+msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1977
+#: src/transport/gnunet-service-transport_neighbours.c:1388
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2013
+#: src/transport/gnunet-service-transport_neighbours.c:1422
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2031
+#: src/transport/gnunet-service-transport_neighbours.c:1438
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2060
-msgid "# KEEPALIVE messages discarded (not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:2544
+msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2113
-msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
+#: src/transport/gnunet-service-transport_neighbours.c:2559
+#: src/transport/gnunet-service-transport_neighbours.c:2585
+msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2121
-msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
+#: src/transport/gnunet-service-transport_neighbours.c:2598
+msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2627
+msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2187
+#: src/transport/gnunet-service-transport_neighbours.c:2807
+msgid "# unexpected SESSION ACK messages"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:2856
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2205
+#: src/transport/gnunet-service-transport_neighbours.c:2870
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2323
+#: src/transport/gnunet-service-transport_neighbours.c:2901
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2336
+#: src/transport/gnunet-service-transport_neighbours.c:2912
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2411
-msgid "# unexpected CONNECT_ACK messages (no peer)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_neighbours.c:2453
-msgid "# unexpected CONNECT_ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:2943
+msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2544
-msgid "# unexpected ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:3020
+msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
 #: src/transport/gnunet-service-transport_plugins.c:111
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:118
-#, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_plugins.c:122
-#, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_plugins.c:150
-#, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/transport/gnunet-service-transport_validation.c:410
+#: src/transport/gnunet-service-transport_validation.c:414
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:459
+#: src/transport/gnunet-service-transport_validation.c:463
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:508
+#: src/transport/gnunet-service-transport_validation.c:512
 msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:566
+#: src/transport/gnunet-service-transport_validation.c:570
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:798
+#: src/transport/gnunet-service-transport_validation.c:805
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:833
+#: src/transport/gnunet-service-transport_validation.c:840
 #, c-format
 msgid ""
 "Not confirming PING with address `%s' since I cannot confirm having this "
 "address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:919
+#: src/transport/gnunet-service-transport_validation.c:924
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:928
+#: src/transport/gnunet-service-transport_validation.c:933
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1050
+#: src/transport/gnunet-service-transport_validation.c:1055
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1075
+#: src/transport/gnunet-service-transport_validation.c:1080
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1134
+#: src/transport/gnunet-service-transport_validation.c:1136
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:256
+#: src/transport/gnunet-transport.c:260
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:269
+#: src/transport/gnunet-transport.c:273
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:319
+#: src/transport/gnunet-transport.c:323
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:326
+#: src/transport/gnunet-transport.c:330
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:359
+#: src/transport/gnunet-transport.c:363
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:379
+#: src/transport/gnunet-transport.c:383
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:410
+#: src/transport/gnunet-transport.c:414
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:439
+#: src/transport/gnunet-transport.c:443
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:453
+#: src/transport/gnunet-transport.c:466
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:483
+#: src/transport/gnunet-transport.c:473
+#, c-format
+msgid "Peer `%s': %s <unable to resolve address>\n"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:501
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/transport/gnunet-transport.c:539
+#: src/transport/gnunet-transport.c:569
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-transport.c:587
+#: src/transport/gnunet-transport.c:618
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:590
+#: src/transport/gnunet-transport.c:621
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:593
+#: src/transport/gnunet-transport.c:624
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:596
+#: src/transport/gnunet-transport.c:627
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:599
+#: src/transport/gnunet-transport.c:630
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:603
+#: src/transport/gnunet-transport.c:634
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:606
+#: src/transport/gnunet-transport.c:637
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:614
+#: src/transport/gnunet-transport.c:645
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_http.c:981
+#: src/transport/plugin_transport_http.c:1100
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1029
+#: src/transport/plugin_transport_http.c:1149
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/transport/plugin_transport_http.c:1054 src/util/service.c:986
+#: src/transport/plugin_transport_http.c:1174 src/util/service.c:1036
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_http.c:1071 src/util/service.c:1003
+#: src/transport/plugin_transport_http.c:1191 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/plugin_transport_http.c:1176
+#: src/transport/plugin_transport_http.c:1296
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1189
+#: src/transport/plugin_transport_http.c:1309
 #, c-format
 msgid "FREEING %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1264
+#: src/transport/plugin_transport_http.c:1386
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1277
+#: src/transport/plugin_transport_http.c:1399
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/transport/plugin_transport_http.c:1288
+#: src/transport/plugin_transport_http.c:1410
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1308
+#: src/transport/plugin_transport_http.c:1430
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1338
+#: src/transport/plugin_transport_http.c:1460
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:621
+#: src/transport/plugin_transport_http_client.c:624
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:189
+#: src/transport/plugin_transport_http_server.c:178
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:213
+#: src/transport/plugin_transport_http_server.c:202
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:370
-#, c-format
-msgid "Received malformed message via %s. Ignored.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:457
-msgid "SMTP filter string to invalid, lacks ': '\n"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:466
-#, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:561
-#: src/transport/plugin_transport_smtp.c:571
-#: src/transport/plugin_transport_smtp.c:584
-#: src/transport/plugin_transport_smtp.c:603
-#: src/transport/plugin_transport_smtp.c:626
-#: src/transport/plugin_transport_smtp.c:634
-#: src/transport/plugin_transport_smtp.c:647
-#: src/transport/plugin_transport_smtp.c:658
-#, c-format
-msgid "SMTP: `%s' failed: %s.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:801
-msgid "No email-address specified, can not start SMTP transport.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:813
-msgid "# bytes received via SMTP"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:814
-msgid "# bytes sent via SMTP"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:816
-msgid "# bytes dropped by SMTP (outgoing)"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:512
+#: src/transport/plugin_transport_tcp.c:591
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:616
-#: src/transport/plugin_transport_tcp.c:705
-#: src/transport/plugin_transport_tcp.c:757
-#: src/transport/plugin_transport_tcp.c:830
-#: src/transport/plugin_transport_tcp.c:909
+#: src/transport/plugin_transport_tcp.c:767
+#: src/transport/plugin_transport_tcp.c:856
+#: src/transport/plugin_transport_tcp.c:906
+#: src/transport/plugin_transport_tcp.c:992
+#: src/transport/plugin_transport_tcp.c:1086
+#: src/transport/plugin_transport_tcp.c:1103
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:622
-#: src/transport/plugin_transport_tcp.c:856
-#: src/transport/plugin_transport_tcp.c:1561
+#: src/transport/plugin_transport_tcp.c:774
+#: src/transport/plugin_transport_tcp.c:963
+#: src/transport/plugin_transport_tcp.c:1761
+#: src/transport/plugin_transport_tcp.c:2390
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:709
+#: src/transport/plugin_transport_tcp.c:860
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:760
+#: src/transport/plugin_transport_tcp.c:909
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:834
+#: src/transport/plugin_transport_tcp.c:996
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1081
+#: src/transport/plugin_transport_tcp.c:1290
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1116
-msgid "Found valid IPv4 NAT address (creating session)!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1186
+#: src/transport/plugin_transport_tcp.c:1401
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1603
+#: src/transport/plugin_transport_tcp.c:1802
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1756
+#: src/transport/plugin_transport_tcp.c:1973
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1823
+#: src/transport/plugin_transport_tcp.c:2043
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1962 src/util/service.c:889
+#: src/transport/plugin_transport_tcp.c:2279 src/util/service.c:940
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1976
+#: src/transport/plugin_transport_tcp.c:2293
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2039
+#: src/transport/plugin_transport_tcp.c:2355
 #, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2062
+#: src/transport/plugin_transport_tcp.c:2378
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2066
+#: src/transport/plugin_transport_tcp.c:2382
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2070
+#: src/transport/plugin_transport_tcp.c:2386
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:130
+#: src/transport/plugin_transport_udp_broadcasting.c:128
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:172
+#: src/transport/plugin_transport_udp_broadcasting.c:169
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:393
+#: src/transport/plugin_transport_udp_broadcasting.c:367
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1985
+#: src/transport/plugin_transport_udp.c:1894
+#, c-format
+msgid ""
+"UDP could not message to `%s': `%s'. Please check your network configuration "
+"and disable IPv6 if your connection does not have a global IPv6 address\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2138
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_udp.c:2068
+#: src/transport/plugin_transport_udp.c:2306
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2112
+#: src/transport/plugin_transport_udp.c:2349
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_unix.c:1051
+#: src/transport/plugin_transport_unix.c:1356
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_wlan.c:875
-msgid "# wlan session timeouts"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:899
-msgid "# wlan session created"
+#: src/transport/plugin_transport_wlan.c:561
+msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:980
-#: src/transport/plugin_transport_wlan.c:1138
-#: src/transport/plugin_transport_wlan.c:1159
-#: src/transport/plugin_transport_wlan.c:1190
-#: src/transport/plugin_transport_wlan.c:2334
-#: src/transport/plugin_transport_wlan.c:3142
-msgid "# wlan pending sessions"
+#: src/transport/plugin_transport_wlan.c:580
+msgid "# WLAN messages defragmented"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1233
-#: src/transport/plugin_transport_wlan.c:1888
-msgid "# wlan pending fragments"
+#: src/transport/plugin_transport_wlan.c:626
+#: src/transport/plugin_transport_wlan.c:676
+#: src/transport/plugin_transport_wlan.c:1696
+msgid "# WLAN sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1388
-#, c-format
-msgid ""
-"Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:1732
-msgid "# wlan hello beacons send"
+#: src/transport/plugin_transport_wlan.c:749
+msgid "# WLAN message fragments sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1765
-#: src/transport/plugin_transport_wlan.c:1968
-#: src/transport/plugin_transport_wlan.c:2059
-#, c-format
-msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
+#: src/transport/plugin_transport_wlan.c:767
+msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1954
-msgid "# wlan acks send"
+#: src/transport/plugin_transport_wlan.c:867
+#: src/transport/plugin_transport_wlan.c:948
+#: src/transport/plugin_transport_wlan.c:1698
+msgid "# WLAN MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2025
-msgid "# wlan fragments send"
+#: src/transport/plugin_transport_wlan.c:1119
+msgid "# HELLO messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2161
-#, c-format
-msgid "Wlan Address len %d is wrong\n"
+#: src/transport/plugin_transport_wlan.c:1140
+msgid "# fragments received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2295
-#: src/transport/plugin_transport_wlan.c:2919
-#: src/transport/plugin_transport_wlan.c:3145
-msgid "# wlan mac endpoints"
+#: src/transport/plugin_transport_wlan.c:1150
+msgid "# ACKs received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2517
-msgid "# wlan whole messages received"
+#: src/transport/plugin_transport_wlan.c:1207
+msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2708
-msgid "# wlan hello messages received"
+#: src/transport/plugin_transport_wlan.c:1306
+msgid "# DATA messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2742
-msgid "# wlan fragments received"
+#: src/transport/plugin_transport_wlan.c:1341
+msgid "# WLAN DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2790
-msgid "# wlan acks received"
+#: src/transport/plugin_transport_wlan.c:1402
+msgid "# HELLO beacons sent via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2879
-msgid "# wlan mac endpoints timeouts"
+#: src/transport/plugin_transport_wlan.c:1511
+msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:2903
-msgid "# wlan mac endpoints created"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:2956
-msgid "# wlan WLAN_HELPER_DATA received"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:1668
+#, fuzzy, c-format
+msgid "Invalid configuration option `%s' in section `%s'\n"
+msgstr "配置文件“%s”已写入。\n"
 
-#: src/transport/plugin_transport_wlan.c:3010
-msgid "# wlan messages for this client received"
+#: src/transport/plugin_transport_wlan.c:1677
+#, c-format
+msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3021
-msgid "# wlan messages inside WLAN_HELPER_DATA received"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:1687
+#, fuzzy, c-format
+msgid "Missing configuration option `%s' in section `%s'\n"
+msgstr "配置文件“%s”已写入。\n"
 
-#: src/transport/transport_api.c:588
+#: src/transport/transport_api.c:570
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
@@ -4753,134 +5001,127 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:304
+#: src/util/client.c:359
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:312
+#: src/util/client.c:367
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:657
+#: src/util/client.c:685
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:717 src/util/service.c:919
+#: src/util/client.c:740 src/util/service.c:970
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:859
+#: src/util/client.c:882
 #, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/util/client.c:875
+#: src/util/client.c:896
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1143
+#: src/util/client.c:1149
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:239 src/util/common_logging.c:889
+#: src/util/common_logging.c:239 src/util/common_logging.c:890
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:241 src/util/common_logging.c:887
+#: src/util/common_logging.c:241 src/util/common_logging.c:888
 msgid "INFO"
 msgstr "信息"
 
-#: src/util/common_logging.c:243 src/util/common_logging.c:885
+#: src/util/common_logging.c:243 src/util/common_logging.c:886
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:245 src/util/common_logging.c:883
+#: src/util/common_logging.c:245 src/util/common_logging.c:884
 msgid "ERROR"
 msgstr "错误"
 
-#: src/util/common_logging.c:247 src/util/common_logging.c:891
+#: src/util/common_logging.c:247 src/util/common_logging.c:892
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:609
+#: src/util/common_logging.c:610
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/common_logging.c:724
+#: src/util/common_logging.c:725
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:892
+#: src/util/common_logging.c:893
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:991
+#: src/util/common_logging.c:992
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1029
+#: src/util/common_logging.c:1030
 msgid "invalid address"
 msgstr ""
 
-#: src/util/configuration.c:245
+#: src/util/configuration.c:244
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/util/configuration.c:817
+#: src/util/configuration.c:816
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/connection.c:460
+#: src/util/connection.c:420
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/util/connection.c:475
+#: src/util/connection.c:435
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:629
+#: src/util/connection.c:550
 #, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
-#: src/util/connection.c:821 src/util/connection.c:992
+#: src/util/connection.c:739 src/util/connection.c:909
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/util/connection.c:830
+#: src/util/connection.c:748
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' (%p)\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/util/connection.c:983
+#: src/util/connection.c:900
 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
-#: src/util/connection.c:1465
-#, c-format
-msgid ""
-"Could not satisfy pending transmission request, socket closed or connect "
-"failed (%p).\n"
-msgstr ""
-
-#: src/util/container_bloomfilter.c:507
+#: src/util/container_bloomfilter.c:510
 #, c-format
 msgid ""
 "Size of file on disk is incorrect for this Bloom filter (want %llu, have "
@@ -4897,134 +5138,134 @@ msgstr ""
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/util/crypto_rsa.c:618 src/util/crypto_rsa.c:665
+#: src/util/crypto_rsa.c:661 src/util/crypto_rsa.c:708
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/crypto_rsa.c:623
+#: src/util/crypto_rsa.c:666
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_rsa.c:641
+#: src/util/crypto_rsa.c:684
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:669 src/util/crypto_rsa.c:705
+#: src/util/crypto_rsa.c:712 src/util/crypto_rsa.c:748
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:700
+#: src/util/crypto_rsa.c:743
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:720
+#: src/util/crypto_rsa.c:763
 #, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:738
+#: src/util/crypto_rsa.c:781
 #, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:959
+#: src/util/crypto_rsa.c:1032
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:479
+#: src/util/disk.c:498
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/disk.c:1087
+#: src/util/disk.c:1062
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录！\n"
 
-#: src/util/disk.c:1441 src/util/service.c:1580
+#: src/util/disk.c:1416 src/util/service.c:1650
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/util/disk.c:1759
+#: src/util/disk.c:1734
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
-#: src/util/getopt.c:672
+#: src/util/getopt.c:669
 #, c-format
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/util/getopt.c:696
+#: src/util/getopt.c:693
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s：选项“--%s”不允许有参数\n"
 
-#: src/util/getopt.c:701
+#: src/util/getopt.c:698
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s：选项“%c%s”不允许有参数\n"
 
-#: src/util/getopt.c:718 src/util/getopt.c:886
+#: src/util/getopt.c:715 src/util/getopt.c:883
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s：选项“%s”要求有一个参数\n"
 
-#: src/util/getopt.c:747
+#: src/util/getopt.c:744
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s：无法识别的选项“--%s”\n"
 
-#: src/util/getopt.c:751
+#: src/util/getopt.c:748
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s：无法识别的选项“%c%s”\n"
 
-#: src/util/getopt.c:776
+#: src/util/getopt.c:773
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s：非法选项 -- %c\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:775
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s：无效选项 -- %c\n"
 
-#: src/util/getopt.c:806 src/util/getopt.c:934
+#: src/util/getopt.c:803 src/util/getopt.c:931
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s：选项要求有一个参数 -- %c\n"
 
-#: src/util/getopt.c:854
+#: src/util/getopt.c:851
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s：选项“-W %s”有歧义\n"
 
-#: src/util/getopt.c:872
+#: src/util/getopt.c:869
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s：选项“-W %s” 不允许有参数\n"
 
-#: src/util/getopt.c:1038
+#: src/util/getopt.c:1035
 #, fuzzy, c-format
 msgid "Use %s to get a list of options.\n"
 msgstr "请使用 --help 获取选项列表。\n"
 
-#: src/util/getopt_helpers.c:84
+#: src/util/getopt_helpers.c:86
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "长选项的必选参数对短选项也是必选的。\n"
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:283
+#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:286
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
@@ -5037,6 +5278,27 @@ msgstr ""
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
+#: src/util/gnunet-rsa.c:64
+#, c-format
+msgid "No hostkey file specified on command line\n"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:112
+msgid "print the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:115
+msgid "print the hash of the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:118
+msgid "print the short hash of the public key in ASCII format"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:124
+msgid "Manipulate GNUnet private RSA key files"
+msgstr ""
+
 #: src/util/gnunet-service-resolver.c:288
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
@@ -5048,42 +5310,37 @@ msgstr "无法解析“%s”(%s)：%s\n"
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/util/gnunet-service-resolver.c:494
-#, c-format
-msgid "Resolver asked to look up `%s'.\n"
-msgstr ""
-
-#: src/util/gnunet-service-resolver.c:529
-#, c-format
-msgid "Resolver asked to look up IP address `%s'.\n"
-msgstr ""
-
-#: src/util/helper.c:239
+#: src/util/helper.c:244
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/helper.c:254
+#: src/util/helper.c:259
 #, c-format
 msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/util/helper.c:264
+#: src/util/helper.c:269
 #, c-format
 msgid "Got %u bytes from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:273
+#: src/util/helper.c:278
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/helper.c:432
+#: src/util/helper.c:310
+#, fuzzy, c-format
+msgid "Starting HELPER process `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
+#: src/util/helper.c:440
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/network.c:1196
+#: src/util/network.c:1200
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -5111,12 +5368,12 @@ msgstr "“%s”说：%s\n"
 msgid "stat (%s) failed: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/util/os_priority.c:304
+#: src/util/os_priority.c:305
 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for reading: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/os_priority.c:305
+#: src/util/os_priority.c:306
 #, fuzzy, c-format
 msgid "Failed to open named pipe `%s' for writing: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
@@ -5141,12 +5398,12 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/pseudonym.c:273
+#: src/util/pseudonym.c:276
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/pseudonym.c:338
+#: src/util/pseudonym.c:407 src/util/pseudonym.c:433
 msgid "no-name"
 msgstr "无名称"
 
@@ -5161,187 +5418,167 @@ msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:351
+#: src/util/resolver_api.c:347
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/util/resolver_api.c:355
+#: src/util/resolver_api.c:351
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:426
-#, c-format
-msgid "Resolver returns `%s' for IP `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:807
-#, c-format
-msgid "Resolver returns `%s'.\n"
-msgstr ""
-
-#: src/util/resolver_api.c:901
-#, c-format
-msgid "Resolving our FQDN `%s'\n"
-msgstr ""
-
-#: src/util/resolver_api.c:906
+#: src/util/resolver_api.c:890
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/resolver_api.c:938
-#, c-format
-msgid "Resolving our hostname `%s'\n"
-msgstr ""
-
-#: src/util/scheduler.c:866
+#: src/util/scheduler.c:786
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:996
+#: src/util/scheduler.c:916
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:397
+#: src/util/server.c:483
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/server.c:406
+#: src/util/server.c:492
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/server.c:411
+#: src/util/server.c:497
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/server.c:640
+#: src/util/server.c:827
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/service.c:117 src/util/service.c:143 src/util/service.c:186
-#: src/util/service.c:207 src/util/service.c:214
+#: src/util/service.c:135 src/util/service.c:161 src/util/service.c:204
+#: src/util/service.c:225 src/util/service.c:232
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/service.c:170
+#: src/util/service.c:188
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/util/service.c:263
+#: src/util/service.c:281
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
-#: src/util/service.c:296
+#: src/util/service.c:313
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 
-#: src/util/service.c:326
+#: src/util/service.c:343
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
 
-#: src/util/service.c:668
+#: src/util/service.c:698
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:673
+#: src/util/service.c:703
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/util/service.c:680
+#: src/util/service.c:710
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:724
+#: src/util/service.c:765
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:752
+#: src/util/service.c:802
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:869
+#: src/util/service.c:920
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:939
+#: src/util/service.c:990
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:956
+#: src/util/service.c:1007
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1191
+#: src/util/service.c:1241
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1242 src/util/service.c:1260
+#: src/util/service.c:1292 src/util/service.c:1310
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1287
+#: src/util/service.c:1337
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1442
+#: src/util/service.c:1506
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/util/service.c:1475
+#: src/util/service.c:1539
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1521
+#: src/util/service.c:1588
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1525
+#: src/util/service.c:1592
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1529
+#: src/util/service.c:1596
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1581
+#: src/util/service.c:1651
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/util/service.c:1594
+#: src/util/service.c:1664
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”：%s\n"
 
-#: src/util/service.c:1657
+#: src/util/service.c:1729
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5350,54 +5587,75 @@ msgstr ""
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
 
-#: src/util/strings.c:143
+#: src/util/strings.c:144
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:354
+#: src/util/strings.c:334
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:462
+#: src/util/strings.c:481
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
 
-#: src/util/strings.c:554
+#: src/util/strings.c:573
 msgid "ms"
 msgstr "毫秒"
 
-#: src/util/strings.c:559
+#: src/util/strings.c:578
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:563
+#: src/util/strings.c:582
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:567
+#: src/util/strings.c:586
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:571
+#: src/util/strings.c:590
 msgid "h"
 msgstr "时"
 
-#: src/util/strings.c:575
+#: src/util/strings.c:594
 msgid " days"
 msgstr " 天"
 
-#: src/util/strings.c:599
+#: src/util/strings.c:618
 msgid "end of time"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1065
+#: src/util/strings.c:1012
+msgid "IPv6 address did not start with `['\n"
+msgstr ""
+
+#: src/util/strings.c:1020
+msgid "IPv6 address did contain ':' to separate port number\n"
+msgstr ""
+
+#: src/util/strings.c:1026
+msgid "IPv6 address did contain ']' before ':' to separate port number\n"
+msgstr ""
+
+#: src/util/strings.c:1033
+msgid "IPv6 address did contain a valid port number after the last ':'\n"
+msgstr ""
+
+#: src/util/strings.c:1042
+#, fuzzy, c-format
+msgid "Invalid IPv6 address `%s': %s\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/vpn/gnunet-service-vpn.c:511 src/vpn/gnunet-service-vpn.c:1071
 msgid "# Active tunnels"
 msgstr ""
 
 #: src/vpn/gnunet-service-vpn.c:608 src/vpn/gnunet-service-vpn.c:645
 #, fuzzy
-msgid "# Peers connected to mesh tunnels"
+msgid "# peers connected to mesh tunnels"
 msgstr ""
 "\n"
 "按任意键继续\n"
@@ -5419,70 +5677,70 @@ msgstr ""
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "发送消息失败。\n"
 
-#: src/vpn/gnunet-service-vpn.c:967
+#: src/vpn/gnunet-service-vpn.c:973
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1285
+#: src/vpn/gnunet-service-vpn.c:1291
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1306
+#: src/vpn/gnunet-service-vpn.c:1312
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1511
+#: src/vpn/gnunet-service-vpn.c:1517
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1549 src/vpn/gnunet-service-vpn.c:1590
+#: src/vpn/gnunet-service-vpn.c:1555 src/vpn/gnunet-service-vpn.c:1596
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1600
+#: src/vpn/gnunet-service-vpn.c:1606
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1614
+#: src/vpn/gnunet-service-vpn.c:1620
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1697
+#: src/vpn/gnunet-service-vpn.c:1704
 msgid "# ICMP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2038
+#: src/vpn/gnunet-service-vpn.c:2045
 msgid "# UDP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2196
+#: src/vpn/gnunet-service-vpn.c:2203
 msgid "# TCP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2347
+#: src/vpn/gnunet-service-vpn.c:2354
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2402
+#: src/vpn/gnunet-service-vpn.c:2409
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2441 src/vpn/gnunet-service-vpn.c:2624
+#: src/vpn/gnunet-service-vpn.c:2448 src/vpn/gnunet-service-vpn.c:2661
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2726
+#: src/vpn/gnunet-service-vpn.c:2734
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3133
+#: src/vpn/gnunet-service-vpn.c:3141
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3165
+#: src/vpn/gnunet-service-vpn.c:3173
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -5556,23 +5814,66 @@ msgstr ""
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:479 src/include/gnunet_common.h:484
-#: src/include/gnunet_common.h:490
+#: src/include/gnunet_common.h:497 src/include/gnunet_common.h:502
+#: src/include/gnunet_common.h:508
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:500
+#: src/include/gnunet_common.h:518
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:521 src/include/gnunet_common.h:528
+#: src/include/gnunet_common.h:539 src/include/gnunet_common.h:546
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "# Peers connected"
+#~ msgstr ""
+#~ "\n"
+#~ "按任意键继续\n"
+
+#, fuzzy
+#~ msgid "%s failed for `%s' at %s:%d: `%s'\n"
+#~ msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize Postgres with configuration `%s': %s"
+#~ msgstr "无法保存配置文件“%s”："
+
+#, fuzzy
+#~ msgid "Copying file with RENAME (%s,%s)\n"
+#~ msgstr "“%s”以错误码 %s 失败：%s\n"
+
+#, fuzzy
+#~ msgid "Copying file with command scp %s %s\n"
+#~ msgstr "“%s”以错误码 %s 失败：%s\n"
+
+#, fuzzy
+#~ msgid "Finished copying all blacklist files!\n"
+#~ msgstr "无法解析“%s”(%s)：%s\n"
+
+#, fuzzy
+#~ msgid "Failed during blacklist file copying!\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "# fast reconnects failed"
+#~ msgstr ""
+#~ "\n"
+#~ "按任意键继续\n"
+
+#~ msgid "Unknown user `%s'\n"
+#~ msgstr "未知的用户“%s”\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to statistics service!\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
 #~ msgid "Failed to send to `%s': %s\n"
 #~ msgstr "打开日志文件“%s”失败：%s\n"
 
@@ -5625,14 +5926,6 @@ msgstr ""
 #~ msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy
-#~ msgid "Failed to get full path for `%s'\n"
-#~ msgstr "解析配置文件“%s”失败\n"
-
-#, fuzzy
-#~ msgid "Failed to create file for dhtlog.\n"
-#~ msgstr "无法为守护程序创建用户账户。"
-
-#, fuzzy
 #~ msgid "Phase 3: sending messages\n"
 #~ msgstr "发送消息失败。\n"
 
@@ -5640,10 +5933,6 @@ msgstr ""
 #~ msgid "Fail! Could not connect peers\n"
 #~ msgstr "无法连接到 %s:%u：%s\n"
 
-#, fuzzy
-#~ msgid "Failed to connect to core service\n"
-#~ msgstr "初始化“%s”服务失败。\n"
-
 #~ msgid "Error"
 #~ msgstr "错误"
 
@@ -5668,9 +5957,6 @@ msgstr ""
 #~ msgid "Ok"
 #~ msgstr "确定"
 
-#~ msgid "GNUnet configuration"
-#~ msgstr "GNUnet 配置"
-
 #~ msgid ""
 #~ "Welcome to GNUnet!\n"
 #~ "\n"
@@ -5902,9 +6188,6 @@ msgstr ""
 #~ "\n"
 #~ "您的配置更改没有保存。\n"
 
-#~ msgid "list all network adapters"
-#~ msgstr "列出所有网络适配器"
-
 #~ msgid "install GNUnet as Windows service"
 #~ msgstr "以 Windows 服务方式安装 GNUnet"
 
@@ -5914,9 +6197,6 @@ msgstr ""
 #~ msgid "display a file's hash value"
 #~ msgstr "显示一个文件的散列值"
 
-#~ msgid "GNUnet service installed successfully.\n"
-#~ msgstr "GNUnet 服务安装成功。\n"
-
 #~ msgid "This version of Windows doesn't support services.\n"
 #~ msgstr "此版本的 Windows 不支持服务。\n"
 
@@ -6127,9 +6407,6 @@ msgstr ""
 #~ msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'\n"
 #~ msgstr "在 NETWORK 节的配置条目 HOST 中有语法错误：“%s”\n"
 
-#~ msgid "Error connecting to %s:%u. Is the daemon running?\n"
-#~ msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
-
 #~ msgid "Reading result from gnunetd failed, reply invalid!\n"
 #~ msgstr "从 gnunetd 读取结果失败，应答无效！\n"
 
@@ -6288,19 +6565,12 @@ msgstr ""
 #~ msgid "Command `%s' requires two arguments (`%s' and `%s').\n"
 #~ msgstr "%s：选项“%s”要求有一个参数\n"
 
-#, fuzzy
-#~ msgid "Unsupported command `%s'.  Aborting.\n"
-#~ msgstr "未知的命令“%s”。\n"
-
 #~ msgid ""
 #~ "OS tells us about very large message (%u bytes) pending on UDP socket, "
 #~ "truncating at 64k\n"
 #~ msgstr ""
 #~ "操作系统通知，在 UPnP 套接字上有大量消息待处理(%u 字节)，将截短为64k\n"
 
-#~ msgid "Error while parsing dscl output.\n"
-#~ msgstr "解析 dscl 输出时出错。\n"
-
 #~ msgid ""
 #~ "Couldn't find a group (`%s') for the new user and none was specified.\n"
 #~ msgstr "找不到新用户的组(“%s”)且没有指定用户组。\n"
author	Bertrand Marc <beberking@gmail.com>	2012-06-06 20:47:48 +0200
committer	Bertrand Marc <beberking@gmail.com>	2012-06-06 20:47:48 +0200
commit	740b30688bd745a527f96f9116c19acb3480971a (patch)
tree	2709a3f4dba11c174aa9e1ba3612e30c578e76a9 /po
parent	2b81464a43485fcc8ce079fafdee7b7a171835f4 (diff)