[GNUnet-SVN] r32174 - in gnunet: po src src/consensus src/include src/se

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r32174 - in gnunet: po src src/consensus src/include src/se

From:	gnunet
Subject:	[GNUnet-SVN] r32174 - in gnunet: po src src/consensus src/include src/secretsharing
Date:	Mon, 3 Feb 2014 22:25:53 +0100
Author: dold
Date: 2014-02-03 22:25:53 +0100 (Mon, 03 Feb 2014)
New Revision: 32174

Modified:
   gnunet/po/POTFILES.in
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
   gnunet/src/Makefile.am
   gnunet/src/consensus/consensus.h
   gnunet/src/consensus/consensus_api.c
   gnunet/src/consensus/gnunet-consensus-profiler.c
   gnunet/src/consensus/gnunet-service-consensus.c
   gnunet/src/include/gnunet_consensus_service.h
   gnunet/src/include/gnunet_secretsharing_service.h
   gnunet/src/secretsharing/gnunet-secretsharing-profiler.c
   gnunet/src/secretsharing/gnunet-service-secretsharing.c
   gnunet/src/secretsharing/secretsharing.h
   gnunet/src/secretsharing/secretsharing_api.c
Log:
- consensus and secretsharing have both start time and deadline


Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2014-02-03 21:07:23 UTC (rev 32173)
+++ gnunet/po/POTFILES.in       2014-02-03 21:25:53 UTC (rev 32174)
@@ -14,6 +14,11 @@
 src/ats/plugin_ats_mlp.c
 src/ats/plugin_ats_proportional.c
 src/ats/plugin_ats_ril.c
+src/ats-tests/ats-testing.c
+src/ats-tests/ats-testing-experiment.c
+src/ats-tests/ats-testing-log.c
+src/ats-tests/ats-testing-traffic.c
+src/ats-tests/gnunet-ats-sim.c
 src/ats-tool/gnunet-ats.c
 src/block/block.c
 src/block/plugin_block_template.c

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2014-02-03 21:07:23 UTC (rev 32173)
+++ gnunet/po/de.po     2014-02-03 21:25:53 UTC (rev 32174)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-01-20 23:27+0100\n"
+"POT-Creation-Date: 2014-02-03 20:43+0100\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -405,56 +405,110 @@
 msgid "Failed to initialize solver!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/ats/plugin_ats_mlp.c:868
+#: src/ats/plugin_ats_mlp.c:892
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1281
+#: src/ats/plugin_ats_mlp.c:1329
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/ats/plugin_ats_mlp.c:1328
+#: src/ats/plugin_ats_mlp.c:1376
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2059
+#: src/ats/plugin_ats_mlp.c:2122
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2067
+#: src/ats/plugin_ats_mlp.c:2131
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2077
+#: src/ats/plugin_ats_mlp.c:2142
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2085
+#: src/ats/plugin_ats_mlp.c:2150
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2096
+#: src/ats/plugin_ats_mlp.c:2161
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1511
+#: src/ats/plugin_ats_proportional.c:1510
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
+#: src/ats-tests/ats-testing.c:71
+msgid "Benchmarking done\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:104
+#, fuzzy, c-format
+msgid "Failed to connect peer 0 and %u\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/ats-tests/ats-testing.c:412
+#, c-format
+msgid "Connected master [%u] with slave [%u]\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:418
+#, fuzzy, c-format
+msgid "Failed to connect master peer [%u] with slave [%u]\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/ats-tests/ats-testing.c:449
+msgid "Connecting peers on CORE level\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:460
+#, c-format
+msgid "Connecting master [%u] with slave [%u]\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:469
+#, fuzzy, c-format
+msgid "Could not connect master [%u] and slave [%u]\n"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#: src/ats-tests/ats-testing.c:489 src/ats-tests/ats-testing.c:670
+#, fuzzy
+msgid "Initialization failed, shutdown\n"
+msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
+
+#: src/ats-tests/ats-testing-log.c:840
+msgid "Stop logging\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing-log.c:889
+#, fuzzy, c-format
+msgid "Start logging `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/ats-tests/gnunet-ats-sim.c:86
+#, c-format
+msgid ""
+"Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
+"= %u KiB/s\n"
+msgstr ""
+
 #: src/ats-tool/gnunet-ats.c:145
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -478,12 +532,12 @@
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:352 src/namestore/gnunet-namestore.c:550
-#: src/transport/gnunet-transport.c:1130
+#: src/transport/gnunet-transport.c:1134
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/ats-tool/gnunet-ats.c:364 src/transport/gnunet-transport.c:1139
+#: src/ats-tool/gnunet-ats.c:364 src/transport/gnunet-transport.c:1143
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -701,156 +755,156 @@
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:644
+#: src/conversation/gnunet-conversation.c:647
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:667
+#: src/conversation/gnunet-conversation.c:670
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:672
+#: src/conversation/gnunet-conversation.c:675
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:678
-#: src/conversation/gnunet-conversation.c:702
+#: src/conversation/gnunet-conversation.c:681
+#: src/conversation/gnunet-conversation.c:705
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:683
+#: src/conversation/gnunet-conversation.c:686
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:692
+#: src/conversation/gnunet-conversation.c:695
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
 
-#: src/conversation/gnunet-conversation.c:697
+#: src/conversation/gnunet-conversation.c:700
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:716
+#: src/conversation/gnunet-conversation.c:719
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:722
+#: src/conversation/gnunet-conversation.c:725
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/conversation/gnunet-conversation.c:750
-#: src/conversation/gnunet-conversation.c:765
+#: src/conversation/gnunet-conversation.c:753
+#: src/conversation/gnunet-conversation.c:768
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:798
-#: src/conversation/gnunet-conversation.c:814
+#: src/conversation/gnunet-conversation.c:801
+#: src/conversation/gnunet-conversation.c:817
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:821
+#: src/conversation/gnunet-conversation.c:824
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:830
+#: src/conversation/gnunet-conversation.c:833
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:847
+#: src/conversation/gnunet-conversation.c:850
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:882
+#: src/conversation/gnunet-conversation.c:885
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:890
+#: src/conversation/gnunet-conversation.c:893
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:907
+#: src/conversation/gnunet-conversation.c:910
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:934
+#: src/conversation/gnunet-conversation.c:937
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:936
+#: src/conversation/gnunet-conversation.c:939
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:938
+#: src/conversation/gnunet-conversation.c:941
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:940
+#: src/conversation/gnunet-conversation.c:943
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:942
+#: src/conversation/gnunet-conversation.c:945
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:944
+#: src/conversation/gnunet-conversation.c:947
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:946
+#: src/conversation/gnunet-conversation.c:949
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:948
+#: src/conversation/gnunet-conversation.c:951
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
 
-#: src/conversation/gnunet-conversation.c:950
+#: src/conversation/gnunet-conversation.c:953
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1148
+#: src/conversation/gnunet-conversation.c:1151
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/conversation/gnunet-conversation.c:1161
+#: src/conversation/gnunet-conversation.c:1164
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym `%s' wurde gelöscht.\n"
 
-#: src/conversation/gnunet-conversation.c:1196
+#: src/conversation/gnunet-conversation.c:1199
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 
-#: src/conversation/gnunet-conversation.c:1220
+#: src/conversation/gnunet-conversation.c:1223
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/conversation/gnunet-conversation.c:1246
+#: src/conversation/gnunet-conversation.c:1249
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1249
+#: src/conversation/gnunet-conversation.c:1252
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1276
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1045,7 +1099,7 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/core/core_api.c:765
+#: src/core/core_api.c:767
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -1055,27 +1109,27 @@
 msgstr "Ich bin Peer `%s'.\n"
 
 #: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:820 src/transport/gnunet-transport.c:840
+#: src/transport/gnunet-transport.c:824 src/transport/gnunet-transport.c:844
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:821
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:825
 #, fuzzy
 msgid "Connected to"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:841
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:845
 #, fuzzy
 msgid "Disconnected from"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/core/gnunet-core.c:164 src/peerinfo-tool/gnunet-peerinfo.c:645
+#: src/core/gnunet-core.c:164 src/peerinfo-tool/gnunet-peerinfo.c:694
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültige Kommandozeilen Parameter:\n"
 
-#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1336
+#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1340
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -1100,12 +1154,12 @@
 msgid "# send requests dropped (disconnected)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_clients.c:475
+#: src/core/gnunet-service-core_clients.c:480
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_clients.c:518
+#: src/core/gnunet-service-core_clients.c:526
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
@@ -1277,30 +1331,29 @@
 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:278
+#: src/core/gnunet-service-core_sessions.c:214
+#: src/core/gnunet-service-core_sessions.c:286
 #: src/dht/gnunet-service-dht_neighbours.c:662
 #: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:662
-#: src/dht/gnunet-service-xdht_neighbours.c:727
-#: src/fs/gnunet-service-fs_cp.c:604 src/fs/gnunet-service-fs_cp.c:1499
-#: src/topology/gnunet-daemon-topology.c:706
-#: src/topology/gnunet-daemon-topology.c:807
-#: src/transport/gnunet-service-transport_neighbours.c:846
-#: src/transport/gnunet-service-transport_neighbours.c:1078
-#: src/transport/gnunet-service-transport_neighbours.c:1087
-#: src/transport/gnunet-service-transport_neighbours.c:3048
-#: src/transport/gnunet-service-transport_neighbours.c:3309
+#: src/dht/gnunet-service-xdht_neighbours.c:939
+#: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
+#: src/topology/gnunet-daemon-topology.c:707
+#: src/topology/gnunet-daemon-topology.c:808
+#: src/transport/gnunet-service-transport_neighbours.c:848
+#: src/transport/gnunet-service-transport_neighbours.c:1080
+#: src/transport/gnunet-service-transport_neighbours.c:1089
+#: src/transport/gnunet-service-transport_neighbours.c:3202
+#: src/transport/gnunet-service-transport_neighbours.c:3463
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
 
-#: src/core/gnunet-service-core_sessions.c:246
+#: src/core/gnunet-service-core_sessions.c:253
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/core/gnunet-service-core_sessions.c:415
+#: src/core/gnunet-service-core_sessions.c:424
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -1376,7 +1429,7 @@
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
 #: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:61
+#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:60
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -1386,7 +1439,7 @@
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:484
-#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/datastore/plugin_datastore_sqlite.c:404
 #: src/namecache/plugin_namecache_sqlite.c:295
 #: src/namestore/plugin_namestore_sqlite.c:327
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
@@ -1727,7 +1780,7 @@
 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:253
+#: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
 #: src/psycstore/plugin_psycstore_sqlite.c:319
@@ -1735,23 +1788,23 @@
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:649
+#: src/datastore/plugin_datastore_sqlite.c:663
 #, 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:1135
+#: src/datastore/plugin_datastore_sqlite.c:1156
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1154
+#: src/datastore/plugin_datastore_sqlite.c:1175
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1194
+#: src/datastore/plugin_datastore_sqlite.c:1215
 #: src/namecache/plugin_namecache_sqlite.c:583
 #: src/namestore/plugin_namestore_sqlite.c:719
 #, fuzzy
@@ -1767,48 +1820,48 @@
 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:132
+#: src/dht/gnunet-dht-get.c:133
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:156
+#: src/dht/gnunet-dht-get.c:159
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:162 src/dht/gnunet-dht-monitor.c:225
+#: src/dht/gnunet-dht-get.c:165 src/dht/gnunet-dht-monitor.c:225
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/dht/gnunet-dht-get.c:170
+#: src/dht/gnunet-dht-get.c:173
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:186 src/dht/gnunet-dht-monitor.c:262
+#: src/dht/gnunet-dht-get.c:189 src/dht/gnunet-dht-monitor.c:262
 #: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:189
+#: src/dht/gnunet-dht-get.c:192
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:192 src/dht/gnunet-dht-monitor.c:265
+#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:210
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
+#: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
 #: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
@@ -1816,7 +1869,7 @@
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:222
+#: src/dht/gnunet-dht-get.c:225
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -1872,11 +1925,11 @@
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:235
+#: src/dht/gnunet-dht-put.c:236
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:172
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:176
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
@@ -1888,54 +1941,54 @@
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_clients.c:511
-#: src/dht/gnunet-service-xdht_clients.c:511
+#: src/dht/gnunet-service-xdht_clients.c:512
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:595
-#: src/dht/gnunet-service-xdht_clients.c:595
+#: src/dht/gnunet-service-xdht_clients.c:597
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:796
-#: src/dht/gnunet-service-xdht_clients.c:796
+#: src/dht/gnunet-service-xdht_clients.c:798
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:1037
-#: src/dht/gnunet-service-xdht_clients.c:1037
+#: src/dht/gnunet-service-xdht_clients.c:1039
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1050
-#: src/dht/gnunet-service-xdht_clients.c:1050
+#: src/dht/gnunet-service-xdht_clients.c:1052
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1087
-#: src/dht/gnunet-service-xdht_clients.c:1087
+#: src/dht/gnunet-service-xdht_clients.c:1089
 #, 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:1110
-#: src/dht/gnunet-service-xdht_clients.c:1110
+#: src/dht/gnunet-service-xdht_clients.c:1112
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:1164
-#: src/dht/gnunet-service-dht_clients.c:1206
-#: src/dht/gnunet-service-xdht_clients.c:1164
-#: src/dht/gnunet-service-xdht_clients.c:1206
+#: src/dht/gnunet-service-dht_clients.c:1207
+#: src/dht/gnunet-service-xdht_clients.c:1166
+#: src/dht/gnunet-service-xdht_clients.c:1208
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1174
-#: src/dht/gnunet-service-xdht_clients.c:1174
+#: src/dht/gnunet-service-xdht_clients.c:1176
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
@@ -1995,63 +2048,53 @@
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/dht/gnunet-service-dht_neighbours.c:516
-#: src/dht/gnunet-service-xdht_neighbours.c:516
 msgid "# Preference updates given to core"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:610
-#: src/dht/gnunet-service-xdht_neighbours.c:610
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
 #: src/dht/gnunet-service-dht_neighbours.c:764
-#: src/dht/gnunet-service-xdht_neighbours.c:764
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:819
+#: src/dht/gnunet-service-xdht_neighbours.c:540
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:857
+#: src/dht/gnunet-service-xdht_neighbours.c:579
 #, fuzzy
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:889
-#: src/dht/gnunet-service-xdht_neighbours.c:889
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1093
 #: src/dht/gnunet-service-dht_neighbours.c:1130
-#: src/dht/gnunet-service-xdht_neighbours.c:1093
-#: src/dht/gnunet-service-xdht_neighbours.c:1130
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1108
 #: src/dht/gnunet-service-dht_neighbours.c:1145
-#: src/dht/gnunet-service-xdht_neighbours.c:1108
-#: src/dht/gnunet-service-xdht_neighbours.c:1145
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1287
-#: src/dht/gnunet-service-xdht_neighbours.c:1287
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1316
-#: src/dht/gnunet-service-xdht_neighbours.c:1316
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
@@ -2059,85 +2102,72 @@
 #: src/dht/gnunet-service-dht_neighbours.c:1323
 #: src/dht/gnunet-service-dht_neighbours.c:1440
 #: src/dht/gnunet-service-dht_neighbours.c:1543
-#: src/dht/gnunet-service-xdht_neighbours.c:1323
-#: src/dht/gnunet-service-xdht_neighbours.c:1440
-#: src/dht/gnunet-service-xdht_neighbours.c:1543
+#: src/dht/gnunet-service-xdht_neighbours.c:616
+#: src/dht/gnunet-service-xdht_neighbours.c:1246
+#: src/dht/gnunet-service-xdht_neighbours.c:1330
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1405
-#: src/dht/gnunet-service-xdht_neighbours.c:1405
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1432
-#: src/dht/gnunet-service-xdht_neighbours.c:1432
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1550
-#: src/dht/gnunet-service-xdht_neighbours.c:1550
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1637
-#: src/dht/gnunet-service-xdht_neighbours.c:1637
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1640
-#: src/dht/gnunet-service-xdht_neighbours.c:1640
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1803
-#: src/dht/gnunet-service-xdht_neighbours.c:1803
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1811
-#: src/dht/gnunet-service-xdht_neighbours.c:1811
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1904
-#: src/dht/gnunet-service-xdht_neighbours.c:1904
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1907
-#: src/dht/gnunet-service-xdht_neighbours.c:1907
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1961
-#: src/dht/gnunet-service-xdht_neighbours.c:1961
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1975
-#: src/dht/gnunet-service-xdht_neighbours.c:1975
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
 #: src/dht/gnunet-service-dht_neighbours.c:2052
-#: src/dht/gnunet-service-xdht_neighbours.c:2052
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Bytes empfangen über TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:2055
-#: src/dht/gnunet-service-xdht_neighbours.c:2055
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Bytes empfangen über TCP"
@@ -2148,46 +2178,48 @@
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_routing.c:211
-#: src/dht/gnunet-service-xdht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:220
-#: src/dht/gnunet-service-xdht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:226
-#: src/dht/gnunet-service-xdht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:232
-#: src/dht/gnunet-service-xdht_routing.c:232
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:244
-#: src/dht/gnunet-service-xdht_routing.c:244
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:317
-#: src/dht/gnunet-service-xdht_routing.c:317
 msgid "# Entries removed from routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:399
-#: src/dht/gnunet-service-xdht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:417
-#: src/dht/gnunet-service-xdht_routing.c:417
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# Client Trace-Anfragen empfangen"
 
+#: src/dht/gnunet-service-xdht_neighbours.c:1179
+#, fuzzy
+msgid "# TRAIL SETUP requests received"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1182
+#, fuzzy
+msgid "# TRAIL SETUP bytes received"
+msgstr "# Client Trace-Anfragen empfangen"
+
 #: src/dht/plugin_block_dht.c:138
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
@@ -2621,32 +2653,32 @@
 msgid "Cannot read experiments file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:219
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
 #, c-format
 msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:307
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
 #, c-format
 msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:451
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
 #, c-format
 msgid "Added peer `%s' as active node\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:889
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891
 #, fuzzy, c-format
 msgid "Connected to peer %s\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:919
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921
 #, fuzzy, c-format
 msgid "Disconnected from peer %s\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1102
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -3453,7 +3485,7 @@
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1168 src/transport/gnunet-transport.c:1198
+#: src/transport/gnunet-transport.c:1172 src/transport/gnunet-transport.c:1202
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
@@ -3571,101 +3603,101 @@
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
 #: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
-#: src/topology/gnunet-daemon-topology.c:1253
-#: src/topology/gnunet-daemon-topology.c:1260
+#: src/topology/gnunet-daemon-topology.c:1254
+#: src/topology/gnunet-daemon-topology.c:1261
 #, 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:680
+#: src/fs/gnunet-service-fs_cp.c:682
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:684
+#: src/fs/gnunet-service-fs_cp.c:686
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:719
+#: src/fs/gnunet-service-fs_cp.c:721
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/fs/gnunet-service-fs_cp.c:725
+#: src/fs/gnunet-service-fs_cp.c:727
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:750 src/fs/gnunet-service-fs_cp.c:1299
+#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:843
+#: src/fs/gnunet-service-fs_cp.c:845
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:896
+#: src/fs/gnunet-service-fs_cp.c:898
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:904
+#: src/fs/gnunet-service-fs_cp.c:906
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:920
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:956
+#: src/fs/gnunet-service-fs_cp.c:958
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1024
+#: src/fs/gnunet-service-fs_cp.c:1026
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1049
+#: src/fs/gnunet-service-fs_cp.c:1051
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1059
+#: src/fs/gnunet-service-fs_cp.c:1061
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1137
+#: src/fs/gnunet-service-fs_cp.c:1139
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1171
+#: src/fs/gnunet-service-fs_cp.c:1173
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1193
+#: src/fs/gnunet-service-fs_cp.c:1195
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1244
+#: src/fs/gnunet-service-fs_cp.c:1246
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1268
+#: src/fs/gnunet-service-fs_cp.c:1270
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1297
+#: src/fs/gnunet-service-fs_cp.c:1299
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1668
+#: src/fs/gnunet-service-fs_cp.c:1670
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -3966,7 +3998,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:566
+#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
@@ -4639,11 +4671,11 @@
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
+#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425
 #: src/peerinfo-tool/gnunet-peerinfo.c:350
 #: src/peerinfo-tool/gnunet-peerinfo.c:419
 #: src/peerinfo-tool/gnunet-peerinfo.c:490
-#: src/topology/gnunet-daemon-topology.c:924
+#: src/topology/gnunet-daemon-topology.c:925
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -4699,32 +4731,32 @@
 msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/hostlist/hostlist-server.c:389
+#: src/hostlist/hostlist-server.c:390
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639
 #: src/transport/gnunet-service-transport.c:892
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/hostlist/hostlist-server.c:575
+#: src/hostlist/hostlist-server.c:576
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:589
+#: src/hostlist/hostlist-server.c:590
 #, 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:629
+#: src/hostlist/hostlist-server.c:630
 #, 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:672
+#: src/hostlist/hostlist-server.c:673
 #, 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"
@@ -4816,38 +4848,43 @@
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/mesh/gnunet-mesh.c:343
+#: src/mesh/gnunet-mesh.c:348
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/mesh/gnunet-mesh.c:521
+#: src/mesh/gnunet-mesh.c:592
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/mesh/gnunet-mesh.c:586
-msgid "You must NOT give a TARGET when using options\n"
+#: src/mesh/gnunet-mesh.c:658
+msgid "You must NOT give a TARGETwhen using 'request all' options\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:669
+#: src/mesh/gnunet-mesh.c:747
 msgid "activate echo mode"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:672
-#, fuzzy
-msgid "provide information about all tunnels"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/mesh/gnunet-mesh.c:678
+#: src/mesh/gnunet-mesh.c:753
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:681
+#: src/mesh/gnunet-mesh.c:756
 #, fuzzy
+msgid "provide information about all peers"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/mesh/gnunet-mesh.c:759
+#, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
+#: src/mesh/gnunet-mesh.c:762
+#, fuzzy
+msgid "provide information about all tunnels"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
 #: src/mesh/gnunet-service-mesh_peer.c:377
 msgid "Wrong CORE service\n"
 msgstr ""
@@ -4975,7 +5012,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:715
-#: src/peerinfo-tool/gnunet-peerinfo.c:702
+#: src/peerinfo-tool/gnunet-peerinfo.c:723
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -5301,7 +5338,7 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/nse/gnunet-service-nse.c:1461
+#: src/nse/gnunet-service-nse.c:1462
 #: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248
 msgid "Value is too large.\n"
 msgstr ""
@@ -5420,67 +5457,72 @@
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fehler bei %s:%d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:666 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:633
 #, fuzzy, c-format
+msgid "Service `%s' is not running, please start GNUnet\n"
+msgstr "`%s' ist keine Datei.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
+#, 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:724
+#: src/peerinfo-tool/gnunet-peerinfo.c:745
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:768
+#: src/peerinfo-tool/gnunet-peerinfo.c:789
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:771
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:774
+#: src/peerinfo-tool/gnunet-peerinfo.c:795
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:777
+#: src/peerinfo-tool/gnunet-peerinfo.c:798
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:780
+#: src/peerinfo-tool/gnunet-peerinfo.c:801
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:783
+#: src/peerinfo-tool/gnunet-peerinfo.c:804
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:786
+#: src/peerinfo-tool/gnunet-peerinfo.c:807
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:810
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:800
+#: src/peerinfo-tool/gnunet-peerinfo.c:821
 #, 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:124
+#: src/transport/gnunet-service-transport_plugins.c:126
 #, 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:129
+#: src/transport/gnunet-service-transport_plugins.c:131
 #, 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:159
+#: src/transport/gnunet-service-transport_plugins.c:163
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
@@ -5941,144 +5983,144 @@
 msgid "Generated key set with key length %d bits.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:776
+#: src/scalarproduct/gnunet-service-scalarproduct.c:746
 #, fuzzy, c-format
 msgid "Client (%p) disconnected from us.\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:848
-#: src/scalarproduct/gnunet-service-scalarproduct.c:938
+#: src/scalarproduct/gnunet-service-scalarproduct.c:818
+#: src/scalarproduct/gnunet-service-scalarproduct.c:908
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:854
+#: src/scalarproduct/gnunet-service-scalarproduct.c:824
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:948
+#: src/scalarproduct/gnunet-service-scalarproduct.c:918
 #, c-format
 msgid "Sent result to client (%p), this session (%s) has ended!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1027
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1165
+#: src/scalarproduct/gnunet-service-scalarproduct.c:997
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1135
 #, fuzzy
 msgid "Could not send service-response message via mesh!)\n"
 msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1391
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1340
 #, c-format
 msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1495
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1622
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1444
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1571
 #, fuzzy
 msgid "Transmitting service request.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1504
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1453
 #, fuzzy
 msgid "Could not send service-request multipart message to channel!\n"
 msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1544
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1493
 #, fuzzy, c-format
 msgid "Successfully created new channel to peer (%s)!\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1631
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1580
 #, fuzzy
 msgid "Could not send message to channel!\n"
 msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1688
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1637
 #, fuzzy
 msgid "Too short message received from client!\n"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1701
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1650
 #, fuzzy
 msgid "Invalid message received from client, session information incorrect!\n"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1712
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1661
 #, c-format
 msgid ""
 "Duplicate session information received, cannot create new session with key `"
 "%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1733
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1682
 #, c-format
 msgid ""
 "Got client-request-session with key %s, preparing channel to remote "
 "service.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1772
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1721
 #, c-format
 msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1819
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1768
 #, c-format
 msgid ""
 "Got client-responder-session with key %s and a matching service-request-"
 "session set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1830
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1779
 #, c-format
 msgid ""
 "Got client-responder-session with key %s but NO matching service-request-"
 "session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1860
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1809
 #, fuzzy, c-format
 msgid "New incoming channel from peer %s.\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1841
 #, c-format
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2083
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2242
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2032
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2191
 #, c-format
 msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2092
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2249
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2041
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2198
 #, c-format
 msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2187
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2136
 #, c-format
 msgid ""
 "Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2471
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2420
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2536
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2485
 msgid "Generating Paillier-Keyset.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2551
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2500
 #, fuzzy
 msgid "Connect to MESH failed\n"
 msgstr " Verbindung fehlgeschlagen (Bug?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2555
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2504
 #, fuzzy
 msgid "Mesh initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -6123,7 +6165,7 @@
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1416
+#: src/set/gnunet-service-set.c:1415
 #, fuzzy
 msgid "Could not connect to mesh service\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -6640,57 +6682,57 @@
 msgid "# connect requests issued to transport"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:727
-#: src/topology/gnunet-daemon-topology.c:812
+#: src/topology/gnunet-daemon-topology.c:728
+#: src/topology/gnunet-daemon-topology.c:813
 #, fuzzy
 msgid "# friends connected"
 msgstr "# verbundener Knoten"
 
-#: src/topology/gnunet-daemon-topology.c:992
+#: src/topology/gnunet-daemon-topology.c:993
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1021
+#: src/topology/gnunet-daemon-topology.c:1022
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1028
+#: src/topology/gnunet-daemon-topology.c:1029
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:1050
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1051
+#: src/topology/gnunet-daemon-topology.c:1052
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1056
+#: src/topology/gnunet-daemon-topology.c:1057
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1062
+#: src/topology/gnunet-daemon-topology.c:1063
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1093
+#: src/topology/gnunet-daemon-topology.c:1094
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1150
+#: src/topology/gnunet-daemon-topology.c:1151
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/topology/gnunet-daemon-topology.c:1289
+#: src/topology/gnunet-daemon-topology.c:1290
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -6771,196 +6813,196 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1025
+#: src/transport/gnunet-service-transport_neighbours.c:1027
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1161
-#: src/transport/gnunet-service-transport_neighbours.c:1571
+#: src/transport/gnunet-service-transport_neighbours.c:1163
+#: src/transport/gnunet-service-transport_neighbours.c:1573
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1166
+#: src/transport/gnunet-service-transport_neighbours.c:1168
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1171
+#: src/transport/gnunet-service-transport_neighbours.c:1173
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1228
+#: src/transport/gnunet-service-transport_neighbours.c:1230
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1285
+#: src/transport/gnunet-service-transport_neighbours.c:1287
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1318
+#: src/transport/gnunet-service-transport_neighbours.c:1320
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1326
+#: src/transport/gnunet-service-transport_neighbours.c:1328
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1373
+#: src/transport/gnunet-service-transport_neighbours.c:1375
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1384
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1390
+#: src/transport/gnunet-service-transport_neighbours.c:1392
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1398
+#: src/transport/gnunet-service-transport_neighbours.c:1400
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1476
+#: src/transport/gnunet-service-transport_neighbours.c:1478
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1510
+#: src/transport/gnunet-service-transport_neighbours.c:1512
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1526
+#: src/transport/gnunet-service-transport_neighbours.c:1528
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1618
+#: src/transport/gnunet-service-transport_neighbours.c:1620
 #, fuzzy
 msgid "# SESSION_CONNECT messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1634
+#: src/transport/gnunet-service-transport_neighbours.c:1636
 #, fuzzy, c-format
 msgid "Failed to transmit CONNECT message via plugin to %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1677
+#: src/transport/gnunet-service-transport_neighbours.c:1679
 #, fuzzy
 msgid "# CONNECT_ACK messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1797
+#: src/transport/gnunet-service-transport_neighbours.c:1947
 #, fuzzy, c-format
 msgid "Blacklisting dissaproved to connect to peer `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2210
+#: src/transport/gnunet-service-transport_neighbours.c:2360
 #, fuzzy
 msgid "# CONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2215
+#: src/transport/gnunet-service-transport_neighbours.c:2365
 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3013
+#: src/transport/gnunet-service-transport_neighbours.c:3167
 #, fuzzy
 msgid "# CONNECT_ACK messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3021
+#: src/transport/gnunet-service-transport_neighbours.c:3175
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3036
-#: src/transport/gnunet-service-transport_neighbours.c:3072
+#: src/transport/gnunet-service-transport_neighbours.c:3190
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3085
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3115
+#: src/transport/gnunet-service-transport_neighbours.c:3269
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3284
+#: src/transport/gnunet-service-transport_neighbours.c:3438
 #, fuzzy
 msgid "# SESSION_ACK messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3303
+#: src/transport/gnunet-service-transport_neighbours.c:3457
 #, fuzzy
 msgid "# unexpected SESSION_ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3358
+#: src/transport/gnunet-service-transport_neighbours.c:3511
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3373
+#: src/transport/gnunet-service-transport_neighbours.c:3526
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3401
+#: src/transport/gnunet-service-transport_neighbours.c:3554
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3407
+#: src/transport/gnunet-service-transport_neighbours.c:3560
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3416
+#: src/transport/gnunet-service-transport_neighbours.c:3569
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3452
+#: src/transport/gnunet-service-transport_neighbours.c:3605
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3704
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_plugins.c:116
+#: src/transport/gnunet-service-transport_plugins.c:118
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:172
-#: src/transport/gnunet-service-transport_plugins.c:180
-#: src/transport/gnunet-service-transport_plugins.c:188
-#: src/transport/gnunet-service-transport_plugins.c:196
-#: src/transport/gnunet-service-transport_plugins.c:204
-#: src/transport/gnunet-service-transport_plugins.c:212
-#: src/transport/gnunet-service-transport_plugins.c:220
-#: src/transport/gnunet-service-transport_plugins.c:228
-#: src/transport/gnunet-service-transport_plugins.c:236
-#: src/transport/gnunet-service-transport_plugins.c:244
-#: src/transport/gnunet-service-transport_plugins.c:252
+#: src/transport/gnunet-service-transport_plugins.c:176
+#: src/transport/gnunet-service-transport_plugins.c:184
+#: src/transport/gnunet-service-transport_plugins.c:192
+#: src/transport/gnunet-service-transport_plugins.c:200
+#: src/transport/gnunet-service-transport_plugins.c:208
+#: src/transport/gnunet-service-transport_plugins.c:216
+#: src/transport/gnunet-service-transport_plugins.c:224
+#: src/transport/gnunet-service-transport_plugins.c:232
+#: src/transport/gnunet-service-transport_plugins.c:240
+#: src/transport/gnunet-service-transport_plugins.c:248
+#: src/transport/gnunet-service-transport_plugins.c:256
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:259
+#: src/transport/gnunet-service-transport_plugins.c:263
 #, fuzzy, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Fehler beim Laden des Plugins `%s' bei %s:%d. Plugin wird entladen.\n"
@@ -7099,129 +7141,129 @@
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:720
+#: src/transport/gnunet-transport.c:722
 #, 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:741
+#: src/transport/gnunet-transport.c:743
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:765
+#: src/transport/gnunet-transport.c:767
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:798
+#: src/transport/gnunet-transport.c:802
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:860
+#: src/transport/gnunet-transport.c:864
 #, 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:883
+#: src/transport/gnunet-transport.c:887
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:893
+#: src/transport/gnunet-transport.c:897
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:1106
+#: src/transport/gnunet-transport.c:1110
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:1150
+#: src/transport/gnunet-transport.c:1154
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1158
+#: src/transport/gnunet-transport.c:1162
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1177 src/transport/gnunet-transport.c:1207
-#: src/transport/gnunet-transport.c:1230 src/transport/gnunet-transport.c:1273
+#: src/transport/gnunet-transport.c:1181 src/transport/gnunet-transport.c:1211
+#: src/transport/gnunet-transport.c:1234 src/transport/gnunet-transport.c:1277
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:1186 src/transport/gnunet-transport.c:1216
+#: src/transport/gnunet-transport.c:1190 src/transport/gnunet-transport.c:1220
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:1235
+#: src/transport/gnunet-transport.c:1239
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1319
+#: src/transport/gnunet-transport.c:1323
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers )"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1322
+#: src/transport/gnunet-transport.c:1326
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1324
+#: src/transport/gnunet-transport.c:1328
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:1327
+#: src/transport/gnunet-transport.c:1331
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1330
+#: src/transport/gnunet-transport.c:1334
 #, fuzzy
 msgid "print information for all pending validations continously"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1333
+#: src/transport/gnunet-transport.c:1337
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1339
+#: src/transport/gnunet-transport.c:1343
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1341
+#: src/transport/gnunet-transport.c:1345
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:1343
+#: src/transport/gnunet-transport.c:1347
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1345
+#: src/transport/gnunet-transport.c:1349
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1348
+#: src/transport/gnunet-transport.c:1352
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1357
+#: src/transport/gnunet-transport.c:1361
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
@@ -7495,85 +7537,85 @@
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:766
-#: src/transport/plugin_transport_tcp.c:930
-#: src/transport/plugin_transport_tcp.c:1973
-#: src/transport/plugin_transport_tcp.c:2527
+#: src/transport/plugin_transport_tcp.c:932
+#: src/transport/plugin_transport_tcp.c:2012
+#: src/transport/plugin_transport_tcp.c:2550
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_tcp.c:797
-#: src/transport/plugin_transport_tcp.c:923
-#: src/transport/plugin_transport_tcp.c:1009
-#: src/transport/plugin_transport_tcp.c:1056
-#: src/transport/plugin_transport_tcp.c:1219
-#: src/transport/plugin_transport_tcp.c:1237
+#: src/transport/plugin_transport_tcp.c:799
+#: src/transport/plugin_transport_tcp.c:925
+#: src/transport/plugin_transport_tcp.c:1013
+#: src/transport/plugin_transport_tcp.c:1060
+#: src/transport/plugin_transport_tcp.c:1223
+#: src/transport/plugin_transport_tcp.c:1241
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transport/plugin_transport_tcp.c:800
+#: src/transport/plugin_transport_tcp.c:802
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1012
+#: src/transport/plugin_transport_tcp.c:1016
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1059
+#: src/transport/plugin_transport_tcp.c:1063
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:1193
+#: src/transport/plugin_transport_tcp.c:1197
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1427
+#: src/transport/plugin_transport_tcp.c:1466
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1532
+#: src/transport/plugin_transport_tcp.c:1571
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2021
+#: src/transport/plugin_transport_tcp.c:2060
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:2189
+#: src/transport/plugin_transport_tcp.c:2211
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2253
+#: src/transport/plugin_transport_tcp.c:2275
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2407 src/util/service.c:589
+#: src/transport/plugin_transport_tcp.c:2429 src/util/service.c:589
 #: src/util/service.c:595
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2421
+#: src/transport/plugin_transport_tcp.c:2443
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2516
+#: src/transport/plugin_transport_tcp.c:2539
 #, 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:2520
+#: src/transport/plugin_transport_tcp.c:2543
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2523
+#: src/transport/plugin_transport_tcp.c:2546
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7719,7 +7761,7 @@
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:690
+#: src/transport/transport_api.c:710
 #, 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"
@@ -8143,35 +8185,35 @@
 msgid "Could not read hostkey file: %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/gnunet-ecc.c:286
+#: src/util/gnunet-ecc.c:283
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:341
+#: src/util/gnunet-ecc.c:349
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:344
+#: src/util/gnunet-ecc.c:352
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:347
+#: src/util/gnunet-ecc.c:355
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:350
+#: src/util/gnunet-ecc.c:358
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:353
+#: src/util/gnunet-ecc.c:361
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:356
+#: src/util/gnunet-ecc.c:364
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:367
+#: src/util/gnunet-ecc.c:375
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
@@ -8273,17 +8315,17 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:713
+#: src/util/os_installation.c:766
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/util/os_installation.c:773
+#: src/util/os_installation.c:826
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/os_installation.c:783
+#: src/util/os_installation.c:836
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2014-02-03 21:07:23 UTC (rev 32173)
+++ gnunet/po/es.po     2014-02-03 21:25:53 UTC (rev 32174)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-01-20 23:27+0100\n"
+"POT-Creation-Date: 2014-02-03 20:43+0100\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -437,21 +437,21 @@
 msgid "Failed to initialize solver!\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
 
-#: src/ats/plugin_ats_mlp.c:868
+#: src/ats/plugin_ats_mlp.c:892
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1281
+#: src/ats/plugin_ats_mlp.c:1329
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
 
-#: src/ats/plugin_ats_mlp.c:1328
+#: src/ats/plugin_ats_mlp.c:1376
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2059
+#: src/ats/plugin_ats_mlp.c:2122
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
@@ -460,7 +460,7 @@
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/plugin_ats_mlp.c:2067
+#: src/ats/plugin_ats_mlp.c:2131
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
@@ -470,30 +470,84 @@
 "ancho de banda predeterminado (%llu)\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/plugin_ats_mlp.c:2077
+#: src/ats/plugin_ats_mlp.c:2142
 #, fuzzy, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/plugin_ats_mlp.c:2085
+#: src/ats/plugin_ats_mlp.c:2150
 #, fuzzy, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/plugin_ats_mlp.c:2096
+#: src/ats/plugin_ats_mlp.c:2161
 #, fuzzy, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
-#: src/ats/plugin_ats_proportional.c:1511
+#: src/ats/plugin_ats_proportional.c:1510
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "No se encontró la IP del host «%s»: %s\n"
 
+#: src/ats-tests/ats-testing.c:71
+msgid "Benchmarking done\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:104
+#, fuzzy, c-format
+msgid "Failed to connect peer 0 and %u\n"
+msgstr "Se produjo un fallo al conectar con «%s»\n"
+
+#: src/ats-tests/ats-testing.c:412
+#, c-format
+msgid "Connected master [%u] with slave [%u]\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:418
+#, fuzzy, c-format
+msgid "Failed to connect master peer [%u] with slave [%u]\n"
+msgstr "Fallo al conectar a gnunetd.\n"
+
+#: src/ats-tests/ats-testing.c:449
+msgid "Connecting peers on CORE level\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:460
+#, c-format
+msgid "Connecting master [%u] with slave [%u]\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:469
+#, fuzzy, c-format
+msgid "Could not connect master [%u] and slave [%u]\n"
+msgstr "¡No se pudo conectar al servicio %s!\n"
+
+#: src/ats-tests/ats-testing.c:489 src/ats-tests/ats-testing.c:670
+#, fuzzy
+msgid "Initialization failed, shutdown\n"
+msgstr "¡La inicialización del mecanismo de módulos falló: %s!\n"
+
+#: src/ats-tests/ats-testing-log.c:840
+msgid "Stop logging\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing-log.c:889
+#, fuzzy, c-format
+msgid "Start logging `%s'\n"
+msgstr "Iniciando descarga «%s».\n"
+
+#: src/ats-tests/gnunet-ats-sim.c:86
+#, c-format
+msgid ""
+"Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
+"= %u KiB/s\n"
+msgstr ""
+
 # Miguel: ¿Como podría traducir "resolutions" y "resolve"?
 # Son difíciles de no calcar, puesto que no conozco como expresar
 # el concepto de obtener una dirección a partir de un nombre
@@ -525,12 +579,12 @@
 msgstr "Cuota para la red «%11s» (entrada/salida): %10s / %10s\n"
 
 #: src/ats-tool/gnunet-ats.c:352 src/namestore/gnunet-namestore.c:550
-#: src/transport/gnunet-transport.c:1130
+#: src/transport/gnunet-transport.c:1134
 #, c-format
 msgid "Service `%s' is not running\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/ats-tool/gnunet-ats.c:364 src/transport/gnunet-transport.c:1139
+#: src/ats-tool/gnunet-ats.c:364 src/transport/gnunet-transport.c:1143
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
@@ -755,157 +809,157 @@
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:644
+#: src/conversation/gnunet-conversation.c:647
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:667
+#: src/conversation/gnunet-conversation.c:670
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:672
+#: src/conversation/gnunet-conversation.c:675
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:678
-#: src/conversation/gnunet-conversation.c:702
+#: src/conversation/gnunet-conversation.c:681
+#: src/conversation/gnunet-conversation.c:705
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:683
+#: src/conversation/gnunet-conversation.c:686
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:692
+#: src/conversation/gnunet-conversation.c:695
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "Detectada dirección de la red interna «%s».\n"
 
-#: src/conversation/gnunet-conversation.c:697
+#: src/conversation/gnunet-conversation.c:700
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:716
+#: src/conversation/gnunet-conversation.c:719
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:722
+#: src/conversation/gnunet-conversation.c:725
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Par «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:750
-#: src/conversation/gnunet-conversation.c:765
+#: src/conversation/gnunet-conversation.c:753
+#: src/conversation/gnunet-conversation.c:768
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:798
-#: src/conversation/gnunet-conversation.c:814
+#: src/conversation/gnunet-conversation.c:801
+#: src/conversation/gnunet-conversation.c:817
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:821
+#: src/conversation/gnunet-conversation.c:824
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:830
+#: src/conversation/gnunet-conversation.c:833
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:847
+#: src/conversation/gnunet-conversation.c:850
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:882
+#: src/conversation/gnunet-conversation.c:885
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:890
+#: src/conversation/gnunet-conversation.c:893
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:907
+#: src/conversation/gnunet-conversation.c:910
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:934
+#: src/conversation/gnunet-conversation.c:937
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:936
+#: src/conversation/gnunet-conversation.c:939
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:938
+#: src/conversation/gnunet-conversation.c:941
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:940
+#: src/conversation/gnunet-conversation.c:943
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:942
+#: src/conversation/gnunet-conversation.c:945
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:944
+#: src/conversation/gnunet-conversation.c:947
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:946
+#: src/conversation/gnunet-conversation.c:949
 #, fuzzy
 msgid "Use `/status' to print status information"
 msgstr "ser prolijo (imprime información de progreso)"
 
-#: src/conversation/gnunet-conversation.c:948
+#: src/conversation/gnunet-conversation.c:951
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Use «/quit» para finalizar «gnunet-chat»"
 
-#: src/conversation/gnunet-conversation.c:950
+#: src/conversation/gnunet-conversation.c:953
 msgid "Use `/help command' to get help for a specific command"
 msgstr "Use «/help comando» para obtener ayuda sobre un comando específico"
 
-#: src/conversation/gnunet-conversation.c:1148
+#: src/conversation/gnunet-conversation.c:1151
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:1161
+#: src/conversation/gnunet-conversation.c:1164
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "El pseudónimo '%s' fue borrado.\n"
 
-#: src/conversation/gnunet-conversation.c:1196
+#: src/conversation/gnunet-conversation.c:1199
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Debes especificar un fichero a inspeccionar.\n"
 
-#: src/conversation/gnunet-conversation.c:1220
+#: src/conversation/gnunet-conversation.c:1223
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Se produjo un fallo al iniciar el proceso «gnunet-peerinfo».\n"
 
-#: src/conversation/gnunet-conversation.c:1246
+#: src/conversation/gnunet-conversation.c:1249
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1249
+#: src/conversation/gnunet-conversation.c:1252
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1276
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1099,7 +1153,7 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "No se pudo empezar a publicar.\n"
 
-#: src/core/core_api.c:765
+#: src/core/core_api.c:767
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
@@ -1110,26 +1164,26 @@
 msgstr "Par «%s»\n"
 
 #: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:820 src/transport/gnunet-transport.c:840
+#: src/transport/gnunet-transport.c:824 src/transport/gnunet-transport.c:844
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr "%24s: %-17s %4s   (%u conexiones en total)\n"
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:821
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:825
 msgid "Connected to"
 msgstr "Conectado a"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:841
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:845
 msgid "Disconnected from"
 msgstr "Desconectado de"
 
-#: src/core/gnunet-core.c:164 src/peerinfo-tool/gnunet-peerinfo.c:645
+#: src/core/gnunet-core.c:164 src/peerinfo-tool/gnunet-peerinfo.c:694
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Parámetro no válido «%s» en la línea de comandos\n"
 
 # Miguel: ¿Quizá continuamente fuese mejor?
-#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1336
+#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1340
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
@@ -1153,11 +1207,11 @@
 msgid "# send requests dropped (disconnected)"
 msgstr "# peticiones de envío descartadas (desconectado)"
 
-#: src/core/gnunet-service-core_clients.c:475
+#: src/core/gnunet-service-core_clients.c:480
 msgid "# messages discarded (session disconnected)"
 msgstr "# mensajes descartados (sesión desconectada)"
 
-#: src/core/gnunet-service-core_clients.c:518
+#: src/core/gnunet-service-core_clients.c:526
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de mensajes del tipo %u recibidos"
@@ -1318,28 +1372,27 @@
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Mensaje no soportado del tipo %u (%u bytes) recibido del par «%s»\n"
 
-#: src/core/gnunet-service-core_sessions.c:208
-#: src/core/gnunet-service-core_sessions.c:278
+#: src/core/gnunet-service-core_sessions.c:214
+#: src/core/gnunet-service-core_sessions.c:286
 #: src/dht/gnunet-service-dht_neighbours.c:662
 #: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:662
-#: src/dht/gnunet-service-xdht_neighbours.c:727
-#: src/fs/gnunet-service-fs_cp.c:604 src/fs/gnunet-service-fs_cp.c:1499
-#: src/topology/gnunet-daemon-topology.c:706
-#: src/topology/gnunet-daemon-topology.c:807
-#: src/transport/gnunet-service-transport_neighbours.c:846
-#: src/transport/gnunet-service-transport_neighbours.c:1078
-#: src/transport/gnunet-service-transport_neighbours.c:1087
-#: src/transport/gnunet-service-transport_neighbours.c:3048
-#: src/transport/gnunet-service-transport_neighbours.c:3309
+#: src/dht/gnunet-service-xdht_neighbours.c:939
+#: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
+#: src/topology/gnunet-daemon-topology.c:707
+#: src/topology/gnunet-daemon-topology.c:808
+#: src/transport/gnunet-service-transport_neighbours.c:848
+#: src/transport/gnunet-service-transport_neighbours.c:1080
+#: src/transport/gnunet-service-transport_neighbours.c:1089
+#: src/transport/gnunet-service-transport_neighbours.c:3202
+#: src/transport/gnunet-service-transport_neighbours.c:3463
 msgid "# peers connected"
 msgstr "# pares conectados"
 
-#: src/core/gnunet-service-core_sessions.c:246
+#: src/core/gnunet-service-core_sessions.c:253
 msgid "# type map refreshes sent"
 msgstr "# envíos de refrescos del mapa de tipos"
 
-#: src/core/gnunet-service-core_sessions.c:415
+#: src/core/gnunet-service-core_sessions.c:424
 msgid "# messages discarded (expired prior to transmission)"
 msgstr "# mensajes descartados (expirados antes de su transmisión)"
 
@@ -1411,7 +1464,7 @@
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
 #: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:61
+#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:60
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» falló en %s: %d con el error: %s\n"
@@ -1421,7 +1474,7 @@
 msgstr "Caché de datos Sqlite ejecutándose\n"
 
 #: src/datacache/plugin_datacache_sqlite.c:484
-#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/datastore/plugin_datastore_sqlite.c:404
 #: src/namecache/plugin_namecache_sqlite.c:295
 #: src/namestore/plugin_namestore_sqlite.c:327
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
@@ -1751,7 +1804,7 @@
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "«%s» falló en %s:%u con el error: %s"
 
-#: src/datastore/plugin_datastore_sqlite.c:253
+#: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
 #: src/psycstore/plugin_psycstore_sqlite.c:319
@@ -1759,19 +1812,19 @@
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Imposible inicializar SQLite: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:649
+#: src/datastore/plugin_datastore_sqlite.c:663
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 "Datos no válidos en la base de datos.  Intentando arreglar (por borrado).\n"
 
 # to should be too, i think
-#: src/datastore/plugin_datastore_sqlite.c:1135
+#: src/datastore/plugin_datastore_sqlite.c:1156
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 "la versión de sqlite es muy antigua para determinar el tamaño, se asume "
 "cero\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1154
+#: src/datastore/plugin_datastore_sqlite.c:1175
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
@@ -1780,7 +1833,7 @@
 "Usando la utilización de páginas de sqlite para estimar el «payload» (%llu "
 "páginas de %llu bytes de tamaño)\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1194
+#: src/datastore/plugin_datastore_sqlite.c:1215
 #: src/namecache/plugin_namecache_sqlite.c:583
 #: src/namestore/plugin_namestore_sqlite.c:719
 msgid "Sqlite database running\n"
@@ -1794,7 +1847,7 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
-#: src/dht/gnunet-dht-get.c:132
+#: src/dht/gnunet-dht-get.c:133
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
@@ -1803,40 +1856,40 @@
 "Resultado %d, tipo %d:\n"
 "%.*s\n"
 
-#: src/dht/gnunet-dht-get.c:156
+#: src/dht/gnunet-dht-get.c:159
 msgid "Must provide key for DHT GET!\n"
 msgstr "¡Se debe proveer una clave para el «GET» DHT!\n"
 
-#: src/dht/gnunet-dht-get.c:162 src/dht/gnunet-dht-monitor.c:225
+#: src/dht/gnunet-dht-get.c:165 src/dht/gnunet-dht-monitor.c:225
 msgid "Failed to connect to DHT service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
-#: src/dht/gnunet-dht-get.c:170
+#: src/dht/gnunet-dht-get.c:173
 msgid "Issueing DHT GET with key"
 msgstr "Enviando un «GET» DHT con clave"
 
-#: src/dht/gnunet-dht-get.c:186 src/dht/gnunet-dht-monitor.c:262
+#: src/dht/gnunet-dht-get.c:189 src/dht/gnunet-dht-monitor.c:262
 #: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr "la clave de búsqueda"
 
-#: src/dht/gnunet-dht-get.c:189
+#: src/dht/gnunet-dht-get.c:192
 msgid "how many parallel requests (replicas) to create"
 msgstr "cuantas peticiones paralelas (réplicas) crear"
 
-#: src/dht/gnunet-dht-get.c:192 src/dht/gnunet-dht-monitor.c:265
+#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265
 msgid "the type of data to look for"
 msgstr "el tipo de datos a buscar"
 
-#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:210
 msgid "how long to execute this query before giving up?"
 msgstr "¿cuánto tiempo se debe ejecutar esta consulta antes de abandonar?"
 
-#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201
 msgid "use DHT's demultiplex everywhere option"
 msgstr "opción para usar el demultiplexado de la DHT siempre"
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
+#: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
 #: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
@@ -1844,7 +1897,7 @@
 msgid "be verbose (print progress information)"
 msgstr "ser prolijo (imprime información de progreso)"
 
-#: src/dht/gnunet-dht-get.c:222
+#: src/dht/gnunet-dht-get.c:225
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 "Iniciando una peticion «GET» a la DHT de GNUnet, imprimiendo resultados."
@@ -1899,13 +1952,13 @@
 msgid "the type to insert data as"
 msgstr "el tipo de datos a insertar"
 
-#: src/dht/gnunet-dht-put.c:235
+#: src/dht/gnunet-dht-put.c:236
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 "Inicianco una petición «PUT» a la DHT de GNUnet para insertar «DATA» bajo "
 "«KEY»."
 
-#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:172
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:176
 msgid "Failed to connect to transport service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio de transporte!\n"
 
@@ -1915,54 +1968,54 @@
 msgstr "# peticiones «GET» inyectadas de clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:511
-#: src/dht/gnunet-service-xdht_clients.c:511
+#: src/dht/gnunet-service-xdht_clients.c:512
 msgid "# PUT requests received from clients"
 msgstr "# peticiones «PUT» recibidas de clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:595
-#: src/dht/gnunet-service-xdht_clients.c:595
+#: src/dht/gnunet-service-xdht_clients.c:597
 msgid "# GET requests received from clients"
 msgstr "# peticiones «GET» recibidas de clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:796
-#: src/dht/gnunet-service-xdht_clients.c:796
+#: src/dht/gnunet-service-xdht_clients.c:798
 msgid "# GET STOP requests received from clients"
 msgstr "# peticiones «GET STOP» recibidas de clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:1037
-#: src/dht/gnunet-service-xdht_clients.c:1037
+#: src/dht/gnunet-service-xdht_clients.c:1039
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 "# Coincidencias de clave, diferencias de tipo en la respuesta (REPLY) del "
 "cliente (CLIENT)"
 
 #: src/dht/gnunet-service-dht_clients.c:1050
-#: src/dht/gnunet-service-xdht_clients.c:1050
+#: src/dht/gnunet-service-xdht_clients.c:1052
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 "# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) omitidas"
 
 #: src/dht/gnunet-service-dht_clients.c:1087
-#: src/dht/gnunet-service-xdht_clients.c:1087
+#: src/dht/gnunet-service-xdht_clients.c:1089
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr "¡Tipo de bloque no soportado (%u) en la petición!\n"
 
 #: src/dht/gnunet-service-dht_clients.c:1110
-#: src/dht/gnunet-service-xdht_clients.c:1110
+#: src/dht/gnunet-service-xdht_clients.c:1112
 msgid "# RESULTS queued for clients"
 msgstr "# Resultados (RESULTS) encolados para clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:1164
-#: src/dht/gnunet-service-dht_clients.c:1206
-#: src/dht/gnunet-service-xdht_clients.c:1164
-#: src/dht/gnunet-service-xdht_clients.c:1206
+#: src/dht/gnunet-service-dht_clients.c:1207
+#: src/dht/gnunet-service-xdht_clients.c:1166
+#: src/dht/gnunet-service-xdht_clients.c:1208
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 "# Respuestas (REPLIES) ignoradas para clientes (CLIENTS) (sin coincidencia)"
 
 #: src/dht/gnunet-service-dht_clients.c:1174
-#: src/dht/gnunet-service-xdht_clients.c:1174
+#: src/dht/gnunet-service-xdht_clients.c:1176
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 "¡No se pudo enviar respuesta al cliente, el mensaje es demasiado grande!\n"
@@ -2020,133 +2073,110 @@
 msgstr "# «HELLO» obtenidos de «peerinfo»"
 
 #: src/dht/gnunet-service-dht_neighbours.c:516
-#: src/dht/gnunet-service-xdht_neighbours.c:516
 msgid "# Preference updates given to core"
 msgstr "# Actualizaciones de preferencias dadas al servicio principal"
 
 #: src/dht/gnunet-service-dht_neighbours.c:610
-#: src/dht/gnunet-service-xdht_neighbours.c:610
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes «FIND PEER» iniciados"
 
 #: src/dht/gnunet-service-dht_neighbours.c:764
-#: src/dht/gnunet-service-xdht_neighbours.c:764
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# Mensajes encolados descartados (par desconectado)"
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:819
+#: src/dht/gnunet-service-xdht_neighbours.c:540
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes transmitidos a otros pares"
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:857
+#: src/dht/gnunet-service-xdht_neighbours.c:579
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Bytes de ancho de banda solicitados por el servicio principal"
 
 #: src/dht/gnunet-service-dht_neighbours.c:889
-#: src/dht/gnunet-service-xdht_neighbours.c:889
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# peticiones unidas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1093
 #: src/dht/gnunet-service-dht_neighbours.c:1130
-#: src/dht/gnunet-service-xdht_neighbours.c:1093
-#: src/dht/gnunet-service-xdht_neighbours.c:1130
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr "# Pares excluidos del encaminado debido a «Bloomfilter»"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1108
 #: src/dht/gnunet-service-dht_neighbours.c:1145
-#: src/dht/gnunet-service-xdht_neighbours.c:1108
-#: src/dht/gnunet-service-xdht_neighbours.c:1145
 msgid "# Peer selection failed"
 msgstr "# Selecciones de pares fallidas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1287
-#: src/dht/gnunet-service-xdht_neighbours.c:1287
 msgid "# PUT requests routed"
 msgstr "# Peticiones «PUT» encaminadas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1316
-#: src/dht/gnunet-service-xdht_neighbours.c:1316
 msgid "# PUT messages queued for transmission"
 msgstr "# mensajes «PUT» encolados para transmisión"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1323
 #: src/dht/gnunet-service-dht_neighbours.c:1440
 #: src/dht/gnunet-service-dht_neighbours.c:1543
-#: src/dht/gnunet-service-xdht_neighbours.c:1323
-#: src/dht/gnunet-service-xdht_neighbours.c:1440
-#: src/dht/gnunet-service-xdht_neighbours.c:1543
+#: src/dht/gnunet-service-xdht_neighbours.c:616
+#: src/dht/gnunet-service-xdht_neighbours.c:1246
+#: src/dht/gnunet-service-xdht_neighbours.c:1330
 msgid "# P2P messages dropped due to full queue"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1405
-#: src/dht/gnunet-service-xdht_neighbours.c:1405
 msgid "# GET requests routed"
 msgstr "# Peticiones «GET» encaminadas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1432
-#: src/dht/gnunet-service-xdht_neighbours.c:1432
 msgid "# GET messages queued for transmission"
 msgstr "# Mensajes «GET» encolados para transmisión"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1550
-#: src/dht/gnunet-service-xdht_neighbours.c:1550
 msgid "# RESULT messages queued for transmission"
 msgstr "# Mensajes «RESULT» encolados para transmisión"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1637
-#: src/dht/gnunet-service-xdht_neighbours.c:1637
 msgid "# P2P PUT requests received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1640
-#: src/dht/gnunet-service-xdht_neighbours.c:1640
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1803
-#: src/dht/gnunet-service-xdht_neighbours.c:1803
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1811
-#: src/dht/gnunet-service-xdht_neighbours.c:1811
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a falta de «HELLO»"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1904
-#: src/dht/gnunet-service-xdht_neighbours.c:1904
 msgid "# P2P GET requests received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1907
-#: src/dht/gnunet-service-xdht_neighbours.c:1907
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1961
-#: src/dht/gnunet-service-xdht_neighbours.c:1961
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Peticiones «FIND PEER» P2P procesadas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1975
-#: src/dht/gnunet-service-xdht_neighbours.c:1975
 msgid "# P2P GET requests ONLY routed"
 msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
 
 #: src/dht/gnunet-service-dht_neighbours.c:2052
-#: src/dht/gnunet-service-xdht_neighbours.c:2052
 msgid "# P2P RESULTS received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
 
 #: src/dht/gnunet-service-dht_neighbours.c:2055
-#: src/dht/gnunet-service-xdht_neighbours.c:2055
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
@@ -2156,51 +2186,53 @@
 msgstr "# Estimaciones del tamaño de red recibidas"
 
 #: src/dht/gnunet-service-dht_routing.c:211
-#: src/dht/gnunet-service-xdht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 "# Buenas respuestas (REPLIES) encontradas en la tabla de encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:220
-#: src/dht/gnunet-service-xdht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) duplicadas encontradas en la tabla de encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:226
-#: src/dht/gnunet-service-xdht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) no válidas encontradas en la tabla de encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:232
-#: src/dht/gnunet-service-xdht_routing.c:232
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) irrelevantes encontradas en la tabla de encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:244
-#: src/dht/gnunet-service-xdht_routing.c:244
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 "# Respuestas (REPLIES) no soportadas encontradas en la tabla de "
 "encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:317
-#: src/dht/gnunet-service-xdht_routing.c:317
 msgid "# Entries removed from routing table"
 msgstr "# Entradas eliminadas de la tabla de encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:399
-#: src/dht/gnunet-service-xdht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr "# Entradas añadidas a la tabla de encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:417
-#: src/dht/gnunet-service-xdht_routing.c:417
 msgid "# DHT requests combined"
 msgstr "# Peticiones a la DHT combinadas"
 
+#: src/dht/gnunet-service-xdht_neighbours.c:1179
+#, fuzzy
+msgid "# TRAIL SETUP requests received"
+msgstr "# peticiones «GET» recibidas"
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1182
+#, fuzzy
+msgid "# TRAIL SETUP bytes received"
+msgstr "# Peticiones «GET» P2P recibidas"
+
 #: src/dht/plugin_block_dht.c:138
 #, c-format
 msgid "Block not of type %u\n"
@@ -2634,32 +2666,32 @@
 msgid "Cannot read experiments file `%s'\n"
 msgstr "No se pudo leer la lista de amigos «%s»\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:219
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
 #, c-format
 msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:307
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
 #, c-format
 msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:451
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
 #, c-format
 msgid "Added peer `%s' as active node\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:889
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891
 #, fuzzy, c-format
 msgid "Connected to peer %s\n"
 msgstr "Conectado a %s.\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:919
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921
 #, fuzzy, c-format
 msgid "Disconnected from peer %s\n"
 msgstr "Desconectado de %s\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1102
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
@@ -3476,7 +3508,7 @@
 msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n"
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1168 src/transport/gnunet-transport.c:1198
+#: src/transport/gnunet-transport.c:1172 src/transport/gnunet-transport.c:1202
 #, 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"
@@ -3595,90 +3627,90 @@
 msgstr "# Rutas en bucle local eliminadas"
 
 #: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
-#: src/topology/gnunet-daemon-topology.c:1253
-#: src/topology/gnunet-daemon-topology.c:1260
+#: src/topology/gnunet-daemon-topology.c:1254
+#: src/topology/gnunet-daemon-topology.c:1261
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Se produjo un fallo al conectar con el servicio «%s».\n"
 
-#: src/fs/gnunet-service-fs_cp.c:680
+#: src/fs/gnunet-service-fs_cp.c:682
 msgid "# migration stop messages received"
 msgstr "# mensajes de detención de migración recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:684
+#: src/fs/gnunet-service-fs_cp.c:686
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr "Migración de contenido al par «%s» bloqueada durante %s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:719
+#: src/fs/gnunet-service-fs_cp.c:721
 msgid "# replies transmitted to other peers"
 msgstr "# respuestas transmitidas a otros pares"
 
-#: src/fs/gnunet-service-fs_cp.c:725
+#: src/fs/gnunet-service-fs_cp.c:727
 msgid "# replies dropped"
 msgstr "# respuestas omitidas"
 
-#: src/fs/gnunet-service-fs_cp.c:750 src/fs/gnunet-service-fs_cp.c:1299
+#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301
 msgid "# P2P searches active"
 msgstr "# busquedas P2P activas"
 
-#: src/fs/gnunet-service-fs_cp.c:843
+#: src/fs/gnunet-service-fs_cp.c:845
 msgid "# artificial delays introduced (ms)"
 msgstr "# retardos artificiales introducidos (ms)"
 
-#: src/fs/gnunet-service-fs_cp.c:896
+#: src/fs/gnunet-service-fs_cp.c:898
 msgid "# replies dropped due to type mismatch"
 msgstr "# respuestas omitidas debido a incompatibilidad de tipos"
 
-#: src/fs/gnunet-service-fs_cp.c:904
+#: src/fs/gnunet-service-fs_cp.c:906
 msgid "# replies received for other peers"
 msgstr "# respuestas recibidas de otros pares"
 
-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:920
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr "# respuestas omitidas debido a insuficiente tráfico de cobertura"
 
-#: src/fs/gnunet-service-fs_cp.c:956
+#: src/fs/gnunet-service-fs_cp.c:958
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr "# búsquedas P2P destruidas debido a respuesta definitiva"
 
-#: src/fs/gnunet-service-fs_cp.c:1024
+#: src/fs/gnunet-service-fs_cp.c:1026
 msgid "# requests done for free (low load)"
 msgstr "# peticiones realizadas gratuitamente (baja carga)"
 
-#: src/fs/gnunet-service-fs_cp.c:1049
+#: src/fs/gnunet-service-fs_cp.c:1051
 msgid "# request dropped, priority insufficient"
 msgstr "# peticiones omitidas, prioridad insuficiente"
 
-#: src/fs/gnunet-service-fs_cp.c:1059
+#: src/fs/gnunet-service-fs_cp.c:1061
 msgid "# requests done for a price (normal load)"
 msgstr "# peticiones realizadas por un precio (carga normal)"
 
-#: src/fs/gnunet-service-fs_cp.c:1137
+#: src/fs/gnunet-service-fs_cp.c:1139
 msgid "# GET requests received (from other peers)"
 msgstr "# peticiones «GET» recibidas (de otros pares)"
 
-#: src/fs/gnunet-service-fs_cp.c:1171
+#: src/fs/gnunet-service-fs_cp.c:1173
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# peticiones omitidas debido a que el iniciador no está conectado"
 
-#: src/fs/gnunet-service-fs_cp.c:1193
+#: src/fs/gnunet-service-fs_cp.c:1195
 msgid "# requests dropped due to missing reverse route"
 msgstr "# peticiones omitidas debido a falta de ruta inversa"
 
-#: src/fs/gnunet-service-fs_cp.c:1244
+#: src/fs/gnunet-service-fs_cp.c:1246
 msgid "# requests dropped due TTL underflow"
 msgstr "# peticiones omitidas debido a expiración del TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1268
+#: src/fs/gnunet-service-fs_cp.c:1270
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# peticiones omitidas debido a una petición de mayor TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1297
+#: src/fs/gnunet-service-fs_cp.c:1299
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes de búsqueda P2P recibidos y procesados"
 
-#: src/fs/gnunet-service-fs_cp.c:1668
+#: src/fs/gnunet-service-fs_cp.c:1670
 msgid "# migration stop messages sent"
 msgstr "# mensajes de detención de migración enviados"
 
@@ -3969,7 +4001,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n"
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:566
+#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Número de puerto %llu no válido.  Saliendo.\n"
@@ -4666,11 +4698,11 @@
 msgid "expired addresses encountered"
 msgstr "direcciones expiradas encontradas"
 
-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
+#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425
 #: src/peerinfo-tool/gnunet-peerinfo.c:350
 #: src/peerinfo-tool/gnunet-peerinfo.c:419
 #: src/peerinfo-tool/gnunet-peerinfo.c:490
-#: src/topology/gnunet-daemon-topology.c:924
+#: src/topology/gnunet-daemon-topology.c:925
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
@@ -4725,34 +4757,34 @@
 msgid "# hostlist advertisements send"
 msgstr "# anuncios de listas de máquinas enviados"
 
-#: src/hostlist/hostlist-server.c:389
+#: src/hostlist/hostlist-server.c:390
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 "Los mensajes de anuncio no pudieron encolarse por el servicio principal\n"
 
-#: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639
 #: src/transport/gnunet-service-transport.c:892
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
 "Saliendo.\n"
 
-#: src/hostlist/hostlist-server.c:575
+#: src/hostlist/hostlist-server.c:576
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr "Servicio de listas de máquinas arranca en %s:%llu\n"
 
-#: src/hostlist/hostlist-server.c:589
+#: src/hostlist/hostlist-server.c:590
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Dirección para obtener la lista de máquinas: «%s»\n"
 
-#: src/hostlist/hostlist-server.c:629
+#: src/hostlist/hostlist-server.c:630
 #, c-format
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/hostlist-server.c:672
+#: src/hostlist/hostlist-server.c:673
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4852,37 +4884,42 @@
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Se produjo un fallo al leer el directorio «%s»\n"
 
-#: src/mesh/gnunet-mesh.c:343
+#: src/mesh/gnunet-mesh.c:348
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/mesh/gnunet-mesh.c:521
+#: src/mesh/gnunet-mesh.c:592
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/mesh/gnunet-mesh.c:586
-msgid "You must NOT give a TARGET when using options\n"
+#: src/mesh/gnunet-mesh.c:658
+msgid "You must NOT give a TARGETwhen using 'request all' options\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:669
+#: src/mesh/gnunet-mesh.c:747
 msgid "activate echo mode"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:672
+#: src/mesh/gnunet-mesh.c:753
+msgid "port to listen to (default; 0)"
+msgstr ""
+
+#: src/mesh/gnunet-mesh.c:756
 #, fuzzy
-msgid "provide information about all tunnels"
+msgid "provide information about all peers"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/mesh/gnunet-mesh.c:678
-msgid "port to listen to (default; 0)"
-msgstr ""
-
-#: src/mesh/gnunet-mesh.c:681
+#: src/mesh/gnunet-mesh.c:759
 msgid "provide information about a particular tunnel"
 msgstr "proveer información acerca de un túnel en particular"
 
+#: src/mesh/gnunet-mesh.c:762
+#, fuzzy
+msgid "provide information about all tunnels"
+msgstr "proveer información acerca de un túnel en particular"
+
 #: src/mesh/gnunet-service-mesh_peer.c:377
 msgid "Wrong CORE service\n"
 msgstr "Servicio principal (CORE) erróneo\n"
@@ -5002,7 +5039,7 @@
 msgstr "borrar"
 
 #: src/namestore/gnunet-namestore.c:715
-#: src/peerinfo-tool/gnunet-peerinfo.c:702
+#: src/peerinfo-tool/gnunet-peerinfo.c:723
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
@@ -5344,7 +5381,7 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/nse/gnunet-service-nse.c:1461
+#: src/nse/gnunet-service-nse.c:1462
 #: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248
 msgid "Value is too large.\n"
 msgstr ""
@@ -5466,66 +5503,71 @@
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fallo añadiendo «HELLO»: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:666 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:633
+#, fuzzy, c-format
+msgid "Service `%s' is not running, please start GNUnet\n"
+msgstr "El servicio «%s» no está ejecutandose\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "La carga de la clave de la máquina desde «%s» ha fallado.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:724
+#: src/peerinfo-tool/gnunet-peerinfo.c:745
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par «%s».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:768
+#: src/peerinfo-tool/gnunet-peerinfo.c:789
 msgid "don't resolve host names"
 msgstr "no resolver nombres de máquina"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:771
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
 msgid "output only the identity strings"
 msgstr "mostrar únicamente las cadenas de identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:774
+#: src/peerinfo-tool/gnunet-peerinfo.c:795
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:777
+#: src/peerinfo-tool/gnunet-peerinfo.c:798
 msgid "output our own identity only"
 msgstr "muestra únicamente nuestra propia identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:780
+#: src/peerinfo-tool/gnunet-peerinfo.c:801
 msgid "list all known peers"
 msgstr "mostrar todos los pares conocidos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:783
+#: src/peerinfo-tool/gnunet-peerinfo.c:804
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:786
+#: src/peerinfo-tool/gnunet-peerinfo.c:807
 msgid "also output HELLO uri(s)"
 msgstr "también mostrar las URI de «HELLO»"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:810
 msgid "add given HELLO uri to the database"
 msgstr "añade la URI de «HELLO» dada a la base de datos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:800
+#: src/peerinfo-tool/gnunet-peerinfo.c:821
 msgid "Print information about peers."
 msgstr "Imprimir información sobre los pares."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:124
+#: src/transport/gnunet-service-transport_plugins.c:126
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Iniciando los módulos de transporte «%s»\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:129
+#: src/transport/gnunet-service-transport_plugins.c:131
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Cargando el módulo de transporte «%s»\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:159
+#: src/transport/gnunet-service-transport_plugins.c:163
 #, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
@@ -5987,149 +6029,149 @@
 msgid "Generated key set with key length %d bits.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:776
+#: src/scalarproduct/gnunet-service-scalarproduct.c:746
 #, fuzzy, c-format
 msgid "Client (%p) disconnected from us.\n"
 msgstr "Desconectado de %s\n"
 
 # Miguel: Si no me equivoco, "status result" es un
 # resultado de tipo estado.
-#: src/scalarproduct/gnunet-service-scalarproduct.c:848
-#: src/scalarproduct/gnunet-service-scalarproduct.c:938
+#: src/scalarproduct/gnunet-service-scalarproduct.c:818
+#: src/scalarproduct/gnunet-service-scalarproduct.c:908
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "No se pudo mandar el resultado (estado) al cliente\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:854
+#: src/scalarproduct/gnunet-service-scalarproduct.c:824
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:948
+#: src/scalarproduct/gnunet-service-scalarproduct.c:918
 #, c-format
 msgid "Sent result to client (%p), this session (%s) has ended!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1027
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1165
+#: src/scalarproduct/gnunet-service-scalarproduct.c:997
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1135
 msgid "Could not send service-response message via mesh!)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1391
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1340
 #, c-format
 msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1495
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1622
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1444
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1571
 #, fuzzy
 msgid "Transmitting service request.\n"
 msgstr "Reiniciando el servicio «%s»\n"
 
 # Miguel: Si no me equivoco, "list result" es un resultado
 # de tipo lista.
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1504
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1453
 #, fuzzy
 msgid "Could not send service-request multipart message to channel!\n"
 msgstr "No se pudo mandar el resultado (lista) al cliente\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1544
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1493
 #, fuzzy, c-format
 msgid "Successfully created new channel to peer (%s)!\n"
 msgstr "Conectado satisfactoriamente a «%s»\n"
 
 # Miguel: Si no me equivoco, "list result" es un resultado
 # de tipo lista.
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1631
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1580
 #, fuzzy
 msgid "Could not send message to channel!\n"
 msgstr "No se pudo mandar el resultado (lista) al cliente\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1688
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1637
 #, fuzzy
 msgid "Too short message received from client!\n"
 msgstr "# peticiones «PUT» recibidas de clientes"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1701
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1650
 #, fuzzy
 msgid "Invalid message received from client, session information incorrect!\n"
 msgstr "Mensaje «%s» no válido recibido de la lista de máquinas en «%s»\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1712
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1661
 #, c-format
 msgid ""
 "Duplicate session information received, cannot create new session with key `"
 "%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1733
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1682
 #, c-format
 msgid ""
 "Got client-request-session with key %s, preparing channel to remote "
 "service.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1772
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1721
 #, c-format
 msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1819
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1768
 #, c-format
 msgid ""
 "Got client-responder-session with key %s and a matching service-request-"
 "session set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1830
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1779
 #, c-format
 msgid ""
 "Got client-responder-session with key %s but NO matching service-request-"
 "session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1860
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1809
 #, fuzzy, c-format
 msgid "New incoming channel from peer %s.\n"
 msgstr "Desconectado de %s\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1841
 #, c-format
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2083
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2242
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2032
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2191
 #, c-format
 msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2092
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2249
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2041
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2198
 #, c-format
 msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2187
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2136
 #, c-format
 msgid ""
 "Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2471
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2420
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2536
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2485
 msgid "Generating Paillier-Keyset.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2551
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2500
 #, fuzzy
 msgid "Connect to MESH failed\n"
 msgstr "Conexión fallida (¿bug?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2555
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2504
 #, fuzzy
 msgid "Mesh initialized\n"
 msgstr "Conexión fallida\n"
@@ -6174,7 +6216,7 @@
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1416
+#: src/set/gnunet-service-set.c:1415
 #, fuzzy
 msgid "Could not connect to mesh service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
@@ -6710,36 +6752,36 @@
 msgid "# connect requests issued to transport"
 msgstr "# peticiones de conexión requeridas al servicio de transporte"
 
-#: src/topology/gnunet-daemon-topology.c:727
-#: src/topology/gnunet-daemon-topology.c:812
+#: src/topology/gnunet-daemon-topology.c:728
+#: src/topology/gnunet-daemon-topology.c:813
 msgid "# friends connected"
 msgstr "# amigos conectados"
 
-#: src/topology/gnunet-daemon-topology.c:992
+#: src/topology/gnunet-daemon-topology.c:993
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 "¡Se produjo un fallo al conectar con el servicio principal, no se puede "
 "gestionar la topología!\n"
 
-#: src/topology/gnunet-daemon-topology.c:1021
+#: src/topology/gnunet-daemon-topology.c:1022
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr "Me he encontrado «%s» en mi lista de amigos (inútil, ignorado)\n"
 
-#: src/topology/gnunet-daemon-topology.c:1028
+#: src/topology/gnunet-daemon-topology.c:1029
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr "Encontrado amigo «%s» en la configuración\n"
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:1050
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1051
+#: src/topology/gnunet-daemon-topology.c:1052
 msgid "# friends in configuration"
 msgstr "# amigos en configuración"
 
-#: src/topology/gnunet-daemon-topology.c:1056
+#: src/topology/gnunet-daemon-topology.c:1057
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
@@ -6747,23 +6789,23 @@
 "Menos amigos especificados que los requeridos por el contador mínimo de "
 "amigos. Sólo me conectaré a amigos.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1062
+#: src/topology/gnunet-daemon-topology.c:1063
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 "Más conexiones amistosas requeridas que el número objetivo total de "
 "conexiones.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1093
+#: src/topology/gnunet-daemon-topology.c:1094
 msgid "# HELLO messages received"
 msgstr "# mensajes «HELLO» recibidos"
 
 # gossiped??
-#: src/topology/gnunet-daemon-topology.c:1150
+#: src/topology/gnunet-daemon-topology.c:1151
 msgid "# HELLO messages gossipped"
 msgstr "# Mensajes «HELLO» rumoreados"
 
-#: src/topology/gnunet-daemon-topology.c:1289
+#: src/topology/gnunet-daemon-topology.c:1290
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 "Control de topología de GNUnet (manteniendo las restricciones del mesh de "
@@ -6843,181 +6885,181 @@
 msgid "# refreshed my HELLO"
 msgstr "# refrescos de mi «HELLO»"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1025
+#: src/transport/gnunet-service-transport_neighbours.c:1027
 msgid "# DISCONNECT messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1161
-#: src/transport/gnunet-service-transport_neighbours.c:1571
+#: src/transport/gnunet-service-transport_neighbours.c:1163
+#: src/transport/gnunet-service-transport_neighbours.c:1573
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes en la cola de mensajes para otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1166
+#: src/transport/gnunet-service-transport_neighbours.c:1168
 msgid "# messages transmitted to other peers"
 msgstr "# mensajes transmitidos a otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1171
+#: src/transport/gnunet-service-transport_neighbours.c:1173
 msgid "# transmission failures for messages to other peers"
 msgstr "# fallos de transmisión en mensajes a otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1228
+#: src/transport/gnunet-service-transport_neighbours.c:1230
 msgid "# messages timed out while in transport queue"
 msgstr "# mensajes expirados mientras estaban en la cola de transporte"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1285
+#: src/transport/gnunet-service-transport_neighbours.c:1287
 msgid "# keepalives sent"
 msgstr "# «keepalives» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1318
+#: src/transport/gnunet-service-transport_neighbours.c:1320
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# Mensajes «KEEPALIVE» descartados (par desconocido)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1326
+#: src/transport/gnunet-service-transport_neighbours.c:1328
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes «KEEPALIVE» descartados (no hay sesión)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1373
+#: src/transport/gnunet-service-transport_neighbours.c:1375
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1384
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# Mensajes «KEEPALIVE_RESPONSE» descartados (no esperado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1390
+#: src/transport/gnunet-service-transport_neighbours.c:1392
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1398
+#: src/transport/gnunet-service-transport_neighbours.c:1400
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1476
+#: src/transport/gnunet-service-transport_neighbours.c:1478
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# mensajes descartados debido a la falta de registro vecinal"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1510
+#: src/transport/gnunet-service-transport_neighbours.c:1512
 msgid "# bandwidth quota violations by other peers"
 msgstr "# violaciones de la cuota de ancho de banda por otros pares"
 
 # throttling?
-#: src/transport/gnunet-service-transport_neighbours.c:1526
+#: src/transport/gnunet-service-transport_neighbours.c:1528
 msgid "# ms throttling suggested"
 msgstr "# ms de impulso sugeridos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1618
+#: src/transport/gnunet-service-transport_neighbours.c:1620
 #, fuzzy
 msgid "# SESSION_CONNECT messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1634
+#: src/transport/gnunet-service-transport_neighbours.c:1636
 #, fuzzy, c-format
 msgid "Failed to transmit CONNECT message via plugin to %s\n"
 msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1677
+#: src/transport/gnunet-service-transport_neighbours.c:1679
 #, fuzzy
 msgid "# CONNECT_ACK messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1797
+#: src/transport/gnunet-service-transport_neighbours.c:1947
 #, fuzzy, c-format
 msgid "Blacklisting dissaproved to connect to peer `%s'\n"
 msgstr "Se produjo un fallo al conectar con «%s»\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2210
+#: src/transport/gnunet-service-transport_neighbours.c:2360
 #, fuzzy
 msgid "# CONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2215
+#: src/transport/gnunet-service-transport_neighbours.c:2365
 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3013
+#: src/transport/gnunet-service-transport_neighbours.c:3167
 #, fuzzy
 msgid "# CONNECT_ACK messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3021
+#: src/transport/gnunet-service-transport_neighbours.c:3175
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3036
-#: src/transport/gnunet-service-transport_neighbours.c:3072
+#: src/transport/gnunet-service-transport_neighbours.c:3190
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3085
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (esperando en el ATS)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3115
+#: src/transport/gnunet-service-transport_neighbours.c:3269
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3284
+#: src/transport/gnunet-service-transport_neighbours.c:3438
 #, fuzzy
 msgid "# SESSION_ACK messages received"
 msgstr "# mensajes SET QUOTA recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3303
+#: src/transport/gnunet-service-transport_neighbours.c:3457
 #, fuzzy
 msgid "# unexpected SESSION_ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3358
+#: src/transport/gnunet-service-transport_neighbours.c:3511
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr "# Mensajes «SET QUOTA» ignorados (no existe tal par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3373
+#: src/transport/gnunet-service-transport_neighbours.c:3526
 msgid "# disconnects due to quota of 0"
 msgstr "# desconexiones debido a una cuota de 0"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3401
+#: src/transport/gnunet-service-transport_neighbours.c:3554
 msgid "# disconnect messages ignored (old format)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3407
+#: src/transport/gnunet-service-transport_neighbours.c:3560
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3416
+#: src/transport/gnunet-service-transport_neighbours.c:3569
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3452
+#: src/transport/gnunet-service-transport_neighbours.c:3605
 msgid "# other peer asked to disconnect from us"
 msgstr "# peticiones de otro par para desconectarse de nosotros"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3704
 msgid "# disconnected from peer upon explicit request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
-#: src/transport/gnunet-service-transport_plugins.c:116
+#: src/transport/gnunet-service-transport_plugins.c:118
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr "El servicio de transporte carece de la opción «NEIGHBOUR_LIMIT».\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:172
-#: src/transport/gnunet-service-transport_plugins.c:180
-#: src/transport/gnunet-service-transport_plugins.c:188
-#: src/transport/gnunet-service-transport_plugins.c:196
-#: src/transport/gnunet-service-transport_plugins.c:204
-#: src/transport/gnunet-service-transport_plugins.c:212
-#: src/transport/gnunet-service-transport_plugins.c:220
-#: src/transport/gnunet-service-transport_plugins.c:228
-#: src/transport/gnunet-service-transport_plugins.c:236
-#: src/transport/gnunet-service-transport_plugins.c:244
-#: src/transport/gnunet-service-transport_plugins.c:252
+#: src/transport/gnunet-service-transport_plugins.c:176
+#: src/transport/gnunet-service-transport_plugins.c:184
+#: src/transport/gnunet-service-transport_plugins.c:192
+#: src/transport/gnunet-service-transport_plugins.c:200
+#: src/transport/gnunet-service-transport_plugins.c:208
+#: src/transport/gnunet-service-transport_plugins.c:216
+#: src/transport/gnunet-service-transport_plugins.c:224
+#: src/transport/gnunet-service-transport_plugins.c:232
+#: src/transport/gnunet-service-transport_plugins.c:240
+#: src/transport/gnunet-service-transport_plugins.c:248
+#: src/transport/gnunet-service-transport_plugins.c:256
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:259
+#: src/transport/gnunet-service-transport_plugins.c:263
 #, fuzzy, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Falló al cargar el plugin '%s' en %s:%d. Descargando plugin.\n"
@@ -7163,17 +7205,17 @@
 msgstr ""
 "Ningún puerto fue configurado para el módulo «%s», no se puede probar\n"
 
-#: src/transport/gnunet-transport.c:720
+#: src/transport/gnunet-transport.c:722
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Transmitiendo %u bytes a %s\n"
 
-#: src/transport/gnunet-transport.c:741
+#: src/transport/gnunet-transport.c:743
 #, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Conectado satisfactoriamente a «%s»\n"
 
-#: src/transport/gnunet-transport.c:765
+#: src/transport/gnunet-transport.c:767
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7182,33 +7224,33 @@
 "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
 "bloques de %u Kb\n"
 
-#: src/transport/gnunet-transport.c:798
+#: src/transport/gnunet-transport.c:802
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "Desconectado del par «%s» mientras probaba\n"
 
-#: src/transport/gnunet-transport.c:860
+#: src/transport/gnunet-transport.c:864
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Recibidos %u bytes de %s\n"
 
-#: src/transport/gnunet-transport.c:883
+#: src/transport/gnunet-transport.c:887
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:893
+#: src/transport/gnunet-transport.c:897
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1106
+#: src/transport/gnunet-transport.c:1110
 msgid "Failed to send connect request to transport service\n"
 msgstr ""
 "Se produjo un fallo al enviar una petición de conexión al servicio de "
 "transporte\n"
 
-#: src/transport/gnunet-transport.c:1150
+#: src/transport/gnunet-transport.c:1154
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -7217,7 +7259,7 @@
 "Múltiples operaciones introducidas. Por favor, seleccione únicamente una "
 "operación: %s, %s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1158
+#: src/transport/gnunet-transport.c:1162
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
@@ -7225,72 +7267,72 @@
 "Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
 "%s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1177 src/transport/gnunet-transport.c:1207
-#: src/transport/gnunet-transport.c:1230 src/transport/gnunet-transport.c:1273
+#: src/transport/gnunet-transport.c:1181 src/transport/gnunet-transport.c:1211
+#: src/transport/gnunet-transport.c:1234 src/transport/gnunet-transport.c:1277
 msgid "Failed to connect to transport service\n"
 msgstr "Se produjo un fallo al conectar con el servicio de transporte\n"
 
-#: src/transport/gnunet-transport.c:1186 src/transport/gnunet-transport.c:1216
+#: src/transport/gnunet-transport.c:1190 src/transport/gnunet-transport.c:1220
 msgid "Failed to send request to transport service\n"
 msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
 
-#: src/transport/gnunet-transport.c:1235
+#: src/transport/gnunet-transport.c:1239
 msgid "Starting to receive benchmark data\n"
 msgstr "Empezando a recibir datos de prueba\n"
 
-#: src/transport/gnunet-transport.c:1319
+#: src/transport/gnunet-transport.c:1323
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers )"
 msgstr "Imprime información sobre los pares conectados."
 
-#: src/transport/gnunet-transport.c:1322
+#: src/transport/gnunet-transport.c:1326
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr "medir cómo de rápido recibimos datos de todos los pares (hasta CTRL-C)"
 
-#: src/transport/gnunet-transport.c:1324
+#: src/transport/gnunet-transport.c:1328
 msgid "connect to a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:1327
+#: src/transport/gnunet-transport.c:1331
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "Imprime información de los pares de GNUnet."
 
 # Miguel: ¿Quizá continuamente fuese mejor?
-#: src/transport/gnunet-transport.c:1330
+#: src/transport/gnunet-transport.c:1334
 #, fuzzy
 msgid "print information for all pending validations continously"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
 
-#: src/transport/gnunet-transport.c:1333
+#: src/transport/gnunet-transport.c:1337
 msgid "provide information about all current connections (once)"
 msgstr "provee información sobre todas las conexiones actuales (una vez)"
 
-#: src/transport/gnunet-transport.c:1339
+#: src/transport/gnunet-transport.c:1343
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 "provee información sobre todas los eventos de conexión y desconexión "
 "(continuamente)"
 
-#: src/transport/gnunet-transport.c:1341
+#: src/transport/gnunet-transport.c:1345
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
-#: src/transport/gnunet-transport.c:1343
+#: src/transport/gnunet-transport.c:1347
 msgid "peer identity"
 msgstr "identidad del par"
 
-#: src/transport/gnunet-transport.c:1345
+#: src/transport/gnunet-transport.c:1349
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr "enviar data para prueba a otro par (hasta CTRL-C)"
 
-#: src/transport/gnunet-transport.c:1348
+#: src/transport/gnunet-transport.c:1352
 msgid "test transport configuration (involves external server)"
 msgstr "probar configuración de transporte (requiere un servidor externo)"
 
-#: src/transport/gnunet-transport.c:1357
+#: src/transport/gnunet-transport.c:1361
 msgid "Direct access to transport service."
 msgstr "Acceso directo al servicio de transporte."
 
@@ -7568,59 +7610,59 @@
 msgstr "Longitud de dirección inesperada: %u bytes\n"
 
 #: src/transport/plugin_transport_tcp.c:766
-#: src/transport/plugin_transport_tcp.c:930
-#: src/transport/plugin_transport_tcp.c:1973
-#: src/transport/plugin_transport_tcp.c:2527
+#: src/transport/plugin_transport_tcp.c:932
+#: src/transport/plugin_transport_tcp.c:2012
+#: src/transport/plugin_transport_tcp.c:2550
 msgid "# TCP sessions active"
 msgstr "# Sesiones TCP activas"
 
-#: src/transport/plugin_transport_tcp.c:797
-#: src/transport/plugin_transport_tcp.c:923
-#: src/transport/plugin_transport_tcp.c:1009
-#: src/transport/plugin_transport_tcp.c:1056
-#: src/transport/plugin_transport_tcp.c:1219
-#: src/transport/plugin_transport_tcp.c:1237
+#: src/transport/plugin_transport_tcp.c:799
+#: src/transport/plugin_transport_tcp.c:925
+#: src/transport/plugin_transport_tcp.c:1013
+#: src/transport/plugin_transport_tcp.c:1060
+#: src/transport/plugin_transport_tcp.c:1223
+#: src/transport/plugin_transport_tcp.c:1241
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes actualmente en los buffer TCP"
 
-#: src/transport/plugin_transport_tcp.c:800
+#: src/transport/plugin_transport_tcp.c:802
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes descartados por TCP (desconectado)"
 
-#: src/transport/plugin_transport_tcp.c:1012
+#: src/transport/plugin_transport_tcp.c:1016
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (expirados)"
 
-#: src/transport/plugin_transport_tcp.c:1059
+#: src/transport/plugin_transport_tcp.c:1063
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:1193
+#: src/transport/plugin_transport_tcp.c:1197
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr "Intentando enviar con una sesión no válida %p\n"
 
-#: src/transport/plugin_transport_tcp.c:1427
+#: src/transport/plugin_transport_tcp.c:1466
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1532
+#: src/transport/plugin_transport_tcp.c:1571
 msgid "# transport-service disconnect requests for TCP"
 msgstr "# peticiones de desconexión del servicio de transporte por TCP"
 
-#: src/transport/plugin_transport_tcp.c:2021
+#: src/transport/plugin_transport_tcp.c:2060
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
 
-#: src/transport/plugin_transport_tcp.c:2189
+#: src/transport/plugin_transport_tcp.c:2211
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:2253
+#: src/transport/plugin_transport_tcp.c:2275
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
-#: src/transport/plugin_transport_tcp.c:2407 src/util/service.c:589
+#: src/transport/plugin_transport_tcp.c:2429 src/util/service.c:589
 #: src/util/service.c:595
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
@@ -7628,20 +7670,20 @@
 "¡Se requiere un número de puerto válido para el servicio «%s» en la "
 "configuración!\n"
 
-#: src/transport/plugin_transport_tcp.c:2421
+#: src/transport/plugin_transport_tcp.c:2443
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
 
-#: src/transport/plugin_transport_tcp.c:2516
+#: src/transport/plugin_transport_tcp.c:2539
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "Transporte TCP escuchando en el puerto %llu\n"
 
-#: src/transport/plugin_transport_tcp.c:2520
+#: src/transport/plugin_transport_tcp.c:2543
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n"
 
-#: src/transport/plugin_transport_tcp.c:2523
+#: src/transport/plugin_transport_tcp.c:2546
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr "El transporte TCP anuncia que está en el puerto %llu\n"
@@ -7783,7 +7825,7 @@
 "El ejecutable auxiliar «%s» no tiene activado el bit SUID, no se puede "
 "ejecutar el transporte WLAN\n"
 
-#: src/transport/transport_api.c:690
+#: src/transport/transport_api.c:710
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Recibido mensaje inesperado del tipo %u en %s:%u\n"
@@ -8219,35 +8261,35 @@
 msgid "Could not read hostkey file: %s\n"
 msgstr "¡No se puede leer el fichero de claves de máquina!\n"
 
-#: src/util/gnunet-ecc.c:286
+#: src/util/gnunet-ecc.c:283
 msgid "No hostkey file specified on command line\n"
 msgstr "No se ha especificado la clave de máquina en la línea de comandos\n"
 
-#: src/util/gnunet-ecc.c:341
+#: src/util/gnunet-ecc.c:349
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:344
+#: src/util/gnunet-ecc.c:352
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:347
+#: src/util/gnunet-ecc.c:355
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr "crea «COUNT» pares de claves pública-privada (para pruebas)"
 
-#: src/util/gnunet-ecc.c:350
+#: src/util/gnunet-ecc.c:358
 msgid "print the public key in ASCII format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:353
+#: src/util/gnunet-ecc.c:361
 msgid "print the hash of the public key in ASCII format"
 msgstr "imprime el hash de la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:356
+#: src/util/gnunet-ecc.c:364
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:367
+#: src/util/gnunet-ecc.c:375
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
@@ -8354,17 +8396,17 @@
 "No se pudo determinar la ruta de instalación de %s.  Establezca la variable "
 "de entorno «%s».\n"
 
-#: src/util/os_installation.c:713
+#: src/util/os_installation.c:766
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "¡No se pudo encontrar el programa llamado «%s» en PATH!\n"
 
-#: src/util/os_installation.c:773
+#: src/util/os_installation.c:826
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "«%s» falló para el puerto %d (%s).\n"
 
-#: src/util/os_installation.c:783
+#: src/util/os_installation.c:836
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2014-02-03 21:07:23 UTC (rev 32173)
+++ gnunet/po/sv.po     2014-02-03 21:25:53 UTC (rev 32174)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-01-20 23:27+0100\n"
+"POT-Creation-Date: 2014-02-03 20:43+0100\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -403,56 +403,110 @@
 msgid "Failed to initialize solver!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/ats/plugin_ats_mlp.c:868
+#: src/ats/plugin_ats_mlp.c:892
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1281
+#: src/ats/plugin_ats_mlp.c:1329
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/ats/plugin_ats_mlp.c:1328
+#: src/ats/plugin_ats_mlp.c:1376
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2059
+#: src/ats/plugin_ats_mlp.c:2122
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2067
+#: src/ats/plugin_ats_mlp.c:2131
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2077
+#: src/ats/plugin_ats_mlp.c:2142
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2085
+#: src/ats/plugin_ats_mlp.c:2150
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2096
+#: src/ats/plugin_ats_mlp.c:2161
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1511
+#: src/ats/plugin_ats_proportional.c:1510
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
+#: src/ats-tests/ats-testing.c:71
+msgid "Benchmarking done\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:104
+#, fuzzy, c-format
+msgid "Failed to connect peer 0 and %u\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/ats-tests/ats-testing.c:412
+#, c-format
+msgid "Connected master [%u] with slave [%u]\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:418
+#, fuzzy, c-format
+msgid "Failed to connect master peer [%u] with slave [%u]\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/ats-tests/ats-testing.c:449
+msgid "Connecting peers on CORE level\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:460
+#, c-format
+msgid "Connecting master [%u] with slave [%u]\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:469
+#, fuzzy, c-format
+msgid "Could not connect master [%u] and slave [%u]\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/ats-tests/ats-testing.c:489 src/ats-tests/ats-testing.c:670
+#, fuzzy
+msgid "Initialization failed, shutdown\n"
+msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
+
+#: src/ats-tests/ats-testing-log.c:840
+msgid "Stop logging\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing-log.c:889
+#, fuzzy, c-format
+msgid "Start logging `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/ats-tests/gnunet-ats-sim.c:86
+#, c-format
+msgid ""
+"Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
+"= %u KiB/s\n"
+msgstr ""
+
 #: src/ats-tool/gnunet-ats.c:145
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -476,12 +530,12 @@
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:352 src/namestore/gnunet-namestore.c:550
-#: src/transport/gnunet-transport.c:1130
+#: src/transport/gnunet-transport.c:1134
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/ats-tool/gnunet-ats.c:364 src/transport/gnunet-transport.c:1139
+#: src/ats-tool/gnunet-ats.c:364 src/transport/gnunet-transport.c:1143
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -699,156 +753,156 @@
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:644
+#: src/conversation/gnunet-conversation.c:647
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:667
+#: src/conversation/gnunet-conversation.c:670
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:672
+#: src/conversation/gnunet-conversation.c:675
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:678
-#: src/conversation/gnunet-conversation.c:702
+#: src/conversation/gnunet-conversation.c:681
+#: src/conversation/gnunet-conversation.c:705
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:683
+#: src/conversation/gnunet-conversation.c:686
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:692
+#: src/conversation/gnunet-conversation.c:695
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:697
+#: src/conversation/gnunet-conversation.c:700
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:716
+#: src/conversation/gnunet-conversation.c:719
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:722
+#: src/conversation/gnunet-conversation.c:725
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/conversation/gnunet-conversation.c:750
-#: src/conversation/gnunet-conversation.c:765
+#: src/conversation/gnunet-conversation.c:753
+#: src/conversation/gnunet-conversation.c:768
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:798
-#: src/conversation/gnunet-conversation.c:814
+#: src/conversation/gnunet-conversation.c:801
+#: src/conversation/gnunet-conversation.c:817
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:821
+#: src/conversation/gnunet-conversation.c:824
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:830
+#: src/conversation/gnunet-conversation.c:833
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:847
+#: src/conversation/gnunet-conversation.c:850
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:882
+#: src/conversation/gnunet-conversation.c:885
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:890
+#: src/conversation/gnunet-conversation.c:893
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:907
+#: src/conversation/gnunet-conversation.c:910
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:934
+#: src/conversation/gnunet-conversation.c:937
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:936
+#: src/conversation/gnunet-conversation.c:939
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:938
+#: src/conversation/gnunet-conversation.c:941
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:940
+#: src/conversation/gnunet-conversation.c:943
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:942
+#: src/conversation/gnunet-conversation.c:945
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:944
+#: src/conversation/gnunet-conversation.c:947
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:946
+#: src/conversation/gnunet-conversation.c:949
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:948
+#: src/conversation/gnunet-conversation.c:951
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "tillåter klienter att fastställa gnunetds konfiguration"
 
-#: src/conversation/gnunet-conversation.c:950
+#: src/conversation/gnunet-conversation.c:953
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1148
+#: src/conversation/gnunet-conversation.c:1151
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/conversation/gnunet-conversation.c:1161
+#: src/conversation/gnunet-conversation.c:1164
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym \"%s\" togs bort.\n"
 
-#: src/conversation/gnunet-conversation.c:1196
+#: src/conversation/gnunet-conversation.c:1199
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/conversation/gnunet-conversation.c:1220
+#: src/conversation/gnunet-conversation.c:1223
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/conversation/gnunet-conversation.c:1246
+#: src/conversation/gnunet-conversation.c:1249
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1249
+#: src/conversation/gnunet-conversation.c:1252
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1276
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1043,7 +1097,7 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/core/core_api.c:765
+#: src/core/core_api.c:767
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -1053,27 +1107,27 @@
 msgstr "Jag är ändpunkt \"%s\".\n"
 
 #: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:820 src/transport/gnunet-transport.c:840
+#: src/transport/gnunet-transport.c:824 src/transport/gnunet-transport.c:844
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:821
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:825
 #, fuzzy
 msgid "Connected to"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:841
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:845
 #, fuzzy
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:164 src/peerinfo-tool/gnunet-peerinfo.c:645
+#: src/core/gnunet-core.c:164 src/peerinfo-tool/gnunet-peerinfo.c:694
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
-#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1336
+#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1340
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -1097,12 +1151,12 @@
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:475
+#: src/core/gnunet-service-core_clients.c:480
 #, fuzzy
 msgid "# messages discarded (session disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_clients.c:518
+#: src/core/gnunet-service-core_clients.c:526
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -1274,29 +1328,28 @@
 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:278
+#: src/core/gnunet-service-core_sessions.c:214
+#: src/core/gnunet-service-core_sessions.c:286
 #: src/dht/gnunet-service-dht_neighbours.c:662
 #: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:662
-#: src/dht/gnunet-service-xdht_neighbours.c:727
-#: src/fs/gnunet-service-fs_cp.c:604 src/fs/gnunet-service-fs_cp.c:1499
-#: src/topology/gnunet-daemon-topology.c:706
-#: src/topology/gnunet-daemon-topology.c:807
-#: src/transport/gnunet-service-transport_neighbours.c:846
-#: src/transport/gnunet-service-transport_neighbours.c:1078
-#: src/transport/gnunet-service-transport_neighbours.c:1087
-#: src/transport/gnunet-service-transport_neighbours.c:3048
-#: src/transport/gnunet-service-transport_neighbours.c:3309
+#: src/dht/gnunet-service-xdht_neighbours.c:939
+#: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
+#: src/topology/gnunet-daemon-topology.c:707
+#: src/topology/gnunet-daemon-topology.c:808
+#: src/transport/gnunet-service-transport_neighbours.c:848
+#: src/transport/gnunet-service-transport_neighbours.c:1080
+#: src/transport/gnunet-service-transport_neighbours.c:1089
+#: src/transport/gnunet-service-transport_neighbours.c:3202
+#: src/transport/gnunet-service-transport_neighbours.c:3463
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
 
-#: src/core/gnunet-service-core_sessions.c:246
+#: src/core/gnunet-service-core_sessions.c:253
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:415
+#: src/core/gnunet-service-core_sessions.c:424
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -1371,7 +1424,7 @@
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
 #: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:61
+#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:60
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -1381,7 +1434,7 @@
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:484
-#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/datastore/plugin_datastore_sqlite.c:404
 #: src/namecache/plugin_namecache_sqlite.c:295
 #: src/namestore/plugin_namestore_sqlite.c:327
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
@@ -1707,7 +1760,7 @@
 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:253
+#: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
 #: src/psycstore/plugin_psycstore_sqlite.c:319
@@ -1715,22 +1768,22 @@
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:649
+#: src/datastore/plugin_datastore_sqlite.c:663
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1135
+#: src/datastore/plugin_datastore_sqlite.c:1156
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1154
+#: src/datastore/plugin_datastore_sqlite.c:1175
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1194
+#: src/datastore/plugin_datastore_sqlite.c:1215
 #: src/namecache/plugin_namecache_sqlite.c:583
 #: src/namestore/plugin_namestore_sqlite.c:719
 msgid "Sqlite database running\n"
@@ -1745,48 +1798,48 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:132
+#: src/dht/gnunet-dht-get.c:133
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:156
+#: src/dht/gnunet-dht-get.c:159
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:162 src/dht/gnunet-dht-monitor.c:225
+#: src/dht/gnunet-dht-get.c:165 src/dht/gnunet-dht-monitor.c:225
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:170
+#: src/dht/gnunet-dht-get.c:173
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:186 src/dht/gnunet-dht-monitor.c:262
+#: src/dht/gnunet-dht-get.c:189 src/dht/gnunet-dht-monitor.c:262
 #: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:189
+#: src/dht/gnunet-dht-get.c:192
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:192 src/dht/gnunet-dht-monitor.c:265
+#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:210
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
+#: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
 #: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
@@ -1794,7 +1847,7 @@
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:222
+#: src/dht/gnunet-dht-get.c:225
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -1850,11 +1903,11 @@
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:235
+#: src/dht/gnunet-dht-put.c:236
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:172
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:176
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -1866,54 +1919,54 @@
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_clients.c:511
-#: src/dht/gnunet-service-xdht_clients.c:511
+#: src/dht/gnunet-service-xdht_clients.c:512
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:595
-#: src/dht/gnunet-service-xdht_clients.c:595
+#: src/dht/gnunet-service-xdht_clients.c:597
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:796
-#: src/dht/gnunet-service-xdht_clients.c:796
+#: src/dht/gnunet-service-xdht_clients.c:798
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:1037
-#: src/dht/gnunet-service-xdht_clients.c:1037
+#: src/dht/gnunet-service-xdht_clients.c:1039
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1050
-#: src/dht/gnunet-service-xdht_clients.c:1050
+#: src/dht/gnunet-service-xdht_clients.c:1052
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1087
-#: src/dht/gnunet-service-xdht_clients.c:1087
+#: src/dht/gnunet-service-xdht_clients.c:1089
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1110
-#: src/dht/gnunet-service-xdht_clients.c:1110
+#: src/dht/gnunet-service-xdht_clients.c:1112
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:1164
-#: src/dht/gnunet-service-dht_clients.c:1206
-#: src/dht/gnunet-service-xdht_clients.c:1164
-#: src/dht/gnunet-service-xdht_clients.c:1206
+#: src/dht/gnunet-service-dht_clients.c:1207
+#: src/dht/gnunet-service-xdht_clients.c:1166
+#: src/dht/gnunet-service-xdht_clients.c:1208
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1174
-#: src/dht/gnunet-service-xdht_clients.c:1174
+#: src/dht/gnunet-service-xdht_clients.c:1176
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "Kunde inte skicka meddelande till gnunetd\n"
@@ -1973,61 +2026,51 @@
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/dht/gnunet-service-dht_neighbours.c:516
-#: src/dht/gnunet-service-xdht_neighbours.c:516
 msgid "# Preference updates given to core"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:610
-#: src/dht/gnunet-service-xdht_neighbours.c:610
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
 #: src/dht/gnunet-service-dht_neighbours.c:764
-#: src/dht/gnunet-service-xdht_neighbours.c:764
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:819
+#: src/dht/gnunet-service-xdht_neighbours.c:540
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:857
+#: src/dht/gnunet-service-xdht_neighbours.c:579
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:889
-#: src/dht/gnunet-service-xdht_neighbours.c:889
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1093
 #: src/dht/gnunet-service-dht_neighbours.c:1130
-#: src/dht/gnunet-service-xdht_neighbours.c:1093
-#: src/dht/gnunet-service-xdht_neighbours.c:1130
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1108
 #: src/dht/gnunet-service-dht_neighbours.c:1145
-#: src/dht/gnunet-service-xdht_neighbours.c:1108
-#: src/dht/gnunet-service-xdht_neighbours.c:1145
 msgid "# Peer selection failed"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1287
-#: src/dht/gnunet-service-xdht_neighbours.c:1287
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1316
-#: src/dht/gnunet-service-xdht_neighbours.c:1316
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
@@ -2035,85 +2078,72 @@
 #: src/dht/gnunet-service-dht_neighbours.c:1323
 #: src/dht/gnunet-service-dht_neighbours.c:1440
 #: src/dht/gnunet-service-dht_neighbours.c:1543
-#: src/dht/gnunet-service-xdht_neighbours.c:1323
-#: src/dht/gnunet-service-xdht_neighbours.c:1440
-#: src/dht/gnunet-service-xdht_neighbours.c:1543
+#: src/dht/gnunet-service-xdht_neighbours.c:616
+#: src/dht/gnunet-service-xdht_neighbours.c:1246
+#: src/dht/gnunet-service-xdht_neighbours.c:1330
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1405
-#: src/dht/gnunet-service-xdht_neighbours.c:1405
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1432
-#: src/dht/gnunet-service-xdht_neighbours.c:1432
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1550
-#: src/dht/gnunet-service-xdht_neighbours.c:1550
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1637
-#: src/dht/gnunet-service-xdht_neighbours.c:1637
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1640
-#: src/dht/gnunet-service-xdht_neighbours.c:1640
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1803
-#: src/dht/gnunet-service-xdht_neighbours.c:1803
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1811
-#: src/dht/gnunet-service-xdht_neighbours.c:1811
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1904
-#: src/dht/gnunet-service-xdht_neighbours.c:1904
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1907
-#: src/dht/gnunet-service-xdht_neighbours.c:1907
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1961
-#: src/dht/gnunet-service-xdht_neighbours.c:1961
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1975
-#: src/dht/gnunet-service-xdht_neighbours.c:1975
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_neighbours.c:2052
-#: src/dht/gnunet-service-xdht_neighbours.c:2052
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
 #: src/dht/gnunet-service-dht_neighbours.c:2055
-#: src/dht/gnunet-service-xdht_neighbours.c:2055
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -2124,46 +2154,48 @@
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_routing.c:211
-#: src/dht/gnunet-service-xdht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:220
-#: src/dht/gnunet-service-xdht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:226
-#: src/dht/gnunet-service-xdht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:232
-#: src/dht/gnunet-service-xdht_routing.c:232
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:244
-#: src/dht/gnunet-service-xdht_routing.c:244
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:317
-#: src/dht/gnunet-service-xdht_routing.c:317
 msgid "# Entries removed from routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:399
-#: src/dht/gnunet-service-xdht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:417
-#: src/dht/gnunet-service-xdht_routing.c:417
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# byte mottogs via TCP"
 
+#: src/dht/gnunet-service-xdht_neighbours.c:1179
+#, fuzzy
+msgid "# TRAIL SETUP requests received"
+msgstr "# byte mottogs via TCP"
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1182
+#, fuzzy
+msgid "# TRAIL SETUP bytes received"
+msgstr "# byte mottogs via TCP"
+
 #: src/dht/plugin_block_dht.c:138
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
@@ -2596,32 +2628,32 @@
 msgid "Cannot read experiments file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:219
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
 #, c-format
 msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:307
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
 #, c-format
 msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:451
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
 #, c-format
 msgid "Added peer `%s' as active node\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:889
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891
 #, fuzzy, c-format
 msgid "Connected to peer %s\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:919
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921
 #, fuzzy, c-format
 msgid "Disconnected from peer %s\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1102
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -3425,7 +3457,7 @@
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1168 src/transport/gnunet-transport.c:1198
+#: src/transport/gnunet-transport.c:1172 src/transport/gnunet-transport.c:1202
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -3528,95 +3560,95 @@
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
-#: src/topology/gnunet-daemon-topology.c:1253
-#: src/topology/gnunet-daemon-topology.c:1260
+#: src/topology/gnunet-daemon-topology.c:1254
+#: src/topology/gnunet-daemon-topology.c:1261
 #, 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:680
+#: src/fs/gnunet-service-fs_cp.c:682
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:684
+#: src/fs/gnunet-service-fs_cp.c:686
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:719
+#: src/fs/gnunet-service-fs_cp.c:721
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:725
+#: src/fs/gnunet-service-fs_cp.c:727
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:750 src/fs/gnunet-service-fs_cp.c:1299
+#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:843
+#: src/fs/gnunet-service-fs_cp.c:845
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:896
+#: src/fs/gnunet-service-fs_cp.c:898
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:904
+#: src/fs/gnunet-service-fs_cp.c:906
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:920
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:956
+#: src/fs/gnunet-service-fs_cp.c:958
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1024
+#: src/fs/gnunet-service-fs_cp.c:1026
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1049
+#: src/fs/gnunet-service-fs_cp.c:1051
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1059
+#: src/fs/gnunet-service-fs_cp.c:1061
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1137
+#: src/fs/gnunet-service-fs_cp.c:1139
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1171
+#: src/fs/gnunet-service-fs_cp.c:1173
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1193
+#: src/fs/gnunet-service-fs_cp.c:1195
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1244
+#: src/fs/gnunet-service-fs_cp.c:1246
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1268
+#: src/fs/gnunet-service-fs_cp.c:1270
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1297
+#: src/fs/gnunet-service-fs_cp.c:1299
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1668
+#: src/fs/gnunet-service-fs_cp.c:1670
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -3915,7 +3947,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:566
+#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
@@ -4583,11 +4615,11 @@
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
+#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425
 #: src/peerinfo-tool/gnunet-peerinfo.c:350
 #: src/peerinfo-tool/gnunet-peerinfo.c:419
 #: src/peerinfo-tool/gnunet-peerinfo.c:490
-#: src/topology/gnunet-daemon-topology.c:924
+#: src/topology/gnunet-daemon-topology.c:925
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -4638,32 +4670,32 @@
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:389
+#: src/hostlist/hostlist-server.c:390
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639
 #: src/transport/gnunet-service-transport.c:892
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/hostlist/hostlist-server.c:575
+#: src/hostlist/hostlist-server.c:576
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:589
+#: src/hostlist/hostlist-server.c:590
 #, 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:629
+#: src/hostlist/hostlist-server.c:630
 #, 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:672
+#: src/hostlist/hostlist-server.c:673
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4755,38 +4787,43 @@
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/mesh/gnunet-mesh.c:343
+#: src/mesh/gnunet-mesh.c:348
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/mesh/gnunet-mesh.c:521
+#: src/mesh/gnunet-mesh.c:592
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/mesh/gnunet-mesh.c:586
-msgid "You must NOT give a TARGET when using options\n"
+#: src/mesh/gnunet-mesh.c:658
+msgid "You must NOT give a TARGETwhen using 'request all' options\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:669
+#: src/mesh/gnunet-mesh.c:747
 msgid "activate echo mode"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:672
-#, fuzzy
-msgid "provide information about all tunnels"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/mesh/gnunet-mesh.c:678
+#: src/mesh/gnunet-mesh.c:753
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:681
+#: src/mesh/gnunet-mesh.c:756
 #, fuzzy
+msgid "provide information about all peers"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/mesh/gnunet-mesh.c:759
+#, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "Skriv ut information om GNUnets motparter."
 
+#: src/mesh/gnunet-mesh.c:762
+#, fuzzy
+msgid "provide information about all tunnels"
+msgstr "Skriv ut information om GNUnets motparter."
+
 #: src/mesh/gnunet-service-mesh_peer.c:377
 msgid "Wrong CORE service\n"
 msgstr ""
@@ -4914,7 +4951,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:715
-#: src/peerinfo-tool/gnunet-peerinfo.c:702
+#: src/peerinfo-tool/gnunet-peerinfo.c:723
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
@@ -5241,7 +5278,7 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:1461
+#: src/nse/gnunet-service-nse.c:1462
 #: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248
 msgid "Value is too large.\n"
 msgstr ""
@@ -5358,67 +5395,72 @@
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:666 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:633
 #, fuzzy, c-format
+msgid "Service `%s' is not running, please start GNUnet\n"
+msgstr "\"%s\" är inte en fil.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
+#, 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:724
+#: src/peerinfo-tool/gnunet-peerinfo.c:745
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:768
+#: src/peerinfo-tool/gnunet-peerinfo.c:789
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:771
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:774
+#: src/peerinfo-tool/gnunet-peerinfo.c:795
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:777
+#: src/peerinfo-tool/gnunet-peerinfo.c:798
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:780
+#: src/peerinfo-tool/gnunet-peerinfo.c:801
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:783
+#: src/peerinfo-tool/gnunet-peerinfo.c:804
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:786
+#: src/peerinfo-tool/gnunet-peerinfo.c:807
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:810
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:800
+#: src/peerinfo-tool/gnunet-peerinfo.c:821
 #, 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:124
+#: src/transport/gnunet-service-transport_plugins.c:126
 #, 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:129
+#: src/transport/gnunet-service-transport_plugins.c:131
 #, 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:159
+#: src/transport/gnunet-service-transport_plugins.c:163
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
@@ -5879,143 +5921,143 @@
 msgid "Generated key set with key length %d bits.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:776
+#: src/scalarproduct/gnunet-service-scalarproduct.c:746
 #, fuzzy, c-format
 msgid "Client (%p) disconnected from us.\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:848
-#: src/scalarproduct/gnunet-service-scalarproduct.c:938
+#: src/scalarproduct/gnunet-service-scalarproduct.c:818
+#: src/scalarproduct/gnunet-service-scalarproduct.c:908
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:854
+#: src/scalarproduct/gnunet-service-scalarproduct.c:824
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:948
+#: src/scalarproduct/gnunet-service-scalarproduct.c:918
 #, c-format
 msgid "Sent result to client (%p), this session (%s) has ended!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1027
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1165
+#: src/scalarproduct/gnunet-service-scalarproduct.c:997
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1135
 msgid "Could not send service-response message via mesh!)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1391
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1340
 #, c-format
 msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1495
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1622
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1444
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1571
 #, fuzzy
 msgid "Transmitting service request.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1504
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1453
 #, fuzzy
 msgid "Could not send service-request multipart message to channel!\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1544
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1493
 #, fuzzy, c-format
 msgid "Successfully created new channel to peer (%s)!\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1631
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1580
 #, fuzzy
 msgid "Could not send message to channel!\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1688
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1637
 #, fuzzy
 msgid "Too short message received from client!\n"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1701
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1650
 #, fuzzy
 msgid "Invalid message received from client, session information incorrect!\n"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1712
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1661
 #, c-format
 msgid ""
 "Duplicate session information received, cannot create new session with key `"
 "%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1733
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1682
 #, c-format
 msgid ""
 "Got client-request-session with key %s, preparing channel to remote "
 "service.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1772
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1721
 #, c-format
 msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1819
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1768
 #, c-format
 msgid ""
 "Got client-responder-session with key %s and a matching service-request-"
 "session set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1830
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1779
 #, c-format
 msgid ""
 "Got client-responder-session with key %s but NO matching service-request-"
 "session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1860
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1809
 #, fuzzy, c-format
 msgid "New incoming channel from peer %s.\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1841
 #, c-format
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2083
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2242
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2032
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2191
 #, c-format
 msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2092
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2249
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2041
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2198
 #, c-format
 msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2187
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2136
 #, c-format
 msgid ""
 "Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2471
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2420
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2536
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2485
 msgid "Generating Paillier-Keyset.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2551
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2500
 #, fuzzy
 msgid "Connect to MESH failed\n"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2555
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2504
 #, fuzzy
 msgid "Mesh initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -6060,7 +6102,7 @@
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1416
+#: src/set/gnunet-service-set.c:1415
 #, fuzzy
 msgid "Could not connect to mesh service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -6570,56 +6612,56 @@
 msgid "# connect requests issued to transport"
 msgstr "# byte mottogs via TCP"
 
-#: src/topology/gnunet-daemon-topology.c:727
-#: src/topology/gnunet-daemon-topology.c:812
+#: src/topology/gnunet-daemon-topology.c:728
+#: src/topology/gnunet-daemon-topology.c:813
 #, fuzzy
 msgid "# friends connected"
 msgstr "# av anslutna parter"
 
-#: src/topology/gnunet-daemon-topology.c:992
+#: src/topology/gnunet-daemon-topology.c:993
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1021
+#: src/topology/gnunet-daemon-topology.c:1022
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1028
+#: src/topology/gnunet-daemon-topology.c:1029
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:1050
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1051
+#: src/topology/gnunet-daemon-topology.c:1052
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1056
+#: src/topology/gnunet-daemon-topology.c:1057
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1062
+#: src/topology/gnunet-daemon-topology.c:1063
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1093
+#: src/topology/gnunet-daemon-topology.c:1094
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/topology/gnunet-daemon-topology.c:1150
+#: src/topology/gnunet-daemon-topology.c:1151
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1289
+#: src/topology/gnunet-daemon-topology.c:1290
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -6697,194 +6739,194 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1025
+#: src/transport/gnunet-service-transport_neighbours.c:1027
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1161
-#: src/transport/gnunet-service-transport_neighbours.c:1571
+#: src/transport/gnunet-service-transport_neighbours.c:1163
+#: src/transport/gnunet-service-transport_neighbours.c:1573
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1166
+#: src/transport/gnunet-service-transport_neighbours.c:1168
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1171
+#: src/transport/gnunet-service-transport_neighbours.c:1173
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1228
+#: src/transport/gnunet-service-transport_neighbours.c:1230
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1285
+#: src/transport/gnunet-service-transport_neighbours.c:1287
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1318
+#: src/transport/gnunet-service-transport_neighbours.c:1320
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1326
+#: src/transport/gnunet-service-transport_neighbours.c:1328
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1373
+#: src/transport/gnunet-service-transport_neighbours.c:1375
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1384
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1390
+#: src/transport/gnunet-service-transport_neighbours.c:1392
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1398
+#: src/transport/gnunet-service-transport_neighbours.c:1400
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1476
+#: src/transport/gnunet-service-transport_neighbours.c:1478
 #, 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:1510
+#: src/transport/gnunet-service-transport_neighbours.c:1512
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1526
+#: src/transport/gnunet-service-transport_neighbours.c:1528
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1618
+#: src/transport/gnunet-service-transport_neighbours.c:1620
 #, fuzzy
 msgid "# SESSION_CONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1634
+#: src/transport/gnunet-service-transport_neighbours.c:1636
 #, fuzzy, c-format
 msgid "Failed to transmit CONNECT message via plugin to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1677
+#: src/transport/gnunet-service-transport_neighbours.c:1679
 #, fuzzy
 msgid "# CONNECT_ACK messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1797
+#: src/transport/gnunet-service-transport_neighbours.c:1947
 #, fuzzy, c-format
 msgid "Blacklisting dissaproved to connect to peer `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2210
+#: src/transport/gnunet-service-transport_neighbours.c:2360
 #, fuzzy
 msgid "# CONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2215
+#: src/transport/gnunet-service-transport_neighbours.c:2365
 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3013
+#: src/transport/gnunet-service-transport_neighbours.c:3167
 #, fuzzy
 msgid "# CONNECT_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3021
+#: src/transport/gnunet-service-transport_neighbours.c:3175
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3036
-#: src/transport/gnunet-service-transport_neighbours.c:3072
+#: src/transport/gnunet-service-transport_neighbours.c:3190
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3085
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3115
+#: src/transport/gnunet-service-transport_neighbours.c:3269
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3284
+#: src/transport/gnunet-service-transport_neighbours.c:3438
 #, fuzzy
 msgid "# SESSION_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3303
+#: src/transport/gnunet-service-transport_neighbours.c:3457
 #, fuzzy
 msgid "# unexpected SESSION_ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3358
+#: src/transport/gnunet-service-transport_neighbours.c:3511
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3373
+#: src/transport/gnunet-service-transport_neighbours.c:3526
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3401
+#: src/transport/gnunet-service-transport_neighbours.c:3554
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3407
+#: src/transport/gnunet-service-transport_neighbours.c:3560
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3416
+#: src/transport/gnunet-service-transport_neighbours.c:3569
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3452
+#: src/transport/gnunet-service-transport_neighbours.c:3605
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3704
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-service-transport_plugins.c:116
+#: src/transport/gnunet-service-transport_plugins.c:118
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:172
-#: src/transport/gnunet-service-transport_plugins.c:180
-#: src/transport/gnunet-service-transport_plugins.c:188
-#: src/transport/gnunet-service-transport_plugins.c:196
-#: src/transport/gnunet-service-transport_plugins.c:204
-#: src/transport/gnunet-service-transport_plugins.c:212
-#: src/transport/gnunet-service-transport_plugins.c:220
-#: src/transport/gnunet-service-transport_plugins.c:228
-#: src/transport/gnunet-service-transport_plugins.c:236
-#: src/transport/gnunet-service-transport_plugins.c:244
-#: src/transport/gnunet-service-transport_plugins.c:252
+#: src/transport/gnunet-service-transport_plugins.c:176
+#: src/transport/gnunet-service-transport_plugins.c:184
+#: src/transport/gnunet-service-transport_plugins.c:192
+#: src/transport/gnunet-service-transport_plugins.c:200
+#: src/transport/gnunet-service-transport_plugins.c:208
+#: src/transport/gnunet-service-transport_plugins.c:216
+#: src/transport/gnunet-service-transport_plugins.c:224
+#: src/transport/gnunet-service-transport_plugins.c:232
+#: src/transport/gnunet-service-transport_plugins.c:240
+#: src/transport/gnunet-service-transport_plugins.c:248
+#: src/transport/gnunet-service-transport_plugins.c:256
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:259
+#: src/transport/gnunet-service-transport_plugins.c:263
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
@@ -7023,129 +7065,129 @@
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:720
+#: src/transport/gnunet-transport.c:722
 #, 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:741
+#: src/transport/gnunet-transport.c:743
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:765
+#: src/transport/gnunet-transport.c:767
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:798
+#: src/transport/gnunet-transport.c:802
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:860
+#: src/transport/gnunet-transport.c:864
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:883
+#: src/transport/gnunet-transport.c:887
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:893
+#: src/transport/gnunet-transport.c:897
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1106
+#: src/transport/gnunet-transport.c:1110
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1150
+#: src/transport/gnunet-transport.c:1154
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1158
+#: src/transport/gnunet-transport.c:1162
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1177 src/transport/gnunet-transport.c:1207
-#: src/transport/gnunet-transport.c:1230 src/transport/gnunet-transport.c:1273
+#: src/transport/gnunet-transport.c:1181 src/transport/gnunet-transport.c:1211
+#: src/transport/gnunet-transport.c:1234 src/transport/gnunet-transport.c:1277
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1186 src/transport/gnunet-transport.c:1216
+#: src/transport/gnunet-transport.c:1190 src/transport/gnunet-transport.c:1220
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1235
+#: src/transport/gnunet-transport.c:1239
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1319
+#: src/transport/gnunet-transport.c:1323
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers )"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1322
+#: src/transport/gnunet-transport.c:1326
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1324
+#: src/transport/gnunet-transport.c:1328
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1327
+#: src/transport/gnunet-transport.c:1331
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1330
+#: src/transport/gnunet-transport.c:1334
 #, fuzzy
 msgid "print information for all pending validations continously"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1333
+#: src/transport/gnunet-transport.c:1337
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1339
+#: src/transport/gnunet-transport.c:1343
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1341
+#: src/transport/gnunet-transport.c:1345
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:1343
+#: src/transport/gnunet-transport.c:1347
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1345
+#: src/transport/gnunet-transport.c:1349
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1348
+#: src/transport/gnunet-transport.c:1352
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1357
+#: src/transport/gnunet-transport.c:1361
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -7415,85 +7457,85 @@
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:766
-#: src/transport/plugin_transport_tcp.c:930
-#: src/transport/plugin_transport_tcp.c:1973
-#: src/transport/plugin_transport_tcp.c:2527
+#: src/transport/plugin_transport_tcp.c:932
+#: src/transport/plugin_transport_tcp.c:2012
+#: src/transport/plugin_transport_tcp.c:2550
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:797
-#: src/transport/plugin_transport_tcp.c:923
-#: src/transport/plugin_transport_tcp.c:1009
-#: src/transport/plugin_transport_tcp.c:1056
-#: src/transport/plugin_transport_tcp.c:1219
-#: src/transport/plugin_transport_tcp.c:1237
+#: src/transport/plugin_transport_tcp.c:799
+#: src/transport/plugin_transport_tcp.c:925
+#: src/transport/plugin_transport_tcp.c:1013
+#: src/transport/plugin_transport_tcp.c:1060
+#: src/transport/plugin_transport_tcp.c:1223
+#: src/transport/plugin_transport_tcp.c:1241
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_tcp.c:800
+#: src/transport/plugin_transport_tcp.c:802
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1012
+#: src/transport/plugin_transport_tcp.c:1016
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1059
+#: src/transport/plugin_transport_tcp.c:1063
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:1193
+#: src/transport/plugin_transport_tcp.c:1197
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1427
+#: src/transport/plugin_transport_tcp.c:1466
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1532
+#: src/transport/plugin_transport_tcp.c:1571
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2021
+#: src/transport/plugin_transport_tcp.c:2060
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:2189
+#: src/transport/plugin_transport_tcp.c:2211
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2253
+#: src/transport/plugin_transport_tcp.c:2275
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2407 src/util/service.c:589
+#: src/transport/plugin_transport_tcp.c:2429 src/util/service.c:589
 #: src/util/service.c:595
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2421
+#: src/transport/plugin_transport_tcp.c:2443
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2516
+#: src/transport/plugin_transport_tcp.c:2539
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2520
+#: src/transport/plugin_transport_tcp.c:2543
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2523
+#: src/transport/plugin_transport_tcp.c:2546
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7639,7 +7681,7 @@
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:690
+#: src/transport/transport_api.c:710
 #, 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"
@@ -8056,35 +8098,35 @@
 msgid "Could not read hostkey file: %s\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/util/gnunet-ecc.c:286
+#: src/util/gnunet-ecc.c:283
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:341
+#: src/util/gnunet-ecc.c:349
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:344
+#: src/util/gnunet-ecc.c:352
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:347
+#: src/util/gnunet-ecc.c:355
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:350
+#: src/util/gnunet-ecc.c:358
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:353
+#: src/util/gnunet-ecc.c:361
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:356
+#: src/util/gnunet-ecc.c:364
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:367
+#: src/util/gnunet-ecc.c:375
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -8186,18 +8228,18 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:713
+#: src/util/os_installation.c:766
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
 # drive = hard drive ?
-#: src/util/os_installation.c:773
+#: src/util/os_installation.c:826
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/os_installation.c:783
+#: src/util/os_installation.c:836
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2014-02-03 21:07:23 UTC (rev 32173)
+++ gnunet/po/vi.po     2014-02-03 21:25:53 UTC (rev 32174)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-01-20 23:27+0100\n"
+"POT-Creation-Date: 2014-02-03 20:43+0100\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -409,56 +409,111 @@
 msgid "Failed to initialize solver!\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/ats/plugin_ats_mlp.c:868
+#: src/ats/plugin_ats_mlp.c:892
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1281
+#: src/ats/plugin_ats_mlp.c:1329
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/ats/plugin_ats_mlp.c:1328
+#: src/ats/plugin_ats_mlp.c:1376
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2059
+#: src/ats/plugin_ats_mlp.c:2122
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2067
+#: src/ats/plugin_ats_mlp.c:2131
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2077
+#: src/ats/plugin_ats_mlp.c:2142
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2085
+#: src/ats/plugin_ats_mlp.c:2150
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2096
+#: src/ats/plugin_ats_mlp.c:2161
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1511
+#: src/ats/plugin_ats_proportional.c:1510
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
+#: src/ats-tests/ats-testing.c:71
+msgid "Benchmarking done\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:104
+#, fuzzy, c-format
+msgid "Failed to connect peer 0 and %u\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/ats-tests/ats-testing.c:412
+#, c-format
+msgid "Connected master [%u] with slave [%u]\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:418
+#, fuzzy, c-format
+msgid "Failed to connect master peer [%u] with slave [%u]\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/ats-tests/ats-testing.c:449
+msgid "Connecting peers on CORE level\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:460
+#, c-format
+msgid "Connecting master [%u] with slave [%u]\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:469
+#, fuzzy, c-format
+msgid "Could not connect master [%u] and slave [%u]\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/ats-tests/ats-testing.c:489 src/ats-tests/ats-testing.c:670
+#, fuzzy
+msgid "Initialization failed, shutdown\n"
+msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n"
+
+#: src/ats-tests/ats-testing-log.c:840
+#, fuzzy
+msgid "Stop logging\n"
+msgstr "Theo dõi"
+
+#: src/ats-tests/ats-testing-log.c:889
+#, fuzzy, c-format
+msgid "Start logging `%s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/ats-tests/gnunet-ats-sim.c:86
+#, c-format
+msgid ""
+"Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
+"= %u KiB/s\n"
+msgstr ""
+
 #: src/ats-tool/gnunet-ats.c:145
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -482,12 +537,12 @@
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:352 src/namestore/gnunet-namestore.c:550
-#: src/transport/gnunet-transport.c:1130
+#: src/transport/gnunet-transport.c:1134
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/ats-tool/gnunet-ats.c:364 src/transport/gnunet-transport.c:1139
+#: src/ats-tool/gnunet-ats.c:364 src/transport/gnunet-transport.c:1143
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -705,156 +760,156 @@
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:644
+#: src/conversation/gnunet-conversation.c:647
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:667
+#: src/conversation/gnunet-conversation.c:670
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:672
+#: src/conversation/gnunet-conversation.c:675
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:678
-#: src/conversation/gnunet-conversation.c:702
+#: src/conversation/gnunet-conversation.c:681
+#: src/conversation/gnunet-conversation.c:705
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:683
+#: src/conversation/gnunet-conversation.c:686
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:692
+#: src/conversation/gnunet-conversation.c:695
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/conversation/gnunet-conversation.c:697
+#: src/conversation/gnunet-conversation.c:700
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:716
+#: src/conversation/gnunet-conversation.c:719
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:722
+#: src/conversation/gnunet-conversation.c:725
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/conversation/gnunet-conversation.c:750
-#: src/conversation/gnunet-conversation.c:765
+#: src/conversation/gnunet-conversation.c:753
+#: src/conversation/gnunet-conversation.c:768
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:798
-#: src/conversation/gnunet-conversation.c:814
+#: src/conversation/gnunet-conversation.c:801
+#: src/conversation/gnunet-conversation.c:817
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:821
+#: src/conversation/gnunet-conversation.c:824
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:830
+#: src/conversation/gnunet-conversation.c:833
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:847
+#: src/conversation/gnunet-conversation.c:850
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:882
+#: src/conversation/gnunet-conversation.c:885
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:890
+#: src/conversation/gnunet-conversation.c:893
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:907
+#: src/conversation/gnunet-conversation.c:910
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:934
+#: src/conversation/gnunet-conversation.c:937
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:936
+#: src/conversation/gnunet-conversation.c:939
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:938
+#: src/conversation/gnunet-conversation.c:941
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:940
+#: src/conversation/gnunet-conversation.c:943
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:942
+#: src/conversation/gnunet-conversation.c:945
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:944
+#: src/conversation/gnunet-conversation.c:947
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:946
+#: src/conversation/gnunet-conversation.c:949
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:948
+#: src/conversation/gnunet-conversation.c:951
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat"
 
-#: src/conversation/gnunet-conversation.c:950
+#: src/conversation/gnunet-conversation.c:953
 msgid "Use `/help command' to get help for a specific command"
 msgstr "Gõ chuỗi « /help LỆNH » để xem trợ giúp về lệnh đó"
 
-#: src/conversation/gnunet-conversation.c:1148
+#: src/conversation/gnunet-conversation.c:1151
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/conversation/gnunet-conversation.c:1161
+#: src/conversation/gnunet-conversation.c:1164
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Biệt hiệu « %s » bị xoá.\n"
 
-#: src/conversation/gnunet-conversation.c:1196
+#: src/conversation/gnunet-conversation.c:1199
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/conversation/gnunet-conversation.c:1220
+#: src/conversation/gnunet-conversation.c:1223
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/conversation/gnunet-conversation.c:1246
+#: src/conversation/gnunet-conversation.c:1249
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1249
+#: src/conversation/gnunet-conversation.c:1252
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1276
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1046,7 +1101,7 @@
 msgid "Could not start playback audio helper.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/core/core_api.c:765
+#: src/core/core_api.c:767
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -1056,27 +1111,27 @@
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
 #: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:820 src/transport/gnunet-transport.c:840
+#: src/transport/gnunet-transport.c:824 src/transport/gnunet-transport.c:844
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:821
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:825
 #, fuzzy
 msgid "Connected to"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:841
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:845
 #, fuzzy
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/core/gnunet-core.c:164 src/peerinfo-tool/gnunet-peerinfo.c:645
+#: src/core/gnunet-core.c:164 src/peerinfo-tool/gnunet-peerinfo.c:694
 #, 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.c:201 src/transport/gnunet-transport.c:1336
+#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1340
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -1101,12 +1156,12 @@
 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:475
+#: src/core/gnunet-service-core_clients.c:480
 #, 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:518
+#: src/core/gnunet-service-core_clients.c:526
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# các byte nhiễu được nhận"
@@ -1278,30 +1333,29 @@
 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:278
+#: src/core/gnunet-service-core_sessions.c:214
+#: src/core/gnunet-service-core_sessions.c:286
 #: src/dht/gnunet-service-dht_neighbours.c:662
 #: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:662
-#: src/dht/gnunet-service-xdht_neighbours.c:727
-#: src/fs/gnunet-service-fs_cp.c:604 src/fs/gnunet-service-fs_cp.c:1499
-#: src/topology/gnunet-daemon-topology.c:706
-#: src/topology/gnunet-daemon-topology.c:807
-#: src/transport/gnunet-service-transport_neighbours.c:846
-#: src/transport/gnunet-service-transport_neighbours.c:1078
-#: src/transport/gnunet-service-transport_neighbours.c:1087
-#: src/transport/gnunet-service-transport_neighbours.c:3048
-#: src/transport/gnunet-service-transport_neighbours.c:3309
+#: src/dht/gnunet-service-xdht_neighbours.c:939
+#: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
+#: src/topology/gnunet-daemon-topology.c:707
+#: src/topology/gnunet-daemon-topology.c:808
+#: src/transport/gnunet-service-transport_neighbours.c:848
+#: src/transport/gnunet-service-transport_neighbours.c:1080
+#: src/transport/gnunet-service-transport_neighbours.c:1089
+#: src/transport/gnunet-service-transport_neighbours.c:3202
+#: src/transport/gnunet-service-transport_neighbours.c:3463
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/core/gnunet-service-core_sessions.c:246
+#: src/core/gnunet-service-core_sessions.c:253
 #, 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:415
+#: src/core/gnunet-service-core_sessions.c:424
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -1377,7 +1431,7 @@
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
 #: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:61
+#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:60
 #, 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"
@@ -1387,7 +1441,7 @@
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:484
-#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/datastore/plugin_datastore_sqlite.c:404
 #: src/namecache/plugin_namecache_sqlite.c:295
 #: src/namestore/plugin_namestore_sqlite.c:327
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
@@ -1727,7 +1781,7 @@
 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:253
+#: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
 #: src/psycstore/plugin_psycstore_sqlite.c:319
@@ -1735,23 +1789,23 @@
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:649
+#: src/datastore/plugin_datastore_sqlite.c:663
 #, 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:1135
+#: src/datastore/plugin_datastore_sqlite.c:1156
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1154
+#: src/datastore/plugin_datastore_sqlite.c:1175
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1194
+#: src/datastore/plugin_datastore_sqlite.c:1215
 #: src/namecache/plugin_namecache_sqlite.c:583
 #: src/namestore/plugin_namestore_sqlite.c:719
 #, fuzzy
@@ -1767,48 +1821,48 @@
 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:132
+#: src/dht/gnunet-dht-get.c:133
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:156
+#: src/dht/gnunet-dht-get.c:159
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:162 src/dht/gnunet-dht-monitor.c:225
+#: src/dht/gnunet-dht-get.c:165 src/dht/gnunet-dht-monitor.c:225
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:170
+#: src/dht/gnunet-dht-get.c:173
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:186 src/dht/gnunet-dht-monitor.c:262
+#: src/dht/gnunet-dht-get.c:189 src/dht/gnunet-dht-monitor.c:262
 #: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:189
+#: src/dht/gnunet-dht-get.c:192
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:192 src/dht/gnunet-dht-monitor.c:265
+#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:210
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
+#: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
 #: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
@@ -1816,7 +1870,7 @@
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:222
+#: src/dht/gnunet-dht-get.c:225
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -1872,11 +1926,11 @@
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:235
+#: src/dht/gnunet-dht-put.c:236
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:172
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:176
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -1888,53 +1942,53 @@
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/dht/gnunet-service-dht_clients.c:511
-#: src/dht/gnunet-service-xdht_clients.c:511
+#: src/dht/gnunet-service-xdht_clients.c:512
 #, 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:595
-#: src/dht/gnunet-service-xdht_clients.c:595
+#: src/dht/gnunet-service-xdht_clients.c:597
 #, 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:796
-#: src/dht/gnunet-service-xdht_clients.c:796
+#: src/dht/gnunet-service-xdht_clients.c:798
 #, 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:1037
-#: src/dht/gnunet-service-xdht_clients.c:1037
+#: src/dht/gnunet-service-xdht_clients.c:1039
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1050
-#: src/dht/gnunet-service-xdht_clients.c:1050
+#: src/dht/gnunet-service-xdht_clients.c:1052
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1087
-#: src/dht/gnunet-service-xdht_clients.c:1087
+#: src/dht/gnunet-service-xdht_clients.c:1089
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1110
-#: src/dht/gnunet-service-xdht_clients.c:1110
+#: src/dht/gnunet-service-xdht_clients.c:1112
 msgid "# RESULTS queued for clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1164
-#: src/dht/gnunet-service-dht_clients.c:1206
-#: src/dht/gnunet-service-xdht_clients.c:1164
-#: src/dht/gnunet-service-xdht_clients.c:1206
+#: src/dht/gnunet-service-dht_clients.c:1207
+#: src/dht/gnunet-service-xdht_clients.c:1166
+#: src/dht/gnunet-service-xdht_clients.c:1208
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1174
-#: src/dht/gnunet-service-xdht_clients.c:1174
+#: src/dht/gnunet-service-xdht_clients.c:1176
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -1993,63 +2047,53 @@
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
 #: src/dht/gnunet-service-dht_neighbours.c:516
-#: src/dht/gnunet-service-xdht_neighbours.c:516
 msgid "# Preference updates given to core"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:610
-#: src/dht/gnunet-service-xdht_neighbours.c:610
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
 
 #: src/dht/gnunet-service-dht_neighbours.c:764
-#: src/dht/gnunet-service-xdht_neighbours.c:764
 #, 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:819
-#: src/dht/gnunet-service-xdht_neighbours.c:819
+#: src/dht/gnunet-service-xdht_neighbours.c:540
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:857
+#: src/dht/gnunet-service-xdht_neighbours.c:579
 #, fuzzy
 msgid "# Bytes of bandwidth 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:889
-#: src/dht/gnunet-service-xdht_neighbours.c:889
 #, fuzzy
 msgid "# requests TTL-dropped"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1093
 #: src/dht/gnunet-service-dht_neighbours.c:1130
-#: src/dht/gnunet-service-xdht_neighbours.c:1093
-#: src/dht/gnunet-service-xdht_neighbours.c:1130
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1108
 #: src/dht/gnunet-service-dht_neighbours.c:1145
-#: src/dht/gnunet-service-xdht_neighbours.c:1108
-#: src/dht/gnunet-service-xdht_neighbours.c:1145
 #, 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:1287
-#: src/dht/gnunet-service-xdht_neighbours.c:1287
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1316
-#: src/dht/gnunet-service-xdht_neighbours.c:1316
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
@@ -2057,86 +2101,73 @@
 #: src/dht/gnunet-service-dht_neighbours.c:1323
 #: src/dht/gnunet-service-dht_neighbours.c:1440
 #: src/dht/gnunet-service-dht_neighbours.c:1543
-#: src/dht/gnunet-service-xdht_neighbours.c:1323
-#: src/dht/gnunet-service-xdht_neighbours.c:1440
-#: src/dht/gnunet-service-xdht_neighbours.c:1543
+#: src/dht/gnunet-service-xdht_neighbours.c:616
+#: src/dht/gnunet-service-xdht_neighbours.c:1246
+#: src/dht/gnunet-service-xdht_neighbours.c:1330
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1405
-#: src/dht/gnunet-service-xdht_neighbours.c:1405
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1432
-#: src/dht/gnunet-service-xdht_neighbours.c:1432
 #, 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:1550
-#: src/dht/gnunet-service-xdht_neighbours.c:1550
 #, 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:1637
-#: src/dht/gnunet-service-xdht_neighbours.c:1637
 #, 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:1640
-#: src/dht/gnunet-service-xdht_neighbours.c:1640
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1803
-#: src/dht/gnunet-service-xdht_neighbours.c:1803
 #, 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:1811
-#: src/dht/gnunet-service-xdht_neighbours.c:1811
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1904
-#: src/dht/gnunet-service-xdht_neighbours.c:1904
 #, 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:1907
-#: src/dht/gnunet-service-xdht_neighbours.c:1907
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/dht/gnunet-service-dht_neighbours.c:1961
-#: src/dht/gnunet-service-xdht_neighbours.c:1961
 #, 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:1975
-#: src/dht/gnunet-service-xdht_neighbours.c:1975
 #, 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:2052
-#: src/dht/gnunet-service-xdht_neighbours.c:2052
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
 
 #: src/dht/gnunet-service-dht_neighbours.c:2055
-#: src/dht/gnunet-service-xdht_neighbours.c:2055
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -2147,46 +2178,48 @@
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/dht/gnunet-service-dht_routing.c:211
-#: src/dht/gnunet-service-xdht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:220
-#: src/dht/gnunet-service-xdht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:226
-#: src/dht/gnunet-service-xdht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:232
-#: src/dht/gnunet-service-xdht_routing.c:232
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:244
-#: src/dht/gnunet-service-xdht_routing.c:244
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:317
-#: src/dht/gnunet-service-xdht_routing.c:317
 msgid "# Entries removed from routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:399
-#: src/dht/gnunet-service-xdht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:417
-#: src/dht/gnunet-service-xdht_routing.c:417
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
+#: src/dht/gnunet-service-xdht_neighbours.c:1179
+#, fuzzy
+msgid "# TRAIL SETUP requests received"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1182
+#, fuzzy
+msgid "# TRAIL SETUP bytes received"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
 #: src/dht/plugin_block_dht.c:138
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
@@ -2620,32 +2653,32 @@
 msgid "Cannot read experiments file `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:219
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
 #, c-format
 msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:307
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
 #, c-format
 msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:451
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
 #, c-format
 msgid "Added peer `%s' as active node\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:889
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891
 #, fuzzy, c-format
 msgid "Connected to peer %s\n"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:919
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921
 #, fuzzy, c-format
 msgid "Disconnected from peer %s\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1102
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -3448,7 +3481,7 @@
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1168 src/transport/gnunet-transport.c:1198
+#: src/transport/gnunet-transport.c:1172 src/transport/gnunet-transport.c:1202
 #, 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"
@@ -3567,102 +3600,102 @@
 msgstr "# tổng số định tuyến lỗ hổng thành công"
 
 #: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
-#: src/topology/gnunet-daemon-topology.c:1253
-#: src/topology/gnunet-daemon-topology.c:1260
+#: src/topology/gnunet-daemon-topology.c:1254
+#: src/topology/gnunet-daemon-topology.c:1261
 #, 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:680
+#: src/fs/gnunet-service-fs_cp.c:682
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:684
+#: src/fs/gnunet-service-fs_cp.c:686
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:719
+#: src/fs/gnunet-service-fs_cp.c:721
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/fs/gnunet-service-fs_cp.c:725
+#: src/fs/gnunet-service-fs_cp.c:727
 #, fuzzy
 msgid "# replies dropped"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_cp.c:750 src/fs/gnunet-service-fs_cp.c:1299
+#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:843
+#: src/fs/gnunet-service-fs_cp.c:845
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:896
+#: src/fs/gnunet-service-fs_cp.c:898
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:904
+#: src/fs/gnunet-service-fs_cp.c:906
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:920
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:956
+#: src/fs/gnunet-service-fs_cp.c:958
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1024
+#: src/fs/gnunet-service-fs_cp.c:1026
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1049
+#: src/fs/gnunet-service-fs_cp.c:1051
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1059
+#: src/fs/gnunet-service-fs_cp.c:1061
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1137
+#: src/fs/gnunet-service-fs_cp.c:1139
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1171
+#: src/fs/gnunet-service-fs_cp.c:1173
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1193
+#: src/fs/gnunet-service-fs_cp.c:1195
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1244
+#: src/fs/gnunet-service-fs_cp.c:1246
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1268
+#: src/fs/gnunet-service-fs_cp.c:1270
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1297
+#: src/fs/gnunet-service-fs_cp.c:1299
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:1668
+#: src/fs/gnunet-service-fs_cp.c:1670
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
@@ -3966,7 +3999,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:566
+#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
@@ -4641,11 +4674,11 @@
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
+#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425
 #: src/peerinfo-tool/gnunet-peerinfo.c:350
 #: src/peerinfo-tool/gnunet-peerinfo.c:419
 #: src/peerinfo-tool/gnunet-peerinfo.c:490
-#: src/topology/gnunet-daemon-topology.c:924
+#: src/topology/gnunet-daemon-topology.c:925
 #, 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"
@@ -4702,32 +4735,32 @@
 msgid "# hostlist advertisements send"
 msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
-#: src/hostlist/hostlist-server.c:389
+#: src/hostlist/hostlist-server.c:390
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639
 #: src/transport/gnunet-service-transport.c:892
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/hostlist/hostlist-server.c:575
+#: src/hostlist/hostlist-server.c:576
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:589
+#: src/hostlist/hostlist-server.c:590
 #, 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:629
+#: src/hostlist/hostlist-server.c:630
 #, 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:672
+#: src/hostlist/hostlist-server.c:673
 #, 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"
@@ -4819,38 +4852,43 @@
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/mesh/gnunet-mesh.c:343
+#: src/mesh/gnunet-mesh.c:348
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/mesh/gnunet-mesh.c:521
+#: src/mesh/gnunet-mesh.c:592
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/mesh/gnunet-mesh.c:586
-msgid "You must NOT give a TARGET when using options\n"
+#: src/mesh/gnunet-mesh.c:658
+msgid "You must NOT give a TARGETwhen using 'request all' options\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:669
+#: src/mesh/gnunet-mesh.c:747
 msgid "activate echo mode"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:672
-#, fuzzy
-msgid "provide information about all tunnels"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
-
-#: src/mesh/gnunet-mesh.c:678
+#: src/mesh/gnunet-mesh.c:753
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:681
+#: src/mesh/gnunet-mesh.c:756
 #, fuzzy
+msgid "provide information about all peers"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/mesh/gnunet-mesh.c:759
+#, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
+#: src/mesh/gnunet-mesh.c:762
+#, fuzzy
+msgid "provide information about all tunnels"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
 #: src/mesh/gnunet-service-mesh_peer.c:377
 msgid "Wrong CORE service\n"
 msgstr ""
@@ -4972,7 +5010,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:715
-#: src/peerinfo-tool/gnunet-peerinfo.c:702
+#: src/peerinfo-tool/gnunet-peerinfo.c:723
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
@@ -5296,7 +5334,7 @@
 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:1461
+#: src/nse/gnunet-service-nse.c:1462
 #: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248
 #, fuzzy
 msgid "Value is too large.\n"
@@ -5420,68 +5458,73 @@
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:666 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:633
+#, fuzzy, c-format
+msgid "Service `%s' is not running, please start GNUnet\n"
+msgstr "« %s » không phải là một tập tin.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:724
+#: src/peerinfo-tool/gnunet-peerinfo.c:745
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:768
+#: src/peerinfo-tool/gnunet-peerinfo.c:789
 msgid "don't resolve host names"
 msgstr "không quyết định các tên máy"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:771
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
 msgid "output only the identity strings"
 msgstr "chỉ xuất những chuỗi nhận diện"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:774
+#: src/peerinfo-tool/gnunet-peerinfo.c:795
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:777
+#: src/peerinfo-tool/gnunet-peerinfo.c:798
 msgid "output our own identity only"
 msgstr "chỉ xuất nhận diện mình"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:780
+#: src/peerinfo-tool/gnunet-peerinfo.c:801
 #, 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:783
+#: src/peerinfo-tool/gnunet-peerinfo.c:804
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:786
+#: src/peerinfo-tool/gnunet-peerinfo.c:807
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:810
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:800
+#: src/peerinfo-tool/gnunet-peerinfo.c:821
 #, 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:124
+#: src/transport/gnunet-service-transport_plugins.c:126
 #, 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:129
+#: src/transport/gnunet-service-transport_plugins.c:131
 #, 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:159
+#: src/transport/gnunet-service-transport_plugins.c:163
 #, 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"
@@ -5941,143 +5984,143 @@
 msgid "Generated key set with key length %d bits.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:776
+#: src/scalarproduct/gnunet-service-scalarproduct.c:746
 #, fuzzy, c-format
 msgid "Client (%p) disconnected from us.\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:848
-#: src/scalarproduct/gnunet-service-scalarproduct.c:938
+#: src/scalarproduct/gnunet-service-scalarproduct.c:818
+#: src/scalarproduct/gnunet-service-scalarproduct.c:908
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:854
+#: src/scalarproduct/gnunet-service-scalarproduct.c:824
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:948
+#: src/scalarproduct/gnunet-service-scalarproduct.c:918
 #, c-format
 msgid "Sent result to client (%p), this session (%s) has ended!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1027
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1165
+#: src/scalarproduct/gnunet-service-scalarproduct.c:997
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1135
 msgid "Could not send service-response message via mesh!)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1391
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1340
 #, c-format
 msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1495
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1622
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1444
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1571
 #, fuzzy
 msgid "Transmitting service request.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1504
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1453
 #, fuzzy
 msgid "Could not send service-request multipart message to channel!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1544
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1493
 #, fuzzy, c-format
 msgid "Successfully created new channel to peer (%s)!\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1631
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1580
 #, fuzzy
 msgid "Could not send message to channel!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1688
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1637
 #, fuzzy
 msgid "Too short message received from client!\n"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1701
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1650
 #, fuzzy
 msgid "Invalid message received from client, session information incorrect!\n"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1712
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1661
 #, c-format
 msgid ""
 "Duplicate session information received, cannot create new session with key `"
 "%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1733
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1682
 #, c-format
 msgid ""
 "Got client-request-session with key %s, preparing channel to remote "
 "service.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1772
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1721
 #, c-format
 msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1819
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1768
 #, c-format
 msgid ""
 "Got client-responder-session with key %s and a matching service-request-"
 "session set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1830
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1779
 #, c-format
 msgid ""
 "Got client-responder-session with key %s but NO matching service-request-"
 "session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1860
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1809
 #, fuzzy, c-format
 msgid "New incoming channel from peer %s.\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1841
 #, c-format
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2083
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2242
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2032
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2191
 #, c-format
 msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2092
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2249
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2041
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2198
 #, c-format
 msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2187
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2136
 #, c-format
 msgid ""
 "Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2471
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2420
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2536
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2485
 msgid "Generating Paillier-Keyset.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2551
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2500
 #, fuzzy
 msgid "Connect to MESH failed\n"
 msgstr " Không kết nối được (lỗi ?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2555
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2504
 #, fuzzy
 msgid "Mesh initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -6122,7 +6165,7 @@
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1416
+#: src/set/gnunet-service-set.c:1415
 #, fuzzy
 msgid "Could not connect to mesh service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
@@ -6632,62 +6675,62 @@
 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:727
-#: src/topology/gnunet-daemon-topology.c:812
+#: src/topology/gnunet-daemon-topology.c:728
+#: src/topology/gnunet-daemon-topology.c:813
 #, fuzzy
 msgid "# friends connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/topology/gnunet-daemon-topology.c:992
+#: src/topology/gnunet-daemon-topology.c:993
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1021
+#: src/topology/gnunet-daemon-topology.c:1022
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1028
+#: src/topology/gnunet-daemon-topology.c:1029
 #, 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:1049
+#: src/topology/gnunet-daemon-topology.c:1050
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1051
+#: src/topology/gnunet-daemon-topology.c:1052
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1056
+#: src/topology/gnunet-daemon-topology.c:1057
 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:1062
+#: src/topology/gnunet-daemon-topology.c:1063
 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:1093
+#: src/topology/gnunet-daemon-topology.c:1094
 #, 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:1150
+#: src/topology/gnunet-daemon-topology.c:1151
 #, 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:1289
+#: src/topology/gnunet-daemon-topology.c:1290
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -6766,196 +6809,196 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1025
+#: src/transport/gnunet-service-transport_neighbours.c:1027
 #, 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:1161
-#: src/transport/gnunet-service-transport_neighbours.c:1571
+#: src/transport/gnunet-service-transport_neighbours.c:1163
+#: src/transport/gnunet-service-transport_neighbours.c:1573
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1166
+#: src/transport/gnunet-service-transport_neighbours.c:1168
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/transport/gnunet-service-transport_neighbours.c:1171
+#: src/transport/gnunet-service-transport_neighbours.c:1173
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1228
+#: src/transport/gnunet-service-transport_neighbours.c:1230
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1285
+#: src/transport/gnunet-service-transport_neighbours.c:1287
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# các khoá phiên chạy được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1318
+#: src/transport/gnunet-service-transport_neighbours.c:1320
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1326
+#: src/transport/gnunet-service-transport_neighbours.c:1328
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1373
+#: src/transport/gnunet-service-transport_neighbours.c:1375
 #, fuzzy
 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:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1384
 #, 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:1390
+#: src/transport/gnunet-service-transport_neighbours.c:1392
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1398
+#: src/transport/gnunet-service-transport_neighbours.c:1400
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1476
+#: src/transport/gnunet-service-transport_neighbours.c:1478
 #, 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:1510
+#: src/transport/gnunet-service-transport_neighbours.c:1512
 #, 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:1526
+#: src/transport/gnunet-service-transport_neighbours.c:1528
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1618
+#: src/transport/gnunet-service-transport_neighbours.c:1620
 #, fuzzy
 msgid "# SESSION_CONNECT messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1634
+#: src/transport/gnunet-service-transport_neighbours.c:1636
 #, fuzzy, c-format
 msgid "Failed to transmit CONNECT message via plugin to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1677
+#: src/transport/gnunet-service-transport_neighbours.c:1679
 #, fuzzy
 msgid "# CONNECT_ACK messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1797
+#: src/transport/gnunet-service-transport_neighbours.c:1947
 #, fuzzy, c-format
 msgid "Blacklisting dissaproved to connect to peer `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2210
+#: src/transport/gnunet-service-transport_neighbours.c:2360
 #, fuzzy
 msgid "# CONNECT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2215
+#: src/transport/gnunet-service-transport_neighbours.c:2365
 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3013
+#: src/transport/gnunet-service-transport_neighbours.c:3167
 #, fuzzy
 msgid "# CONNECT_ACK messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3021
+#: src/transport/gnunet-service-transport_neighbours.c:3175
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3036
-#: src/transport/gnunet-service-transport_neighbours.c:3072
+#: src/transport/gnunet-service-transport_neighbours.c:3190
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3085
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3115
+#: src/transport/gnunet-service-transport_neighbours.c:3269
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3284
+#: src/transport/gnunet-service-transport_neighbours.c:3438
 #, fuzzy
 msgid "# SESSION_ACK messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3303
+#: src/transport/gnunet-service-transport_neighbours.c:3457
 #, 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:3358
+#: src/transport/gnunet-service-transport_neighbours.c:3511
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3373
+#: src/transport/gnunet-service-transport_neighbours.c:3526
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3401
+#: src/transport/gnunet-service-transport_neighbours.c:3554
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3407
+#: src/transport/gnunet-service-transport_neighbours.c:3560
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3416
+#: src/transport/gnunet-service-transport_neighbours.c:3569
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3452
+#: src/transport/gnunet-service-transport_neighbours.c:3605
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3704
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_plugins.c:116
+#: src/transport/gnunet-service-transport_plugins.c:118
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:172
-#: src/transport/gnunet-service-transport_plugins.c:180
-#: src/transport/gnunet-service-transport_plugins.c:188
-#: src/transport/gnunet-service-transport_plugins.c:196
-#: src/transport/gnunet-service-transport_plugins.c:204
-#: src/transport/gnunet-service-transport_plugins.c:212
-#: src/transport/gnunet-service-transport_plugins.c:220
-#: src/transport/gnunet-service-transport_plugins.c:228
-#: src/transport/gnunet-service-transport_plugins.c:236
-#: src/transport/gnunet-service-transport_plugins.c:244
-#: src/transport/gnunet-service-transport_plugins.c:252
+#: src/transport/gnunet-service-transport_plugins.c:176
+#: src/transport/gnunet-service-transport_plugins.c:184
+#: src/transport/gnunet-service-transport_plugins.c:192
+#: src/transport/gnunet-service-transport_plugins.c:200
+#: src/transport/gnunet-service-transport_plugins.c:208
+#: src/transport/gnunet-service-transport_plugins.c:216
+#: src/transport/gnunet-service-transport_plugins.c:224
+#: src/transport/gnunet-service-transport_plugins.c:232
+#: src/transport/gnunet-service-transport_plugins.c:240
+#: src/transport/gnunet-service-transport_plugins.c:248
+#: src/transport/gnunet-service-transport_plugins.c:256
 #, fuzzy, c-format
 msgid "Missing function `%s' in 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_plugins.c:259
+#: src/transport/gnunet-service-transport_plugins.c:263
 #, fuzzy, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Lỗi nạp phần bổ sung « %s » tại %s:%d. Đang hủy nạp phần bổ sung.\n"
@@ -7094,129 +7137,129 @@
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:720
+#: src/transport/gnunet-transport.c:722
 #, 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:741
+#: src/transport/gnunet-transport.c:743
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/transport/gnunet-transport.c:765
+#: src/transport/gnunet-transport.c:767
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:798
+#: src/transport/gnunet-transport.c:802
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:860
+#: src/transport/gnunet-transport.c:864
 #, 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:883
+#: src/transport/gnunet-transport.c:887
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:893
+#: src/transport/gnunet-transport.c:897
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1106
+#: src/transport/gnunet-transport.c:1110
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1150
+#: src/transport/gnunet-transport.c:1154
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1158
+#: src/transport/gnunet-transport.c:1162
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1177 src/transport/gnunet-transport.c:1207
-#: src/transport/gnunet-transport.c:1230 src/transport/gnunet-transport.c:1273
+#: src/transport/gnunet-transport.c:1181 src/transport/gnunet-transport.c:1211
+#: src/transport/gnunet-transport.c:1234 src/transport/gnunet-transport.c:1277
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1186 src/transport/gnunet-transport.c:1216
+#: src/transport/gnunet-transport.c:1190 src/transport/gnunet-transport.c:1220
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1235
+#: src/transport/gnunet-transport.c:1239
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1319
+#: src/transport/gnunet-transport.c:1323
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers )"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1322
+#: src/transport/gnunet-transport.c:1326
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1324
+#: src/transport/gnunet-transport.c:1328
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1327
+#: src/transport/gnunet-transport.c:1331
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1330
+#: src/transport/gnunet-transport.c:1334
 #, fuzzy
 msgid "print information for all pending validations continously"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1333
+#: src/transport/gnunet-transport.c:1337
 #, 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:1339
+#: src/transport/gnunet-transport.c:1343
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1341
+#: src/transport/gnunet-transport.c:1345
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:1343
+#: src/transport/gnunet-transport.c:1347
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1345
+#: src/transport/gnunet-transport.c:1349
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1348
+#: src/transport/gnunet-transport.c:1352
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1357
+#: src/transport/gnunet-transport.c:1361
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -7477,85 +7520,85 @@
 msgstr "Gặp sự kiện bất thường: %d\n"
 
 #: src/transport/plugin_transport_tcp.c:766
-#: src/transport/plugin_transport_tcp.c:930
-#: src/transport/plugin_transport_tcp.c:1973
-#: src/transport/plugin_transport_tcp.c:2527
+#: src/transport/plugin_transport_tcp.c:932
+#: src/transport/plugin_transport_tcp.c:2012
+#: src/transport/plugin_transport_tcp.c:2550
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_tcp.c:797
-#: src/transport/plugin_transport_tcp.c:923
-#: src/transport/plugin_transport_tcp.c:1009
-#: src/transport/plugin_transport_tcp.c:1056
-#: src/transport/plugin_transport_tcp.c:1219
-#: src/transport/plugin_transport_tcp.c:1237
+#: src/transport/plugin_transport_tcp.c:799
+#: src/transport/plugin_transport_tcp.c:925
+#: src/transport/plugin_transport_tcp.c:1013
+#: src/transport/plugin_transport_tcp.c:1060
+#: src/transport/plugin_transport_tcp.c:1223
+#: src/transport/plugin_transport_tcp.c:1241
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:800
+#: src/transport/plugin_transport_tcp.c:802
 #, 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:1012
+#: src/transport/plugin_transport_tcp.c:1016
 #, 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:1059
+#: src/transport/plugin_transport_tcp.c:1063
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:1193
+#: src/transport/plugin_transport_tcp.c:1197
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1427
+#: src/transport/plugin_transport_tcp.c:1466
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1532
+#: src/transport/plugin_transport_tcp.c:1571
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2021
+#: src/transport/plugin_transport_tcp.c:2060
 #, 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:2189
+#: src/transport/plugin_transport_tcp.c:2211
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:2253
+#: src/transport/plugin_transport_tcp.c:2275
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2407 src/util/service.c:589
+#: src/transport/plugin_transport_tcp.c:2429 src/util/service.c:589
 #: src/util/service.c:595
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2421
+#: src/transport/plugin_transport_tcp.c:2443
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2516
+#: src/transport/plugin_transport_tcp.c:2539
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2520
+#: src/transport/plugin_transport_tcp.c:2543
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2523
+#: src/transport/plugin_transport_tcp.c:2546
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7701,7 +7744,7 @@
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:690
+#: src/transport/transport_api.c:710
 #, 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"
@@ -8121,35 +8164,35 @@
 msgid "Could not read hostkey file: %s\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/util/gnunet-ecc.c:286
+#: src/util/gnunet-ecc.c:283
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:341
+#: src/util/gnunet-ecc.c:349
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:344
+#: src/util/gnunet-ecc.c:352
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:347
+#: src/util/gnunet-ecc.c:355
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:350
+#: src/util/gnunet-ecc.c:358
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:353
+#: src/util/gnunet-ecc.c:361
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:356
+#: src/util/gnunet-ecc.c:364
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:367
+#: src/util/gnunet-ecc.c:375
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -8251,17 +8294,17 @@
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:713
+#: src/util/os_installation.c:766
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/util/os_installation.c:773
+#: src/util/os_installation.c:826
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/os_installation.c:783
+#: src/util/os_installation.c:836
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -11914,9 +11957,6 @@
 #~ msgid "Enable for extra-verbose logging."
 #~ msgstr "Bật để theo dõi rất chi tiết hơn."
 
-#~ msgid "Logging"
-#~ msgstr "Theo dõi"
-
 #~ msgid "Specify which system messages should be logged how"
 #~ msgstr "Ghi rõ những thông điệp hệ thống nào nên được theo dõi như thế nào"
 

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2014-02-03 21:07:23 UTC (rev 32173)
+++ gnunet/po/zh_CN.po  2014-02-03 21:25:53 UTC (rev 32174)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-01-20 23:27+0100\n"
+"POT-Creation-Date: 2014-02-03 20:43+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -402,56 +402,110 @@
 msgid "Failed to initialize solver!\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/ats/plugin_ats_mlp.c:868
+#: src/ats/plugin_ats_mlp.c:892
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1281
+#: src/ats/plugin_ats_mlp.c:1329
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1328
+#: src/ats/plugin_ats_mlp.c:1376
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2059
+#: src/ats/plugin_ats_mlp.c:2122
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2067
+#: src/ats/plugin_ats_mlp.c:2131
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2077
+#: src/ats/plugin_ats_mlp.c:2142
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2085
+#: src/ats/plugin_ats_mlp.c:2150
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2096
+#: src/ats/plugin_ats_mlp.c:2161
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1511
+#: src/ats/plugin_ats_proportional.c:1510
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
+#: src/ats-tests/ats-testing.c:71
+msgid "Benchmarking done\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:104
+#, fuzzy, c-format
+msgid "Failed to connect peer 0 and %u\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/ats-tests/ats-testing.c:412
+#, c-format
+msgid "Connected master [%u] with slave [%u]\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:418
+#, fuzzy, c-format
+msgid "Failed to connect master peer [%u] with slave [%u]\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/ats-tests/ats-testing.c:449
+msgid "Connecting peers on CORE level\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:460
+#, c-format
+msgid "Connecting master [%u] with slave [%u]\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing.c:469
+#, fuzzy, c-format
+msgid "Could not connect master [%u] and slave [%u]\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/ats-tests/ats-testing.c:489 src/ats-tests/ats-testing.c:670
+#, fuzzy
+msgid "Initialization failed, shutdown\n"
+msgstr "插件机构初始化失败：%s！\n"
+
+#: src/ats-tests/ats-testing-log.c:840
+msgid "Stop logging\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing-log.c:889
+#, fuzzy, c-format
+msgid "Start logging `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/ats-tests/gnunet-ats-sim.c:86
+#, c-format
+msgid ""
+"Master [%u]: sent: %u KiB in %u sec. = %u KiB/s, received: %u KiB in %u sec. "
+"= %u KiB/s\n"
+msgstr ""
+
 #: src/ats-tool/gnunet-ats.c:145
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -475,12 +529,12 @@
 msgstr ""
 
 #: src/ats-tool/gnunet-ats.c:352 src/namestore/gnunet-namestore.c:550
-#: src/transport/gnunet-transport.c:1130
+#: src/transport/gnunet-transport.c:1134
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "服务已删除。\n"
 
-#: src/ats-tool/gnunet-ats.c:364 src/transport/gnunet-transport.c:1139
+#: src/ats-tool/gnunet-ats.c:364 src/transport/gnunet-transport.c:1143
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -697,155 +751,155 @@
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:644
+#: src/conversation/gnunet-conversation.c:647
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:667
+#: src/conversation/gnunet-conversation.c:670
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:672
+#: src/conversation/gnunet-conversation.c:675
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:678
-#: src/conversation/gnunet-conversation.c:702
+#: src/conversation/gnunet-conversation.c:681
+#: src/conversation/gnunet-conversation.c:705
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:683
+#: src/conversation/gnunet-conversation.c:686
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:692
+#: src/conversation/gnunet-conversation.c:695
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/conversation/gnunet-conversation.c:697
+#: src/conversation/gnunet-conversation.c:700
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:716
+#: src/conversation/gnunet-conversation.c:719
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:722
+#: src/conversation/gnunet-conversation.c:725
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/conversation/gnunet-conversation.c:750
-#: src/conversation/gnunet-conversation.c:765
+#: src/conversation/gnunet-conversation.c:753
+#: src/conversation/gnunet-conversation.c:768
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:798
-#: src/conversation/gnunet-conversation.c:814
+#: src/conversation/gnunet-conversation.c:801
+#: src/conversation/gnunet-conversation.c:817
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:821
+#: src/conversation/gnunet-conversation.c:824
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:830
+#: src/conversation/gnunet-conversation.c:833
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:847
+#: src/conversation/gnunet-conversation.c:850
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:882
+#: src/conversation/gnunet-conversation.c:885
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:890
+#: src/conversation/gnunet-conversation.c:893
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:907
+#: src/conversation/gnunet-conversation.c:910
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:934
+#: src/conversation/gnunet-conversation.c:937
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:936
+#: src/conversation/gnunet-conversation.c:939
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:938
+#: src/conversation/gnunet-conversation.c:941
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:940
+#: src/conversation/gnunet-conversation.c:943
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:942
+#: src/conversation/gnunet-conversation.c:945
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:944
+#: src/conversation/gnunet-conversation.c:947
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:946
+#: src/conversation/gnunet-conversation.c:949
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:948
+#: src/conversation/gnunet-conversation.c:951
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:950
+#: src/conversation/gnunet-conversation.c:953
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1148
+#: src/conversation/gnunet-conversation.c:1151
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:1161
+#: src/conversation/gnunet-conversation.c:1164
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1196
+#: src/conversation/gnunet-conversation.c:1199
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/conversation/gnunet-conversation.c:1220
+#: src/conversation/gnunet-conversation.c:1223
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/conversation/gnunet-conversation.c:1246
+#: src/conversation/gnunet-conversation.c:1249
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1249
+#: src/conversation/gnunet-conversation.c:1252
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1273
+#: src/conversation/gnunet-conversation.c:1276
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1032,7 +1086,7 @@
 msgid "Could not start playback audio helper.\n"
 msgstr ""
 
-#: src/core/core_api.c:765
+#: src/core/core_api.c:767
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
@@ -1042,27 +1096,27 @@
 msgstr ""
 
 #: src/core/gnunet-core.c:110 src/core/gnunet-core.c:138
-#: src/transport/gnunet-transport.c:820 src/transport/gnunet-transport.c:840
+#: src/transport/gnunet-transport.c:824 src/transport/gnunet-transport.c:844
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:821
+#: src/core/gnunet-core.c:112 src/transport/gnunet-transport.c:825
 #, fuzzy
 msgid "Connected to"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:841
+#: src/core/gnunet-core.c:140 src/transport/gnunet-transport.c:845
 #, fuzzy
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:164 src/peerinfo-tool/gnunet-peerinfo.c:645
+#: src/core/gnunet-core.c:164 src/peerinfo-tool/gnunet-peerinfo.c:694
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1336
+#: src/core/gnunet-core.c:201 src/transport/gnunet-transport.c:1340
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
@@ -1084,11 +1138,11 @@
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:475
+#: src/core/gnunet-service-core_clients.c:480
 msgid "# messages discarded (session disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core_clients.c:518
+#: src/core/gnunet-service-core_clients.c:526
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
@@ -1238,28 +1292,27 @@
 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:278
+#: src/core/gnunet-service-core_sessions.c:214
+#: src/core/gnunet-service-core_sessions.c:286
 #: src/dht/gnunet-service-dht_neighbours.c:662
 #: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:662
-#: src/dht/gnunet-service-xdht_neighbours.c:727
-#: src/fs/gnunet-service-fs_cp.c:604 src/fs/gnunet-service-fs_cp.c:1499
-#: src/topology/gnunet-daemon-topology.c:706
-#: src/topology/gnunet-daemon-topology.c:807
-#: src/transport/gnunet-service-transport_neighbours.c:846
-#: src/transport/gnunet-service-transport_neighbours.c:1078
-#: src/transport/gnunet-service-transport_neighbours.c:1087
-#: src/transport/gnunet-service-transport_neighbours.c:3048
-#: src/transport/gnunet-service-transport_neighbours.c:3309
+#: src/dht/gnunet-service-xdht_neighbours.c:939
+#: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
+#: src/topology/gnunet-daemon-topology.c:707
+#: src/topology/gnunet-daemon-topology.c:808
+#: src/transport/gnunet-service-transport_neighbours.c:848
+#: src/transport/gnunet-service-transport_neighbours.c:1080
+#: src/transport/gnunet-service-transport_neighbours.c:1089
+#: src/transport/gnunet-service-transport_neighbours.c:3202
+#: src/transport/gnunet-service-transport_neighbours.c:3463
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:246
+#: src/core/gnunet-service-core_sessions.c:253
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:415
+#: src/core/gnunet-service-core_sessions.c:424
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -1331,7 +1384,7 @@
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
 #: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:61
+#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:60
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
@@ -1341,7 +1394,7 @@
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:484
-#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/datastore/plugin_datastore_sqlite.c:404
 #: src/namecache/plugin_namecache_sqlite.c:295
 #: src/namestore/plugin_namestore_sqlite.c:327
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
@@ -1653,7 +1706,7 @@
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:253
+#: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
 #: src/psycstore/plugin_psycstore_sqlite.c:319
@@ -1661,23 +1714,23 @@
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:649
+#: src/datastore/plugin_datastore_sqlite.c:663
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1135
+#: src/datastore/plugin_datastore_sqlite.c:1156
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1154
+#: src/datastore/plugin_datastore_sqlite.c:1175
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1194
+#: src/datastore/plugin_datastore_sqlite.c:1215
 #: src/namecache/plugin_namecache_sqlite.c:583
 #: src/namestore/plugin_namestore_sqlite.c:719
 #, fuzzy
@@ -1693,48 +1746,48 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-dht-get.c:132
+#: src/dht/gnunet-dht-get.c:133
 #, c-format
 msgid ""
 "Result %d, type %d:\n"
 "%.*s\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:156
+#: src/dht/gnunet-dht-get.c:159
 msgid "Must provide key for DHT GET!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:162 src/dht/gnunet-dht-monitor.c:225
+#: src/dht/gnunet-dht-get.c:165 src/dht/gnunet-dht-monitor.c:225
 #, fuzzy
 msgid "Failed to connect to DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-dht-get.c:170
+#: src/dht/gnunet-dht-get.c:173
 msgid "Issueing DHT GET with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:186 src/dht/gnunet-dht-monitor.c:262
+#: src/dht/gnunet-dht-get.c:189 src/dht/gnunet-dht-monitor.c:262
 #: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:189
+#: src/dht/gnunet-dht-get.c:192
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:192 src/dht/gnunet-dht-monitor.c:265
+#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-monitor.c:265
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-put.c:210
+#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:210
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-put.c:201
 msgid "use DHT's demultiplex everywhere option"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
+#: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
 #: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
@@ -1742,7 +1795,7 @@
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:222
+#: src/dht/gnunet-dht-get.c:225
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
@@ -1796,11 +1849,11 @@
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:235
+#: src/dht/gnunet-dht-put.c:236
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:172
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:176
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -1811,50 +1864,50 @@
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:511
-#: src/dht/gnunet-service-xdht_clients.c:511
+#: src/dht/gnunet-service-xdht_clients.c:512
 msgid "# PUT requests received from clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:595
-#: src/dht/gnunet-service-xdht_clients.c:595
+#: src/dht/gnunet-service-xdht_clients.c:597
 msgid "# GET requests received from clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:796
-#: src/dht/gnunet-service-xdht_clients.c:796
+#: src/dht/gnunet-service-xdht_clients.c:798
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1037
-#: src/dht/gnunet-service-xdht_clients.c:1037
+#: src/dht/gnunet-service-xdht_clients.c:1039
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1050
-#: src/dht/gnunet-service-xdht_clients.c:1050
+#: src/dht/gnunet-service-xdht_clients.c:1052
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1087
-#: src/dht/gnunet-service-xdht_clients.c:1087
+#: src/dht/gnunet-service-xdht_clients.c:1089
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1110
-#: src/dht/gnunet-service-xdht_clients.c:1110
+#: src/dht/gnunet-service-xdht_clients.c:1112
 msgid "# RESULTS queued for clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1164
-#: src/dht/gnunet-service-dht_clients.c:1206
-#: src/dht/gnunet-service-xdht_clients.c:1164
-#: src/dht/gnunet-service-xdht_clients.c:1206
+#: src/dht/gnunet-service-dht_clients.c:1207
+#: src/dht/gnunet-service-xdht_clients.c:1166
+#: src/dht/gnunet-service-xdht_clients.c:1208
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1174
-#: src/dht/gnunet-service-xdht_clients.c:1174
+#: src/dht/gnunet-service-xdht_clients.c:1176
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -1911,130 +1964,107 @@
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:516
-#: src/dht/gnunet-service-xdht_neighbours.c:516
 msgid "# Preference updates given to core"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:610
-#: src/dht/gnunet-service-xdht_neighbours.c:610
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:764
-#: src/dht/gnunet-service-xdht_neighbours.c:764
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:819
+#: src/dht/gnunet-service-xdht_neighbours.c:540
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:857
+#: src/dht/gnunet-service-xdht_neighbours.c:579
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:889
-#: src/dht/gnunet-service-xdht_neighbours.c:889
 msgid "# requests TTL-dropped"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1093
 #: src/dht/gnunet-service-dht_neighbours.c:1130
-#: src/dht/gnunet-service-xdht_neighbours.c:1093
-#: src/dht/gnunet-service-xdht_neighbours.c:1130
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1108
 #: src/dht/gnunet-service-dht_neighbours.c:1145
-#: src/dht/gnunet-service-xdht_neighbours.c:1108
-#: src/dht/gnunet-service-xdht_neighbours.c:1145
 msgid "# Peer selection failed"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1287
-#: src/dht/gnunet-service-xdht_neighbours.c:1287
 msgid "# PUT requests routed"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1316
-#: src/dht/gnunet-service-xdht_neighbours.c:1316
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1323
 #: src/dht/gnunet-service-dht_neighbours.c:1440
 #: src/dht/gnunet-service-dht_neighbours.c:1543
-#: src/dht/gnunet-service-xdht_neighbours.c:1323
-#: src/dht/gnunet-service-xdht_neighbours.c:1440
-#: src/dht/gnunet-service-xdht_neighbours.c:1543
+#: src/dht/gnunet-service-xdht_neighbours.c:616
+#: src/dht/gnunet-service-xdht_neighbours.c:1246
+#: src/dht/gnunet-service-xdht_neighbours.c:1330
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1405
-#: src/dht/gnunet-service-xdht_neighbours.c:1405
 msgid "# GET requests routed"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1432
-#: src/dht/gnunet-service-xdht_neighbours.c:1432
 msgid "# GET messages queued for transmission"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1550
-#: src/dht/gnunet-service-xdht_neighbours.c:1550
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1637
-#: src/dht/gnunet-service-xdht_neighbours.c:1637
 msgid "# P2P PUT requests received"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1640
-#: src/dht/gnunet-service-xdht_neighbours.c:1640
 msgid "# P2P PUT bytes received"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1803
-#: src/dht/gnunet-service-xdht_neighbours.c:1803
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1811
-#: src/dht/gnunet-service-xdht_neighbours.c:1811
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1904
-#: src/dht/gnunet-service-xdht_neighbours.c:1904
 msgid "# P2P GET requests received"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1907
-#: src/dht/gnunet-service-xdht_neighbours.c:1907
 msgid "# P2P GET bytes received"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1961
-#: src/dht/gnunet-service-xdht_neighbours.c:1961
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:1975
-#: src/dht/gnunet-service-xdht_neighbours.c:1975
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:2052
-#: src/dht/gnunet-service-xdht_neighbours.c:2052
 msgid "# P2P RESULTS received"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:2055
-#: src/dht/gnunet-service-xdht_neighbours.c:2055
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
@@ -2043,45 +2073,45 @@
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:211
-#: src/dht/gnunet-service-xdht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:220
-#: src/dht/gnunet-service-xdht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:226
-#: src/dht/gnunet-service-xdht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:232
-#: src/dht/gnunet-service-xdht_routing.c:232
 msgid "# Irrelevant REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:244
-#: src/dht/gnunet-service-xdht_routing.c:244
 msgid "# Unsupported REPLIES matched against routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:317
-#: src/dht/gnunet-service-xdht_routing.c:317
 msgid "# Entries removed from routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:399
-#: src/dht/gnunet-service-xdht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_routing.c:417
-#: src/dht/gnunet-service-xdht_routing.c:417
 msgid "# DHT requests combined"
 msgstr ""
 
+#: src/dht/gnunet-service-xdht_neighbours.c:1179
+msgid "# TRAIL SETUP requests received"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1182
+msgid "# TRAIL SETUP bytes received"
+msgstr ""
+
 #: src/dht/plugin_block_dht.c:138
 #, c-format
 msgid "Block not of type %u\n"
@@ -2499,32 +2529,32 @@
 msgid "Cannot read experiments file `%s'\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:219
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
 #, c-format
 msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:307
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:309
 #, c-format
 msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:451
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:453
 #, c-format
 msgid "Added peer `%s' as active node\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:889
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:891
 #, fuzzy, c-format
 msgid "Connected to peer %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:919
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:921
 #, fuzzy, c-format
 msgid "Disconnected from peer %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1102
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1104
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -3305,7 +3335,7 @@
 msgstr ""
 
 #: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1168 src/transport/gnunet-transport.c:1198
+#: src/transport/gnunet-transport.c:1172 src/transport/gnunet-transport.c:1202
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -3406,90 +3436,90 @@
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:288
-#: src/topology/gnunet-daemon-topology.c:1253
-#: src/topology/gnunet-daemon-topology.c:1260
+#: src/topology/gnunet-daemon-topology.c:1254
+#: src/topology/gnunet-daemon-topology.c:1261
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-service-fs_cp.c:680
+#: src/fs/gnunet-service-fs_cp.c:682
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:684
+#: src/fs/gnunet-service-fs_cp.c:686
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:719
+#: src/fs/gnunet-service-fs_cp.c:721
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:725
+#: src/fs/gnunet-service-fs_cp.c:727
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:750 src/fs/gnunet-service-fs_cp.c:1299
+#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:843
+#: src/fs/gnunet-service-fs_cp.c:845
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:896
+#: src/fs/gnunet-service-fs_cp.c:898
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:904
+#: src/fs/gnunet-service-fs_cp.c:906
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:920
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:956
+#: src/fs/gnunet-service-fs_cp.c:958
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1024
+#: src/fs/gnunet-service-fs_cp.c:1026
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1049
+#: src/fs/gnunet-service-fs_cp.c:1051
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1059
+#: src/fs/gnunet-service-fs_cp.c:1061
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1137
+#: src/fs/gnunet-service-fs_cp.c:1139
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1171
+#: src/fs/gnunet-service-fs_cp.c:1173
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1193
+#: src/fs/gnunet-service-fs_cp.c:1195
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1244
+#: src/fs/gnunet-service-fs_cp.c:1246
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1268
+#: src/fs/gnunet-service-fs_cp.c:1270
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1297
+#: src/fs/gnunet-service-fs_cp.c:1299
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1668
+#: src/fs/gnunet-service-fs_cp.c:1670
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3768,7 +3798,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:566
+#: src/gns/gnunet-bcd.c:355 src/hostlist/hostlist-server.c:567
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
@@ -4426,11 +4456,11 @@
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
+#: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:425
 #: src/peerinfo-tool/gnunet-peerinfo.c:350
 #: src/peerinfo-tool/gnunet-peerinfo.c:419
 #: src/peerinfo-tool/gnunet-peerinfo.c:490
-#: src/topology/gnunet-daemon-topology.c:924
+#: src/topology/gnunet-daemon-topology.c:925
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
@@ -4481,31 +4511,31 @@
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:389
+#: src/hostlist/hostlist-server.c:390
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:556 src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/hostlist/hostlist-server.c:557 src/peerinfo-tool/gnunet-peerinfo.c:639
 #: src/transport/gnunet-service-transport.c:892
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:575
+#: src/hostlist/hostlist-server.c:576
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:589
+#: src/hostlist/hostlist-server.c:590
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:629
+#: src/hostlist/hostlist-server.c:630
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/hostlist-server.c:672
+#: src/hostlist/hostlist-server.c:673
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4597,38 +4627,43 @@
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/mesh/gnunet-mesh.c:343
+#: src/mesh/gnunet-mesh.c:348
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/mesh/gnunet-mesh.c:521
+#: src/mesh/gnunet-mesh.c:592
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/mesh/gnunet-mesh.c:586
-msgid "You must NOT give a TARGET when using options\n"
+#: src/mesh/gnunet-mesh.c:658
+msgid "You must NOT give a TARGETwhen using 'request all' options\n"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:669
+#: src/mesh/gnunet-mesh.c:747
 msgid "activate echo mode"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:672
-#, fuzzy
-msgid "provide information about all tunnels"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
-
-#: src/mesh/gnunet-mesh.c:678
+#: src/mesh/gnunet-mesh.c:753
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:681
+#: src/mesh/gnunet-mesh.c:756
 #, fuzzy
+msgid "provide information about all peers"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/mesh/gnunet-mesh.c:759
+#, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
+#: src/mesh/gnunet-mesh.c:762
+#, fuzzy
+msgid "provide information about all tunnels"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
 #: src/mesh/gnunet-service-mesh_peer.c:377
 msgid "Wrong CORE service\n"
 msgstr ""
@@ -4749,7 +4784,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:715
-#: src/peerinfo-tool/gnunet-peerinfo.c:702
+#: src/peerinfo-tool/gnunet-peerinfo.c:723
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
@@ -5070,7 +5105,7 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-service-nse.c:1461
+#: src/nse/gnunet-service-nse.c:1462
 #: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248
 #, fuzzy
 msgid "Value is too large.\n"
@@ -5187,68 +5222,73 @@
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:666 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:633
+#, fuzzy, c-format
+msgid "Service `%s' is not running, please start GNUnet\n"
+msgstr "服务已删除。\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:654 src/util/gnunet-scrypt.c:224
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:724
+#: src/peerinfo-tool/gnunet-peerinfo.c:745
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:768
+#: src/peerinfo-tool/gnunet-peerinfo.c:789
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:771
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:774
+#: src/peerinfo-tool/gnunet-peerinfo.c:795
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:777
+#: src/peerinfo-tool/gnunet-peerinfo.c:798
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:780
+#: src/peerinfo-tool/gnunet-peerinfo.c:801
 #, fuzzy
 msgid "list all known peers"
 msgstr "列出所有网络适配器"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:783
+#: src/peerinfo-tool/gnunet-peerinfo.c:804
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:786
+#: src/peerinfo-tool/gnunet-peerinfo.c:807
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:789
+#: src/peerinfo-tool/gnunet-peerinfo.c:810
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:800
+#: src/peerinfo-tool/gnunet-peerinfo.c:821
 #, 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:124
+#: src/transport/gnunet-service-transport_plugins.c:126
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:129
+#: src/transport/gnunet-service-transport_plugins.c:131
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:159
+#: src/transport/gnunet-service-transport_plugins.c:163
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -5698,140 +5738,140 @@
 msgid "Generated key set with key length %d bits.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:776
+#: src/scalarproduct/gnunet-service-scalarproduct.c:746
 #, fuzzy, c-format
 msgid "Client (%p) disconnected from us.\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:848
-#: src/scalarproduct/gnunet-service-scalarproduct.c:938
+#: src/scalarproduct/gnunet-service-scalarproduct.c:818
+#: src/scalarproduct/gnunet-service-scalarproduct.c:908
 #, fuzzy, c-format
 msgid "Could not send message to client (%p)!\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:854
+#: src/scalarproduct/gnunet-service-scalarproduct.c:824
 #, c-format
 msgid "Sending session-end notification to client (%p) for session %s\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:948
+#: src/scalarproduct/gnunet-service-scalarproduct.c:918
 #, c-format
 msgid "Sent result to client (%p), this session (%s) has ended!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1027
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1165
+#: src/scalarproduct/gnunet-service-scalarproduct.c:997
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1135
 msgid "Could not send service-response message via mesh!)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1391
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1340
 #, c-format
 msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1495
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1622
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1444
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1571
 msgid "Transmitting service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1504
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1453
 #, fuzzy
 msgid "Could not send service-request multipart message to channel!\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1544
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1493
 #, fuzzy, c-format
 msgid "Successfully created new channel to peer (%s)!\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1631
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1580
 #, fuzzy
 msgid "Could not send message to channel!\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1688
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1637
 msgid "Too short message received from client!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1701
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1650
 msgid "Invalid message received from client, session information incorrect!\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1712
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1661
 #, c-format
 msgid ""
 "Duplicate session information received, cannot create new session with key `"
 "%s'\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1733
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1682
 #, c-format
 msgid ""
 "Got client-request-session with key %s, preparing channel to remote "
 "service.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1772
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1721
 #, c-format
 msgid "Creating new channel for session with key %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1819
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1768
 #, c-format
 msgid ""
 "Got client-responder-session with key %s and a matching service-request-"
 "session set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1830
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1779
 #, c-format
 msgid ""
 "Got client-responder-session with key %s but NO matching service-request-"
 "session set, queuing element for later use.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1860
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1809
 #, fuzzy, c-format
 msgid "New incoming channel from peer %s.\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1841
 #, c-format
 msgid "Peer disconnected, terminating session %s with peer (%s)\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2083
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2242
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2032
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2191
 #, c-format
 msgid "Got session with key %s and a matching element set, processing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2092
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2249
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2041
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2198
 #, c-format
 msgid "Got session with key %s without a matching element set, queueing.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2187
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2136
 #, c-format
 msgid ""
 "Got message with duplicate session key (`%s'), ignoring service request.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2471
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2420
 msgid "Shutting down, initiating cleanup.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2536
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2485
 msgid "Generating Paillier-Keyset.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2551
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2500
 #, fuzzy
 msgid "Connect to MESH failed\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2555
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2504
 msgid "Mesh initialized\n"
 msgstr ""
 
@@ -5873,7 +5913,7 @@
 msgid "also profile decryption"
 msgstr ""
 
-#: src/set/gnunet-service-set.c:1416
+#: src/set/gnunet-service-set.c:1415
 #, fuzzy
 msgid "Could not connect to mesh service\n"
 msgstr "无法连接到 %s:%u：%s\n"
@@ -6380,58 +6420,58 @@
 msgid "# connect requests issued to transport"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:727
-#: src/topology/gnunet-daemon-topology.c:812
+#: src/topology/gnunet-daemon-topology.c:728
+#: src/topology/gnunet-daemon-topology.c:813
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:992
+#: src/topology/gnunet-daemon-topology.c:993
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1021
+#: src/topology/gnunet-daemon-topology.c:1022
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1028
+#: src/topology/gnunet-daemon-topology.c:1029
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:1050
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1051
+#: src/topology/gnunet-daemon-topology.c:1052
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1056
+#: src/topology/gnunet-daemon-topology.c:1057
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1062
+#: src/topology/gnunet-daemon-topology.c:1063
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1093
+#: src/topology/gnunet-daemon-topology.c:1094
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1150
+#: src/topology/gnunet-daemon-topology.c:1151
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1289
+#: src/topology/gnunet-daemon-topology.c:1290
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -6505,171 +6545,171 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1025
+#: src/transport/gnunet-service-transport_neighbours.c:1027
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1161
-#: src/transport/gnunet-service-transport_neighbours.c:1571
+#: src/transport/gnunet-service-transport_neighbours.c:1163
+#: src/transport/gnunet-service-transport_neighbours.c:1573
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1166
+#: src/transport/gnunet-service-transport_neighbours.c:1168
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1171
+#: src/transport/gnunet-service-transport_neighbours.c:1173
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1228
+#: src/transport/gnunet-service-transport_neighbours.c:1230
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1285
+#: src/transport/gnunet-service-transport_neighbours.c:1287
 msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1318
+#: src/transport/gnunet-service-transport_neighbours.c:1320
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1326
+#: src/transport/gnunet-service-transport_neighbours.c:1328
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1373
+#: src/transport/gnunet-service-transport_neighbours.c:1375
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1382
+#: src/transport/gnunet-service-transport_neighbours.c:1384
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1390
+#: src/transport/gnunet-service-transport_neighbours.c:1392
 msgid "# KEEPALIVE_RESPONSE messages discarded (address changed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1398
+#: src/transport/gnunet-service-transport_neighbours.c:1400
 msgid "# KEEPALIVE_RESPONSE messages discarded (wrong nonce)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1476
+#: src/transport/gnunet-service-transport_neighbours.c:1478
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1510
+#: src/transport/gnunet-service-transport_neighbours.c:1512
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1526
+#: src/transport/gnunet-service-transport_neighbours.c:1528
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1618
+#: src/transport/gnunet-service-transport_neighbours.c:1620
 msgid "# SESSION_CONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1634
+#: src/transport/gnunet-service-transport_neighbours.c:1636
 #, fuzzy, c-format
 msgid "Failed to transmit CONNECT message via plugin to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1677
+#: src/transport/gnunet-service-transport_neighbours.c:1679
 msgid "# CONNECT_ACK messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1797
+#: src/transport/gnunet-service-transport_neighbours.c:1947
 #, fuzzy, c-format
 msgid "Blacklisting dissaproved to connect to peer `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2210
+#: src/transport/gnunet-service-transport_neighbours.c:2360
 msgid "# CONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2215
+#: src/transport/gnunet-service-transport_neighbours.c:2365
 #, c-format
 msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3013
+#: src/transport/gnunet-service-transport_neighbours.c:3167
 msgid "# CONNECT_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3021
+#: src/transport/gnunet-service-transport_neighbours.c:3175
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3036
-#: src/transport/gnunet-service-transport_neighbours.c:3072
+#: src/transport/gnunet-service-transport_neighbours.c:3190
+#: src/transport/gnunet-service-transport_neighbours.c:3226
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3085
+#: src/transport/gnunet-service-transport_neighbours.c:3239
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3115
+#: src/transport/gnunet-service-transport_neighbours.c:3269
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3284
+#: src/transport/gnunet-service-transport_neighbours.c:3438
 msgid "# SESSION_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3303
+#: src/transport/gnunet-service-transport_neighbours.c:3457
 msgid "# unexpected SESSION_ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3358
+#: src/transport/gnunet-service-transport_neighbours.c:3511
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3373
+#: src/transport/gnunet-service-transport_neighbours.c:3526
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3401
+#: src/transport/gnunet-service-transport_neighbours.c:3554
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3407
+#: src/transport/gnunet-service-transport_neighbours.c:3560
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3416
+#: src/transport/gnunet-service-transport_neighbours.c:3569
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3452
+#: src/transport/gnunet-service-transport_neighbours.c:3605
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3551
+#: src/transport/gnunet-service-transport_neighbours.c:3704
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:116
+#: src/transport/gnunet-service-transport_plugins.c:118
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:172
-#: src/transport/gnunet-service-transport_plugins.c:180
-#: src/transport/gnunet-service-transport_plugins.c:188
-#: src/transport/gnunet-service-transport_plugins.c:196
-#: src/transport/gnunet-service-transport_plugins.c:204
-#: src/transport/gnunet-service-transport_plugins.c:212
-#: src/transport/gnunet-service-transport_plugins.c:220
-#: src/transport/gnunet-service-transport_plugins.c:228
-#: src/transport/gnunet-service-transport_plugins.c:236
-#: src/transport/gnunet-service-transport_plugins.c:244
-#: src/transport/gnunet-service-transport_plugins.c:252
+#: src/transport/gnunet-service-transport_plugins.c:176
+#: src/transport/gnunet-service-transport_plugins.c:184
+#: src/transport/gnunet-service-transport_plugins.c:192
+#: src/transport/gnunet-service-transport_plugins.c:200
+#: src/transport/gnunet-service-transport_plugins.c:208
+#: src/transport/gnunet-service-transport_plugins.c:216
+#: src/transport/gnunet-service-transport_plugins.c:224
+#: src/transport/gnunet-service-transport_plugins.c:232
+#: src/transport/gnunet-service-transport_plugins.c:240
+#: src/transport/gnunet-service-transport_plugins.c:248
+#: src/transport/gnunet-service-transport_plugins.c:256
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:259
+#: src/transport/gnunet-service-transport_plugins.c:263
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
@@ -6806,126 +6846,126 @@
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:720
+#: src/transport/gnunet-transport.c:722
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:741
+#: src/transport/gnunet-transport.c:743
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:765
+#: src/transport/gnunet-transport.c:767
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:798
+#: src/transport/gnunet-transport.c:802
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:860
+#: src/transport/gnunet-transport.c:864
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:883
+#: src/transport/gnunet-transport.c:887
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:893
+#: src/transport/gnunet-transport.c:897
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:1106
+#: src/transport/gnunet-transport.c:1110
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1150
+#: src/transport/gnunet-transport.c:1154
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1158
+#: src/transport/gnunet-transport.c:1162
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1177 src/transport/gnunet-transport.c:1207
-#: src/transport/gnunet-transport.c:1230 src/transport/gnunet-transport.c:1273
+#: src/transport/gnunet-transport.c:1181 src/transport/gnunet-transport.c:1211
+#: src/transport/gnunet-transport.c:1234 src/transport/gnunet-transport.c:1277
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1186 src/transport/gnunet-transport.c:1216
+#: src/transport/gnunet-transport.c:1190 src/transport/gnunet-transport.c:1220
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1235
+#: src/transport/gnunet-transport.c:1239
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1319
+#: src/transport/gnunet-transport.c:1323
 #, fuzzy
 msgid "print information for all peers (instead of only connected peers )"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/transport/gnunet-transport.c:1322
+#: src/transport/gnunet-transport.c:1326
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1324
+#: src/transport/gnunet-transport.c:1328
 #, fuzzy
 msgid "connect to a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1327
+#: src/transport/gnunet-transport.c:1331
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/transport/gnunet-transport.c:1330
+#: src/transport/gnunet-transport.c:1334
 #, fuzzy
 msgid "print information for all pending validations continously"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/transport/gnunet-transport.c:1333
+#: src/transport/gnunet-transport.c:1337
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1339
+#: src/transport/gnunet-transport.c:1343
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1341
+#: src/transport/gnunet-transport.c:1345
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1343
+#: src/transport/gnunet-transport.c:1347
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1345
+#: src/transport/gnunet-transport.c:1349
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1348
+#: src/transport/gnunet-transport.c:1352
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1357
+#: src/transport/gnunet-transport.c:1361
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
@@ -7175,79 +7215,79 @@
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:766
-#: src/transport/plugin_transport_tcp.c:930
-#: src/transport/plugin_transport_tcp.c:1973
-#: src/transport/plugin_transport_tcp.c:2527
+#: src/transport/plugin_transport_tcp.c:932
+#: src/transport/plugin_transport_tcp.c:2012
+#: src/transport/plugin_transport_tcp.c:2550
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:797
-#: src/transport/plugin_transport_tcp.c:923
-#: src/transport/plugin_transport_tcp.c:1009
-#: src/transport/plugin_transport_tcp.c:1056
-#: src/transport/plugin_transport_tcp.c:1219
-#: src/transport/plugin_transport_tcp.c:1237
+#: src/transport/plugin_transport_tcp.c:799
+#: src/transport/plugin_transport_tcp.c:925
+#: src/transport/plugin_transport_tcp.c:1013
+#: src/transport/plugin_transport_tcp.c:1060
+#: src/transport/plugin_transport_tcp.c:1223
+#: src/transport/plugin_transport_tcp.c:1241
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:800
+#: src/transport/plugin_transport_tcp.c:802
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1012
+#: src/transport/plugin_transport_tcp.c:1016
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1059
+#: src/transport/plugin_transport_tcp.c:1063
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1193
+#: src/transport/plugin_transport_tcp.c:1197
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1427
+#: src/transport/plugin_transport_tcp.c:1466
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1532
+#: src/transport/plugin_transport_tcp.c:1571
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2021
+#: src/transport/plugin_transport_tcp.c:2060
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2189
+#: src/transport/plugin_transport_tcp.c:2211
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2253
+#: src/transport/plugin_transport_tcp.c:2275
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2407 src/util/service.c:589
+#: src/transport/plugin_transport_tcp.c:2429 src/util/service.c:589
 #: src/util/service.c:595
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2421
+#: src/transport/plugin_transport_tcp.c:2443
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2516
+#: src/transport/plugin_transport_tcp.c:2539
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2520
+#: src/transport/plugin_transport_tcp.c:2543
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2523
+#: src/transport/plugin_transport_tcp.c:2546
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7380,7 +7420,7 @@
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:690
+#: src/transport/transport_api.c:710
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
@@ -7793,35 +7833,35 @@
 msgid "Could not read hostkey file: %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/gnunet-ecc.c:286
+#: src/util/gnunet-ecc.c:283
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:341
+#: src/util/gnunet-ecc.c:349
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:344
+#: src/util/gnunet-ecc.c:352
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:347
+#: src/util/gnunet-ecc.c:355
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:350
+#: src/util/gnunet-ecc.c:358
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:353
+#: src/util/gnunet-ecc.c:361
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:356
+#: src/util/gnunet-ecc.c:364
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:367
+#: src/util/gnunet-ecc.c:375
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改配置文件中的一个值"
@@ -7923,17 +7963,17 @@
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:713
+#: src/util/os_installation.c:766
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/util/os_installation.c:773
+#: src/util/os_installation.c:826
 #, fuzzy, c-format
 msgid "CreateProcess failed for binary %s (%d).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/os_installation.c:783
+#: src/util/os_installation.c:836
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""

Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2014-02-03 21:07:23 UTC (rev 32173)
+++ gnunet/src/Makefile.am      2014-02-03 21:25:53 UTC (rev 32174)
@@ -6,7 +6,7 @@
  TESTING = testing
  TESTBED = testbed
  CONSENSUS = consensus
-# SECRETSHARING = secretsharing
+ SECRETSHARING = secretsharing
  EXPERIMENTATION = experimentation
 # SCALARPRODUCT = scalarproduct
 endif

Modified: gnunet/src/consensus/consensus.h
===================================================================
--- gnunet/src/consensus/consensus.h    2014-02-03 21:07:23 UTC (rev 32173)
+++ gnunet/src/consensus/consensus.h    2014-02-03 21:25:53 UTC (rev 32174)
@@ -41,30 +41,28 @@
    */
   struct GNUNET_MessageHeader header;
 
+  /**
+   * Number of peers (at the end of this message) that want to
+   * participate in the consensus.
+   */
   uint32_t num_peers GNUNET_PACKED;
 
-  struct GNUNET_HashCode session_id;
-
-  /* GNUNET_PeerIdentity[num_peers] */
-};
-
-
-struct GNUNET_CONSENSUS_ConcludeMessage
-{
   /**
-   * Type: GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE
+   * Session id of the consensus.
    */
-  struct GNUNET_MessageHeader header;
+  struct GNUNET_HashCode session_id;
 
   /**
-   * Padding, must be zero.
+   * Start time for the consensus.
    */
-  uint32_t reserved GNUNET_PACKED;
+  struct GNUNET_TIME_AbsoluteNBO start;
 
   /**
-   * Deadline for conclude
+   * Deadline for conclude.
    */
   struct GNUNET_TIME_AbsoluteNBO deadline;
+
+  /* GNUNET_PeerIdentity[num_peers] */
 };
 
 

Modified: gnunet/src/consensus/consensus_api.c
===================================================================
--- gnunet/src/consensus/consensus_api.c        2014-02-03 21:07:23 UTC (rev 
32173)
+++ gnunet/src/consensus/consensus_api.c        2014-02-03 21:25:53 UTC (rev 
32174)
@@ -156,6 +156,9 @@
  *              Inclusion of the local peer is optional.
  * @param session_id session identifier
  *                   Allows a group of peers to have more than consensus 
session.
+ * @param start start time of the consensus, conclude should be called before
+ *              the start time.
+ * @param deadline time when the consensus should have concluded
  * @param new_element_cb callback, called when a new element is added to the 
set by
  *                    another peer
  * @param new_element_cls closure for new_element
@@ -166,6 +169,8 @@
                         unsigned int num_peers,
                         const struct GNUNET_PeerIdentity *peers,
                          const struct GNUNET_HashCode *session_id,
+                         struct GNUNET_TIME_Absolute start,
+                         struct GNUNET_TIME_Absolute deadline,
                          GNUNET_CONSENSUS_ElementCallback new_element_cb,
                          void *new_element_cls)
 {
@@ -196,6 +201,8 @@
                             GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_JOIN);
 
   join_msg->session_id = consensus->session_id;
+  join_msg->start = GNUNET_TIME_absolute_hton (start);
+  join_msg->deadline = GNUNET_TIME_absolute_hton (deadline);
   join_msg->num_peers = htonl (num_peers);
   memcpy(&join_msg[1],
         peers,
@@ -266,12 +273,10 @@
  */
 void
 GNUNET_CONSENSUS_conclude (struct GNUNET_CONSENSUS_Handle *consensus,
-                          struct GNUNET_TIME_Absolute deadline,
                           GNUNET_CONSENSUS_ConcludeCallback conclude,
                           void *conclude_cls)
 {
   struct GNUNET_MQ_Envelope *ev;
-  struct GNUNET_CONSENSUS_ConcludeMessage *conclude_msg;
 
   GNUNET_assert (NULL != conclude);
   GNUNET_assert (NULL == consensus->conclude_cb);
@@ -279,9 +284,7 @@
   consensus->conclude_cls = conclude_cls;
   consensus->conclude_cb = conclude;
 
-  ev = GNUNET_MQ_msg (conclude_msg, 
GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE);
-  conclude_msg->deadline = GNUNET_TIME_absolute_hton (deadline);
-
+  ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE);
   GNUNET_MQ_send (consensus->mq, ev);
 }
 

Modified: gnunet/src/consensus/gnunet-consensus-profiler.c
===================================================================
--- gnunet/src/consensus/gnunet-consensus-profiler.c    2014-02-03 21:07:23 UTC 
(rev 32173)
+++ gnunet/src/consensus/gnunet-consensus-profiler.c    2014-02-03 21:25:53 UTC 
(rev 32174)
@@ -25,6 +25,7 @@
  */
 #include "platform.h"
 #include "gnunet_util_lib.h"
+#include "gnunet_time_lib.h"
 #include "gnunet_consensus_service.h"
 #include "gnunet_testbed_service.h"
 
@@ -56,8 +57,18 @@
 
 static int verbose;
 
+/**
+ * Start time for all consensuses.
+ */
+static struct GNUNET_TIME_Absolute start;
 
 /**
+ * Deadline for all consensuses.
+ */
+static struct GNUNET_TIME_Absolute deadline;
+
+
+/**
  * Signature of the event handler function called by the
  * respective event controller.
  *
@@ -172,7 +183,6 @@
 
   for (i = 0; i < num_peers; i++)
     GNUNET_CONSENSUS_conclude (consensus_handles[i],
-                               GNUNET_TIME_relative_to_absolute 
(conclude_timeout),
                                conclude_cb, &consensus_handles[i]);
 }
 
@@ -259,6 +269,8 @@
   consensus = GNUNET_CONSENSUS_create (cfg,
                                        num_peers, peer_ids,
                                        &session_id,
+                                       start,
+                                       deadline,
                                        &new_element_cb, chp);
   *chp = (struct GNUNET_CONSENSUS_Handle *) consensus;
   return consensus;
@@ -396,6 +408,9 @@
     return;
   }
 
+  start = GNUNET_TIME_absolute_get ();
+  deadline = GNUNET_TIME_absolute_add (start, conclude_timeout);
+
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
               "running gnunet-consensus\n");
 

Modified: gnunet/src/consensus/gnunet-service-consensus.c
===================================================================
--- gnunet/src/consensus/gnunet-service-consensus.c     2014-02-03 21:07:23 UTC 
(rev 32173)
+++ gnunet/src/consensus/gnunet-service-consensus.c     2014-02-03 21:25:53 UTC 
(rev 32174)
@@ -142,6 +142,11 @@
   struct GNUNET_MQ_Handle *client_mq;
 
   /**
+   * Time when the conclusion of the consensus should begin.
+   */
+  struct GNUNET_TIME_Absolute conclude_start;
+
+  /**
    * Timeout for all rounds together, single rounds will schedule a timeout 
task
    * with a fraction of the conclude timeout.
    * Only valid once the current round is not CONSENSUS_ROUND_BEGIN.
@@ -1039,6 +1044,9 @@
     other_session = other_session->next;
   }
 
+  session->conclude_deadline = GNUNET_TIME_absolute_ntoh (join_msg->deadline);
+  session->conclude_start = GNUNET_TIME_absolute_ntoh (join_msg->start);
+
   session->local_peer_idx = get_peer_idx (&my_peer, session);
   GNUNET_assert (-1 != session->local_peer_idx);
   session->element_set = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_UNION);
@@ -1168,11 +1176,8 @@
                  const struct GNUNET_MessageHeader *message)
 {
   struct ConsensusSession *session;
-  struct GNUNET_CONSENSUS_ConcludeMessage *cmsg;
 
-
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "conclude requested\n");
-  cmsg = (struct GNUNET_CONSENSUS_ConcludeMessage *) message;
   session = get_session_by_client (client);
   if (NULL == session)
   {
@@ -1194,7 +1199,6 @@
   }
   else
   {
-    session->conclude_deadline = GNUNET_TIME_absolute_ntoh (cmsg->deadline);
     /* the 'begin' round is over, start with the next, actual round */
     round_over (session, NULL);
   }
@@ -1257,7 +1261,7 @@
 {
   static const struct GNUNET_SERVER_MessageHandler server_handlers[] = {
     {&client_conclude, NULL, GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_CONCLUDE,
-        sizeof (struct GNUNET_CONSENSUS_ConcludeMessage)},
+        sizeof (struct GNUNET_MessageHeader)},
     {&client_insert, NULL, GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_INSERT, 0},
     {&client_join, NULL, GNUNET_MESSAGE_TYPE_CONSENSUS_CLIENT_JOIN, 0},
     {NULL, NULL, 0, 0}

Modified: gnunet/src/include/gnunet_consensus_service.h
===================================================================
--- gnunet/src/include/gnunet_consensus_service.h       2014-02-03 21:07:23 UTC 
(rev 32173)
+++ gnunet/src/include/gnunet_consensus_service.h       2014-02-03 21:25:53 UTC 
(rev 32174)
@@ -72,6 +72,9 @@
  *              Inclusion of the local peer is optional.
  * @param session_id session identifier
  *                   Allows a group of peers to have more than consensus 
session.
+ * @param start start time of the consensus, conclude should be called before
+ *              the start time.
+ * @param deadline time when the consensus should have concluded
  * @param new_element_cb callback, called when a new element is added to the 
set by
  *                    another peer. Also called when an error occurs.
  * @param new_element_cls closure for new_element
@@ -82,6 +85,8 @@
                          unsigned int num_peers,
                          const struct GNUNET_PeerIdentity *peers,
                          const struct GNUNET_HashCode *session_id,
+                         struct GNUNET_TIME_Absolute start,
+                         struct GNUNET_TIME_Absolute deadline,
                          GNUNET_CONSENSUS_ElementCallback new_element_cb,
                          void *new_element_cls);
 
@@ -135,14 +140,11 @@
  * try to conclude the consensus within a given time window.
  *
  * @param consensus consensus session
- * @param deadline deadline after which the conculde callback
- *                 whill be called
  * @param conclude called when the conclusion was successful
  * @param conclude_cls closure for the conclude callback
  */
 void
 GNUNET_CONSENSUS_conclude (struct GNUNET_CONSENSUS_Handle *consensus,
-                           struct GNUNET_TIME_Absolute deadline,
                            GNUNET_CONSENSUS_ConcludeCallback conclude,
                            void *conclude_cls);
 

Modified: gnunet/src/include/gnunet_secretsharing_service.h
===================================================================
--- gnunet/src/include/gnunet_secretsharing_service.h   2014-02-03 21:07:23 UTC 
(rev 32173)
+++ gnunet/src/include/gnunet_secretsharing_service.h   2014-02-03 21:25:53 UTC 
(rev 32174)
@@ -190,6 +190,8 @@
  * @param num_peers number of peers in 'peers'
  * @param peers array of peers that we will share secrets with, can optionally 
contain the local peer
  * @param session_id unique session id
+ * @param start When should all peers be available for sharing the secret?
+ *              Random number generation can take place before the start time.
  * @param deadline point in time where the session must be established; taken 
as hint
  *                 by underlying consensus sessions
  * @param threshold minimum number of peers that must cooperate to decrypt a 
value
@@ -201,6 +203,7 @@
                                      unsigned int num_peers,
                                      const struct GNUNET_PeerIdentity *peers,
                                      const struct GNUNET_HashCode *session_id,
+                                     struct GNUNET_TIME_Absolute start,
                                      struct GNUNET_TIME_Absolute deadline,
                                      unsigned int threshold,
                                      GNUNET_SECRETSHARING_SecretReadyCallback 
cb,
@@ -247,6 +250,7 @@
  * @param share our secret share to use for decryption
  * @param ciphertext ciphertext to publish in order to decrypt it (if enough 
peers agree)
  * @param decrypt_cb callback called once the decryption succeeded
+ * @param start By when should the cooperation for decryption start?
  * @param deadline By when should the decryption be finished?
  * @param decrypt_cb_cls closure for @a decrypt_cb
  * @return handle to cancel the operation
@@ -255,6 +259,7 @@
 GNUNET_SECRETSHARING_decrypt (const struct GNUNET_CONFIGURATION_Handle *cfg,
                               struct GNUNET_SECRETSHARING_Share *share,
                               const struct GNUNET_SECRETSHARING_Ciphertext 
*ciphertext,
+                              struct GNUNET_TIME_Absolute start,
                               struct GNUNET_TIME_Absolute deadline,
                               GNUNET_SECRETSHARING_DecryptCallback decrypt_cb,
                               void *decrypt_cb_cls);

Modified: gnunet/src/secretsharing/gnunet-secretsharing-profiler.c
===================================================================
--- gnunet/src/secretsharing/gnunet-secretsharing-profiler.c    2014-02-03 
21:07:23 UTC (rev 32173)
+++ gnunet/src/secretsharing/gnunet-secretsharing-profiler.c    2014-02-03 
21:25:53 UTC (rev 32174)
@@ -49,6 +49,11 @@
 static struct GNUNET_TIME_Relative timeout;
 
 /**
+ * When should dkg communication start?
+ */
+static struct GNUNET_TIME_Relative delay;
+
+/**
  * Handles for secretsharing sessions.
  */
 static struct GNUNET_SECRETSHARING_Session **session_handles;
@@ -85,11 +90,20 @@
 
 static int verbose;
 
-struct GNUNET_SECRETSHARING_Plaintext reference_plaintext;
+static struct GNUNET_SECRETSHARING_Plaintext reference_plaintext;
 
-struct GNUNET_SECRETSHARING_Ciphertext ciphertext;
+static struct GNUNET_SECRETSHARING_Ciphertext ciphertext;
 
+static struct GNUNET_TIME_Absolute dkg_start;
 
+static struct GNUNET_TIME_Absolute dkg_deadline;
+
+
+static struct GNUNET_TIME_Absolute decrypt_start;
+
+static struct GNUNET_TIME_Absolute decrypt_deadline;
+
+
 /**
  * Signature of the event handler function called by the
  * respective event controller.
@@ -236,7 +250,7 @@
               "decrypt connect adapter, %d peers\n",
               num_peers);
   *hp = GNUNET_SECRETSHARING_decrypt (cfg, shares[n], &ciphertext,
-                                      GNUNET_TIME_relative_to_absolute 
(GNUNET_TIME_UNIT_MINUTES),
+                                      decrypt_start, decrypt_deadline,
                                       decrypt_cb,
                                       hp);
 
@@ -315,6 +329,10 @@
       return;
     }
 
+    decrypt_start = GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (), 
delay);
+    decrypt_deadline = GNUNET_TIME_absolute_add (decrypt_start, timeout);
+
+
     // compute g^42
     GNUNET_SECRETSHARING_plaintext_generate_i (&reference_plaintext, 42);
     GNUNET_SECRETSHARING_encrypt (&common_pubkey, &reference_plaintext, 
&ciphertext);
@@ -350,7 +368,8 @@
                                              num_peers,
                                              peer_ids,
                                              &session_id,
-                                             GNUNET_TIME_relative_to_absolute 
(timeout),
+                                             dkg_start,
+                                             dkg_deadline,
                                              threshold,
                                              &secret_ready_cb, sp);
   return *sp;
@@ -471,6 +490,9 @@
   char *topology;
   int topology_cmp_result;
 
+  dkg_start = GNUNET_TIME_absolute_add (GNUNET_TIME_absolute_get (), delay);
+  dkg_deadline = GNUNET_TIME_absolute_add (dkg_start, timeout);
+
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, "testbed", 
"OVERLAY_TOPOLOGY", &topology))
   {
     fprintf (stderr,
@@ -513,6 +535,9 @@
       { 'n', "num-peers", NULL,
         gettext_noop ("number of peers in consensus"),
         GNUNET_YES, &GNUNET_GETOPT_set_uint, &num_peers },
+      { 'D', "delay", NULL,
+        gettext_noop ("dkg start delay"),
+        GNUNET_YES, &GNUNET_GETOPT_set_relative_time, &delay },
       { 't', "timeout", NULL,
         gettext_noop ("dkg timeout"),
         GNUNET_YES, &GNUNET_GETOPT_set_relative_time, &timeout },
@@ -527,7 +552,8 @@
         GNUNET_NO, &GNUNET_GETOPT_set_one, &verbose },
       GNUNET_GETOPT_OPTION_END
   };
-  timeout = GNUNET_TIME_UNIT_SECONDS;
+  delay = GNUNET_TIME_UNIT_ZERO;
+  timeout = GNUNET_TIME_UNIT_MINUTES;
   GNUNET_PROGRAM_run2 (argc, argv, "gnunet-secretsharing-profiler",
                      "help",
                      options, &run, NULL, GNUNET_YES);

Modified: gnunet/src/secretsharing/gnunet-service-secretsharing.c
===================================================================
--- gnunet/src/secretsharing/gnunet-service-secretsharing.c     2014-02-03 
21:07:23 UTC (rev 32173)
+++ gnunet/src/secretsharing/gnunet-service-secretsharing.c     2014-02-03 
21:25:53 UTC (rev 32174)
@@ -238,6 +238,11 @@
   struct GNUNET_MQ_Handle *client_mq;
 
   /**
+   * When should we start communicating for decryption?
+   */
+  struct GNUNET_TIME_Absolute start;
+
+  /**
    * When would we like the ciphertext to be
    * decrypted?
    */
@@ -814,8 +819,8 @@
 
   element_size = (sizeof (struct GNUNET_SECRETSHARING_KeygenRevealData) +
                   GNUNET_SECRETSHARING_ELGAMAL_BITS / 8 * ks->num_peers +
-                  GNUNET_SECRETSHARING_ELGAMAL_BITS / 8 * ks->threshold +
-                  GNUNET_CRYPTO_PAILLIER_BITS * 2 / 8 * ks->num_peers);
+                  sizeof (struct GNUNET_CRYPTO_PaillierCiphertext) * 
ks->num_peers +
+                  GNUNET_SECRETSHARING_ELGAMAL_BITS / 8 * ks->threshold);
 
   element = GNUNET_malloc (sizeof (struct GNUNET_SET_Element) + element_size);
   element->size = element_size;
@@ -857,13 +862,11 @@
     memset (ciphertext, 0, sizeof *ciphertext);
     if (GNUNET_YES == ks->info[i].round1_valid)
     {
-      struct GNUNET_CRYPTO_PaillierPlaintext plaintext;
       gcry_mpi_set_ui (idx, i + 1);
       // evaluate the polynomial
       horner_eval (v, ks->presecret_polynomial, ks->threshold, idx, elgamal_q);
-      GNUNET_CRYPTO_mpi_print_unsigned (&plaintext, sizeof plaintext, v);
       // encrypt the result
-      GNUNET_CRYPTO_paillier_encrypt (&ks->info[i].paillier_public_key, 
&plaintext, ciphertext);
+      GNUNET_CRYPTO_paillier_encrypt (&ks->info[i].paillier_public_key, v, 
ciphertext);
     }
     pos += sizeof *ciphertext;
   }
@@ -904,7 +907,6 @@
   const struct GNUNET_SECRETSHARING_KeygenRevealData *d;
   struct KeygenPeerInfo *info;
   unsigned char *pos;
-  struct GNUNET_CRYPTO_PaillierPlaintext plaintext;
   size_t expected_element_size;
 
   if (NULL == element)
@@ -915,7 +917,7 @@
 
   expected_element_size = (sizeof (struct 
GNUNET_SECRETSHARING_KeygenRevealData) +
                   GNUNET_SECRETSHARING_ELGAMAL_BITS / 8 * ks->num_peers +
-                  GNUNET_CRYPTO_PAILLIER_BITS / 8 * 2 * ks->num_peers +
+                  sizeof (struct GNUNET_CRYPTO_PaillierCiphertext) * 
ks->num_peers +
                   GNUNET_SECRETSHARING_ELGAMAL_BITS / 8 * ks->threshold);
 
   if (element->size != expected_element_size)
@@ -960,7 +962,7 @@
   // skip exponentiated pre-shares
   pos += GNUNET_SECRETSHARING_ELGAMAL_BITS / 8 * ks->num_peers;
   // skip encrypted pre-shares
-  pos += GNUNET_CRYPTO_PAILLIER_BITS * 2 / 8 * ks->num_peers;
+  pos += sizeof (struct GNUNET_CRYPTO_PaillierCiphertext) * ks->num_peers;
   // the first exponentiated coefficient is the public key share
   GNUNET_CRYPTO_mpi_scan_unsigned (&info->public_key_share, pos, 
GNUNET_SECRETSHARING_ELGAMAL_BITS / 8);
 
@@ -968,12 +970,11 @@
   // skip exp. pre-shares
   pos += GNUNET_SECRETSHARING_ELGAMAL_BITS / 8 * ks->num_peers;
   // skip to the encrypted value for our peer
-  pos += GNUNET_CRYPTO_PAILLIER_BITS * 2 / 8 * ks->local_peer_idx;
+  pos += sizeof (struct GNUNET_CRYPTO_PaillierCiphertext) * ks->local_peer_idx;
 
+  GNUNET_assert (NULL != (info->decrypted_preshare = gcry_mpi_new (0)));
   GNUNET_CRYPTO_paillier_decrypt (&ks->paillier_private_key, 
&ks->info[ks->local_peer_idx].paillier_public_key,
-                                  (struct GNUNET_CRYPTO_PaillierCiphertext *) 
pos, &plaintext);
-  GNUNET_CRYPTO_mpi_scan_unsigned (&info->decrypted_preshare, &plaintext,
-                                   sizeof plaintext);
+                                  (struct GNUNET_CRYPTO_PaillierCiphertext *) 
pos, info->decrypted_preshare);
 
   // TODO: validate zero knowledge proofs
 
@@ -1009,13 +1010,13 @@
   GNUNET_CONSENSUS_destroy (ks->consensus);
 
   ks->consensus = GNUNET_CONSENSUS_create (cfg, ks->num_peers, ks->peers, 
&ks->session_id,
+                                           time_between (ks->start_time, 
ks->deadline, 1, 2),
+                                           ks->deadline,
                                            keygen_round2_new_element, ks);
 
   insert_round2_element (ks);
 
   GNUNET_CONSENSUS_conclude (ks->consensus,
-                             /* last round, thus conclude at DKG deadline */
-                             ks->deadline,
                              keygen_round2_conclude,
                              ks);
 }
@@ -1104,6 +1105,8 @@
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "first round of consensus with %u 
peers\n", ks->num_peers);
   ks->consensus = GNUNET_CONSENSUS_create (cfg, ks->num_peers, ks->peers, 
&msg->session_id,
+                                           GNUNET_TIME_absolute_ntoh 
(msg->start),
+                                           GNUNET_TIME_absolute_ntoh 
(msg->deadline),
                                            keygen_round1_new_element, ks);
 
   ks->info = GNUNET_new_array (ks->num_peers, struct KeygenPeerInfo);
@@ -1125,8 +1128,6 @@
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: Concluding for round 1\n", 
ks->local_peer_idx);
 
   GNUNET_CONSENSUS_conclude (ks->consensus,
-                             /* half the overall time */
-                             time_between (ks->start_time, ks->deadline, 1, 2),
                              keygen_round1_conclude,
                              ks);
 
@@ -1259,6 +1260,9 @@
   gcry_mpi_t x;
   gcry_mpi_t s;
 
+  /* make vagrind happy until we implement the real deal ... */
+  memset (&d, 0, sizeof d);
+
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "P%u: Inserting decrypt element\n",
               ds->share->my_peer);
 
@@ -1273,11 +1277,6 @@
   element.size = sizeof (struct GNUNET_SECRETSHARING_DecryptData);
   element.type = 0;
 
-  /* make vagrind happy until we implement the real deal ... */
-  memset (&d.nizk_commit1, 0, sizeof d.nizk_commit1);
-  memset (&d.nizk_commit2, 0, sizeof d.nizk_commit2);
-  memset (&d.nizk_response, 0, sizeof d.nizk_response);
-
   d.ciphertext = ds->ciphertext;
   d.peer = my_peer;
   d.purpose.size = htonl (element.size - offsetof (struct 
GNUNET_SECRETSHARING_DecryptData, purpose));
@@ -1317,6 +1316,7 @@
   GNUNET_CONTAINER_DLL_insert (decrypt_sessions_head, decrypt_sessions_tail, 
ds);
   ds->client = client;
   ds->client_mq = GNUNET_MQ_queue_for_server_client (client);
+  ds->start = GNUNET_TIME_absolute_ntoh (msg->start);
   ds->deadline = GNUNET_TIME_absolute_ntoh (msg->deadline);
   ds->ciphertext = msg->ciphertext;
 
@@ -1331,6 +1331,8 @@
                                            ds->share->num_peers,
                                            ds->share->peers,
                                            &session_id,
+                                           ds->start,
+                                           ds->deadline,
                                            &decrypt_new_element,
                                            ds);
 
@@ -1344,7 +1346,7 @@
 
   insert_decrypt_element (ds);
 
-  GNUNET_CONSENSUS_conclude (ds->consensus, ds->deadline, decrypt_conclude, 
ds);
+  GNUNET_CONSENSUS_conclude (ds->consensus, decrypt_conclude, ds);
 
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 

Modified: gnunet/src/secretsharing/secretsharing.h
===================================================================
--- gnunet/src/secretsharing/secretsharing.h    2014-02-03 21:07:23 UTC (rev 
32173)
+++ gnunet/src/secretsharing/secretsharing.h    2014-02-03 21:25:53 UTC (rev 
32174)
@@ -57,6 +57,11 @@
   struct GNUNET_HashCode session_id GNUNET_PACKED;
 
   /**
+   * Start time for communication with the other peers.
+   */
+  struct GNUNET_TIME_AbsoluteNBO start;
+
+  /**
    * Deadline for the establishment of the crypto system.
    */
   struct GNUNET_TIME_AbsoluteNBO deadline;
@@ -131,6 +136,11 @@
   struct GNUNET_MessageHeader header;
 
   /**
+   * Until when should the decryption start?
+   */
+  struct GNUNET_TIME_AbsoluteNBO start;
+
+  /**
    * Until when should the decryption be finished?
    */
   struct GNUNET_TIME_AbsoluteNBO deadline;

Modified: gnunet/src/secretsharing/secretsharing_api.c
===================================================================
--- gnunet/src/secretsharing/secretsharing_api.c        2014-02-03 21:07:23 UTC 
(rev 32173)
+++ gnunet/src/secretsharing/secretsharing_api.c        2014-02-03 21:25:53 UTC 
(rev 32174)
@@ -174,6 +174,7 @@
                                      unsigned int num_peers,
                                      const struct GNUNET_PeerIdentity *peers,
                                      const struct GNUNET_HashCode *session_id,
+                                     struct GNUNET_TIME_Absolute start,
                                      struct GNUNET_TIME_Absolute deadline,
                                      unsigned int threshold,
                                      GNUNET_SECRETSHARING_SecretReadyCallback 
cb,
@@ -205,6 +206,7 @@
   msg->threshold = htons (threshold);
   msg->num_peers = htons (num_peers);
   msg->session_id = *session_id;
+  msg->start = GNUNET_TIME_absolute_hton (start);
   msg->deadline = GNUNET_TIME_absolute_hton (deadline);
   memcpy (&msg[1], peers, num_peers * sizeof (struct GNUNET_PeerIdentity));
 
@@ -253,6 +255,7 @@
 GNUNET_SECRETSHARING_decrypt (const struct GNUNET_CONFIGURATION_Handle *cfg,
                               struct GNUNET_SECRETSHARING_Share *share,
                               const struct GNUNET_SECRETSHARING_Ciphertext 
*ciphertext,
+                              struct GNUNET_TIME_Absolute start,
                               struct GNUNET_TIME_Absolute deadline,
                               GNUNET_SECRETSHARING_DecryptCallback decrypt_cb,
                               void *decrypt_cb_cls)
@@ -285,6 +288,7 @@
 
   GNUNET_assert (GNUNET_OK == GNUNET_SECRETSHARING_share_write (share, 
&msg[1], share_size, NULL));
 
+  msg->start = GNUNET_TIME_absolute_hton (start);
   msg->deadline = GNUNET_TIME_absolute_hton (deadline);
   msg->ciphertext = *ciphertext;
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r32174 - in gnunet: po src src/consensus src/include src/secretsharing, gnunet <=
Prev by Date: [GNUnet-SVN] r32173 - in gnunet-gtk: contrib src/fs
Next by Date: [GNUnet-SVN] r32175 - gnunet/src/ats-tests
Previous by thread: [GNUnet-SVN] r32173 - in gnunet-gtk: contrib src/fs
Next by thread: [GNUnet-SVN] r32175 - gnunet/src/ats-tests
Index(es):
- Date
- Thread