gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r16811 - gnunet/po


From: gnunet
Subject: [GNUnet-SVN] r16811 - gnunet/po
Date: Tue, 13 Sep 2011 14:44:25 +0200

Author: grothoff
Date: 2011-09-13 14:44:25 +0200 (Tue, 13 Sep 2011)
New Revision: 16811

Modified:
   gnunet/po/POTFILES.in
   gnunet/po/de.gmo
   gnunet/po/de.po
   gnunet/po/es.gmo
   gnunet/po/es.po
   gnunet/po/gnunet.pot
   gnunet/po/sv.gmo
   gnunet/po/sv.po
   gnunet/po/vi.gmo
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
Log:
updating po-files

Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2011-09-13 12:43:24 UTC (rev 16810)
+++ gnunet/po/POTFILES.in       2011-09-13 12:44:25 UTC (rev 16811)
@@ -116,6 +116,7 @@
 src/util/container_bloomfilter.c
 src/util/test_container_bloomfilter.c
 src/util/test_scheduler.c
+src/util/gnunet-config-diff.c
 src/util/test_time.c
 src/util/program.c
 src/util/client.c
@@ -207,6 +208,10 @@
 src/fs/gnunet-service-fs_push.c
 src/fs/test_fs_uri.c
 src/fs/test_fs_getopt.c
+src/ats/ats_api.c
+src/ats/test_ats_api_update_address.c
+src/ats/test_ats_api.c
+src/ats/gnunet-service-transport_ats.c
 src/block/plugin_block_template.c
 src/block/test_block.c
 src/block/plugin_block_fs.c
@@ -215,7 +220,10 @@
 src/block/block.c
 src/block/plugin_block_test.c
 src/mesh/mesh_api_new.c
+src/mesh/test_mesh_local_1.c
 src/mesh/test_mesh_api.c
+src/mesh/test_mesh_local_2.c
+src/mesh/test_mesh_small.c
 src/mesh/gnunet-service-mesh.c
 src/mesh/mesh_api.c
 src/template/gnunet-template.c
@@ -246,6 +254,7 @@
 src/dht/dht_api_get_put.c
 src/dht/gnunet-service-dht.c
 src/dht/plugin_dhtlog_mysql_dump_load.c
+src/dht/test_dht_twopeer_get_put.c
 src/dht/gnunet-dht-put.c
 src/dht/gnunet-dht-get.c
 src/dht/test_dht_api.c
@@ -253,7 +262,11 @@
 src/dht/plugin_dhtlog_mysql.c
 src/transport/test_plugin_transport_udp.c
 src/transport/plugin_transport_wlan.c
+src/transport/gnunet-service-transport_clients.c
 src/transport/transport_api_peer_address_lookup.c
+src/transport/gnunet-service-transport_neighbours.c
+src/transport/gnunet-transport-connect-running-peers.c
+src/transport/gnunet-service-transport_plugins.c
 src/transport/test_plugin_transport_https.c
 src/transport/test_transport_api.c
 src/transport/test_quota_compliance.c
@@ -261,14 +274,16 @@
 src/transport/gnunet-transport.c
 src/transport/plugin_transport_template.c
 src/transport/test_transport_api_multiaddress.c
-src/transport/perf_transport_ats.c
 src/transport/test_plugin_transport.c
-src/transport/test_transport_ats_multiple_peers.c
+src/transport/test_transport_startonly.c
+src/transport/test_transport_api_disconnect.c
+src/transport/transport-testing.c
+src/transport/gnunet-service-transport_hello.c
 src/transport/plugin_transport_http.c
-src/transport/test_transport_ats.c
 src/transport/gnunet-service-transport.c
 src/transport/test_transport_api_reliability.c
 src/transport/transport_api_address_lookup.c
+src/transport/gnunet-transport-certificate-creation.c
 src/transport/test_transport_api_unreliability.c
 src/transport/plugin_transport_tcp.c
 src/transport/gnunet-transport-wlan-helper.c
@@ -276,13 +291,16 @@
 src/transport/wlan/radiotap-parser.c
 src/transport/wlan/helper_common.c
 src/transport/test_plugin_transport_wlan_dummy.c
+src/transport/gnunet-service-transport_validation.c
+src/transport/test_transport_testing.c
 src/transport/plugin_transport_smtp.c
 src/transport/test_plugin_transport_http.c
-src/transport/gnunet-service-transport_ats.c
+src/transport/test_transport_api_limited_sockets.c
 src/transport/plugin_transport_udp.c
 src/transport/transport_api_blacklist.c
 src/transport/transport_api.c
 src/transport/plugin_transport_unix.c
+src/transport/gnunet-service-transport_blacklist.c
 src/chat/chat.c
 src/chat/test_chat_private.c
 src/chat/gnunet-chat.c
@@ -306,9 +324,9 @@
 src/dv/gnunet-service-dv.c
 src/nse/test_nse_api.c
 src/nse/nse_api.c
-src/nse/nse-profiler.c
 src/nse/gnunet-service-nse.c
 src/nse/test_nse_multipeer.c
+src/nse/gnunet-nse-profiler.c
 src/core/gnunet-service-core.c
 src/core/core_api_iterate_peers.c
 src/core/test_core_api_reliability.c
@@ -319,6 +337,9 @@
 src/core/test_core_api_send_to_self.c
 src/core/core_api.c
 src/core/test_core_api_preferences.c
+src/ats-test/perf_transport_ats.c
+src/ats-test/test_transport_ats_multiple_peers.c
+src/ats-test/test_transport_ats.c
 src/fragmentation/fragmentation.h
 src/nat/nat.h
 src/vpn/gnunet-daemon-vpn-helper.h
@@ -354,6 +375,7 @@
 src/include/gnunet_mesh_service.h
 src/include/gnunet_nat_lib.h
 src/include/gnunet_bandwidth_lib.h
+src/include/gnunet_ats_service.h
 src/include/gnunet_program_lib.h
 src/include/block_dns.h
 src/include/gnunet_nse_service.h
@@ -395,6 +417,7 @@
 src/include/gnunet_service_lib.h
 src/include/gnunet_statistics_service.h
 src/include/gnunet_peer_lib.h
+src/util/.#resolver.h
 src/util/resolver.h
 src/util/disk.h
 src/fs/gnunet-service-fs_indexing.h
@@ -408,18 +431,32 @@
 src/fs/gnunet-service-fs.h
 src/fs/gnunet-service-fs_lc.h
 src/fs/gnunet-service-fs_push.h
+src/ats/gnunet-service-transport_ats.h
 src/mesh/mesh.h
 src/mesh/mesh_protocol.h
 src/arm/gnunet-service-arm.h
 src/arm/arm.h
 src/dht/dhtlog.h
 src/dht/dht.h
+src/transport/gnunet-service-transport.h
+src/transport/gnunet-service-transport_hello.h
 src/transport/transport-testing.h
+src/transport/gnunet-service-transport_clients.h
+src/transport/gnunet-service-transport_validation.h
 src/transport/transport.h
+src/transport/gnunet-service-transport_neighbours.h
 src/transport/ieee80211_radiotap.h
+src/transport/wlan/byteorder.h
+src/transport/wlan/loopback_helper.h
+src/transport/wlan/crctable_osdep.h
+src/transport/wlan/ieee80211.h
+src/transport/wlan/ieee80211_radiotap.h
+src/transport/wlan/radiotap-parser.h
+src/transport/wlan/helper_common.h
 src/transport/gnunet-transport-wlan-helper.h
 src/transport/plugin_transport_wlan.h
-src/transport/gnunet-service-transport_ats.h
+src/transport/gnunet-service-transport_blacklist.h
+src/transport/gnunet-service-transport_plugins.h
 src/chat/chat.h
 src/datastore/datastore.h
 src/dv/dv.h

Modified: gnunet/po/de.gmo
===================================================================
(Binary files differ)

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2011-09-13 12:43:24 UTC (rev 16810)
+++ gnunet/po/de.po     2011-09-13 12:44:25 UTC (rev 16811)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-07-19 15:16+0200\n"
+"POT-Creation-Date: 2011-09-13 14:44+0200\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -17,274 +17,274 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/fragmentation/defragmentation.c:274
+#: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:457
+#: src/fragmentation/defragmentation.c:454
 #, fuzzy
 msgid "# fragments received"
 msgstr "# verworfener Nachrichten"
 
-#: src/fragmentation/defragmentation.c:521
+#: src/fragmentation/defragmentation.c:513
 #, fuzzy
 msgid "# duplicate fragments received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fragmentation/defragmentation.c:545
+#: src/fragmentation/defragmentation.c:532
 msgid "# messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/fragmentation/fragmentation.c:181
+#: src/fragmentation/fragmentation.c:183
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/fragmentation/fragmentation.c:185
+#: src/fragmentation/fragmentation.c:186
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Selbstbekanntmachungen übertragen"
 
-#: src/fragmentation/fragmentation.c:249
+#: src/fragmentation/fragmentation.c:248
 msgid "# messages fragmented"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/fragmentation/fragmentation.c:254
+#: src/fragmentation/fragmentation.c:251
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:336
+#: src/fragmentation/fragmentation.c:335
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/fragmentation/fragmentation.c:343
+#: src/fragmentation/fragmentation.c:341
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:358
+#: src/fragmentation/fragmentation.c:365
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/nat/nat.c:823
+#: src/nat/nat.c:778
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:884
+#: src/nat/nat.c:828
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/nat/nat.c:1185 src/nat/nat.c:1207
+#: src/nat/nat.c:1096 src/nat/nat.c:1113
 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/nat/nat.c:1276 src/nat/nat.c:1284
+#: src/nat/nat.c:1167 src/nat/nat.c:1177
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1422
+#: src/nat/nat.c:1309
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1440
+#: src/nat/nat.c:1321
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:317
+#: src/nat/gnunet-nat-server.c:290
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:361
+#: src/nat/gnunet-nat-server.c:329
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_test.c:376
+#: src/nat/nat_test.c:348
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nat/nat_test.c:451
+#: src/nat/nat_test.c:418
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:772 src/vpn/gnunet-daemon-exit.c:1280
-#: src/template/gnunet-template.c:72 src/core/test_core_api_send_to_self.c:216
+#: src/vpn/gnunet-daemon-vpn.c:1275 src/vpn/gnunet-daemon-exit.c:1455
+#: src/template/gnunet-template.c:68 src/core/test_core_api_send_to_self.c:217
 #, fuzzy
 msgid "help text"
 msgstr "Hilfetext für -t"
 
-#: src/datacache/datacache.c:110 src/datacache/datacache.c:255
-#: src/datastore/gnunet-service-datastore.c:888
+#: src/datacache/datacache.c:108 src/datacache/datacache.c:236
+#: src/datastore/gnunet-service-datastore.c:821
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# bytes in der Datenbank"
 
-#: src/datacache/datacache.c:138 src/datacache/datacache.c:149
-#: src/datastore/gnunet-service-datastore.c:1442
-#: src/datastore/gnunet-service-datastore.c:1641
-#: src/datastore/test_plugin_datastore.c:209
-#: src/datastore/test_plugin_datastore.c:352
-#: src/datastore/perf_plugin_datastore.c:340
-#: src/datastore/perf_plugin_datastore.c:458
+#: src/datacache/datacache.c:134 src/datacache/datacache.c:142
+#: src/datastore/gnunet-service-datastore.c:1292
+#: src/datastore/gnunet-service-datastore.c:1483
+#: src/datastore/test_plugin_datastore.c:192
+#: src/datastore/test_plugin_datastore.c:315
+#: src/datastore/perf_plugin_datastore.c:309
+#: src/datastore/perf_plugin_datastore.c:413
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/datacache/datacache.c:178
+#: src/datacache/datacache.c:167
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:186
+#: src/datacache/datacache.c:176
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/datacache/datacache.c:285
+#: src/datacache/datacache.c:262
 #, fuzzy
 msgid "# requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datacache/datacache.c:292
+#: src/datacache/datacache.c:268
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/plugin_datacache_template.c:126
+#: src/datacache/plugin_datacache_template.c:121
 msgid "Template datacache running\n"
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:66
 #: src/datacache/plugin_datacache_sqlite.c:69
-#: src/datacache/plugin_datacache_sqlite.c:126
-#: src/datacache/plugin_datacache_sqlite.c:201
-#: src/datacache/plugin_datacache_sqlite.c:248
-#: src/datacache/plugin_datacache_sqlite.c:322
-#: src/datacache/plugin_datacache_sqlite.c:331
-#: src/datacache/plugin_datacache_sqlite.c:345
+#: src/datacache/plugin_datacache_sqlite.c:122
+#: src/datacache/plugin_datacache_sqlite.c:191
+#: src/datacache/plugin_datacache_sqlite.c:232
+#: src/datacache/plugin_datacache_sqlite.c:296
+#: src/datacache/plugin_datacache_sqlite.c:305
+#: src/datacache/plugin_datacache_sqlite.c:318
+#: src/datacache/plugin_datacache_sqlite.c:325
+#: src/datacache/plugin_datacache_sqlite.c:338
+#: src/datacache/plugin_datacache_sqlite.c:346
 #: src/datacache/plugin_datacache_sqlite.c:354
-#: src/datacache/plugin_datacache_sqlite.c:374
-#: src/datacache/plugin_datacache_sqlite.c:383
-#: src/datacache/plugin_datacache_sqlite.c:394
 #: src/datacache/plugin_datacache_mysql.c:103
 #: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:518
-#: src/datacache/plugin_datacache_mysql.c:527
-#: src/datacache/plugin_datacache_mysql.c:603
-#: src/datacache/plugin_datacache_mysql.c:619 src/util/crypto_rsa.c:84
-#: src/util/crypto_ksk.c:47 src/dht/plugin_dhtlog_mysql.c:583
-#: src/dht/plugin_dhtlog_mysql.c:592 src/dht/plugin_dhtlog_mysql.c:652
-#: src/dht/plugin_dhtlog_mysql.c:667
+#: src/datacache/plugin_datacache_mysql.c:517
+#: src/datacache/plugin_datacache_mysql.c:526
+#: src/datacache/plugin_datacache_mysql.c:598
+#: src/datacache/plugin_datacache_mysql.c:614 src/util/crypto_rsa.c:84
+#: src/util/crypto_ksk.c:47 src/dht/plugin_dhtlog_mysql.c:581
+#: src/dht/plugin_dhtlog_mysql.c:590 src/dht/plugin_dhtlog_mysql.c:648
+#: src/dht/plugin_dhtlog_mysql.c:663
 #: src/datastore/plugin_datastore_sqlite.c:61
 #: src/datastore/plugin_datastore_mysql.c:139
 #: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:599
-#: src/datastore/plugin_datastore_mysql.c:661
-#: src/datastore/plugin_datastore_mysql.c:673 src/include/gnunet_common.h:319
+#: src/datastore/plugin_datastore_mysql.c:613
+#: src/datastore/plugin_datastore_mysql.c:673
+#: src/datastore/plugin_datastore_mysql.c:685 src/include/gnunet_common.h:324
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:461
+#: src/datacache/plugin_datacache_sqlite.c:419
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:496
-#: src/datastore/plugin_datastore_sqlite.c:381
+#: src/datacache/plugin_datacache_sqlite.c:454
+#: src/datastore/plugin_datastore_sqlite.c:405
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:81
-#: src/datastore/plugin_datastore_postgres.c:95
+#: src/datacache/plugin_datacache_postgres.c:79
+#: src/datastore/plugin_datastore_postgres.c:93
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/datacache/plugin_datacache_postgres.c:154
+#: src/datacache/plugin_datacache_postgres.c:149
 #, fuzzy, c-format
 msgid "Unable to initialize Postgres: %s"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/datacache/plugin_datacache_postgres.c:557
+#: src/datacache/plugin_datacache_postgres.c:500
 msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:220
-#: src/datastore/plugin_datastore_mysql.c:297
+#: src/datacache/plugin_datacache_mysql.c:224
+#: src/datastore/plugin_datastore_mysql.c:316
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
 
-#: src/datacache/plugin_datacache_mysql.c:227
-#: src/datastore/plugin_datastore_mysql.c:304
+#: src/datacache/plugin_datacache_mysql.c:230
+#: src/datastore/plugin_datastore_mysql.c:322
 #, fuzzy, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/datacache/plugin_datacache_mysql.c:1061
+#: src/datacache/plugin_datacache_mysql.c:979
 msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1801 src/testing/testing_group.c:1814
-#: src/testing/testing_group.c:1920 src/testing/testing_group.c:1981
-#: src/testing/testing_group.c:2070 src/testing/testing_group.c:2092
-#: src/testing/testing_group.c:2231 src/testing/test_testing_topology.c:1104
-#: src/testing/test_testing_topology_blacklist.c:457
-#: src/testing/testing_peergroup.c:856
-#: src/testing/test_testing_large_topology.c:1046
-#: src/dht/test_dht_multipeer.c:833 src/dht/gnunet-dht-driver.c:4001
-#: src/dv/test_transport_api_dv.c:1102
+#: src/testing/testing_group.c:1903 src/testing/testing_group.c:1915
+#: src/testing/testing_group.c:2016 src/testing/testing_group.c:2075
+#: src/testing/testing_group.c:2164 src/testing/testing_group.c:2184
+#: src/testing/testing_group.c:2321 src/testing/test_testing_topology.c:1078
+#: src/testing/test_testing_topology_blacklist.c:448
+#: src/testing/testing_peergroup.c:876
+#: src/testing/test_testing_large_topology.c:1022
+#: src/dht/test_dht_multipeer.c:864 src/dht/gnunet-dht-driver.c:3907
+#: src/dv/test_transport_api_dv.c:1132
 #, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1824
+#: src/testing/testing_group.c:1925
 #, fuzzy, c-format
 msgid "Target is %d connections per peer."
 msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
-#: src/testing/testing_group.c:2079
+#: src/testing/testing_group.c:2172
 #, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2111 src/testing/testing_group.c:2307
+#: src/testing/testing_group.c:2202 src/testing/testing_group.c:2395
 #, c-format
 msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2148
+#: src/testing/testing_group.c:2239
 #, c-format
 msgid "natural log of %d is %d, will run %d iterations\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2151
+#: src/testing/testing_group.c:2242
 #, c-format
 msgid "Total connections added thus far: %u!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2193
+#: src/testing/testing_group.c:2283
 #, c-format
 msgid "Total connections added for small world: %d!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2246
+#: src/testing/testing_group.c:2335
 #, c-format
 msgid "rand is %f probability is %f\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2824 src/testing/testing_group.c:3035
+#: src/testing/testing_group.c:2910 src/testing/testing_group.c:3109
 #, fuzzy, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
@@ -293,374 +293,375 @@
 "Option `%s' ist in der Konfigurationsdatei in der Sektion `%s' nicht "
 "gesetzt, sie wird auf %dm gesetzt.\n"
 
-#: src/testing/testing_group.c:2935
+#: src/testing/testing_group.c:3011
 msgid "Finished copying all friend files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3051
+#: src/testing/testing_group.c:3124
 #, fuzzy, c-format
 msgid "Copying file with command cp %s %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/testing/testing_group.c:3074
+#: src/testing/testing_group.c:3147
 #, c-format
 msgid "Copying file with command scp %s %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3092
+#: src/testing/testing_group.c:3164
 #, c-format
 msgid "Checking copy status of file %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3111
+#: src/testing/testing_group.c:3182
 #, c-format
 msgid "File %d copied\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3126
+#: src/testing/testing_group.c:3197
 msgid "Finished copying all blacklist files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3496 src/testing/testing_group.c:3624
-#: src/testing/testing_group.c:4839 src/testing/testing_group.c:4982
+#: src/testing/testing_group.c:3581 src/testing/testing_group.c:3720
+#: src/testing/testing_group.c:4925 src/testing/testing_group.c:5066
 msgid "Delaying connect, we have too many outstanding connections!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3506 src/testing/testing_group.c:4851
-#: src/testing/testing_group.c:4994
+#: src/testing/testing_group.c:3591 src/testing/testing_group.c:4935
+#: src/testing/testing_group.c:5076
 #, c-format
 msgid "Creating connection, outstanding_connections is %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3518
+#: src/testing/testing_group.c:3603
 #, fuzzy, c-format
 msgid "Offering Hello of peer %s to peer %s\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/testing/testing_group.c:3636
+#: src/testing/testing_group.c:3730
 #, c-format
 msgid "Creating connection, outstanding_connections is %d (max %d)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3887
+#: src/testing/testing_group.c:3983
 msgid "Creating clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3894
+#: src/testing/testing_group.c:3990
 msgid "Creating small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3901
+#: src/testing/testing_group.c:3997
 msgid "Creating small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3907
+#: src/testing/testing_group.c:4003
 msgid "Creating ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3913
+#: src/testing/testing_group.c:4009
 msgid "Creating 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3920
+#: src/testing/testing_group.c:4015
 msgid "Creating Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3926
+#: src/testing/testing_group.c:4021
 msgid "Creating InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3933
+#: src/testing/testing_group.c:4027
 msgid "Creating Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3940
+#: src/testing/testing_group.c:4034
 msgid "Creating straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3947
+#: src/testing/testing_group.c:4040
 msgid "Creating topology from file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3966
+#: src/testing/testing_group.c:4058
 msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3983
+#: src/testing/testing_group.c:4075
 msgid "Failed during friend file copying!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3991
+#: src/testing/testing_group.c:4083
 msgid "Friend files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4010
+#: src/testing/testing_group.c:4102
 msgid "Blacklisting all but clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4018
+#: src/testing/testing_group.c:4110
 msgid "Blacklisting all but small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4028
+#: src/testing/testing_group.c:4118
 msgid "Blacklisting all but small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4036
+#: src/testing/testing_group.c:4126
 msgid "Blacklisting all but ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4044
+#: src/testing/testing_group.c:4134
 msgid "Blacklisting all but 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4052
+#: src/testing/testing_group.c:4142
 msgid "Blacklisting all but Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4060
+#: src/testing/testing_group.c:4150
 msgid "Blacklisting all but InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4097
+#: src/testing/testing_group.c:4187
 msgid "Blacklisting all but Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4105
+#: src/testing/testing_group.c:4195
 msgid "Blacklisting all but straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4122
+#: src/testing/testing_group.c:4212
 msgid "Failed during blacklist file copying!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4130
+#: src/testing/testing_group.c:4220
 msgid "Blacklist files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5213
+#: src/testing/testing_group.c:5301
 msgid "Creating clique CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5220
+#: src/testing/testing_group.c:5308
 msgid "Creating small world (ring) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5227
+#: src/testing/testing_group.c:5315
 msgid "Creating small world (2d-torus) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5233
+#: src/testing/testing_group.c:5321
 msgid "Creating ring CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5240
+#: src/testing/testing_group.c:5328
 msgid "Creating 2d torus CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5247
+#: src/testing/testing_group.c:5335
 msgid "Creating Erdos-Renyi CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5254
+#: src/testing/testing_group.c:5342
 msgid "Creating InterNAT CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5261
+#: src/testing/testing_group.c:5349
 msgid "Creating Scale Free CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5268
+#: src/testing/testing_group.c:5356
 msgid "Creating straight line CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5274
+#: src/testing/testing_group.c:5362
 msgid "Creating no CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5280
+#: src/testing/testing_group.c:5368
 #, fuzzy
 msgid "Unknown topology specification, can't connect peers!\n"
 msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/testing/testing_group.c:5289
+#: src/testing/testing_group.c:5378
 #, c-format
 msgid "Connecting random subset (%'.2f percent) of possible peers\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5297
+#: src/testing/testing_group.c:5386
 #, c-format
 msgid "Connecting a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5305
+#: src/testing/testing_group.c:5395
 #, c-format
 msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5315
+#: src/testing/testing_group.c:5405
 #, c-format
 msgid "Finding additional %u closest peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5923
+#: src/testing/testing_group.c:6084
 #, fuzzy
 msgid "Could not read hostkeys file!\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testing/testing_group.c:5996
+#: src/testing/testing_group.c:6154
 #, c-format
 msgid "Could not create configuration for peer number %u on `%s'!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6119 src/testing/testing.c:1189
+#: src/testing/testing_group.c:6298 src/testing/testing.c:1272
 #, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr ""
 
-#: src/testing/testing.c:210
-#, fuzzy
-msgid "Failed to connect to core service\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/testing/testing.c:247 src/testing/testing.c:735
-#: src/testing/testing.c:1947 src/testing/testing.c:1965
-#: src/testing/testing.c:2049 src/testing/testing.c:2065
-#, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-
-#: src/testing/testing.c:327
+#: src/testing/testing.c:208
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:342 src/testing/testing.c:912
+#: src/testing/testing.c:222 src/testing/testing.c:822
 #, fuzzy
 msgid "`scp' did not complete cleanly.\n"
 msgstr "`%s' ist zu keinem Knoten verbunden.\n"
 
-#: src/testing/testing.c:367
+#: src/testing/testing.c:245
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:368
+#: src/testing/testing.c:246
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/testing/testing.c:430
+#: src/testing/testing.c:302
 #, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr ""
 
-#: src/testing/testing.c:440
+#: src/testing/testing.c:309
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/testing/testing.c:441 src/testing/testing.c:638
+#: src/testing/testing.c:310 src/testing/testing.c:508
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/testing/testing.c:506
+#: src/testing/testing.c:372
 #, fuzzy, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
 
-#: src/testing/testing.c:510
+#: src/testing/testing.c:376
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr ""
 
-#: src/testing/testing.c:520
+#: src/testing/testing.c:386
 #, fuzzy
 msgid "`Failed to get hostkey!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/testing/testing.c:556
+#: src/testing/testing.c:420
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:627
+#: src/testing/testing.c:500
 #, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr ""
 
-#: src/testing/testing.c:637
+#: src/testing/testing.c:507
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/testing/testing.c:665
+#: src/testing/testing.c:531 src/testing/testing.c:630
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:666
+#: src/testing/testing.c:532 src/testing/testing.c:631
+#: src/testing/testing.c:651
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:707
-msgid "Unable to connect to CORE service for peer!\n"
-msgstr ""
+#: src/testing/testing.c:571 src/testing/testing.c:2072
+#: src/testing/testing.c:2091
+#, fuzzy
+msgid "Failed to connect to transport service!\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/testing/testing.c:769
+#: src/testing/testing.c:600
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:797
+#: src/testing/testing.c:650
+msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
+msgstr ""
+
+#: src/testing/testing.c:673 src/testing/testing.c:707
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:827
+#: src/testing/testing.c:688 src/testing/testing.c:737
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr ""
 
-#: src/testing/testing.c:899
+#: src/testing/testing.c:810
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:1277 src/testing/testing.c:1407
+#: src/testing/testing.c:988
 #, fuzzy, c-format
+msgid "Starting service %s for peer `%4s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/testing/testing.c:1360 src/testing/testing.c:1443
+#: src/testing/testing.c:1581
+#, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/testing/testing.c:1359
+#: src/testing/testing.c:1533
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/testing/testing.c:1492
+#: src/testing/testing.c:1668
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1500
+#: src/testing/testing.c:1676
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/testing/testing.c:1532
+#: src/testing/testing.c:1707
 #, fuzzy, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr ""
 "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
 "der Konfigurationsdatei an.\n"
 
-#: src/testing/testing.c:1535
+#: src/testing/testing.c:1710
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/testing/testing.c:1723
+#: src/testing/testing.c:1881
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/testing/testing.c:1918 src/testing/testing.c:2036
+#: src/testing/testing.c:2036
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/testing/testing.c:2107
+#: src/testing/testing.c:2238
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
@@ -669,11 +670,11 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:202
+#: src/peerinfo/gnunet-service-peerinfo.c:197
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:251
+#: src/peerinfo/gnunet-service-peerinfo.c:241
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -681,198 +682,196 @@
 "Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
 "Datei wurde entfernt.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:318
+#: src/peerinfo/gnunet-service-peerinfo.c:306
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:266
+#: src/peerinfo/peerinfo_api_notify.c:257
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/peerinfo/test_peerinfo_api.c:112 src/hostlist/hostlist-server.c:469
-#: src/peerinfo-tool/gnunet-peerinfo.c:168 src/dv/gnunet-service-dv.c:2833
-#: src/core/gnunet-service-core.c:3036 src/core/gnunet-service-core.c:3345
+#: src/peerinfo/test_peerinfo_api.c:109 src/hostlist/hostlist-server.c:437
+#: src/peerinfo-tool/gnunet-peerinfo.c:157 src/dv/gnunet-service-dv.c:2998
+#: src/core/gnunet-service-core.c:3034 src/core/gnunet-service-core.c:3328
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/peerinfo/peerinfo_api.c:280
+#: src/peerinfo/peerinfo_api.c:276
 #, fuzzy, c-format
 msgid "Failed to transmit message to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/peerinfo/peerinfo_api.c:447
+#: src/peerinfo/peerinfo_api.c:432
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/peerinfo/peerinfo_api.c:476 src/peerinfo/peerinfo_api.c:494
+#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service.\n"
 msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
 
-#: src/peerinfo/peerinfo_api.c:540
+#: src/peerinfo/peerinfo_api.c:521
 #, fuzzy
 msgid "Failed to transmit iteration request to `PEERINFO' service\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/peerinfo/peerinfo_api.c:580
+#: src/peerinfo/peerinfo_api.c:555
 msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:281
-#: src/hostlist/hostlist-client.c:620
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:259
+#: src/hostlist/hostlist-client.c:622
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:298
-#: src/hostlist/hostlist-client.c:594 src/hostlist/hostlist-client.c:1384
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:274
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1338
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:311
-#: src/hostlist/hostlist-server.c:377
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:286
+#: src/hostlist/hostlist-server.c:353
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:422
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:389
 #, c-format
 msgid "Hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:265
+#: src/hostlist/gnunet-daemon-hostlist.c:253
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:300
-#: src/topology/gnunet-daemon-topology.c:1452
-#: src/topology/gnunet-daemon-topology.c:1460 src/fs/gnunet-service-fs.c:544
+#: src/hostlist/gnunet-daemon-hostlist.c:286
+#: src/topology/gnunet-daemon-topology.c:1315
+#: src/topology/gnunet-daemon-topology.c:1322 src/fs/gnunet-service-fs.c:519
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:321
+#: src/hostlist/gnunet-daemon-hostlist.c:306
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/hostlist/gnunet-daemon-hostlist.c:311
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:328
+#: src/hostlist/gnunet-daemon-hostlist.c:314
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:332
+#: src/hostlist/gnunet-daemon-hostlist.c:318
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:344
+#: src/hostlist/gnunet-daemon-hostlist.c:330
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:135
+#: src/hostlist/hostlist-server.c:134
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# bytes in der Datenbank"
 
-#: src/hostlist/hostlist-server.c:164
+#: src/hostlist/hostlist-server.c:160
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:194
-#: src/topology/gnunet-daemon-topology.c:973
-#: src/transport/gnunet-service-transport.c:3160
-#: src/transport/gnunet-service-transport.c:4572
+#: src/hostlist/hostlist-server.c:187
+#: src/topology/gnunet-daemon-topology.c:900
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/hostlist/hostlist-server.c:217
+#: src/hostlist/hostlist-server.c:208
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:234
+#: src/hostlist/hostlist-server.c:224
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:289
+#: src/hostlist/hostlist-server.c:272
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/hostlist/hostlist-server.c:292
+#: src/hostlist/hostlist-server.c:275
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:283
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:309
+#: src/hostlist/hostlist-server.c:290
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:313
+#: src/hostlist/hostlist-server.c:294
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:321
+#: src/hostlist/hostlist-server.c:302
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:323
+#: src/hostlist/hostlist-server.c:305
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:329
+#: src/hostlist/hostlist-server.c:309
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:331
+#: src/hostlist/hostlist-server.c:310
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/hostlist-server.c:427
+#: src/hostlist/hostlist-server.c:398
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:599
-#: src/transport/gnunet-service-transport.c:6603
-#: src/peerinfo-tool/gnunet-peerinfo.c:224 src/core/gnunet-service-core.c:4703
+#: src/hostlist/hostlist-server.c:556
+#: src/transport/gnunet-service-transport.c:458
+#: src/peerinfo-tool/gnunet-peerinfo.c:208 src/core/gnunet-service-core.c:4607
 #, fuzzy, c-format
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/hostlist/hostlist-server.c:611
+#: src/hostlist/hostlist-server.c:566
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/hostlist/hostlist-server.c:623
+#: src/hostlist/hostlist-server.c:575
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:639
+#: src/hostlist/hostlist-server.c:589
 #, 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:679
+#: src/hostlist/hostlist-server.c:627
 #, 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"
@@ -881,378 +880,374 @@
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:343
+#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/hostlist-client.c:314 src/hostlist/hostlist-client.c:347
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/hostlist/hostlist-client.c:334
+#: src/hostlist/hostlist-client.c:330
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: src/hostlist/hostlist-client.c:383 src/hostlist/hostlist-client.c:403
+#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
 #, c-format
 msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:480 src/hostlist/hostlist-client.c:680
-#: src/hostlist/hostlist-client.c:687 src/hostlist/hostlist-client.c:739
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:885
-#: src/hostlist/hostlist-client.c:996 src/hostlist/hostlist-client.c:1002
-#: src/transport/test_plugin_transport_https.c:787
-#: src/transport/test_plugin_transport_https.c:796
-#: src/transport/plugin_transport_http.c:2094
-#: src/transport/plugin_transport_http.c:2103
+#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
+#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
+#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
+#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
+#: src/transport/test_plugin_transport_https.c:829
+#: src/transport/test_plugin_transport_https.c:837
+#: src/transport/plugin_transport_http.c:2059
+#: src/transport/plugin_transport_http.c:2067
+#: src/transport/test_plugin_transport_http.c:795
 #: src/transport/test_plugin_transport_http.c:803
-#: src/transport/test_plugin_transport_http.c:812
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/hostlist/hostlist-client.c:661
+#: src/hostlist/hostlist-client.c:663
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:810
+#: src/hostlist/hostlist-client.c:805
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:827
+#: src/hostlist/hostlist-client.c:822
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:848
+#: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
 msgid "%s failed for `%s' at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/hostlist/hostlist-client.c:857
+#: src/hostlist/hostlist-client.c:848
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
 "beträgt %8.3f KB/s.\n"
 
-#: src/hostlist/hostlist-client.c:864
+#: src/hostlist/hostlist-client.c:856
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
+#: src/hostlist/hostlist-client.c:909
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:926
+#: src/hostlist/hostlist-client.c:917
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1075 src/hostlist/hostlist-client.c:1567
+#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1511
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1084
+#: src/hostlist/hostlist-client.c:1054
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1124
+#: src/hostlist/hostlist-client.c:1092
 msgid "Scheduled saving of hostlists\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1128
+#: src/hostlist/hostlist-client.c:1096
 #, c-format
 msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1151 src/hostlist/hostlist-client.c:1171
+#: src/hostlist/hostlist-client.c:1117 src/hostlist/hostlist-client.c:1133
 #, fuzzy
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1249
 #, c-format
 msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1325
+#: src/hostlist/hostlist-client.c:1280
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/hostlist-client.c:1286
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:1335
+#: src/hostlist/hostlist-client.c:1290
 #, c-format
 msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1344
+#: src/hostlist/hostlist-client.c:1301
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-client.c:1378
+#: src/hostlist/hostlist-client.c:1334
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1380
+#: src/hostlist/hostlist-client.c:1336
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1416
+#: src/hostlist/hostlist-client.c:1369
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1429
+#: src/hostlist/hostlist-client.c:1383
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-client.c:1436
+#: src/hostlist/hostlist-client.c:1388
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:1464 src/hostlist/hostlist-client.c:1482
+#: src/hostlist/hostlist-client.c:1412 src/hostlist/hostlist-client.c:1429
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1476
+#: src/hostlist/hostlist-client.c:1424
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1533
+#: src/hostlist/hostlist-client.c:1476
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1536
+#: src/hostlist/hostlist-client.c:1479
 #, c-format
 msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1545
+#: src/hostlist/hostlist-client.c:1488
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1557
+#: src/hostlist/hostlist-client.c:1500
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1560
+#: src/hostlist/hostlist-client.c:1504
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/topology/gnunet-daemon-topology.c:253
+#: src/topology/gnunet-daemon-topology.c:250
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:418
+#: src/topology/gnunet-daemon-topology.c:402
 #, fuzzy
 msgid "# connect requests issued to core"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:718
-#: src/topology/gnunet-daemon-topology.c:832
-#: src/transport/gnunet-service-transport.c:2666
-#: src/transport/gnunet-service-transport.c:2725
+#: src/topology/gnunet-daemon-topology.c:676
+#: src/topology/gnunet-daemon-topology.c:778
+#: src/transport/gnunet-service-transport_neighbours.c:432
+#: src/transport/gnunet-service-transport_neighbours.c:627
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
 
-#: src/topology/gnunet-daemon-topology.c:741
-#: src/topology/gnunet-daemon-topology.c:839
+#: src/topology/gnunet-daemon-topology.c:697
+#: src/topology/gnunet-daemon-topology.c:783
 #, fuzzy
 msgid "# friends connected"
 msgstr "# verbundener Knoten"
 
-#: src/topology/gnunet-daemon-topology.c:1059
+#: src/topology/gnunet-daemon-topology.c:977
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1097
+#: src/topology/gnunet-daemon-topology.c:1009
 #, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1110
+#: src/topology/gnunet-daemon-topology.c:1021
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1117
+#: src/topology/gnunet-daemon-topology.c:1027
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1036
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1134
+#: src/topology/gnunet-daemon-topology.c:1044
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1150
+#: src/topology/gnunet-daemon-topology.c:1064
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1161
+#: src/topology/gnunet-daemon-topology.c:1077
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1176
+#: src/topology/gnunet-daemon-topology.c:1087
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1182
+#: src/topology/gnunet-daemon-topology.c:1093
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1193
+#: src/topology/gnunet-daemon-topology.c:1103
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1200
+#: src/topology/gnunet-daemon-topology.c:1109
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1206
+#: src/topology/gnunet-daemon-topology.c:1116
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1247
+#: src/topology/gnunet-daemon-topology.c:1151
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1316
+#: src/topology/gnunet-daemon-topology.c:1208
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/topology/gnunet-daemon-topology.c:1487
+#: src/topology/gnunet-daemon-topology.c:1348
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/statistics/statistics_api.c:325
+#: src/statistics/statistics_api.c:326
 #, fuzzy
 msgid "Failed to connect to statistics service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:94
+#: src/statistics/gnunet-statistics.c:89
 #, fuzzy, c-format
 msgid "Failed to obtain statistics.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:125 src/fs/gnunet-pseudonym.c:172
+#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/statistics/gnunet-statistics.c:162
+#: src/statistics/gnunet-statistics.c:155
 msgid "limit output to statistcs for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:165
+#: src/statistics/gnunet-statistics.c:158
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:168
+#: src/statistics/gnunet-statistics.c:161
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:177
+#: src/statistics/gnunet-statistics.c:168
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
 
-#: src/statistics/gnunet-service-statistics.c:211
+#: src/statistics/gnunet-service-statistics.c:208
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-service-statistics.c:273
+#: src/statistics/gnunet-service-statistics.c:266
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/util/os_priority.c:116
+#: src/util/os_priority.c:110
 #, c-format
 msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
-#: src/util/os_installation.c:296
+#: src/util/os_installation.c:291
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:482 src/transport/test_transport_api.c:642
-#: src/transport/test_transport_api_reliability.c:655
-#: src/transport/test_transport_api_unreliability.c:700
+#: src/util/os_installation.c:474
 #, 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:489 src/transport/test_transport_api.c:649
-#: src/transport/test_transport_api_reliability.c:662
-#: src/transport/test_transport_api_unreliability.c:707
+#: src/util/os_installation.c:479
 #, fuzzy, c-format
 msgid "stat (%s) failed: %s\n"
 msgstr "`%s' schlug fehl: %s\n"
 
-#: src/util/common_logging.c:154 src/util/common_logging.c:492
-#: src/util/test_common_logging.c:76
+#: src/util/common_logging.c:154 src/util/common_logging.c:500
+#: src/util/test_common_logging.c:75
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:156 src/util/common_logging.c:490
+#: src/util/common_logging.c:156 src/util/common_logging.c:498
 #: src/util/test_common_logging.c:72
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:158 src/util/common_logging.c:488
+#: src/util/common_logging.c:158 src/util/common_logging.c:496
 #: src/util/test_common_logging.c:68
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/common_logging.c:160 src/util/common_logging.c:486
-#: src/util/test_common_logging.c:64
+#: src/util/common_logging.c:160 src/util/common_logging.c:494
+#: src/util/test_common_logging.c:65
 msgid "ERROR"
 msgstr "FEHLER"
 
@@ -1260,34 +1255,34 @@
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:204 src/dht/plugin_dhtlog_mysql_dump.c:837
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:602
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:635
+#: src/util/common_logging.c:214 src/dht/plugin_dhtlog_mysql_dump.c:909
 #: src/dht/plugin_dhtlog_mysql_dump_load.c:669
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:703
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:737
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:770
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:803
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:836
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:700
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:732
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:764
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:796
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:827
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:858
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:889
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/common_logging.c:321
+#: src/util/common_logging.c:331
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:493
+#: src/util/common_logging.c:501
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:575
+#: src/util/common_logging.c:583
 #, fuzzy
 msgid "unknown address"
 msgstr "Unbekannter Fehler"
 
-#: src/util/common_logging.c:615
+#: src/util/common_logging.c:621
 #, fuzzy
 msgid "invalid address"
 msgstr "Ungültige Parameter: "
@@ -1302,178 +1297,178 @@
 msgid "no-name"
 msgstr "Name anzeigen"
 
-#: src/util/test_strings.c:42 src/util/strings.c:138
+#: src/util/test_strings.c:42 src/util/strings.c:139
 msgid "b"
 msgstr "b"
 
-#: src/util/test_strings.c:45 src/util/strings.c:144
+#: src/util/test_strings.c:45 src/util/strings.c:145
 msgid "KiB"
 msgstr ""
 
-#: src/util/test_strings.c:48 src/util/strings.c:156
+#: src/util/test_strings.c:48 src/util/strings.c:157
 msgid "TiB"
 msgstr ""
 
-#: src/util/test_strings.c:51 src/util/strings.c:362
+#: src/util/test_strings.c:51 src/util/strings.c:363
 msgid "ms"
 msgstr "ms"
 
-#: src/util/test_strings.c:57 src/util/strings.c:371
+#: src/util/test_strings.c:56 src/util/strings.c:372
 msgid "s"
 msgstr "s"
 
-#: src/util/test_strings.c:63 src/util/strings.c:379
+#: src/util/test_strings.c:61 src/util/strings.c:380
 msgid "h"
 msgstr "h"
 
-#: src/util/connection.c:459
+#: src/util/connection.c:457
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/util/connection.c:475
+#: src/util/connection.c:472
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:647
+#: src/util/connection.c:640
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
-#: src/util/connection.c:869 src/util/connection.c:1043
+#: src/util/connection.c:852 src/util/connection.c:1023
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/connection.c:1032
+#: src/util/connection.c:1013
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/connection.c:1558
+#: src/util/connection.c:1529
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
 "failed (%p).\n"
 msgstr ""
 
-#: src/util/connection.c:1594
+#: src/util/connection.c:1565
 #, fuzzy, c-format
 msgid "Failed to send to `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/util/plugin.c:88
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
 
-#: src/util/plugin.c:148
+#: src/util/plugin.c:144
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 "`%s' konnte die Methode '%s%s' nicht auflösen. Ort: %s:%d. Fehler: %s\n"
 
-#: src/util/plugin.c:221
+#: src/util/plugin.c:217
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
 
-#: src/util/bio.c:136 src/util/bio.c:143
+#: src/util/bio.c:134 src/util/bio.c:140
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/bio.c:144
+#: src/util/bio.c:141
 #, fuzzy
 msgid "End of file"
 msgstr "Eine Konfigurationsdatei laden"
 
-#: src/util/bio.c:200
+#: src/util/bio.c:193
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:212
+#: src/util/bio.c:203
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:258
+#: src/util/bio.c:248
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:273
+#: src/util/bio.c:262
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/crypto_rsa.c:623 src/util/crypto_rsa.c:673
+#: src/util/crypto_rsa.c:611 src/util/crypto_rsa.c:658
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/util/crypto_rsa.c:628
+#: src/util/crypto_rsa.c:616
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
 
-#: src/util/crypto_rsa.c:648
+#: src/util/crypto_rsa.c:634
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:677 src/util/crypto_rsa.c:719
+#: src/util/crypto_rsa.c:662 src/util/crypto_rsa.c:698
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:713
+#: src/util/crypto_rsa.c:693
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:734
+#: src/util/crypto_rsa.c:714
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/util/crypto_rsa.c:754
+#: src/util/crypto_rsa.c:732
 #, fuzzy, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr "Aufruf von `%s' mit Schlüssel `%s'.\n"
 
-#: src/util/crypto_rsa.c:978
+#: src/util/crypto_rsa.c:953
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/server.c:389
+#: src/util/server.c:384
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/server.c:399
+#: src/util/server.c:392
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/util/server.c:405
+#: src/util/server.c:397
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/util/server.c:627
+#: src/util/server.c:612
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/network.c:1088
+#: src/util/network.c:1193
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -1484,7 +1479,7 @@
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:264
+#: src/util/crypto_random.c:263
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
@@ -1495,140 +1490,145 @@
 msgid "Got IP address `%s' for our host.\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:146 src/util/resolver_api.c:914
+#: src/util/test_resolver_api.c:147 src/util/resolver_api.c:873
 #, c-format
 msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:152
+#: src/util/test_resolver_api.c:154
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s %u\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/test_resolver_api.c:259
+#: src/util/test_resolver_api.c:264
 #, c-format
 msgid "gethostbyname() could not lookup IP address: %s\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:318
+#: src/util/test_resolver_api.c:329
 #, c-format
 msgid "gethostbyaddr() could not lookup hostname: %s\n"
 msgstr ""
 
-#: src/util/configuration.c:246
+#: src/util/configuration.c:244
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/configuration.c:810
+#: src/util/configuration.c:801
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:89
+#: src/util/gnunet-resolver.c:76
 msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/client.c:311
+#: src/util/client.c:304
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:319
+#: src/util/client.c:312
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:679
+#: src/util/client.c:669
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:728
+#: src/util/client.c:729 src/util/service.c:880
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr ""
+
+#: src/util/client.c:871
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/util/client.c:744
+#: src/util/client.c:887
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/util/client.c:1017
+#: src/util/client.c:1158
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/scheduler.c:791
+#: src/util/scheduler.c:859
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:922
+#: src/util/scheduler.c:990
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/strings.c:148
+#: src/util/strings.c:149
 msgid "MiB"
 msgstr ""
 
-#: src/util/strings.c:152
+#: src/util/strings.c:153
 msgid "GiB"
 msgstr ""
 
-#: src/util/strings.c:191
+#: src/util/strings.c:193
 #, c-format
 msgid "Character set requested was `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:268
+#: src/util/strings.c:271
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:367
+#: src/util/strings.c:368
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:375
+#: src/util/strings.c:376
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:383
+#: src/util/strings.c:384
 msgid " days"
 msgstr " Tage"
 
-#: src/util/strings.c:407
+#: src/util/strings.c:408
 msgid "end of time"
 msgstr ""
 
-#: src/util/disk.c:418
+#: src/util/disk.c:429
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/disk.c:781
+#: src/util/disk.c:829
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1134 src/util/service.c:1510
+#: src/util/disk.c:1180 src/util/service.c:1456
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#: src/util/disk.c:1438
+#: src/util/disk.c:1486
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/util/resolver_api.c:199
+#: src/util/resolver_api.c:198
 #, fuzzy, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
 
-#: src/util/resolver_api.c:219
+#: src/util/resolver_api.c:217
 #, fuzzy, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
@@ -1636,32 +1636,32 @@
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/util/resolver_api.c:363
+#: src/util/resolver_api.c:354
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
 
-#: src/util/resolver_api.c:367
+#: src/util/resolver_api.c:358
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/resolver_api.c:441
+#: src/util/resolver_api.c:427
 #, c-format
 msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:827
+#: src/util/resolver_api.c:789
 #, c-format
 msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:920
+#: src/util/resolver_api.c:879
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/resolver_api.c:953
+#: src/util/resolver_api.c:911
 #, c-format
 msgid "Resolving our hostname `%s'\n"
 msgstr ""
@@ -1671,18 +1671,18 @@
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/gnunet-service-resolver.c:318
-#: src/util/gnunet-service-resolver.c:367
+#: src/util/gnunet-service-resolver.c:317
+#: src/util/gnunet-service-resolver.c:362
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/util/gnunet-service-resolver.c:469
+#: src/util/gnunet-service-resolver.c:460
 #, c-format
 msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:516
+#: src/util/gnunet-service-resolver.c:508
 #, c-format
 msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
@@ -1692,62 +1692,62 @@
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/util/getopt.c:693
+#: src/util/getopt.c:692
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: Option '--%s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt.c:699
+#: src/util/getopt.c:697
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: Option '%c%s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt.c:718 src/util/getopt.c:887
+#: src/util/getopt.c:714 src/util/getopt.c:882
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: Option `%s' benötigt einen Parameter\n"
 
-#: src/util/getopt.c:747
+#: src/util/getopt.c:743
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: unbekannte Option '--%s'\n"
 
-#: src/util/getopt.c:751
+#: src/util/getopt.c:747
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: unbekannte Option '%c%s'\n"
 
-#: src/util/getopt.c:776
+#: src/util/getopt.c:772
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: unerlaubte Option -- %c\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:774
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ungültige Option -- %c\n"
 
-#: src/util/getopt.c:806 src/util/getopt.c:936
+#: src/util/getopt.c:802 src/util/getopt.c:930
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: Option benötigt einen Parameter -- %c\n"
 
-#: src/util/getopt.c:854
+#: src/util/getopt.c:850
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: Option '-W %s' ist mehrdeutig\n"
 
-#: src/util/getopt.c:872
+#: src/util/getopt.c:868
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: Option '-W %s' erlaubt keinen Parameter\n"
 
-#: src/util/getopt.c:1041
+#: src/util/getopt.c:1034
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Verwenden Sie --help, um eine Liste der Optionen zu erhalten.\n"
 
-#: src/util/signal.c:77
+#: src/util/signal.c:78
 #, fuzzy, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Aufruf von `%s' gibt %d zurück.\n"
@@ -1760,142 +1760,137 @@
 "Parameter, die für lange Optionen zwingend sind, sind auch für kurze "
 "Optionen zwingend.\n"
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:284
+#: src/util/getopt_helpers.c:254 src/util/getopt_helpers.c:282
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Sie müssen für die Option `%s' zusätzlich eine Zahl angeben.\n"
 
-#: src/util/service.c:114 src/util/service.c:142 src/util/service.c:188
-#: src/util/service.c:212 src/util/service.c:219
+#: src/util/service.c:112 src/util/service.c:138 src/util/service.c:182
+#: src/util/service.c:202 src/util/service.c:209
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/service.c:171
+#: src/util/service.c:165
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ungültige Netzwerk Notation ('/%d ist nicht gültig in IPv4 CIDR)."
 
-#: src/util/service.c:268
+#: src/util/service.c:258
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
 
-#: src/util/service.c:304
+#: src/util/service.c:292
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/service.c:336
+#: src/util/service.c:323
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
 
-#: src/util/service.c:649
+#: src/util/service.c:627
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:656
+#: src/util/service.c:632
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/util/service.c:662
+#: src/util/service.c:639
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:707
+#: src/util/service.c:683
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:735
+#: src/util/service.c:712
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:857
+#: src/util/service.c:829
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:881 src/transport/plugin_transport_tcp.c:2048
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1927
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/service.c:915
+#: src/util/service.c:900
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/service.c:936
-#, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:953
+#: src/util/service.c:917
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:985
+#: src/util/service.c:947
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/util/service.c:1003
+#: src/util/service.c:965
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/util/service.c:1163 src/util/service.c:1182
+#: src/util/service.c:1121 src/util/service.c:1139
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1211
+#: src/util/service.c:1166
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1367
+#: src/util/service.c:1315
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/service.c:1402
+#: src/util/service.c:1349
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/util/service.c:1450
+#: src/util/service.c:1397
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1455
+#: src/util/service.c:1401
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1459
+#: src/util/service.c:1405
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1511
+#: src/util/service.c:1457
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1525
+#: src/util/service.c:1471
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/util/service.c:1585
+#: src/util/service.c:1534
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -1904,71 +1899,71 @@
 msgid "`%' must be followed by HEX number"
 msgstr ""
 
-#: src/fs/fs_uri.c:275
+#: src/fs/fs_uri.c:273
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:293
+#: src/fs/fs_uri.c:291
 msgid "`++' not allowed in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:300
+#: src/fs/fs_uri.c:298
 msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:370 src/fs/fs_uri.c:377
+#: src/fs/fs_uri.c:366 src/fs/fs_uri.c:373
 msgid "Malformed SKS URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:421 src/fs/fs_uri.c:441
+#: src/fs/fs_uri.c:417 src/fs/fs_uri.c:432
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:572 src/fs/fs_uri.c:592 src/fs/fs_uri.c:602
-#: src/fs/fs_uri.c:631
+#: src/fs/fs_uri.c:562 src/fs/fs_uri.c:577 src/fs/fs_uri.c:587
+#: src/fs/fs_uri.c:615
 msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:611
+#: src/fs/fs_uri.c:597
 msgid "SKS URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:617
+#: src/fs/fs_uri.c:603
 msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:625
+#: src/fs/fs_uri.c:609
 msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:636
+#: src/fs/fs_uri.c:622
 msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:649
+#: src/fs/fs_uri.c:634
 msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:688
+#: src/fs/fs_uri.c:672
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:923
+#: src/fs/fs_uri.c:897
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/fs/fs_uri.c:930
+#: src/fs/fs_uri.c:904
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/fs/fs_uri.c:1248 src/fs/fs_uri.c:1275
+#: src/fs/fs_uri.c:1212 src/fs/fs_uri.c:1239
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1281
+#: src/fs/fs_uri.c:1245
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -1977,305 +1972,311 @@
 msgid "Failed to receive response for `%s' request from `%s' service.\n"
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/fs/fs_list_indexed.c:119
+#: src/fs/fs_list_indexed.c:117
 #, fuzzy, c-format
 msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/fs/fs_list_indexed.c:176
+#: src/fs/fs_list_indexed.c:164
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:207 src/fs/gnunet-service-fs_lc.c:377
-#: src/fs/gnunet-service-fs_lc.c:519
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
+#: src/fs/gnunet-service-fs_lc.c:480
 #, fuzzy
 msgid "# client searches active"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:262
+#: src/fs/gnunet-service-fs_lc.c:254
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:323
+#: src/fs/gnunet-service-fs_lc.c:312
 #, fuzzy
 msgid "# client searches received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:367
+#: src/fs/gnunet-service-fs_lc.c:351
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/fs_publish.c:152 src/fs/fs_publish.c:462
+#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:740 src/fs/fs_publish.c:756 src/fs/fs_publish.c:797
-#: src/fs/fs_publish.c:816 src/fs/fs_publish.c:846 src/fs/fs_publish.c:1020
+#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
+#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/fs/fs_publish.c:742
+#: src/fs/fs_publish.c:649
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:754
+#: src/fs/fs_publish.c:661
 #, fuzzy
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/fs_publish.c:799
+#: src/fs/fs_publish.c:704
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:818
+#: src/fs/fs_publish.c:724
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:848
+#: src/fs/fs_publish.c:751
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:877
+#: src/fs/fs_publish.c:775
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/fs_publish.c:956
+#: src/fs/fs_publish.c:845
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/fs/fs_publish.c:964
+#: src/fs/fs_publish.c:851
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:1022
+#: src/fs/fs_publish.c:899
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/fs/fs_publish.c:1219
+#: src/fs/fs_publish.c:1078
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1295
+#: src/fs/fs_publish.c:1149
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1665
+#: src/fs/fs_publish.c:1482
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:1702 src/fs/fs_namespace.c:890
+#: src/fs/fs_publish.c:1518 src/fs/fs_namespace.c:822
 #, fuzzy
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
 
-#: src/fs/gnunet-download.c:104
+#: src/fs/gnunet-download.c:100
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/gnunet-download.c:113
+#: src/fs/gnunet-download.c:112
 #, c-format
 msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:125
+#: src/fs/gnunet-download.c:121
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/fs/gnunet-download.c:132
+#: src/fs/gnunet-download.c:129
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Upload abgewiesen!"
 
-#: src/fs/gnunet-download.c:150 src/fs/gnunet-unindex.c:118
-#: src/fs/gnunet-search.c:199 src/fs/gnunet-publish.c:165
+#: src/fs/gnunet-download.c:144 src/fs/gnunet-unindex.c:109
+#: src/fs/gnunet-search.c:190 src/fs/gnunet-publish.c:155
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:179
+#: src/fs/gnunet-download.c:169
 #, fuzzy, c-format
 msgid "You need to specify a URI argument.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-download.c:187 src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-download.c:175 src/fs/gnunet-publish.c:426
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/fs/gnunet-download.c:197
+#: src/fs/gnunet-download.c:182
 #, c-format
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:205
+#: src/fs/gnunet-download.c:189
 #, c-format
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:224 src/fs/gnunet-unindex.c:158
-#: src/fs/gnunet-search.c:260 src/fs/gnunet-publish.c:469
+#: src/fs/gnunet-download.c:203 src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-search.c:241 src/fs/gnunet-publish.c:404
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-search.c:285
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "Den Grad LEVEL der gewünschten Empfänger-Anonymität setzen"
 
-#: src/fs/gnunet-download.c:273
+#: src/fs/gnunet-download.c:243
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:276 src/fs/gnunet-search.c:316
+#: src/fs/gnunet-download.c:246 src/fs/gnunet-search.c:288
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:279
+#: src/fs/gnunet-download.c:249
 msgid "write the file to FILENAME"
 msgstr "Schreibe die Datei in DATEINAME"
 
-#: src/fs/gnunet-download.c:283
+#: src/fs/gnunet-download.c:253
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:287
+#: src/fs/gnunet-download.c:257
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:290
+#: src/fs/gnunet-download.c:260
 msgid "download a GNUnet directory recursively"
 msgstr "Das GNUnet Verzeichnis rekursiv herunterladen"
 
-#: src/fs/gnunet-download.c:293 src/fs/gnunet-unindex.c:191
-#: src/fs/gnunet-search.c:327 src/fs/gnunet-publish.c:684
-#: src/dht/gnunet-dht-get-peer.c:201 src/dht/gnunet-dht-put.c:188
-#: src/dht/gnunet-dht-get.c:214 src/nse/nse-profiler.c:442
+#: src/fs/gnunet-download.c:263 src/fs/gnunet-unindex.c:169
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:585
+#: src/mesh/test_mesh_small.c:674 src/dht/gnunet-dht-get-peer.c:190
+#: src/dht/gnunet-dht-put.c:176 src/dht/gnunet-dht-get.c:204
+#: src/nse/gnunet-nse-profiler.c:655
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:302
+#: src/fs/gnunet-download.c:270
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:93
+#: src/fs/gnunet-unindex.c:89
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:102
+#: src/fs/gnunet-unindex.c:96
 #, fuzzy, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 "\n"
 "Fehler beim Deindizieren der Datei: %s\n"
 
-#: src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-unindex.c:101
 #, fuzzy, c-format
 msgid "Unindexing done.\n"
 msgstr "Dateien deindizieren."
 
-#: src/fs/gnunet-unindex.c:144
+#: src/fs/gnunet-unindex.c:131
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-unindex.c:169
+#: src/fs/gnunet-unindex.c:148
 #, fuzzy, c-format
 msgid "Could not start unindex operation.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/fs/gnunet-unindex.c:200
+#: src/fs/gnunet-unindex.c:176
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/fs_namespace.c:54 src/fs/fs_namespace.c:83
+#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s' in section `%s'\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/fs/fs_namespace.c:117
+#: src/fs/fs_namespace.c:107
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_namespace.c:146 src/fs/fs_namespace.c:239
+#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:449 src/fs/fs_namespace.c:471
+#: src/fs/fs_namespace.c:323
 #, fuzzy
+msgid "Unknown error"
+msgstr "Unbekannter Fehler"
+
+#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
+#, fuzzy
 msgid "Failed to serialize meta data"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_namespace.c:489
+#: src/fs/fs_namespace.c:452
 #, fuzzy
 msgid "Failed to connect to datastore service"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:537
+#: src/fs/fs_namespace.c:495
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/fs/fs_namespace.c:642
+#: src/fs/fs_namespace.c:597
 #, fuzzy, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 "Der Eintrag konnte dem Namespace `%s' nicht hinzugefügt werden (existiert "
 "er?)\n"
 
-#: src/fs/fs_namespace.c:943
+#: src/fs/fs_namespace.c:866
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/gnunet-pseudonym.c:192
+#: src/fs/gnunet-pseudonym.c:165
 #, fuzzy, c-format
 msgid "Namespace `%s' unknown.\n"
 msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/fs/gnunet-pseudonym.c:284 src/fs/gnunet-pseudonym.c:291
-#: src/fs/gnunet-pseudonym.c:293
+#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
+#: src/fs/gnunet-pseudonym.c:249
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/fs/gnunet-pseudonym.c:313 src/fs/gnunet-publish.c:630
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:532
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
 
-#: src/fs/gnunet-pseudonym.c:317
+#: src/fs/gnunet-pseudonym.c:272
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:321
+#: src/fs/gnunet-pseudonym.c:275
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:325
+#: src/fs/gnunet-pseudonym.c:278
 #, fuzzy
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
@@ -2284,171 +2285,185 @@
 "Ein zusätzliches Schlüsselwort für alle Dateien und Verzeichnisse hinzufügen "
 "(diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-pseudonym.c:329 src/fs/gnunet-publish.c:650
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:551
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
 "setzen"
 
-#: src/fs/gnunet-pseudonym.c:332
+#: src/fs/gnunet-pseudonym.c:285
 #, fuzzy
 msgid "print names of local namespaces"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/fs/gnunet-pseudonym.c:335
+#: src/fs/gnunet-pseudonym.c:288
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:338
+#: src/fs/gnunet-pseudonym.c:291
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:341 src/fs/gnunet-publish.c:669
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:570
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:345
+#: src/fs/gnunet-pseudonym.c:297
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/fs/gnunet-pseudonym.c:349
+#: src/fs/gnunet-pseudonym.c:300
 #, fuzzy
 msgid "change rating of namespace ID by VALUE"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/fs/gnunet-pseudonym.c:359
+#: src/fs/gnunet-pseudonym.c:308
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-search.c:117
+#: src/fs/gnunet-search.c:111
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:188
+#: src/fs/gnunet-search.c:181
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Fehler beim Verlassen der DHT.\n"
 
-#: src/fs/gnunet-search.c:246
+#: src/fs/gnunet-search.c:231
 #, fuzzy, c-format
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-search.c:280
+#: src/fs/gnunet-search.c:255
 #, fuzzy, c-format
 msgid "Could not start searching.\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-search.c:320
+#: src/fs/gnunet-search.c:291
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:324
+#: src/fs/gnunet-search.c:294
 msgid "automatically terminate search after VALUE ms"
 msgstr ""
 
-#: src/fs/gnunet-search.c:336
+#: src/fs/gnunet-search.c:301
+msgid "automatically terminate search after VALUE results are found"
+msgstr ""
+
+#: src/fs/gnunet-search.c:308
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/fs_unindex.c:64
+#: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:72
+#: src/fs/fs_unindex.c:63
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/fs/fs_unindex.c:261
+#: src/fs/fs_unindex.c:235
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:269
+#: src/fs/fs_unindex.c:243
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:277
+#: src/fs/fs_unindex.c:251
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/fs/fs_unindex.c:328
+#: src/fs/fs_unindex.c:296
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:363
+#: src/fs/fs_unindex.c:331
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_unindex.c:376
+#: src/fs/fs_unindex.c:344
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:414
+#: src/fs/fs_unindex.c:378
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/gnunet-directory.c:53
+#: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:100
+#: src/fs/gnunet-directory.c:94
 #, fuzzy, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr "==> Verzeichnis `%s':\n"
 
-#: src/fs/gnunet-directory.c:106
+#: src/fs/gnunet-directory.c:97
 #, fuzzy, c-format
 msgid "Directory `%s' contents:\n"
 msgstr "==> Verzeichnis `%s':\n"
 
-#: src/fs/gnunet-directory.c:147
+#: src/fs/gnunet-directory.c:132
 #, fuzzy, c-format
 msgid "You must specify a filename to inspect."
 msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 
-#: src/fs/gnunet-directory.c:163
+#: src/fs/gnunet-directory.c:145
 #, fuzzy, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/gnunet-directory.c:203
+#: src/fs/gnunet-directory.c:176
 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/fs_file_information.c:362
+#: src/fs/fs_file_information.c:349
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s': %s"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/fs/fs_test_lib.c:282
+#: src/fs/fs_test_lib.c:269
 #, fuzzy, c-format
 msgid "Failed to start daemon: %s\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:158
+#: src/fs/gnunet-service-fs_pe.c:228
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:241
+#: src/fs/gnunet-service-fs_pe.c:334
 msgid "# queries messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:354 src/fs/gnunet-service-fs_pe.c:423
-#: src/fs/gnunet-service-fs_pe.c:455
+#: src/fs/gnunet-service-fs_pe.c:457
+#, fuzzy
+msgid "# requests merged"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/fs/gnunet-service-fs_pe.c:463
+#, fuzzy
+msgid "# requests refreshed"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/fs/gnunet-service-fs_pe.c:511 src/fs/gnunet-service-fs_pe.c:586
+#: src/fs/gnunet-service-fs_pe.c:622
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/fs_getopt.c:202
+#: src/fs/fs_getopt.c:191
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2460,95 +2475,95 @@
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/fs/gnunet-publish.c:118
+#: src/fs/gnunet-publish.c:115
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:128
+#: src/fs/gnunet-publish.c:123
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/fs/gnunet-publish.c:141
+#: src/fs/gnunet-publish.c:134
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:145
+#: src/fs/gnunet-publish.c:138
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/fs/gnunet-publish.c:292
+#: src/fs/gnunet-publish.c:265
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:267
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/fs/gnunet-publish.c:358
+#: src/fs/gnunet-publish.c:312
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-publish.c:411
+#: src/fs/gnunet-publish.c:354
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:419
+#: src/fs/gnunet-publish.c:361
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-publish.c:425
+#: src/fs/gnunet-publish.c:367
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-publish.c:434
+#: src/fs/gnunet-publish.c:375
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/fs/gnunet-publish.c:445 src/fs/gnunet-publish.c:453
+#: src/fs/gnunet-publish.c:385 src/fs/gnunet-publish.c:392
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/fs/gnunet-publish.c:482
+#: src/fs/gnunet-publish.c:414
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/fs/gnunet-publish.c:536
+#: src/fs/gnunet-publish.c:459
 #, fuzzy, c-format
 msgid "Could not access file: %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-publish.c:573
+#: src/fs/gnunet-publish.c:484
 #, fuzzy, c-format
 msgid "Could not publish `%s': %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:507
 #, fuzzy, c-format
 msgid "Could not start publishing.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-publish.c:634
+#: src/fs/gnunet-publish.c:536
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:638
+#: src/fs/gnunet-publish.c:539
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:642
+#: src/fs/gnunet-publish.c:543
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2556,7 +2571,7 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:646
+#: src/fs/gnunet-publish.c:547
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2564,7 +2579,7 @@
 "Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der "
 "obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-publish.c:653
+#: src/fs/gnunet-publish.c:554
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2572,7 +2587,7 @@
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:559
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2580,723 +2595,737 @@
 "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlich "
 "werden soll. (nur für das Einfügen in Namespaces)"
 
-#: src/fs/gnunet-publish.c:662
+#: src/fs/gnunet-publish.c:563
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/fs/gnunet-publish.c:666
+#: src/fs/gnunet-publish.c:567
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "Die Datei unter dem Pseudonym NAME veröffentlichen (platziert die Datei in "
 "einem Namespace)"
 
-#: src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-publish.c:573
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:676
+#: src/fs/gnunet-publish.c:577
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in "
 "Namespaces)"
 
-#: src/fs/gnunet-publish.c:680
+#: src/fs/gnunet-publish.c:581
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:594
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_directory.c:209 src/fs/fs_directory.c:221
+#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
 #, fuzzy
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/gnunet-service-fs_cp.c:726
+#: src/fs/gnunet-service-fs_cp.c:693
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:765
+#: src/fs/gnunet-service-fs_cp.c:728
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/fs/gnunet-service-fs_cp.c:773
+#: src/fs/gnunet-service-fs_cp.c:734
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:806 src/fs/gnunet-service-fs_cp.c:936
-#: src/fs/gnunet-service-fs_cp.c:1367 src/fs/gnunet-service-fs_cp.c:1414
+#: src/fs/gnunet-service-fs_cp.c:763 src/fs/gnunet-service-fs_cp.c:879
+#: src/fs/gnunet-service-fs_cp.c:1289 src/fs/gnunet-service-fs_cp.c:1326
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:889
+#: src/fs/gnunet-service-fs_cp.c:836
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:959
+#: src/fs/gnunet-service-fs_cp.c:899
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:974
+#: src/fs/gnunet-service-fs_cp.c:913
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1019
+#: src/fs/gnunet-service-fs_cp.c:951
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1087
+#: src/fs/gnunet-service-fs_cp.c:1018
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1112
+#: src/fs/gnunet-service-fs_cp.c:1042
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1122
+#: src/fs/gnunet-service-fs_cp.c:1052
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1201
+#: src/fs/gnunet-service-fs_cp.c:1131
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1236
+#: src/fs/gnunet-service-fs_cp.c:1165
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1260
+#: src/fs/gnunet-service-fs_cp.c:1189
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1329
+#: src/fs/gnunet-service-fs_cp.c:1255
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1360
+#: src/fs/gnunet-service-fs_cp.c:1283
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1410
+#: src/fs/gnunet-service-fs_cp.c:1324
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/fs_download.c:332
+#: src/fs/fs_download.c:309
 #, fuzzy
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr "Rekursiver Download des Verzeichnisses `%s' bei %llu von %llu Bytes.\n"
 
-#: src/fs/fs_download.c:354
+#: src/fs/fs_download.c:329
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:536 src/fs/fs_download.c:554
+#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:872
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/fs/fs_download.c:1070
+#: src/fs/fs_download.c:958
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1108
+#: src/fs/fs_download.c:985
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1133
+#: src/fs/fs_download.c:1008
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1149
+#: src/fs/fs_download.c:1020
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1161
+#: src/fs/fs_download.c:1029
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_download.c:2017
+#: src/fs/fs_download.c:1826
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:116
-#: src/fs/gnunet-service-fs_indexing.c:177
+#: src/fs/gnunet-service-fs_indexing.c:113
+#: src/fs/gnunet-service-fs_indexing.c:163
 #, fuzzy, c-format
 msgid "Configuration option `%s' in section `%s' missing.\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:125
-#: src/fs/gnunet-service-fs_indexing.c:192
+#: src/fs/gnunet-service-fs_indexing.c:121
+#: src/fs/gnunet-service-fs_indexing.c:177
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:147
+#: src/fs/gnunet-service-fs_indexing.c:137
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/fs/gnunet-service-fs_indexing.c:252
+#: src/fs/gnunet-service-fs_indexing.c:228
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:297
+#: src/fs/gnunet-service-fs_indexing.c:266
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:548
+#: src/fs/gnunet-service-fs_indexing.c:487
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:628
+#: src/fs/gnunet-service-fs_indexing.c:552
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:632
+#: src/fs/gnunet-service-fs_indexing.c:554
 #, fuzzy
 msgid "not indexed"
 msgstr "Deindizierung schlug fehl."
 
-#: src/fs/gnunet-service-fs_indexing.c:663
+#: src/fs/gnunet-service-fs_indexing.c:569
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
 
-#: src/fs/fs_search.c:859
+#: src/fs/fs_search.c:798
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:388 src/fs/gnunet-service-fs_pr.c:633
+#: src/fs/gnunet-service-fs_pr.c:300
 #, fuzzy
+msgid "# Pending requests created"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/fs/gnunet-service-fs_pr.c:379 src/fs/gnunet-service-fs_pr.c:638
+#, fuzzy
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:769
+#: src/fs/gnunet-service-fs_pr.c:802
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:802
+#: src/fs/gnunet-service-fs_pr.c:829
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:821
+#: src/fs/gnunet-service-fs_pr.c:845
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:838
+#: src/fs/gnunet-service-fs_pr.c:860
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:937
+#: src/fs/gnunet-service-fs_pr.c:952
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:962
+#: src/fs/gnunet-service-fs_pr.c:979
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_pr.c:999
+#: src/fs/gnunet-service-fs_pr.c:1012
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1101
+#: src/fs/gnunet-service-fs_pr.c:1102
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1122
+#: src/fs/gnunet-service-fs_pr.c:1123
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1172
+#: src/fs/gnunet-service-fs_pr.c:1170
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1186
+#: src/fs/gnunet-service-fs_pr.c:1184
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1195
+#: src/fs/gnunet-service-fs_pr.c:1193
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1209
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1230
+#: src/fs/gnunet-service-fs_pr.c:1226
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1239
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1250
+#: src/fs/gnunet-service-fs_pr.c:1244
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1275 src/fs/gnunet-service-fs_pr.c:1323
-#: src/fs/gnunet-service-fs_pr.c:1442
+#: src/fs/gnunet-service-fs_pr.c:1270 src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1426
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1342
+#: src/fs/gnunet-service-fs_pr.c:1329
 msgid "# Datastore lookups concluded (found ultimate result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1356
+#: src/fs/gnunet-service-fs_pr.c:1342
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1421
+#: src/fs/gnunet-service-fs_pr.c:1404
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1487
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1576
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/fs/fs.c:313
+#: src/fs/fs.c:284
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs.c:324
+#: src/fs/fs.c:293
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs.c:332
+#: src/fs/fs.c:299
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs.c:967
+#: src/fs/fs.c:877
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs.c:1445
+#: src/fs/fs.c:1323
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs.c:1491
+#: src/fs/fs.c:1364
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1510
+#: src/fs/fs.c:1380
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs.c:2166
+#: src/fs/fs.c:1984
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2179
+#: src/fs/fs.c:1994
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs.c:2308 src/fs/fs.c:2570
+#: src/fs/fs.c:2107 src/fs/fs.c:2346
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs.c:2331
+#: src/fs/fs.c:2124
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs.c:2347 src/fs/fs.c:2368 src/fs/fs.c:2881
+#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2555
+#: src/fs/fs.c:2337
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs.c:2831
+#: src/fs/fs.c:2583
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs.c:2924
+#: src/fs/fs.c:2669
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:682
+#: src/fs/gnunet-service-fs_push.c:642
 #, c-format
 msgid ""
 "Invalid value specified for option `%s' in section `%s', content pushing "
 "disabled\n"
 msgstr ""
 
-#: src/block/plugin_block_fs.c:138
+#: src/block/plugin_block_fs.c:128
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:105
+#: src/block/plugin_block_dht.c:99
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/block/plugin_block_dht.c:114
+#: src/block/plugin_block_dht.c:106
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:126
+#: src/block/plugin_block_dht.c:115
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/block/block.c:113
+#: src/block/block.c:108
 #, fuzzy, c-format
 msgid "Loading block plugins `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/block/block.c:122
+#: src/block/block.c:118
 #, fuzzy, c-format
 msgid "Failed to load block plugin `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:953
+#: src/mesh/test_mesh_small.c:687
+msgid "Test mesh in a small network."
+msgstr ""
+
+#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:859
 #, fuzzy
 msgid "Failed to transmit shutdown ACK.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/arm/mockup-service.c:47 src/arm/gnunet-service-arm.c:959
+#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:864
 msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:71 src/arm/gnunet-service-arm.c:987
+#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:892
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:200
+#: src/arm/gnunet-service-arm.c:206
 #, c-format
 msgid "Restarting service `%s' due to configuration file change.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:229
+#: src/arm/gnunet-service-arm.c:234
 #, fuzzy
 msgid "Could not send status result to client\n"
 msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:266
+#: src/arm/gnunet-service-arm.c:268
 msgid "Not sending status result to client: no client known\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:428
+#: src/arm/gnunet-service-arm.c:406
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:432
+#: src/arm/gnunet-service-arm.c:409
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:460
+#: src/arm/gnunet-service-arm.c:435
 #, c-format
 msgid "ARM is shutting down, service `%s' not started.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:469
+#: src/arm/gnunet-service-arm.c:443
 #, fuzzy, c-format
 msgid "Service `%s' already running.\n"
 msgstr "Diese Suche läuft bereits!\n"
 
-#: src/arm/gnunet-service-arm.c:480
+#: src/arm/gnunet-service-arm.c:453
 #, fuzzy, c-format
 msgid "Binary implementing service `%s' not known!\n"
 msgstr ""
 "Signatur kann nicht verifiziert werden, der Knoten `%s' ist uns nicht "
 "bekannt!\n"
 
-#: src/arm/gnunet-service-arm.c:493
+#: src/arm/gnunet-service-arm.c:464
 #, fuzzy, c-format
 msgid "Configuration file `%s' for service `%s' not known!\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/arm/gnunet-service-arm.c:531
+#: src/arm/gnunet-service-arm.c:498
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:727
+#: src/arm/gnunet-service-arm.c:665
 msgid "Stopping all services\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:785
+#: src/arm/gnunet-service-arm.c:717
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:869
+#: src/arm/gnunet-service-arm.c:790
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:874
+#: src/arm/gnunet-service-arm.c:795
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:879
+#: src/arm/gnunet-service-arm.c:800
 #, fuzzy
 msgid "unknown"
 msgstr "Unbekannter Fehler"
 
-#: src/arm/gnunet-service-arm.c:891
+#: src/arm/gnunet-service-arm.c:807
 #, fuzzy, c-format
 msgid "Service `%s' stopped\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-service-arm.c:905
+#: src/arm/gnunet-service-arm.c:821
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:156
+#: src/arm/gnunet-arm.c:161
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-arm.c:160
+#: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
 msgid "Failed to stop service `%s'!\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/arm/gnunet-arm.c:166
+#: src/arm/gnunet-arm.c:171
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-arm.c:170
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Failed to start service `%s'!\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:181
 #, fuzzy, c-format
 msgid "Some error communicating with service `%s'.\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/arm/gnunet-arm.c:203
+#: src/arm/gnunet-arm.c:207
 #, fuzzy, c-format
 msgid "Service `%s' is running.\n"
 msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/arm/gnunet-arm.c:208
+#: src/arm/gnunet-arm.c:212
 #, fuzzy, c-format
 msgid "Service `%s' is not running.\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/arm/gnunet-arm.c:235
+#: src/arm/gnunet-arm.c:238
 #, fuzzy, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 "Es muss eine Liste von Freunden in der Konfigurationsdatei unter `%s' in der "
 "Sektion `%s' angegeben werden.\n"
 
-#: src/arm/gnunet-arm.c:244 src/arm/gnunet-arm.c:338
+#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:265
+#: src/arm/gnunet-arm.c:269
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/arm/gnunet-arm.c:271
+#: src/arm/gnunet-arm.c:275
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:387
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:389
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:371
+#: src/arm/gnunet-arm.c:391
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:373
+#: src/arm/gnunet-arm.c:393
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:375
+#: src/arm/gnunet-arm.c:396
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:378
+#: src/arm/gnunet-arm.c:399
 msgid "test if a particular service is running"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:380
+#: src/arm/gnunet-arm.c:402
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:382
+#: src/arm/gnunet-arm.c:404
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:391
+#: src/arm/gnunet-arm.c:407
+#, fuzzy
+msgid "timeout for completing current operation"
+msgstr "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in ms)"
+
+#: src/arm/gnunet-arm.c:418
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:820
+#: src/arm/gnunet-service-arm_interceptor.c:803
 #, c-format
 msgid "Unable to forward to service `%s': shutdown\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:828
+#: src/arm/gnunet-service-arm_interceptor.c:812
 #, c-format
 msgid "Unable to forward to service `%s': timeout before connect\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:895
+#: src/arm/gnunet-service-arm_interceptor.c:868
 #, fuzzy, c-format
 msgid "Unable to start service `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/arm/gnunet-service-arm_interceptor.c:964
+#: src/arm/gnunet-service-arm_interceptor.c:936
 #, fuzzy, c-format
 msgid "Unable to accept connection for service `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/arm/gnunet-service-arm_interceptor.c:982
+#: src/arm/gnunet-service-arm_interceptor.c:952
 #, fuzzy, c-format
 msgid "Service `%s' started\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:1112
+#: src/arm/gnunet-service-arm_interceptor.c:1080
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/arm/gnunet-service-arm_interceptor.c:1134
+#: src/arm/gnunet-service-arm_interceptor.c:1102
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1151
+#: src/arm/gnunet-service-arm_interceptor.c:1116
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:203 src/arm/test_exponential_backoff.c:194
+#: src/arm/arm_api.c:201 src/arm/test_exponential_backoff.c:192
 #, fuzzy
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/arm/arm_api.c:399
+#: src/arm/arm_api.c:390
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/arm/arm_api.c:414
+#: src/arm/arm_api.c:405
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/arm/arm_api.c:495
+#: src/arm/arm_api.c:469
 #, fuzzy, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/arm/arm_api.c:568
+#: src/arm/arm_api.c:539
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:569
+#: src/arm/arm_api.c:540
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:593
+#: src/arm/arm_api.c:563
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:594
+#: src/arm/arm_api.c:566
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:626 src/arm/arm_api.c:630
+#: src/arm/arm_api.c:598 src/arm/arm_api.c:602
 #, fuzzy, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr "`%s': Nachricht wurde nicht innerhalb %llu ms empfangen.\n"
 
-#: src/arm/arm_api.c:701
+#: src/arm/arm_api.c:675
 #, fuzzy, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr "Keine Antwort innerhalb %llums erhalten.\n"
 
-#: src/dht/dhtlog.c:57
+#: src/dht/dhtlog.c:56
 #, c-format
 msgid "Loading `%s' dhtlog plugin\n"
 msgstr ""
@@ -3306,1255 +3335,1019 @@
 msgid "Failed to load dhtlog plugin for `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:823
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:588
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:621
+#: src/dht/plugin_dhtlog_mysql_dump.c:895
 #: src/dht/plugin_dhtlog_mysql_dump_load.c:655
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:689
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:723
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:756
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:789
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:822
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:686
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:718
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:750
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:782
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:813
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:844
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:875
 #, fuzzy, c-format
 msgid "Failed to get full path for `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:852
+#: src/dht/plugin_dhtlog_mysql_dump.c:924
 #, fuzzy
 msgid "Failed to create file for dhtlog.\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/dht/gnunet-dht-get-peer.c:86
+#: src/dht/gnunet-dht-get-peer.c:84
 #, c-format
 msgid "Found %u peers\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:121
+#: src/dht/gnunet-dht-get-peer.c:115
 #, fuzzy, c-format
 msgid "Found peer `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/dht/gnunet-dht-get-peer.c:195 src/dht/gnunet-dht-put.c:173
-#: src/dht/gnunet-dht-get.c:205
+#: src/dht/gnunet-dht-get-peer.c:184 src/dht/gnunet-dht-put.c:161
+#: src/dht/gnunet-dht-get.c:195
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:198 src/dht/gnunet-dht-put.c:182
-#: src/dht/gnunet-dht-get.c:211
+#: src/dht/gnunet-dht-get-peer.c:187 src/dht/gnunet-dht-put.c:170
+#: src/dht/gnunet-dht-get.c:201
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:222
+#: src/dht/gnunet-dht-get-peer.c:209
 msgid "Issue a GET PEER request to the GNUnet DHT, print results."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:96
+#: src/dht/gnunet-dht-put.c:95
 #, fuzzy, c-format
 msgid "PUT request sent!\n"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:119
 #, c-format
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:130
+#: src/dht/gnunet-dht-put.c:127
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/dht/gnunet-dht-put.c:137
+#: src/dht/gnunet-dht-put.c:132
 #, fuzzy, c-format
 msgid "Connected to %s service!\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/dht/gnunet-dht-put.c:153
+#: src/dht/gnunet-dht-put.c:147
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:176
+#: src/dht/gnunet-dht-put.c:164
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:179
+#: src/dht/gnunet-dht-put.c:167
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:185
+#: src/dht/gnunet-dht-put.c:173
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:209
+#: src/dht/gnunet-dht-put.c:195
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:208
+#: src/dht/gnunet-dht-get.c:198
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:235
+#: src/dht/gnunet-dht-get.c:223
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/dht_api.c:238
+#: src/dht/dht_api.c:235
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/dht/plugin_dhtlog_mysql.c:1592
+#: src/dht/plugin_dhtlog_mysql.c:1550
 #, fuzzy
 msgid "Failed to initialize MySQL database connection for dhtlog.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/transport/test_plugin_transport_udp.c:196
-#: src/transport/test_plugin_transport_https.c:1194
-#: src/transport/test_plugin_transport.c:213
-#: src/transport/gnunet-service-transport.c:6586
-#: src/transport/test_plugin_transport_http.c:1277
+#: src/transport/test_plugin_transport_udp.c:185
+#: src/transport/test_plugin_transport_https.c:1271
+#: src/transport/test_plugin_transport.c:202
+#: src/transport/gnunet-service-transport.c:435
+#: src/transport/test_plugin_transport_http.c:1232
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:207
-#: src/transport/test_plugin_transport_https.c:1260
-#: src/transport/test_plugin_transport.c:224
-#: src/transport/gnunet-service-transport.c:6621
-#: src/transport/test_plugin_transport_http.c:1303
+#: src/transport/test_plugin_transport_udp.c:195
+#: src/transport/test_plugin_transport_https.c:1335
+#: src/transport/test_plugin_transport.c:212
+#: src/transport/gnunet-service-transport.c:444
+#: src/transport/test_plugin_transport_http.c:1255
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:217
+#: src/transport/test_plugin_transport_udp.c:205
 #, fuzzy
 msgid "Loading udp transport plugin\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/test_plugin_transport_udp.c:225
+#: src/transport/test_plugin_transport_udp.c:213
 #, fuzzy
 msgid "Failed to load transport plugin for udp\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/plugin_transport_wlan.c:1574
-#: src/transport/plugin_transport_wlan.c:1629
-#: src/transport/plugin_transport_wlan.c:1810
+#: src/transport/plugin_transport_wlan.c:1422
+#: src/transport/plugin_transport_wlan.c:1617
+#: src/transport/plugin_transport_wlan.c:1736
 #, c-format
 msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1955
+#: src/transport/plugin_transport_wlan.c:1854
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3213
+#: src/transport/plugin_transport_wlan.c:2710
 #, c-format
 msgid "Finished reading from wlan-helper stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:406
+#: src/transport/gnunet-service-transport_clients.c:246
+#, c-format
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:251
+#, fuzzy
+msgid "# messages dropped due to slow client"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/transport/gnunet-service-transport_clients.c:394
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:511
+#, fuzzy
+msgid "# bytes payload received for other peers"
+msgstr "# Bytes des Typs %d empfangen"
+
+#: src/transport/gnunet-service-transport_clients.c:528
+msgid "# bytes payload dropped (other peer was not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:579
+#, fuzzy
+msgid "# REQUEST CONNECT messages received"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/gnunet-service-transport_clients.c:607
+#, fuzzy
+msgid "# SET QUOTA messages received"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/gnunet-service-transport_neighbours.c:776
+#, fuzzy
+msgid "# messages not sent (no such peer or not connected)"
+msgstr "# defragmentierter Nachrichten"
+
+#: src/transport/gnunet-service-transport_neighbours.c:796
+#, fuzzy
+msgid "# bytes in message queue for other peers"
+msgstr "# Bytes ausgehender Nachrichten verworfen"
+
+#: src/transport/gnunet-service-transport_neighbours.c:864
+#, fuzzy
+msgid "# bandwidth quota violations by other peers"
+msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
+
+#: src/transport/gnunet-service-transport_neighbours.c:882
+msgid "# ms throttling suggested"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:907
+#, fuzzy
+msgid "# KEEPALIVE messages discarded (not connected)"
+msgstr "# defragmentierter Nachrichten"
+
+#: src/transport/gnunet-service-transport_neighbours.c:937
+msgid "# SET QUOTA messages ignored (no such peer)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:949
+msgid "# disconnects due to quota of 0"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:108
+msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:115
+#, fuzzy, c-format
+msgid "Starting transport plugins `%s'\n"
+msgstr "Teste Transport(e) %s\n"
+
+#: src/transport/gnunet-service-transport_plugins.c:119
+#, fuzzy, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr "Teste Transport(e) %s\n"
+
+#: src/transport/gnunet-service-transport_plugins.c:139
+#, fuzzy, c-format
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+
+#: src/transport/test_plugin_transport_https.c:409
 msgid "Phase 0: Test plugin functions failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:411
+#: src/transport/test_plugin_transport_https.c:418
 msgid "Phase 1: Test connect with wrong data failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:416
+#: src/transport/test_plugin_transport_https.c:427
 msgid "Phase 2: Test session selection failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:421
+#: src/transport/test_plugin_transport_https.c:435
 msgid "Phase 3: Test sending with plugin failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:694
-#: src/transport/test_plugin_transport_http.c:700
+#: src/transport/test_plugin_transport_https.c:726
+#: src/transport/test_plugin_transport_http.c:692
 #, fuzzy, c-format
 msgid "curl failed for `%s' at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/transport/test_plugin_transport_https.c:713
-#: src/transport/test_plugin_transport_http.c:721
+#: src/transport/test_plugin_transport_https.c:746
+#: src/transport/test_plugin_transport_http.c:712
 msgid "Connecting to peer without any peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:723
-#: src/transport/test_plugin_transport_http.c:733
+#: src/transport/test_plugin_transport_https.c:759
+#: src/transport/test_plugin_transport_http.c:725
 msgid "Connecting to peer with too short peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:733
-#: src/transport/test_plugin_transport_http.c:745
+#: src/transport/test_plugin_transport_https.c:772
+#: src/transport/test_plugin_transport_http.c:738
 msgid "Connecting to peer with too long peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:743
+#: src/transport/test_plugin_transport_https.c:785
 msgid "Connecting to peer with valid peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:884
-#: src/transport/test_plugin_transport_http.c:899
+#: src/transport/test_plugin_transport_https.c:924
+#: src/transport/test_plugin_transport_http.c:887
 #, c-format
 msgid "Unknown address size: ipv6 has %u ipv4 has %u but this has %u\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:891
-#: src/transport/test_plugin_transport_http.c:906
+#: src/transport/test_plugin_transport_https.c:930
+#: src/transport/test_plugin_transport_http.c:893
 #, c-format
 msgid "Transport plugin notification for address: `%s':%u\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:994
-#: src/transport/test_plugin_transport_http.c:1021
+#: src/transport/test_plugin_transport_https.c:1038
+#: src/transport/test_plugin_transport_http.c:1002
 msgid "Connecting to peer without any peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1005
-#: src/transport/test_plugin_transport_http.c:1037
+#: src/transport/test_plugin_transport_https.c:1053
+#: src/transport/test_plugin_transport_http.c:1017
 msgid "Connecting to peer with too short peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1018
-#: src/transport/test_plugin_transport_http.c:1051
+#: src/transport/test_plugin_transport_https.c:1069
+#: src/transport/test_plugin_transport_http.c:1033
 msgid "Connecting to peer with too long peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1029
-#: src/transport/test_plugin_transport_http.c:1068
+#: src/transport/test_plugin_transport_https.c:1083
+#: src/transport/test_plugin_transport_http.c:1047
 msgid "Connecting to peer with valid peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1038
+#: src/transport/test_plugin_transport_https.c:1093
 msgid ""
 "\n"
 "Phase 1: transmit data to all suggested addresses\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1085
+#: src/transport/test_plugin_transport_https.c:1151
 msgid ""
 "\n"
 "Phase 2: session selection\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1115
+#: src/transport/test_plugin_transport_https.c:1187
 msgid ""
 "\n"
 "Phase 3: send multiple or big messages after disconnect\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1120
+#: src/transport/test_plugin_transport_https.c:1193
 #, fuzzy
 msgid "Phase 3: sending messages\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/transport/test_plugin_transport_https.c:1210
-#: src/transport/plugin_transport_http.c:3380
-#: src/transport/test_plugin_transport_http.c:1293
+#: src/transport/test_plugin_transport_https.c:1284
+#: src/transport/plugin_transport_http.c:3321
+#: src/transport/test_plugin_transport_http.c:1245
 #, c-format
 msgid "Require valid port number for transport plugin `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1275
+#: src/transport/test_plugin_transport_https.c:1352
 #, fuzzy, c-format
 msgid "Loading HTTPS transport plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/test_plugin_transport_https.c:1281
+#: src/transport/test_plugin_transport_https.c:1358
 #, fuzzy
 msgid "Failed to load transport plugin for https\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/test_plugin_transport_https.c:1290
+#: src/transport/test_plugin_transport_https.c:1368
 #, c-format
 msgid "Transport plugin returned %u addresses to connect to\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1359
+#: src/transport/test_plugin_transport_https.c:1444
 msgid ""
 "\n"
 "Phase 0\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1417
-#: src/transport/test_plugin_transport_https.c:1420
+#: src/transport/test_plugin_transport_https.c:1507
+#: src/transport/test_plugin_transport_https.c:1510
 msgid ""
 "\n"
 "delete\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_transport_api.c:583
-#: src/transport/test_transport_api_reliability.c:596
-#: src/transport/test_transport_api_unreliability.c:641
-msgid "PATH environment variable is unset.\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-list-connections.c:86
-#: src/peerinfo-tool/gnunet-peerinfo.c:214
-#: src/core/gnunet-core-list-connections.c:170
+#: src/transport/gnunet-transport-list-connections.c:91
+#: src/peerinfo-tool/gnunet-peerinfo.c:200
+#: src/core/gnunet-core-list-connections.c:166
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültige Kommandozeilen Parameter:\n"
 
-#: src/transport/gnunet-transport-list-connections.c:109
-#: src/peerinfo-tool/gnunet-peerinfo.c:278
-#: src/core/gnunet-core-list-connections.c:194
+#: src/transport/gnunet-transport-list-connections.c:112
+#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/core/gnunet-core-list-connections.c:187
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/transport/gnunet-transport-list-connections.c:117
-#: src/core/gnunet-core-list-connections.c:202
+#: src/transport/gnunet-transport-list-connections.c:119
+#: src/core/gnunet-core-list-connections.c:194
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/test_plugin_transport.c:236
+#: src/transport/test_plugin_transport.c:224
 #, fuzzy
 msgid "Loading tcp transport plugin\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/test_plugin_transport.c:244
+#: src/transport/test_plugin_transport.c:232
 #, fuzzy
 msgid "Failed to load transport plugin for tcp\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/plugin_transport_http.c:700
-#: src/transport/plugin_transport_http.c:1259
-#: src/transport/plugin_transport_http.c:2585
+#: src/transport/gnunet-service-transport_hello.c:176
+msgid "# refreshed my HELLO"
+msgstr ""
+
+#: src/transport/plugin_transport_http.c:698
+#: src/transport/plugin_transport_http.c:1231
+#: src/transport/plugin_transport_http.c:2551
 #, fuzzy
 msgid "# HTTP peers active"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_http.c:1008
-#: src/transport/plugin_transport_http.c:1326
+#: src/transport/plugin_transport_http.c:993
+#: src/transport/plugin_transport_http.c:1306
 msgid "# HTTP inbound sessions for peers active"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1930
+#: src/transport/plugin_transport_http.c:1889
 #, c-format
 msgid "Connection %X: HTTP PUT to peer `%s' (`%s') failed: `%s' `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1954
+#: src/transport/plugin_transport_http.c:1915
 #, c-format
 msgid "Connection %X: HTTP GET to peer `%s' (`%s') failed: `%s' `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:2222
-#: src/transport/plugin_transport_http.c:2326
+#: src/transport/plugin_transport_http.c:2193
+#: src/transport/plugin_transport_http.c:2305
 #, fuzzy, c-format
 msgid "Connection: %X: %s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/transport/plugin_transport_http.c:2626
+#: src/transport/plugin_transport_http.c:2592
 msgid "# HTTP outbound sessions for peers active"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3407
-#: src/transport/plugin_transport_http.c:3435
+#: src/transport/plugin_transport_http.c:3349
+#: src/transport/plugin_transport_http.c:3378
 #, fuzzy
 msgid "Misconfigured address to bind to in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/transport/plugin_transport_http.c:3466
+#: src/transport/plugin_transport_http.c:3404
 #, fuzzy, c-format
 msgid "Required configuration options missing in section `%s'\n"
 msgstr ""
 "Es muss eine Liste von Freunden in der Konfigurationsdatei unter `%s' in der "
 "Sektion `%s' angegeben werden.\n"
 
-#: src/transport/plugin_transport_http.c:3502
-#, c-format
-msgid "Could not create a new TLS certificate, shell script `%s' failed!\n"
+#: src/transport/plugin_transport_http.c:3442
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3518
+#: src/transport/plugin_transport_http.c:3458
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3642
+#: src/transport/plugin_transport_http.c:3610
 #, c-format
 msgid ""
 "HTTP Server with %s could not be started on port %u! %s plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3658
+#: src/transport/plugin_transport_http.c:3626
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1145
-#, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/transport/gnunet-service-transport.c:1153
+#: src/transport/plugin_transport_tcp.c:504
 #, c-format
-msgid "Blacklist file `%s' is empty.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1166
-#, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/transport/gnunet-service-transport.c:1185
-#: src/transport/gnunet-service-transport.c:1206
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
-
-#: src/transport/gnunet-service-transport.c:1195
-#: src/transport/gnunet-service-transport.c:1228
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
-msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
-
-#: src/transport/gnunet-service-transport.c:1240
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
-
-#: src/transport/gnunet-service-transport.c:1257
-#, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1303
-msgid "# bytes discarded (could not transmit to client)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1428
-msgid "# address validation timeouts"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1465
-#, c-format
-msgid ""
-"Dropping message of type %u and size %u, have %u messages pending (%u is the "
-"soft limit)\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1471
-#, fuzzy
-msgid "# messages dropped due to slow client"
-msgstr "# gap Anfragen verworfen: Kollision in RT"
-
-#: src/transport/gnunet-service-transport.c:1575
-#: src/transport/gnunet-service-transport.c:1753
-msgid "# bytes pending with plugins"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1581
-#, fuzzy
-msgid "# bytes successfully transmitted by plugins"
-msgstr "# Bytes des Typs %d übertragen"
-
-#: src/transport/gnunet-service-transport.c:1588
-msgid "# bytes with transmission failure by plugins"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1614
-#: src/transport/gnunet-service-transport.c:2021
-#: src/transport/gnunet-service-transport.c:2028
-#: src/transport/gnunet-service-transport.c:2068
-#: src/transport/gnunet-service-transport.c:2467
-#: src/transport/gnunet-service-transport.c:2524
-#: src/transport/gnunet-service-transport.c:4917
-#, fuzzy
-msgid "# connected addresses"
-msgstr "# verbundener Knoten"
-
-#: src/transport/gnunet-service-transport.c:1671
-msgid "# transport selected peer address freely"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1679
-#, fuzzy
-msgid "# transport failed to selected peer address"
-msgstr "Transport %d wird ausgewählten anderen Knoten bekannt gegeben.\n"
-
-#: src/transport/gnunet-service-transport.c:1692
-#: src/transport/gnunet-service-transport.c:1749
-#: src/transport/gnunet-service-transport.c:1826
-#: src/transport/gnunet-service-transport.c:4945
-#, fuzzy
-msgid "# bytes in message queue for other peers"
-msgstr "# Bytes ausgehender Nachrichten verworfen"
-
-#: src/transport/gnunet-service-transport.c:1696
-msgid "# bytes discarded (no destination address available)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1708
-msgid "# message delivery deferred (no address)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1911
-#: src/transport/gnunet-service-transport.c:3838
-#, fuzzy
-msgid "# PING without HELLO messages sent"
-msgstr "# Klartext PING Nachrichten gesendet"
-
-#: src/transport/gnunet-service-transport.c:2140
-#, fuzzy
-msgid "# transmission attempts failed (no address)"
-msgstr "Kein Transport des Typs %d bekannt.\n"
-
-#: src/transport/gnunet-service-transport.c:2214
-msgid "# refreshed my HELLO"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2241
-msgid "# transmitted my HELLO to other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2354
-msgid "# disconnects due to try_fast_reconnect"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2419
-msgid "# disconnects due to session end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2455
-msgid "# disconnects due to unready session"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2482
-msgid "# try_fast_reconnect thanks to plugin_env_session_end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2491
-msgid "# disconnects due to missing pong"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2532
-msgid "# disconnects due to NO pong"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2545
-msgid "# try_fast_reconnect thanks to validated_address"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2569
-msgid "# disconnects due to plugin_env_session_end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3033
-msgid "# disconnects due to timeout"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3074
-msgid "# valid peer addresses returned by PEERINFO"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3093
-msgid "# previously validated addresses lacking transport"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3123
-#: src/transport/gnunet-service-transport.c:4206
-#: src/transport/gnunet-service-transport.c:4924
-#, fuzzy
-msgid "# peer addresses considered valid"
-msgstr "# Knotenankündigungen empfangen"
-
-#: src/transport/gnunet-service-transport.c:3168
-#: src/transport/gnunet-service-transport.c:3258
-#: src/transport/gnunet-service-transport.c:4581
-#: src/transport/gnunet-service-transport.c:4827
-#: src/transport/gnunet-service-transport.c:4987
-#: src/transport/gnunet-service-transport.c:6336
-msgid "# outstanding peerinfo iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3220
-#: src/transport/gnunet-service-transport.c:5009
-msgid "# active neighbours"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3254
-msgid "# peerinfo new neighbor iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3266
-msgid "# HELLO's sent to new neighbors"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3562
-msgid "# disconnects due to blacklist"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3833
-#, fuzzy
-msgid "# PING with HELLO messages sent"
-msgstr "# PING Nachrichten erstellt"
-
-#: src/transport/gnunet-service-transport.c:3842
-#, fuzzy
-msgid "# PING messages sent for re-validation"
-msgstr "# PING Nachrichten erstellt"
-
-#: src/transport/gnunet-service-transport.c:3966
-msgid "# payload received from other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4130
-#, c-format
-msgid ""
-"Not accepting PONG from `%s' with address `%s' since I cannot confirm using "
-"this address.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4169
-msgid "Received expired signature.  Check system time.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4173
-msgid "# address validation successes"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4287
-#: src/core/gnunet-service-core.c:4287
-#, fuzzy
-msgid "# PONG messages received"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
-
-#: src/transport/gnunet-service-transport.c:4400
-msgid "# PING messages sent for initial validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4442
-msgid "# peer addresses scheduled for validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4451
-#, c-format
-msgid ""
-"Transport `%s' not loaded, will not try to validate peer address using this "
-"transport.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4454
-msgid "# peer addresses not validated (plugin not available)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4470
-msgid "# peer addresses not validated (loopback)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4516
-msgid "# peer addresses not validated (in progress)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4605
-msgid "# new HELLOs requiring full validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4616
-msgid "# duplicate HELLO (peer known)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4661
-msgid "# no existing neighbour record (validating HELLO)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4666
-msgid "# HELLO validations (update case)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4706
-#, fuzzy
-msgid "# HELLOs received for validation"
-msgstr "# Blöcke migriert"
-
-#: src/transport/gnunet-service-transport.c:4737
-msgid "# HELLOs ignored for validation (is my own HELLO)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4754
-msgid "# HELLOs ignored due to high load"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4823
-msgid "# peerinfo process hello iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4949
-#, fuzzy
-msgid "# bytes discarded due to disconnect"
-msgstr "# Knotenankündigungen empfangen"
-
-#: src/transport/gnunet-service-transport.c:5054
-#, fuzzy, c-format
-msgid "Received `%s' message from `%s' destined for `%s' which is not me!\n"
-msgstr "Empfangener PING ist nicht an uns gerichtet!\n"
-
-#: src/transport/gnunet-service-transport.c:5076
-#: src/core/gnunet-service-core.c:4264
-#, fuzzy
-msgid "# PING messages received"
-msgstr "# PING Nachrichten erstellt"
-
-#: src/transport/gnunet-service-transport.c:5088
-#, c-format
-msgid "Refusing to create PONG since I do not have a session with `%s'.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5161
-#, c-format
-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5256
-msgid "# PONGs unicast via reliable transport"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5269
-msgid "# PONGs multicast to all available addresses"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5300
-#, fuzzy, c-format
-msgid "Could not send PONG to `%s': no address available\n"
-msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
-
-#: src/transport/gnunet-service-transport.c:5408
-#, fuzzy
-msgid "# bytes received from other peers"
-msgstr "# Bytes des Typs %d empfangen"
-
-#: src/transport/gnunet-service-transport.c:5425
-#, c-format
-msgid ""
-"Dropping incoming message due to repeated bandwidth quota (%u b/s) "
-"violations (total of %u).\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5429
-#, fuzzy
-msgid "# bandwidth quota violations by other peers"
-msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
-
-#: src/transport/gnunet-service-transport.c:5466
-#, fuzzy
-msgid "# HELLO messages received from other peers"
-msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
-
-#: src/transport/gnunet-service-transport.c:5497
-msgid "# ms throttling suggested"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5547
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5621
-#, fuzzy
-msgid "# HELLOs received from clients"
-msgstr "Empfangene Client-Nachricht ist ungültig.\n"
-
-#: src/transport/gnunet-service-transport.c:5714
-msgid "# payload received for other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5757
-#, fuzzy
-msgid "# REQUEST CONNECT messages received"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
-
-#: src/transport/gnunet-service-transport.c:5788
-#, fuzzy
-msgid "# SET QUOTA messages received"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
-
-#: src/transport/gnunet-service-transport.c:5796
-msgid "# SET QUOTA messages ignored (no such peer)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5819
-msgid "# disconnects due to quota of 0"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:6137
-#, fuzzy, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr "Teste Transport(e) %s\n"
-
-#: src/transport/gnunet-service-transport.c:6149
-#, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
-
-#: src/transport/gnunet-service-transport.c:6645
-#, fuzzy, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr "Teste Transport(e) %s\n"
-
-#: src/transport/gnunet-service-transport.c:6738
-msgid "Transport service ready.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:515
-#, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:606
-#: src/transport/plugin_transport_tcp.c:702
-#: src/transport/plugin_transport_tcp.c:756
-#: src/transport/plugin_transport_tcp.c:848
-#: src/transport/plugin_transport_tcp.c:1208
+#: src/transport/plugin_transport_tcp.c:590
+#: src/transport/plugin_transport_tcp.c:679
+#: src/transport/plugin_transport_tcp.c:728
+#: src/transport/plugin_transport_tcp.c:817
+#: src/transport/plugin_transport_tcp.c:1142
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transport/plugin_transport_tcp.c:614
-#: src/transport/plugin_transport_tcp.c:877
-#: src/transport/plugin_transport_tcp.c:1623
+#: src/transport/plugin_transport_tcp.c:596
+#: src/transport/plugin_transport_tcp.c:843
+#: src/transport/plugin_transport_tcp.c:1531
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_tcp.c:706
+#: src/transport/plugin_transport_tcp.c:683
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:760
+#: src/transport/plugin_transport_tcp.c:731
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:852
+#: src/transport/plugin_transport_tcp.c:821
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:989
+#: src/transport/plugin_transport_tcp.c:942
 #, fuzzy
 msgid "# bytes TCP was asked to transmit"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:1046
+#: src/transport/plugin_transport_tcp.c:993
 msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1091
+#: src/transport/plugin_transport_tcp.c:1034
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1110
+#: src/transport/plugin_transport_tcp.c:1051
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1168
+#: src/transport/plugin_transport_tcp.c:1103
 #, fuzzy
 msgid "# bytes discarded by TCP (failed to connect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1284
+#: src/transport/plugin_transport_tcp.c:1211
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1670
+#: src/transport/plugin_transport_tcp.c:1574
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:1831
+#: src/transport/plugin_transport_tcp.c:1722
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:1896
+#: src/transport/plugin_transport_tcp.c:1788
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2063
+#: src/transport/plugin_transport_tcp.c:1941
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2135
+#: src/transport/plugin_transport_tcp.c:2001
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transport/plugin_transport_tcp.c:2161
+#: src/transport/plugin_transport_tcp.c:2024
 #, 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:2166
+#: src/transport/plugin_transport_tcp.c:2028
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2170
+#: src/transport/plugin_transport_tcp.c:2032
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_validation.c:520
+msgid "# address records discarded"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:606
+#: src/core/gnunet-service-core.c:4187
+#, fuzzy
+msgid "# PING messages received"
+msgstr "# PING Nachrichten erstellt"
+
+#: src/transport/gnunet-service-transport_validation.c:628
+#, c-format
+msgid ""
+"Not confirming PING with address `%s' since I cannot confirm having this "
+"address.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:685
+msgid "# PONGs unicast via reliable transport"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:694
+msgid "# PONGs multicast to all available addresses"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:758
+#, c-format
+msgid ""
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:792
+#, fuzzy
+msgid "# PING without HELLO messages sent"
+msgstr "# Klartext PING Nachrichten gesendet"
+
+#: src/transport/gnunet-service-transport_validation.c:864
+msgid "# address revalidations started"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:923
+#: src/core/gnunet-service-core.c:4210
+#, fuzzy
+msgid "# PONG messages received"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/gnunet-service-transport_validation.c:945
+msgid "# PONGs dropped, no matching pending validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:961
+msgid "# PONGs dropped, signature expired"
+msgstr ""
+
 #: src/transport/plugin_transport_smtp.c:367
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr ""
 "Es wurde eine ungültige Nachricht per SMTP empfangen (ungültige Größe).\n"
 
-#: src/transport/plugin_transport_smtp.c:459
+#: src/transport/plugin_transport_smtp.c:454
 #, fuzzy
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n"
 
-#: src/transport/plugin_transport_smtp.c:469
+#: src/transport/plugin_transport_smtp.c:463
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "SMTP Filterstring zu lang, wurde auf `%s' abgeschnitten\n"
 
-#: src/transport/plugin_transport_smtp.c:565
-#: src/transport/plugin_transport_smtp.c:576
-#: src/transport/plugin_transport_smtp.c:590
-#: src/transport/plugin_transport_smtp.c:610
-#: src/transport/plugin_transport_smtp.c:635
+#: src/transport/plugin_transport_smtp.c:558
+#: src/transport/plugin_transport_smtp.c:568
+#: src/transport/plugin_transport_smtp.c:581
+#: src/transport/plugin_transport_smtp.c:600
+#: src/transport/plugin_transport_smtp.c:623
+#: src/transport/plugin_transport_smtp.c:631
 #: src/transport/plugin_transport_smtp.c:644
-#: src/transport/plugin_transport_smtp.c:658
-#: src/transport/plugin_transport_smtp.c:670
+#: src/transport/plugin_transport_smtp.c:655
 #, fuzzy, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "`%s' schlug fehl: %s\n"
 
-#: src/transport/plugin_transport_smtp.c:816
+#: src/transport/plugin_transport_smtp.c:798
 #, fuzzy
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 "Kein Filter für E-Mail angegeben, es kann keine Bekanntmachung erstellt "
 "werden.\n"
 
-#: src/transport/plugin_transport_smtp.c:833
+#: src/transport/plugin_transport_smtp.c:810
 #, fuzzy
 msgid "# bytes received via SMTP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_smtp.c:834
+#: src/transport/plugin_transport_smtp.c:811
 #, fuzzy
 msgid "# bytes sent via SMTP"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transport/plugin_transport_smtp.c:836
+#: src/transport/plugin_transport_smtp.c:813
 #, fuzzy
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/test_plugin_transport_http.c:1319
+#: src/transport/test_plugin_transport_http.c:1271
 #, fuzzy, c-format
 msgid "Loading HTTP transport plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/test_plugin_transport_http.c:1326
+#: src/transport/test_plugin_transport_http.c:1278
 #, fuzzy
 msgid "Failed to load transport plugin for http\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/test_plugin_transport_http.c:1408
+#: src/transport/test_plugin_transport_http.c:1364
 msgid ""
 "Phase 0\n"
 "\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1352
-#: src/transport/plugin_transport_unix.c:1118
+#: src/transport/plugin_transport_udp.c:1279
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1410
+#: src/transport/plugin_transport_udp.c:1329
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_udp.c:1541
+#: src/transport/plugin_transport_udp.c:1455
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/transport_api.c:582
+#: src/transport/transport_api.c:570
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Es wurde eine unbekannte Testbed Nachricht des Typs %u empfangen.\n"
 
-#: src/transport/plugin_transport_unix.c:1144
+#: src/transport/plugin_transport_unix.c:1092
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/chat/chat.c:177
+#: src/transport/gnunet-service-transport_blacklist.c:247
+#, fuzzy, c-format
+msgid "Could not read blacklist file `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:254
+#, c-format
+msgid "Blacklist file `%s' is empty.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:266
+#, fuzzy, c-format
+msgid "Failed to read blacklist from `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:287
+#: src/transport/gnunet-service-transport_blacklist.c:311
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:298
+#: src/transport/gnunet-service-transport_blacklist.c:336
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:350
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:364
+#, c-format
+msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:522
+#: src/transport/gnunet-service-transport_blacklist.c:754
+msgid "# disconnects due to blacklist"
+msgstr ""
+
+#: src/chat/chat.c:175
 #, fuzzy
 msgid "Could not transmit confirmation receipt\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/chat/chat.c:288
+#: src/chat/chat.c:283
 msgid "The current user must be the the first one joined\n"
 msgstr ""
 
-#: src/chat/chat.c:424
+#: src/chat/chat.c:412
 #, fuzzy, c-format
 msgid "Unknown message type: '%u'\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/chat/chat.c:489
+#: src/chat/chat.c:472
 #, fuzzy, c-format
 msgid "Configuration option `%s' in section `%s' missing\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/chat/chat.c:498
+#: src/chat/chat.c:480
 #, fuzzy, c-format
 msgid "Failed to access chat home directory `%s'\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/chat/chat.c:517
+#: src/chat/chat.c:498
 #, fuzzy, c-format
 msgid "Failed to create/open key in file `%s'\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/chat/chat.c:581
+#: src/chat/chat.c:559
 #, fuzzy
 msgid "Could not serialize metadata\n"
 msgstr "Konnte libgnunetutil nicht initialisieren!\n"
 
-#: src/chat/chat.c:701
+#: src/chat/chat.c:674
 #, fuzzy
 msgid "Failed to connect to the chat service\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/chat/chat.c:707
+#: src/chat/chat.c:680
 msgid "Undefined mandatory parameter: joinCallback\n"
 msgstr ""
 
-#: src/chat/chat.c:713
+#: src/chat/chat.c:686
 msgid "Undefined mandatory parameter: messageCallback\n"
 msgstr ""
 
-#: src/chat/chat.c:719
+#: src/chat/chat.c:692
 msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:89
+#: src/chat/gnunet-chat.c:92
 #, c-format
 msgid "Joined\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:123
+#: src/chat/gnunet-chat.c:124
 msgid "anonymous"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:129
+#: src/chat/gnunet-chat.c:130
 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "`%s' %s schlug fehl: %s\n"
 
-#: src/chat/gnunet-chat.c:132 src/chat/gnunet-chat.c:135
+#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr "`%s' %s schlug fehl: %s\n"
 
-#: src/chat/gnunet-chat.c:138
+#: src/chat/gnunet-chat.c:139
 #, fuzzy, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/chat/gnunet-chat.c:141
+#: src/chat/gnunet-chat.c:142
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:144
+#: src/chat/gnunet-chat.c:145
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:147
+#: src/chat/gnunet-chat.c:148
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:150
+#: src/chat/gnunet-chat.c:151
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:153
+#: src/chat/gnunet-chat.c:156
 #, fuzzy, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:159
 #, fuzzy, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:162
 #, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:191
+#: src/chat/gnunet-chat.c:193
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:222
+#: src/chat/gnunet-chat.c:224
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:222
+#: src/chat/gnunet-chat.c:224
 #, fuzzy, c-format
 msgid "`%s' left the room\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/chat/gnunet-chat.c:286 src/chat/gnunet-chat.c:326
+#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
 #, fuzzy, c-format
 msgid "Could not change username\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/chat/gnunet-chat.c:290 src/chat/gnunet-chat.c:660
+#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:629
 #, fuzzy, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr "Ungültige Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/chat/gnunet-chat.c:330
+#: src/chat/gnunet-chat.c:320
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/chat/gnunet-chat.c:343
+#: src/chat/gnunet-chat.c:333
 #, c-format
 msgid "Users in room `%s': "
 msgstr ""
 
-#: src/chat/gnunet-chat.c:383
+#: src/chat/gnunet-chat.c:371
 #, c-format
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:391
+#: src/chat/gnunet-chat.c:379
 #, fuzzy, c-format
 msgid "Unknown user `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/chat/gnunet-chat.c:407
+#: src/chat/gnunet-chat.c:395
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:448
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/chat/gnunet-chat.c:478
+#: src/chat/gnunet-chat.c:459
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:463
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:467
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:470
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:472
 msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:493
+#: src/chat/gnunet-chat.c:474
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:496
+#: src/chat/gnunet-chat.c:477
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:499
+#: src/chat/gnunet-chat.c:480
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:501
+#: src/chat/gnunet-chat.c:482
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:503
+#: src/chat/gnunet-chat.c:484
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:505
+#: src/chat/gnunet-chat.c:486
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:508
+#: src/chat/gnunet-chat.c:489
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:510
+#: src/chat/gnunet-chat.c:491
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:627
+#: src/chat/gnunet-chat.c:605
 #, fuzzy, c-format
 msgid "You must specify a nickname\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/chat/gnunet-chat.c:652
+#: src/chat/gnunet-chat.c:621
 #, fuzzy, c-format
 msgid "Failed to join room `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/chat/gnunet-chat.c:685
+#: src/chat/gnunet-chat.c:654
 msgid "set the nickname to use (required)"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:688
+#: src/chat/gnunet-chat.c:657
 msgid "set the chat room to join"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:702
+#: src/chat/gnunet-chat.c:669
 msgid "Join a chat on GNUnet."
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:273
+#: src/chat/gnunet-service-chat.c:267
 #, fuzzy
 msgid "Failed to queue a message notification\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/chat/gnunet-service-chat.c:566
+#: src/chat/gnunet-service-chat.c:546
 #, fuzzy
 msgid "Failed to queue a join notification\n"
 msgstr "Fehler beim Abfragen der Netzwerkverkehrsbedingungen von gnunetd.\n"
 
-#: src/chat/gnunet-service-chat.c:764
+#: src/chat/gnunet-service-chat.c:729
 #, fuzzy
 msgid "Failed to queue a confirmation receipt\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/chat/gnunet-service-chat.c:952
+#: src/chat/gnunet-service-chat.c:907
 #, fuzzy
 msgid "Failed to queue a leave notification\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
@@ -4565,30 +4358,30 @@
 msgid "Peer `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:241
+#: src/peerinfo-tool/gnunet-peerinfo.c:222
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:249
+#: src/peerinfo-tool/gnunet-peerinfo.c:229
 #, 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:261
+#: src/peerinfo-tool/gnunet-peerinfo.c:241
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:281
+#: src/peerinfo-tool/gnunet-peerinfo.c:261
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:284
+#: src/peerinfo-tool/gnunet-peerinfo.c:264
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:292
+#: src/peerinfo-tool/gnunet-peerinfo.c:270
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -4598,33 +4391,33 @@
 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:223
+#: src/datastore/plugin_datastore_sqlite.c:239
 #, fuzzy, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:253
+#: src/datastore/plugin_datastore_sqlite.c:266
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:669
+#: src/datastore/plugin_datastore_sqlite.c:662
 #, 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:1110
+#: src/datastore/plugin_datastore_sqlite.c:1115
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1138
+#: src/datastore/plugin_datastore_sqlite.c:1134
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1179
+#: src/datastore/plugin_datastore_sqlite.c:1173
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite Datenspeicher"
@@ -4634,365 +4427,377 @@
 msgid "# bytes used in file-sharing datastore"
 msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/datastore/gnunet-service-datastore.c:347
+#: src/datastore/gnunet-service-datastore.c:331
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/datastore/gnunet-service-datastore.c:427
+#: src/datastore/gnunet-service-datastore.c:397
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:496
+#: src/datastore/gnunet-service-datastore.c:457
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:665
+#: src/datastore/gnunet-service-datastore.c:610
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:712
+#: src/datastore/gnunet-service-datastore.c:655
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:724
+#: src/datastore/gnunet-service-datastore.c:666
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:728
+#: src/datastore/gnunet-service-datastore.c:670
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:734
+#: src/datastore/gnunet-service-datastore.c:676
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:740
-#: src/datastore/gnunet-service-datastore.c:795
-#: src/datastore/gnunet-service-datastore.c:1041
-#: src/datastore/gnunet-service-datastore.c:1596
+#: src/datastore/gnunet-service-datastore.c:681
+#: src/datastore/gnunet-service-datastore.c:735
+#: src/datastore/gnunet-service-datastore.c:953
+#: src/datastore/gnunet-service-datastore.c:1438
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:810
+#: src/datastore/gnunet-service-datastore.c:750
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:908
+#: src/datastore/gnunet-service-datastore.c:835
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1099
+#: src/datastore/gnunet-service-datastore.c:1001
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1115
+#: src/datastore/gnunet-service-datastore.c:1015
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1150
+#: src/datastore/gnunet-service-datastore.c:1043
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1189
+#: src/datastore/gnunet-service-datastore.c:1077
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1227
+#: src/datastore/gnunet-service-datastore.c:1112
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1263
+#: src/datastore/gnunet-service-datastore.c:1139
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1276
+#: src/datastore/gnunet-service-datastore.c:1149
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1316
+#: src/datastore/gnunet-service-datastore.c:1183
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1371
+#: src/datastore/gnunet-service-datastore.c:1227
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1452
-#: src/datastore/test_plugin_datastore.c:361
-#: src/datastore/perf_plugin_datastore.c:467
+#: src/datastore/gnunet-service-datastore.c:1300
+#: src/datastore/test_plugin_datastore.c:322
+#: src/datastore/perf_plugin_datastore.c:420
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1460
+#: src/datastore/gnunet-service-datastore.c:1309
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1648
+#: src/datastore/gnunet-service-datastore.c:1488
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1653
+#: src/datastore/gnunet-service-datastore.c:1490
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1667
+#: src/datastore/gnunet-service-datastore.c:1500
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1680
+#: src/datastore/gnunet-service-datastore.c:1513
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/datastore/plugin_datastore_template.c:252
+#: src/datastore/plugin_datastore_template.c:241
 msgid "Template database running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:292
+#: src/datastore/datastore_api.c:287
 #, fuzzy
 msgid "Failed to transmit request to drop database.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/datastore/datastore_api.c:380
+#: src/datastore/datastore_api.c:370
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:432
+#: src/datastore/datastore_api.c:417
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:462
+#: src/datastore/datastore_api.c:444
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:493
+#: src/datastore/datastore_api.c:465
 #, fuzzy
 msgid "# Requests dropped from datastore queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/datastore/datastore_api.c:543
+#: src/datastore/datastore_api.c:514
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:573
+#: src/datastore/datastore_api.c:541
 msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/datastore/datastore_api.c:644
+#: src/datastore/datastore_api.c:606
 #, fuzzy
 msgid "Failed to transmit request to DATASTORE.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/datastore/datastore_api.c:646
+#: src/datastore/datastore_api.c:608
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/datastore/datastore_api.c:673
+#: src/datastore/datastore_api.c:631
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# bytes in der Datenbank"
 
-#: src/datastore/datastore_api.c:822
+#: src/datastore/datastore_api.c:768
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr ""
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:836
+#: src/datastore/datastore_api.c:781
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:848 src/datastore/datastore_api.c:855
+#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
 
-#: src/datastore/datastore_api.c:864
+#: src/datastore/datastore_api.c:806
 #, fuzzy
 msgid "# status messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/datastore/datastore_api.c:947
+#: src/datastore/datastore_api.c:878
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1024
+#: src/datastore/datastore_api.c:950
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1092
+#: src/datastore/datastore_api.c:1015
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1159
+#: src/datastore/datastore_api.c:1078
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1234
+#: src/datastore/datastore_api.c:1148
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1281
+#: src/datastore/datastore_api.c:1193
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr ""
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1345
+#: src/datastore/datastore_api.c:1254
 #, fuzzy
 msgid "# Results received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/datastore/datastore_api.c:1424
+#: src/datastore/datastore_api.c:1326
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1492
+#: src/datastore/datastore_api.c:1393
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1563
+#: src/datastore/datastore_api.c:1457
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/plugin_datastore_mysql.c:515
+#: src/datastore/plugin_datastore_mysql.c:529
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/datastore/plugin_datastore_mysql.c:608
+#: src/datastore/plugin_datastore_mysql.c:622
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1484
+#: src/datastore/plugin_datastore_mysql.c:1500
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:177
+#: src/datastore/plugin_datastore_postgres.c:173
 #, fuzzy, c-format
 msgid "Unable to initialize Postgres with configuration `%s': %s"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/datastore/plugin_datastore_postgres.c:1116
+#: src/datastore/plugin_datastore_postgres.c:979
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:161
+#: src/dv/plugin_transport_dv.c:159
 #, fuzzy, c-format
 msgid "%s Received message from %s of type %d, distance %u!\n"
 msgstr "Beschädigte Nachricht von Knoten `%s' in %s:%d empfangen.\n"
 
-#: src/dv/dv_api.c:179
+#: src/dv/dv_api.c:178
 #, fuzzy
 msgid "Failed to connect to the dv service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/nse/nse-profiler.c:462
-#, fuzzy
-msgid "Run a test of the NSE service."
-msgstr "Auf den Dienst konnte nicht zugegriffen werden"
+#: src/nse/gnunet-service-nse.c:864
+#, c-format
+msgid "Proof of work invalid: %llu!\n"
+msgstr ""
 
-#: src/nse/gnunet-service-nse.c:998
+#: src/nse/gnunet-service-nse.c:1286 src/nse/gnunet-service-nse.c:1305
+#: src/nse/gnunet-service-nse.c:1326
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1008
-msgid "NSE Service could not access hostkey.  Exiting.\n"
-msgstr ""
+#: src/nse/gnunet-service-nse.c:1293
+#, fuzzy
+msgid "Invalid work requirement for NSE service. Exiting.\n"
+msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/core/gnunet-service-core.c:935
+#: src/nse/gnunet-service-nse.c:1314
+#, fuzzy
+msgid "NSE service could not access hostkey.  Exiting.\n"
+msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+
+#: src/nse/gnunet-nse-profiler.c:673
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "Auf den Dienst konnte nicht zugegriffen werden"
+
+#: src/core/gnunet-service-core.c:920
 msgid "# total peer preference"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1063
+#: src/core/gnunet-service-core.c:1040
 msgid "# peer status changes"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1176
+#: src/core/gnunet-service-core.c:1236
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core.c:1662
+#: src/core/gnunet-service-core.c:1712
 #, c-format
 msgid ""
 "Client asked for preference change with peer `%s', which is not connected!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1747 src/core/gnunet-service-core.c:4318
-#: src/core/gnunet-service-core.c:4541
+#: src/core/gnunet-service-core.c:1793 src/core/gnunet-service-core.c:4240
+#: src/core/gnunet-service-core.c:4456
 msgid "# established sessions"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1794
+#: src/core/gnunet-service-core.c:1838
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/core/gnunet-service-core.c:1933 src/core/gnunet-service-core.c:2781
-#: src/core/gnunet-service-core.c:4623
+#: src/core/gnunet-service-core.c:1964 src/core/gnunet-service-core.c:2793
+#: src/core/gnunet-service-core.c:4532
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2003
+#: src/core/gnunet-service-core.c:2031
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2114
+#: src/core/gnunet-service-core.c:2134
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core.c:2289
+#: src/core/gnunet-service-core.c:2314
 msgid "# transmissions delayed due to corking"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2494
+#: src/core/gnunet-service-core.c:2517
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2849
+#: src/core/gnunet-service-core.c:2857
 #, fuzzy
 msgid "# messages discarded (disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core.c:2906 src/core/gnunet-service-core.c:4741
+#: src/core/gnunet-service-core.c:2909 src/core/gnunet-service-core.c:4644
 msgid "# discarded CORE_SEND requests"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2919 src/core/gnunet-service-core.c:4742
+#: src/core/gnunet-service-core.c:2924 src/core/gnunet-service-core.c:4648
 msgid "# discarded lower priority CORE_SEND requests"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2994
+#: src/core/gnunet-service-core.c:2996
 #, fuzzy
 msgid "# connection requests received"
 msgstr "# Client Trace-Anfragen empfangen"
@@ -5001,181 +4806,237 @@
 msgid "# connection requests ignored (already connected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3057 src/core/gnunet-service-core.c:3741
+#: src/core/gnunet-service-core.c:3054 src/core/gnunet-service-core.c:3697
 msgid "# SET_KEY messages deferred (need public key)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3070
+#: src/core/gnunet-service-core.c:3067
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3105
+#: src/core/gnunet-service-core.c:3099
 msgid "# Error extracting public key from HELLO"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3151
+#: src/core/gnunet-service-core.c:3145
 msgid "# Asking transport to connect (for SET_KEY)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3286
+#: src/core/gnunet-service-core.c:3270
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core.c:3367
+#: src/core/gnunet-service-core.c:3349
 #, c-format
 msgid ""
 "Ignoring `%s' message due to lack of public key for peer `%4s' (failed to "
 "obtain one).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3471
+#: src/core/gnunet-service-core.c:3444
 #, fuzzy
 msgid "# PING messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core.c:3483
+#: src/core/gnunet-service-core.c:3456
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3515
+#: src/core/gnunet-service-core.c:3481
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core.c:3574
+#: src/core/gnunet-service-core.c:3534
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core.c:3617
+#: src/core/gnunet-service-core.c:3572
 #, fuzzy
 msgid "# Session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core.c:3751
+#: src/core/gnunet-service-core.c:3706
 #, fuzzy, c-format
 msgid "Received `%s' message that was for `%s', not for me.  Ignoring.\n"
 msgstr "Größe der `%s' Nachricht ist zu kurz. Nachricht wird ignoriert.\n"
 
-#: src/core/gnunet-service-core.c:3796
+#: src/core/gnunet-service-core.c:3748
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core.c:3953
+#: src/core/gnunet-service-core.c:3894
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core.c:3997
+#: src/core/gnunet-service-core.c:3941
 msgid "# messages not delivered to any client"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4076 src/core/gnunet-service-core.c:4102
+#: src/core/gnunet-service-core.c:4011 src/core/gnunet-service-core.c:4036
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core.c:4088
+#: src/core/gnunet-service-core.c:4023
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core.c:4126
+#: src/core/gnunet-service-core.c:4060
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/core/gnunet-service-core.c:4129
+#: src/core/gnunet-service-core.c:4064
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core.c:4162
+#: src/core/gnunet-service-core.c:4094
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core.c:4230
+#: src/core/gnunet-service-core.c:4157
 #, fuzzy
 msgid "# session keys received"
 msgstr "# Sitzungsschlüssel abgelehnt"
 
-#: src/core/gnunet-service-core.c:4248
+#: src/core/gnunet-service-core.c:4173
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4306
+#: src/core/gnunet-service-core.c:4229
 #, fuzzy, c-format
 msgid "Unsupported message of type %u received.\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/core/gnunet-service-core.c:4481 src/core/gnunet-service-core.c:4572
+#: src/core/gnunet-service-core.c:4403 src/core/gnunet-service-core.c:4485
 #, fuzzy
 msgid "# peers connected (transport)"
 msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
-#: src/core/gnunet-service-core.c:4695
+#: src/core/gnunet-service-core.c:4599
 msgid "Core service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4713
+#: src/core/gnunet-service-core.c:4617
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4751
+#: src/core/gnunet-service-core.c:4656
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/core_api.c:874
+#: src/core/core_api.c:832
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:291 src/include/gnunet_common.h:296
-#: src/include/gnunet_common.h:302
+#: src/include/gnunet_common.h:296 src/include/gnunet_common.h:301
+#: src/include/gnunet_common.h:307
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:312
+#: src/include/gnunet_common.h:317
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:326
+#: src/include/gnunet_common.h:331
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
-#: src/include/gnunet_getopt_lib.h:145
+#: src/include/gnunet_getopt_lib.h:144
 msgid "print this help"
 msgstr "Gibt diese Hilfe aus"
 
-#: src/include/gnunet_getopt_lib.h:155
+#: src/include/gnunet_getopt_lib.h:154
 msgid "print the version number"
 msgstr "Versionsnummer ausgeben"
 
-#: src/include/gnunet_getopt_lib.h:164
+#: src/include/gnunet_getopt_lib.h:163
 msgid "configure logging to write logs to LOGFILE"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:173
+#: src/include/gnunet_getopt_lib.h:172
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:182
+#: src/include/gnunet_getopt_lib.h:181
 msgid "be verbose"
 msgstr "umfangreiche Meldungen ausgeben"
 
-#: src/include/gnunet_getopt_lib.h:191
+#: src/include/gnunet_getopt_lib.h:190
 msgid "use configuration file FILENAME"
 msgstr "Konfigurationsdatei FILENAME verwenden"
 
+#, fuzzy
+#~ msgid "Failed to connect to core service\n"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "# bytes successfully transmitted by plugins"
+#~ msgstr "# Bytes des Typs %d übertragen"
+
+#, fuzzy
+#~ msgid "# connected addresses"
+#~ msgstr "# verbundener Knoten"
+
+#, fuzzy
+#~ msgid "# transport failed to selected peer address"
+#~ msgstr "Transport %d wird ausgewählten anderen Knoten bekannt gegeben.\n"
+
+#, fuzzy
+#~ msgid "# transmission attempts failed (no address)"
+#~ msgstr "Kein Transport des Typs %d bekannt.\n"
+
+#, fuzzy
+#~ msgid "# peer addresses considered valid"
+#~ msgstr "# Knotenankündigungen empfangen"
+
+#, fuzzy
+#~ msgid "# PING with HELLO messages sent"
+#~ msgstr "# PING Nachrichten erstellt"
+
+#, fuzzy
+#~ msgid "# PING messages sent for re-validation"
+#~ msgstr "# PING Nachrichten erstellt"
+
+#, fuzzy
+#~ msgid "# HELLOs received for validation"
+#~ msgstr "# Blöcke migriert"
+
+#, fuzzy
+#~ msgid "# bytes discarded due to disconnect"
+#~ msgstr "# Knotenankündigungen empfangen"
+
+#, fuzzy
+#~ msgid "Received `%s' message from `%s' destined for `%s' which is not me!\n"
+#~ msgstr "Empfangener PING ist nicht an uns gerichtet!\n"
+
+#, fuzzy
+#~ msgid "Could not send PONG to `%s': no address available\n"
+#~ msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
+
+#, fuzzy
+#~ msgid "# HELLO messages received from other peers"
+#~ msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
+
+#, fuzzy
+#~ msgid "# HELLOs received from clients"
+#~ msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+
 #~ msgid "Error"
 #~ msgstr "Fehler"
 
@@ -5786,10 +5647,6 @@
 #~ msgid "sleep for SPACE ms after each a message block"
 #~ msgstr "Für SPACE ms nach jedem Nachrichtenblock pausieren"
 
-#~ msgid "time to wait for the completion of an iteration (in ms)"
-#~ msgstr ""
-#~ "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in ms)"
-
 #~ msgid "number of messages in a message block"
 #~ msgstr "Anzahl an Nachrichten in einem Nachrichtenblock"
 

Modified: gnunet/po/es.gmo
===================================================================
(Binary files differ)

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2011-09-13 12:43:24 UTC (rev 16810)
+++ gnunet/po/es.po     2011-09-13 12:44:25 UTC (rev 16811)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-07-19 15:16+0200\n"
+"POT-Creation-Date: 2011-09-13 14:44+0200\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -17,645 +17,646 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/fragmentation/defragmentation.c:274
+#: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:457
+#: src/fragmentation/defragmentation.c:454
 #, fuzzy
 msgid "# fragments received"
 msgstr "# fragmentos descartados"
 
-#: src/fragmentation/defragmentation.c:521
+#: src/fragmentation/defragmentation.c:513
 #, fuzzy
 msgid "# duplicate fragments received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/fragmentation/defragmentation.c:545
+#: src/fragmentation/defragmentation.c:532
 msgid "# messages defragmented"
 msgstr "# mensajes defragmentados"
 
-#: src/fragmentation/fragmentation.c:181
+#: src/fragmentation/fragmentation.c:183
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Auto-anuncios transmitidos"
 
-#: src/fragmentation/fragmentation.c:185
+#: src/fragmentation/fragmentation.c:186
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Auto-anuncios transmitidos"
 
-#: src/fragmentation/fragmentation.c:249
+#: src/fragmentation/fragmentation.c:248
 msgid "# messages fragmented"
 msgstr "# mensajes fragmentados"
 
-#: src/fragmentation/fragmentation.c:254
+#: src/fragmentation/fragmentation.c:251
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:336
+#: src/fragmentation/fragmentation.c:335
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fragmentation/fragmentation.c:343
+#: src/fragmentation/fragmentation.c:341
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:358
+#: src/fragmentation/fragmentation.c:365
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/nat/nat.c:823
+#: src/nat/nat.c:778
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:884
+#: src/nat/nat.c:828
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/nat/nat.c:1185 src/nat/nat.c:1207
+#: src/nat/nat.c:1096 src/nat/nat.c:1113
 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "Imposible guardar la configuración"
 
-#: src/nat/nat.c:1276 src/nat/nat.c:1284
+#: src/nat/nat.c:1167 src/nat/nat.c:1177
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1422
+#: src/nat/nat.c:1309
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1440
+#: src/nat/nat.c:1321
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:317
+#: src/nat/gnunet-nat-server.c:290
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:361
+#: src/nat/gnunet-nat-server.c:329
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_test.c:376
+#: src/nat/nat_test.c:348
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/nat/nat_test.c:451
+#: src/nat/nat_test.c:418
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:772 src/vpn/gnunet-daemon-exit.c:1280
-#: src/template/gnunet-template.c:72 src/core/test_core_api_send_to_self.c:216
+#: src/vpn/gnunet-daemon-vpn.c:1275 src/vpn/gnunet-daemon-exit.c:1455
+#: src/template/gnunet-template.c:68 src/core/test_core_api_send_to_self.c:217
 #, fuzzy
 msgid "help text"
 msgstr "texto de ayuda para -t"
 
-#: src/datacache/datacache.c:110 src/datacache/datacache.c:255
-#: src/datastore/gnunet-service-datastore.c:888
+#: src/datacache/datacache.c:108 src/datacache/datacache.c:236
+#: src/datastore/gnunet-service-datastore.c:821
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# bytes en la base de datos"
 
-#: src/datacache/datacache.c:138 src/datacache/datacache.c:149
-#: src/datastore/gnunet-service-datastore.c:1442
-#: src/datastore/gnunet-service-datastore.c:1641
-#: src/datastore/test_plugin_datastore.c:209
-#: src/datastore/test_plugin_datastore.c:352
-#: src/datastore/perf_plugin_datastore.c:340
-#: src/datastore/perf_plugin_datastore.c:458
+#: src/datacache/datacache.c:134 src/datacache/datacache.c:142
+#: src/datastore/gnunet-service-datastore.c:1292
+#: src/datastore/gnunet-service-datastore.c:1483
+#: src/datastore/test_plugin_datastore.c:192
+#: src/datastore/test_plugin_datastore.c:315
+#: src/datastore/perf_plugin_datastore.c:309
+#: src/datastore/perf_plugin_datastore.c:413
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/datacache/datacache.c:178
+#: src/datacache/datacache.c:167
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:186
+#: src/datacache/datacache.c:176
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/datacache/datacache.c:285
+#: src/datacache/datacache.c:262
 #, fuzzy
 msgid "# requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datacache/datacache.c:292
+#: src/datacache/datacache.c:268
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/plugin_datacache_template.c:126
+#: src/datacache/plugin_datacache_template.c:121
 msgid "Template datacache running\n"
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:66
 #: src/datacache/plugin_datacache_sqlite.c:69
-#: src/datacache/plugin_datacache_sqlite.c:126
-#: src/datacache/plugin_datacache_sqlite.c:201
-#: src/datacache/plugin_datacache_sqlite.c:248
-#: src/datacache/plugin_datacache_sqlite.c:322
-#: src/datacache/plugin_datacache_sqlite.c:331
-#: src/datacache/plugin_datacache_sqlite.c:345
+#: src/datacache/plugin_datacache_sqlite.c:122
+#: src/datacache/plugin_datacache_sqlite.c:191
+#: src/datacache/plugin_datacache_sqlite.c:232
+#: src/datacache/plugin_datacache_sqlite.c:296
+#: src/datacache/plugin_datacache_sqlite.c:305
+#: src/datacache/plugin_datacache_sqlite.c:318
+#: src/datacache/plugin_datacache_sqlite.c:325
+#: src/datacache/plugin_datacache_sqlite.c:338
+#: src/datacache/plugin_datacache_sqlite.c:346
 #: src/datacache/plugin_datacache_sqlite.c:354
-#: src/datacache/plugin_datacache_sqlite.c:374
-#: src/datacache/plugin_datacache_sqlite.c:383
-#: src/datacache/plugin_datacache_sqlite.c:394
 #: src/datacache/plugin_datacache_mysql.c:103
 #: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:518
-#: src/datacache/plugin_datacache_mysql.c:527
-#: src/datacache/plugin_datacache_mysql.c:603
-#: src/datacache/plugin_datacache_mysql.c:619 src/util/crypto_rsa.c:84
-#: src/util/crypto_ksk.c:47 src/dht/plugin_dhtlog_mysql.c:583
-#: src/dht/plugin_dhtlog_mysql.c:592 src/dht/plugin_dhtlog_mysql.c:652
-#: src/dht/plugin_dhtlog_mysql.c:667
+#: src/datacache/plugin_datacache_mysql.c:517
+#: src/datacache/plugin_datacache_mysql.c:526
+#: src/datacache/plugin_datacache_mysql.c:598
+#: src/datacache/plugin_datacache_mysql.c:614 src/util/crypto_rsa.c:84
+#: src/util/crypto_ksk.c:47 src/dht/plugin_dhtlog_mysql.c:581
+#: src/dht/plugin_dhtlog_mysql.c:590 src/dht/plugin_dhtlog_mysql.c:648
+#: src/dht/plugin_dhtlog_mysql.c:663
 #: src/datastore/plugin_datastore_sqlite.c:61
 #: src/datastore/plugin_datastore_mysql.c:139
 #: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:599
-#: src/datastore/plugin_datastore_mysql.c:661
-#: src/datastore/plugin_datastore_mysql.c:673 src/include/gnunet_common.h:319
+#: src/datastore/plugin_datastore_mysql.c:613
+#: src/datastore/plugin_datastore_mysql.c:673
+#: src/datastore/plugin_datastore_mysql.c:685 src/include/gnunet_common.h:324
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:461
+#: src/datacache/plugin_datacache_sqlite.c:419
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:496
-#: src/datastore/plugin_datastore_sqlite.c:381
+#: src/datacache/plugin_datacache_sqlite.c:454
+#: src/datastore/plugin_datastore_sqlite.c:405
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:81
-#: src/datastore/plugin_datastore_postgres.c:95
+#: src/datacache/plugin_datacache_postgres.c:79
+#: src/datastore/plugin_datastore_postgres.c:93
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/datacache/plugin_datacache_postgres.c:154
+#: src/datacache/plugin_datacache_postgres.c:149
 #, fuzzy, c-format
 msgid "Unable to initialize Postgres: %s"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/datacache/plugin_datacache_postgres.c:557
+#: src/datacache/plugin_datacache_postgres.c:500
 msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:220
-#: src/datastore/plugin_datastore_mysql.c:297
+#: src/datacache/plugin_datacache_mysql.c:224
+#: src/datastore/plugin_datastore_mysql.c:316
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Intentando usar el fichero '%s' para la configuración de MySQL.\n"
 
-#: src/datacache/plugin_datacache_mysql.c:227
-#: src/datastore/plugin_datastore_mysql.c:304
+#: src/datacache/plugin_datacache_mysql.c:230
+#: src/datastore/plugin_datastore_mysql.c:322
 #, fuzzy, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "Imposible ejecutar '%s': %s\n"
 
-#: src/datacache/plugin_datacache_mysql.c:1061
+#: src/datacache/plugin_datacache_mysql.c:979
 msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1801 src/testing/testing_group.c:1814
-#: src/testing/testing_group.c:1920 src/testing/testing_group.c:1981
-#: src/testing/testing_group.c:2070 src/testing/testing_group.c:2092
-#: src/testing/testing_group.c:2231 src/testing/test_testing_topology.c:1104
-#: src/testing/test_testing_topology_blacklist.c:457
-#: src/testing/testing_peergroup.c:856
-#: src/testing/test_testing_large_topology.c:1046
-#: src/dht/test_dht_multipeer.c:833 src/dht/gnunet-dht-driver.c:4001
-#: src/dv/test_transport_api_dv.c:1102
+#: src/testing/testing_group.c:1903 src/testing/testing_group.c:1915
+#: src/testing/testing_group.c:2016 src/testing/testing_group.c:2075
+#: src/testing/testing_group.c:2164 src/testing/testing_group.c:2184
+#: src/testing/testing_group.c:2321 src/testing/test_testing_topology.c:1078
+#: src/testing/test_testing_topology_blacklist.c:448
+#: src/testing/testing_peergroup.c:876
+#: src/testing/test_testing_large_topology.c:1022
+#: src/dht/test_dht_multipeer.c:864 src/dht/gnunet-dht-driver.c:3907
+#: src/dv/test_transport_api_dv.c:1132
 #, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1824
+#: src/testing/testing_group.c:1925
 #, fuzzy, c-format
 msgid "Target is %d connections per peer."
 msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
 
-#: src/testing/testing_group.c:2079
+#: src/testing/testing_group.c:2172
 #, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2111 src/testing/testing_group.c:2307
+#: src/testing/testing_group.c:2202 src/testing/testing_group.c:2395
 #, c-format
 msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2148
+#: src/testing/testing_group.c:2239
 #, c-format
 msgid "natural log of %d is %d, will run %d iterations\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2151
+#: src/testing/testing_group.c:2242
 #, c-format
 msgid "Total connections added thus far: %u!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2193
+#: src/testing/testing_group.c:2283
 #, c-format
 msgid "Total connections added for small world: %d!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2246
+#: src/testing/testing_group.c:2335
 #, c-format
 msgid "rand is %f probability is %f\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2824 src/testing/testing_group.c:3035
+#: src/testing/testing_group.c:2910 src/testing/testing_group.c:3109
 #, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
 "file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2935
+#: src/testing/testing_group.c:3011
 msgid "Finished copying all friend files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3051
+#: src/testing/testing_group.c:3124
 #, fuzzy, c-format
 msgid "Copying file with command cp %s %s\n"
 msgstr "'%s' falló con el código de error %s: %s"
 
-#: src/testing/testing_group.c:3074
+#: src/testing/testing_group.c:3147
 #, c-format
 msgid "Copying file with command scp %s %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3092
+#: src/testing/testing_group.c:3164
 #, c-format
 msgid "Checking copy status of file %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3111
+#: src/testing/testing_group.c:3182
 #, c-format
 msgid "File %d copied\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3126
+#: src/testing/testing_group.c:3197
 msgid "Finished copying all blacklist files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3496 src/testing/testing_group.c:3624
-#: src/testing/testing_group.c:4839 src/testing/testing_group.c:4982
+#: src/testing/testing_group.c:3581 src/testing/testing_group.c:3720
+#: src/testing/testing_group.c:4925 src/testing/testing_group.c:5066
 msgid "Delaying connect, we have too many outstanding connections!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3506 src/testing/testing_group.c:4851
-#: src/testing/testing_group.c:4994
+#: src/testing/testing_group.c:3591 src/testing/testing_group.c:4935
+#: src/testing/testing_group.c:5076
 #, c-format
 msgid "Creating connection, outstanding_connections is %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3518
+#: src/testing/testing_group.c:3603
 #, fuzzy, c-format
 msgid "Offering Hello of peer %s to peer %s\n"
 msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
 
-#: src/testing/testing_group.c:3636
+#: src/testing/testing_group.c:3730
 #, c-format
 msgid "Creating connection, outstanding_connections is %d (max %d)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3887
+#: src/testing/testing_group.c:3983
 msgid "Creating clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3894
+#: src/testing/testing_group.c:3990
 msgid "Creating small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3901
+#: src/testing/testing_group.c:3997
 msgid "Creating small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3907
+#: src/testing/testing_group.c:4003
 msgid "Creating ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3913
+#: src/testing/testing_group.c:4009
 msgid "Creating 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3920
+#: src/testing/testing_group.c:4015
 msgid "Creating Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3926
+#: src/testing/testing_group.c:4021
 msgid "Creating InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3933
+#: src/testing/testing_group.c:4027
 msgid "Creating Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3940
+#: src/testing/testing_group.c:4034
 msgid "Creating straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3947
+#: src/testing/testing_group.c:4040
 msgid "Creating topology from file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3966
+#: src/testing/testing_group.c:4058
 msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3983
+#: src/testing/testing_group.c:4075
 msgid "Failed during friend file copying!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3991
+#: src/testing/testing_group.c:4083
 msgid "Friend files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4010
+#: src/testing/testing_group.c:4102
 msgid "Blacklisting all but clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4018
+#: src/testing/testing_group.c:4110
 msgid "Blacklisting all but small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4028
+#: src/testing/testing_group.c:4118
 msgid "Blacklisting all but small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4036
+#: src/testing/testing_group.c:4126
 msgid "Blacklisting all but ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4044
+#: src/testing/testing_group.c:4134
 msgid "Blacklisting all but 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4052
+#: src/testing/testing_group.c:4142
 msgid "Blacklisting all but Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4060
+#: src/testing/testing_group.c:4150
 msgid "Blacklisting all but InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4097
+#: src/testing/testing_group.c:4187
 msgid "Blacklisting all but Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4105
+#: src/testing/testing_group.c:4195
 msgid "Blacklisting all but straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4122
+#: src/testing/testing_group.c:4212
 msgid "Failed during blacklist file copying!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4130
+#: src/testing/testing_group.c:4220
 msgid "Blacklist files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5213
+#: src/testing/testing_group.c:5301
 msgid "Creating clique CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5220
+#: src/testing/testing_group.c:5308
 msgid "Creating small world (ring) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5227
+#: src/testing/testing_group.c:5315
 msgid "Creating small world (2d-torus) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5233
+#: src/testing/testing_group.c:5321
 msgid "Creating ring CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5240
+#: src/testing/testing_group.c:5328
 msgid "Creating 2d torus CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5247
+#: src/testing/testing_group.c:5335
 msgid "Creating Erdos-Renyi CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5254
+#: src/testing/testing_group.c:5342
 msgid "Creating InterNAT CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5261
+#: src/testing/testing_group.c:5349
 msgid "Creating Scale Free CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5268
+#: src/testing/testing_group.c:5356
 msgid "Creating straight line CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5274
+#: src/testing/testing_group.c:5362
 msgid "Creating no CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5280
+#: src/testing/testing_group.c:5368
 msgid "Unknown topology specification, can't connect peers!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5289
+#: src/testing/testing_group.c:5378
 #, c-format
 msgid "Connecting random subset (%'.2f percent) of possible peers\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5297
+#: src/testing/testing_group.c:5386
 #, c-format
 msgid "Connecting a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5305
+#: src/testing/testing_group.c:5395
 #, c-format
 msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5315
+#: src/testing/testing_group.c:5405
 #, c-format
 msgid "Finding additional %u closest peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5923
+#: src/testing/testing_group.c:6084
 #, fuzzy
 msgid "Could not read hostkeys file!\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/testing/testing_group.c:5996
+#: src/testing/testing_group.c:6154
 #, c-format
 msgid "Could not create configuration for peer number %u on `%s'!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6119 src/testing/testing.c:1189
+#: src/testing/testing_group.c:6298 src/testing/testing.c:1272
 #, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr ""
 
-#: src/testing/testing.c:210
-#, fuzzy
-msgid "Failed to connect to core service\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/testing/testing.c:247 src/testing/testing.c:735
-#: src/testing/testing.c:1947 src/testing/testing.c:1965
-#: src/testing/testing.c:2049 src/testing/testing.c:2065
-#, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/testing/testing.c:327
+#: src/testing/testing.c:208
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:342 src/testing/testing.c:912
+#: src/testing/testing.c:222 src/testing/testing.c:822
 #, fuzzy
 msgid "`scp' did not complete cleanly.\n"
 msgstr "'%s' no esta conectado a ningún par.\n"
 
-#: src/testing/testing.c:367
+#: src/testing/testing.c:245
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:368
+#: src/testing/testing.c:246
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/testing/testing.c:430
+#: src/testing/testing.c:302
 #, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr ""
 
-#: src/testing/testing.c:440
+#: src/testing/testing.c:309
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/testing/testing.c:441 src/testing/testing.c:638
+#: src/testing/testing.c:310 src/testing/testing.c:508
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/testing/testing.c:506
+#: src/testing/testing.c:372
 #, fuzzy, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr "Se produjo un error leyendo información de gnunetd.\n"
 
-#: src/testing/testing.c:510
+#: src/testing/testing.c:376
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr ""
 
-#: src/testing/testing.c:520
+#: src/testing/testing.c:386
 #, fuzzy
 msgid "`Failed to get hostkey!\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/testing/testing.c:556
+#: src/testing/testing.c:420
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:627
+#: src/testing/testing.c:500
 #, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr ""
 
-#: src/testing/testing.c:637
+#: src/testing/testing.c:507
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing.c:665
+#: src/testing/testing.c:531 src/testing/testing.c:630
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:666
+#: src/testing/testing.c:532 src/testing/testing.c:631
+#: src/testing/testing.c:651
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:707
-msgid "Unable to connect to CORE service for peer!\n"
-msgstr ""
+#: src/testing/testing.c:571 src/testing/testing.c:2072
+#: src/testing/testing.c:2091
+#, fuzzy
+msgid "Failed to connect to transport service!\n"
+msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing.c:769
+#: src/testing/testing.c:600
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:797
+#: src/testing/testing.c:650
+msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
+msgstr ""
+
+#: src/testing/testing.c:673 src/testing/testing.c:707
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:827
+#: src/testing/testing.c:688 src/testing/testing.c:737
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr ""
 
-#: src/testing/testing.c:899
+#: src/testing/testing.c:810
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:1277 src/testing/testing.c:1407
+#: src/testing/testing.c:988
 #, fuzzy, c-format
+msgid "Starting service %s for peer `%4s'\n"
+msgstr "Iniciada colección '%s'.\n"
+
+#: src/testing/testing.c:1360 src/testing/testing.c:1443
+#: src/testing/testing.c:1581
+#, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "Permiso denegado para '%s' en %s:%d.\n"
 
-#: src/testing/testing.c:1359
+#: src/testing/testing.c:1533
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/testing/testing.c:1492
+#: src/testing/testing.c:1668
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1500
+#: src/testing/testing.c:1676
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "Imposible guardar la configuración"
 
-#: src/testing/testing.c:1532
+#: src/testing/testing.c:1707
 #, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr ""
 
-#: src/testing/testing.c:1535
+#: src/testing/testing.c:1710
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "Imposible guardar la configuración"
 
-#: src/testing/testing.c:1723
+#: src/testing/testing.c:1881
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing.c:1918 src/testing/testing.c:2036
+#: src/testing/testing.c:2036
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing.c:2107
+#: src/testing/testing.c:2238
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
@@ -664,11 +665,11 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Transporte(s) disponible(s): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:202
+#: src/peerinfo/gnunet-service-peerinfo.c:197
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:251
+#: src/peerinfo/gnunet-service-peerinfo.c:241
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -676,198 +677,196 @@
 "El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
 "Eliminando.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:318
+#: src/peerinfo/gnunet-service-peerinfo.c:306
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:266
+#: src/peerinfo/peerinfo_api_notify.c:257
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/peerinfo/test_peerinfo_api.c:112 src/hostlist/hostlist-server.c:469
-#: src/peerinfo-tool/gnunet-peerinfo.c:168 src/dv/gnunet-service-dv.c:2833
-#: src/core/gnunet-service-core.c:3036 src/core/gnunet-service-core.c:3345
+#: src/peerinfo/test_peerinfo_api.c:109 src/hostlist/hostlist-server.c:437
+#: src/peerinfo-tool/gnunet-peerinfo.c:157 src/dv/gnunet-service-dv.c:2998
+#: src/core/gnunet-service-core.c:3034 src/core/gnunet-service-core.c:3328
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/peerinfo/peerinfo_api.c:280
+#: src/peerinfo/peerinfo_api.c:276
 #, fuzzy, c-format
 msgid "Failed to transmit message to `%s' service.\n"
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/peerinfo/peerinfo_api.c:447
+#: src/peerinfo/peerinfo_api.c:432
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
 
-#: src/peerinfo/peerinfo_api.c:476 src/peerinfo/peerinfo_api.c:494
+#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service.\n"
 msgstr "Recibido mensaje UDP6 inválido de %s:%d, omitiendo.\n"
 
-#: src/peerinfo/peerinfo_api.c:540
+#: src/peerinfo/peerinfo_api.c:521
 #, fuzzy
 msgid "Failed to transmit iteration request to `PEERINFO' service\n"
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/peerinfo/peerinfo_api.c:580
+#: src/peerinfo/peerinfo_api.c:555
 msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:281
-#: src/hostlist/hostlist-client.c:620
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:259
+#: src/hostlist/hostlist-client.c:622
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:298
-#: src/hostlist/hostlist-client.c:594 src/hostlist/hostlist-client.c:1384
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:274
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1338
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:311
-#: src/hostlist/hostlist-server.c:377
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:286
+#: src/hostlist/hostlist-server.c:353
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Anuncios a extraños mandados"
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:422
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:389
 #, c-format
 msgid "Hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:265
+#: src/hostlist/gnunet-daemon-hostlist.c:253
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:300
-#: src/topology/gnunet-daemon-topology.c:1452
-#: src/topology/gnunet-daemon-topology.c:1460 src/fs/gnunet-service-fs.c:544
+#: src/hostlist/gnunet-daemon-hostlist.c:286
+#: src/topology/gnunet-daemon-topology.c:1315
+#: src/topology/gnunet-daemon-topology.c:1322 src/fs/gnunet-service-fs.c:519
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:321
+#: src/hostlist/gnunet-daemon-hostlist.c:306
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/hostlist/gnunet-daemon-hostlist.c:311
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:328
+#: src/hostlist/gnunet-daemon-hostlist.c:314
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:332
+#: src/hostlist/gnunet-daemon-hostlist.c:318
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:344
+#: src/hostlist/gnunet-daemon-hostlist.c:330
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:135
+#: src/hostlist/hostlist-server.c:134
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# bytes en la base de datos"
 
-#: src/hostlist/hostlist-server.c:164
+#: src/hostlist/hostlist-server.c:160
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:194
-#: src/topology/gnunet-daemon-topology.c:973
-#: src/transport/gnunet-service-transport.c:3160
-#: src/transport/gnunet-service-transport.c:4572
+#: src/hostlist/hostlist-server.c:187
+#: src/topology/gnunet-daemon-topology.c:900
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/hostlist/hostlist-server.c:217
+#: src/hostlist/hostlist-server.c:208
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:234
+#: src/hostlist/hostlist-server.c:224
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:289
+#: src/hostlist/hostlist-server.c:272
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:292
+#: src/hostlist/hostlist-server.c:275
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:283
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:309
+#: src/hostlist/hostlist-server.c:290
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:313
+#: src/hostlist/hostlist-server.c:294
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/hostlist/hostlist-server.c:321
+#: src/hostlist/hostlist-server.c:302
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:323
+#: src/hostlist/hostlist-server.c:305
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/hostlist/hostlist-server.c:329
+#: src/hostlist/hostlist-server.c:309
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:331
+#: src/hostlist/hostlist-server.c:310
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/hostlist/hostlist-server.c:427
+#: src/hostlist/hostlist-server.c:398
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:599
-#: src/transport/gnunet-service-transport.c:6603
-#: src/peerinfo-tool/gnunet-peerinfo.c:224 src/core/gnunet-service-core.c:4703
+#: src/hostlist/hostlist-server.c:556
+#: src/transport/gnunet-service-transport.c:458
+#: src/peerinfo-tool/gnunet-peerinfo.c:208 src/core/gnunet-service-core.c:4607
 #, fuzzy, c-format
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/hostlist/hostlist-server.c:611
+#: src/hostlist/hostlist-server.c:566
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Argumentos no válidos. Saliendo.\n"
 
-#: src/hostlist/hostlist-server.c:623
+#: src/hostlist/hostlist-server.c:575
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:639
+#: src/hostlist/hostlist-server.c:589
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:679
+#: src/hostlist/hostlist-server.c:627
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -876,378 +875,374 @@
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:343
+#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# saludos descargados vía HTTP"
 
-#: src/hostlist/hostlist-client.c:314 src/hostlist/hostlist-client.c:347
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
 
-#: src/hostlist/hostlist-client.c:334
+#: src/hostlist/hostlist-client.c:330
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# saludos descargados vía HTTP"
 
-#: src/hostlist/hostlist-client.c:383 src/hostlist/hostlist-client.c:403
+#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
 #, c-format
 msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:480 src/hostlist/hostlist-client.c:680
-#: src/hostlist/hostlist-client.c:687 src/hostlist/hostlist-client.c:739
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:885
-#: src/hostlist/hostlist-client.c:996 src/hostlist/hostlist-client.c:1002
-#: src/transport/test_plugin_transport_https.c:787
-#: src/transport/test_plugin_transport_https.c:796
-#: src/transport/plugin_transport_http.c:2094
-#: src/transport/plugin_transport_http.c:2103
+#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
+#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
+#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
+#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
+#: src/transport/test_plugin_transport_https.c:829
+#: src/transport/test_plugin_transport_https.c:837
+#: src/transport/plugin_transport_http.c:2059
+#: src/transport/plugin_transport_http.c:2067
+#: src/transport/test_plugin_transport_http.c:795
 #: src/transport/test_plugin_transport_http.c:803
-#: src/transport/test_plugin_transport_http.c:812
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/hostlist/hostlist-client.c:661
+#: src/hostlist/hostlist-client.c:663
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:810
+#: src/hostlist/hostlist-client.c:805
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:827
+#: src/hostlist/hostlist-client.c:822
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:848
+#: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
 msgid "%s failed for `%s' at %s:%d: `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/hostlist/hostlist-client.c:857
+#: src/hostlist/hostlist-client.c:848
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Subida de '%s' completada, la velocidad media de subida actual es %8.3f "
 "kbps.\n"
 
-#: src/hostlist/hostlist-client.c:864
+#: src/hostlist/hostlist-client.c:856
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
+#: src/hostlist/hostlist-client.c:909
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:926
+#: src/hostlist/hostlist-client.c:917
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1075 src/hostlist/hostlist-client.c:1567
+#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1511
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1084
+#: src/hostlist/hostlist-client.c:1054
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1124
+#: src/hostlist/hostlist-client.c:1092
 msgid "Scheduled saving of hostlists\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1128
+#: src/hostlist/hostlist-client.c:1096
 #, c-format
 msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1151 src/hostlist/hostlist-client.c:1171
+#: src/hostlist/hostlist-client.c:1117 src/hostlist/hostlist-client.c:1133
 #, fuzzy
 msgid "# active connections"
 msgstr "Configuración de GNUnet"
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1249
 #, c-format
 msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1325
+#: src/hostlist/hostlist-client.c:1280
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/hostlist-client.c:1286
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1335
+#: src/hostlist/hostlist-client.c:1290
 #, c-format
 msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1344
+#: src/hostlist/hostlist-client.c:1301
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/hostlist/hostlist-client.c:1378
+#: src/hostlist/hostlist-client.c:1334
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1380
+#: src/hostlist/hostlist-client.c:1336
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1416
+#: src/hostlist/hostlist-client.c:1369
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1429
+#: src/hostlist/hostlist-client.c:1383
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/hostlist/hostlist-client.c:1436
+#: src/hostlist/hostlist-client.c:1388
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1464 src/hostlist/hostlist-client.c:1482
+#: src/hostlist/hostlist-client.c:1412 src/hostlist/hostlist-client.c:1429
 #, fuzzy, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Error creando usuario"
 
-#: src/hostlist/hostlist-client.c:1476
+#: src/hostlist/hostlist-client.c:1424
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1533
+#: src/hostlist/hostlist-client.c:1476
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1536
+#: src/hostlist/hostlist-client.c:1479
 #, c-format
 msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1545
+#: src/hostlist/hostlist-client.c:1488
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1557
+#: src/hostlist/hostlist-client.c:1500
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1560
+#: src/hostlist/hostlist-client.c:1504
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
 
-#: src/topology/gnunet-daemon-topology.c:253
+#: src/topology/gnunet-daemon-topology.c:250
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:418
+#: src/topology/gnunet-daemon-topology.c:402
 #, fuzzy
 msgid "# connect requests issued to core"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/topology/gnunet-daemon-topology.c:718
-#: src/topology/gnunet-daemon-topology.c:832
-#: src/transport/gnunet-service-transport.c:2666
-#: src/transport/gnunet-service-transport.c:2725
+#: src/topology/gnunet-daemon-topology.c:676
+#: src/topology/gnunet-daemon-topology.c:778
+#: src/transport/gnunet-service-transport_neighbours.c:432
+#: src/transport/gnunet-service-transport_neighbours.c:627
 #, fuzzy
 msgid "# peers connected"
 msgstr "# de pares conectados"
 
-#: src/topology/gnunet-daemon-topology.c:741
-#: src/topology/gnunet-daemon-topology.c:839
+#: src/topology/gnunet-daemon-topology.c:697
+#: src/topology/gnunet-daemon-topology.c:783
 #, fuzzy
 msgid "# friends connected"
 msgstr "# de pares conectados"
 
-#: src/topology/gnunet-daemon-topology.c:1059
+#: src/topology/gnunet-daemon-topology.c:977
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1097
+#: src/topology/gnunet-daemon-topology.c:1009
 #, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1110
+#: src/topology/gnunet-daemon-topology.c:1021
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1117
+#: src/topology/gnunet-daemon-topology.c:1027
 #, fuzzy, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr "El formato del fichero '%s' no es válido.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1036
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1134
+#: src/topology/gnunet-daemon-topology.c:1044
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1150
+#: src/topology/gnunet-daemon-topology.c:1064
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1161
+#: src/topology/gnunet-daemon-topology.c:1077
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1176
+#: src/topology/gnunet-daemon-topology.c:1087
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/topology/gnunet-daemon-topology.c:1182
+#: src/topology/gnunet-daemon-topology.c:1093
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1193
+#: src/topology/gnunet-daemon-topology.c:1103
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/topology/gnunet-daemon-topology.c:1200
+#: src/topology/gnunet-daemon-topology.c:1109
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1206
+#: src/topology/gnunet-daemon-topology.c:1116
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1247
+#: src/topology/gnunet-daemon-topology.c:1151
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/topology/gnunet-daemon-topology.c:1316
+#: src/topology/gnunet-daemon-topology.c:1208
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# mensajes salientes omitidos"
 
-#: src/topology/gnunet-daemon-topology.c:1487
+#: src/topology/gnunet-daemon-topology.c:1348
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/statistics/statistics_api.c:325
+#: src/statistics/statistics_api.c:326
 #, fuzzy
 msgid "Failed to connect to statistics service!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/statistics/gnunet-statistics.c:94
+#: src/statistics/gnunet-statistics.c:89
 #, fuzzy, c-format
 msgid "Failed to obtain statistics.\n"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/statistics/gnunet-statistics.c:125 src/fs/gnunet-pseudonym.c:172
+#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/statistics/gnunet-statistics.c:162
+#: src/statistics/gnunet-statistics.c:155
 msgid "limit output to statistcs for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:165
+#: src/statistics/gnunet-statistics.c:158
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:168
+#: src/statistics/gnunet-statistics.c:161
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:177
+#: src/statistics/gnunet-statistics.c:168
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
-#: src/statistics/gnunet-service-statistics.c:211
+#: src/statistics/gnunet-service-statistics.c:208
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Descarga los ficheros de GNUnet"
 
-#: src/statistics/gnunet-service-statistics.c:273
+#: src/statistics/gnunet-service-statistics.c:266
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Descarga los ficheros de GNUnet"
 
-#: src/util/os_priority.c:116
+#: src/util/os_priority.c:110
 #, c-format
 msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
-#: src/util/os_installation.c:296
+#: src/util/os_installation.c:291
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:482 src/transport/test_transport_api.c:642
-#: src/transport/test_transport_api_reliability.c:655
-#: src/transport/test_transport_api_unreliability.c:700
+#: src/util/os_installation.c:474
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
 
-#: src/util/os_installation.c:489 src/transport/test_transport_api.c:649
-#: src/transport/test_transport_api_reliability.c:662
-#: src/transport/test_transport_api_unreliability.c:707
+#: src/util/os_installation.c:479
 #, fuzzy, c-format
 msgid "stat (%s) failed: %s\n"
 msgstr "'%s' %s falló: %s\n"
 
-#: src/util/common_logging.c:154 src/util/common_logging.c:492
-#: src/util/test_common_logging.c:76
+#: src/util/common_logging.c:154 src/util/common_logging.c:500
+#: src/util/test_common_logging.c:75
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/common_logging.c:156 src/util/common_logging.c:490
+#: src/util/common_logging.c:156 src/util/common_logging.c:498
 #: src/util/test_common_logging.c:72
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/common_logging.c:158 src/util/common_logging.c:488
+#: src/util/common_logging.c:158 src/util/common_logging.c:496
 #: src/util/test_common_logging.c:68
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/common_logging.c:160 src/util/common_logging.c:486
-#: src/util/test_common_logging.c:64
+#: src/util/common_logging.c:160 src/util/common_logging.c:494
+#: src/util/test_common_logging.c:65
 msgid "ERROR"
 msgstr "ERROR"
 
@@ -1255,34 +1250,34 @@
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:204 src/dht/plugin_dhtlog_mysql_dump.c:837
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:602
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:635
+#: src/util/common_logging.c:214 src/dht/plugin_dhtlog_mysql_dump.c:909
 #: src/dht/plugin_dhtlog_mysql_dump_load.c:669
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:703
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:737
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:770
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:803
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:836
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:700
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:732
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:764
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:796
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:827
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:858
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:889
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/util/common_logging.c:321
+#: src/util/common_logging.c:331
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:493
+#: src/util/common_logging.c:501
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:575
+#: src/util/common_logging.c:583
 #, fuzzy
 msgid "unknown address"
 msgstr "desconocido"
 
-#: src/util/common_logging.c:615
+#: src/util/common_logging.c:621
 #, fuzzy
 msgid "invalid address"
 msgstr "Argumentos inválidos: "
@@ -1297,179 +1292,179 @@
 msgid "no-name"
 msgstr "Mostrar el nombre"
 
-#: src/util/test_strings.c:42 src/util/strings.c:138
+#: src/util/test_strings.c:42 src/util/strings.c:139
 msgid "b"
 msgstr "b"
 
-#: src/util/test_strings.c:45 src/util/strings.c:144
+#: src/util/test_strings.c:45 src/util/strings.c:145
 msgid "KiB"
 msgstr "KiB"
 
-#: src/util/test_strings.c:48 src/util/strings.c:156
+#: src/util/test_strings.c:48 src/util/strings.c:157
 msgid "TiB"
 msgstr "TiB"
 
-#: src/util/test_strings.c:51 src/util/strings.c:362
+#: src/util/test_strings.c:51 src/util/strings.c:363
 msgid "ms"
 msgstr "ms"
 
-#: src/util/test_strings.c:57 src/util/strings.c:371
+#: src/util/test_strings.c:56 src/util/strings.c:372
 msgid "s"
 msgstr "s"
 
-#: src/util/test_strings.c:63 src/util/strings.c:379
+#: src/util/test_strings.c:61 src/util/strings.c:380
 msgid "h"
 msgstr "h"
 
-#: src/util/connection.c:459
+#: src/util/connection.c:457
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Permiso denegado para '%s' en %s:%d.\n"
 
-#: src/util/connection.c:475
+#: src/util/connection.c:472
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:647
+#: src/util/connection.c:640
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Se produjo un error estableciendo conexión con gnunetd.\n"
 
-#: src/util/connection.c:869 src/util/connection.c:1043
+#: src/util/connection.c:852 src/util/connection.c:1023
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/connection.c:1032
+#: src/util/connection.c:1013
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/connection.c:1558
+#: src/util/connection.c:1529
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
 "failed (%p).\n"
 msgstr ""
 
-#: src/util/connection.c:1594
+#: src/util/connection.c:1565
 #, fuzzy, c-format
 msgid "Failed to send to `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/util/plugin.c:88
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "¡El mecanismo de iniciación de los plugins falló: %s!\n"
 
-#: src/util/plugin.c:148
+#: src/util/plugin.c:144
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "'%s' falló al resolver el método '%s%s' en %s:%d con un error: %s\n"
 
-#: src/util/plugin.c:221
+#: src/util/plugin.c:217
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "'%s' falló en la biblioteca '%s' en %s:%d con un error: %s\n"
 
-#: src/util/bio.c:136 src/util/bio.c:143
+#: src/util/bio.c:134 src/util/bio.c:140
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Error creando usuario"
 
-#: src/util/bio.c:144
+#: src/util/bio.c:141
 #, fuzzy
 msgid "End of file"
 msgstr "Cargar un fichero de configuración"
 
-#: src/util/bio.c:200
+#: src/util/bio.c:193
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:212
+#: src/util/bio.c:203
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:258
+#: src/util/bio.c:248
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:273
+#: src/util/bio.c:262
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/crypto_rsa.c:623 src/util/crypto_rsa.c:673
+#: src/util/crypto_rsa.c:611 src/util/crypto_rsa.c:658
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "Imposible escribir PID al fichero '%s': %s.\n"
 
-#: src/util/crypto_rsa.c:628
+#: src/util/crypto_rsa.c:616
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Creando nueva clave local (esto puede llevar un tiempo).\n"
 
-#: src/util/crypto_rsa.c:648
+#: src/util/crypto_rsa.c:634
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:677 src/util/crypto_rsa.c:719
+#: src/util/crypto_rsa.c:662 src/util/crypto_rsa.c:698
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:713
+#: src/util/crypto_rsa.c:693
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:734
+#: src/util/crypto_rsa.c:714
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "El fichero '%s' no contiene un pseudónimo.\n"
 
-#: src/util/crypto_rsa.c:754
+#: src/util/crypto_rsa.c:732
 #, fuzzy, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr "Llamada a '%s' con la clave '%s'.\n"
 
-#: src/util/crypto_rsa.c:978
+#: src/util/crypto_rsa.c:953
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/util/server.c:389
+#: src/util/server.c:384
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/util/server.c:399
+#: src/util/server.c:392
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/util/server.c:405
+#: src/util/server.c:397
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/util/server.c:627
+#: src/util/server.c:612
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/network.c:1088
+#: src/util/network.c:1193
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -1480,7 +1475,7 @@
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:264
+#: src/util/crypto_random.c:263
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
@@ -1491,141 +1486,146 @@
 msgid "Got IP address `%s' for our host.\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:146 src/util/resolver_api.c:914
+#: src/util/test_resolver_api.c:147 src/util/resolver_api.c:873
 #, c-format
 msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:152
+#: src/util/test_resolver_api.c:154
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s %u\n"
 msgstr "Imposible resolver '%s': %s\n"
 
-#: src/util/test_resolver_api.c:259
+#: src/util/test_resolver_api.c:264
 #, c-format
 msgid "gethostbyname() could not lookup IP address: %s\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:318
+#: src/util/test_resolver_api.c:329
 #, c-format
 msgid "gethostbyaddr() could not lookup hostname: %s\n"
 msgstr ""
 
-#: src/util/configuration.c:246
+#: src/util/configuration.c:244
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr ""
 "Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/util/configuration.c:810
+#: src/util/configuration.c:801
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:89
+#: src/util/gnunet-resolver.c:76
 msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/client.c:311
+#: src/util/client.c:304
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:319
+#: src/util/client.c:312
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:679
+#: src/util/client.c:669
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:728
+#: src/util/client.c:729 src/util/service.c:880
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr ""
+
+#: src/util/client.c:871
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/util/client.c:744
+#: src/util/client.c:887
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
 
-#: src/util/client.c:1017
+#: src/util/client.c:1158
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/scheduler.c:791
+#: src/util/scheduler.c:859
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:922
+#: src/util/scheduler.c:990
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/strings.c:148
+#: src/util/strings.c:149
 msgid "MiB"
 msgstr "MiB"
 
-#: src/util/strings.c:152
+#: src/util/strings.c:153
 msgid "GiB"
 msgstr "GiB"
 
-#: src/util/strings.c:191
+#: src/util/strings.c:193
 #, c-format
 msgid "Character set requested was `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:268
+#: src/util/strings.c:271
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:367
+#: src/util/strings.c:368
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:375
+#: src/util/strings.c:376
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:383
+#: src/util/strings.c:384
 msgid " days"
 msgstr " días"
 
-#: src/util/strings.c:407
+#: src/util/strings.c:408
 msgid "end of time"
 msgstr ""
 
-#: src/util/disk.c:418
+#: src/util/disk.c:429
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/util/disk.c:781
+#: src/util/disk.c:829
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
 
-#: src/util/disk.c:1134 src/util/service.c:1510
+#: src/util/disk.c:1180 src/util/service.c:1456
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
 
-#: src/util/disk.c:1438
+#: src/util/disk.c:1486
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/util/resolver_api.c:199
+#: src/util/resolver_api.c:198
 #, fuzzy, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr "Intentando usar el fichero '%s' para la configuración de MySQL.\n"
 
-#: src/util/resolver_api.c:219
+#: src/util/resolver_api.c:217
 #, fuzzy, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
@@ -1633,32 +1633,32 @@
 "Debes especificar un número positivo para '%s' en la configuración en la "
 "sección '%s'.\n"
 
-#: src/util/resolver_api.c:363
+#: src/util/resolver_api.c:354
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet usa ahora la dirección IP %u.%u.%u.%u.\n"
 
-#: src/util/resolver_api.c:367
+#: src/util/resolver_api.c:358
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:441
+#: src/util/resolver_api.c:427
 #, c-format
 msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:827
+#: src/util/resolver_api.c:789
 #, c-format
 msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:920
+#: src/util/resolver_api.c:879
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Imposible resolver '%s': %s\n"
 
-#: src/util/resolver_api.c:953
+#: src/util/resolver_api.c:911
 #, c-format
 msgid "Resolving our hostname `%s'\n"
 msgstr ""
@@ -1668,18 +1668,18 @@
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "Imposible resolver '%s': %s\n"
 
-#: src/util/gnunet-service-resolver.c:318
-#: src/util/gnunet-service-resolver.c:367
+#: src/util/gnunet-service-resolver.c:317
+#: src/util/gnunet-service-resolver.c:362
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Imposible encontrar la IP del host '%s': %s\n"
 
-#: src/util/gnunet-service-resolver.c:469
+#: src/util/gnunet-service-resolver.c:460
 #, c-format
 msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:516
+#: src/util/gnunet-service-resolver.c:508
 #, c-format
 msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
@@ -1689,62 +1689,62 @@
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: la opción '%s' es ambigua\n"
 
-#: src/util/getopt.c:693
+#: src/util/getopt.c:692
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: la opción '--%s' no permite un argumento\n"
 
-#: src/util/getopt.c:699
+#: src/util/getopt.c:697
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: la opción '%c%s' no permite un argumento\n"
 
-#: src/util/getopt.c:718 src/util/getopt.c:887
+#: src/util/getopt.c:714 src/util/getopt.c:882
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: la opción '%s' requiere un argumento\n"
 
-#: src/util/getopt.c:747
+#: src/util/getopt.c:743
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: opción no reconocida '--%s'\n"
 
-#: src/util/getopt.c:751
+#: src/util/getopt.c:747
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: opción no reconocida '%c%s'\n"
 
-#: src/util/getopt.c:776
+#: src/util/getopt.c:772
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: opción ilegal -- %c\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:774
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: opción no válida -- %c\n"
 
-#: src/util/getopt.c:806 src/util/getopt.c:936
+#: src/util/getopt.c:802 src/util/getopt.c:930
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: la opción requiere un argumento --%c\n"
 
-#: src/util/getopt.c:854
+#: src/util/getopt.c:850
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: la opción '-W %s' es ambigua\n"
 
-#: src/util/getopt.c:872
+#: src/util/getopt.c:868
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: la opción '-W %s' no permite un argumento\n"
 
-#: src/util/getopt.c:1041
+#: src/util/getopt.c:1034
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Usar --help para obtener una lista de opciones.\n"
 
-#: src/util/signal.c:77
+#: src/util/signal.c:78
 #, fuzzy, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "La llamada a '%s' devuelve %d.\n"
@@ -1755,142 +1755,137 @@
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:284
+#: src/util/getopt_helpers.c:254 src/util/getopt_helpers.c:282
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Tienes que introducir un número en la opción '%s'.\n"
 
-#: src/util/service.c:114 src/util/service.c:142 src/util/service.c:188
-#: src/util/service.c:212 src/util/service.c:219
+#: src/util/service.c:112 src/util/service.c:138 src/util/service.c:182
+#: src/util/service.c:202 src/util/service.c:209
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: '%s'\n"
 
-#: src/util/service.c:171
+#: src/util/service.c:165
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Notación de red no válida ('/%d' no es válido en IPv4 CIDR)."
 
-#: src/util/service.c:268
+#: src/util/service.c:258
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Notación de red no válida (no termina con ';': '%s')\n"
 
-#: src/util/service.c:304
+#: src/util/service.c:292
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Formato '%s' erróneo para la máscara de red: %s\n"
 
-#: src/util/service.c:336
+#: src/util/service.c:323
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato '%s' erróneo para la red: %s\n"
 
-#: src/util/service.c:649
+#: src/util/service.c:627
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:656
+#: src/util/service.c:632
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Operación desconocida '%s'\n"
 
-#: src/util/service.c:662
+#: src/util/service.c:639
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:707
+#: src/util/service.c:683
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:735
+#: src/util/service.c:712
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:857
+#: src/util/service.c:829
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:881 src/transport/plugin_transport_tcp.c:2048
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1927
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/service.c:915
+#: src/util/service.c:900
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/service.c:936
-#, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:953
+#: src/util/service.c:917
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:985
+#: src/util/service.c:947
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/util/service.c:1003
+#: src/util/service.c:965
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/service.c:1163 src/util/service.c:1182
+#: src/util/service.c:1121 src/util/service.c:1139
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1211
+#: src/util/service.c:1166
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1367
+#: src/util/service.c:1315
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/service.c:1402
+#: src/util/service.c:1349
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
-#: src/util/service.c:1450
+#: src/util/service.c:1397
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1455
+#: src/util/service.c:1401
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1459
+#: src/util/service.c:1405
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1511
+#: src/util/service.c:1457
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1525
+#: src/util/service.c:1471
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
 
-#: src/util/service.c:1585
+#: src/util/service.c:1534
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -1899,71 +1894,71 @@
 msgid "`%' must be followed by HEX number"
 msgstr ""
 
-#: src/fs/fs_uri.c:275
+#: src/fs/fs_uri.c:273
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "URL invalida '%s' (debe comenzar por '%s')\n"
 
-#: src/fs/fs_uri.c:293
+#: src/fs/fs_uri.c:291
 msgid "`++' not allowed in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:300
+#: src/fs/fs_uri.c:298
 msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:370 src/fs/fs_uri.c:377
+#: src/fs/fs_uri.c:366 src/fs/fs_uri.c:373
 msgid "Malformed SKS URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:421 src/fs/fs_uri.c:441
+#: src/fs/fs_uri.c:417 src/fs/fs_uri.c:432
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:572 src/fs/fs_uri.c:592 src/fs/fs_uri.c:602
-#: src/fs/fs_uri.c:631
+#: src/fs/fs_uri.c:562 src/fs/fs_uri.c:577 src/fs/fs_uri.c:587
+#: src/fs/fs_uri.c:615
 msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:611
+#: src/fs/fs_uri.c:597
 msgid "SKS URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:617
+#: src/fs/fs_uri.c:603
 msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:625
+#: src/fs/fs_uri.c:609
 msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:636
+#: src/fs/fs_uri.c:622
 msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:649
+#: src/fs/fs_uri.c:634
 msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:688
+#: src/fs/fs_uri.c:672
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:923
+#: src/fs/fs_uri.c:897
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "Configuración de GNUnet"
 
-#: src/fs/fs_uri.c:930
+#: src/fs/fs_uri.c:904
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/fs/fs_uri.c:1248 src/fs/fs_uri.c:1275
+#: src/fs/fs_uri.c:1212 src/fs/fs_uri.c:1239
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna clave especificada!\n"
 
-#: src/fs/fs_uri.c:1281
+#: src/fs/fs_uri.c:1245
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -1972,303 +1967,309 @@
 msgid "Failed to receive response for `%s' request from `%s' service.\n"
 msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
 
-#: src/fs/fs_list_indexed.c:119
+#: src/fs/fs_list_indexed.c:117
 #, fuzzy, c-format
 msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
 msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
 
-#: src/fs/fs_list_indexed.c:176
+#: src/fs/fs_list_indexed.c:164
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:207 src/fs/gnunet-service-fs_lc.c:377
-#: src/fs/gnunet-service-fs_lc.c:519
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
+#: src/fs/gnunet-service-fs_lc.c:480
 #, fuzzy
 msgid "# client searches active"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_lc.c:262
+#: src/fs/gnunet-service-fs_lc.c:254
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/fs/gnunet-service-fs_lc.c:323
+#: src/fs/gnunet-service-fs_lc.c:312
 #, fuzzy
 msgid "# client searches received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_lc.c:367
+#: src/fs/gnunet-service-fs_lc.c:351
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/fs_publish.c:152 src/fs/fs_publish.c:462
+#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/fs/fs_publish.c:740 src/fs/fs_publish.c:756 src/fs/fs_publish.c:797
-#: src/fs/fs_publish.c:816 src/fs/fs_publish.c:846 src/fs/fs_publish.c:1020
+#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
+#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indexación del fichero '%s' fallida. Intentando insertar fichero...\n"
 
-#: src/fs/fs_publish.c:742
+#: src/fs/fs_publish.c:649
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:754
+#: src/fs/fs_publish.c:661
 #, fuzzy
 msgid "unknown error"
 msgstr "Error desconocido"
 
-#: src/fs/fs_publish.c:799
+#: src/fs/fs_publish.c:704
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:818
+#: src/fs/fs_publish.c:724
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:848
+#: src/fs/fs_publish.c:751
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/fs/fs_publish.c:877
+#: src/fs/fs_publish.c:775
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/fs/fs_publish.c:956
+#: src/fs/fs_publish.c:845
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/fs/fs_publish.c:964
+#: src/fs/fs_publish.c:851
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/fs/fs_publish.c:1022
+#: src/fs/fs_publish.c:899
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "'%s' no es un fichero regular.\n"
 
-#: src/fs/fs_publish.c:1219
+#: src/fs/fs_publish.c:1078
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1295
+#: src/fs/fs_publish.c:1149
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1665
+#: src/fs/fs_publish.c:1482
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/fs/fs_publish.c:1702 src/fs/fs_namespace.c:890
+#: src/fs/fs_publish.c:1518 src/fs/fs_namespace.c:822
 #, fuzzy
 msgid "Internal error."
 msgstr "Error desconocido.\n"
 
-#: src/fs/gnunet-download.c:104
+#: src/fs/gnunet-download.c:100
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/fs/gnunet-download.c:113
+#: src/fs/gnunet-download.c:112
 #, c-format
 msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:125
+#: src/fs/gnunet-download.c:121
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Error descargando: %s\n"
 
-#: src/fs/gnunet-download.c:132
+#: src/fs/gnunet-download.c:129
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "¡Subida rechazada!"
 
-#: src/fs/gnunet-download.c:150 src/fs/gnunet-unindex.c:118
-#: src/fs/gnunet-search.c:199 src/fs/gnunet-publish.c:165
+#: src/fs/gnunet-download.c:144 src/fs/gnunet-unindex.c:109
+#: src/fs/gnunet-search.c:190 src/fs/gnunet-publish.c:155
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Estado de descarga inesperado."
 
-#: src/fs/gnunet-download.c:179
+#: src/fs/gnunet-download.c:169
 #, fuzzy, c-format
 msgid "You need to specify a URI argument.\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/fs/gnunet-download.c:187 src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-download.c:175 src/fs/gnunet-publish.c:426
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "El fichero '%s' tiene la URI: '%s'\n"
 
-#: src/fs/gnunet-download.c:197
+#: src/fs/gnunet-download.c:182
 #, c-format
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:205
+#: src/fs/gnunet-download.c:189
 #, c-format
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:224 src/fs/gnunet-unindex.c:158
-#: src/fs/gnunet-search.c:260 src/fs/gnunet-publish.c:469
+#: src/fs/gnunet-download.c:203 src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-search.c:241 src/fs/gnunet-publish.c:404
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-search.c:285
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "seleccione el NIVEL deseado de anonimidad-del-receptor"
 
-#: src/fs/gnunet-download.c:273
+#: src/fs/gnunet-download.c:243
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:276 src/fs/gnunet-search.c:316
+#: src/fs/gnunet-download.c:246 src/fs/gnunet-search.c:288
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:279
+#: src/fs/gnunet-download.c:249
 msgid "write the file to FILENAME"
 msgstr "escribe el fichero al FICHERO"
 
-#: src/fs/gnunet-download.c:283
+#: src/fs/gnunet-download.c:253
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:287
+#: src/fs/gnunet-download.c:257
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:290
+#: src/fs/gnunet-download.c:260
 msgid "download a GNUnet directory recursively"
 msgstr "descarga un directorio de GNUnet recursivamente"
 
-#: src/fs/gnunet-download.c:293 src/fs/gnunet-unindex.c:191
-#: src/fs/gnunet-search.c:327 src/fs/gnunet-publish.c:684
-#: src/dht/gnunet-dht-get-peer.c:201 src/dht/gnunet-dht-put.c:188
-#: src/dht/gnunet-dht-get.c:214 src/nse/nse-profiler.c:442
+#: src/fs/gnunet-download.c:263 src/fs/gnunet-unindex.c:169
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:585
+#: src/mesh/test_mesh_small.c:674 src/dht/gnunet-dht-get-peer.c:190
+#: src/dht/gnunet-dht-put.c:176 src/dht/gnunet-dht-get.c:204
+#: src/nse/gnunet-nse-profiler.c:655
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:302
+#: src/fs/gnunet-download.c:270
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:93
+#: src/fs/gnunet-unindex.c:89
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:102
+#: src/fs/gnunet-unindex.c:96
 #, fuzzy, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 "\n"
 "Error desindexando el fichero: %s\n"
 
-#: src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-unindex.c:101
 #, fuzzy, c-format
 msgid "Unindexing done.\n"
 msgstr "Desindexar los ficheros."
 
-#: src/fs/gnunet-unindex.c:144
+#: src/fs/gnunet-unindex.c:131
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
 
-#: src/fs/gnunet-unindex.c:169
+#: src/fs/gnunet-unindex.c:148
 #, fuzzy, c-format
 msgid "Could not start unindex operation.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/fs/gnunet-unindex.c:200
+#: src/fs/gnunet-unindex.c:176
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/fs_namespace.c:54 src/fs/fs_namespace.c:83
+#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s' in section `%s'\n"
 msgstr ""
 "El fichero de configuración debe especificar el directorio para almacenar "
 "los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/fs/fs_namespace.c:117
+#: src/fs/fs_namespace.c:107
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_namespace.c:146 src/fs/fs_namespace.c:239
+#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/fs_namespace.c:449 src/fs/fs_namespace.c:471
+#: src/fs/fs_namespace.c:323
 #, fuzzy
+msgid "Unknown error"
+msgstr "Error desconocido"
+
+#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
+#, fuzzy
 msgid "Failed to serialize meta data"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/fs/fs_namespace.c:489
+#: src/fs/fs_namespace.c:452
 #, fuzzy
 msgid "Failed to connect to datastore service"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/fs_namespace.c:537
+#: src/fs/fs_namespace.c:495
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/fs/fs_namespace.c:642
+#: src/fs/fs_namespace.c:597
 #, fuzzy, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr "Fallo al añadir la entrada al espacio '%s' (¿existe?)\n"
 
-#: src/fs/fs_namespace.c:943
+#: src/fs/fs_namespace.c:866
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/fs/gnunet-pseudonym.c:192
+#: src/fs/gnunet-pseudonym.c:165
 #, fuzzy, c-format
 msgid "Namespace `%s' unknown.\n"
 msgstr "El espacio '%s' ha sido valorado con un %d.\n"
 
-#: src/fs/gnunet-pseudonym.c:284 src/fs/gnunet-pseudonym.c:291
-#: src/fs/gnunet-pseudonym.c:293
+#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
+#: src/fs/gnunet-pseudonym.c:249
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: la opción '%s' es ambigua\n"
 
-#: src/fs/gnunet-pseudonym.c:313 src/fs/gnunet-publish.c:630
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:532
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "seleccione el NIVEL deseado de anonimato al enviar"
 
-#: src/fs/gnunet-pseudonym.c:317
+#: src/fs/gnunet-pseudonym.c:272
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:321
+#: src/fs/gnunet-pseudonym.c:275
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:325
+#: src/fs/gnunet-pseudonym.c:278
 #, fuzzy
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
@@ -2277,169 +2278,183 @@
 "añade una clave adicional para todos los ficheros y directorios (esta opción "
 "puede ser especificada varias veces)"
 
-#: src/fs/gnunet-pseudonym.c:329 src/fs/gnunet-publish.c:650
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:551
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "cambia el meta-dato para el TIPO dado al VALOR dado"
 
-#: src/fs/gnunet-pseudonym.c:332
+#: src/fs/gnunet-pseudonym.c:285
 #, fuzzy
 msgid "print names of local namespaces"
 msgstr "cambia la valoración de un espacio"
 
-#: src/fs/gnunet-pseudonym.c:335
+#: src/fs/gnunet-pseudonym.c:288
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:338
+#: src/fs/gnunet-pseudonym.c:291
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:341 src/fs/gnunet-publish.c:669
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:570
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:345
+#: src/fs/gnunet-pseudonym.c:297
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "cambia la valoración de un espacio"
 
-#: src/fs/gnunet-pseudonym.c:349
+#: src/fs/gnunet-pseudonym.c:300
 #, fuzzy
 msgid "change rating of namespace ID by VALUE"
 msgstr "cambia la valoración de un espacio"
 
-#: src/fs/gnunet-pseudonym.c:359
+#: src/fs/gnunet-pseudonym.c:308
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-search.c:117
+#: src/fs/gnunet-search.c:111
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:188
+#: src/fs/gnunet-search.c:181
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Error abandonando DHT.\n"
 
-#: src/fs/gnunet-search.c:246
+#: src/fs/gnunet-search.c:231
 #, fuzzy, c-format
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-search.c:280
+#: src/fs/gnunet-search.c:255
 #, fuzzy, c-format
 msgid "Could not start searching.\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-search.c:320
+#: src/fs/gnunet-search.c:291
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:324
+#: src/fs/gnunet-search.c:294
 msgid "automatically terminate search after VALUE ms"
 msgstr ""
 
-#: src/fs/gnunet-search.c:336
+#: src/fs/gnunet-search.c:301
+msgid "automatically terminate search after VALUE results are found"
+msgstr ""
+
+#: src/fs/gnunet-search.c:308
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/fs_unindex.c:64
+#: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:72
+#: src/fs/fs_unindex.c:63
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Falló al entregar el mensaje '%s'.\n"
 
-#: src/fs/fs_unindex.c:261
+#: src/fs/fs_unindex.c:235
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:269
+#: src/fs/fs_unindex.c:243
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:277
+#: src/fs/fs_unindex.c:251
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Respuesta inválida a '%s'.\n"
 
-#: src/fs/fs_unindex.c:328
+#: src/fs/fs_unindex.c:296
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/fs/fs_unindex.c:363
+#: src/fs/fs_unindex.c:331
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/fs/fs_unindex.c:376
+#: src/fs/fs_unindex.c:344
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/fs/fs_unindex.c:414
+#: src/fs/fs_unindex.c:378
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/fs/gnunet-directory.c:53
+#: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:100
+#: src/fs/gnunet-directory.c:94
 #, fuzzy, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr "==> Directorio '%s':\n"
 
-#: src/fs/gnunet-directory.c:106
+#: src/fs/gnunet-directory.c:97
 #, fuzzy, c-format
 msgid "Directory `%s' contents:\n"
 msgstr "==> Directorio '%s':\n"
 
-#: src/fs/gnunet-directory.c:147
+#: src/fs/gnunet-directory.c:132
 #, fuzzy, c-format
 msgid "You must specify a filename to inspect."
 msgstr "Debes especificar una lista de ficheros a insertar.\n"
 
-#: src/fs/gnunet-directory.c:163
+#: src/fs/gnunet-directory.c:145
 #, fuzzy, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/gnunet-directory.c:203
+#: src/fs/gnunet-directory.c:176
 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/fs_file_information.c:362
+#: src/fs/fs_file_information.c:349
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s': %s"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/fs/fs_test_lib.c:282
+#: src/fs/fs_test_lib.c:269
 #, fuzzy, c-format
 msgid "Failed to start daemon: %s\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:158
+#: src/fs/gnunet-service-fs_pe.c:228
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:241
+#: src/fs/gnunet-service-fs_pe.c:334
 msgid "# queries messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:354 src/fs/gnunet-service-fs_pe.c:423
-#: src/fs/gnunet-service-fs_pe.c:455
+#: src/fs/gnunet-service-fs_pe.c:457
+#, fuzzy
+msgid "# requests merged"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_pe.c:463
+#, fuzzy
+msgid "# requests refreshed"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_pe.c:511 src/fs/gnunet-service-fs_pe.c:586
+#: src/fs/gnunet-service-fs_pe.c:622
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/fs_getopt.c:202
+#: src/fs/fs_getopt.c:191
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2453,95 +2468,95 @@
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
 
-#: src/fs/gnunet-publish.c:118
+#: src/fs/gnunet-publish.c:115
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:128
+#: src/fs/gnunet-publish.c:123
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Error descargando: %s\n"
 
-#: src/fs/gnunet-publish.c:141
+#: src/fs/gnunet-publish.c:134
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:145
+#: src/fs/gnunet-publish.c:138
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/fs/gnunet-publish.c:292
+#: src/fs/gnunet-publish.c:265
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Actualizando los datos del módulo '%s'\n"
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:267
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Claves para los ficheros '%s':\n"
 
-#: src/fs/gnunet-publish.c:358
+#: src/fs/gnunet-publish.c:312
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-publish.c:411
+#: src/fs/gnunet-publish.c:354
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:419
+#: src/fs/gnunet-publish.c:361
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
 
-#: src/fs/gnunet-publish.c:425
+#: src/fs/gnunet-publish.c:367
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/fs/gnunet-publish.c:434
+#: src/fs/gnunet-publish.c:375
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
 
-#: src/fs/gnunet-publish.c:445 src/fs/gnunet-publish.c:453
+#: src/fs/gnunet-publish.c:385 src/fs/gnunet-publish.c:392
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
 
-#: src/fs/gnunet-publish.c:482
+#: src/fs/gnunet-publish.c:414
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-publish.c:536
+#: src/fs/gnunet-publish.c:459
 #, fuzzy, c-format
 msgid "Could not access file: %s\n"
 msgstr "Imposible ejecutar '%s': %s\n"
 
-#: src/fs/gnunet-publish.c:573
+#: src/fs/gnunet-publish.c:484
 #, fuzzy, c-format
 msgid "Could not publish `%s': %s\n"
 msgstr "Imposible ejecutar '%s': %s\n"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:507
 #, fuzzy, c-format
 msgid "Could not start publishing.\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/fs/gnunet-publish.c:634
+#: src/fs/gnunet-publish.c:536
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:638
+#: src/fs/gnunet-publish.c:539
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:642
+#: src/fs/gnunet-publish.c:543
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2549,7 +2564,7 @@
 "imprime la lista de las claves extraidas que podrían ser usadas, pero no "
 "realiza la subida"
 
-#: src/fs/gnunet-publish.c:646
+#: src/fs/gnunet-publish.c:547
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2557,7 +2572,7 @@
 "añade una clave adicional para el fichero del nivel más alto o el directorio "
 "(esta opción puede ser especificada varias veces)"
 
-#: src/fs/gnunet-publish.c:653
+#: src/fs/gnunet-publish.c:554
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2565,7 +2580,7 @@
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "encriptada en la base de datos de GNUnet)"
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:559
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2573,715 +2588,729 @@
 "especifica la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:662
+#: src/fs/gnunet-publish.c:563
 msgid "specify the priority of the content"
 msgstr "especifica la prioridad del contenido"
 
-#: src/fs/gnunet-publish.c:666
+#: src/fs/gnunet-publish.c:567
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publica los ficheros bajo el pseudónimo NOMBRE (coloca el fichero en el "
 "espacio)"
 
-#: src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-publish.c:573
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:676
+#: src/fs/gnunet-publish.c:577
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "cambia la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:680
+#: src/fs/gnunet-publish.c:581
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:594
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_directory.c:209 src/fs/fs_directory.c:221
+#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
 #, fuzzy
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/gnunet-service-fs_cp.c:726
+#: src/fs/gnunet-service-fs_cp.c:693
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:765
+#: src/fs/gnunet-service-fs_cp.c:728
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:773
+#: src/fs/gnunet-service-fs_cp.c:734
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:806 src/fs/gnunet-service-fs_cp.c:936
-#: src/fs/gnunet-service-fs_cp.c:1367 src/fs/gnunet-service-fs_cp.c:1414
+#: src/fs/gnunet-service-fs_cp.c:763 src/fs/gnunet-service-fs_cp.c:879
+#: src/fs/gnunet-service-fs_cp.c:1289 src/fs/gnunet-service-fs_cp.c:1326
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:889
+#: src/fs/gnunet-service-fs_cp.c:836
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:959
+#: src/fs/gnunet-service-fs_cp.c:899
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:974
+#: src/fs/gnunet-service-fs_cp.c:913
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1019
+#: src/fs/gnunet-service-fs_cp.c:951
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1087
+#: src/fs/gnunet-service-fs_cp.c:1018
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1112
+#: src/fs/gnunet-service-fs_cp.c:1042
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1122
+#: src/fs/gnunet-service-fs_cp.c:1052
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1201
+#: src/fs/gnunet-service-fs_cp.c:1131
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1236
+#: src/fs/gnunet-service-fs_cp.c:1165
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1260
+#: src/fs/gnunet-service-fs_cp.c:1189
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1329
+#: src/fs/gnunet-service-fs_cp.c:1255
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1360
+#: src/fs/gnunet-service-fs_cp.c:1283
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1410
+#: src/fs/gnunet-service-fs_cp.c:1324
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/fs_download.c:332
+#: src/fs/fs_download.c:309
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:354
+#: src/fs/fs_download.c:329
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:536 src/fs/fs_download.c:554
+#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:872
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/fs/fs_download.c:1070
+#: src/fs/fs_download.c:958
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1108
+#: src/fs/fs_download.c:985
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1133
+#: src/fs/fs_download.c:1008
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_download.c:1149
+#: src/fs/fs_download.c:1020
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_download.c:1161
+#: src/fs/fs_download.c:1029
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_download.c:2017
+#: src/fs/fs_download.c:1826
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:116
-#: src/fs/gnunet-service-fs_indexing.c:177
+#: src/fs/gnunet-service-fs_indexing.c:113
+#: src/fs/gnunet-service-fs_indexing.c:163
 #, fuzzy, c-format
 msgid "Configuration option `%s' in section `%s' missing.\n"
 msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:125
-#: src/fs/gnunet-service-fs_indexing.c:192
+#: src/fs/gnunet-service-fs_indexing.c:121
+#: src/fs/gnunet-service-fs_indexing.c:177
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:147
+#: src/fs/gnunet-service-fs_indexing.c:137
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Error creando usuario"
 
-#: src/fs/gnunet-service-fs_indexing.c:252
+#: src/fs/gnunet-service-fs_indexing.c:228
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:297
+#: src/fs/gnunet-service-fs_indexing.c:266
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:548
+#: src/fs/gnunet-service-fs_indexing.c:487
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:628
+#: src/fs/gnunet-service-fs_indexing.c:552
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Imposible resolver '%s': %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:632
+#: src/fs/gnunet-service-fs_indexing.c:554
 #, fuzzy
 msgid "not indexed"
 msgstr "El desindexado falló"
 
-#: src/fs/gnunet-service-fs_indexing.c:663
+#: src/fs/gnunet-service-fs_indexing.c:569
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "La indexación de los datos falló en la posición %i.\n"
 
-#: src/fs/fs_search.c:859
+#: src/fs/fs_search.c:798
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:388 src/fs/gnunet-service-fs_pr.c:633
+#: src/fs/gnunet-service-fs_pr.c:300
 #, fuzzy
+msgid "# Pending requests created"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/fs/gnunet-service-fs_pr.c:379 src/fs/gnunet-service-fs_pr.c:638
+#, fuzzy
 msgid "# Pending requests active"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:769
+#: src/fs/gnunet-service-fs_pr.c:802
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# bytes recibidos por TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:802
+#: src/fs/gnunet-service-fs_pr.c:829
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:821
+#: src/fs/gnunet-service-fs_pr.c:845
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:838
+#: src/fs/gnunet-service-fs_pr.c:860
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:937
+#: src/fs/gnunet-service-fs_pr.c:952
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:962
+#: src/fs/gnunet-service-fs_pr.c:979
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:999
+#: src/fs/gnunet-service-fs_pr.c:1012
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# bytes recibidos vía HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1101
+#: src/fs/gnunet-service-fs_pr.c:1102
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1122
+#: src/fs/gnunet-service-fs_pr.c:1123
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1172
+#: src/fs/gnunet-service-fs_pr.c:1170
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1186
+#: src/fs/gnunet-service-fs_pr.c:1184
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1195
+#: src/fs/gnunet-service-fs_pr.c:1193
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1209
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1230
+#: src/fs/gnunet-service-fs_pr.c:1226
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1239
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1250
+#: src/fs/gnunet-service-fs_pr.c:1244
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1275 src/fs/gnunet-service-fs_pr.c:1323
-#: src/fs/gnunet-service-fs_pr.c:1442
+#: src/fs/gnunet-service-fs_pr.c:1270 src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1426
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1342
+#: src/fs/gnunet-service-fs_pr.c:1329
 msgid "# Datastore lookups concluded (found ultimate result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1356
+#: src/fs/gnunet-service-fs_pr.c:1342
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1421
+#: src/fs/gnunet-service-fs_pr.c:1404
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1487
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1576
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/fs/fs.c:313
+#: src/fs/fs.c:284
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs.c:324
+#: src/fs/fs.c:293
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs.c:332
+#: src/fs/fs.c:299
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs.c:967
+#: src/fs/fs.c:877
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs.c:1445
+#: src/fs/fs.c:1323
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs.c:1491
+#: src/fs/fs.c:1364
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1510
+#: src/fs/fs.c:1380
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs.c:2166
+#: src/fs/fs.c:1984
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2179
+#: src/fs/fs.c:1994
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs.c:2308 src/fs/fs.c:2570
+#: src/fs/fs.c:2107 src/fs/fs.c:2346
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs.c:2331
+#: src/fs/fs.c:2124
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs.c:2347 src/fs/fs.c:2368 src/fs/fs.c:2881
+#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2555
+#: src/fs/fs.c:2337
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs.c:2831
+#: src/fs/fs.c:2583
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs.c:2924
+#: src/fs/fs.c:2669
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:682
+#: src/fs/gnunet-service-fs_push.c:642
 #, c-format
 msgid ""
 "Invalid value specified for option `%s' in section `%s', content pushing "
 "disabled\n"
 msgstr ""
 
-#: src/block/plugin_block_fs.c:138
+#: src/block/plugin_block_fs.c:128
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:105
+#: src/block/plugin_block_dht.c:99
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:114
+#: src/block/plugin_block_dht.c:106
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:126
+#: src/block/plugin_block_dht.c:115
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/block/block.c:113
+#: src/block/block.c:108
 #, fuzzy, c-format
 msgid "Loading block plugins `%s'\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/block/block.c:122
+#: src/block/block.c:118
 #, fuzzy, c-format
 msgid "Failed to load block plugin `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:953
+#: src/mesh/test_mesh_small.c:687
+msgid "Test mesh in a small network."
+msgstr ""
+
+#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:859
 #, fuzzy
 msgid "Failed to transmit shutdown ACK.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/arm/mockup-service.c:47 src/arm/gnunet-service-arm.c:959
+#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:864
 msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:71 src/arm/gnunet-service-arm.c:987
+#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:892
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:200
+#: src/arm/gnunet-service-arm.c:206
 #, c-format
 msgid "Restarting service `%s' due to configuration file change.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:229
+#: src/arm/gnunet-service-arm.c:234
 #, fuzzy
 msgid "Could not send status result to client\n"
 msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/arm/gnunet-service-arm.c:266
+#: src/arm/gnunet-service-arm.c:268
 msgid "Not sending status result to client: no client known\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:428
+#: src/arm/gnunet-service-arm.c:406
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/arm/gnunet-service-arm.c:432
+#: src/arm/gnunet-service-arm.c:409
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:460
+#: src/arm/gnunet-service-arm.c:435
 #, c-format
 msgid "ARM is shutting down, service `%s' not started.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:469
+#: src/arm/gnunet-service-arm.c:443
 #, fuzzy, c-format
 msgid "Service `%s' already running.\n"
 msgstr "¡Esta búsqueda está aún pendiente!\n"
 
-#: src/arm/gnunet-service-arm.c:480
+#: src/arm/gnunet-service-arm.c:453
 #, fuzzy, c-format
 msgid "Binary implementing service `%s' not known!\n"
 msgstr "La verificación de la firma falló: el par '%s' no es conocido.\n"
 
-#: src/arm/gnunet-service-arm.c:493
+#: src/arm/gnunet-service-arm.c:464
 #, fuzzy, c-format
 msgid "Configuration file `%s' for service `%s' not known!\n"
 msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/arm/gnunet-service-arm.c:531
+#: src/arm/gnunet-service-arm.c:498
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:727
+#: src/arm/gnunet-service-arm.c:665
 #, fuzzy
 msgid "Stopping all services\n"
 msgstr "Deteniendo cron\n"
 
-#: src/arm/gnunet-service-arm.c:785
+#: src/arm/gnunet-service-arm.c:717
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:869
+#: src/arm/gnunet-service-arm.c:790
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:874
+#: src/arm/gnunet-service-arm.c:795
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:879
+#: src/arm/gnunet-service-arm.c:800
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/arm/gnunet-service-arm.c:891
+#: src/arm/gnunet-service-arm.c:807
 #, fuzzy, c-format
 msgid "Service `%s' stopped\n"
 msgstr "Servicio eliminado.\n"
 
-#: src/arm/gnunet-service-arm.c:905
+#: src/arm/gnunet-service-arm.c:821
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:156
+#: src/arm/gnunet-arm.c:161
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Servicio eliminado.\n"
 
-#: src/arm/gnunet-arm.c:160
+#: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
 msgid "Failed to stop service `%s'!\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/arm/gnunet-arm.c:166
+#: src/arm/gnunet-arm.c:171
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "Servicio eliminado.\n"
 
-#: src/arm/gnunet-arm.c:170
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Failed to start service `%s'!\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:181
 #, fuzzy, c-format
 msgid "Some error communicating with service `%s'.\n"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/arm/gnunet-arm.c:203
+#: src/arm/gnunet-arm.c:207
 #, fuzzy, c-format
 msgid "Service `%s' is running.\n"
 msgstr "El espacio '%s' ha sido valorado con un %d.\n"
 
-#: src/arm/gnunet-arm.c:208
+#: src/arm/gnunet-arm.c:212
 #, fuzzy, c-format
 msgid "Service `%s' is not running.\n"
 msgstr "'%s' no es un fichero.\n"
 
-#: src/arm/gnunet-arm.c:235
+#: src/arm/gnunet-arm.c:238
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:244 src/arm/gnunet-arm.c:338
+#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:265
+#: src/arm/gnunet-arm.c:269
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/arm/gnunet-arm.c:271
+#: src/arm/gnunet-arm.c:275
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:387
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:389
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:371
+#: src/arm/gnunet-arm.c:391
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:373
+#: src/arm/gnunet-arm.c:393
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:375
+#: src/arm/gnunet-arm.c:396
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:378
+#: src/arm/gnunet-arm.c:399
 msgid "test if a particular service is running"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:380
+#: src/arm/gnunet-arm.c:402
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:382
+#: src/arm/gnunet-arm.c:404
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:391
+#: src/arm/gnunet-arm.c:407
+#, fuzzy
+msgid "timeout for completing current operation"
+msgstr "tiempo para esperar hasta completar una iteración (en ms)"
+
+#: src/arm/gnunet-arm.c:418
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:820
+#: src/arm/gnunet-service-arm_interceptor.c:803
 #, c-format
 msgid "Unable to forward to service `%s': shutdown\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:828
+#: src/arm/gnunet-service-arm_interceptor.c:812
 #, c-format
 msgid "Unable to forward to service `%s': timeout before connect\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:895
+#: src/arm/gnunet-service-arm_interceptor.c:868
 #, fuzzy, c-format
 msgid "Unable to start service `%s': %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/arm/gnunet-service-arm_interceptor.c:964
+#: src/arm/gnunet-service-arm_interceptor.c:936
 #, fuzzy, c-format
 msgid "Unable to accept connection for service `%s': %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/arm/gnunet-service-arm_interceptor.c:982
+#: src/arm/gnunet-service-arm_interceptor.c:952
 #, fuzzy, c-format
 msgid "Service `%s' started\n"
 msgstr "Servicio eliminado.\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:1112
+#: src/arm/gnunet-service-arm_interceptor.c:1080
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Imposible crear la cuenta de usuario:"
 
-#: src/arm/gnunet-service-arm_interceptor.c:1134
+#: src/arm/gnunet-service-arm_interceptor.c:1102
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1151
+#: src/arm/gnunet-service-arm_interceptor.c:1116
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:203 src/arm/test_exponential_backoff.c:194
+#: src/arm/arm_api.c:201 src/arm/test_exponential_backoff.c:192
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:399
+#: src/arm/arm_api.c:390
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr ""
 "El fichero de configuración debe especificar el directorio para almacenar "
 "los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/arm/arm_api.c:414
+#: src/arm/arm_api.c:405
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "El fichero de configuración debe especificar el directorio para almacenar "
 "los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/arm/arm_api.c:495
+#: src/arm/arm_api.c:469
 #, fuzzy, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr "Recibida respuesta anómala a'%s' del par '%s'.\n"
 
-#: src/arm/arm_api.c:568
+#: src/arm/arm_api.c:539
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:569
+#: src/arm/arm_api.c:540
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:593
+#: src/arm/arm_api.c:563
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:594
+#: src/arm/arm_api.c:566
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:626 src/arm/arm_api.c:630
+#: src/arm/arm_api.c:598 src/arm/arm_api.c:602
 #, fuzzy, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr "'%s': No se recibió el mensaje en %llu ms.\n"
 
-#: src/arm/arm_api.c:701
+#: src/arm/arm_api.c:675
 #, fuzzy, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr "No se ha recibido una respuesta en %llums.\n"
 
-#: src/dht/dhtlog.c:57
+#: src/dht/dhtlog.c:56
 #, c-format
 msgid "Loading `%s' dhtlog plugin\n"
 msgstr ""
@@ -3291,1247 +3320,1013 @@
 msgid "Failed to load dhtlog plugin for `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:823
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:588
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:621
+#: src/dht/plugin_dhtlog_mysql_dump.c:895
 #: src/dht/plugin_dhtlog_mysql_dump_load.c:655
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:689
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:723
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:756
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:789
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:822
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:686
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:718
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:750
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:782
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:813
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:844
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:875
 #, fuzzy, c-format
 msgid "Failed to get full path for `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:852
+#: src/dht/plugin_dhtlog_mysql_dump.c:924
 #, fuzzy
 msgid "Failed to create file for dhtlog.\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/dht/gnunet-dht-get-peer.c:86
+#: src/dht/gnunet-dht-get-peer.c:84
 #, c-format
 msgid "Found %u peers\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:121
+#: src/dht/gnunet-dht-get-peer.c:115
 #, fuzzy, c-format
 msgid "Found peer `%s'\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/dht/gnunet-dht-get-peer.c:195 src/dht/gnunet-dht-put.c:173
-#: src/dht/gnunet-dht-get.c:205
+#: src/dht/gnunet-dht-get-peer.c:184 src/dht/gnunet-dht-put.c:161
+#: src/dht/gnunet-dht-get.c:195
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:198 src/dht/gnunet-dht-put.c:182
-#: src/dht/gnunet-dht-get.c:211
+#: src/dht/gnunet-dht-get-peer.c:187 src/dht/gnunet-dht-put.c:170
+#: src/dht/gnunet-dht-get.c:201
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:222
+#: src/dht/gnunet-dht-get-peer.c:209
 msgid "Issue a GET PEER request to the GNUnet DHT, print results."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:96
+#: src/dht/gnunet-dht-put.c:95
 #, c-format
 msgid "PUT request sent!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:119
 #, c-format
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:130
+#: src/dht/gnunet-dht-put.c:127
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/dht/gnunet-dht-put.c:137
+#: src/dht/gnunet-dht-put.c:132
 #, fuzzy, c-format
 msgid "Connected to %s service!\n"
 msgstr "'%s' conectado a '%s'.\n"
 
-#: src/dht/gnunet-dht-put.c:153
+#: src/dht/gnunet-dht-put.c:147
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:176
+#: src/dht/gnunet-dht-put.c:164
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:179
+#: src/dht/gnunet-dht-put.c:167
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:185
+#: src/dht/gnunet-dht-put.c:173
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:209
+#: src/dht/gnunet-dht-put.c:195
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:208
+#: src/dht/gnunet-dht-get.c:198
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:235
+#: src/dht/gnunet-dht-get.c:223
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/dht_api.c:238
+#: src/dht/dht_api.c:235
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/dht/plugin_dhtlog_mysql.c:1592
+#: src/dht/plugin_dhtlog_mysql.c:1550
 #, fuzzy
 msgid "Failed to initialize MySQL database connection for dhtlog.\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/transport/test_plugin_transport_udp.c:196
-#: src/transport/test_plugin_transport_https.c:1194
-#: src/transport/test_plugin_transport.c:213
-#: src/transport/gnunet-service-transport.c:6586
-#: src/transport/test_plugin_transport_http.c:1277
+#: src/transport/test_plugin_transport_udp.c:185
+#: src/transport/test_plugin_transport_https.c:1271
+#: src/transport/test_plugin_transport.c:202
+#: src/transport/gnunet-service-transport.c:435
+#: src/transport/test_plugin_transport_http.c:1232
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:207
-#: src/transport/test_plugin_transport_https.c:1260
-#: src/transport/test_plugin_transport.c:224
-#: src/transport/gnunet-service-transport.c:6621
-#: src/transport/test_plugin_transport_http.c:1303
+#: src/transport/test_plugin_transport_udp.c:195
+#: src/transport/test_plugin_transport_https.c:1335
+#: src/transport/test_plugin_transport.c:212
+#: src/transport/gnunet-service-transport.c:444
+#: src/transport/test_plugin_transport_http.c:1255
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:217
+#: src/transport/test_plugin_transport_udp.c:205
 #, fuzzy
 msgid "Loading udp transport plugin\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/transport/test_plugin_transport_udp.c:225
+#: src/transport/test_plugin_transport_udp.c:213
 #, fuzzy
 msgid "Failed to load transport plugin for udp\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/transport/plugin_transport_wlan.c:1574
-#: src/transport/plugin_transport_wlan.c:1629
-#: src/transport/plugin_transport_wlan.c:1810
+#: src/transport/plugin_transport_wlan.c:1422
+#: src/transport/plugin_transport_wlan.c:1617
+#: src/transport/plugin_transport_wlan.c:1736
 #, c-format
 msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1955
+#: src/transport/plugin_transport_wlan.c:1854
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3213
+#: src/transport/plugin_transport_wlan.c:2710
 #, c-format
 msgid "Finished reading from wlan-helper stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:406
+#: src/transport/gnunet-service-transport_clients.c:246
+#, c-format
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:251
+#, fuzzy
+msgid "# messages dropped due to slow client"
+msgstr "# Anuncios de los pares recibidos"
+
+#: src/transport/gnunet-service-transport_clients.c:394
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:511
+#, fuzzy
+msgid "# bytes payload received for other peers"
+msgstr "# bytes recibidos por TCP"
+
+#: src/transport/gnunet-service-transport_clients.c:528
+msgid "# bytes payload dropped (other peer was not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:579
+#, fuzzy
+msgid "# REQUEST CONNECT messages received"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/transport/gnunet-service-transport_clients.c:607
+#, fuzzy
+msgid "# SET QUOTA messages received"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/transport/gnunet-service-transport_neighbours.c:776
+#, fuzzy
+msgid "# messages not sent (no such peer or not connected)"
+msgstr "# mensajes defragmentados"
+
+#: src/transport/gnunet-service-transport_neighbours.c:796
+#, fuzzy
+msgid "# bytes in message queue for other peers"
+msgstr "# bytes de mensajes salientes omitidos"
+
+#: src/transport/gnunet-service-transport_neighbours.c:864
+msgid "# bandwidth quota violations by other peers"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:882
+msgid "# ms throttling suggested"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:907
+#, fuzzy
+msgid "# KEEPALIVE messages discarded (not connected)"
+msgstr "# mensajes defragmentados"
+
+#: src/transport/gnunet-service-transport_neighbours.c:937
+msgid "# SET QUOTA messages ignored (no such peer)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:949
+msgid "# disconnects due to quota of 0"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:108
+msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:115
+#, fuzzy, c-format
+msgid "Starting transport plugins `%s'\n"
+msgstr "Probando transporte(s) %s\n"
+
+#: src/transport/gnunet-service-transport_plugins.c:119
+#, fuzzy, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr "Probando transporte(s) %s\n"
+
+#: src/transport/gnunet-service-transport_plugins.c:139
+#, fuzzy, c-format
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
+
+#: src/transport/test_plugin_transport_https.c:409
 msgid "Phase 0: Test plugin functions failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:411
+#: src/transport/test_plugin_transport_https.c:418
 msgid "Phase 1: Test connect with wrong data failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:416
+#: src/transport/test_plugin_transport_https.c:427
 msgid "Phase 2: Test session selection failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:421
+#: src/transport/test_plugin_transport_https.c:435
 msgid "Phase 3: Test sending with plugin failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:694
-#: src/transport/test_plugin_transport_http.c:700
+#: src/transport/test_plugin_transport_https.c:726
+#: src/transport/test_plugin_transport_http.c:692
 #, fuzzy, c-format
 msgid "curl failed for `%s' at %s:%d: `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/transport/test_plugin_transport_https.c:713
-#: src/transport/test_plugin_transport_http.c:721
+#: src/transport/test_plugin_transport_https.c:746
+#: src/transport/test_plugin_transport_http.c:712
 msgid "Connecting to peer without any peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:723
-#: src/transport/test_plugin_transport_http.c:733
+#: src/transport/test_plugin_transport_https.c:759
+#: src/transport/test_plugin_transport_http.c:725
 msgid "Connecting to peer with too short peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:733
-#: src/transport/test_plugin_transport_http.c:745
+#: src/transport/test_plugin_transport_https.c:772
+#: src/transport/test_plugin_transport_http.c:738
 msgid "Connecting to peer with too long peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:743
+#: src/transport/test_plugin_transport_https.c:785
 msgid "Connecting to peer with valid peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:884
-#: src/transport/test_plugin_transport_http.c:899
+#: src/transport/test_plugin_transport_https.c:924
+#: src/transport/test_plugin_transport_http.c:887
 #, c-format
 msgid "Unknown address size: ipv6 has %u ipv4 has %u but this has %u\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:891
-#: src/transport/test_plugin_transport_http.c:906
+#: src/transport/test_plugin_transport_https.c:930
+#: src/transport/test_plugin_transport_http.c:893
 #, c-format
 msgid "Transport plugin notification for address: `%s':%u\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:994
-#: src/transport/test_plugin_transport_http.c:1021
+#: src/transport/test_plugin_transport_https.c:1038
+#: src/transport/test_plugin_transport_http.c:1002
 msgid "Connecting to peer without any peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1005
-#: src/transport/test_plugin_transport_http.c:1037
+#: src/transport/test_plugin_transport_https.c:1053
+#: src/transport/test_plugin_transport_http.c:1017
 msgid "Connecting to peer with too short peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1018
-#: src/transport/test_plugin_transport_http.c:1051
+#: src/transport/test_plugin_transport_https.c:1069
+#: src/transport/test_plugin_transport_http.c:1033
 msgid "Connecting to peer with too long peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1029
-#: src/transport/test_plugin_transport_http.c:1068
+#: src/transport/test_plugin_transport_https.c:1083
+#: src/transport/test_plugin_transport_http.c:1047
 msgid "Connecting to peer with valid peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1038
+#: src/transport/test_plugin_transport_https.c:1093
 msgid ""
 "\n"
 "Phase 1: transmit data to all suggested addresses\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1085
+#: src/transport/test_plugin_transport_https.c:1151
 msgid ""
 "\n"
 "Phase 2: session selection\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1115
+#: src/transport/test_plugin_transport_https.c:1187
 msgid ""
 "\n"
 "Phase 3: send multiple or big messages after disconnect\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1120
+#: src/transport/test_plugin_transport_https.c:1193
 #, fuzzy
 msgid "Phase 3: sending messages\n"
 msgstr "Falló al entregar el mensaje '%s'.\n"
 
-#: src/transport/test_plugin_transport_https.c:1210
-#: src/transport/plugin_transport_http.c:3380
-#: src/transport/test_plugin_transport_http.c:1293
+#: src/transport/test_plugin_transport_https.c:1284
+#: src/transport/plugin_transport_http.c:3321
+#: src/transport/test_plugin_transport_http.c:1245
 #, c-format
 msgid "Require valid port number for transport plugin `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1275
+#: src/transport/test_plugin_transport_https.c:1352
 #, fuzzy, c-format
 msgid "Loading HTTPS transport plugin `%s'\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/transport/test_plugin_transport_https.c:1281
+#: src/transport/test_plugin_transport_https.c:1358
 #, fuzzy
 msgid "Failed to load transport plugin for https\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/transport/test_plugin_transport_https.c:1290
+#: src/transport/test_plugin_transport_https.c:1368
 #, c-format
 msgid "Transport plugin returned %u addresses to connect to\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1359
+#: src/transport/test_plugin_transport_https.c:1444
 msgid ""
 "\n"
 "Phase 0\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1417
-#: src/transport/test_plugin_transport_https.c:1420
+#: src/transport/test_plugin_transport_https.c:1507
+#: src/transport/test_plugin_transport_https.c:1510
 msgid ""
 "\n"
 "delete\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_transport_api.c:583
-#: src/transport/test_transport_api_reliability.c:596
-#: src/transport/test_transport_api_unreliability.c:641
-msgid "PATH environment variable is unset.\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-list-connections.c:86
-#: src/peerinfo-tool/gnunet-peerinfo.c:214
-#: src/core/gnunet-core-list-connections.c:170
+#: src/transport/gnunet-transport-list-connections.c:91
+#: src/peerinfo-tool/gnunet-peerinfo.c:200
+#: src/core/gnunet-core-list-connections.c:166
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Argumentos en la linea de comandos inválidos:\n"
 
-#: src/transport/gnunet-transport-list-connections.c:109
-#: src/peerinfo-tool/gnunet-peerinfo.c:278
-#: src/core/gnunet-core-list-connections.c:194
+#: src/transport/gnunet-transport-list-connections.c:112
+#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/core/gnunet-core-list-connections.c:187
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/transport/gnunet-transport-list-connections.c:117
-#: src/core/gnunet-core-list-connections.c:202
+#: src/transport/gnunet-transport-list-connections.c:119
+#: src/core/gnunet-core-list-connections.c:194
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/transport/test_plugin_transport.c:236
+#: src/transport/test_plugin_transport.c:224
 #, fuzzy
 msgid "Loading tcp transport plugin\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/transport/test_plugin_transport.c:244
+#: src/transport/test_plugin_transport.c:232
 #, fuzzy
 msgid "Failed to load transport plugin for tcp\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/transport/plugin_transport_http.c:700
-#: src/transport/plugin_transport_http.c:1259
-#: src/transport/plugin_transport_http.c:2585
+#: src/transport/gnunet-service-transport_hello.c:176
+msgid "# refreshed my HELLO"
+msgstr ""
+
+#: src/transport/plugin_transport_http.c:698
+#: src/transport/plugin_transport_http.c:1231
+#: src/transport/plugin_transport_http.c:2551
 #, fuzzy
 msgid "# HTTP peers active"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_http.c:1008
-#: src/transport/plugin_transport_http.c:1326
+#: src/transport/plugin_transport_http.c:993
+#: src/transport/plugin_transport_http.c:1306
 msgid "# HTTP inbound sessions for peers active"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1930
+#: src/transport/plugin_transport_http.c:1889
 #, c-format
 msgid "Connection %X: HTTP PUT to peer `%s' (`%s') failed: `%s' `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1954
+#: src/transport/plugin_transport_http.c:1915
 #, c-format
 msgid "Connection %X: HTTP GET to peer `%s' (`%s') failed: `%s' `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:2222
-#: src/transport/plugin_transport_http.c:2326
+#: src/transport/plugin_transport_http.c:2193
+#: src/transport/plugin_transport_http.c:2305
 #, fuzzy, c-format
 msgid "Connection: %X: %s failed at %s:%d: `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/transport/plugin_transport_http.c:2626
+#: src/transport/plugin_transport_http.c:2592
 msgid "# HTTP outbound sessions for peers active"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3407
-#: src/transport/plugin_transport_http.c:3435
+#: src/transport/plugin_transport_http.c:3349
+#: src/transport/plugin_transport_http.c:3378
 #, fuzzy
 msgid "Misconfigured address to bind to in configuration!\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/transport/plugin_transport_http.c:3466
+#: src/transport/plugin_transport_http.c:3404
 #, c-format
 msgid "Required configuration options missing in section `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3502
-#, c-format
-msgid "Could not create a new TLS certificate, shell script `%s' failed!\n"
+#: src/transport/plugin_transport_http.c:3442
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3518
+#: src/transport/plugin_transport_http.c:3458
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3642
+#: src/transport/plugin_transport_http.c:3610
 #, c-format
 msgid ""
 "HTTP Server with %s could not be started on port %u! %s plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3658
+#: src/transport/plugin_transport_http.c:3626
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1145
-#, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
-
-#: src/transport/gnunet-service-transport.c:1153
+#: src/transport/plugin_transport_tcp.c:504
 #, c-format
-msgid "Blacklist file `%s' is empty.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1166
-#, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
-
-#: src/transport/gnunet-service-transport.c:1185
-#: src/transport/gnunet-service-transport.c:1206
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr ""
-"Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
-
-#: src/transport/gnunet-service-transport.c:1195
-#: src/transport/gnunet-service-transport.c:1228
-#, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1240
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-msgstr ""
-"Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
-
-#: src/transport/gnunet-service-transport.c:1257
-#, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1303
-msgid "# bytes discarded (could not transmit to client)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1428
-msgid "# address validation timeouts"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1465
-#, c-format
-msgid ""
-"Dropping message of type %u and size %u, have %u messages pending (%u is the "
-"soft limit)\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1471
-#, fuzzy
-msgid "# messages dropped due to slow client"
-msgstr "# Anuncios de los pares recibidos"
-
-#: src/transport/gnunet-service-transport.c:1575
-#: src/transport/gnunet-service-transport.c:1753
-msgid "# bytes pending with plugins"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1581
-#, fuzzy
-msgid "# bytes successfully transmitted by plugins"
-msgstr "# bytes desencriptados"
-
-#: src/transport/gnunet-service-transport.c:1588
-msgid "# bytes with transmission failure by plugins"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1614
-#: src/transport/gnunet-service-transport.c:2021
-#: src/transport/gnunet-service-transport.c:2028
-#: src/transport/gnunet-service-transport.c:2068
-#: src/transport/gnunet-service-transport.c:2467
-#: src/transport/gnunet-service-transport.c:2524
-#: src/transport/gnunet-service-transport.c:4917
-#, fuzzy
-msgid "# connected addresses"
-msgstr "# de pares conectados"
-
-#: src/transport/gnunet-service-transport.c:1671
-msgid "# transport selected peer address freely"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1679
-#, fuzzy
-msgid "# transport failed to selected peer address"
-msgstr "Anunciando mi transporte %d a los pares seleccionados.\n"
-
-#: src/transport/gnunet-service-transport.c:1692
-#: src/transport/gnunet-service-transport.c:1749
-#: src/transport/gnunet-service-transport.c:1826
-#: src/transport/gnunet-service-transport.c:4945
-#, fuzzy
-msgid "# bytes in message queue for other peers"
-msgstr "# bytes de mensajes salientes omitidos"
-
-#: src/transport/gnunet-service-transport.c:1696
-msgid "# bytes discarded (no destination address available)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1708
-msgid "# message delivery deferred (no address)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1911
-#: src/transport/gnunet-service-transport.c:3838
-#, fuzzy
-msgid "# PING without HELLO messages sent"
-msgstr "# mensajes de texto mandados por PING"
-
-#: src/transport/gnunet-service-transport.c:2140
-msgid "# transmission attempts failed (no address)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2214
-msgid "# refreshed my HELLO"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2241
-msgid "# transmitted my HELLO to other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2354
-msgid "# disconnects due to try_fast_reconnect"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2419
-msgid "# disconnects due to session end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2455
-msgid "# disconnects due to unready session"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2482
-msgid "# try_fast_reconnect thanks to plugin_env_session_end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2491
-msgid "# disconnects due to missing pong"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2532
-msgid "# disconnects due to NO pong"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2545
-msgid "# try_fast_reconnect thanks to validated_address"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2569
-msgid "# disconnects due to plugin_env_session_end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3033
-msgid "# disconnects due to timeout"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3074
-msgid "# valid peer addresses returned by PEERINFO"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3093
-msgid "# previously validated addresses lacking transport"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3123
-#: src/transport/gnunet-service-transport.c:4206
-#: src/transport/gnunet-service-transport.c:4924
-#, fuzzy
-msgid "# peer addresses considered valid"
-msgstr "# Anuncios de los pares recibidos"
-
-#: src/transport/gnunet-service-transport.c:3168
-#: src/transport/gnunet-service-transport.c:3258
-#: src/transport/gnunet-service-transport.c:4581
-#: src/transport/gnunet-service-transport.c:4827
-#: src/transport/gnunet-service-transport.c:4987
-#: src/transport/gnunet-service-transport.c:6336
-msgid "# outstanding peerinfo iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3220
-#: src/transport/gnunet-service-transport.c:5009
-msgid "# active neighbours"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3254
-msgid "# peerinfo new neighbor iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3266
-msgid "# HELLO's sent to new neighbors"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3562
-msgid "# disconnects due to blacklist"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3833
-#, fuzzy
-msgid "# PING with HELLO messages sent"
-msgstr "# mensajes de texto mandados por PING"
-
-#: src/transport/gnunet-service-transport.c:3842
-msgid "# PING messages sent for re-validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3966
-msgid "# payload received from other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4130
-#, c-format
-msgid ""
-"Not accepting PONG from `%s' with address `%s' since I cannot confirm using "
-"this address.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4169
-msgid "Received expired signature.  Check system time.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4173
-msgid "# address validation successes"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4287
-#: src/core/gnunet-service-core.c:4287
-#, fuzzy
-msgid "# PONG messages received"
-msgstr "# mensajes PONG encriptados recibidos"
-
-#: src/transport/gnunet-service-transport.c:4400
-msgid "# PING messages sent for initial validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4442
-msgid "# peer addresses scheduled for validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4451
-#, c-format
-msgid ""
-"Transport `%s' not loaded, will not try to validate peer address using this "
-"transport.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4454
-msgid "# peer addresses not validated (plugin not available)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4470
-msgid "# peer addresses not validated (loopback)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4516
-msgid "# peer addresses not validated (in progress)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4605
-msgid "# new HELLOs requiring full validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4616
-msgid "# duplicate HELLO (peer known)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4661
-msgid "# no existing neighbour record (validating HELLO)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4666
-msgid "# HELLO validations (update case)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4706
-#, fuzzy
-msgid "# HELLOs received for validation"
-msgstr "# blocks migrados"
-
-#: src/transport/gnunet-service-transport.c:4737
-msgid "# HELLOs ignored for validation (is my own HELLO)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4754
-msgid "# HELLOs ignored due to high load"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4823
-msgid "# peerinfo process hello iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4949
-#, fuzzy
-msgid "# bytes discarded due to disconnect"
-msgstr "# Anuncios de los pares recibidos"
-
-#: src/transport/gnunet-service-transport.c:5054
-#, fuzzy, c-format
-msgid "Received `%s' message from `%s' destined for `%s' which is not me!\n"
-msgstr "¡Recibido PING no destinado a nosotros!\n"
-
-#: src/transport/gnunet-service-transport.c:5076
-#: src/core/gnunet-service-core.c:4264
-#, fuzzy
-msgid "# PING messages received"
-msgstr "# mensajes PONG encriptados recibidos"
-
-#: src/transport/gnunet-service-transport.c:5088
-#, c-format
-msgid "Refusing to create PONG since I do not have a session with `%s'.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5161
-#, c-format
-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5256
-msgid "# PONGs unicast via reliable transport"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5269
-msgid "# PONGs multicast to all available addresses"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5300
-#, fuzzy, c-format
-msgid "Could not send PONG to `%s': no address available\n"
-msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
-
-#: src/transport/gnunet-service-transport.c:5408
-#, fuzzy
-msgid "# bytes received from other peers"
-msgstr "# bytes recibidos por TCP"
-
-#: src/transport/gnunet-service-transport.c:5425
-#, c-format
-msgid ""
-"Dropping incoming message due to repeated bandwidth quota (%u b/s) "
-"violations (total of %u).\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5429
-msgid "# bandwidth quota violations by other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5466
-#, fuzzy
-msgid "# HELLO messages received from other peers"
-msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
-
-#: src/transport/gnunet-service-transport.c:5497
-msgid "# ms throttling suggested"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5547
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5621
-#, fuzzy
-msgid "# HELLOs received from clients"
-msgstr "El mensaje recibido del cliente es inválido\n"
-
-#: src/transport/gnunet-service-transport.c:5714
-msgid "# payload received for other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5757
-#, fuzzy
-msgid "# REQUEST CONNECT messages received"
-msgstr "# mensajes PONG encriptados recibidos"
-
-#: src/transport/gnunet-service-transport.c:5788
-#, fuzzy
-msgid "# SET QUOTA messages received"
-msgstr "# mensajes PONG encriptados recibidos"
-
-#: src/transport/gnunet-service-transport.c:5796
-msgid "# SET QUOTA messages ignored (no such peer)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5819
-msgid "# disconnects due to quota of 0"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:6137
-#, fuzzy, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr "Probando transporte(s) %s\n"
-
-#: src/transport/gnunet-service-transport.c:6149
-#, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
-
-#: src/transport/gnunet-service-transport.c:6645
-#, fuzzy, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr "Probando transporte(s) %s\n"
-
-#: src/transport/gnunet-service-transport.c:6738
-msgid "Transport service ready.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:515
-#, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:606
-#: src/transport/plugin_transport_tcp.c:702
-#: src/transport/plugin_transport_tcp.c:756
-#: src/transport/plugin_transport_tcp.c:848
-#: src/transport/plugin_transport_tcp.c:1208
+#: src/transport/plugin_transport_tcp.c:590
+#: src/transport/plugin_transport_tcp.c:679
+#: src/transport/plugin_transport_tcp.c:728
+#: src/transport/plugin_transport_tcp.c:817
+#: src/transport/plugin_transport_tcp.c:1142
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes enviados por TCP"
 
-#: src/transport/plugin_transport_tcp.c:614
-#: src/transport/plugin_transport_tcp.c:877
-#: src/transport/plugin_transport_tcp.c:1623
+#: src/transport/plugin_transport_tcp.c:596
+#: src/transport/plugin_transport_tcp.c:843
+#: src/transport/plugin_transport_tcp.c:1531
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/transport/plugin_transport_tcp.c:706
+#: src/transport/plugin_transport_tcp.c:683
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:760
+#: src/transport/plugin_transport_tcp.c:731
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes desencriptados"
 
-#: src/transport/plugin_transport_tcp.c:852
+#: src/transport/plugin_transport_tcp.c:821
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:989
+#: src/transport/plugin_transport_tcp.c:942
 #, fuzzy
 msgid "# bytes TCP was asked to transmit"
 msgstr "# bytes desencriptados"
 
-#: src/transport/plugin_transport_tcp.c:1046
+#: src/transport/plugin_transport_tcp.c:993
 msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1091
+#: src/transport/plugin_transport_tcp.c:1034
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1110
+#: src/transport/plugin_transport_tcp.c:1051
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1168
+#: src/transport/plugin_transport_tcp.c:1103
 #, fuzzy
 msgid "# bytes discarded by TCP (failed to connect)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:1284
+#: src/transport/plugin_transport_tcp.c:1211
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1670
+#: src/transport/plugin_transport_tcp.c:1574
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_tcp.c:1831
+#: src/transport/plugin_transport_tcp.c:1722
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_tcp.c:1896
+#: src/transport/plugin_transport_tcp.c:1788
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2063
+#: src/transport/plugin_transport_tcp.c:1941
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/transport/plugin_transport_tcp.c:2135
+#: src/transport/plugin_transport_tcp.c:2001
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/plugin_transport_tcp.c:2161
+#: src/transport/plugin_transport_tcp.c:2024
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2166
+#: src/transport/plugin_transport_tcp.c:2028
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2170
+#: src/transport/plugin_transport_tcp.c:2032
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_validation.c:520
+msgid "# address records discarded"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:606
+#: src/core/gnunet-service-core.c:4187
+#, fuzzy
+msgid "# PING messages received"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/transport/gnunet-service-transport_validation.c:628
+#, c-format
+msgid ""
+"Not confirming PING with address `%s' since I cannot confirm having this "
+"address.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:685
+msgid "# PONGs unicast via reliable transport"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:694
+msgid "# PONGs multicast to all available addresses"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:758
+#, c-format
+msgid ""
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:792
+#, fuzzy
+msgid "# PING without HELLO messages sent"
+msgstr "# mensajes de texto mandados por PING"
+
+#: src/transport/gnunet-service-transport_validation.c:864
+msgid "# address revalidations started"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:923
+#: src/core/gnunet-service-core.c:4210
+#, fuzzy
+msgid "# PONG messages received"
+msgstr "# mensajes PONG encriptados recibidos"
+
+#: src/transport/gnunet-service-transport_validation.c:945
+msgid "# PONGs dropped, no matching pending validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:961
+msgid "# PONGs dropped, signature expired"
+msgstr ""
+
 #: src/transport/plugin_transport_smtp.c:367
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr "Recibido el mensaje '%s' con un mal formato. Omitiendo.\n"
 
-#: src/transport/plugin_transport_smtp.c:459
+#: src/transport/plugin_transport_smtp.c:454
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:469
+#: src/transport/plugin_transport_smtp.c:463
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:565
-#: src/transport/plugin_transport_smtp.c:576
-#: src/transport/plugin_transport_smtp.c:590
-#: src/transport/plugin_transport_smtp.c:610
-#: src/transport/plugin_transport_smtp.c:635
+#: src/transport/plugin_transport_smtp.c:558
+#: src/transport/plugin_transport_smtp.c:568
+#: src/transport/plugin_transport_smtp.c:581
+#: src/transport/plugin_transport_smtp.c:600
+#: src/transport/plugin_transport_smtp.c:623
+#: src/transport/plugin_transport_smtp.c:631
 #: src/transport/plugin_transport_smtp.c:644
-#: src/transport/plugin_transport_smtp.c:658
-#: src/transport/plugin_transport_smtp.c:670
+#: src/transport/plugin_transport_smtp.c:655
 #, fuzzy, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "'%s' %s falló: %s\n"
 
-#: src/transport/plugin_transport_smtp.c:816
+#: src/transport/plugin_transport_smtp.c:798
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:833
+#: src/transport/plugin_transport_smtp.c:810
 #, fuzzy
 msgid "# bytes received via SMTP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_smtp.c:834
+#: src/transport/plugin_transport_smtp.c:811
 #, fuzzy
 msgid "# bytes sent via SMTP"
 msgstr "# bytes enviados por TCP"
 
-#: src/transport/plugin_transport_smtp.c:836
+#: src/transport/plugin_transport_smtp.c:813
 #, fuzzy
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/test_plugin_transport_http.c:1319
+#: src/transport/test_plugin_transport_http.c:1271
 #, fuzzy, c-format
 msgid "Loading HTTP transport plugin `%s'\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/transport/test_plugin_transport_http.c:1326
+#: src/transport/test_plugin_transport_http.c:1278
 #, fuzzy
 msgid "Failed to load transport plugin for http\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/transport/test_plugin_transport_http.c:1408
+#: src/transport/test_plugin_transport_http.c:1364
 msgid ""
 "Phase 0\n"
 "\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1352
-#: src/transport/plugin_transport_unix.c:1118
+#: src/transport/plugin_transport_udp.c:1279
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1410
+#: src/transport/plugin_transport_udp.c:1329
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/transport/plugin_transport_udp.c:1541
+#: src/transport/plugin_transport_udp.c:1455
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/transport/transport_api.c:582
+#: src/transport/transport_api.c:570
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Recibido mensaje corrupto del par '%s' en %s:%d.\n"
 
-#: src/transport/plugin_transport_unix.c:1144
+#: src/transport/plugin_transport_unix.c:1092
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/chat/chat.c:177
+#: src/transport/gnunet-service-transport_blacklist.c:247
+#, fuzzy, c-format
+msgid "Could not read blacklist file `%s'\n"
+msgstr "Imposible inicializar la aplicación '%s'\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:254
+#, c-format
+msgid "Blacklist file `%s' is empty.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:266
+#, fuzzy, c-format
+msgid "Failed to read blacklist from `%s'\n"
+msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:287
+#: src/transport/gnunet-service-transport_blacklist.c:311
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+msgstr ""
+"Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:298
+#: src/transport/gnunet-service-transport_blacklist.c:336
+#, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:350
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+msgstr ""
+"Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:364
+#, c-format
+msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:522
+#: src/transport/gnunet-service-transport_blacklist.c:754
+msgid "# disconnects due to blacklist"
+msgstr ""
+
+#: src/chat/chat.c:175
 #, fuzzy
 msgid "Could not transmit confirmation receipt\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/chat/chat.c:288
+#: src/chat/chat.c:283
 msgid "The current user must be the the first one joined\n"
 msgstr ""
 
-#: src/chat/chat.c:424
+#: src/chat/chat.c:412
 #, fuzzy, c-format
 msgid "Unknown message type: '%u'\n"
 msgstr "Operación desconocida '%s'\n"
 
-#: src/chat/chat.c:489
+#: src/chat/chat.c:472
 #, fuzzy, c-format
 msgid "Configuration option `%s' in section `%s' missing\n"
 msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/chat/chat.c:498
+#: src/chat/chat.c:480
 #, fuzzy, c-format
 msgid "Failed to access chat home directory `%s'\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/chat/chat.c:517
+#: src/chat/chat.c:498
 #, fuzzy, c-format
 msgid "Failed to create/open key in file `%s'\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/chat/chat.c:581
+#: src/chat/chat.c:559
 #, fuzzy
 msgid "Could not serialize metadata\n"
 msgstr "¡Imposible inicializar libgnunetutil!\n"
 
-#: src/chat/chat.c:701
+#: src/chat/chat.c:674
 #, fuzzy
 msgid "Failed to connect to the chat service\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/chat/chat.c:707
+#: src/chat/chat.c:680
 msgid "Undefined mandatory parameter: joinCallback\n"
 msgstr ""
 
-#: src/chat/chat.c:713
+#: src/chat/chat.c:686
 msgid "Undefined mandatory parameter: messageCallback\n"
 msgstr ""
 
-#: src/chat/chat.c:719
+#: src/chat/chat.c:692
 msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:89
+#: src/chat/gnunet-chat.c:92
 #, c-format
 msgid "Joined\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:123
+#: src/chat/gnunet-chat.c:124
 msgid "anonymous"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:129
+#: src/chat/gnunet-chat.c:130
 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "'%s' %s falló: %s\n"
 
-#: src/chat/gnunet-chat.c:132 src/chat/gnunet-chat.c:135
+#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr "'%s' %s falló: %s\n"
 
-#: src/chat/gnunet-chat.c:138
+#: src/chat/gnunet-chat.c:139
 #, fuzzy, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr "'%s' %s falló: %s\n"
 
-#: src/chat/gnunet-chat.c:141
+#: src/chat/gnunet-chat.c:142
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr "'%s' falló con el código de error %s: %s"
 
-#: src/chat/gnunet-chat.c:144
+#: src/chat/gnunet-chat.c:145
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/chat/gnunet-chat.c:147
+#: src/chat/gnunet-chat.c:148
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/chat/gnunet-chat.c:150
+#: src/chat/gnunet-chat.c:151
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/chat/gnunet-chat.c:153
+#: src/chat/gnunet-chat.c:156
 #, fuzzy, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:159
 #, fuzzy, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr "'%s' falló con el código de error %s: %s"
 
-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:162
 #, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:191
+#: src/chat/gnunet-chat.c:193
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:222
+#: src/chat/gnunet-chat.c:224
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:222
+#: src/chat/gnunet-chat.c:224
 #, c-format
 msgid "`%s' left the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:286 src/chat/gnunet-chat.c:326
+#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
 #, fuzzy, c-format
 msgid "Could not change username\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/chat/gnunet-chat.c:290 src/chat/gnunet-chat.c:660
+#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:629
 #, fuzzy, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr "Respuesta inválida a '%s' del par '%s'.\n"
 
-#: src/chat/gnunet-chat.c:330
+#: src/chat/gnunet-chat.c:320
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
 
-#: src/chat/gnunet-chat.c:343
+#: src/chat/gnunet-chat.c:333
 #, fuzzy, c-format
 msgid "Users in room `%s': "
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/chat/gnunet-chat.c:383
+#: src/chat/gnunet-chat.c:371
 #, c-format
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:391
+#: src/chat/gnunet-chat.c:379
 #, fuzzy, c-format
 msgid "Unknown user `%s'\n"
 msgstr "Operación desconocida '%s'\n"
 
-#: src/chat/gnunet-chat.c:407
+#: src/chat/gnunet-chat.c:395
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:448
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Operación desconocida '%s'\n"
 
-#: src/chat/gnunet-chat.c:478
+#: src/chat/gnunet-chat.c:459
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:463
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:467
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:470
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:472
 msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:493
+#: src/chat/gnunet-chat.c:474
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:496
+#: src/chat/gnunet-chat.c:477
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:499
+#: src/chat/gnunet-chat.c:480
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:501
+#: src/chat/gnunet-chat.c:482
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:503
+#: src/chat/gnunet-chat.c:484
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:505
+#: src/chat/gnunet-chat.c:486
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:508
+#: src/chat/gnunet-chat.c:489
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:510
+#: src/chat/gnunet-chat.c:491
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:627
+#: src/chat/gnunet-chat.c:605
 #, fuzzy, c-format
 msgid "You must specify a nickname\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/chat/gnunet-chat.c:652
+#: src/chat/gnunet-chat.c:621
 #, fuzzy, c-format
 msgid "Failed to join room `%s'\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/chat/gnunet-chat.c:685
+#: src/chat/gnunet-chat.c:654
 msgid "set the nickname to use (required)"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:688
+#: src/chat/gnunet-chat.c:657
 msgid "set the chat room to join"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:702
+#: src/chat/gnunet-chat.c:669
 msgid "Join a chat on GNUnet."
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:273
+#: src/chat/gnunet-service-chat.c:267
 #, fuzzy
 msgid "Failed to queue a message notification\n"
 msgstr "Imposible guardar la configuración"
 
-#: src/chat/gnunet-service-chat.c:566
+#: src/chat/gnunet-service-chat.c:546
 #, fuzzy
 msgid "Failed to queue a join notification\n"
 msgstr "Imposible guardar la configuración"
 
-#: src/chat/gnunet-service-chat.c:764
+#: src/chat/gnunet-service-chat.c:729
 #, fuzzy
 msgid "Failed to queue a confirmation receipt\n"
 msgstr "Imposible guardar la configuración"
 
-#: src/chat/gnunet-service-chat.c:952
+#: src/chat/gnunet-service-chat.c:907
 #, fuzzy
 msgid "Failed to queue a leave notification\n"
 msgstr "Imposible guardar la configuración"
@@ -4542,30 +4337,30 @@
 msgid "Peer `%s'\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:241
+#: src/peerinfo-tool/gnunet-peerinfo.c:222
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:249
+#: src/peerinfo-tool/gnunet-peerinfo.c:229
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Analizando saludo de '%s' se produjo un fallo.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:261
+#: src/peerinfo-tool/gnunet-peerinfo.c:241
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:281
+#: src/peerinfo-tool/gnunet-peerinfo.c:261
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:284
+#: src/peerinfo-tool/gnunet-peerinfo.c:264
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:292
+#: src/peerinfo-tool/gnunet-peerinfo.c:270
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Imprime información de los pares de GNUnet."
@@ -4575,33 +4370,33 @@
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:223
+#: src/datastore/plugin_datastore_sqlite.c:239
 #, fuzzy, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:253
+#: src/datastore/plugin_datastore_sqlite.c:266
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:669
+#: src/datastore/plugin_datastore_sqlite.c:662
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "Datos no válidos en %s.  Intentando fijar (por borrado).\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1110
+#: src/datastore/plugin_datastore_sqlite.c:1115
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1138
+#: src/datastore/plugin_datastore_sqlite.c:1134
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1179
+#: src/datastore/plugin_datastore_sqlite.c:1173
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "base de datos sqlite"
@@ -4611,362 +4406,374 @@
 msgid "# bytes used in file-sharing datastore"
 msgstr "# bytes en la base de datos"
 
-#: src/datastore/gnunet-service-datastore.c:347
+#: src/datastore/gnunet-service-datastore.c:331
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# bytes recibidos por TCP"
 
-#: src/datastore/gnunet-service-datastore.c:427
+#: src/datastore/gnunet-service-datastore.c:397
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:496
+#: src/datastore/gnunet-service-datastore.c:457
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:665
+#: src/datastore/gnunet-service-datastore.c:610
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:712
+#: src/datastore/gnunet-service-datastore.c:655
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:724
+#: src/datastore/gnunet-service-datastore.c:666
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:728
+#: src/datastore/gnunet-service-datastore.c:670
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:734
+#: src/datastore/gnunet-service-datastore.c:676
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:740
-#: src/datastore/gnunet-service-datastore.c:795
-#: src/datastore/gnunet-service-datastore.c:1041
-#: src/datastore/gnunet-service-datastore.c:1596
+#: src/datastore/gnunet-service-datastore.c:681
+#: src/datastore/gnunet-service-datastore.c:735
+#: src/datastore/gnunet-service-datastore.c:953
+#: src/datastore/gnunet-service-datastore.c:1438
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:810
+#: src/datastore/gnunet-service-datastore.c:750
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:908
+#: src/datastore/gnunet-service-datastore.c:835
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1099
+#: src/datastore/gnunet-service-datastore.c:1001
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/gnunet-service-datastore.c:1115
+#: src/datastore/gnunet-service-datastore.c:1015
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1150
+#: src/datastore/gnunet-service-datastore.c:1043
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/gnunet-service-datastore.c:1189
+#: src/datastore/gnunet-service-datastore.c:1077
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/gnunet-service-datastore.c:1227
+#: src/datastore/gnunet-service-datastore.c:1112
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/gnunet-service-datastore.c:1263
+#: src/datastore/gnunet-service-datastore.c:1139
 #, fuzzy
 msgid "Content not found"
 msgstr "¡Comando '%s' no encontrado!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1276
+#: src/datastore/gnunet-service-datastore.c:1149
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1316
+#: src/datastore/gnunet-service-datastore.c:1183
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/gnunet-service-datastore.c:1371
+#: src/datastore/gnunet-service-datastore.c:1227
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1452
-#: src/datastore/test_plugin_datastore.c:361
-#: src/datastore/perf_plugin_datastore.c:467
+#: src/datastore/gnunet-service-datastore.c:1300
+#: src/datastore/test_plugin_datastore.c:322
+#: src/datastore/perf_plugin_datastore.c:420
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1460
+#: src/datastore/gnunet-service-datastore.c:1309
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/datastore/gnunet-service-datastore.c:1648
+#: src/datastore/gnunet-service-datastore.c:1488
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1653
+#: src/datastore/gnunet-service-datastore.c:1490
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1667
+#: src/datastore/gnunet-service-datastore.c:1500
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1680
+#: src/datastore/gnunet-service-datastore.c:1513
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/datastore/plugin_datastore_template.c:252
+#: src/datastore/plugin_datastore_template.c:241
 msgid "Template database running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:292
+#: src/datastore/datastore_api.c:287
 #, fuzzy
 msgid "Failed to transmit request to drop database.\n"
 msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
 
-#: src/datastore/datastore_api.c:380
+#: src/datastore/datastore_api.c:370
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:432
+#: src/datastore/datastore_api.c:417
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:462
+#: src/datastore/datastore_api.c:444
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:493
+#: src/datastore/datastore_api.c:465
 #, fuzzy
 msgid "# Requests dropped from datastore queue"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/datastore/datastore_api.c:543
+#: src/datastore/datastore_api.c:514
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:573
+#: src/datastore/datastore_api.c:541
 msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/datastore/datastore_api.c:644
+#: src/datastore/datastore_api.c:606
 msgid "Failed to transmit request to DATASTORE.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:646
+#: src/datastore/datastore_api.c:608
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/datastore/datastore_api.c:673
+#: src/datastore/datastore_api.c:631
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# bytes en la base de datos"
 
-#: src/datastore/datastore_api.c:822
+#: src/datastore/datastore_api.c:768
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr ""
 "\n"
 "Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/datastore/datastore_api.c:836
+#: src/datastore/datastore_api.c:781
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:848 src/datastore/datastore_api.c:855
+#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
 
-#: src/datastore/datastore_api.c:864
+#: src/datastore/datastore_api.c:806
 #, fuzzy
 msgid "# status messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:947
+#: src/datastore/datastore_api.c:878
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:1024
+#: src/datastore/datastore_api.c:950
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1092
+#: src/datastore/datastore_api.c:1015
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1159
+#: src/datastore/datastore_api.c:1078
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:1234
+#: src/datastore/datastore_api.c:1148
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/datastore_api.c:1281
+#: src/datastore/datastore_api.c:1193
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr ""
 "\n"
 "Fallo al recibir la respuesta de gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1345
+#: src/datastore/datastore_api.c:1254
 #, fuzzy
 msgid "# Results received"
 msgstr "# bytes recibidos por TCP"
 
-#: src/datastore/datastore_api.c:1424
+#: src/datastore/datastore_api.c:1326
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1492
+#: src/datastore/datastore_api.c:1393
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1563
+#: src/datastore/datastore_api.c:1457
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/datastore/plugin_datastore_mysql.c:515
+#: src/datastore/plugin_datastore_mysql.c:529
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/datastore/plugin_datastore_mysql.c:608
+#: src/datastore/plugin_datastore_mysql.c:622
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' a '%s' falló en %s: %d con error %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1484
+#: src/datastore/plugin_datastore_mysql.c:1500
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:177
+#: src/datastore/plugin_datastore_postgres.c:173
 #, fuzzy, c-format
 msgid "Unable to initialize Postgres with configuration `%s': %s"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/datastore/plugin_datastore_postgres.c:1116
+#: src/datastore/plugin_datastore_postgres.c:979
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:161
+#: src/dv/plugin_transport_dv.c:159
 #, fuzzy, c-format
 msgid "%s Received message from %s of type %d, distance %u!\n"
 msgstr "Recibido mensaje corrupto del par '%s' en %s:%d.\n"
 
-#: src/dv/dv_api.c:179
+#: src/dv/dv_api.c:178
 #, fuzzy
 msgid "Failed to connect to the dv service!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/nse/nse-profiler.c:462
-#, fuzzy
-msgid "Run a test of the NSE service."
-msgstr "Imposible acceder al servicio"
+#: src/nse/gnunet-service-nse.c:864
+#, c-format
+msgid "Proof of work invalid: %llu!\n"
+msgstr ""
 
-#: src/nse/gnunet-service-nse.c:998
+#: src/nse/gnunet-service-nse.c:1286 src/nse/gnunet-service-nse.c:1305
+#: src/nse/gnunet-service-nse.c:1326
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1008
-msgid "NSE Service could not access hostkey.  Exiting.\n"
-msgstr ""
+#: src/nse/gnunet-service-nse.c:1293
+#, fuzzy
+msgid "Invalid work requirement for NSE service. Exiting.\n"
+msgstr "Argumentos no válidos. Saliendo.\n"
 
-#: src/core/gnunet-service-core.c:935
+#: src/nse/gnunet-service-nse.c:1314
+#, fuzzy
+msgid "NSE service could not access hostkey.  Exiting.\n"
+msgstr "Imposible acceder a la información del espacio.\n"
+
+#: src/nse/gnunet-nse-profiler.c:673
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "Imposible acceder al servicio"
+
+#: src/core/gnunet-service-core.c:920
 msgid "# total peer preference"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1063
+#: src/core/gnunet-service-core.c:1040
 msgid "# peer status changes"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1176
+#: src/core/gnunet-service-core.c:1236
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/core/gnunet-service-core.c:1662
+#: src/core/gnunet-service-core.c:1712
 #, c-format
 msgid ""
 "Client asked for preference change with peer `%s', which is not connected!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1747 src/core/gnunet-service-core.c:4318
-#: src/core/gnunet-service-core.c:4541
+#: src/core/gnunet-service-core.c:1793 src/core/gnunet-service-core.c:4240
+#: src/core/gnunet-service-core.c:4456
 msgid "# established sessions"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1794
+#: src/core/gnunet-service-core.c:1838
 msgid "# bytes encrypted"
 msgstr "# bytes encriptados"
 
-#: src/core/gnunet-service-core.c:1933 src/core/gnunet-service-core.c:2781
-#: src/core/gnunet-service-core.c:4623
+#: src/core/gnunet-service-core.c:1964 src/core/gnunet-service-core.c:2793
+#: src/core/gnunet-service-core.c:4532
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2003
+#: src/core/gnunet-service-core.c:2031
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2114
+#: src/core/gnunet-service-core.c:2134
 msgid "# bytes decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/core/gnunet-service-core.c:2289
+#: src/core/gnunet-service-core.c:2314
 msgid "# transmissions delayed due to corking"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2494
+#: src/core/gnunet-service-core.c:2517
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2849
+#: src/core/gnunet-service-core.c:2857
 #, fuzzy
 msgid "# messages discarded (disconnected)"
 msgstr "# mensajes defragmentados"
 
-#: src/core/gnunet-service-core.c:2906 src/core/gnunet-service-core.c:4741
+#: src/core/gnunet-service-core.c:2909 src/core/gnunet-service-core.c:4644
 msgid "# discarded CORE_SEND requests"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2919 src/core/gnunet-service-core.c:4742
+#: src/core/gnunet-service-core.c:2924 src/core/gnunet-service-core.c:4648
 msgid "# discarded lower priority CORE_SEND requests"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2994
+#: src/core/gnunet-service-core.c:2996
 #, fuzzy
 msgid "# connection requests received"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -4975,182 +4782,230 @@
 msgid "# connection requests ignored (already connected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3057 src/core/gnunet-service-core.c:3741
+#: src/core/gnunet-service-core.c:3054 src/core/gnunet-service-core.c:3697
 msgid "# SET_KEY messages deferred (need public key)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3070
+#: src/core/gnunet-service-core.c:3067
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3105
+#: src/core/gnunet-service-core.c:3099
 msgid "# Error extracting public key from HELLO"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3151
+#: src/core/gnunet-service-core.c:3145
 msgid "# Asking transport to connect (for SET_KEY)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3286
+#: src/core/gnunet-service-core.c:3270
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/core/gnunet-service-core.c:3367
+#: src/core/gnunet-service-core.c:3349
 #, c-format
 msgid ""
 "Ignoring `%s' message due to lack of public key for peer `%4s' (failed to "
 "obtain one).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3471
+#: src/core/gnunet-service-core.c:3444
 #, fuzzy
 msgid "# PING messages decrypted"
 msgstr "# mensajes defragmentados"
 
-#: src/core/gnunet-service-core.c:3483
+#: src/core/gnunet-service-core.c:3456
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3515
+#: src/core/gnunet-service-core.c:3481
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# mensajes fragmentados"
 
-#: src/core/gnunet-service-core.c:3574
+#: src/core/gnunet-service-core.c:3534
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# mensajes defragmentados"
 
-#: src/core/gnunet-service-core.c:3617
+#: src/core/gnunet-service-core.c:3572
 #, fuzzy
 msgid "# Session keys confirmed via PONG"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/core/gnunet-service-core.c:3751
+#: src/core/gnunet-service-core.c:3706
 #, fuzzy, c-format
 msgid "Received `%s' message that was for `%s', not for me.  Ignoring.\n"
 msgstr "el tamaño del '%s' mensaje es demasiado corto. Ignorandolo.\n"
 
-#: src/core/gnunet-service-core.c:3796
+#: src/core/gnunet-service-core.c:3748
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# mensajes defragmentados"
 
-#: src/core/gnunet-service-core.c:3953
+#: src/core/gnunet-service-core.c:3894
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de ruido recibidos"
 
-#: src/core/gnunet-service-core.c:3997
+#: src/core/gnunet-service-core.c:3941
 msgid "# messages not delivered to any client"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4076 src/core/gnunet-service-core.c:4102
+#: src/core/gnunet-service-core.c:4011 src/core/gnunet-service-core.c:4036
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core.c:4088
+#: src/core/gnunet-service-core.c:4023
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core.c:4126
+#: src/core/gnunet-service-core.c:4060
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/core/gnunet-service-core.c:4129
+#: src/core/gnunet-service-core.c:4064
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos por UDP (salientes)"
 
-#: src/core/gnunet-service-core.c:4162
+#: src/core/gnunet-service-core.c:4094
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/core/gnunet-service-core.c:4230
+#: src/core/gnunet-service-core.c:4157
 #, fuzzy
 msgid "# session keys received"
 msgstr "# claves de la sesión rechazadas"
 
-#: src/core/gnunet-service-core.c:4248
+#: src/core/gnunet-service-core.c:4173
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4306
+#: src/core/gnunet-service-core.c:4229
 #, fuzzy, c-format
 msgid "Unsupported message of type %u received.\n"
 msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
 
-#: src/core/gnunet-service-core.c:4481 src/core/gnunet-service-core.c:4572
+#: src/core/gnunet-service-core.c:4403 src/core/gnunet-service-core.c:4485
 #, fuzzy
 msgid "# peers connected (transport)"
 msgstr "# de pares conectados"
 
-#: src/core/gnunet-service-core.c:4695
+#: src/core/gnunet-service-core.c:4599
 msgid "Core service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4713
+#: src/core/gnunet-service-core.c:4617
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4751
+#: src/core/gnunet-service-core.c:4656
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/core_api.c:874
+#: src/core/core_api.c:832
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:291 src/include/gnunet_common.h:296
-#: src/include/gnunet_common.h:302
+#: src/include/gnunet_common.h:296 src/include/gnunet_common.h:301
+#: src/include/gnunet_common.h:307
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/include/gnunet_common.h:312
+#: src/include/gnunet_common.h:317
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/include/gnunet_common.h:326
+#: src/include/gnunet_common.h:331
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 
-#: src/include/gnunet_getopt_lib.h:145
+#: src/include/gnunet_getopt_lib.h:144
 msgid "print this help"
 msgstr "imprime esta ayuda"
 
-#: src/include/gnunet_getopt_lib.h:155
+#: src/include/gnunet_getopt_lib.h:154
 msgid "print the version number"
 msgstr "imprime el número de versión"
 
-#: src/include/gnunet_getopt_lib.h:164
+#: src/include/gnunet_getopt_lib.h:163
 msgid "configure logging to write logs to LOGFILE"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:173
+#: src/include/gnunet_getopt_lib.h:172
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:182
+#: src/include/gnunet_getopt_lib.h:181
 msgid "be verbose"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:191
+#: src/include/gnunet_getopt_lib.h:190
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "usa el fichero de configuración FILENAME"
 
+#, fuzzy
+#~ msgid "Failed to connect to core service\n"
+#~ msgstr "Fallo al conectar a gnunetd.\n"
+
+#, fuzzy
+#~ msgid "# bytes successfully transmitted by plugins"
+#~ msgstr "# bytes desencriptados"
+
+#, fuzzy
+#~ msgid "# connected addresses"
+#~ msgstr "# de pares conectados"
+
+#, fuzzy
+#~ msgid "# transport failed to selected peer address"
+#~ msgstr "Anunciando mi transporte %d a los pares seleccionados.\n"
+
+#, fuzzy
+#~ msgid "# peer addresses considered valid"
+#~ msgstr "# Anuncios de los pares recibidos"
+
+#, fuzzy
+#~ msgid "# PING with HELLO messages sent"
+#~ msgstr "# mensajes de texto mandados por PING"
+
+#, fuzzy
+#~ msgid "# HELLOs received for validation"
+#~ msgstr "# blocks migrados"
+
+#, fuzzy
+#~ msgid "# bytes discarded due to disconnect"
+#~ msgstr "# Anuncios de los pares recibidos"
+
+#, fuzzy
+#~ msgid "Received `%s' message from `%s' destined for `%s' which is not me!\n"
+#~ msgstr "¡Recibido PING no destinado a nosotros!\n"
+
+#, fuzzy
+#~ msgid "Could not send PONG to `%s': no address available\n"
+#~ msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
+
+#, fuzzy
+#~ msgid "# HELLO messages received from other peers"
+#~ msgstr "Mensaje '%s' inválido recibido del par '%s'.\n"
+
+#, fuzzy
+#~ msgid "# HELLOs received from clients"
+#~ msgstr "El mensaje recibido del cliente es inválido\n"
+
 #~ msgid "Error"
 #~ msgstr "Error"
 
@@ -5695,9 +5550,6 @@
 #~ msgid "sleep for SPACE ms after each a message block"
 #~ msgstr "duerme durante SPACE ms después de cada bloque de mensajes"
 
-#~ msgid "time to wait for the completion of an iteration (in ms)"
-#~ msgstr "tiempo para esperar hasta completar una iteración (en ms)"
-
 #~ msgid "number of messages in a message block"
 #~ msgstr "número de mensajes en un bloque de mensajes"
 

Modified: gnunet/po/gnunet.pot
===================================================================
--- gnunet/po/gnunet.pot        2011-09-13 12:43:24 UTC (rev 16810)
+++ gnunet/po/gnunet.pot        2011-09-13 12:44:25 UTC (rev 16811)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-07-19 15:16+0200\n"
+"POT-Creation-Date: 2011-09-13 14:44+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <address@hidden>\n"
 "Language-Team: LANGUAGE <address@hidden>\n"
@@ -17,622 +17,624 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/fragmentation/defragmentation.c:274
+#: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:457
+#: src/fragmentation/defragmentation.c:454
 msgid "# fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:521
+#: src/fragmentation/defragmentation.c:513
 msgid "# duplicate fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:545
+#: src/fragmentation/defragmentation.c:532
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:181
+#: src/fragmentation/fragmentation.c:183
 msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:185
+#: src/fragmentation/fragmentation.c:186
 msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:249
+#: src/fragmentation/fragmentation.c:248
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:254
+#: src/fragmentation/fragmentation.c:251
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:336
+#: src/fragmentation/fragmentation.c:335
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:343
+#: src/fragmentation/fragmentation.c:341
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:358
+#: src/fragmentation/fragmentation.c:365
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/nat/nat.c:823
+#: src/nat/nat.c:778
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:884
+#: src/nat/nat.c:828
 #, c-format
 msgid "Failed to start %s\n"
 msgstr ""
 
-#: src/nat/nat.c:1185 src/nat/nat.c:1207
+#: src/nat/nat.c:1096 src/nat/nat.c:1113
 #, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr ""
 
-#: src/nat/nat.c:1276 src/nat/nat.c:1284
+#: src/nat/nat.c:1167 src/nat/nat.c:1177
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1422
+#: src/nat/nat.c:1309
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1440
+#: src/nat/nat.c:1321
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:317
+#: src/nat/gnunet-nat-server.c:290
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:361
+#: src/nat/gnunet-nat-server.c:329
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_test.c:376
+#: src/nat/nat_test.c:348
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/nat/nat_test.c:451
+#: src/nat/nat_test.c:418
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:772 src/vpn/gnunet-daemon-exit.c:1280
-#: src/template/gnunet-template.c:72 src/core/test_core_api_send_to_self.c:216
+#: src/vpn/gnunet-daemon-vpn.c:1275 src/vpn/gnunet-daemon-exit.c:1455
+#: src/template/gnunet-template.c:68 src/core/test_core_api_send_to_self.c:217
 msgid "help text"
 msgstr ""
 
-#: src/datacache/datacache.c:110 src/datacache/datacache.c:255
-#: src/datastore/gnunet-service-datastore.c:888
+#: src/datacache/datacache.c:108 src/datacache/datacache.c:236
+#: src/datastore/gnunet-service-datastore.c:821
 msgid "# bytes stored"
 msgstr ""
 
-#: src/datacache/datacache.c:138 src/datacache/datacache.c:149
-#: src/datastore/gnunet-service-datastore.c:1442
-#: src/datastore/gnunet-service-datastore.c:1641
-#: src/datastore/test_plugin_datastore.c:209
-#: src/datastore/test_plugin_datastore.c:352
-#: src/datastore/perf_plugin_datastore.c:340
-#: src/datastore/perf_plugin_datastore.c:458
+#: src/datacache/datacache.c:134 src/datacache/datacache.c:142
+#: src/datastore/gnunet-service-datastore.c:1292
+#: src/datastore/gnunet-service-datastore.c:1483
+#: src/datastore/test_plugin_datastore.c:192
+#: src/datastore/test_plugin_datastore.c:315
+#: src/datastore/perf_plugin_datastore.c:309
+#: src/datastore/perf_plugin_datastore.c:413
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
 
-#: src/datacache/datacache.c:178
+#: src/datacache/datacache.c:167
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:186
+#: src/datacache/datacache.c:176
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:285
+#: src/datacache/datacache.c:262
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:292
+#: src/datacache/datacache.c:268
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/plugin_datacache_template.c:126
+#: src/datacache/plugin_datacache_template.c:121
 msgid "Template datacache running\n"
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:66
 #: src/datacache/plugin_datacache_sqlite.c:69
-#: src/datacache/plugin_datacache_sqlite.c:126
-#: src/datacache/plugin_datacache_sqlite.c:201
-#: src/datacache/plugin_datacache_sqlite.c:248
-#: src/datacache/plugin_datacache_sqlite.c:322
-#: src/datacache/plugin_datacache_sqlite.c:331
-#: src/datacache/plugin_datacache_sqlite.c:345
+#: src/datacache/plugin_datacache_sqlite.c:122
+#: src/datacache/plugin_datacache_sqlite.c:191
+#: src/datacache/plugin_datacache_sqlite.c:232
+#: src/datacache/plugin_datacache_sqlite.c:296
+#: src/datacache/plugin_datacache_sqlite.c:305
+#: src/datacache/plugin_datacache_sqlite.c:318
+#: src/datacache/plugin_datacache_sqlite.c:325
+#: src/datacache/plugin_datacache_sqlite.c:338
+#: src/datacache/plugin_datacache_sqlite.c:346
 #: src/datacache/plugin_datacache_sqlite.c:354
-#: src/datacache/plugin_datacache_sqlite.c:374
-#: src/datacache/plugin_datacache_sqlite.c:383
-#: src/datacache/plugin_datacache_sqlite.c:394
 #: src/datacache/plugin_datacache_mysql.c:103
 #: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:518
-#: src/datacache/plugin_datacache_mysql.c:527
-#: src/datacache/plugin_datacache_mysql.c:603
-#: src/datacache/plugin_datacache_mysql.c:619 src/util/crypto_rsa.c:84
-#: src/util/crypto_ksk.c:47 src/dht/plugin_dhtlog_mysql.c:583
-#: src/dht/plugin_dhtlog_mysql.c:592 src/dht/plugin_dhtlog_mysql.c:652
-#: src/dht/plugin_dhtlog_mysql.c:667
+#: src/datacache/plugin_datacache_mysql.c:517
+#: src/datacache/plugin_datacache_mysql.c:526
+#: src/datacache/plugin_datacache_mysql.c:598
+#: src/datacache/plugin_datacache_mysql.c:614 src/util/crypto_rsa.c:84
+#: src/util/crypto_ksk.c:47 src/dht/plugin_dhtlog_mysql.c:581
+#: src/dht/plugin_dhtlog_mysql.c:590 src/dht/plugin_dhtlog_mysql.c:648
+#: src/dht/plugin_dhtlog_mysql.c:663
 #: src/datastore/plugin_datastore_sqlite.c:61
 #: src/datastore/plugin_datastore_mysql.c:139
 #: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:599
-#: src/datastore/plugin_datastore_mysql.c:661
-#: src/datastore/plugin_datastore_mysql.c:673 src/include/gnunet_common.h:319
+#: src/datastore/plugin_datastore_mysql.c:613
+#: src/datastore/plugin_datastore_mysql.c:673
+#: src/datastore/plugin_datastore_mysql.c:685 src/include/gnunet_common.h:324
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:461
+#: src/datacache/plugin_datacache_sqlite.c:419
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:496
-#: src/datastore/plugin_datastore_sqlite.c:381
+#: src/datacache/plugin_datacache_sqlite.c:454
+#: src/datastore/plugin_datastore_sqlite.c:405
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:81
-#: src/datastore/plugin_datastore_postgres.c:95
+#: src/datacache/plugin_datacache_postgres.c:79
+#: src/datastore/plugin_datastore_postgres.c:93
 #, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:154
+#: src/datacache/plugin_datacache_postgres.c:149
 #, c-format
 msgid "Unable to initialize Postgres: %s"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:557
+#: src/datacache/plugin_datacache_postgres.c:500
 msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:220
-#: src/datastore/plugin_datastore_mysql.c:297
+#: src/datacache/plugin_datacache_mysql.c:224
+#: src/datastore/plugin_datastore_mysql.c:316
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:227
-#: src/datastore/plugin_datastore_mysql.c:304
+#: src/datacache/plugin_datacache_mysql.c:230
+#: src/datastore/plugin_datastore_mysql.c:322
 #, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:1061
+#: src/datacache/plugin_datacache_mysql.c:979
 msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1801 src/testing/testing_group.c:1814
-#: src/testing/testing_group.c:1920 src/testing/testing_group.c:1981
-#: src/testing/testing_group.c:2070 src/testing/testing_group.c:2092
-#: src/testing/testing_group.c:2231 src/testing/test_testing_topology.c:1104
-#: src/testing/test_testing_topology_blacklist.c:457
-#: src/testing/testing_peergroup.c:856
-#: src/testing/test_testing_large_topology.c:1046
-#: src/dht/test_dht_multipeer.c:833 src/dht/gnunet-dht-driver.c:4001
-#: src/dv/test_transport_api_dv.c:1102
+#: src/testing/testing_group.c:1903 src/testing/testing_group.c:1915
+#: src/testing/testing_group.c:2016 src/testing/testing_group.c:2075
+#: src/testing/testing_group.c:2164 src/testing/testing_group.c:2184
+#: src/testing/testing_group.c:2321 src/testing/test_testing_topology.c:1078
+#: src/testing/test_testing_topology_blacklist.c:448
+#: src/testing/testing_peergroup.c:876
+#: src/testing/test_testing_large_topology.c:1022
+#: src/dht/test_dht_multipeer.c:864 src/dht/gnunet-dht-driver.c:3907
+#: src/dv/test_transport_api_dv.c:1132
 #, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1824
+#: src/testing/testing_group.c:1925
 #, c-format
 msgid "Target is %d connections per peer."
 msgstr ""
 
-#: src/testing/testing_group.c:2079
+#: src/testing/testing_group.c:2172
 #, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2111 src/testing/testing_group.c:2307
+#: src/testing/testing_group.c:2202 src/testing/testing_group.c:2395
 #, c-format
 msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2148
+#: src/testing/testing_group.c:2239
 #, c-format
 msgid "natural log of %d is %d, will run %d iterations\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2151
+#: src/testing/testing_group.c:2242
 #, c-format
 msgid "Total connections added thus far: %u!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2193
+#: src/testing/testing_group.c:2283
 #, c-format
 msgid "Total connections added for small world: %d!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2246
+#: src/testing/testing_group.c:2335
 #, c-format
 msgid "rand is %f probability is %f\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2824 src/testing/testing_group.c:3035
+#: src/testing/testing_group.c:2910 src/testing/testing_group.c:3109
 #, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
 "file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2935
+#: src/testing/testing_group.c:3011
 msgid "Finished copying all friend files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3051
+#: src/testing/testing_group.c:3124
 #, c-format
 msgid "Copying file with command cp %s %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3074
+#: src/testing/testing_group.c:3147
 #, c-format
 msgid "Copying file with command scp %s %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3092
+#: src/testing/testing_group.c:3164
 #, c-format
 msgid "Checking copy status of file %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3111
+#: src/testing/testing_group.c:3182
 #, c-format
 msgid "File %d copied\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3126
+#: src/testing/testing_group.c:3197
 msgid "Finished copying all blacklist files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3496 src/testing/testing_group.c:3624
-#: src/testing/testing_group.c:4839 src/testing/testing_group.c:4982
+#: src/testing/testing_group.c:3581 src/testing/testing_group.c:3720
+#: src/testing/testing_group.c:4925 src/testing/testing_group.c:5066
 msgid "Delaying connect, we have too many outstanding connections!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3506 src/testing/testing_group.c:4851
-#: src/testing/testing_group.c:4994
+#: src/testing/testing_group.c:3591 src/testing/testing_group.c:4935
+#: src/testing/testing_group.c:5076
 #, c-format
 msgid "Creating connection, outstanding_connections is %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3518
+#: src/testing/testing_group.c:3603
 #, c-format
 msgid "Offering Hello of peer %s to peer %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3636
+#: src/testing/testing_group.c:3730
 #, c-format
 msgid "Creating connection, outstanding_connections is %d (max %d)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3887
+#: src/testing/testing_group.c:3983
 msgid "Creating clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3894
+#: src/testing/testing_group.c:3990
 msgid "Creating small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3901
+#: src/testing/testing_group.c:3997
 msgid "Creating small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3907
+#: src/testing/testing_group.c:4003
 msgid "Creating ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3913
+#: src/testing/testing_group.c:4009
 msgid "Creating 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3920
+#: src/testing/testing_group.c:4015
 msgid "Creating Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3926
+#: src/testing/testing_group.c:4021
 msgid "Creating InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3933
+#: src/testing/testing_group.c:4027
 msgid "Creating Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3940
+#: src/testing/testing_group.c:4034
 msgid "Creating straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3947
+#: src/testing/testing_group.c:4040
 msgid "Creating topology from file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3966
+#: src/testing/testing_group.c:4058
 msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3983
+#: src/testing/testing_group.c:4075
 msgid "Failed during friend file copying!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3991
+#: src/testing/testing_group.c:4083
 msgid "Friend files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4010
+#: src/testing/testing_group.c:4102
 msgid "Blacklisting all but clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4018
+#: src/testing/testing_group.c:4110
 msgid "Blacklisting all but small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4028
+#: src/testing/testing_group.c:4118
 msgid "Blacklisting all but small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4036
+#: src/testing/testing_group.c:4126
 msgid "Blacklisting all but ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4044
+#: src/testing/testing_group.c:4134
 msgid "Blacklisting all but 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4052
+#: src/testing/testing_group.c:4142
 msgid "Blacklisting all but Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4060
+#: src/testing/testing_group.c:4150
 msgid "Blacklisting all but InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4097
+#: src/testing/testing_group.c:4187
 msgid "Blacklisting all but Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4105
+#: src/testing/testing_group.c:4195
 msgid "Blacklisting all but straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4122
+#: src/testing/testing_group.c:4212
 msgid "Failed during blacklist file copying!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4130
+#: src/testing/testing_group.c:4220
 msgid "Blacklist files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5213
+#: src/testing/testing_group.c:5301
 msgid "Creating clique CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5220
+#: src/testing/testing_group.c:5308
 msgid "Creating small world (ring) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5227
+#: src/testing/testing_group.c:5315
 msgid "Creating small world (2d-torus) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5233
+#: src/testing/testing_group.c:5321
 msgid "Creating ring CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5240
+#: src/testing/testing_group.c:5328
 msgid "Creating 2d torus CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5247
+#: src/testing/testing_group.c:5335
 msgid "Creating Erdos-Renyi CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5254
+#: src/testing/testing_group.c:5342
 msgid "Creating InterNAT CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5261
+#: src/testing/testing_group.c:5349
 msgid "Creating Scale Free CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5268
+#: src/testing/testing_group.c:5356
 msgid "Creating straight line CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5274
+#: src/testing/testing_group.c:5362
 msgid "Creating no CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5280
+#: src/testing/testing_group.c:5368
 msgid "Unknown topology specification, can't connect peers!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5289
+#: src/testing/testing_group.c:5378
 #, c-format
 msgid "Connecting random subset (%'.2f percent) of possible peers\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5297
+#: src/testing/testing_group.c:5386
 #, c-format
 msgid "Connecting a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5305
+#: src/testing/testing_group.c:5395
 #, c-format
 msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5315
+#: src/testing/testing_group.c:5405
 #, c-format
 msgid "Finding additional %u closest peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5923
+#: src/testing/testing_group.c:6084
 msgid "Could not read hostkeys file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5996
+#: src/testing/testing_group.c:6154
 #, c-format
 msgid "Could not create configuration for peer number %u on `%s'!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6119 src/testing/testing.c:1189
+#: src/testing/testing_group.c:6298 src/testing/testing.c:1272
 #, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr ""
 
-#: src/testing/testing.c:210
-msgid "Failed to connect to core service\n"
-msgstr ""
-
-#: src/testing/testing.c:247 src/testing/testing.c:735
-#: src/testing/testing.c:1947 src/testing/testing.c:1965
-#: src/testing/testing.c:2049 src/testing/testing.c:2065
-msgid "Failed to connect to transport service!\n"
-msgstr ""
-
-#: src/testing/testing.c:327
+#: src/testing/testing.c:208
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:342 src/testing/testing.c:912
+#: src/testing/testing.c:222 src/testing/testing.c:822
 msgid "`scp' did not complete cleanly.\n"
 msgstr ""
 
-#: src/testing/testing.c:367
+#: src/testing/testing.c:245
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:368
+#: src/testing/testing.c:246
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:430
+#: src/testing/testing.c:302
 #, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr ""
 
-#: src/testing/testing.c:440
+#: src/testing/testing.c:309
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:441 src/testing/testing.c:638
+#: src/testing/testing.c:310 src/testing/testing.c:508
 msgid "Failed to start `ssh' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:506
+#: src/testing/testing.c:372
 #, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:510
+#: src/testing/testing.c:376
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr ""
 
-#: src/testing/testing.c:520
+#: src/testing/testing.c:386
 msgid "`Failed to get hostkey!\n"
 msgstr ""
 
-#: src/testing/testing.c:556
+#: src/testing/testing.c:420
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:627
+#: src/testing/testing.c:500
 #, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr ""
 
-#: src/testing/testing.c:637
+#: src/testing/testing.c:507
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:665
+#: src/testing/testing.c:531 src/testing/testing.c:630
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:666
+#: src/testing/testing.c:532 src/testing/testing.c:631
+#: src/testing/testing.c:651
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:707
-msgid "Unable to connect to CORE service for peer!\n"
+#: src/testing/testing.c:571 src/testing/testing.c:2072
+#: src/testing/testing.c:2091
+msgid "Failed to connect to transport service!\n"
 msgstr ""
 
-#: src/testing/testing.c:769
+#: src/testing/testing.c:600
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:797
+#: src/testing/testing.c:650
+msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
+msgstr ""
+
+#: src/testing/testing.c:673 src/testing/testing.c:707
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:827
+#: src/testing/testing.c:688 src/testing/testing.c:737
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr ""
 
-#: src/testing/testing.c:899
+#: src/testing/testing.c:810
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:1277 src/testing/testing.c:1407
+#: src/testing/testing.c:988
 #, c-format
+msgid "Starting service %s for peer `%4s'\n"
+msgstr ""
+
+#: src/testing/testing.c:1360 src/testing/testing.c:1443
+#: src/testing/testing.c:1581
+#, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr ""
 
-#: src/testing/testing.c:1359
+#: src/testing/testing.c:1533
 #, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr ""
 
-#: src/testing/testing.c:1492
+#: src/testing/testing.c:1668
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1500
+#: src/testing/testing.c:1676
 msgid "Failed to write new configuration to disk."
 msgstr ""
 
-#: src/testing/testing.c:1532
+#: src/testing/testing.c:1707
 #, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr ""
 
-#: src/testing/testing.c:1535
+#: src/testing/testing.c:1710
 msgid "Failed to copy new configuration to remote machine."
 msgstr ""
 
-#: src/testing/testing.c:1723
+#: src/testing/testing.c:1881
 msgid "Peers failed to connect"
 msgstr ""
 
-#: src/testing/testing.c:1918 src/testing/testing.c:2036
+#: src/testing/testing.c:2036
 msgid "Failed to connect to core service of first peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:2107
+#: src/testing/testing.c:2238
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
@@ -641,199 +643,197 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:202
+#: src/peerinfo/gnunet-service-peerinfo.c:197
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:251
+#: src/peerinfo/gnunet-service-peerinfo.c:241
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:318
+#: src/peerinfo/gnunet-service-peerinfo.c:306
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api_notify.c:266
+#: src/peerinfo/peerinfo_api_notify.c:257
 #, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr ""
 
-#: src/peerinfo/test_peerinfo_api.c:112 src/hostlist/hostlist-server.c:469
-#: src/peerinfo-tool/gnunet-peerinfo.c:168 src/dv/gnunet-service-dv.c:2833
-#: src/core/gnunet-service-core.c:3036 src/core/gnunet-service-core.c:3345
+#: src/peerinfo/test_peerinfo_api.c:109 src/hostlist/hostlist-server.c:437
+#: src/peerinfo-tool/gnunet-peerinfo.c:157 src/dv/gnunet-service-dv.c:2998
+#: src/core/gnunet-service-core.c:3034 src/core/gnunet-service-core.c:3328
 #, c-format
 msgid "Error in communication with PEERINFO service\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:280
+#: src/peerinfo/peerinfo_api.c:276
 #, c-format
 msgid "Failed to transmit message to `%s' service.\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:447
+#: src/peerinfo/peerinfo_api.c:432
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:476 src/peerinfo/peerinfo_api.c:494
+#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
 msgid "Received invalid message from `PEERINFO' service.\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:540
+#: src/peerinfo/peerinfo_api.c:521
 msgid "Failed to transmit iteration request to `PEERINFO' service\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:580
+#: src/peerinfo/peerinfo_api.c:555
 msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:281
-#: src/hostlist/hostlist-client.c:620
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:259
+#: src/hostlist/hostlist-client.c:622
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:298
-#: src/hostlist/hostlist-client.c:594 src/hostlist/hostlist-client.c:1384
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:274
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1338
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:311
-#: src/hostlist/hostlist-server.c:377
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:286
+#: src/hostlist/hostlist-server.c:353
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:422
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:389
 #, c-format
 msgid "Hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:265
+#: src/hostlist/gnunet-daemon-hostlist.c:253
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:300
-#: src/topology/gnunet-daemon-topology.c:1452
-#: src/topology/gnunet-daemon-topology.c:1460 src/fs/gnunet-service-fs.c:544
+#: src/hostlist/gnunet-daemon-hostlist.c:286
+#: src/topology/gnunet-daemon-topology.c:1315
+#: src/topology/gnunet-daemon-topology.c:1322 src/fs/gnunet-service-fs.c:519
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:321
+#: src/hostlist/gnunet-daemon-hostlist.c:306
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/hostlist/gnunet-daemon-hostlist.c:311
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:328
+#: src/hostlist/gnunet-daemon-hostlist.c:314
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:332
+#: src/hostlist/gnunet-daemon-hostlist.c:318
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:344
+#: src/hostlist/gnunet-daemon-hostlist.c:330
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:135
+#: src/hostlist/hostlist-server.c:134
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:164
+#: src/hostlist/hostlist-server.c:160
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:194
-#: src/topology/gnunet-daemon-topology.c:973
-#: src/transport/gnunet-service-transport.c:3160
-#: src/transport/gnunet-service-transport.c:4572
+#: src/hostlist/hostlist-server.c:187
+#: src/topology/gnunet-daemon-topology.c:900
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:217
+#: src/hostlist/hostlist-server.c:208
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:234
+#: src/hostlist/hostlist-server.c:224
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:289
+#: src/hostlist/hostlist-server.c:272
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:292
+#: src/hostlist/hostlist-server.c:275
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:283
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:309
+#: src/hostlist/hostlist-server.c:290
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:313
+#: src/hostlist/hostlist-server.c:294
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:321
+#: src/hostlist/hostlist-server.c:302
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:323
+#: src/hostlist/hostlist-server.c:305
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:329
+#: src/hostlist/hostlist-server.c:309
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:331
+#: src/hostlist/hostlist-server.c:310
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:427
+#: src/hostlist/hostlist-server.c:398
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:599
-#: src/transport/gnunet-service-transport.c:6603
-#: src/peerinfo-tool/gnunet-peerinfo.c:224 src/core/gnunet-service-core.c:4703
+#: src/hostlist/hostlist-server.c:556
+#: src/transport/gnunet-service-transport.c:458
+#: src/peerinfo-tool/gnunet-peerinfo.c:208 src/core/gnunet-service-core.c:4607
 #, c-format
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:611
+#: src/hostlist/hostlist-server.c:566
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:623
+#: src/hostlist/hostlist-server.c:575
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:639
+#: src/hostlist/hostlist-server.c:589
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:679
+#: src/hostlist/hostlist-server.c:627
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -842,366 +842,362 @@
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:343
+#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:314 src/hostlist/hostlist-client.c:347
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:334
+#: src/hostlist/hostlist-client.c:330
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:383 src/hostlist/hostlist-client.c:403
+#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
 #, c-format
 msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:480 src/hostlist/hostlist-client.c:680
-#: src/hostlist/hostlist-client.c:687 src/hostlist/hostlist-client.c:739
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:885
-#: src/hostlist/hostlist-client.c:996 src/hostlist/hostlist-client.c:1002
-#: src/transport/test_plugin_transport_https.c:787
-#: src/transport/test_plugin_transport_https.c:796
-#: src/transport/plugin_transport_http.c:2094
-#: src/transport/plugin_transport_http.c:2103
+#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
+#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
+#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
+#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
+#: src/transport/test_plugin_transport_https.c:829
+#: src/transport/test_plugin_transport_https.c:837
+#: src/transport/plugin_transport_http.c:2059
+#: src/transport/plugin_transport_http.c:2067
+#: src/transport/test_plugin_transport_http.c:795
 #: src/transport/test_plugin_transport_http.c:803
-#: src/transport/test_plugin_transport_http.c:812
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:661
+#: src/hostlist/hostlist-client.c:663
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:810
+#: src/hostlist/hostlist-client.c:805
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:827
+#: src/hostlist/hostlist-client.c:822
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:848
+#: src/hostlist/hostlist-client.c:842
 #, c-format
 msgid "%s failed for `%s' at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:857
+#: src/hostlist/hostlist-client.c:848
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:864
+#: src/hostlist/hostlist-client.c:856
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
+#: src/hostlist/hostlist-client.c:909
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:926
+#: src/hostlist/hostlist-client.c:917
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1075 src/hostlist/hostlist-client.c:1567
+#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1511
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1084
+#: src/hostlist/hostlist-client.c:1054
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1124
+#: src/hostlist/hostlist-client.c:1092
 msgid "Scheduled saving of hostlists\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1128
+#: src/hostlist/hostlist-client.c:1096
 #, c-format
 msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1151 src/hostlist/hostlist-client.c:1171
+#: src/hostlist/hostlist-client.c:1117 src/hostlist/hostlist-client.c:1133
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1249
 #, c-format
 msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1325
+#: src/hostlist/hostlist-client.c:1280
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/hostlist-client.c:1286
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1335
+#: src/hostlist/hostlist-client.c:1290
 #, c-format
 msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1344
+#: src/hostlist/hostlist-client.c:1301
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1378
+#: src/hostlist/hostlist-client.c:1334
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1380
+#: src/hostlist/hostlist-client.c:1336
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1416
+#: src/hostlist/hostlist-client.c:1369
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1429
+#: src/hostlist/hostlist-client.c:1383
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1436
+#: src/hostlist/hostlist-client.c:1388
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1464 src/hostlist/hostlist-client.c:1482
+#: src/hostlist/hostlist-client.c:1412 src/hostlist/hostlist-client.c:1429
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1476
+#: src/hostlist/hostlist-client.c:1424
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1533
+#: src/hostlist/hostlist-client.c:1476
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1536
+#: src/hostlist/hostlist-client.c:1479
 #, c-format
 msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1545
+#: src/hostlist/hostlist-client.c:1488
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1557
+#: src/hostlist/hostlist-client.c:1500
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1560
+#: src/hostlist/hostlist-client.c:1504
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:253
+#: src/topology/gnunet-daemon-topology.c:250
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:418
+#: src/topology/gnunet-daemon-topology.c:402
 msgid "# connect requests issued to core"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:718
-#: src/topology/gnunet-daemon-topology.c:832
-#: src/transport/gnunet-service-transport.c:2666
-#: src/transport/gnunet-service-transport.c:2725
+#: src/topology/gnunet-daemon-topology.c:676
+#: src/topology/gnunet-daemon-topology.c:778
+#: src/transport/gnunet-service-transport_neighbours.c:432
+#: src/transport/gnunet-service-transport_neighbours.c:627
 msgid "# peers connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:741
-#: src/topology/gnunet-daemon-topology.c:839
+#: src/topology/gnunet-daemon-topology.c:697
+#: src/topology/gnunet-daemon-topology.c:783
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1059
+#: src/topology/gnunet-daemon-topology.c:977
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1097
+#: src/topology/gnunet-daemon-topology.c:1009
 #, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1110
+#: src/topology/gnunet-daemon-topology.c:1021
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1117
+#: src/topology/gnunet-daemon-topology.c:1027
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1036
 #, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1134
+#: src/topology/gnunet-daemon-topology.c:1044
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1150
+#: src/topology/gnunet-daemon-topology.c:1064
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1161
+#: src/topology/gnunet-daemon-topology.c:1077
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1176
+#: src/topology/gnunet-daemon-topology.c:1087
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1182
+#: src/topology/gnunet-daemon-topology.c:1093
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1193
+#: src/topology/gnunet-daemon-topology.c:1103
 msgid "# friends in configuration"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1200
+#: src/topology/gnunet-daemon-topology.c:1109
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1206
+#: src/topology/gnunet-daemon-topology.c:1116
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1247
+#: src/topology/gnunet-daemon-topology.c:1151
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1316
+#: src/topology/gnunet-daemon-topology.c:1208
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1487
+#: src/topology/gnunet-daemon-topology.c:1348
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/statistics/statistics_api.c:325
+#: src/statistics/statistics_api.c:326
 msgid "Failed to connect to statistics service!\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:94
+#: src/statistics/gnunet-statistics.c:89
 #, c-format
 msgid "Failed to obtain statistics.\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:125 src/fs/gnunet-pseudonym.c:172
+#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
 #, c-format
 msgid "Invalid argument `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:162
+#: src/statistics/gnunet-statistics.c:155
 msgid "limit output to statistcs for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:165
+#: src/statistics/gnunet-statistics.c:158
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:168
+#: src/statistics/gnunet-statistics.c:161
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:177
+#: src/statistics/gnunet-statistics.c:168
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:211
+#: src/statistics/gnunet-service-statistics.c:208
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:273
+#: src/statistics/gnunet-service-statistics.c:266
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/util/os_priority.c:116
+#: src/util/os_priority.c:110
 #, c-format
 msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
-#: src/util/os_installation.c:296
+#: src/util/os_installation.c:291
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:482 src/transport/test_transport_api.c:642
-#: src/transport/test_transport_api_reliability.c:655
-#: src/transport/test_transport_api_unreliability.c:700
+#: src/util/os_installation.c:474
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/os_installation.c:489 src/transport/test_transport_api.c:649
-#: src/transport/test_transport_api_reliability.c:662
-#: src/transport/test_transport_api_unreliability.c:707
+#: src/util/os_installation.c:479
 #, c-format
 msgid "stat (%s) failed: %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:154 src/util/common_logging.c:492
-#: src/util/test_common_logging.c:76
+#: src/util/common_logging.c:154 src/util/common_logging.c:500
+#: src/util/test_common_logging.c:75
 msgid "DEBUG"
 msgstr ""
 
-#: src/util/common_logging.c:156 src/util/common_logging.c:490
+#: src/util/common_logging.c:156 src/util/common_logging.c:498
 #: src/util/test_common_logging.c:72
 msgid "INFO"
 msgstr ""
 
-#: src/util/common_logging.c:158 src/util/common_logging.c:488
+#: src/util/common_logging.c:158 src/util/common_logging.c:496
 #: src/util/test_common_logging.c:68
 msgid "WARNING"
 msgstr ""
 
-#: src/util/common_logging.c:160 src/util/common_logging.c:486
-#: src/util/test_common_logging.c:64
+#: src/util/common_logging.c:160 src/util/common_logging.c:494
+#: src/util/test_common_logging.c:65
 msgid "ERROR"
 msgstr ""
 
@@ -1209,33 +1205,33 @@
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:204 src/dht/plugin_dhtlog_mysql_dump.c:837
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:602
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:635
+#: src/util/common_logging.c:214 src/dht/plugin_dhtlog_mysql_dump.c:909
 #: src/dht/plugin_dhtlog_mysql_dump_load.c:669
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:703
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:737
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:770
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:803
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:836
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:700
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:732
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:764
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:796
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:827
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:858
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:889
 #, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr ""
 
-#: src/util/common_logging.c:321
+#: src/util/common_logging.c:331
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:493
+#: src/util/common_logging.c:501
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:575
+#: src/util/common_logging.c:583
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:615
+#: src/util/common_logging.c:621
 msgid "invalid address"
 msgstr ""
 
@@ -1248,175 +1244,175 @@
 msgid "no-name"
 msgstr ""
 
-#: src/util/test_strings.c:42 src/util/strings.c:138
+#: src/util/test_strings.c:42 src/util/strings.c:139
 msgid "b"
 msgstr ""
 
-#: src/util/test_strings.c:45 src/util/strings.c:144
+#: src/util/test_strings.c:45 src/util/strings.c:145
 msgid "KiB"
 msgstr ""
 
-#: src/util/test_strings.c:48 src/util/strings.c:156
+#: src/util/test_strings.c:48 src/util/strings.c:157
 msgid "TiB"
 msgstr ""
 
-#: src/util/test_strings.c:51 src/util/strings.c:362
+#: src/util/test_strings.c:51 src/util/strings.c:363
 msgid "ms"
 msgstr ""
 
-#: src/util/test_strings.c:57 src/util/strings.c:371
+#: src/util/test_strings.c:56 src/util/strings.c:372
 msgid "s"
 msgstr ""
 
-#: src/util/test_strings.c:63 src/util/strings.c:379
+#: src/util/test_strings.c:61 src/util/strings.c:380
 msgid "h"
 msgstr ""
 
-#: src/util/connection.c:459
+#: src/util/connection.c:457
 #, c-format
 msgid "Access denied to `%s'\n"
 msgstr ""
 
-#: src/util/connection.c:475
+#: src/util/connection.c:472
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:647
+#: src/util/connection.c:640
 #, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
-#: src/util/connection.c:869 src/util/connection.c:1043
+#: src/util/connection.c:852 src/util/connection.c:1023
 #, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr ""
 
-#: src/util/connection.c:1032
+#: src/util/connection.c:1013
 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
-#: src/util/connection.c:1558
+#: src/util/connection.c:1529
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
 "failed (%p).\n"
 msgstr ""
 
-#: src/util/connection.c:1594
+#: src/util/connection.c:1565
 #, c-format
 msgid "Failed to send to `%s': %s\n"
 msgstr ""
 
-#: src/util/plugin.c:88
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr ""
 
-#: src/util/plugin.c:148
+#: src/util/plugin.c:144
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:221
+#: src/util/plugin.c:217
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/bio.c:136 src/util/bio.c:143
+#: src/util/bio.c:134 src/util/bio.c:140
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr ""
 
-#: src/util/bio.c:144
+#: src/util/bio.c:141
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:200
+#: src/util/bio.c:193
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:212
+#: src/util/bio.c:203
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:258
+#: src/util/bio.c:248
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:273
+#: src/util/bio.c:262
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/crypto_rsa.c:623 src/util/crypto_rsa.c:673
+#: src/util/crypto_rsa.c:611 src/util/crypto_rsa.c:658
 #, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:628
+#: src/util/crypto_rsa.c:616
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:648
+#: src/util/crypto_rsa.c:634
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:677 src/util/crypto_rsa.c:719
+#: src/util/crypto_rsa.c:662 src/util/crypto_rsa.c:698
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:713
+#: src/util/crypto_rsa.c:693
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:734
+#: src/util/crypto_rsa.c:714
 #, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:754
+#: src/util/crypto_rsa.c:732
 #, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:978
+#: src/util/crypto_rsa.c:953
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/server.c:389
+#: src/util/server.c:384
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/util/server.c:399
+#: src/util/server.c:392
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/server.c:405
+#: src/util/server.c:397
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
 
-#: src/util/server.c:627
+#: src/util/server.c:612
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/network.c:1088
+#: src/util/network.c:1193
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -1427,7 +1423,7 @@
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:264
+#: src/util/crypto_random.c:263
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
@@ -1437,171 +1433,176 @@
 msgid "Got IP address `%s' for our host.\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:146 src/util/resolver_api.c:914
+#: src/util/test_resolver_api.c:147 src/util/resolver_api.c:873
 #, c-format
 msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:152
+#: src/util/test_resolver_api.c:154
 #, c-format
 msgid "Could not resolve our FQDN : %s %u\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:259
+#: src/util/test_resolver_api.c:264
 #, c-format
 msgid "gethostbyname() could not lookup IP address: %s\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:318
+#: src/util/test_resolver_api.c:329
 #, c-format
 msgid "gethostbyaddr() could not lookup hostname: %s\n"
 msgstr ""
 
-#: src/util/configuration.c:246
+#: src/util/configuration.c:244
 #, c-format
 msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr ""
 
-#: src/util/configuration.c:810
+#: src/util/configuration.c:801
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:89
+#: src/util/gnunet-resolver.c:76
 msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/client.c:311
+#: src/util/client.c:304
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:319
+#: src/util/client.c:312
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:679
+#: src/util/client.c:669
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:728
+#: src/util/client.c:729 src/util/service.c:880
 #, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr ""
+
+#: src/util/client.c:871
+#, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/util/client.c:744
+#: src/util/client.c:887
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1017
+#: src/util/client.c:1158
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/scheduler.c:791
+#: src/util/scheduler.c:859
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:922
+#: src/util/scheduler.c:990
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/strings.c:148
+#: src/util/strings.c:149
 msgid "MiB"
 msgstr ""
 
-#: src/util/strings.c:152
+#: src/util/strings.c:153
 msgid "GiB"
 msgstr ""
 
-#: src/util/strings.c:191
+#: src/util/strings.c:193
 #, c-format
 msgid "Character set requested was `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:268
+#: src/util/strings.c:271
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:367
+#: src/util/strings.c:368
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:375
+#: src/util/strings.c:376
 msgid "m"
 msgstr ""
 
-#: src/util/strings.c:383
+#: src/util/strings.c:384
 msgid " days"
 msgstr ""
 
-#: src/util/strings.c:407
+#: src/util/strings.c:408
 msgid "end of time"
 msgstr ""
 
-#: src/util/disk.c:418
+#: src/util/disk.c:429
 #, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr ""
 
-#: src/util/disk.c:781
+#: src/util/disk.c:829
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
 
-#: src/util/disk.c:1134 src/util/service.c:1510
+#: src/util/disk.c:1180 src/util/service.c:1456
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/util/disk.c:1438
+#: src/util/disk.c:1486
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:199
+#: src/util/resolver_api.c:198
 #, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:219
+#: src/util/resolver_api.c:217
 #, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:363
+#: src/util/resolver_api.c:354
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:367
+#: src/util/resolver_api.c:358
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:441
+#: src/util/resolver_api.c:427
 #, c-format
 msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:827
+#: src/util/resolver_api.c:789
 #, c-format
 msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:920
+#: src/util/resolver_api.c:879
 #, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr ""
 
-#: src/util/resolver_api.c:953
+#: src/util/resolver_api.c:911
 #, c-format
 msgid "Resolving our hostname `%s'\n"
 msgstr ""
@@ -1611,18 +1612,18 @@
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:318
-#: src/util/gnunet-service-resolver.c:367
+#: src/util/gnunet-service-resolver.c:317
+#: src/util/gnunet-service-resolver.c:362
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:469
+#: src/util/gnunet-service-resolver.c:460
 #, c-format
 msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:516
+#: src/util/gnunet-service-resolver.c:508
 #, c-format
 msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
@@ -1632,62 +1633,62 @@
 msgid "%s: option `%s' is ambiguous\n"
 msgstr ""
 
-#: src/util/getopt.c:693
+#: src/util/getopt.c:692
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:699
+#: src/util/getopt.c:697
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:718 src/util/getopt.c:887
+#: src/util/getopt.c:714 src/util/getopt.c:882
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:747
+#: src/util/getopt.c:743
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr ""
 
-#: src/util/getopt.c:751
+#: src/util/getopt.c:747
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr ""
 
-#: src/util/getopt.c:776
+#: src/util/getopt.c:772
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr ""
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:774
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr ""
 
-#: src/util/getopt.c:806 src/util/getopt.c:936
+#: src/util/getopt.c:802 src/util/getopt.c:930
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr ""
 
-#: src/util/getopt.c:854
+#: src/util/getopt.c:850
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr ""
 
-#: src/util/getopt.c:872
+#: src/util/getopt.c:868
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr ""
 
-#: src/util/getopt.c:1041
+#: src/util/getopt.c:1034
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr ""
 
-#: src/util/signal.c:77
+#: src/util/signal.c:78
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
@@ -1698,142 +1699,137 @@
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:284
+#: src/util/getopt_helpers.c:254 src/util/getopt_helpers.c:282
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/util/service.c:114 src/util/service.c:142 src/util/service.c:188
-#: src/util/service.c:212 src/util/service.c:219
+#: src/util/service.c:112 src/util/service.c:138 src/util/service.c:182
+#: src/util/service.c:202 src/util/service.c:209
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/service.c:171
+#: src/util/service.c:165
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/service.c:268
+#: src/util/service.c:258
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/service.c:304
+#: src/util/service.c:292
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/service.c:336
+#: src/util/service.c:323
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
 
-#: src/util/service.c:649
+#: src/util/service.c:627
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:656
+#: src/util/service.c:632
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/util/service.c:662
+#: src/util/service.c:639
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:707
+#: src/util/service.c:683
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:735
+#: src/util/service.c:712
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:857
+#: src/util/service.c:829
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:881 src/transport/plugin_transport_tcp.c:2048
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1927
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/service.c:915
+#: src/util/service.c:900
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/service.c:936
-#, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:953
+#: src/util/service.c:917
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:985
+#: src/util/service.c:947
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr ""
 
-#: src/util/service.c:1003
+#: src/util/service.c:965
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
 
-#: src/util/service.c:1163 src/util/service.c:1182
+#: src/util/service.c:1121 src/util/service.c:1139
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1211
+#: src/util/service.c:1166
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1367
+#: src/util/service.c:1315
 #, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr ""
 
-#: src/util/service.c:1402
+#: src/util/service.c:1349
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1450
+#: src/util/service.c:1397
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1455
+#: src/util/service.c:1401
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1459
+#: src/util/service.c:1405
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1511
+#: src/util/service.c:1457
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1525
+#: src/util/service.c:1471
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/util/service.c:1585
+#: src/util/service.c:1534
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -1842,69 +1838,69 @@
 msgid "`%' must be followed by HEX number"
 msgstr ""
 
-#: src/fs/fs_uri.c:275
+#: src/fs/fs_uri.c:273
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:293
+#: src/fs/fs_uri.c:291
 msgid "`++' not allowed in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:300
+#: src/fs/fs_uri.c:298
 msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:370 src/fs/fs_uri.c:377
+#: src/fs/fs_uri.c:366 src/fs/fs_uri.c:373
 msgid "Malformed SKS URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:421 src/fs/fs_uri.c:441
+#: src/fs/fs_uri.c:417 src/fs/fs_uri.c:432
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:572 src/fs/fs_uri.c:592 src/fs/fs_uri.c:602
-#: src/fs/fs_uri.c:631
+#: src/fs/fs_uri.c:562 src/fs/fs_uri.c:577 src/fs/fs_uri.c:587
+#: src/fs/fs_uri.c:615
 msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:611
+#: src/fs/fs_uri.c:597
 msgid "SKS URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:617
+#: src/fs/fs_uri.c:603
 msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:625
+#: src/fs/fs_uri.c:609
 msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:636
+#: src/fs/fs_uri.c:622
 msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:649
+#: src/fs/fs_uri.c:634
 msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:688
+#: src/fs/fs_uri.c:672
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:923
+#: src/fs/fs_uri.c:897
 msgid "Lacking key configuration settings.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:930
+#: src/fs/fs_uri.c:904
 #, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1248 src/fs/fs_uri.c:1275
+#: src/fs/fs_uri.c:1212 src/fs/fs_uri.c:1239
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1281
+#: src/fs/fs_uri.c:1245
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -1913,442 +1909,459 @@
 msgid "Failed to receive response for `%s' request from `%s' service.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:119
+#: src/fs/fs_list_indexed.c:117
 #, c-format
 msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:176
+#: src/fs/fs_list_indexed.c:164
 #, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:207 src/fs/gnunet-service-fs_lc.c:377
-#: src/fs/gnunet-service-fs_lc.c:519
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
+#: src/fs/gnunet-service-fs_lc.c:480
 msgid "# client searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:262
+#: src/fs/gnunet-service-fs_lc.c:254
 msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:323
+#: src/fs/gnunet-service-fs_lc.c:312
 msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:367
+#: src/fs/gnunet-service-fs_lc.c:351
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/fs_publish.c:152 src/fs/fs_publish.c:462
+#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:740 src/fs/fs_publish.c:756 src/fs/fs_publish.c:797
-#: src/fs/fs_publish.c:816 src/fs/fs_publish.c:846 src/fs/fs_publish.c:1020
+#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
+#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:742
+#: src/fs/fs_publish.c:649
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:754
+#: src/fs/fs_publish.c:661
 msgid "unknown error"
 msgstr ""
 
-#: src/fs/fs_publish.c:799
+#: src/fs/fs_publish.c:704
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:818
+#: src/fs/fs_publish.c:724
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:848
+#: src/fs/fs_publish.c:751
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:877
+#: src/fs/fs_publish.c:775
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:956
+#: src/fs/fs_publish.c:845
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:964
+#: src/fs/fs_publish.c:851
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1022
+#: src/fs/fs_publish.c:899
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1219
+#: src/fs/fs_publish.c:1078
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1295
+#: src/fs/fs_publish.c:1149
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1665
+#: src/fs/fs_publish.c:1482
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:1702 src/fs/fs_namespace.c:890
+#: src/fs/fs_publish.c:1518 src/fs/fs_namespace.c:822
 msgid "Internal error."
 msgstr ""
 
-#: src/fs/gnunet-download.c:104
+#: src/fs/gnunet-download.c:100
 #, c-format
 msgid "Starting download `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:113
+#: src/fs/gnunet-download.c:112
 #, c-format
 msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:125
+#: src/fs/gnunet-download.c:121
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:132
+#: src/fs/gnunet-download.c:129
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:150 src/fs/gnunet-unindex.c:118
-#: src/fs/gnunet-search.c:199 src/fs/gnunet-publish.c:165
+#: src/fs/gnunet-download.c:144 src/fs/gnunet-unindex.c:109
+#: src/fs/gnunet-search.c:190 src/fs/gnunet-publish.c:155
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:179
+#: src/fs/gnunet-download.c:169
 #, c-format
 msgid "You need to specify a URI argument.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:187 src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-download.c:175 src/fs/gnunet-publish.c:426
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:197
+#: src/fs/gnunet-download.c:182
 #, c-format
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:205
+#: src/fs/gnunet-download.c:189
 #, c-format
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:224 src/fs/gnunet-unindex.c:158
-#: src/fs/gnunet-search.c:260 src/fs/gnunet-publish.c:469
+#: src/fs/gnunet-download.c:203 src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-search.c:241 src/fs/gnunet-publish.c:404
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-search.c:285
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:273
+#: src/fs/gnunet-download.c:243
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:276 src/fs/gnunet-search.c:316
+#: src/fs/gnunet-download.c:246 src/fs/gnunet-search.c:288
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:279
+#: src/fs/gnunet-download.c:249
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:283
+#: src/fs/gnunet-download.c:253
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:287
+#: src/fs/gnunet-download.c:257
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:290
+#: src/fs/gnunet-download.c:260
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:293 src/fs/gnunet-unindex.c:191
-#: src/fs/gnunet-search.c:327 src/fs/gnunet-publish.c:684
-#: src/dht/gnunet-dht-get-peer.c:201 src/dht/gnunet-dht-put.c:188
-#: src/dht/gnunet-dht-get.c:214 src/nse/nse-profiler.c:442
+#: src/fs/gnunet-download.c:263 src/fs/gnunet-unindex.c:169
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:585
+#: src/mesh/test_mesh_small.c:674 src/dht/gnunet-dht-get-peer.c:190
+#: src/dht/gnunet-dht-put.c:176 src/dht/gnunet-dht-get.c:204
+#: src/nse/gnunet-nse-profiler.c:655
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:302
+#: src/fs/gnunet-download.c:270
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:93
+#: src/fs/gnunet-unindex.c:89
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:102
+#: src/fs/gnunet-unindex.c:96
 #, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-unindex.c:101
 #, c-format
 msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:144
+#: src/fs/gnunet-unindex.c:131
 #, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:169
+#: src/fs/gnunet-unindex.c:148
 #, c-format
 msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:200
+#: src/fs/gnunet-unindex.c:176
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/fs_namespace.c:54 src/fs/fs_namespace.c:83
+#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
 #, c-format
 msgid "Configuration fails to specify `%s' in section `%s'\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:117
+#: src/fs/fs_namespace.c:107
 #, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:146 src/fs/fs_namespace.c:239
+#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:449 src/fs/fs_namespace.c:471
+#: src/fs/fs_namespace.c:323
+msgid "Unknown error"
+msgstr ""
+
+#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
 msgid "Failed to serialize meta data"
 msgstr ""
 
-#: src/fs/fs_namespace.c:489
+#: src/fs/fs_namespace.c:452
 msgid "Failed to connect to datastore service"
 msgstr ""
 
-#: src/fs/fs_namespace.c:537
+#: src/fs/fs_namespace.c:495
 #, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:642
+#: src/fs/fs_namespace.c:597
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:943
+#: src/fs/fs_namespace.c:866
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:192
+#: src/fs/gnunet-pseudonym.c:165
 #, c-format
 msgid "Namespace `%s' unknown.\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:284 src/fs/gnunet-pseudonym.c:291
-#: src/fs/gnunet-pseudonym.c:293
+#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
+#: src/fs/gnunet-pseudonym.c:249
 #, c-format
 msgid "Option `%s' ignored\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:313 src/fs/gnunet-publish.c:630
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:532
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:317
+#: src/fs/gnunet-pseudonym.c:272
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:321
+#: src/fs/gnunet-pseudonym.c:275
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:325
+#: src/fs/gnunet-pseudonym.c:278
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:329 src/fs/gnunet-publish.c:650
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:551
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:332
+#: src/fs/gnunet-pseudonym.c:285
 msgid "print names of local namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:335
+#: src/fs/gnunet-pseudonym.c:288
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:338
+#: src/fs/gnunet-pseudonym.c:291
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:341 src/fs/gnunet-publish.c:669
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:570
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:345
+#: src/fs/gnunet-pseudonym.c:297
 msgid "specify ID of the root of the namespace"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:349
+#: src/fs/gnunet-pseudonym.c:300
 msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:359
+#: src/fs/gnunet-pseudonym.c:308
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-search.c:117
+#: src/fs/gnunet-search.c:111
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:188
+#: src/fs/gnunet-search.c:181
 #, c-format
 msgid "Error searching: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:246
+#: src/fs/gnunet-search.c:231
 #, c-format
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:280
+#: src/fs/gnunet-search.c:255
 #, c-format
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:320
+#: src/fs/gnunet-search.c:291
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:324
+#: src/fs/gnunet-search.c:294
 msgid "automatically terminate search after VALUE ms"
 msgstr ""
 
-#: src/fs/gnunet-search.c:336
+#: src/fs/gnunet-search.c:301
+msgid "automatically terminate search after VALUE results are found"
+msgstr ""
+
+#: src/fs/gnunet-search.c:308
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/fs_unindex.c:64
+#: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:72
+#: src/fs/fs_unindex.c:63
 msgid "Failed to read file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:261
+#: src/fs/fs_unindex.c:235
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:269
+#: src/fs/fs_unindex.c:243
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:277
+#: src/fs/fs_unindex.c:251
 msgid "Invalid response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:328
+#: src/fs/fs_unindex.c:296
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:363
+#: src/fs/fs_unindex.c:331
 msgid "Failed to connect to `datastore' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:376
+#: src/fs/fs_unindex.c:344
 msgid "Failed to open file for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:414
+#: src/fs/fs_unindex.c:378
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:53
+#: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:100
+#: src/fs/gnunet-directory.c:94
 #, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:106
+#: src/fs/gnunet-directory.c:97
 #, c-format
 msgid "Directory `%s' contents:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:147
+#: src/fs/gnunet-directory.c:132
 #, c-format
 msgid "You must specify a filename to inspect."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:163
+#: src/fs/gnunet-directory.c:145
 #, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:203
+#: src/fs/gnunet-directory.c:176
 msgid "Display contents of a GNUnet directory"
 msgstr ""
 
-#: src/fs/fs_file_information.c:362
+#: src/fs/fs_file_information.c:349
 #, c-format
 msgid "`%s' failed on file `%s': %s"
 msgstr ""
 
-#: src/fs/fs_test_lib.c:282
+#: src/fs/fs_test_lib.c:269
 #, c-format
 msgid "Failed to start daemon: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:158
+#: src/fs/gnunet-service-fs_pe.c:228
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:241
+#: src/fs/gnunet-service-fs_pe.c:334
 msgid "# queries messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:354 src/fs/gnunet-service-fs_pe.c:423
-#: src/fs/gnunet-service-fs_pe.c:455
+#: src/fs/gnunet-service-fs_pe.c:457
+msgid "# requests merged"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:463
+msgid "# requests refreshed"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:511 src/fs/gnunet-service-fs_pe.c:586
+#: src/fs/gnunet-service-fs_pe.c:622
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/fs_getopt.c:202
+#: src/fs/fs_getopt.c:191
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2360,801 +2373,813 @@
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:118
+#: src/fs/gnunet-publish.c:115
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:128
+#: src/fs/gnunet-publish.c:123
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:141
+#: src/fs/gnunet-publish.c:134
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:145
+#: src/fs/gnunet-publish.c:138
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:292
+#: src/fs/gnunet-publish.c:265
 #, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:267
 #, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:358
+#: src/fs/gnunet-publish.c:312
 #, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:411
+#: src/fs/gnunet-publish.c:354
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:419
+#: src/fs/gnunet-publish.c:361
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:425
+#: src/fs/gnunet-publish.c:367
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:434
+#: src/fs/gnunet-publish.c:375
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:445 src/fs/gnunet-publish.c:453
+#: src/fs/gnunet-publish.c:385 src/fs/gnunet-publish.c:392
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:482
+#: src/fs/gnunet-publish.c:414
 #, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:536
+#: src/fs/gnunet-publish.c:459
 #, c-format
 msgid "Could not access file: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:573
+#: src/fs/gnunet-publish.c:484
 #, c-format
 msgid "Could not publish `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:507
 #, c-format
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:634
+#: src/fs/gnunet-publish.c:536
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:638
+#: src/fs/gnunet-publish.c:539
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:642
+#: src/fs/gnunet-publish.c:543
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:646
+#: src/fs/gnunet-publish.c:547
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:653
+#: src/fs/gnunet-publish.c:554
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:559
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:662
+#: src/fs/gnunet-publish.c:563
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:666
+#: src/fs/gnunet-publish.c:567
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-publish.c:573
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:676
+#: src/fs/gnunet-publish.c:577
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:680
+#: src/fs/gnunet-publish.c:581
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:594
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_directory.c:209 src/fs/fs_directory.c:221
+#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:726
+#: src/fs/gnunet-service-fs_cp.c:693
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:765
+#: src/fs/gnunet-service-fs_cp.c:728
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:773
+#: src/fs/gnunet-service-fs_cp.c:734
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:806 src/fs/gnunet-service-fs_cp.c:936
-#: src/fs/gnunet-service-fs_cp.c:1367 src/fs/gnunet-service-fs_cp.c:1414
+#: src/fs/gnunet-service-fs_cp.c:763 src/fs/gnunet-service-fs_cp.c:879
+#: src/fs/gnunet-service-fs_cp.c:1289 src/fs/gnunet-service-fs_cp.c:1326
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:889
+#: src/fs/gnunet-service-fs_cp.c:836
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:959
+#: src/fs/gnunet-service-fs_cp.c:899
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:974
+#: src/fs/gnunet-service-fs_cp.c:913
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1019
+#: src/fs/gnunet-service-fs_cp.c:951
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1087
+#: src/fs/gnunet-service-fs_cp.c:1018
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1112
+#: src/fs/gnunet-service-fs_cp.c:1042
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1122
+#: src/fs/gnunet-service-fs_cp.c:1052
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1201
+#: src/fs/gnunet-service-fs_cp.c:1131
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1236
+#: src/fs/gnunet-service-fs_cp.c:1165
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1260
+#: src/fs/gnunet-service-fs_cp.c:1189
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1329
+#: src/fs/gnunet-service-fs_cp.c:1255
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1360
+#: src/fs/gnunet-service-fs_cp.c:1283
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1410
+#: src/fs/gnunet-service-fs_cp.c:1324
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/fs_download.c:332
+#: src/fs/fs_download.c:309
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:354
+#: src/fs/fs_download.c:329
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:536 src/fs/fs_download.c:554
+#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr ""
 
-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:872
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1070
+#: src/fs/fs_download.c:958
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1108
+#: src/fs/fs_download.c:985
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1133
+#: src/fs/fs_download.c:1008
 #, c-format
 msgid "Download failed: could not open file `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1149
+#: src/fs/fs_download.c:1020
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1161
+#: src/fs/fs_download.c:1029
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_download.c:2017
+#: src/fs/fs_download.c:1826
 msgid "Invalid URI"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:116
-#: src/fs/gnunet-service-fs_indexing.c:177
+#: src/fs/gnunet-service-fs_indexing.c:113
+#: src/fs/gnunet-service-fs_indexing.c:163
 #, c-format
 msgid "Configuration option `%s' in section `%s' missing.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:125
-#: src/fs/gnunet-service-fs_indexing.c:192
+#: src/fs/gnunet-service-fs_indexing.c:121
+#: src/fs/gnunet-service-fs_indexing.c:177
 #, c-format
 msgid "Could not open `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:147
+#: src/fs/gnunet-service-fs_indexing.c:137
 #, c-format
 msgid "Error writing `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:252
+#: src/fs/gnunet-service-fs_indexing.c:228
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:297
+#: src/fs/gnunet-service-fs_indexing.c:266
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:548
+#: src/fs/gnunet-service-fs_indexing.c:487
 #, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:628
+#: src/fs/gnunet-service-fs_indexing.c:552
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:632
+#: src/fs/gnunet-service-fs_indexing.c:554
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:663
+#: src/fs/gnunet-service-fs_indexing.c:569
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/fs_search.c:859
+#: src/fs/fs_search.c:798
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:388 src/fs/gnunet-service-fs_pr.c:633
+#: src/fs/gnunet-service-fs_pr.c:300
+msgid "# Pending requests created"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:379 src/fs/gnunet-service-fs_pr.c:638
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:769
+#: src/fs/gnunet-service-fs_pr.c:802
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:802
+#: src/fs/gnunet-service-fs_pr.c:829
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:821
+#: src/fs/gnunet-service-fs_pr.c:845
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:838
+#: src/fs/gnunet-service-fs_pr.c:860
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:937
+#: src/fs/gnunet-service-fs_pr.c:952
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:962
+#: src/fs/gnunet-service-fs_pr.c:979
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:999
+#: src/fs/gnunet-service-fs_pr.c:1012
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1101
+#: src/fs/gnunet-service-fs_pr.c:1102
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1122
+#: src/fs/gnunet-service-fs_pr.c:1123
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1172
+#: src/fs/gnunet-service-fs_pr.c:1170
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1186
+#: src/fs/gnunet-service-fs_pr.c:1184
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1195
+#: src/fs/gnunet-service-fs_pr.c:1193
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1209
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1230
+#: src/fs/gnunet-service-fs_pr.c:1226
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1239
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1250
+#: src/fs/gnunet-service-fs_pr.c:1244
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1275 src/fs/gnunet-service-fs_pr.c:1323
-#: src/fs/gnunet-service-fs_pr.c:1442
+#: src/fs/gnunet-service-fs_pr.c:1270 src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1426
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1342
+#: src/fs/gnunet-service-fs_pr.c:1329
 msgid "# Datastore lookups concluded (found ultimate result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1356
+#: src/fs/gnunet-service-fs_pr.c:1342
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1421
+#: src/fs/gnunet-service-fs_pr.c:1404
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1487
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1576
 #, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr ""
 
-#: src/fs/fs.c:313
+#: src/fs/fs.c:284
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr ""
 
-#: src/fs/fs.c:324
+#: src/fs/fs.c:293
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr ""
 
-#: src/fs/fs.c:332
+#: src/fs/fs.c:299
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs.c:967
+#: src/fs/fs.c:877
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1445
+#: src/fs/fs.c:1323
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs.c:1491
+#: src/fs/fs.c:1364
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1510
+#: src/fs/fs.c:1380
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2166
+#: src/fs/fs.c:1984
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2179
+#: src/fs/fs.c:1994
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2308 src/fs/fs.c:2570
+#: src/fs/fs.c:2107 src/fs/fs.c:2346
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2331
+#: src/fs/fs.c:2124
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2347 src/fs/fs.c:2368 src/fs/fs.c:2881
+#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2555
+#: src/fs/fs.c:2337
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs.c:2831
+#: src/fs/fs.c:2583
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs.c:2924
+#: src/fs/fs.c:2669
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:682
+#: src/fs/gnunet-service-fs_push.c:642
 #, c-format
 msgid ""
 "Invalid value specified for option `%s' in section `%s', content pushing "
 "disabled\n"
 msgstr ""
 
-#: src/block/plugin_block_fs.c:138
+#: src/block/plugin_block_fs.c:128
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:105
+#: src/block/plugin_block_dht.c:99
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:114
+#: src/block/plugin_block_dht.c:106
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:126
+#: src/block/plugin_block_dht.c:115
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/block/block.c:113
+#: src/block/block.c:108
 #, c-format
 msgid "Loading block plugins `%s'\n"
 msgstr ""
 
-#: src/block/block.c:122
+#: src/block/block.c:118
 #, c-format
 msgid "Failed to load block plugin `%s'\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:953
+#: src/mesh/test_mesh_small.c:687
+msgid "Test mesh in a small network."
+msgstr ""
+
+#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:859
 msgid "Failed to transmit shutdown ACK.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:47 src/arm/gnunet-service-arm.c:959
+#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:864
 msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:71 src/arm/gnunet-service-arm.c:987
+#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:892
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:200
+#: src/arm/gnunet-service-arm.c:206
 #, c-format
 msgid "Restarting service `%s' due to configuration file change.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:229
+#: src/arm/gnunet-service-arm.c:234
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:266
+#: src/arm/gnunet-service-arm.c:268
 msgid "Not sending status result to client: no client known\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:428
+#: src/arm/gnunet-service-arm.c:406
 #, c-format
 msgid "Failed to start service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:432
+#: src/arm/gnunet-service-arm.c:409
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:460
+#: src/arm/gnunet-service-arm.c:435
 #, c-format
 msgid "ARM is shutting down, service `%s' not started.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:469
+#: src/arm/gnunet-service-arm.c:443
 #, c-format
 msgid "Service `%s' already running.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:480
+#: src/arm/gnunet-service-arm.c:453
 #, c-format
 msgid "Binary implementing service `%s' not known!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:493
+#: src/arm/gnunet-service-arm.c:464
 #, c-format
 msgid "Configuration file `%s' for service `%s' not known!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:531
+#: src/arm/gnunet-service-arm.c:498
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:727
+#: src/arm/gnunet-service-arm.c:665
 msgid "Stopping all services\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:785
+#: src/arm/gnunet-service-arm.c:717
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:869
+#: src/arm/gnunet-service-arm.c:790
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:874
+#: src/arm/gnunet-service-arm.c:795
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:879
+#: src/arm/gnunet-service-arm.c:800
 msgid "unknown"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:891
+#: src/arm/gnunet-service-arm.c:807
 #, c-format
 msgid "Service `%s' stopped\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:905
+#: src/arm/gnunet-service-arm.c:821
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:156
+#: src/arm/gnunet-arm.c:161
 #, c-format
 msgid "Service `%s' has been started.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:160
+#: src/arm/gnunet-arm.c:165
 #, c-format
 msgid "Failed to stop service `%s'!\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:166
+#: src/arm/gnunet-arm.c:171
 #, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:170
+#: src/arm/gnunet-arm.c:175
 #, c-format
 msgid "Failed to start service `%s'!\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:181
 #, c-format
 msgid "Some error communicating with service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:203
+#: src/arm/gnunet-arm.c:207
 #, c-format
 msgid "Service `%s' is running.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:208
+#: src/arm/gnunet-arm.c:212
 #, c-format
 msgid "Service `%s' is not running.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:235
+#: src/arm/gnunet-arm.c:238
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:244 src/arm/gnunet-arm.c:338
+#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:265
+#: src/arm/gnunet-arm.c:269
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:271
+#: src/arm/gnunet-arm.c:275
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:387
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:389
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:371
+#: src/arm/gnunet-arm.c:391
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:373
+#: src/arm/gnunet-arm.c:393
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:375
+#: src/arm/gnunet-arm.c:396
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:378
+#: src/arm/gnunet-arm.c:399
 msgid "test if a particular service is running"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:380
+#: src/arm/gnunet-arm.c:402
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:382
+#: src/arm/gnunet-arm.c:404
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:391
+#: src/arm/gnunet-arm.c:407
+msgid "timeout for completing current operation"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:418
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:820
+#: src/arm/gnunet-service-arm_interceptor.c:803
 #, c-format
 msgid "Unable to forward to service `%s': shutdown\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:828
+#: src/arm/gnunet-service-arm_interceptor.c:812
 #, c-format
 msgid "Unable to forward to service `%s': timeout before connect\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:895
+#: src/arm/gnunet-service-arm_interceptor.c:868
 #, c-format
 msgid "Unable to start service `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:964
+#: src/arm/gnunet-service-arm_interceptor.c:936
 #, c-format
 msgid "Unable to accept connection for service `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:982
+#: src/arm/gnunet-service-arm_interceptor.c:952
 #, c-format
 msgid "Service `%s' started\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1112
+#: src/arm/gnunet-service-arm_interceptor.c:1080
 #, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1134
+#: src/arm/gnunet-service-arm_interceptor.c:1102
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1151
+#: src/arm/gnunet-service-arm_interceptor.c:1116
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:203 src/arm/test_exponential_backoff.c:194
+#: src/arm/arm_api.c:201 src/arm/test_exponential_backoff.c:192
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:399
+#: src/arm/arm_api.c:390
 #, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/arm/arm_api.c:414
+#: src/arm/arm_api.c:405
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/arm/arm_api.c:495
+#: src/arm/arm_api.c:469
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:568
+#: src/arm/arm_api.c:539
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:569
+#: src/arm/arm_api.c:540
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:593
+#: src/arm/arm_api.c:563
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:594
+#: src/arm/arm_api.c:566
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:626 src/arm/arm_api.c:630
+#: src/arm/arm_api.c:598 src/arm/arm_api.c:602
 #, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/arm/arm_api.c:701
+#: src/arm/arm_api.c:675
 #, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/dht/dhtlog.c:57
+#: src/dht/dhtlog.c:56
 #, c-format
 msgid "Loading `%s' dhtlog plugin\n"
 msgstr ""
@@ -3164,1195 +3189,968 @@
 msgid "Failed to load dhtlog plugin for `%s'\n"
 msgstr ""
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:823
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:588
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:621
+#: src/dht/plugin_dhtlog_mysql_dump.c:895
 #: src/dht/plugin_dhtlog_mysql_dump_load.c:655
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:689
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:723
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:756
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:789
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:822
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:686
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:718
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:750
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:782
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:813
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:844
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:875
 #, c-format
 msgid "Failed to get full path for `%s'\n"
 msgstr ""
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:852
+#: src/dht/plugin_dhtlog_mysql_dump.c:924
 msgid "Failed to create file for dhtlog.\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:86
+#: src/dht/gnunet-dht-get-peer.c:84
 #, c-format
 msgid "Found %u peers\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:121
+#: src/dht/gnunet-dht-get-peer.c:115
 #, c-format
 msgid "Found peer `%s'\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:195 src/dht/gnunet-dht-put.c:173
-#: src/dht/gnunet-dht-get.c:205
+#: src/dht/gnunet-dht-get-peer.c:184 src/dht/gnunet-dht-put.c:161
+#: src/dht/gnunet-dht-get.c:195
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:198 src/dht/gnunet-dht-put.c:182
-#: src/dht/gnunet-dht-get.c:211
+#: src/dht/gnunet-dht-get-peer.c:187 src/dht/gnunet-dht-put.c:170
+#: src/dht/gnunet-dht-get.c:201
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:222
+#: src/dht/gnunet-dht-get-peer.c:209
 msgid "Issue a GET PEER request to the GNUnet DHT, print results."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:96
+#: src/dht/gnunet-dht-put.c:95
 #, c-format
 msgid "PUT request sent!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:119
 #, c-format
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:130
+#: src/dht/gnunet-dht-put.c:127
 #, c-format
 msgid "Could not connect to %s service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:137
+#: src/dht/gnunet-dht-put.c:132
 #, c-format
 msgid "Connected to %s service!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:153
+#: src/dht/gnunet-dht-put.c:147
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:176
+#: src/dht/gnunet-dht-put.c:164
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:179
+#: src/dht/gnunet-dht-put.c:167
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:185
+#: src/dht/gnunet-dht-put.c:173
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:209
+#: src/dht/gnunet-dht-put.c:195
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:208
+#: src/dht/gnunet-dht-get.c:198
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:235
+#: src/dht/gnunet-dht-get.c:223
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/dht_api.c:238
+#: src/dht/dht_api.c:235
 msgid "Failed to connect to the DHT service!\n"
 msgstr ""
 
-#: src/dht/plugin_dhtlog_mysql.c:1592
+#: src/dht/plugin_dhtlog_mysql.c:1550
 msgid "Failed to initialize MySQL database connection for dhtlog.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:196
-#: src/transport/test_plugin_transport_https.c:1194
-#: src/transport/test_plugin_transport.c:213
-#: src/transport/gnunet-service-transport.c:6586
-#: src/transport/test_plugin_transport_http.c:1277
+#: src/transport/test_plugin_transport_udp.c:185
+#: src/transport/test_plugin_transport_https.c:1271
+#: src/transport/test_plugin_transport.c:202
+#: src/transport/gnunet-service-transport.c:435
+#: src/transport/test_plugin_transport_http.c:1232
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:207
-#: src/transport/test_plugin_transport_https.c:1260
-#: src/transport/test_plugin_transport.c:224
-#: src/transport/gnunet-service-transport.c:6621
-#: src/transport/test_plugin_transport_http.c:1303
+#: src/transport/test_plugin_transport_udp.c:195
+#: src/transport/test_plugin_transport_https.c:1335
+#: src/transport/test_plugin_transport.c:212
+#: src/transport/gnunet-service-transport.c:444
+#: src/transport/test_plugin_transport_http.c:1255
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:217
+#: src/transport/test_plugin_transport_udp.c:205
 msgid "Loading udp transport plugin\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:225
+#: src/transport/test_plugin_transport_udp.c:213
 msgid "Failed to load transport plugin for udp\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1574
-#: src/transport/plugin_transport_wlan.c:1629
-#: src/transport/plugin_transport_wlan.c:1810
+#: src/transport/plugin_transport_wlan.c:1422
+#: src/transport/plugin_transport_wlan.c:1617
+#: src/transport/plugin_transport_wlan.c:1736
 #, c-format
 msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1955
+#: src/transport/plugin_transport_wlan.c:1854
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3213
+#: src/transport/plugin_transport_wlan.c:2710
 #, c-format
 msgid "Finished reading from wlan-helper stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:406
+#: src/transport/gnunet-service-transport_clients.c:246
+#, c-format
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:251
+msgid "# messages dropped due to slow client"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:394
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:511
+msgid "# bytes payload received for other peers"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:528
+msgid "# bytes payload dropped (other peer was not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:579
+msgid "# REQUEST CONNECT messages received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:607
+msgid "# SET QUOTA messages received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:776
+msgid "# messages not sent (no such peer or not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:796
+msgid "# bytes in message queue for other peers"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:864
+msgid "# bandwidth quota violations by other peers"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:882
+msgid "# ms throttling suggested"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:907
+msgid "# KEEPALIVE messages discarded (not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:937
+msgid "# SET QUOTA messages ignored (no such peer)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:949
+msgid "# disconnects due to quota of 0"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:108
+msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:115
+#, c-format
+msgid "Starting transport plugins `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:119
+#, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:139
+#, c-format
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr ""
+
+#: src/transport/test_plugin_transport_https.c:409
 msgid "Phase 0: Test plugin functions failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:411
+#: src/transport/test_plugin_transport_https.c:418
 msgid "Phase 1: Test connect with wrong data failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:416
+#: src/transport/test_plugin_transport_https.c:427
 msgid "Phase 2: Test session selection failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:421
+#: src/transport/test_plugin_transport_https.c:435
 msgid "Phase 3: Test sending with plugin failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:694
-#: src/transport/test_plugin_transport_http.c:700
+#: src/transport/test_plugin_transport_https.c:726
+#: src/transport/test_plugin_transport_http.c:692
 #, c-format
 msgid "curl failed for `%s' at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:713
-#: src/transport/test_plugin_transport_http.c:721
+#: src/transport/test_plugin_transport_https.c:746
+#: src/transport/test_plugin_transport_http.c:712
 msgid "Connecting to peer without any peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:723
-#: src/transport/test_plugin_transport_http.c:733
+#: src/transport/test_plugin_transport_https.c:759
+#: src/transport/test_plugin_transport_http.c:725
 msgid "Connecting to peer with too short peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:733
-#: src/transport/test_plugin_transport_http.c:745
+#: src/transport/test_plugin_transport_https.c:772
+#: src/transport/test_plugin_transport_http.c:738
 msgid "Connecting to peer with too long peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:743
+#: src/transport/test_plugin_transport_https.c:785
 msgid "Connecting to peer with valid peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:884
-#: src/transport/test_plugin_transport_http.c:899
+#: src/transport/test_plugin_transport_https.c:924
+#: src/transport/test_plugin_transport_http.c:887
 #, c-format
 msgid "Unknown address size: ipv6 has %u ipv4 has %u but this has %u\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:891
-#: src/transport/test_plugin_transport_http.c:906
+#: src/transport/test_plugin_transport_https.c:930
+#: src/transport/test_plugin_transport_http.c:893
 #, c-format
 msgid "Transport plugin notification for address: `%s':%u\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:994
-#: src/transport/test_plugin_transport_http.c:1021
+#: src/transport/test_plugin_transport_https.c:1038
+#: src/transport/test_plugin_transport_http.c:1002
 msgid "Connecting to peer without any peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1005
-#: src/transport/test_plugin_transport_http.c:1037
+#: src/transport/test_plugin_transport_https.c:1053
+#: src/transport/test_plugin_transport_http.c:1017
 msgid "Connecting to peer with too short peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1018
-#: src/transport/test_plugin_transport_http.c:1051
+#: src/transport/test_plugin_transport_https.c:1069
+#: src/transport/test_plugin_transport_http.c:1033
 msgid "Connecting to peer with too long peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1029
-#: src/transport/test_plugin_transport_http.c:1068
+#: src/transport/test_plugin_transport_https.c:1083
+#: src/transport/test_plugin_transport_http.c:1047
 msgid "Connecting to peer with valid peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1038
+#: src/transport/test_plugin_transport_https.c:1093
 msgid ""
 "\n"
 "Phase 1: transmit data to all suggested addresses\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1085
+#: src/transport/test_plugin_transport_https.c:1151
 msgid ""
 "\n"
 "Phase 2: session selection\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1115
+#: src/transport/test_plugin_transport_https.c:1187
 msgid ""
 "\n"
 "Phase 3: send multiple or big messages after disconnect\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1120
+#: src/transport/test_plugin_transport_https.c:1193
 msgid "Phase 3: sending messages\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1210
-#: src/transport/plugin_transport_http.c:3380
-#: src/transport/test_plugin_transport_http.c:1293
+#: src/transport/test_plugin_transport_https.c:1284
+#: src/transport/plugin_transport_http.c:3321
+#: src/transport/test_plugin_transport_http.c:1245
 #, c-format
 msgid "Require valid port number for transport plugin `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1275
+#: src/transport/test_plugin_transport_https.c:1352
 #, c-format
 msgid "Loading HTTPS transport plugin `%s'\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1281
+#: src/transport/test_plugin_transport_https.c:1358
 msgid "Failed to load transport plugin for https\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1290
+#: src/transport/test_plugin_transport_https.c:1368
 #, c-format
 msgid "Transport plugin returned %u addresses to connect to\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1359
+#: src/transport/test_plugin_transport_https.c:1444
 msgid ""
 "\n"
 "Phase 0\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1417
-#: src/transport/test_plugin_transport_https.c:1420
+#: src/transport/test_plugin_transport_https.c:1507
+#: src/transport/test_plugin_transport_https.c:1510
 msgid ""
 "\n"
 "delete\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_transport_api.c:583
-#: src/transport/test_transport_api_reliability.c:596
-#: src/transport/test_transport_api_unreliability.c:641
-msgid "PATH environment variable is unset.\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-list-connections.c:86
-#: src/peerinfo-tool/gnunet-peerinfo.c:214
-#: src/core/gnunet-core-list-connections.c:170
+#: src/transport/gnunet-transport-list-connections.c:91
+#: src/peerinfo-tool/gnunet-peerinfo.c:200
+#: src/core/gnunet-core-list-connections.c:166
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport-list-connections.c:109
-#: src/peerinfo-tool/gnunet-peerinfo.c:278
-#: src/core/gnunet-core-list-connections.c:194
+#: src/transport/gnunet-transport-list-connections.c:112
+#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/core/gnunet-core-list-connections.c:187
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/transport/gnunet-transport-list-connections.c:117
-#: src/core/gnunet-core-list-connections.c:202
+#: src/transport/gnunet-transport-list-connections.c:119
+#: src/core/gnunet-core-list-connections.c:194
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/transport/test_plugin_transport.c:236
+#: src/transport/test_plugin_transport.c:224
 msgid "Loading tcp transport plugin\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport.c:244
+#: src/transport/test_plugin_transport.c:232
 msgid "Failed to load transport plugin for tcp\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:700
-#: src/transport/plugin_transport_http.c:1259
-#: src/transport/plugin_transport_http.c:2585
+#: src/transport/gnunet-service-transport_hello.c:176
+msgid "# refreshed my HELLO"
+msgstr ""
+
+#: src/transport/plugin_transport_http.c:698
+#: src/transport/plugin_transport_http.c:1231
+#: src/transport/plugin_transport_http.c:2551
 msgid "# HTTP peers active"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1008
-#: src/transport/plugin_transport_http.c:1326
+#: src/transport/plugin_transport_http.c:993
+#: src/transport/plugin_transport_http.c:1306
 msgid "# HTTP inbound sessions for peers active"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1930
+#: src/transport/plugin_transport_http.c:1889
 #, c-format
 msgid "Connection %X: HTTP PUT to peer `%s' (`%s') failed: `%s' `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1954
+#: src/transport/plugin_transport_http.c:1915
 #, c-format
 msgid "Connection %X: HTTP GET to peer `%s' (`%s') failed: `%s' `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:2222
-#: src/transport/plugin_transport_http.c:2326
+#: src/transport/plugin_transport_http.c:2193
+#: src/transport/plugin_transport_http.c:2305
 #, c-format
 msgid "Connection: %X: %s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:2626
+#: src/transport/plugin_transport_http.c:2592
 msgid "# HTTP outbound sessions for peers active"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3407
-#: src/transport/plugin_transport_http.c:3435
+#: src/transport/plugin_transport_http.c:3349
+#: src/transport/plugin_transport_http.c:3378
 msgid "Misconfigured address to bind to in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3466
+#: src/transport/plugin_transport_http.c:3404
 #, c-format
 msgid "Required configuration options missing in section `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3502
-#, c-format
-msgid "Could not create a new TLS certificate, shell script `%s' failed!\n"
+#: src/transport/plugin_transport_http.c:3442
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3518
+#: src/transport/plugin_transport_http.c:3458
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3642
+#: src/transport/plugin_transport_http.c:3610
 #, c-format
 msgid ""
 "HTTP Server with %s could not be started on port %u! %s plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3658
+#: src/transport/plugin_transport_http.c:3626
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1145
+#: src/transport/plugin_transport_tcp.c:504
 #, c-format
-msgid "Could not read blacklist file `%s'\n"
+msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1153
-#, c-format
-msgid "Blacklist file `%s' is empty.\n"
+#: src/transport/plugin_transport_tcp.c:590
+#: src/transport/plugin_transport_tcp.c:679
+#: src/transport/plugin_transport_tcp.c:728
+#: src/transport/plugin_transport_tcp.c:817
+#: src/transport/plugin_transport_tcp.c:1142
+msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1166
-#, c-format
-msgid "Failed to read blacklist from `%s'\n"
+#: src/transport/plugin_transport_tcp.c:596
+#: src/transport/plugin_transport_tcp.c:843
+#: src/transport/plugin_transport_tcp.c:1531
+msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1185
-#: src/transport/gnunet-service-transport.c:1206
-#, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+#: src/transport/plugin_transport_tcp.c:683
+msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1195
-#: src/transport/gnunet-service-transport.c:1228
-#, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+#: src/transport/plugin_transport_tcp.c:731
+msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1240
-#, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+#: src/transport/plugin_transport_tcp.c:821
+msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1257
-#, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+#: src/transport/plugin_transport_tcp.c:942
+msgid "# bytes TCP was asked to transmit"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1303
-msgid "# bytes discarded (could not transmit to client)"
+#: src/transport/plugin_transport_tcp.c:993
+msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1428
-msgid "# address validation timeouts"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1465
+#: src/transport/plugin_transport_tcp.c:1034
 #, c-format
-msgid ""
-"Dropping message of type %u and size %u, have %u messages pending (%u is the "
-"soft limit)\n"
+msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1471
-msgid "# messages dropped due to slow client"
+#: src/transport/plugin_transport_tcp.c:1051
+msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1575
-#: src/transport/gnunet-service-transport.c:1753
-msgid "# bytes pending with plugins"
+#: src/transport/plugin_transport_tcp.c:1103
+msgid "# bytes discarded by TCP (failed to connect)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1581
-msgid "# bytes successfully transmitted by plugins"
+#: src/transport/plugin_transport_tcp.c:1211
+msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1588
-msgid "# bytes with transmission failure by plugins"
+#: src/transport/plugin_transport_tcp.c:1574
+msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1614
-#: src/transport/gnunet-service-transport.c:2021
-#: src/transport/gnunet-service-transport.c:2028
-#: src/transport/gnunet-service-transport.c:2068
-#: src/transport/gnunet-service-transport.c:2467
-#: src/transport/gnunet-service-transport.c:2524
-#: src/transport/gnunet-service-transport.c:4917
-msgid "# connected addresses"
+#: src/transport/plugin_transport_tcp.c:1722
+msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1671
-msgid "# transport selected peer address freely"
+#: src/transport/plugin_transport_tcp.c:1788
+msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1679
-msgid "# transport failed to selected peer address"
+#: src/transport/plugin_transport_tcp.c:1941
+msgid "Failed to start service.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1692
-#: src/transport/gnunet-service-transport.c:1749
-#: src/transport/gnunet-service-transport.c:1826
-#: src/transport/gnunet-service-transport.c:4945
-msgid "# bytes in message queue for other peers"
+#: src/transport/plugin_transport_tcp.c:2001
+#, c-format
+msgid "Failed to find option %s in section %s!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1696
-msgid "# bytes discarded (no destination address available)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1708
-msgid "# message delivery deferred (no address)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1911
-#: src/transport/gnunet-service-transport.c:3838
-msgid "# PING without HELLO messages sent"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2140
-msgid "# transmission attempts failed (no address)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2214
-msgid "# refreshed my HELLO"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2241
-msgid "# transmitted my HELLO to other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2354
-msgid "# disconnects due to try_fast_reconnect"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2419
-msgid "# disconnects due to session end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2455
-msgid "# disconnects due to unready session"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2482
-msgid "# try_fast_reconnect thanks to plugin_env_session_end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2491
-msgid "# disconnects due to missing pong"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2532
-msgid "# disconnects due to NO pong"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2545
-msgid "# try_fast_reconnect thanks to validated_address"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2569
-msgid "# disconnects due to plugin_env_session_end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3033
-msgid "# disconnects due to timeout"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3074
-msgid "# valid peer addresses returned by PEERINFO"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3093
-msgid "# previously validated addresses lacking transport"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3123
-#: src/transport/gnunet-service-transport.c:4206
-#: src/transport/gnunet-service-transport.c:4924
-msgid "# peer addresses considered valid"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3168
-#: src/transport/gnunet-service-transport.c:3258
-#: src/transport/gnunet-service-transport.c:4581
-#: src/transport/gnunet-service-transport.c:4827
-#: src/transport/gnunet-service-transport.c:4987
-#: src/transport/gnunet-service-transport.c:6336
-msgid "# outstanding peerinfo iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3220
-#: src/transport/gnunet-service-transport.c:5009
-msgid "# active neighbours"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3254
-msgid "# peerinfo new neighbor iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3266
-msgid "# HELLO's sent to new neighbors"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3562
-msgid "# disconnects due to blacklist"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3833
-msgid "# PING with HELLO messages sent"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3842
-msgid "# PING messages sent for re-validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3966
-msgid "# payload received from other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4130
+#: src/transport/plugin_transport_tcp.c:2024
 #, c-format
-msgid ""
-"Not accepting PONG from `%s' with address `%s' since I cannot confirm using "
-"this address.\n"
+msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:4169
-msgid "Received expired signature.  Check system time.\n"
+#: src/transport/plugin_transport_tcp.c:2028
+msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:4173
-msgid "# address validation successes"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4287
-#: src/core/gnunet-service-core.c:4287
-msgid "# PONG messages received"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4400
-msgid "# PING messages sent for initial validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4442
-msgid "# peer addresses scheduled for validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4451
+#: src/transport/plugin_transport_tcp.c:2032
 #, c-format
-msgid ""
-"Transport `%s' not loaded, will not try to validate peer address using this "
-"transport.\n"
+msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:4454
-msgid "# peer addresses not validated (plugin not available)"
+#: src/transport/gnunet-service-transport_validation.c:520
+msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:4470
-msgid "# peer addresses not validated (loopback)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4516
-msgid "# peer addresses not validated (in progress)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4605
-msgid "# new HELLOs requiring full validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4616
-msgid "# duplicate HELLO (peer known)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4661
-msgid "# no existing neighbour record (validating HELLO)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4666
-msgid "# HELLO validations (update case)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4706
-msgid "# HELLOs received for validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4737
-msgid "# HELLOs ignored for validation (is my own HELLO)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4754
-msgid "# HELLOs ignored due to high load"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4823
-msgid "# peerinfo process hello iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4949
-msgid "# bytes discarded due to disconnect"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5054
-#, c-format
-msgid "Received `%s' message from `%s' destined for `%s' which is not me!\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5076
-#: src/core/gnunet-service-core.c:4264
+#: src/transport/gnunet-service-transport_validation.c:606
+#: src/core/gnunet-service-core.c:4187
 msgid "# PING messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5088
+#: src/transport/gnunet-service-transport_validation.c:628
 #, c-format
-msgid "Refusing to create PONG since I do not have a session with `%s'.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5161
-#, c-format
 msgid ""
 "Not confirming PING with address `%s' since I cannot confirm having this "
 "address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5256
+#: src/transport/gnunet-service-transport_validation.c:685
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5269
+#: src/transport/gnunet-service-transport_validation.c:694
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5300
+#: src/transport/gnunet-service-transport_validation.c:758
 #, c-format
-msgid "Could not send PONG to `%s': no address available\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5408
-msgid "# bytes received from other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5425
-#, c-format
 msgid ""
-"Dropping incoming message due to repeated bandwidth quota (%u b/s) "
-"violations (total of %u).\n"
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5429
-msgid "# bandwidth quota violations by other peers"
+#: src/transport/gnunet-service-transport_validation.c:792
+msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5466
-msgid "# HELLO messages received from other peers"
+#: src/transport/gnunet-service-transport_validation.c:864
+msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5497
-msgid "# ms throttling suggested"
+#: src/transport/gnunet-service-transport_validation.c:923
+#: src/core/gnunet-service-core.c:4210
+msgid "# PONG messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5547
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
+#: src/transport/gnunet-service-transport_validation.c:945
+msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5621
-msgid "# HELLOs received from clients"
+#: src/transport/gnunet-service-transport_validation.c:961
+msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5714
-msgid "# payload received for other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5757
-msgid "# REQUEST CONNECT messages received"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5788
-msgid "# SET QUOTA messages received"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5796
-msgid "# SET QUOTA messages ignored (no such peer)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5819
-msgid "# disconnects due to quota of 0"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:6137
+#: src/transport/plugin_transport_smtp.c:367
 #, c-format
-msgid "Loading `%s' transport plugin\n"
+msgid "Received malformed message via %s. Ignored.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:6149
-#, c-format
-msgid "Failed to load transport plugin for `%s'\n"
+#: src/transport/plugin_transport_smtp.c:454
+msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:6645
+#: src/transport/plugin_transport_smtp.c:463
 #, c-format
-msgid "Starting transport plugins `%s'\n"
+msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:6738
-msgid "Transport service ready.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:515
+#: src/transport/plugin_transport_smtp.c:558
+#: src/transport/plugin_transport_smtp.c:568
+#: src/transport/plugin_transport_smtp.c:581
+#: src/transport/plugin_transport_smtp.c:600
+#: src/transport/plugin_transport_smtp.c:623
+#: src/transport/plugin_transport_smtp.c:631
+#: src/transport/plugin_transport_smtp.c:644
+#: src/transport/plugin_transport_smtp.c:655
 #, c-format
-msgid "Unexpected address length: %u bytes\n"
+msgid "SMTP: `%s' failed: %s.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:606
-#: src/transport/plugin_transport_tcp.c:702
-#: src/transport/plugin_transport_tcp.c:756
-#: src/transport/plugin_transport_tcp.c:848
-#: src/transport/plugin_transport_tcp.c:1208
-msgid "# bytes currently in TCP buffers"
+#: src/transport/plugin_transport_smtp.c:798
+msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:614
-#: src/transport/plugin_transport_tcp.c:877
-#: src/transport/plugin_transport_tcp.c:1623
-msgid "# TCP sessions active"
+#: src/transport/plugin_transport_smtp.c:810
+msgid "# bytes received via SMTP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:706
-msgid "# bytes discarded by TCP (timeout)"
+#: src/transport/plugin_transport_smtp.c:811
+msgid "# bytes sent via SMTP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:760
-msgid "# bytes transmitted via TCP"
+#: src/transport/plugin_transport_smtp.c:813
+msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:852
-msgid "# bytes discarded by TCP (disconnect)"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:989
-msgid "# bytes TCP was asked to transmit"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1046
-msgid "# bytes discarded by TCP (no address and no connection)"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1091
+#: src/transport/test_plugin_transport_http.c:1271
 #, c-format
-msgid "Address of unexpected length: %u\n"
+msgid "Loading HTTP transport plugin `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1110
-msgid "Found valid IPv4 NAT address (creating session)!\n"
+#: src/transport/test_plugin_transport_http.c:1278
+msgid "Failed to load transport plugin for http\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1168
-msgid "# bytes discarded by TCP (failed to connect)"
+#: src/transport/test_plugin_transport_http.c:1364
+msgid ""
+"Phase 0\n"
+"\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1284
-msgid "# transport-service disconnect requests for TCP"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1670
-msgid "# TCP WELCOME messages received"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1831
-msgid "# bytes received via TCP"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1896
-msgid "# network-level TCP disconnect events"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2063
-msgid "Failed to start service.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2135
+#: src/transport/plugin_transport_udp.c:1279
 #, c-format
-msgid "Failed to find option %s in section %s!\n"
+msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2161
+#: src/transport/plugin_transport_udp.c:1329
 #, c-format
-msgid "TCP transport listening on port %llu\n"
+msgid "Invalid IPv6 address: `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2166
-msgid "TCP transport not listening on any port (client only)\n"
+#: src/transport/plugin_transport_udp.c:1455
+msgid "Failed to open UDP sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2170
+#: src/transport/transport_api.c:570
 #, c-format
-msgid "TCP transport advertises itself as being on port %llu\n"
+msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:367
-#, c-format
-msgid "Received malformed message via %s. Ignored.\n"
+#: src/transport/plugin_transport_unix.c:1092
+msgid "Failed to open UNIX sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:459
-msgid "SMTP filter string to invalid, lacks ': '\n"
+#: src/transport/gnunet-service-transport_blacklist.c:247
+#, c-format
+msgid "Could not read blacklist file `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:469
+#: src/transport/gnunet-service-transport_blacklist.c:254
 #, c-format
-msgid "SMTP filter string to long, capped to `%s'\n"
+msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:565
-#: src/transport/plugin_transport_smtp.c:576
-#: src/transport/plugin_transport_smtp.c:590
-#: src/transport/plugin_transport_smtp.c:610
-#: src/transport/plugin_transport_smtp.c:635
-#: src/transport/plugin_transport_smtp.c:644
-#: src/transport/plugin_transport_smtp.c:658
-#: src/transport/plugin_transport_smtp.c:670
+#: src/transport/gnunet-service-transport_blacklist.c:266
 #, c-format
-msgid "SMTP: `%s' failed: %s.\n"
+msgid "Failed to read blacklist from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:816
-msgid "No email-address specified, can not start SMTP transport.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:833
-msgid "# bytes received via SMTP"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:834
-msgid "# bytes sent via SMTP"
-msgstr ""
-
-#: src/transport/plugin_transport_smtp.c:836
-msgid "# bytes dropped by SMTP (outgoing)"
-msgstr ""
-
-#: src/transport/test_plugin_transport_http.c:1319
+#: src/transport/gnunet-service-transport_blacklist.c:287
+#: src/transport/gnunet-service-transport_blacklist.c:311
 #, c-format
-msgid "Loading HTTP transport plugin `%s'\n"
+msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_http.c:1326
-msgid "Failed to load transport plugin for http\n"
-msgstr ""
-
-#: src/transport/test_plugin_transport_http.c:1408
-msgid ""
-"Phase 0\n"
-"\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp.c:1352
-#: src/transport/plugin_transport_unix.c:1118
+#: src/transport/gnunet-service-transport_blacklist.c:298
+#: src/transport/gnunet-service-transport_blacklist.c:336
 #, c-format
-msgid "Given `%s' option is out of range: %llu > %u\n"
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1410
+#: src/transport/gnunet-service-transport_blacklist.c:350
 #, c-format
-msgid "Invalid IPv6 address: `%s'\n"
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1541
-msgid "Failed to open UDP sockets\n"
-msgstr ""
-
-#: src/transport/transport_api.c:582
+#: src/transport/gnunet-service-transport_blacklist.c:364
 #, c-format
-msgid "Received unexpected message of type %u in %s:%u\n"
+msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1144
-msgid "Failed to open UNIX sockets\n"
+#: src/transport/gnunet-service-transport_blacklist.c:522
+#: src/transport/gnunet-service-transport_blacklist.c:754
+msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/chat/chat.c:177
+#: src/chat/chat.c:175
 msgid "Could not transmit confirmation receipt\n"
 msgstr ""
 
-#: src/chat/chat.c:288
+#: src/chat/chat.c:283
 msgid "The current user must be the the first one joined\n"
 msgstr ""
 
-#: src/chat/chat.c:424
+#: src/chat/chat.c:412
 #, c-format
 msgid "Unknown message type: '%u'\n"
 msgstr ""
 
-#: src/chat/chat.c:489
+#: src/chat/chat.c:472
 #, c-format
 msgid "Configuration option `%s' in section `%s' missing\n"
 msgstr ""
 
-#: src/chat/chat.c:498
+#: src/chat/chat.c:480
 #, c-format
 msgid "Failed to access chat home directory `%s'\n"
 msgstr ""
 
-#: src/chat/chat.c:517
+#: src/chat/chat.c:498
 #, c-format
 msgid "Failed to create/open key in file `%s'\n"
 msgstr ""
 
-#: src/chat/chat.c:581
+#: src/chat/chat.c:559
 msgid "Could not serialize metadata\n"
 msgstr ""
 
-#: src/chat/chat.c:701
+#: src/chat/chat.c:674
 msgid "Failed to connect to the chat service\n"
 msgstr ""
 
-#: src/chat/chat.c:707
+#: src/chat/chat.c:680
 msgid "Undefined mandatory parameter: joinCallback\n"
 msgstr ""
 
-#: src/chat/chat.c:713
+#: src/chat/chat.c:686
 msgid "Undefined mandatory parameter: messageCallback\n"
 msgstr ""
 
-#: src/chat/chat.c:719
+#: src/chat/chat.c:692
 msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:89
+#: src/chat/gnunet-chat.c:92
 #, c-format
 msgid "Joined\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:123
+#: src/chat/gnunet-chat.c:124
 msgid "anonymous"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:129
+#: src/chat/gnunet-chat.c:130
 #, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:132 src/chat/gnunet-chat.c:135
+#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
 #, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:138
+#: src/chat/gnunet-chat.c:139
 #, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:141
+#: src/chat/gnunet-chat.c:142
 #, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:144
+#: src/chat/gnunet-chat.c:145
 #, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:147
+#: src/chat/gnunet-chat.c:148
 #, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:150
+#: src/chat/gnunet-chat.c:151
 #, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:153
+#: src/chat/gnunet-chat.c:156
 #, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:159
 #, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:162
 #, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:191
+#: src/chat/gnunet-chat.c:193
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:222
+#: src/chat/gnunet-chat.c:224
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:222
+#: src/chat/gnunet-chat.c:224
 #, c-format
 msgid "`%s' left the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:286 src/chat/gnunet-chat.c:326
+#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
 #, c-format
 msgid "Could not change username\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:290 src/chat/gnunet-chat.c:660
+#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:629
 #, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:330
+#: src/chat/gnunet-chat.c:320
 #, c-format
 msgid "Changed username to `%s'\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:343
+#: src/chat/gnunet-chat.c:333
 #, c-format
 msgid "Users in room `%s': "
 msgstr ""
 
-#: src/chat/gnunet-chat.c:383
+#: src/chat/gnunet-chat.c:371
 #, c-format
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:391
+#: src/chat/gnunet-chat.c:379
 #, c-format
 msgid "Unknown user `%s'\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:407
+#: src/chat/gnunet-chat.c:395
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:448
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:478
+#: src/chat/gnunet-chat.c:459
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:463
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:467
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:470
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:472
 msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:493
+#: src/chat/gnunet-chat.c:474
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:496
+#: src/chat/gnunet-chat.c:477
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:499
+#: src/chat/gnunet-chat.c:480
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:501
+#: src/chat/gnunet-chat.c:482
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:503
+#: src/chat/gnunet-chat.c:484
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:505
+#: src/chat/gnunet-chat.c:486
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:508
+#: src/chat/gnunet-chat.c:489
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:510
+#: src/chat/gnunet-chat.c:491
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:627
+#: src/chat/gnunet-chat.c:605
 #, c-format
 msgid "You must specify a nickname\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:652
+#: src/chat/gnunet-chat.c:621
 #, c-format
 msgid "Failed to join room `%s'\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:685
+#: src/chat/gnunet-chat.c:654
 msgid "set the nickname to use (required)"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:688
+#: src/chat/gnunet-chat.c:657
 msgid "set the chat room to join"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:702
+#: src/chat/gnunet-chat.c:669
 msgid "Join a chat on GNUnet."
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:273
+#: src/chat/gnunet-service-chat.c:267
 msgid "Failed to queue a message notification\n"
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:566
+#: src/chat/gnunet-service-chat.c:546
 msgid "Failed to queue a join notification\n"
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:764
+#: src/chat/gnunet-service-chat.c:729
 msgid "Failed to queue a confirmation receipt\n"
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:952
+#: src/chat/gnunet-service-chat.c:907
 msgid "Failed to queue a leave notification\n"
 msgstr ""
 
@@ -4362,30 +4160,30 @@
 msgid "Peer `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:241
+#: src/peerinfo-tool/gnunet-peerinfo.c:222
 #, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:249
+#: src/peerinfo-tool/gnunet-peerinfo.c:229
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:261
+#: src/peerinfo-tool/gnunet-peerinfo.c:241
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:281
+#: src/peerinfo-tool/gnunet-peerinfo.c:261
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:284
+#: src/peerinfo-tool/gnunet-peerinfo.c:264
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:292
+#: src/peerinfo-tool/gnunet-peerinfo.c:270
 msgid "Print information about peers."
 msgstr ""
 
@@ -4394,32 +4192,32 @@
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:223
+#: src/datastore/plugin_datastore_sqlite.c:239
 #, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:253
+#: src/datastore/plugin_datastore_sqlite.c:266
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:669
+#: src/datastore/plugin_datastore_sqlite.c:662
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1110
+#: src/datastore/plugin_datastore_sqlite.c:1115
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1138
+#: src/datastore/plugin_datastore_sqlite.c:1134
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1179
+#: src/datastore/plugin_datastore_sqlite.c:1173
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -4427,333 +4225,343 @@
 msgid "# bytes used in file-sharing datastore"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:347
+#: src/datastore/gnunet-service-datastore.c:331
 msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:427
+#: src/datastore/gnunet-service-datastore.c:397
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:496
+#: src/datastore/gnunet-service-datastore.c:457
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:665
+#: src/datastore/gnunet-service-datastore.c:610
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:712
+#: src/datastore/gnunet-service-datastore.c:655
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:724
+#: src/datastore/gnunet-service-datastore.c:666
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:728
+#: src/datastore/gnunet-service-datastore.c:670
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:734
+#: src/datastore/gnunet-service-datastore.c:676
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:740
-#: src/datastore/gnunet-service-datastore.c:795
-#: src/datastore/gnunet-service-datastore.c:1041
-#: src/datastore/gnunet-service-datastore.c:1596
+#: src/datastore/gnunet-service-datastore.c:681
+#: src/datastore/gnunet-service-datastore.c:735
+#: src/datastore/gnunet-service-datastore.c:953
+#: src/datastore/gnunet-service-datastore.c:1438
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:810
+#: src/datastore/gnunet-service-datastore.c:750
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:908
+#: src/datastore/gnunet-service-datastore.c:835
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1099
+#: src/datastore/gnunet-service-datastore.c:1001
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1115
+#: src/datastore/gnunet-service-datastore.c:1015
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1150
+#: src/datastore/gnunet-service-datastore.c:1043
 msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1189
+#: src/datastore/gnunet-service-datastore.c:1077
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1227
+#: src/datastore/gnunet-service-datastore.c:1112
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1263
+#: src/datastore/gnunet-service-datastore.c:1139
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1276
+#: src/datastore/gnunet-service-datastore.c:1149
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1316
+#: src/datastore/gnunet-service-datastore.c:1183
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1371
+#: src/datastore/gnunet-service-datastore.c:1227
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1452
-#: src/datastore/test_plugin_datastore.c:361
-#: src/datastore/perf_plugin_datastore.c:467
+#: src/datastore/gnunet-service-datastore.c:1300
+#: src/datastore/test_plugin_datastore.c:322
+#: src/datastore/perf_plugin_datastore.c:420
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1460
+#: src/datastore/gnunet-service-datastore.c:1309
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1648
+#: src/datastore/gnunet-service-datastore.c:1488
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1653
+#: src/datastore/gnunet-service-datastore.c:1490
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1667
+#: src/datastore/gnunet-service-datastore.c:1500
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1680
+#: src/datastore/gnunet-service-datastore.c:1513
 msgid "Failed to initialize bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_template.c:252
+#: src/datastore/plugin_datastore_template.c:241
 msgid "Template database running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:292
+#: src/datastore/datastore_api.c:287
 msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:380
+#: src/datastore/datastore_api.c:370
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:432
+#: src/datastore/datastore_api.c:417
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:462
+#: src/datastore/datastore_api.c:444
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:493
+#: src/datastore/datastore_api.c:465
 msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/datastore/datastore_api.c:543
+#: src/datastore/datastore_api.c:514
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:573
+#: src/datastore/datastore_api.c:541
 msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/datastore/datastore_api.c:644
+#: src/datastore/datastore_api.c:606
 msgid "Failed to transmit request to DATASTORE.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:646
+#: src/datastore/datastore_api.c:608
 msgid "# transmission request failures"
 msgstr ""
 
-#: src/datastore/datastore_api.c:673
+#: src/datastore/datastore_api.c:631
 msgid "# bytes sent to datastore"
 msgstr ""
 
-#: src/datastore/datastore_api.c:822
+#: src/datastore/datastore_api.c:768
 msgid "Failed to receive status response from database."
 msgstr ""
 
-#: src/datastore/datastore_api.c:836
+#: src/datastore/datastore_api.c:781
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:848 src/datastore/datastore_api.c:855
+#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
 msgid "Invalid error message received from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:864
+#: src/datastore/datastore_api.c:806
 msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:947
+#: src/datastore/datastore_api.c:878
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1024
+#: src/datastore/datastore_api.c:950
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1092
+#: src/datastore/datastore_api.c:1015
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1159
+#: src/datastore/datastore_api.c:1078
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1234
+#: src/datastore/datastore_api.c:1148
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1281
+#: src/datastore/datastore_api.c:1193
 msgid "Failed to receive response from database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1345
+#: src/datastore/datastore_api.c:1254
 msgid "# Results received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1424
+#: src/datastore/datastore_api.c:1326
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1492
+#: src/datastore/datastore_api.c:1393
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1563
+#: src/datastore/datastore_api.c:1457
 msgid "# GET requests executed"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:515
+#: src/datastore/plugin_datastore_mysql.c:529
 #, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:608
+#: src/datastore/plugin_datastore_mysql.c:622
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:1484
+#: src/datastore/plugin_datastore_mysql.c:1500
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:177
+#: src/datastore/plugin_datastore_postgres.c:173
 #, c-format
 msgid "Unable to initialize Postgres with configuration `%s': %s"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:1116
+#: src/datastore/plugin_datastore_postgres.c:979
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:161
+#: src/dv/plugin_transport_dv.c:159
 #, c-format
 msgid "%s Received message from %s of type %d, distance %u!\n"
 msgstr ""
 
-#: src/dv/dv_api.c:179
+#: src/dv/dv_api.c:178
 msgid "Failed to connect to the dv service!\n"
 msgstr ""
 
-#: src/nse/nse-profiler.c:462
-msgid "Run a test of the NSE service."
+#: src/nse/gnunet-service-nse.c:864
+#, c-format
+msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:998
+#: src/nse/gnunet-service-nse.c:1286 src/nse/gnunet-service-nse.c:1305
+#: src/nse/gnunet-service-nse.c:1326
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1008
-msgid "NSE Service could not access hostkey.  Exiting.\n"
+#: src/nse/gnunet-service-nse.c:1293
+msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:935
+#: src/nse/gnunet-service-nse.c:1314
+msgid "NSE service could not access hostkey.  Exiting.\n"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:673
+msgid "Measure quality and performance of the NSE service."
+msgstr ""
+
+#: src/core/gnunet-service-core.c:920
 msgid "# total peer preference"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1063
+#: src/core/gnunet-service-core.c:1040
 msgid "# peer status changes"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1176
+#: src/core/gnunet-service-core.c:1236
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1662
+#: src/core/gnunet-service-core.c:1712
 #, c-format
 msgid ""
 "Client asked for preference change with peer `%s', which is not connected!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1747 src/core/gnunet-service-core.c:4318
-#: src/core/gnunet-service-core.c:4541
+#: src/core/gnunet-service-core.c:1793 src/core/gnunet-service-core.c:4240
+#: src/core/gnunet-service-core.c:4456
 msgid "# established sessions"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1794
+#: src/core/gnunet-service-core.c:1838
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1933 src/core/gnunet-service-core.c:2781
-#: src/core/gnunet-service-core.c:4623
+#: src/core/gnunet-service-core.c:1964 src/core/gnunet-service-core.c:2793
+#: src/core/gnunet-service-core.c:4532
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2003
+#: src/core/gnunet-service-core.c:2031
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2114
+#: src/core/gnunet-service-core.c:2134
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2289
+#: src/core/gnunet-service-core.c:2314
 msgid "# transmissions delayed due to corking"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2494
+#: src/core/gnunet-service-core.c:2517
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2849
+#: src/core/gnunet-service-core.c:2857
 msgid "# messages discarded (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2906 src/core/gnunet-service-core.c:4741
+#: src/core/gnunet-service-core.c:2909 src/core/gnunet-service-core.c:4644
 msgid "# discarded CORE_SEND requests"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2919 src/core/gnunet-service-core.c:4742
+#: src/core/gnunet-service-core.c:2924 src/core/gnunet-service-core.c:4648
 msgid "# discarded lower priority CORE_SEND requests"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2994
+#: src/core/gnunet-service-core.c:2996
 msgid "# connection requests received"
 msgstr ""
 
@@ -4761,165 +4569,165 @@
 msgid "# connection requests ignored (already connected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3057 src/core/gnunet-service-core.c:3741
+#: src/core/gnunet-service-core.c:3054 src/core/gnunet-service-core.c:3697
 msgid "# SET_KEY messages deferred (need public key)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3070
+#: src/core/gnunet-service-core.c:3067
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3105
+#: src/core/gnunet-service-core.c:3099
 msgid "# Error extracting public key from HELLO"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3151
+#: src/core/gnunet-service-core.c:3145
 msgid "# Asking transport to connect (for SET_KEY)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3286
+#: src/core/gnunet-service-core.c:3270
 msgid "# SET_KEY and PING messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3367
+#: src/core/gnunet-service-core.c:3349
 #, c-format
 msgid ""
 "Ignoring `%s' message due to lack of public key for peer `%4s' (failed to "
 "obtain one).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3471
+#: src/core/gnunet-service-core.c:3444
 msgid "# PING messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3483
+#: src/core/gnunet-service-core.c:3456
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3515
+#: src/core/gnunet-service-core.c:3481
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3574
+#: src/core/gnunet-service-core.c:3534
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3617
+#: src/core/gnunet-service-core.c:3572
 msgid "# Session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3751
+#: src/core/gnunet-service-core.c:3706
 #, c-format
 msgid "Received `%s' message that was for `%s', not for me.  Ignoring.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3796
+#: src/core/gnunet-service-core.c:3748
 msgid "# SET_KEY messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3953
+#: src/core/gnunet-service-core.c:3894
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3997
+#: src/core/gnunet-service-core.c:3941
 msgid "# messages not delivered to any client"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4076 src/core/gnunet-service-core.c:4102
+#: src/core/gnunet-service-core.c:4011 src/core/gnunet-service-core.c:4036
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4088
+#: src/core/gnunet-service-core.c:4023
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4126
+#: src/core/gnunet-service-core.c:4060
 #, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4129
+#: src/core/gnunet-service-core.c:4064
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4162
+#: src/core/gnunet-service-core.c:4094
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4230
+#: src/core/gnunet-service-core.c:4157
 msgid "# session keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4248
+#: src/core/gnunet-service-core.c:4173
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4306
+#: src/core/gnunet-service-core.c:4229
 #, c-format
 msgid "Unsupported message of type %u received.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4481 src/core/gnunet-service-core.c:4572
+#: src/core/gnunet-service-core.c:4403 src/core/gnunet-service-core.c:4485
 msgid "# peers connected (transport)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4695
+#: src/core/gnunet-service-core.c:4599
 msgid "Core service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4713
+#: src/core/gnunet-service-core.c:4617
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4751
+#: src/core/gnunet-service-core.c:4656
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/core_api.c:874
+#: src/core/core_api.c:832
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:291 src/include/gnunet_common.h:296
-#: src/include/gnunet_common.h:302
+#: src/include/gnunet_common.h:296 src/include/gnunet_common.h:301
+#: src/include/gnunet_common.h:307
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:312
+#: src/include/gnunet_common.h:317
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:326
+#: src/include/gnunet_common.h:331
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:145
+#: src/include/gnunet_getopt_lib.h:144
 msgid "print this help"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:155
+#: src/include/gnunet_getopt_lib.h:154
 msgid "print the version number"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:164
+#: src/include/gnunet_getopt_lib.h:163
 msgid "configure logging to write logs to LOGFILE"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:173
+#: src/include/gnunet_getopt_lib.h:172
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:182
+#: src/include/gnunet_getopt_lib.h:181
 msgid "be verbose"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:191
+#: src/include/gnunet_getopt_lib.h:190
 msgid "use configuration file FILENAME"
 msgstr ""

Modified: gnunet/po/sv.gmo
===================================================================
(Binary files differ)

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2011-09-13 12:43:24 UTC (rev 16810)
+++ gnunet/po/sv.po     2011-09-13 12:44:25 UTC (rev 16811)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-07-19 15:16+0200\n"
+"POT-Creation-Date: 2011-09-13 14:44+0200\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -16,644 +16,645 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/fragmentation/defragmentation.c:274
+#: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:457
+#: src/fragmentation/defragmentation.c:454
 #, fuzzy
 msgid "# fragments received"
 msgstr "# byte mottogs via TCP"
 
-#: src/fragmentation/defragmentation.c:521
+#: src/fragmentation/defragmentation.c:513
 #, fuzzy
 msgid "# duplicate fragments received"
 msgstr "# byte mottogs via TCP"
 
-#: src/fragmentation/defragmentation.c:545
+#: src/fragmentation/defragmentation.c:532
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:181
+#: src/fragmentation/fragmentation.c:183
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/fragmentation/fragmentation.c:185
+#: src/fragmentation/fragmentation.c:186
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# byte skickade av typen %d"
 
-#: src/fragmentation/fragmentation.c:249
+#: src/fragmentation/fragmentation.c:248
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:254
+#: src/fragmentation/fragmentation.c:251
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:336
+#: src/fragmentation/fragmentation.c:335
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:343
+#: src/fragmentation/fragmentation.c:341
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:358
+#: src/fragmentation/fragmentation.c:365
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/nat/nat.c:823
+#: src/nat/nat.c:778
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:884
+#: src/nat/nat.c:828
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/nat/nat.c:1185 src/nat/nat.c:1207
+#: src/nat/nat.c:1096 src/nat/nat.c:1113
 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/nat/nat.c:1276 src/nat/nat.c:1284
+#: src/nat/nat.c:1167 src/nat/nat.c:1177
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1422
+#: src/nat/nat.c:1309
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1440
+#: src/nat/nat.c:1321
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:317
+#: src/nat/gnunet-nat-server.c:290
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:361
+#: src/nat/gnunet-nat-server.c:329
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_test.c:376
+#: src/nat/nat_test.c:348
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/nat/nat_test.c:451
+#: src/nat/nat_test.c:418
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:772 src/vpn/gnunet-daemon-exit.c:1280
-#: src/template/gnunet-template.c:72 src/core/test_core_api_send_to_self.c:216
+#: src/vpn/gnunet-daemon-vpn.c:1275 src/vpn/gnunet-daemon-exit.c:1455
+#: src/template/gnunet-template.c:68 src/core/test_core_api_send_to_self.c:217
 #, fuzzy
 msgid "help text"
 msgstr "hjälptext för -t"
 
-#: src/datacache/datacache.c:110 src/datacache/datacache.c:255
-#: src/datastore/gnunet-service-datastore.c:888
+#: src/datacache/datacache.c:108 src/datacache/datacache.c:236
+#: src/datastore/gnunet-service-datastore.c:821
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# byte krypterade"
 
-#: src/datacache/datacache.c:138 src/datacache/datacache.c:149
-#: src/datastore/gnunet-service-datastore.c:1442
-#: src/datastore/gnunet-service-datastore.c:1641
-#: src/datastore/test_plugin_datastore.c:209
-#: src/datastore/test_plugin_datastore.c:352
-#: src/datastore/perf_plugin_datastore.c:340
-#: src/datastore/perf_plugin_datastore.c:458
+#: src/datacache/datacache.c:134 src/datacache/datacache.c:142
+#: src/datastore/gnunet-service-datastore.c:1292
+#: src/datastore/gnunet-service-datastore.c:1483
+#: src/datastore/test_plugin_datastore.c:192
+#: src/datastore/test_plugin_datastore.c:315
+#: src/datastore/perf_plugin_datastore.c:309
+#: src/datastore/perf_plugin_datastore.c:413
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/datacache/datacache.c:178
+#: src/datacache/datacache.c:167
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:186
+#: src/datacache/datacache.c:176
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/datacache/datacache.c:285
+#: src/datacache/datacache.c:262
 #, fuzzy
 msgid "# requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datacache/datacache.c:292
+#: src/datacache/datacache.c:268
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/plugin_datacache_template.c:126
+#: src/datacache/plugin_datacache_template.c:121
 msgid "Template datacache running\n"
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:66
 #: src/datacache/plugin_datacache_sqlite.c:69
-#: src/datacache/plugin_datacache_sqlite.c:126
-#: src/datacache/plugin_datacache_sqlite.c:201
-#: src/datacache/plugin_datacache_sqlite.c:248
-#: src/datacache/plugin_datacache_sqlite.c:322
-#: src/datacache/plugin_datacache_sqlite.c:331
-#: src/datacache/plugin_datacache_sqlite.c:345
+#: src/datacache/plugin_datacache_sqlite.c:122
+#: src/datacache/plugin_datacache_sqlite.c:191
+#: src/datacache/plugin_datacache_sqlite.c:232
+#: src/datacache/plugin_datacache_sqlite.c:296
+#: src/datacache/plugin_datacache_sqlite.c:305
+#: src/datacache/plugin_datacache_sqlite.c:318
+#: src/datacache/plugin_datacache_sqlite.c:325
+#: src/datacache/plugin_datacache_sqlite.c:338
+#: src/datacache/plugin_datacache_sqlite.c:346
 #: src/datacache/plugin_datacache_sqlite.c:354
-#: src/datacache/plugin_datacache_sqlite.c:374
-#: src/datacache/plugin_datacache_sqlite.c:383
-#: src/datacache/plugin_datacache_sqlite.c:394
 #: src/datacache/plugin_datacache_mysql.c:103
 #: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:518
-#: src/datacache/plugin_datacache_mysql.c:527
-#: src/datacache/plugin_datacache_mysql.c:603
-#: src/datacache/plugin_datacache_mysql.c:619 src/util/crypto_rsa.c:84
-#: src/util/crypto_ksk.c:47 src/dht/plugin_dhtlog_mysql.c:583
-#: src/dht/plugin_dhtlog_mysql.c:592 src/dht/plugin_dhtlog_mysql.c:652
-#: src/dht/plugin_dhtlog_mysql.c:667
+#: src/datacache/plugin_datacache_mysql.c:517
+#: src/datacache/plugin_datacache_mysql.c:526
+#: src/datacache/plugin_datacache_mysql.c:598
+#: src/datacache/plugin_datacache_mysql.c:614 src/util/crypto_rsa.c:84
+#: src/util/crypto_ksk.c:47 src/dht/plugin_dhtlog_mysql.c:581
+#: src/dht/plugin_dhtlog_mysql.c:590 src/dht/plugin_dhtlog_mysql.c:648
+#: src/dht/plugin_dhtlog_mysql.c:663
 #: src/datastore/plugin_datastore_sqlite.c:61
 #: src/datastore/plugin_datastore_mysql.c:139
 #: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:599
-#: src/datastore/plugin_datastore_mysql.c:661
-#: src/datastore/plugin_datastore_mysql.c:673 src/include/gnunet_common.h:319
+#: src/datastore/plugin_datastore_mysql.c:613
+#: src/datastore/plugin_datastore_mysql.c:673
+#: src/datastore/plugin_datastore_mysql.c:685 src/include/gnunet_common.h:324
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:461
+#: src/datacache/plugin_datacache_sqlite.c:419
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:496
-#: src/datastore/plugin_datastore_sqlite.c:381
+#: src/datacache/plugin_datacache_sqlite.c:454
+#: src/datastore/plugin_datastore_sqlite.c:405
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:81
-#: src/datastore/plugin_datastore_postgres.c:95
+#: src/datacache/plugin_datacache_postgres.c:79
+#: src/datastore/plugin_datastore_postgres.c:93
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/datacache/plugin_datacache_postgres.c:154
+#: src/datacache/plugin_datacache_postgres.c:149
 #, fuzzy, c-format
 msgid "Unable to initialize Postgres: %s"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/datacache/plugin_datacache_postgres.c:557
+#: src/datacache/plugin_datacache_postgres.c:500
 msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:220
-#: src/datastore/plugin_datastore_mysql.c:297
+#: src/datacache/plugin_datacache_mysql.c:224
+#: src/datastore/plugin_datastore_mysql.c:316
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
 
-#: src/datacache/plugin_datacache_mysql.c:227
-#: src/datastore/plugin_datastore_mysql.c:304
+#: src/datacache/plugin_datacache_mysql.c:230
+#: src/datastore/plugin_datastore_mysql.c:322
 #, fuzzy, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/datacache/plugin_datacache_mysql.c:1061
+#: src/datacache/plugin_datacache_mysql.c:979
 msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1801 src/testing/testing_group.c:1814
-#: src/testing/testing_group.c:1920 src/testing/testing_group.c:1981
-#: src/testing/testing_group.c:2070 src/testing/testing_group.c:2092
-#: src/testing/testing_group.c:2231 src/testing/test_testing_topology.c:1104
-#: src/testing/test_testing_topology_blacklist.c:457
-#: src/testing/testing_peergroup.c:856
-#: src/testing/test_testing_large_topology.c:1046
-#: src/dht/test_dht_multipeer.c:833 src/dht/gnunet-dht-driver.c:4001
-#: src/dv/test_transport_api_dv.c:1102
+#: src/testing/testing_group.c:1903 src/testing/testing_group.c:1915
+#: src/testing/testing_group.c:2016 src/testing/testing_group.c:2075
+#: src/testing/testing_group.c:2164 src/testing/testing_group.c:2184
+#: src/testing/testing_group.c:2321 src/testing/test_testing_topology.c:1078
+#: src/testing/test_testing_topology_blacklist.c:448
+#: src/testing/testing_peergroup.c:876
+#: src/testing/test_testing_large_topology.c:1022
+#: src/dht/test_dht_multipeer.c:864 src/dht/gnunet-dht-driver.c:3907
+#: src/dv/test_transport_api_dv.c:1132
 #, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1824
+#: src/testing/testing_group.c:1925
 #, fuzzy, c-format
 msgid "Target is %d connections per peer."
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing_group.c:2079
+#: src/testing/testing_group.c:2172
 #, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2111 src/testing/testing_group.c:2307
+#: src/testing/testing_group.c:2202 src/testing/testing_group.c:2395
 #, c-format
 msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2148
+#: src/testing/testing_group.c:2239
 #, c-format
 msgid "natural log of %d is %d, will run %d iterations\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2151
+#: src/testing/testing_group.c:2242
 #, c-format
 msgid "Total connections added thus far: %u!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2193
+#: src/testing/testing_group.c:2283
 #, c-format
 msgid "Total connections added for small world: %d!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2246
+#: src/testing/testing_group.c:2335
 #, c-format
 msgid "rand is %f probability is %f\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2824 src/testing/testing_group.c:3035
+#: src/testing/testing_group.c:2910 src/testing/testing_group.c:3109
 #, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
 "file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2935
+#: src/testing/testing_group.c:3011
 msgid "Finished copying all friend files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3051
+#: src/testing/testing_group.c:3124
 #, fuzzy, c-format
 msgid "Copying file with command cp %s %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/testing/testing_group.c:3074
+#: src/testing/testing_group.c:3147
 #, c-format
 msgid "Copying file with command scp %s %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3092
+#: src/testing/testing_group.c:3164
 #, c-format
 msgid "Checking copy status of file %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3111
+#: src/testing/testing_group.c:3182
 #, c-format
 msgid "File %d copied\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3126
+#: src/testing/testing_group.c:3197
 msgid "Finished copying all blacklist files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3496 src/testing/testing_group.c:3624
-#: src/testing/testing_group.c:4839 src/testing/testing_group.c:4982
+#: src/testing/testing_group.c:3581 src/testing/testing_group.c:3720
+#: src/testing/testing_group.c:4925 src/testing/testing_group.c:5066
 msgid "Delaying connect, we have too many outstanding connections!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3506 src/testing/testing_group.c:4851
-#: src/testing/testing_group.c:4994
+#: src/testing/testing_group.c:3591 src/testing/testing_group.c:4935
+#: src/testing/testing_group.c:5076
 #, c-format
 msgid "Creating connection, outstanding_connections is %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3518
+#: src/testing/testing_group.c:3603
 #, c-format
 msgid "Offering Hello of peer %s to peer %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3636
+#: src/testing/testing_group.c:3730
 #, c-format
 msgid "Creating connection, outstanding_connections is %d (max %d)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3887
+#: src/testing/testing_group.c:3983
 msgid "Creating clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3894
+#: src/testing/testing_group.c:3990
 msgid "Creating small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3901
+#: src/testing/testing_group.c:3997
 msgid "Creating small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3907
+#: src/testing/testing_group.c:4003
 msgid "Creating ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3913
+#: src/testing/testing_group.c:4009
 msgid "Creating 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3920
+#: src/testing/testing_group.c:4015
 msgid "Creating Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3926
+#: src/testing/testing_group.c:4021
 msgid "Creating InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3933
+#: src/testing/testing_group.c:4027
 msgid "Creating Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3940
+#: src/testing/testing_group.c:4034
 msgid "Creating straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3947
+#: src/testing/testing_group.c:4040
 msgid "Creating topology from file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3966
+#: src/testing/testing_group.c:4058
 msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3983
+#: src/testing/testing_group.c:4075
 msgid "Failed during friend file copying!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3991
+#: src/testing/testing_group.c:4083
 msgid "Friend files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4010
+#: src/testing/testing_group.c:4102
 msgid "Blacklisting all but clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4018
+#: src/testing/testing_group.c:4110
 msgid "Blacklisting all but small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4028
+#: src/testing/testing_group.c:4118
 msgid "Blacklisting all but small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4036
+#: src/testing/testing_group.c:4126
 msgid "Blacklisting all but ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4044
+#: src/testing/testing_group.c:4134
 msgid "Blacklisting all but 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4052
+#: src/testing/testing_group.c:4142
 msgid "Blacklisting all but Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4060
+#: src/testing/testing_group.c:4150
 msgid "Blacklisting all but InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4097
+#: src/testing/testing_group.c:4187
 msgid "Blacklisting all but Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4105
+#: src/testing/testing_group.c:4195
 msgid "Blacklisting all but straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4122
+#: src/testing/testing_group.c:4212
 msgid "Failed during blacklist file copying!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4130
+#: src/testing/testing_group.c:4220
 msgid "Blacklist files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5213
+#: src/testing/testing_group.c:5301
 msgid "Creating clique CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5220
+#: src/testing/testing_group.c:5308
 msgid "Creating small world (ring) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5227
+#: src/testing/testing_group.c:5315
 msgid "Creating small world (2d-torus) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5233
+#: src/testing/testing_group.c:5321
 msgid "Creating ring CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5240
+#: src/testing/testing_group.c:5328
 msgid "Creating 2d torus CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5247
+#: src/testing/testing_group.c:5335
 msgid "Creating Erdos-Renyi CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5254
+#: src/testing/testing_group.c:5342
 msgid "Creating InterNAT CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5261
+#: src/testing/testing_group.c:5349
 msgid "Creating Scale Free CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5268
+#: src/testing/testing_group.c:5356
 msgid "Creating straight line CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5274
+#: src/testing/testing_group.c:5362
 msgid "Creating no CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5280
+#: src/testing/testing_group.c:5368
 msgid "Unknown topology specification, can't connect peers!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5289
+#: src/testing/testing_group.c:5378
 #, c-format
 msgid "Connecting random subset (%'.2f percent) of possible peers\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5297
+#: src/testing/testing_group.c:5386
 #, c-format
 msgid "Connecting a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5305
+#: src/testing/testing_group.c:5395
 #, c-format
 msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5315
+#: src/testing/testing_group.c:5405
 #, c-format
 msgid "Finding additional %u closest peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5923
+#: src/testing/testing_group.c:6084
 #, fuzzy
 msgid "Could not read hostkeys file!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing_group.c:5996
+#: src/testing/testing_group.c:6154
 #, c-format
 msgid "Could not create configuration for peer number %u on `%s'!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6119 src/testing/testing.c:1189
+#: src/testing/testing_group.c:6298 src/testing/testing.c:1272
 #, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr ""
 
-#: src/testing/testing.c:210
-#, fuzzy
-msgid "Failed to connect to core service\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/testing/testing.c:247 src/testing/testing.c:735
-#: src/testing/testing.c:1947 src/testing/testing.c:1965
-#: src/testing/testing.c:2049 src/testing/testing.c:2065
-#, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/testing/testing.c:327
+#: src/testing/testing.c:208
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:342 src/testing/testing.c:912
+#: src/testing/testing.c:222 src/testing/testing.c:822
 #, fuzzy
 msgid "`scp' did not complete cleanly.\n"
 msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
 
-#: src/testing/testing.c:367
+#: src/testing/testing.c:245
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:368
+#: src/testing/testing.c:246
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/testing/testing.c:430
+#: src/testing/testing.c:302
 #, fuzzy, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:440
+#: src/testing/testing.c:309
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:441 src/testing/testing.c:638
+#: src/testing/testing.c:310 src/testing/testing.c:508
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:506
+#: src/testing/testing.c:372
 #, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:510
+#: src/testing/testing.c:376
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr ""
 
-#: src/testing/testing.c:520
+#: src/testing/testing.c:386
 #, fuzzy
 msgid "`Failed to get hostkey!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:556
+#: src/testing/testing.c:420
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:627
+#: src/testing/testing.c:500
 #, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr ""
 
-#: src/testing/testing.c:637
+#: src/testing/testing.c:507
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/testing/testing.c:665
+#: src/testing/testing.c:531 src/testing/testing.c:630
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:666
+#: src/testing/testing.c:532 src/testing/testing.c:631
+#: src/testing/testing.c:651
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:707
-msgid "Unable to connect to CORE service for peer!\n"
-msgstr ""
+#: src/testing/testing.c:571 src/testing/testing.c:2072
+#: src/testing/testing.c:2091
+#, fuzzy
+msgid "Failed to connect to transport service!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/testing/testing.c:769
+#: src/testing/testing.c:600
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:797
+#: src/testing/testing.c:650
+msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
+msgstr ""
+
+#: src/testing/testing.c:673 src/testing/testing.c:707
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:827
+#: src/testing/testing.c:688 src/testing/testing.c:737
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr ""
 
-#: src/testing/testing.c:899
+#: src/testing/testing.c:810
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:1277 src/testing/testing.c:1407
+#: src/testing/testing.c:988
 #, fuzzy, c-format
+msgid "Starting service %s for peer `%4s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/testing/testing.c:1360 src/testing/testing.c:1443
+#: src/testing/testing.c:1581
+#, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/testing/testing.c:1359
+#: src/testing/testing.c:1533
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/testing/testing.c:1492
+#: src/testing/testing.c:1668
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1500
+#: src/testing/testing.c:1676
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/testing/testing.c:1532
+#: src/testing/testing.c:1707
 #, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr ""
 
-#: src/testing/testing.c:1535
+#: src/testing/testing.c:1710
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/testing/testing.c:1723
+#: src/testing/testing.c:1881
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/testing/testing.c:1918 src/testing/testing.c:2036
+#: src/testing/testing.c:2036
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/testing/testing.c:2107
+#: src/testing/testing.c:2238
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
@@ -662,203 +663,201 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:202
+#: src/peerinfo/gnunet-service-peerinfo.c:197
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:251
+#: src/peerinfo/gnunet-service-peerinfo.c:241
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:318
+#: src/peerinfo/gnunet-service-peerinfo.c:306
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api_notify.c:266
+#: src/peerinfo/peerinfo_api_notify.c:257
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/peerinfo/test_peerinfo_api.c:112 src/hostlist/hostlist-server.c:469
-#: src/peerinfo-tool/gnunet-peerinfo.c:168 src/dv/gnunet-service-dv.c:2833
-#: src/core/gnunet-service-core.c:3036 src/core/gnunet-service-core.c:3345
+#: src/peerinfo/test_peerinfo_api.c:109 src/hostlist/hostlist-server.c:437
+#: src/peerinfo-tool/gnunet-peerinfo.c:157 src/dv/gnunet-service-dv.c:2998
+#: src/core/gnunet-service-core.c:3034 src/core/gnunet-service-core.c:3328
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/peerinfo/peerinfo_api.c:280
+#: src/peerinfo/peerinfo_api.c:276
 #, fuzzy, c-format
 msgid "Failed to transmit message to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/peerinfo/peerinfo_api.c:447
+#: src/peerinfo/peerinfo_api.c:432
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/peerinfo/peerinfo_api.c:476 src/peerinfo/peerinfo_api.c:494
+#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service.\n"
 msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
 
-#: src/peerinfo/peerinfo_api.c:540
+#: src/peerinfo/peerinfo_api.c:521
 #, fuzzy
 msgid "Failed to transmit iteration request to `PEERINFO' service\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/peerinfo/peerinfo_api.c:580
+#: src/peerinfo/peerinfo_api.c:555
 msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:281
-#: src/hostlist/hostlist-client.c:620
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:259
+#: src/hostlist/hostlist-client.c:622
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:298
-#: src/hostlist/hostlist-client.c:594 src/hostlist/hostlist-client.c:1384
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:274
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1338
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:311
-#: src/hostlist/hostlist-server.c:377
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:286
+#: src/hostlist/hostlist-server.c:353
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:422
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:389
 #, c-format
 msgid "Hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:265
+#: src/hostlist/gnunet-daemon-hostlist.c:253
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:300
-#: src/topology/gnunet-daemon-topology.c:1452
-#: src/topology/gnunet-daemon-topology.c:1460 src/fs/gnunet-service-fs.c:544
+#: src/hostlist/gnunet-daemon-hostlist.c:286
+#: src/topology/gnunet-daemon-topology.c:1315
+#: src/topology/gnunet-daemon-topology.c:1322 src/fs/gnunet-service-fs.c:519
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:321
+#: src/hostlist/gnunet-daemon-hostlist.c:306
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/hostlist/gnunet-daemon-hostlist.c:311
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:328
+#: src/hostlist/gnunet-daemon-hostlist.c:314
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:332
+#: src/hostlist/gnunet-daemon-hostlist.c:318
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:344
+#: src/hostlist/gnunet-daemon-hostlist.c:330
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:135
+#: src/hostlist/hostlist-server.c:134
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# byte krypterade"
 
-#: src/hostlist/hostlist-server.c:164
+#: src/hostlist/hostlist-server.c:160
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:194
-#: src/topology/gnunet-daemon-topology.c:973
-#: src/transport/gnunet-service-transport.c:3160
-#: src/transport/gnunet-service-transport.c:4572
+#: src/hostlist/hostlist-server.c:187
+#: src/topology/gnunet-daemon-topology.c:900
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/hostlist/hostlist-server.c:217
+#: src/hostlist/hostlist-server.c:208
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:234
+#: src/hostlist/hostlist-server.c:224
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:289
+#: src/hostlist/hostlist-server.c:272
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:292
+#: src/hostlist/hostlist-server.c:275
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:283
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:309
+#: src/hostlist/hostlist-server.c:290
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:313
+#: src/hostlist/hostlist-server.c:294
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:321
+#: src/hostlist/hostlist-server.c:302
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:323
+#: src/hostlist/hostlist-server.c:305
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:329
+#: src/hostlist/hostlist-server.c:309
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:331
+#: src/hostlist/hostlist-server.c:310
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:427
+#: src/hostlist/hostlist-server.c:398
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:599
-#: src/transport/gnunet-service-transport.c:6603
-#: src/peerinfo-tool/gnunet-peerinfo.c:224 src/core/gnunet-service-core.c:4703
+#: src/hostlist/hostlist-server.c:556
+#: src/transport/gnunet-service-transport.c:458
+#: src/peerinfo-tool/gnunet-peerinfo.c:208 src/core/gnunet-service-core.c:4607
 #, fuzzy, c-format
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/hostlist/hostlist-server.c:611
+#: src/hostlist/hostlist-server.c:566
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/hostlist/hostlist-server.c:623
+#: src/hostlist/hostlist-server.c:575
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:639
+#: src/hostlist/hostlist-server.c:589
 #, 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:679
+#: src/hostlist/hostlist-server.c:627
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -867,373 +866,369 @@
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:343
+#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:314 src/hostlist/hostlist-client.c:347
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/hostlist/hostlist-client.c:334
+#: src/hostlist/hostlist-client.c:330
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:383 src/hostlist/hostlist-client.c:403
+#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
 #, c-format
 msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:480 src/hostlist/hostlist-client.c:680
-#: src/hostlist/hostlist-client.c:687 src/hostlist/hostlist-client.c:739
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:885
-#: src/hostlist/hostlist-client.c:996 src/hostlist/hostlist-client.c:1002
-#: src/transport/test_plugin_transport_https.c:787
-#: src/transport/test_plugin_transport_https.c:796
-#: src/transport/plugin_transport_http.c:2094
-#: src/transport/plugin_transport_http.c:2103
+#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
+#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
+#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
+#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
+#: src/transport/test_plugin_transport_https.c:829
+#: src/transport/test_plugin_transport_https.c:837
+#: src/transport/plugin_transport_http.c:2059
+#: src/transport/plugin_transport_http.c:2067
+#: src/transport/test_plugin_transport_http.c:795
 #: src/transport/test_plugin_transport_http.c:803
-#: src/transport/test_plugin_transport_http.c:812
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/hostlist/hostlist-client.c:661
+#: src/hostlist/hostlist-client.c:663
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:810
+#: src/hostlist/hostlist-client.c:805
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:827
+#: src/hostlist/hostlist-client.c:822
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:848
+#: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
 msgid "%s failed for `%s' at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/hostlist/hostlist-client.c:857
+#: src/hostlist/hostlist-client.c:848
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/hostlist/hostlist-client.c:864
+#: src/hostlist/hostlist-client.c:856
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
+#: src/hostlist/hostlist-client.c:909
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:926
+#: src/hostlist/hostlist-client.c:917
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1075 src/hostlist/hostlist-client.c:1567
+#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1511
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1084
+#: src/hostlist/hostlist-client.c:1054
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1124
+#: src/hostlist/hostlist-client.c:1092
 msgid "Scheduled saving of hostlists\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1128
+#: src/hostlist/hostlist-client.c:1096
 #, c-format
 msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1151 src/hostlist/hostlist-client.c:1171
+#: src/hostlist/hostlist-client.c:1117 src/hostlist/hostlist-client.c:1133
 #, fuzzy
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1249
 #, c-format
 msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1325
+#: src/hostlist/hostlist-client.c:1280
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/hostlist-client.c:1286
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:1335
+#: src/hostlist/hostlist-client.c:1290
 #, c-format
 msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1344
+#: src/hostlist/hostlist-client.c:1301
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/hostlist-client.c:1378
+#: src/hostlist/hostlist-client.c:1334
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1380
+#: src/hostlist/hostlist-client.c:1336
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1416
+#: src/hostlist/hostlist-client.c:1369
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1429
+#: src/hostlist/hostlist-client.c:1383
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/hostlist-client.c:1436
+#: src/hostlist/hostlist-client.c:1388
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:1464 src/hostlist/hostlist-client.c:1482
+#: src/hostlist/hostlist-client.c:1412 src/hostlist/hostlist-client.c:1429
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1476
+#: src/hostlist/hostlist-client.c:1424
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1533
+#: src/hostlist/hostlist-client.c:1476
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1536
+#: src/hostlist/hostlist-client.c:1479
 #, c-format
 msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1545
+#: src/hostlist/hostlist-client.c:1488
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1557
+#: src/hostlist/hostlist-client.c:1500
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1560
+#: src/hostlist/hostlist-client.c:1504
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:253
+#: src/topology/gnunet-daemon-topology.c:250
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:418
+#: src/topology/gnunet-daemon-topology.c:402
 msgid "# connect requests issued to core"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:718
-#: src/topology/gnunet-daemon-topology.c:832
-#: src/transport/gnunet-service-transport.c:2666
-#: src/transport/gnunet-service-transport.c:2725
+#: src/topology/gnunet-daemon-topology.c:676
+#: src/topology/gnunet-daemon-topology.c:778
+#: src/transport/gnunet-service-transport_neighbours.c:432
+#: src/transport/gnunet-service-transport_neighbours.c:627
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
 
-#: src/topology/gnunet-daemon-topology.c:741
-#: src/topology/gnunet-daemon-topology.c:839
+#: src/topology/gnunet-daemon-topology.c:697
+#: src/topology/gnunet-daemon-topology.c:783
 #, fuzzy
 msgid "# friends connected"
 msgstr "# av anslutna parter"
 
-#: src/topology/gnunet-daemon-topology.c:1059
+#: src/topology/gnunet-daemon-topology.c:977
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1097
+#: src/topology/gnunet-daemon-topology.c:1009
 #, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1110
+#: src/topology/gnunet-daemon-topology.c:1021
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1117
+#: src/topology/gnunet-daemon-topology.c:1027
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1036
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1134
+#: src/topology/gnunet-daemon-topology.c:1044
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1150
+#: src/topology/gnunet-daemon-topology.c:1064
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1161
+#: src/topology/gnunet-daemon-topology.c:1077
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1176
+#: src/topology/gnunet-daemon-topology.c:1087
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1182
+#: src/topology/gnunet-daemon-topology.c:1093
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1193
+#: src/topology/gnunet-daemon-topology.c:1103
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1200
+#: src/topology/gnunet-daemon-topology.c:1109
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1206
+#: src/topology/gnunet-daemon-topology.c:1116
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1247
+#: src/topology/gnunet-daemon-topology.c:1151
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/topology/gnunet-daemon-topology.c:1316
+#: src/topology/gnunet-daemon-topology.c:1208
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1487
+#: src/topology/gnunet-daemon-topology.c:1348
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/statistics/statistics_api.c:325
+#: src/statistics/statistics_api.c:326
 #, fuzzy
 msgid "Failed to connect to statistics service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/statistics/gnunet-statistics.c:94
+#: src/statistics/gnunet-statistics.c:89
 #, fuzzy, c-format
 msgid "Failed to obtain statistics.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:125 src/fs/gnunet-pseudonym.c:172
+#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/statistics/gnunet-statistics.c:162
+#: src/statistics/gnunet-statistics.c:155
 msgid "limit output to statistcs for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:165
+#: src/statistics/gnunet-statistics.c:158
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:168
+#: src/statistics/gnunet-statistics.c:161
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:177
+#: src/statistics/gnunet-statistics.c:168
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
-#: src/statistics/gnunet-service-statistics.c:211
+#: src/statistics/gnunet-service-statistics.c:208
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-service-statistics.c:273
+#: src/statistics/gnunet-service-statistics.c:266
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/util/os_priority.c:116
+#: src/util/os_priority.c:110
 #, c-format
 msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
-#: src/util/os_installation.c:296
+#: src/util/os_installation.c:291
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:482 src/transport/test_transport_api.c:642
-#: src/transport/test_transport_api_reliability.c:655
-#: src/transport/test_transport_api_unreliability.c:700
+#: src/util/os_installation.c:474
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/util/os_installation.c:489 src/transport/test_transport_api.c:649
-#: src/transport/test_transport_api_reliability.c:662
-#: src/transport/test_transport_api_unreliability.c:707
+#: src/util/os_installation.c:479
 #, fuzzy, c-format
 msgid "stat (%s) failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/util/common_logging.c:154 src/util/common_logging.c:492
-#: src/util/test_common_logging.c:76
+#: src/util/common_logging.c:154 src/util/common_logging.c:500
+#: src/util/test_common_logging.c:75
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/common_logging.c:156 src/util/common_logging.c:490
+#: src/util/common_logging.c:156 src/util/common_logging.c:498
 #: src/util/test_common_logging.c:72
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:158 src/util/common_logging.c:488
+#: src/util/common_logging.c:158 src/util/common_logging.c:496
 #: src/util/test_common_logging.c:68
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/common_logging.c:160 src/util/common_logging.c:486
-#: src/util/test_common_logging.c:64
+#: src/util/common_logging.c:160 src/util/common_logging.c:494
+#: src/util/test_common_logging.c:65
 msgid "ERROR"
 msgstr "FEL"
 
@@ -1241,33 +1236,33 @@
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:204 src/dht/plugin_dhtlog_mysql_dump.c:837
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:602
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:635
+#: src/util/common_logging.c:214 src/dht/plugin_dhtlog_mysql_dump.c:909
 #: src/dht/plugin_dhtlog_mysql_dump_load.c:669
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:703
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:737
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:770
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:803
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:836
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:700
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:732
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:764
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:796
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:827
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:858
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:889
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/common_logging.c:321
+#: src/util/common_logging.c:331
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:493
+#: src/util/common_logging.c:501
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:575
+#: src/util/common_logging.c:583
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:615
+#: src/util/common_logging.c:621
 msgid "invalid address"
 msgstr ""
 
@@ -1281,178 +1276,178 @@
 msgid "no-name"
 msgstr "Visa namn"
 
-#: src/util/test_strings.c:42 src/util/strings.c:138
+#: src/util/test_strings.c:42 src/util/strings.c:139
 msgid "b"
 msgstr "b"
 
-#: src/util/test_strings.c:45 src/util/strings.c:144
+#: src/util/test_strings.c:45 src/util/strings.c:145
 msgid "KiB"
 msgstr ""
 
-#: src/util/test_strings.c:48 src/util/strings.c:156
+#: src/util/test_strings.c:48 src/util/strings.c:157
 msgid "TiB"
 msgstr ""
 
-#: src/util/test_strings.c:51 src/util/strings.c:362
+#: src/util/test_strings.c:51 src/util/strings.c:363
 msgid "ms"
 msgstr "ms"
 
-#: src/util/test_strings.c:57 src/util/strings.c:371
+#: src/util/test_strings.c:56 src/util/strings.c:372
 msgid "s"
 msgstr "s"
 
-#: src/util/test_strings.c:63 src/util/strings.c:379
+#: src/util/test_strings.c:61 src/util/strings.c:380
 msgid "h"
 msgstr "h"
 
-#: src/util/connection.c:459
+#: src/util/connection.c:457
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/util/connection.c:475
+#: src/util/connection.c:472
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:647
+#: src/util/connection.c:640
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/connection.c:869 src/util/connection.c:1043
+#: src/util/connection.c:852 src/util/connection.c:1023
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/connection.c:1032
+#: src/util/connection.c:1013
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/util/connection.c:1558
+#: src/util/connection.c:1529
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
 "failed (%p).\n"
 msgstr ""
 
-#: src/util/connection.c:1594
+#: src/util/connection.c:1565
 #, fuzzy, c-format
 msgid "Failed to send to `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/plugin.c:88
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
 
-#: src/util/plugin.c:148
+#: src/util/plugin.c:144
 #, fuzzy, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
-#: src/util/plugin.c:221
+#: src/util/plugin.c:217
 #, fuzzy, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/util/bio.c:136 src/util/bio.c:143
+#: src/util/bio.c:134 src/util/bio.c:140
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/bio.c:144
+#: src/util/bio.c:141
 #, fuzzy
 msgid "End of file"
 msgstr "Läs in en konfigurationsfil"
 
-#: src/util/bio.c:200
+#: src/util/bio.c:193
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:212
+#: src/util/bio.c:203
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:258
+#: src/util/bio.c:248
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:273
+#: src/util/bio.c:262
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/crypto_rsa.c:623 src/util/crypto_rsa.c:673
+#: src/util/crypto_rsa.c:611 src/util/crypto_rsa.c:658
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/crypto_rsa.c:628
+#: src/util/crypto_rsa.c:616
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
 
-#: src/util/crypto_rsa.c:648
+#: src/util/crypto_rsa.c:634
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:677 src/util/crypto_rsa.c:719
+#: src/util/crypto_rsa.c:662 src/util/crypto_rsa.c:698
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:713
+#: src/util/crypto_rsa.c:693
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:734
+#: src/util/crypto_rsa.c:714
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
-#: src/util/crypto_rsa.c:754
+#: src/util/crypto_rsa.c:732
 #, fuzzy, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr "Anrop till \"%s\" med nyckel \"%s\".\n"
 
-#: src/util/crypto_rsa.c:978
+#: src/util/crypto_rsa.c:953
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/server.c:389
+#: src/util/server.c:384
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/server.c:399
+#: src/util/server.c:392
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/util/server.c:405
+#: src/util/server.c:397
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/util/server.c:627
+#: src/util/server.c:612
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/network.c:1088
+#: src/util/network.c:1193
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -1463,7 +1458,7 @@
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:264
+#: src/util/crypto_random.c:263
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
@@ -1473,141 +1468,146 @@
 msgid "Got IP address `%s' for our host.\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:146 src/util/resolver_api.c:914
+#: src/util/test_resolver_api.c:147 src/util/resolver_api.c:873
 #, c-format
 msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:152
+#: src/util/test_resolver_api.c:154
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s %u\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/test_resolver_api.c:259
+#: src/util/test_resolver_api.c:264
 #, c-format
 msgid "gethostbyname() could not lookup IP address: %s\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:318
+#: src/util/test_resolver_api.c:329
 #, c-format
 msgid "gethostbyaddr() could not lookup hostname: %s\n"
 msgstr ""
 
-#: src/util/configuration.c:246
+#: src/util/configuration.c:244
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/configuration.c:810
+#: src/util/configuration.c:801
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:89
+#: src/util/gnunet-resolver.c:76
 msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/client.c:311
+#: src/util/client.c:304
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:319
+#: src/util/client.c:312
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:679
+#: src/util/client.c:669
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:728
+#: src/util/client.c:729 src/util/service.c:880
+#, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr ""
+
+#: src/util/client.c:871
 #, fuzzy, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/util/client.c:744
+#: src/util/client.c:887
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/util/client.c:1017
+#: src/util/client.c:1158
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/scheduler.c:791
+#: src/util/scheduler.c:859
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:922
+#: src/util/scheduler.c:990
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/strings.c:148
+#: src/util/strings.c:149
 msgid "MiB"
 msgstr ""
 
-#: src/util/strings.c:152
+#: src/util/strings.c:153
 msgid "GiB"
 msgstr ""
 
-#: src/util/strings.c:191
+#: src/util/strings.c:193
 #, c-format
 msgid "Character set requested was `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:268
+#: src/util/strings.c:271
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:367
+#: src/util/strings.c:368
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:375
+#: src/util/strings.c:376
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:383
+#: src/util/strings.c:384
 msgid " days"
 msgstr " dagar"
 
-#: src/util/strings.c:407
+#: src/util/strings.c:408
 msgid "end of time"
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/disk.c:418
+#: src/util/disk.c:429
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/disk.c:781
+#: src/util/disk.c:829
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/disk.c:1134 src/util/service.c:1510
+#: src/util/disk.c:1180 src/util/service.c:1456
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/util/disk.c:1438
+#: src/util/disk.c:1486
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/util/resolver_api.c:199
+#: src/util/resolver_api.c:198
 #, fuzzy, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
 
-#: src/util/resolver_api.c:219
+#: src/util/resolver_api.c:217
 #, fuzzy, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
@@ -1615,32 +1615,32 @@
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/util/resolver_api.c:363
+#: src/util/resolver_api.c:354
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:367
+#: src/util/resolver_api.c:358
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/resolver_api.c:441
+#: src/util/resolver_api.c:427
 #, c-format
 msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:827
+#: src/util/resolver_api.c:789
 #, c-format
 msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:920
+#: src/util/resolver_api.c:879
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/resolver_api.c:953
+#: src/util/resolver_api.c:911
 #, c-format
 msgid "Resolving our hostname `%s'\n"
 msgstr ""
@@ -1650,18 +1650,18 @@
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/gnunet-service-resolver.c:318
-#: src/util/gnunet-service-resolver.c:367
+#: src/util/gnunet-service-resolver.c:317
+#: src/util/gnunet-service-resolver.c:362
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:469
+#: src/util/gnunet-service-resolver.c:460
 #, c-format
 msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:516
+#: src/util/gnunet-service-resolver.c:508
 #, c-format
 msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
@@ -1671,62 +1671,62 @@
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/util/getopt.c:693
+#: src/util/getopt.c:692
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: flagga \"--%s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:699
+#: src/util/getopt.c:697
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: flagga \"%c%s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:718 src/util/getopt.c:887
+#: src/util/getopt.c:714 src/util/getopt.c:882
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: flagga \"%s\" kräver ett argument\n"
 
-#: src/util/getopt.c:747
+#: src/util/getopt.c:743
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: okänd flagga \"--%s\"\n"
 
-#: src/util/getopt.c:751
+#: src/util/getopt.c:747
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: okänd flagga \"%c%s\"\n"
 
-#: src/util/getopt.c:776
+#: src/util/getopt.c:772
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: otillåten flagga -- %c\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:774
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: ogiltig flagga -- %c\n"
 
-#: src/util/getopt.c:806 src/util/getopt.c:936
+#: src/util/getopt.c:802 src/util/getopt.c:930
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: flagga kräver ett argument -- %c\n"
 
-#: src/util/getopt.c:854
+#: src/util/getopt.c:850
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: flagga \"-W %s\" är tvetydig\n"
 
-#: src/util/getopt.c:872
+#: src/util/getopt.c:868
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: flagga \"-W %s\" tillåter inte ett argument\n"
 
-#: src/util/getopt.c:1041
+#: src/util/getopt.c:1034
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "Använd --help för att få en lista på flaggor.\n"
 
-#: src/util/signal.c:77
+#: src/util/signal.c:78
 #, fuzzy, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr "Anrop till \"%s\" returnerade %d.\n"
@@ -1739,142 +1739,137 @@
 "Argument som är obligatoriska för långa flaggor är också obligatoriska för "
 "korta flaggor.\n"
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:284
+#: src/util/getopt_helpers.c:254 src/util/getopt_helpers.c:282
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/service.c:114 src/util/service.c:142 src/util/service.c:188
-#: src/util/service.c:212 src/util/service.c:219
+#: src/util/service.c:112 src/util/service.c:138 src/util/service.c:182
+#: src/util/service.c:202 src/util/service.c:209
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/service.c:171
+#: src/util/service.c:165
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
 
-#: src/util/service.c:268
+#: src/util/service.c:258
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/util/service.c:304
+#: src/util/service.c:292
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/util/service.c:336
+#: src/util/service.c:323
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
 
-#: src/util/service.c:649
+#: src/util/service.c:627
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:656
+#: src/util/service.c:632
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/util/service.c:662
+#: src/util/service.c:639
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:707
+#: src/util/service.c:683
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:735
+#: src/util/service.c:712
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:857
+#: src/util/service.c:829
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:881 src/transport/plugin_transport_tcp.c:2048
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1927
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/service.c:915
+#: src/util/service.c:900
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/service.c:936
-#, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:953
+#: src/util/service.c:917
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:985
+#: src/util/service.c:947
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/service.c:1003
+#: src/util/service.c:965
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/util/service.c:1163 src/util/service.c:1182
+#: src/util/service.c:1121 src/util/service.c:1139
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1211
+#: src/util/service.c:1166
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1367
+#: src/util/service.c:1315
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/service.c:1402
+#: src/util/service.c:1349
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/util/service.c:1450
+#: src/util/service.c:1397
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1455
+#: src/util/service.c:1401
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1459
+#: src/util/service.c:1405
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1511
+#: src/util/service.c:1457
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1525
+#: src/util/service.c:1471
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/util/service.c:1585
+#: src/util/service.c:1534
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -1883,71 +1878,71 @@
 msgid "`%' must be followed by HEX number"
 msgstr ""
 
-#: src/fs/fs_uri.c:275
+#: src/fs/fs_uri.c:273
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:293
+#: src/fs/fs_uri.c:291
 msgid "`++' not allowed in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:300
+#: src/fs/fs_uri.c:298
 msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:370 src/fs/fs_uri.c:377
+#: src/fs/fs_uri.c:366 src/fs/fs_uri.c:373
 msgid "Malformed SKS URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:421 src/fs/fs_uri.c:441
+#: src/fs/fs_uri.c:417 src/fs/fs_uri.c:432
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:572 src/fs/fs_uri.c:592 src/fs/fs_uri.c:602
-#: src/fs/fs_uri.c:631
+#: src/fs/fs_uri.c:562 src/fs/fs_uri.c:577 src/fs/fs_uri.c:587
+#: src/fs/fs_uri.c:615
 msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:611
+#: src/fs/fs_uri.c:597
 msgid "SKS URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:617
+#: src/fs/fs_uri.c:603
 msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:625
+#: src/fs/fs_uri.c:609
 msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:636
+#: src/fs/fs_uri.c:622
 msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:649
+#: src/fs/fs_uri.c:634
 msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:688
+#: src/fs/fs_uri.c:672
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:923
+#: src/fs/fs_uri.c:897
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/fs/fs_uri.c:930
+#: src/fs/fs_uri.c:904
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/fs/fs_uri.c:1248 src/fs/fs_uri.c:1275
+#: src/fs/fs_uri.c:1212 src/fs/fs_uri.c:1239
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1281
+#: src/fs/fs_uri.c:1245
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -1956,467 +1951,487 @@
 msgid "Failed to receive response for `%s' request from `%s' service.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/fs/fs_list_indexed.c:119
+#: src/fs/fs_list_indexed.c:117
 #, fuzzy, c-format
 msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/fs/fs_list_indexed.c:176
+#: src/fs/fs_list_indexed.c:164
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-service-fs_lc.c:207 src/fs/gnunet-service-fs_lc.c:377
-#: src/fs/gnunet-service-fs_lc.c:519
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
+#: src/fs/gnunet-service-fs_lc.c:480
 #, fuzzy
 msgid "# client searches active"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_lc.c:262
+#: src/fs/gnunet-service-fs_lc.c:254
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:323
+#: src/fs/gnunet-service-fs_lc.c:312
 #, fuzzy
 msgid "# client searches received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_lc.c:367
+#: src/fs/gnunet-service-fs_lc.c:351
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/fs_publish.c:152 src/fs/fs_publish.c:462
+#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:740 src/fs/fs_publish.c:756 src/fs/fs_publish.c:797
-#: src/fs/fs_publish.c:816 src/fs/fs_publish.c:846 src/fs/fs_publish.c:1020
+#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
+#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/fs/fs_publish.c:742
+#: src/fs/fs_publish.c:649
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:754
+#: src/fs/fs_publish.c:661
 #, fuzzy
 msgid "unknown error"
 msgstr "Okänt fel"
 
-#: src/fs/fs_publish.c:799
+#: src/fs/fs_publish.c:704
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:818
+#: src/fs/fs_publish.c:724
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:848
+#: src/fs/fs_publish.c:751
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:877
+#: src/fs/fs_publish.c:775
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_publish.c:956
+#: src/fs/fs_publish.c:845
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/fs/fs_publish.c:964
+#: src/fs/fs_publish.c:851
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:1022
+#: src/fs/fs_publish.c:899
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1219
+#: src/fs/fs_publish.c:1078
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1295
+#: src/fs/fs_publish.c:1149
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1665
+#: src/fs/fs_publish.c:1482
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:1702 src/fs/fs_namespace.c:890
+#: src/fs/fs_publish.c:1518 src/fs/fs_namespace.c:822
 #, fuzzy
 msgid "Internal error."
 msgstr "Okänt fel.\n"
 
-#: src/fs/gnunet-download.c:104
+#: src/fs/gnunet-download.c:100
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-download.c:113
+#: src/fs/gnunet-download.c:112
 #, c-format
 msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:125
+#: src/fs/gnunet-download.c:121
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-download.c:132
+#: src/fs/gnunet-download.c:129
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Uppladdning vägrades!"
 
-#: src/fs/gnunet-download.c:150 src/fs/gnunet-unindex.c:118
-#: src/fs/gnunet-search.c:199 src/fs/gnunet-publish.c:165
+#: src/fs/gnunet-download.c:144 src/fs/gnunet-unindex.c:109
+#: src/fs/gnunet-search.c:190 src/fs/gnunet-publish.c:155
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:179
+#: src/fs/gnunet-download.c:169
 #, fuzzy, c-format
 msgid "You need to specify a URI argument.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-download.c:187 src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-download.c:175 src/fs/gnunet-publish.c:426
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/gnunet-download.c:197
+#: src/fs/gnunet-download.c:182
 #, c-format
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:205
+#: src/fs/gnunet-download.c:189
 #, c-format
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:224 src/fs/gnunet-unindex.c:158
-#: src/fs/gnunet-search.c:260 src/fs/gnunet-publish.c:469
+#: src/fs/gnunet-download.c:203 src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-search.c:241 src/fs/gnunet-publish.c:404
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-search.c:285
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:273
+#: src/fs/gnunet-download.c:243
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:276 src/fs/gnunet-search.c:316
+#: src/fs/gnunet-download.c:246 src/fs/gnunet-search.c:288
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:279
+#: src/fs/gnunet-download.c:249
 msgid "write the file to FILENAME"
 msgstr "skriv filen till FILNAMN"
 
-#: src/fs/gnunet-download.c:283
+#: src/fs/gnunet-download.c:253
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:287
+#: src/fs/gnunet-download.c:257
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:290
+#: src/fs/gnunet-download.c:260
 msgid "download a GNUnet directory recursively"
 msgstr "hämta en GNUnet-katalog rekursivt"
 
-#: src/fs/gnunet-download.c:293 src/fs/gnunet-unindex.c:191
-#: src/fs/gnunet-search.c:327 src/fs/gnunet-publish.c:684
-#: src/dht/gnunet-dht-get-peer.c:201 src/dht/gnunet-dht-put.c:188
-#: src/dht/gnunet-dht-get.c:214 src/nse/nse-profiler.c:442
+#: src/fs/gnunet-download.c:263 src/fs/gnunet-unindex.c:169
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:585
+#: src/mesh/test_mesh_small.c:674 src/dht/gnunet-dht-get-peer.c:190
+#: src/dht/gnunet-dht-put.c:176 src/dht/gnunet-dht-get.c:204
+#: src/nse/gnunet-nse-profiler.c:655
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:302
+#: src/fs/gnunet-download.c:270
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:93
+#: src/fs/gnunet-unindex.c:89
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:102
+#: src/fs/gnunet-unindex.c:96
 #, fuzzy, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 "\n"
 "Fel vid avindexering av fil: %s\n"
 
-#: src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-unindex.c:101
 #, fuzzy, c-format
 msgid "Unindexing done.\n"
 msgstr "Avindexera filer."
 
-#: src/fs/gnunet-unindex.c:144
+#: src/fs/gnunet-unindex.c:131
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-unindex.c:169
+#: src/fs/gnunet-unindex.c:148
 #, fuzzy, c-format
 msgid "Could not start unindex operation.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/fs/gnunet-unindex.c:200
+#: src/fs/gnunet-unindex.c:176
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/fs_namespace.c:54 src/fs/fs_namespace.c:83
+#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s' in section `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/fs/fs_namespace.c:117
+#: src/fs/fs_namespace.c:107
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_namespace.c:146 src/fs/fs_namespace.c:239
+#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:449 src/fs/fs_namespace.c:471
+#: src/fs/fs_namespace.c:323
 #, fuzzy
+msgid "Unknown error"
+msgstr "Okänt fel"
+
+#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
+#, fuzzy
 msgid "Failed to serialize meta data"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_namespace.c:489
+#: src/fs/fs_namespace.c:452
 #, fuzzy
 msgid "Failed to connect to datastore service"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_namespace.c:537
+#: src/fs/fs_namespace.c:495
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_namespace.c:642
+#: src/fs/fs_namespace.c:597
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:943
+#: src/fs/fs_namespace.c:866
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/gnunet-pseudonym.c:192
+#: src/fs/gnunet-pseudonym.c:165
 #, fuzzy, c-format
 msgid "Namespace `%s' unknown.\n"
 msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
 
-#: src/fs/gnunet-pseudonym.c:284 src/fs/gnunet-pseudonym.c:291
-#: src/fs/gnunet-pseudonym.c:293
+#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
+#: src/fs/gnunet-pseudonym.c:249
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/fs/gnunet-pseudonym.c:313 src/fs/gnunet-publish.c:630
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:532
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:317
+#: src/fs/gnunet-pseudonym.c:272
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:321
+#: src/fs/gnunet-pseudonym.c:275
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:325
+#: src/fs/gnunet-pseudonym.c:278
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:329 src/fs/gnunet-publish.c:650
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:551
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:332
+#: src/fs/gnunet-pseudonym.c:285
 msgid "print names of local namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:335
+#: src/fs/gnunet-pseudonym.c:288
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:338
+#: src/fs/gnunet-pseudonym.c:291
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:341 src/fs/gnunet-publish.c:669
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:570
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:345
+#: src/fs/gnunet-pseudonym.c:297
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-pseudonym.c:349
+#: src/fs/gnunet-pseudonym.c:300
 msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:359
+#: src/fs/gnunet-pseudonym.c:308
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-search.c:117
+#: src/fs/gnunet-search.c:111
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:188
+#: src/fs/gnunet-search.c:181
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/fs/gnunet-search.c:246
+#: src/fs/gnunet-search.c:231
 #, fuzzy, c-format
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-search.c:280
+#: src/fs/gnunet-search.c:255
 #, fuzzy, c-format
 msgid "Could not start searching.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-search.c:320
+#: src/fs/gnunet-search.c:291
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:324
+#: src/fs/gnunet-search.c:294
 msgid "automatically terminate search after VALUE ms"
 msgstr ""
 
-#: src/fs/gnunet-search.c:336
+#: src/fs/gnunet-search.c:301
+msgid "automatically terminate search after VALUE results are found"
+msgstr ""
+
+#: src/fs/gnunet-search.c:308
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/fs_unindex.c:64
+#: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:72
+#: src/fs/fs_unindex.c:63
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_unindex.c:261
+#: src/fs/fs_unindex.c:235
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:269
+#: src/fs/fs_unindex.c:243
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:277
+#: src/fs/fs_unindex.c:251
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
 
-#: src/fs/fs_unindex.c:328
+#: src/fs/fs_unindex.c:296
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:363
+#: src/fs/fs_unindex.c:331
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/fs_unindex.c:376
+#: src/fs/fs_unindex.c:344
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:414
+#: src/fs/fs_unindex.c:378
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/gnunet-directory.c:53
+#: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:100
+#: src/fs/gnunet-directory.c:94
 #, fuzzy, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr "==> Katalog \"%s\":\n"
 
-#: src/fs/gnunet-directory.c:106
+#: src/fs/gnunet-directory.c:97
 #, fuzzy, c-format
 msgid "Directory `%s' contents:\n"
 msgstr "==> Katalog \"%s\":\n"
 
-#: src/fs/gnunet-directory.c:147
+#: src/fs/gnunet-directory.c:132
 #, fuzzy, c-format
 msgid "You must specify a filename to inspect."
 msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/fs/gnunet-directory.c:163
+#: src/fs/gnunet-directory.c:145
 #, fuzzy, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-directory.c:203
+#: src/fs/gnunet-directory.c:176
 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
 # drive = hard drive ?
-#: src/fs/fs_file_information.c:362
+#: src/fs/fs_file_information.c:349
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s': %s"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/fs/fs_test_lib.c:282
+#: src/fs/fs_test_lib.c:269
 #, fuzzy, c-format
 msgid "Failed to start daemon: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:158
+#: src/fs/gnunet-service-fs_pe.c:228
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:241
+#: src/fs/gnunet-service-fs_pe.c:334
 msgid "# queries messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:354 src/fs/gnunet-service-fs_pe.c:423
-#: src/fs/gnunet-service-fs_pe.c:455
+#: src/fs/gnunet-service-fs_pe.c:457
+#, fuzzy
+msgid "# requests merged"
+msgstr "# byte mottogs via TCP"
+
+#: src/fs/gnunet-service-fs_pe.c:463
+#, fuzzy
+msgid "# requests refreshed"
+msgstr "# byte mottogs via TCP"
+
+#: src/fs/gnunet-service-fs_pe.c:511 src/fs/gnunet-service-fs_pe.c:586
+#: src/fs/gnunet-service-fs_pe.c:622
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/fs_getopt.c:202
+#: src/fs/fs_getopt.c:191
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2428,814 +2443,827 @@
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/fs/gnunet-publish.c:118
+#: src/fs/gnunet-publish.c:115
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:128
+#: src/fs/gnunet-publish.c:123
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-publish.c:141
+#: src/fs/gnunet-publish.c:134
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:145
+#: src/fs/gnunet-publish.c:138
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:292
+#: src/fs/gnunet-publish.c:265
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:267
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/fs/gnunet-publish.c:358
+#: src/fs/gnunet-publish.c:312
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-publish.c:411
+#: src/fs/gnunet-publish.c:354
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:419
+#: src/fs/gnunet-publish.c:361
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:425
+#: src/fs/gnunet-publish.c:367
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:434
+#: src/fs/gnunet-publish.c:375
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/fs/gnunet-publish.c:445 src/fs/gnunet-publish.c:453
+#: src/fs/gnunet-publish.c:385 src/fs/gnunet-publish.c:392
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:482
+#: src/fs/gnunet-publish.c:414
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-publish.c:536
+#: src/fs/gnunet-publish.c:459
 #, fuzzy, c-format
 msgid "Could not access file: %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:573
+#: src/fs/gnunet-publish.c:484
 #, fuzzy, c-format
 msgid "Could not publish `%s': %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:507
 #, fuzzy, c-format
 msgid "Could not start publishing.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:634
+#: src/fs/gnunet-publish.c:536
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:638
+#: src/fs/gnunet-publish.c:539
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:642
+#: src/fs/gnunet-publish.c:543
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:646
+#: src/fs/gnunet-publish.c:547
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:653
+#: src/fs/gnunet-publish.c:554
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:559
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:662
+#: src/fs/gnunet-publish.c:563
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-publish.c:666
+#: src/fs/gnunet-publish.c:567
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-publish.c:573
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:676
+#: src/fs/gnunet-publish.c:577
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:680
+#: src/fs/gnunet-publish.c:581
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:594
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_directory.c:209 src/fs/fs_directory.c:221
+#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
 #, fuzzy
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/gnunet-service-fs_cp.c:726
+#: src/fs/gnunet-service-fs_cp.c:693
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:765
+#: src/fs/gnunet-service-fs_cp.c:728
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:773
+#: src/fs/gnunet-service-fs_cp.c:734
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:806 src/fs/gnunet-service-fs_cp.c:936
-#: src/fs/gnunet-service-fs_cp.c:1367 src/fs/gnunet-service-fs_cp.c:1414
+#: src/fs/gnunet-service-fs_cp.c:763 src/fs/gnunet-service-fs_cp.c:879
+#: src/fs/gnunet-service-fs_cp.c:1289 src/fs/gnunet-service-fs_cp.c:1326
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:889
+#: src/fs/gnunet-service-fs_cp.c:836
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:959
+#: src/fs/gnunet-service-fs_cp.c:899
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:974
+#: src/fs/gnunet-service-fs_cp.c:913
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1019
+#: src/fs/gnunet-service-fs_cp.c:951
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1087
+#: src/fs/gnunet-service-fs_cp.c:1018
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1112
+#: src/fs/gnunet-service-fs_cp.c:1042
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1122
+#: src/fs/gnunet-service-fs_cp.c:1052
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1201
+#: src/fs/gnunet-service-fs_cp.c:1131
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1236
+#: src/fs/gnunet-service-fs_cp.c:1165
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1260
+#: src/fs/gnunet-service-fs_cp.c:1189
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1329
+#: src/fs/gnunet-service-fs_cp.c:1255
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1360
+#: src/fs/gnunet-service-fs_cp.c:1283
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1410
+#: src/fs/gnunet-service-fs_cp.c:1324
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/fs_download.c:332
+#: src/fs/fs_download.c:309
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:354
+#: src/fs/fs_download.c:329
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:536 src/fs/fs_download.c:554
+#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:872
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_download.c:1070
+#: src/fs/fs_download.c:958
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1108
+#: src/fs/fs_download.c:985
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1133
+#: src/fs/fs_download.c:1008
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_download.c:1149
+#: src/fs/fs_download.c:1020
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1161
+#: src/fs/fs_download.c:1029
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_download.c:2017
+#: src/fs/fs_download.c:1826
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ogiltiga argument: "
 
-#: src/fs/gnunet-service-fs_indexing.c:116
-#: src/fs/gnunet-service-fs_indexing.c:177
+#: src/fs/gnunet-service-fs_indexing.c:113
+#: src/fs/gnunet-service-fs_indexing.c:163
 #, fuzzy, c-format
 msgid "Configuration option `%s' in section `%s' missing.\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:125
-#: src/fs/gnunet-service-fs_indexing.c:192
+#: src/fs/gnunet-service-fs_indexing.c:121
+#: src/fs/gnunet-service-fs_indexing.c:177
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:147
+#: src/fs/gnunet-service-fs_indexing.c:137
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/fs/gnunet-service-fs_indexing.c:252
+#: src/fs/gnunet-service-fs_indexing.c:228
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:297
+#: src/fs/gnunet-service-fs_indexing.c:266
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:548
+#: src/fs/gnunet-service-fs_indexing.c:487
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:628
+#: src/fs/gnunet-service-fs_indexing.c:552
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:632
+#: src/fs/gnunet-service-fs_indexing.c:554
 #, fuzzy
 msgid "not indexed"
 msgstr "Avindexering misslyckades."
 
-#: src/fs/gnunet-service-fs_indexing.c:663
+#: src/fs/gnunet-service-fs_indexing.c:569
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
 
-#: src/fs/fs_search.c:859
+#: src/fs/fs_search.c:798
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:388 src/fs/gnunet-service-fs_pr.c:633
+#: src/fs/gnunet-service-fs_pr.c:300
+#, fuzzy
+msgid "# Pending requests created"
+msgstr "# byte mottogs via TCP"
+
+#: src/fs/gnunet-service-fs_pr.c:379 src/fs/gnunet-service-fs_pr.c:638
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:769
+#: src/fs/gnunet-service-fs_pr.c:802
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_pr.c:802
+#: src/fs/gnunet-service-fs_pr.c:829
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:821
+#: src/fs/gnunet-service-fs_pr.c:845
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:838
+#: src/fs/gnunet-service-fs_pr.c:860
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:937
+#: src/fs/gnunet-service-fs_pr.c:952
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:962
+#: src/fs/gnunet-service-fs_pr.c:979
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:999
+#: src/fs/gnunet-service-fs_pr.c:1012
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1101
+#: src/fs/gnunet-service-fs_pr.c:1102
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1122
+#: src/fs/gnunet-service-fs_pr.c:1123
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1172
+#: src/fs/gnunet-service-fs_pr.c:1170
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1186
+#: src/fs/gnunet-service-fs_pr.c:1184
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1195
+#: src/fs/gnunet-service-fs_pr.c:1193
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1209
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1230
+#: src/fs/gnunet-service-fs_pr.c:1226
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1239
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1250
+#: src/fs/gnunet-service-fs_pr.c:1244
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1275 src/fs/gnunet-service-fs_pr.c:1323
-#: src/fs/gnunet-service-fs_pr.c:1442
+#: src/fs/gnunet-service-fs_pr.c:1270 src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1426
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1342
+#: src/fs/gnunet-service-fs_pr.c:1329
 msgid "# Datastore lookups concluded (found ultimate result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1356
+#: src/fs/gnunet-service-fs_pr.c:1342
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1421
+#: src/fs/gnunet-service-fs_pr.c:1404
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1487
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1576
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/fs/fs.c:313
+#: src/fs/fs.c:284
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs.c:324
+#: src/fs/fs.c:293
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs.c:332
+#: src/fs/fs.c:299
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs.c:967
+#: src/fs/fs.c:877
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs.c:1445
+#: src/fs/fs.c:1323
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs.c:1491
+#: src/fs/fs.c:1364
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1510
+#: src/fs/fs.c:1380
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs.c:2166
+#: src/fs/fs.c:1984
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2179
+#: src/fs/fs.c:1994
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs.c:2308 src/fs/fs.c:2570
+#: src/fs/fs.c:2107 src/fs/fs.c:2346
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs.c:2331
+#: src/fs/fs.c:2124
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs.c:2347 src/fs/fs.c:2368 src/fs/fs.c:2881
+#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2555
+#: src/fs/fs.c:2337
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs.c:2831
+#: src/fs/fs.c:2583
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs.c:2924
+#: src/fs/fs.c:2669
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:682
+#: src/fs/gnunet-service-fs_push.c:642
 #, c-format
 msgid ""
 "Invalid value specified for option `%s' in section `%s', content pushing "
 "disabled\n"
 msgstr ""
 
-#: src/block/plugin_block_fs.c:138
+#: src/block/plugin_block_fs.c:128
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:105
+#: src/block/plugin_block_dht.c:99
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/block/plugin_block_dht.c:114
+#: src/block/plugin_block_dht.c:106
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:126
+#: src/block/plugin_block_dht.c:115
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/block/block.c:113
+#: src/block/block.c:108
 #, fuzzy, c-format
 msgid "Loading block plugins `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/block/block.c:122
+#: src/block/block.c:118
 #, fuzzy, c-format
 msgid "Failed to load block plugin `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:953
+#: src/mesh/test_mesh_small.c:687
+msgid "Test mesh in a small network."
+msgstr ""
+
+#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:859
 #, fuzzy
 msgid "Failed to transmit shutdown ACK.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/mockup-service.c:47 src/arm/gnunet-service-arm.c:959
+#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:864
 msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:71 src/arm/gnunet-service-arm.c:987
+#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:892
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:200
+#: src/arm/gnunet-service-arm.c:206
 #, c-format
 msgid "Restarting service `%s' due to configuration file change.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:229
+#: src/arm/gnunet-service-arm.c:234
 #, fuzzy
 msgid "Could not send status result to client\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/arm/gnunet-service-arm.c:266
+#: src/arm/gnunet-service-arm.c:268
 msgid "Not sending status result to client: no client known\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:428
+#: src/arm/gnunet-service-arm.c:406
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-service-arm.c:432
+#: src/arm/gnunet-service-arm.c:409
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:460
+#: src/arm/gnunet-service-arm.c:435
 #, c-format
 msgid "ARM is shutting down, service `%s' not started.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:469
+#: src/arm/gnunet-service-arm.c:443
 #, c-format
 msgid "Service `%s' already running.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:480
+#: src/arm/gnunet-service-arm.c:453
 #, c-format
 msgid "Binary implementing service `%s' not known!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:493
+#: src/arm/gnunet-service-arm.c:464
 #, fuzzy, c-format
 msgid "Configuration file `%s' for service `%s' not known!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/arm/gnunet-service-arm.c:531
+#: src/arm/gnunet-service-arm.c:498
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:727
+#: src/arm/gnunet-service-arm.c:665
 msgid "Stopping all services\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:785
+#: src/arm/gnunet-service-arm.c:717
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:869
+#: src/arm/gnunet-service-arm.c:790
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:874
+#: src/arm/gnunet-service-arm.c:795
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:879
+#: src/arm/gnunet-service-arm.c:800
 #, fuzzy
 msgid "unknown"
 msgstr "Okänt fel"
 
-#: src/arm/gnunet-service-arm.c:891
+#: src/arm/gnunet-service-arm.c:807
 #, fuzzy, c-format
 msgid "Service `%s' stopped\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-service-arm.c:905
+#: src/arm/gnunet-service-arm.c:821
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:156
+#: src/arm/gnunet-arm.c:161
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-arm.c:160
+#: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
 msgid "Failed to stop service `%s'!\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:166
+#: src/arm/gnunet-arm.c:171
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-arm.c:170
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Failed to start service `%s'!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:181
 #, fuzzy, c-format
 msgid "Some error communicating with service `%s'.\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:203
+#: src/arm/gnunet-arm.c:207
 #, c-format
 msgid "Service `%s' is running.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:208
+#: src/arm/gnunet-arm.c:212
 #, fuzzy, c-format
 msgid "Service `%s' is not running.\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:235
+#: src/arm/gnunet-arm.c:238
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:244 src/arm/gnunet-arm.c:338
+#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:265
+#: src/arm/gnunet-arm.c:269
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/arm/gnunet-arm.c:271
+#: src/arm/gnunet-arm.c:275
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:387
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:389
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:371
+#: src/arm/gnunet-arm.c:391
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:373
+#: src/arm/gnunet-arm.c:393
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:375
+#: src/arm/gnunet-arm.c:396
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:378
+#: src/arm/gnunet-arm.c:399
 msgid "test if a particular service is running"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:380
+#: src/arm/gnunet-arm.c:402
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:382
+#: src/arm/gnunet-arm.c:404
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:391
+#: src/arm/gnunet-arm.c:407
+msgid "timeout for completing current operation"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:418
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:820
+#: src/arm/gnunet-service-arm_interceptor.c:803
 #, c-format
 msgid "Unable to forward to service `%s': shutdown\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:828
+#: src/arm/gnunet-service-arm_interceptor.c:812
 #, c-format
 msgid "Unable to forward to service `%s': timeout before connect\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:895
+#: src/arm/gnunet-service-arm_interceptor.c:868
 #, fuzzy, c-format
 msgid "Unable to start service `%s': %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/arm/gnunet-service-arm_interceptor.c:964
+#: src/arm/gnunet-service-arm_interceptor.c:936
 #, fuzzy, c-format
 msgid "Unable to accept connection for service `%s': %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/arm/gnunet-service-arm_interceptor.c:982
+#: src/arm/gnunet-service-arm_interceptor.c:952
 #, fuzzy, c-format
 msgid "Service `%s' started\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:1112
+#: src/arm/gnunet-service-arm_interceptor.c:1080
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/arm/gnunet-service-arm_interceptor.c:1134
+#: src/arm/gnunet-service-arm_interceptor.c:1102
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1151
+#: src/arm/gnunet-service-arm_interceptor.c:1116
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:203 src/arm/test_exponential_backoff.c:194
+#: src/arm/arm_api.c:201 src/arm/test_exponential_backoff.c:192
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:399
+#: src/arm/arm_api.c:390
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 
-#: src/arm/arm_api.c:414
+#: src/arm/arm_api.c:405
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/arm/arm_api.c:495
+#: src/arm/arm_api.c:469
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:568
+#: src/arm/arm_api.c:539
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:569
+#: src/arm/arm_api.c:540
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:593
+#: src/arm/arm_api.c:563
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:594
+#: src/arm/arm_api.c:566
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:626 src/arm/arm_api.c:630
+#: src/arm/arm_api.c:598 src/arm/arm_api.c:602
 #, fuzzy, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr "\"%s\": Mottog inte meddelande inom %llu ms.\n"
 
-#: src/arm/arm_api.c:701
+#: src/arm/arm_api.c:675
 #, fuzzy, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr "Inget svar mottaget inom %llums.\n"
 
-#: src/dht/dhtlog.c:57
+#: src/dht/dhtlog.c:56
 #, c-format
 msgid "Loading `%s' dhtlog plugin\n"
 msgstr ""
@@ -3245,1245 +3273,1010 @@
 msgid "Failed to load dhtlog plugin for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:823
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:588
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:621
+#: src/dht/plugin_dhtlog_mysql_dump.c:895
 #: src/dht/plugin_dhtlog_mysql_dump_load.c:655
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:689
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:723
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:756
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:789
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:822
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:686
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:718
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:750
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:782
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:813
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:844
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:875
 #, fuzzy, c-format
 msgid "Failed to get full path for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:852
+#: src/dht/plugin_dhtlog_mysql_dump.c:924
 #, fuzzy
 msgid "Failed to create file for dhtlog.\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/dht/gnunet-dht-get-peer.c:86
+#: src/dht/gnunet-dht-get-peer.c:84
 #, c-format
 msgid "Found %u peers\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:121
+#: src/dht/gnunet-dht-get-peer.c:115
 #, fuzzy, c-format
 msgid "Found peer `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/dht/gnunet-dht-get-peer.c:195 src/dht/gnunet-dht-put.c:173
-#: src/dht/gnunet-dht-get.c:205
+#: src/dht/gnunet-dht-get-peer.c:184 src/dht/gnunet-dht-put.c:161
+#: src/dht/gnunet-dht-get.c:195
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:198 src/dht/gnunet-dht-put.c:182
-#: src/dht/gnunet-dht-get.c:211
+#: src/dht/gnunet-dht-get-peer.c:187 src/dht/gnunet-dht-put.c:170
+#: src/dht/gnunet-dht-get.c:201
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:222
+#: src/dht/gnunet-dht-get-peer.c:209
 msgid "Issue a GET PEER request to the GNUnet DHT, print results."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:96
+#: src/dht/gnunet-dht-put.c:95
 #, c-format
 msgid "PUT request sent!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:119
 #, c-format
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:130
+#: src/dht/gnunet-dht-put.c:127
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-put.c:137
+#: src/dht/gnunet-dht-put.c:132
 #, fuzzy, c-format
 msgid "Connected to %s service!\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/dht/gnunet-dht-put.c:153
+#: src/dht/gnunet-dht-put.c:147
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:176
+#: src/dht/gnunet-dht-put.c:164
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:179
+#: src/dht/gnunet-dht-put.c:167
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:185
+#: src/dht/gnunet-dht-put.c:173
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:209
+#: src/dht/gnunet-dht-put.c:195
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:208
+#: src/dht/gnunet-dht-get.c:198
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:235
+#: src/dht/gnunet-dht-get.c:223
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/dht_api.c:238
+#: src/dht/dht_api.c:235
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/plugin_dhtlog_mysql.c:1592
+#: src/dht/plugin_dhtlog_mysql.c:1550
 msgid "Failed to initialize MySQL database connection for dhtlog.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:196
-#: src/transport/test_plugin_transport_https.c:1194
-#: src/transport/test_plugin_transport.c:213
-#: src/transport/gnunet-service-transport.c:6586
-#: src/transport/test_plugin_transport_http.c:1277
+#: src/transport/test_plugin_transport_udp.c:185
+#: src/transport/test_plugin_transport_https.c:1271
+#: src/transport/test_plugin_transport.c:202
+#: src/transport/gnunet-service-transport.c:435
+#: src/transport/test_plugin_transport_http.c:1232
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:207
-#: src/transport/test_plugin_transport_https.c:1260
-#: src/transport/test_plugin_transport.c:224
-#: src/transport/gnunet-service-transport.c:6621
-#: src/transport/test_plugin_transport_http.c:1303
+#: src/transport/test_plugin_transport_udp.c:195
+#: src/transport/test_plugin_transport_https.c:1335
+#: src/transport/test_plugin_transport.c:212
+#: src/transport/gnunet-service-transport.c:444
+#: src/transport/test_plugin_transport_http.c:1255
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:217
+#: src/transport/test_plugin_transport_udp.c:205
 #, fuzzy
 msgid "Loading udp transport plugin\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/test_plugin_transport_udp.c:225
+#: src/transport/test_plugin_transport_udp.c:213
 #, fuzzy
 msgid "Failed to load transport plugin for udp\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/plugin_transport_wlan.c:1574
-#: src/transport/plugin_transport_wlan.c:1629
-#: src/transport/plugin_transport_wlan.c:1810
+#: src/transport/plugin_transport_wlan.c:1422
+#: src/transport/plugin_transport_wlan.c:1617
+#: src/transport/plugin_transport_wlan.c:1736
 #, c-format
 msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1955
+#: src/transport/plugin_transport_wlan.c:1854
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3213
+#: src/transport/plugin_transport_wlan.c:2710
 #, c-format
 msgid "Finished reading from wlan-helper stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:406
+#: src/transport/gnunet-service-transport_clients.c:246
+#, c-format
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:251
+msgid "# messages dropped due to slow client"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:394
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:511
+#, fuzzy
+msgid "# bytes payload received for other peers"
+msgstr "# byte mottagna av typen %d"
+
+#: src/transport/gnunet-service-transport_clients.c:528
+msgid "# bytes payload dropped (other peer was not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:579
+#, fuzzy
+msgid "# REQUEST CONNECT messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/gnunet-service-transport_clients.c:607
+#, fuzzy
+msgid "# SET QUOTA messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/gnunet-service-transport_neighbours.c:776
+msgid "# messages not sent (no such peer or not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:796
+msgid "# bytes in message queue for other peers"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:864
+msgid "# bandwidth quota violations by other peers"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:882
+msgid "# ms throttling suggested"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:907
+msgid "# KEEPALIVE messages discarded (not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:937
+msgid "# SET QUOTA messages ignored (no such peer)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:949
+msgid "# disconnects due to quota of 0"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:108
+msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:115
+#, fuzzy, c-format
+msgid "Starting transport plugins `%s'\n"
+msgstr "Testar transport(er) %s\n"
+
+#: src/transport/gnunet-service-transport_plugins.c:119
+#, fuzzy, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr "Testar transport(er) %s\n"
+
+#: src/transport/gnunet-service-transport_plugins.c:139
+#, fuzzy, c-format
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/transport/test_plugin_transport_https.c:409
 msgid "Phase 0: Test plugin functions failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:411
+#: src/transport/test_plugin_transport_https.c:418
 msgid "Phase 1: Test connect with wrong data failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:416
+#: src/transport/test_plugin_transport_https.c:427
 msgid "Phase 2: Test session selection failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:421
+#: src/transport/test_plugin_transport_https.c:435
 msgid "Phase 3: Test sending with plugin failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:694
-#: src/transport/test_plugin_transport_http.c:700
+#: src/transport/test_plugin_transport_https.c:726
+#: src/transport/test_plugin_transport_http.c:692
 #, fuzzy, c-format
 msgid "curl failed for `%s' at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/transport/test_plugin_transport_https.c:713
-#: src/transport/test_plugin_transport_http.c:721
+#: src/transport/test_plugin_transport_https.c:746
+#: src/transport/test_plugin_transport_http.c:712
 msgid "Connecting to peer without any peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:723
-#: src/transport/test_plugin_transport_http.c:733
+#: src/transport/test_plugin_transport_https.c:759
+#: src/transport/test_plugin_transport_http.c:725
 msgid "Connecting to peer with too short peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:733
-#: src/transport/test_plugin_transport_http.c:745
+#: src/transport/test_plugin_transport_https.c:772
+#: src/transport/test_plugin_transport_http.c:738
 msgid "Connecting to peer with too long peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:743
+#: src/transport/test_plugin_transport_https.c:785
 msgid "Connecting to peer with valid peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:884
-#: src/transport/test_plugin_transport_http.c:899
+#: src/transport/test_plugin_transport_https.c:924
+#: src/transport/test_plugin_transport_http.c:887
 #, c-format
 msgid "Unknown address size: ipv6 has %u ipv4 has %u but this has %u\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:891
-#: src/transport/test_plugin_transport_http.c:906
+#: src/transport/test_plugin_transport_https.c:930
+#: src/transport/test_plugin_transport_http.c:893
 #, c-format
 msgid "Transport plugin notification for address: `%s':%u\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:994
-#: src/transport/test_plugin_transport_http.c:1021
+#: src/transport/test_plugin_transport_https.c:1038
+#: src/transport/test_plugin_transport_http.c:1002
 msgid "Connecting to peer without any peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1005
-#: src/transport/test_plugin_transport_http.c:1037
+#: src/transport/test_plugin_transport_https.c:1053
+#: src/transport/test_plugin_transport_http.c:1017
 msgid "Connecting to peer with too short peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1018
-#: src/transport/test_plugin_transport_http.c:1051
+#: src/transport/test_plugin_transport_https.c:1069
+#: src/transport/test_plugin_transport_http.c:1033
 msgid "Connecting to peer with too long peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1029
-#: src/transport/test_plugin_transport_http.c:1068
+#: src/transport/test_plugin_transport_https.c:1083
+#: src/transport/test_plugin_transport_http.c:1047
 msgid "Connecting to peer with valid peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1038
+#: src/transport/test_plugin_transport_https.c:1093
 msgid ""
 "\n"
 "Phase 1: transmit data to all suggested addresses\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1085
+#: src/transport/test_plugin_transport_https.c:1151
 msgid ""
 "\n"
 "Phase 2: session selection\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1115
+#: src/transport/test_plugin_transport_https.c:1187
 msgid ""
 "\n"
 "Phase 3: send multiple or big messages after disconnect\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1120
+#: src/transport/test_plugin_transport_https.c:1193
 #, fuzzy
 msgid "Phase 3: sending messages\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/test_plugin_transport_https.c:1210
-#: src/transport/plugin_transport_http.c:3380
-#: src/transport/test_plugin_transport_http.c:1293
+#: src/transport/test_plugin_transport_https.c:1284
+#: src/transport/plugin_transport_http.c:3321
+#: src/transport/test_plugin_transport_http.c:1245
 #, c-format
 msgid "Require valid port number for transport plugin `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1275
+#: src/transport/test_plugin_transport_https.c:1352
 #, fuzzy, c-format
 msgid "Loading HTTPS transport plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/test_plugin_transport_https.c:1281
+#: src/transport/test_plugin_transport_https.c:1358
 #, fuzzy
 msgid "Failed to load transport plugin for https\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/test_plugin_transport_https.c:1290
+#: src/transport/test_plugin_transport_https.c:1368
 #, c-format
 msgid "Transport plugin returned %u addresses to connect to\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1359
+#: src/transport/test_plugin_transport_https.c:1444
 msgid ""
 "\n"
 "Phase 0\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1417
-#: src/transport/test_plugin_transport_https.c:1420
+#: src/transport/test_plugin_transport_https.c:1507
+#: src/transport/test_plugin_transport_https.c:1510
 msgid ""
 "\n"
 "delete\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_transport_api.c:583
-#: src/transport/test_transport_api_reliability.c:596
-#: src/transport/test_transport_api_unreliability.c:641
-msgid "PATH environment variable is unset.\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-list-connections.c:86
-#: src/peerinfo-tool/gnunet-peerinfo.c:214
-#: src/core/gnunet-core-list-connections.c:170
+#: src/transport/gnunet-transport-list-connections.c:91
+#: src/peerinfo-tool/gnunet-peerinfo.c:200
+#: src/core/gnunet-core-list-connections.c:166
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
-#: src/transport/gnunet-transport-list-connections.c:109
-#: src/peerinfo-tool/gnunet-peerinfo.c:278
-#: src/core/gnunet-core-list-connections.c:194
+#: src/transport/gnunet-transport-list-connections.c:112
+#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/core/gnunet-core-list-connections.c:187
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/transport/gnunet-transport-list-connections.c:117
-#: src/core/gnunet-core-list-connections.c:202
+#: src/transport/gnunet-transport-list-connections.c:119
+#: src/core/gnunet-core-list-connections.c:194
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/test_plugin_transport.c:236
+#: src/transport/test_plugin_transport.c:224
 #, fuzzy
 msgid "Loading tcp transport plugin\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/test_plugin_transport.c:244
+#: src/transport/test_plugin_transport.c:232
 #, fuzzy
 msgid "Failed to load transport plugin for tcp\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/plugin_transport_http.c:700
-#: src/transport/plugin_transport_http.c:1259
-#: src/transport/plugin_transport_http.c:2585
+#: src/transport/gnunet-service-transport_hello.c:176
+msgid "# refreshed my HELLO"
+msgstr ""
+
+#: src/transport/plugin_transport_http.c:698
+#: src/transport/plugin_transport_http.c:1231
+#: src/transport/plugin_transport_http.c:2551
 msgid "# HTTP peers active"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1008
-#: src/transport/plugin_transport_http.c:1326
+#: src/transport/plugin_transport_http.c:993
+#: src/transport/plugin_transport_http.c:1306
 msgid "# HTTP inbound sessions for peers active"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1930
+#: src/transport/plugin_transport_http.c:1889
 #, c-format
 msgid "Connection %X: HTTP PUT to peer `%s' (`%s') failed: `%s' `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1954
+#: src/transport/plugin_transport_http.c:1915
 #, c-format
 msgid "Connection %X: HTTP GET to peer `%s' (`%s') failed: `%s' `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:2222
-#: src/transport/plugin_transport_http.c:2326
+#: src/transport/plugin_transport_http.c:2193
+#: src/transport/plugin_transport_http.c:2305
 #, fuzzy, c-format
 msgid "Connection: %X: %s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/transport/plugin_transport_http.c:2626
+#: src/transport/plugin_transport_http.c:2592
 msgid "# HTTP outbound sessions for peers active"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3407
-#: src/transport/plugin_transport_http.c:3435
+#: src/transport/plugin_transport_http.c:3349
+#: src/transport/plugin_transport_http.c:3378
 #, fuzzy
 msgid "Misconfigured address to bind to in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/transport/plugin_transport_http.c:3466
+#: src/transport/plugin_transport_http.c:3404
 #, c-format
 msgid "Required configuration options missing in section `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3502
-#, c-format
-msgid "Could not create a new TLS certificate, shell script `%s' failed!\n"
+#: src/transport/plugin_transport_http.c:3442
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3518
+#: src/transport/plugin_transport_http.c:3458
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3642
+#: src/transport/plugin_transport_http.c:3610
 #, c-format
 msgid ""
 "HTTP Server with %s could not be started on port %u! %s plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3658
+#: src/transport/plugin_transport_http.c:3626
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1145
-#, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/transport/gnunet-service-transport.c:1153
+#: src/transport/plugin_transport_tcp.c:504
 #, c-format
-msgid "Blacklist file `%s' is empty.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1166
-#, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/transport/gnunet-service-transport.c:1185
-#: src/transport/gnunet-service-transport.c:1206
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
-
-#: src/transport/gnunet-service-transport.c:1195
-#: src/transport/gnunet-service-transport.c:1228
-#, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1240
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
-
-#: src/transport/gnunet-service-transport.c:1257
-#, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1303
-msgid "# bytes discarded (could not transmit to client)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1428
-msgid "# address validation timeouts"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1465
-#, c-format
-msgid ""
-"Dropping message of type %u and size %u, have %u messages pending (%u is the "
-"soft limit)\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1471
-msgid "# messages dropped due to slow client"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1575
-#: src/transport/gnunet-service-transport.c:1753
-msgid "# bytes pending with plugins"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1581
-#, fuzzy
-msgid "# bytes successfully transmitted by plugins"
-msgstr "# byte skickade av typen %d"
-
-#: src/transport/gnunet-service-transport.c:1588
-msgid "# bytes with transmission failure by plugins"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1614
-#: src/transport/gnunet-service-transport.c:2021
-#: src/transport/gnunet-service-transport.c:2028
-#: src/transport/gnunet-service-transport.c:2068
-#: src/transport/gnunet-service-transport.c:2467
-#: src/transport/gnunet-service-transport.c:2524
-#: src/transport/gnunet-service-transport.c:4917
-#, fuzzy
-msgid "# connected addresses"
-msgstr "# av anslutna parter"
-
-#: src/transport/gnunet-service-transport.c:1671
-msgid "# transport selected peer address freely"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1679
-#, fuzzy
-msgid "# transport failed to selected peer address"
-msgstr "Annonserar min transport %d till valda ändpunkter.\n"
-
-#: src/transport/gnunet-service-transport.c:1692
-#: src/transport/gnunet-service-transport.c:1749
-#: src/transport/gnunet-service-transport.c:1826
-#: src/transport/gnunet-service-transport.c:4945
-msgid "# bytes in message queue for other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1696
-msgid "# bytes discarded (no destination address available)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1708
-msgid "# message delivery deferred (no address)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1911
-#: src/transport/gnunet-service-transport.c:3838
-#, fuzzy
-msgid "# PING without HELLO messages sent"
-msgstr "# PING-meddelanden i klartext skickade"
-
-#: src/transport/gnunet-service-transport.c:2140
-#, fuzzy
-msgid "# transmission attempts failed (no address)"
-msgstr "Ingen transport av typ %d är känd.\n"
-
-#: src/transport/gnunet-service-transport.c:2214
-msgid "# refreshed my HELLO"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2241
-msgid "# transmitted my HELLO to other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2354
-msgid "# disconnects due to try_fast_reconnect"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2419
-msgid "# disconnects due to session end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2455
-msgid "# disconnects due to unready session"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2482
-msgid "# try_fast_reconnect thanks to plugin_env_session_end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2491
-msgid "# disconnects due to missing pong"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2532
-msgid "# disconnects due to NO pong"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2545
-msgid "# try_fast_reconnect thanks to validated_address"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2569
-msgid "# disconnects due to plugin_env_session_end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3033
-msgid "# disconnects due to timeout"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3074
-msgid "# valid peer addresses returned by PEERINFO"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3093
-msgid "# previously validated addresses lacking transport"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3123
-#: src/transport/gnunet-service-transport.c:4206
-#: src/transport/gnunet-service-transport.c:4924
-msgid "# peer addresses considered valid"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3168
-#: src/transport/gnunet-service-transport.c:3258
-#: src/transport/gnunet-service-transport.c:4581
-#: src/transport/gnunet-service-transport.c:4827
-#: src/transport/gnunet-service-transport.c:4987
-#: src/transport/gnunet-service-transport.c:6336
-msgid "# outstanding peerinfo iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3220
-#: src/transport/gnunet-service-transport.c:5009
-msgid "# active neighbours"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3254
-msgid "# peerinfo new neighbor iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3266
-msgid "# HELLO's sent to new neighbors"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3562
-msgid "# disconnects due to blacklist"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3833
-#, fuzzy
-msgid "# PING with HELLO messages sent"
-msgstr "# PING-meddelanden skapade"
-
-#: src/transport/gnunet-service-transport.c:3842
-#, fuzzy
-msgid "# PING messages sent for re-validation"
-msgstr "# PING-meddelanden skapade"
-
-#: src/transport/gnunet-service-transport.c:3966
-msgid "# payload received from other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4130
-#, c-format
-msgid ""
-"Not accepting PONG from `%s' with address `%s' since I cannot confirm using "
-"this address.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4169
-msgid "Received expired signature.  Check system time.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4173
-msgid "# address validation successes"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4287
-#: src/core/gnunet-service-core.c:4287
-#, fuzzy
-msgid "# PONG messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/transport/gnunet-service-transport.c:4400
-msgid "# PING messages sent for initial validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4442
-msgid "# peer addresses scheduled for validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4451
-#, c-format
-msgid ""
-"Transport `%s' not loaded, will not try to validate peer address using this "
-"transport.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4454
-msgid "# peer addresses not validated (plugin not available)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4470
-msgid "# peer addresses not validated (loopback)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4516
-msgid "# peer addresses not validated (in progress)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4605
-msgid "# new HELLOs requiring full validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4616
-msgid "# duplicate HELLO (peer known)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4661
-msgid "# no existing neighbour record (validating HELLO)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4666
-msgid "# HELLO validations (update case)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4706
-msgid "# HELLOs received for validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4737
-msgid "# HELLOs ignored for validation (is my own HELLO)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4754
-msgid "# HELLOs ignored due to high load"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4823
-msgid "# peerinfo process hello iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4949
-#, fuzzy
-msgid "# bytes discarded due to disconnect"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-
-#: src/transport/gnunet-service-transport.c:5054
-#, fuzzy, c-format
-msgid "Received `%s' message from `%s' destined for `%s' which is not me!\n"
-msgstr "Mottog PING som ej var ämnat för oss!\n"
-
-#: src/transport/gnunet-service-transport.c:5076
-#: src/core/gnunet-service-core.c:4264
-#, fuzzy
-msgid "# PING messages received"
-msgstr "# PING-meddelanden skapade"
-
-#: src/transport/gnunet-service-transport.c:5088
-#, c-format
-msgid "Refusing to create PONG since I do not have a session with `%s'.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5161
-#, c-format
-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5256
-msgid "# PONGs unicast via reliable transport"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5269
-msgid "# PONGs multicast to all available addresses"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5300
-#, fuzzy, c-format
-msgid "Could not send PONG to `%s': no address available\n"
-msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
-
-#: src/transport/gnunet-service-transport.c:5408
-#, fuzzy
-msgid "# bytes received from other peers"
-msgstr "# byte mottagna av typen %d"
-
-#: src/transport/gnunet-service-transport.c:5425
-#, c-format
-msgid ""
-"Dropping incoming message due to repeated bandwidth quota (%u b/s) "
-"violations (total of %u).\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5429
-msgid "# bandwidth quota violations by other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5466
-msgid "# HELLO messages received from other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5497
-msgid "# ms throttling suggested"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5547
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5621
-#, fuzzy
-msgid "# HELLOs received from clients"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-
-#: src/transport/gnunet-service-transport.c:5714
-msgid "# payload received for other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5757
-#, fuzzy
-msgid "# REQUEST CONNECT messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/transport/gnunet-service-transport.c:5788
-#, fuzzy
-msgid "# SET QUOTA messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/transport/gnunet-service-transport.c:5796
-msgid "# SET QUOTA messages ignored (no such peer)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5819
-msgid "# disconnects due to quota of 0"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:6137
-#, fuzzy, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr "Testar transport(er) %s\n"
-
-#: src/transport/gnunet-service-transport.c:6149
-#, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/transport/gnunet-service-transport.c:6645
-#, fuzzy, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr "Testar transport(er) %s\n"
-
-#: src/transport/gnunet-service-transport.c:6738
-msgid "Transport service ready.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:515
-#, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:606
-#: src/transport/plugin_transport_tcp.c:702
-#: src/transport/plugin_transport_tcp.c:756
-#: src/transport/plugin_transport_tcp.c:848
-#: src/transport/plugin_transport_tcp.c:1208
+#: src/transport/plugin_transport_tcp.c:590
+#: src/transport/plugin_transport_tcp.c:679
+#: src/transport/plugin_transport_tcp.c:728
+#: src/transport/plugin_transport_tcp.c:817
+#: src/transport/plugin_transport_tcp.c:1142
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_tcp.c:614
-#: src/transport/plugin_transport_tcp.c:877
-#: src/transport/plugin_transport_tcp.c:1623
+#: src/transport/plugin_transport_tcp.c:596
+#: src/transport/plugin_transport_tcp.c:843
+#: src/transport/plugin_transport_tcp.c:1531
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:706
+#: src/transport/plugin_transport_tcp.c:683
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:760
+#: src/transport/plugin_transport_tcp.c:731
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:852
+#: src/transport/plugin_transport_tcp.c:821
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:989
+#: src/transport/plugin_transport_tcp.c:942
 #, fuzzy
 msgid "# bytes TCP was asked to transmit"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:1046
+#: src/transport/plugin_transport_tcp.c:993
 msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1091
+#: src/transport/plugin_transport_tcp.c:1034
 #, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1110
+#: src/transport/plugin_transport_tcp.c:1051
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1168
+#: src/transport/plugin_transport_tcp.c:1103
 #, fuzzy
 msgid "# bytes discarded by TCP (failed to connect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1284
+#: src/transport/plugin_transport_tcp.c:1211
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1670
+#: src/transport/plugin_transport_tcp.c:1574
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:1831
+#: src/transport/plugin_transport_tcp.c:1722
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:1896
+#: src/transport/plugin_transport_tcp.c:1788
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2063
+#: src/transport/plugin_transport_tcp.c:1941
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2135
+#: src/transport/plugin_transport_tcp.c:2001
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/plugin_transport_tcp.c:2161
+#: src/transport/plugin_transport_tcp.c:2024
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2166
+#: src/transport/plugin_transport_tcp.c:2028
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2170
+#: src/transport/plugin_transport_tcp.c:2032
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_validation.c:520
+msgid "# address records discarded"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:606
+#: src/core/gnunet-service-core.c:4187
+#, fuzzy
+msgid "# PING messages received"
+msgstr "# PING-meddelanden skapade"
+
+#: src/transport/gnunet-service-transport_validation.c:628
+#, c-format
+msgid ""
+"Not confirming PING with address `%s' since I cannot confirm having this "
+"address.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:685
+msgid "# PONGs unicast via reliable transport"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:694
+msgid "# PONGs multicast to all available addresses"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:758
+#, c-format
+msgid ""
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:792
+#, fuzzy
+msgid "# PING without HELLO messages sent"
+msgstr "# PING-meddelanden i klartext skickade"
+
+#: src/transport/gnunet-service-transport_validation.c:864
+msgid "# address revalidations started"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:923
+#: src/core/gnunet-service-core.c:4210
+#, fuzzy
+msgid "# PONG messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/gnunet-service-transport_validation.c:945
+msgid "# PONGs dropped, no matching pending validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:961
+msgid "# PONGs dropped, signature expired"
+msgstr ""
+
 #: src/transport/plugin_transport_smtp.c:367
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
 # capped är inte ett bra ord IMHO
-#: src/transport/plugin_transport_smtp.c:459
+#: src/transport/plugin_transport_smtp.c:454
 #, fuzzy
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
 
 # capped är inte ett bra ord IMHO
-#: src/transport/plugin_transport_smtp.c:469
+#: src/transport/plugin_transport_smtp.c:463
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "SMTP-filtersträng för lång, kapad till \"%s\"\n"
 
-#: src/transport/plugin_transport_smtp.c:565
-#: src/transport/plugin_transport_smtp.c:576
-#: src/transport/plugin_transport_smtp.c:590
-#: src/transport/plugin_transport_smtp.c:610
-#: src/transport/plugin_transport_smtp.c:635
+#: src/transport/plugin_transport_smtp.c:558
+#: src/transport/plugin_transport_smtp.c:568
+#: src/transport/plugin_transport_smtp.c:581
+#: src/transport/plugin_transport_smtp.c:600
+#: src/transport/plugin_transport_smtp.c:623
+#: src/transport/plugin_transport_smtp.c:631
 #: src/transport/plugin_transport_smtp.c:644
-#: src/transport/plugin_transport_smtp.c:658
-#: src/transport/plugin_transport_smtp.c:670
+#: src/transport/plugin_transport_smtp.c:655
 #, fuzzy, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/transport/plugin_transport_smtp.c:816
+#: src/transport/plugin_transport_smtp.c:798
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:833
+#: src/transport/plugin_transport_smtp.c:810
 #, fuzzy
 msgid "# bytes received via SMTP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_smtp.c:834
+#: src/transport/plugin_transport_smtp.c:811
 #, fuzzy
 msgid "# bytes sent via SMTP"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_smtp.c:836
+#: src/transport/plugin_transport_smtp.c:813
 #, fuzzy
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/test_plugin_transport_http.c:1319
+#: src/transport/test_plugin_transport_http.c:1271
 #, fuzzy, c-format
 msgid "Loading HTTP transport plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/test_plugin_transport_http.c:1326
+#: src/transport/test_plugin_transport_http.c:1278
 #, fuzzy
 msgid "Failed to load transport plugin for http\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/test_plugin_transport_http.c:1408
+#: src/transport/test_plugin_transport_http.c:1364
 msgid ""
 "Phase 0\n"
 "\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1352
-#: src/transport/plugin_transport_unix.c:1118
+#: src/transport/plugin_transport_udp.c:1279
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1410
+#: src/transport/plugin_transport_udp.c:1329
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_udp.c:1541
+#: src/transport/plugin_transport_udp.c:1455
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/transport_api.c:582
+#: src/transport/transport_api.c:570
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/transport/plugin_transport_unix.c:1144
+#: src/transport/plugin_transport_unix.c:1092
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/chat/chat.c:177
+#: src/transport/gnunet-service-transport_blacklist.c:247
+#, fuzzy, c-format
+msgid "Could not read blacklist file `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:254
+#, c-format
+msgid "Blacklist file `%s' is empty.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:266
+#, fuzzy, c-format
+msgid "Failed to read blacklist from `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:287
+#: src/transport/gnunet-service-transport_blacklist.c:311
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:298
+#: src/transport/gnunet-service-transport_blacklist.c:336
+#, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:350
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:364
+#, c-format
+msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:522
+#: src/transport/gnunet-service-transport_blacklist.c:754
+msgid "# disconnects due to blacklist"
+msgstr ""
+
+#: src/chat/chat.c:175
 #, fuzzy
 msgid "Could not transmit confirmation receipt\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/chat/chat.c:288
+#: src/chat/chat.c:283
 msgid "The current user must be the the first one joined\n"
 msgstr ""
 
-#: src/chat/chat.c:424
+#: src/chat/chat.c:412
 #, fuzzy, c-format
 msgid "Unknown message type: '%u'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/chat/chat.c:489
+#: src/chat/chat.c:472
 #, fuzzy, c-format
 msgid "Configuration option `%s' in section `%s' missing\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/chat/chat.c:498
+#: src/chat/chat.c:480
 #, fuzzy, c-format
 msgid "Failed to access chat home directory `%s'\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/chat/chat.c:517
+#: src/chat/chat.c:498
 #, fuzzy, c-format
 msgid "Failed to create/open key in file `%s'\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/chat/chat.c:581
+#: src/chat/chat.c:559
 #, fuzzy
 msgid "Could not serialize metadata\n"
 msgstr "Kunde inte initiera libgnunetutil!\n"
 
-#: src/chat/chat.c:701
+#: src/chat/chat.c:674
 #, fuzzy
 msgid "Failed to connect to the chat service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/chat/chat.c:707
+#: src/chat/chat.c:680
 msgid "Undefined mandatory parameter: joinCallback\n"
 msgstr ""
 
-#: src/chat/chat.c:713
+#: src/chat/chat.c:686
 msgid "Undefined mandatory parameter: messageCallback\n"
 msgstr ""
 
-#: src/chat/chat.c:719
+#: src/chat/chat.c:692
 msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:89
+#: src/chat/gnunet-chat.c:92
 #, c-format
 msgid "Joined\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:123
+#: src/chat/gnunet-chat.c:124
 msgid "anonymous"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:129
+#: src/chat/gnunet-chat.c:130
 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/chat/gnunet-chat.c:132 src/chat/gnunet-chat.c:135
+#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
 # drive = hard drive ?
-#: src/chat/gnunet-chat.c:138
+#: src/chat/gnunet-chat.c:139
 #, fuzzy, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
 # drive = hard drive ?
-#: src/chat/gnunet-chat.c:141
+#: src/chat/gnunet-chat.c:142
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/chat/gnunet-chat.c:144
+#: src/chat/gnunet-chat.c:145
 #, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:147
+#: src/chat/gnunet-chat.c:148
 #, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:150
+#: src/chat/gnunet-chat.c:151
 #, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:153
+#: src/chat/gnunet-chat.c:156
 #, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:159
 #, fuzzy, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:162
 #, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:191
+#: src/chat/gnunet-chat.c:193
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:222
+#: src/chat/gnunet-chat.c:224
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:222
+#: src/chat/gnunet-chat.c:224
 #, c-format
 msgid "`%s' left the room\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:286 src/chat/gnunet-chat.c:326
+#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
 #, fuzzy, c-format
 msgid "Could not change username\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/chat/gnunet-chat.c:290 src/chat/gnunet-chat.c:660
+#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:629
 #, fuzzy, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr "Ogiltigt svar till \"%s\" från motpart \"%s\".\n"
 
-#: src/chat/gnunet-chat.c:330
+#: src/chat/gnunet-chat.c:320
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/chat/gnunet-chat.c:343
+#: src/chat/gnunet-chat.c:333
 #, c-format
 msgid "Users in room `%s': "
 msgstr ""
 
-#: src/chat/gnunet-chat.c:383
+#: src/chat/gnunet-chat.c:371
 #, c-format
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:391
+#: src/chat/gnunet-chat.c:379
 #, fuzzy, c-format
 msgid "Unknown user `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/chat/gnunet-chat.c:407
+#: src/chat/gnunet-chat.c:395
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:448
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/chat/gnunet-chat.c:478
+#: src/chat/gnunet-chat.c:459
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:463
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:467
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:470
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:472
 msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:493
+#: src/chat/gnunet-chat.c:474
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:496
+#: src/chat/gnunet-chat.c:477
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:499
+#: src/chat/gnunet-chat.c:480
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:501
+#: src/chat/gnunet-chat.c:482
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:503
+#: src/chat/gnunet-chat.c:484
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:505
+#: src/chat/gnunet-chat.c:486
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:508
+#: src/chat/gnunet-chat.c:489
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:510
+#: src/chat/gnunet-chat.c:491
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:627
+#: src/chat/gnunet-chat.c:605
 #, fuzzy, c-format
 msgid "You must specify a nickname\n"
 msgstr "Du måste ange en mottagare!\n"
 
-#: src/chat/gnunet-chat.c:652
+#: src/chat/gnunet-chat.c:621
 #, fuzzy, c-format
 msgid "Failed to join room `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/chat/gnunet-chat.c:685
+#: src/chat/gnunet-chat.c:654
 msgid "set the nickname to use (required)"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:688
+#: src/chat/gnunet-chat.c:657
 msgid "set the chat room to join"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:702
+#: src/chat/gnunet-chat.c:669
 msgid "Join a chat on GNUnet."
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:273
+#: src/chat/gnunet-service-chat.c:267
 #, fuzzy
 msgid "Failed to queue a message notification\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/chat/gnunet-service-chat.c:566
+#: src/chat/gnunet-service-chat.c:546
 #, fuzzy
 msgid "Failed to queue a join notification\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/chat/gnunet-service-chat.c:764
+#: src/chat/gnunet-service-chat.c:729
 #, fuzzy
 msgid "Failed to queue a confirmation receipt\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/chat/gnunet-service-chat.c:952
+#: src/chat/gnunet-service-chat.c:907
 #, fuzzy
 msgid "Failed to queue a leave notification\n"
 msgstr "Kunde inte spara konfiguration!"
@@ -4494,30 +4287,30 @@
 msgid "Peer `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:241
+#: src/peerinfo-tool/gnunet-peerinfo.c:222
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:249
+#: src/peerinfo-tool/gnunet-peerinfo.c:229
 #, 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:261
+#: src/peerinfo-tool/gnunet-peerinfo.c:241
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:281
+#: src/peerinfo-tool/gnunet-peerinfo.c:261
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:284
+#: src/peerinfo-tool/gnunet-peerinfo.c:264
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:292
+#: src/peerinfo-tool/gnunet-peerinfo.c:270
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -4527,32 +4320,32 @@
 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:223
+#: src/datastore/plugin_datastore_sqlite.c:239
 #, fuzzy, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:253
+#: src/datastore/plugin_datastore_sqlite.c:266
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:669
+#: src/datastore/plugin_datastore_sqlite.c:662
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1110
+#: src/datastore/plugin_datastore_sqlite.c:1115
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1138
+#: src/datastore/plugin_datastore_sqlite.c:1134
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1179
+#: src/datastore/plugin_datastore_sqlite.c:1173
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -4561,351 +4354,363 @@
 msgid "# bytes used in file-sharing datastore"
 msgstr "# byte krypterade"
 
-#: src/datastore/gnunet-service-datastore.c:347
+#: src/datastore/gnunet-service-datastore.c:331
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:427
+#: src/datastore/gnunet-service-datastore.c:397
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:496
+#: src/datastore/gnunet-service-datastore.c:457
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:665
+#: src/datastore/gnunet-service-datastore.c:610
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:712
+#: src/datastore/gnunet-service-datastore.c:655
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:724
+#: src/datastore/gnunet-service-datastore.c:666
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:728
+#: src/datastore/gnunet-service-datastore.c:670
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:734
+#: src/datastore/gnunet-service-datastore.c:676
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:740
-#: src/datastore/gnunet-service-datastore.c:795
-#: src/datastore/gnunet-service-datastore.c:1041
-#: src/datastore/gnunet-service-datastore.c:1596
+#: src/datastore/gnunet-service-datastore.c:681
+#: src/datastore/gnunet-service-datastore.c:735
+#: src/datastore/gnunet-service-datastore.c:953
+#: src/datastore/gnunet-service-datastore.c:1438
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:810
+#: src/datastore/gnunet-service-datastore.c:750
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:908
+#: src/datastore/gnunet-service-datastore.c:835
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1099
+#: src/datastore/gnunet-service-datastore.c:1001
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1115
+#: src/datastore/gnunet-service-datastore.c:1015
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1150
+#: src/datastore/gnunet-service-datastore.c:1043
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1189
+#: src/datastore/gnunet-service-datastore.c:1077
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1227
+#: src/datastore/gnunet-service-datastore.c:1112
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1263
+#: src/datastore/gnunet-service-datastore.c:1139
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1276
+#: src/datastore/gnunet-service-datastore.c:1149
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1316
+#: src/datastore/gnunet-service-datastore.c:1183
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1371
+#: src/datastore/gnunet-service-datastore.c:1227
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1452
-#: src/datastore/test_plugin_datastore.c:361
-#: src/datastore/perf_plugin_datastore.c:467
+#: src/datastore/gnunet-service-datastore.c:1300
+#: src/datastore/test_plugin_datastore.c:322
+#: src/datastore/perf_plugin_datastore.c:420
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1460
+#: src/datastore/gnunet-service-datastore.c:1309
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1648
+#: src/datastore/gnunet-service-datastore.c:1488
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1653
+#: src/datastore/gnunet-service-datastore.c:1490
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1667
+#: src/datastore/gnunet-service-datastore.c:1500
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1680
+#: src/datastore/gnunet-service-datastore.c:1513
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/datastore/plugin_datastore_template.c:252
+#: src/datastore/plugin_datastore_template.c:241
 msgid "Template database running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:292
+#: src/datastore/datastore_api.c:287
 #, fuzzy
 msgid "Failed to transmit request to drop database.\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/datastore/datastore_api.c:380
+#: src/datastore/datastore_api.c:370
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:432
+#: src/datastore/datastore_api.c:417
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:462
+#: src/datastore/datastore_api.c:444
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/datastore/datastore_api.c:493
+#: src/datastore/datastore_api.c:465
 msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/datastore/datastore_api.c:543
+#: src/datastore/datastore_api.c:514
 #, fuzzy
 msgid "# datastore connections (re)created"
 msgstr "Nätverksanslutning"
 
-#: src/datastore/datastore_api.c:573
+#: src/datastore/datastore_api.c:541
 msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/datastore/datastore_api.c:644
+#: src/datastore/datastore_api.c:606
 msgid "Failed to transmit request to DATASTORE.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:646
+#: src/datastore/datastore_api.c:608
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/datastore/datastore_api.c:673
+#: src/datastore/datastore_api.c:631
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# byte krypterade"
 
-#: src/datastore/datastore_api.c:822
+#: src/datastore/datastore_api.c:768
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/datastore_api.c:836
+#: src/datastore/datastore_api.c:781
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:848 src/datastore/datastore_api.c:855
+#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Ogiltigt meddelande mottogs den %s:%d."
 
-#: src/datastore/datastore_api.c:864
+#: src/datastore/datastore_api.c:806
 #, fuzzy
 msgid "# status messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/datastore/datastore_api.c:947
+#: src/datastore/datastore_api.c:878
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1024
+#: src/datastore/datastore_api.c:950
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1092
+#: src/datastore/datastore_api.c:1015
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1159
+#: src/datastore/datastore_api.c:1078
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1234
+#: src/datastore/datastore_api.c:1148
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1281
+#: src/datastore/datastore_api.c:1193
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/datastore_api.c:1345
+#: src/datastore/datastore_api.c:1254
 #, fuzzy
 msgid "# Results received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/datastore_api.c:1424
+#: src/datastore/datastore_api.c:1326
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1492
+#: src/datastore/datastore_api.c:1393
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1563
+#: src/datastore/datastore_api.c:1457
 msgid "# GET requests executed"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:515
+#: src/datastore/plugin_datastore_mysql.c:529
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/datastore/plugin_datastore_mysql.c:608
+#: src/datastore/plugin_datastore_mysql.c:622
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1484
+#: src/datastore/plugin_datastore_mysql.c:1500
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:177
+#: src/datastore/plugin_datastore_postgres.c:173
 #, fuzzy, c-format
 msgid "Unable to initialize Postgres with configuration `%s': %s"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/datastore/plugin_datastore_postgres.c:1116
+#: src/datastore/plugin_datastore_postgres.c:979
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:161
+#: src/dv/plugin_transport_dv.c:159
 #, fuzzy, c-format
 msgid "%s Received message from %s of type %d, distance %u!\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/dv/dv_api.c:179
+#: src/dv/dv_api.c:178
 #, fuzzy
 msgid "Failed to connect to the dv service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/nse/nse-profiler.c:462
-#, fuzzy
-msgid "Run a test of the NSE service."
-msgstr "Kan inte tillgå tjänsten"
+#: src/nse/gnunet-service-nse.c:864
+#, c-format
+msgid "Proof of work invalid: %llu!\n"
+msgstr ""
 
-#: src/nse/gnunet-service-nse.c:998
+#: src/nse/gnunet-service-nse.c:1286 src/nse/gnunet-service-nse.c:1305
+#: src/nse/gnunet-service-nse.c:1326
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1008
-msgid "NSE Service could not access hostkey.  Exiting.\n"
-msgstr ""
+#: src/nse/gnunet-service-nse.c:1293
+#, fuzzy
+msgid "Invalid work requirement for NSE service. Exiting.\n"
+msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/core/gnunet-service-core.c:935
+#: src/nse/gnunet-service-nse.c:1314
+#, fuzzy
+msgid "NSE service could not access hostkey.  Exiting.\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#: src/nse/gnunet-nse-profiler.c:673
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "Kan inte tillgå tjänsten"
+
+#: src/core/gnunet-service-core.c:920
 msgid "# total peer preference"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1063
+#: src/core/gnunet-service-core.c:1040
 msgid "# peer status changes"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1176
+#: src/core/gnunet-service-core.c:1236
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1662
+#: src/core/gnunet-service-core.c:1712
 #, c-format
 msgid ""
 "Client asked for preference change with peer `%s', which is not connected!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1747 src/core/gnunet-service-core.c:4318
-#: src/core/gnunet-service-core.c:4541
+#: src/core/gnunet-service-core.c:1793 src/core/gnunet-service-core.c:4240
+#: src/core/gnunet-service-core.c:4456
 msgid "# established sessions"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1794
+#: src/core/gnunet-service-core.c:1838
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/core/gnunet-service-core.c:1933 src/core/gnunet-service-core.c:2781
-#: src/core/gnunet-service-core.c:4623
+#: src/core/gnunet-service-core.c:1964 src/core/gnunet-service-core.c:2793
+#: src/core/gnunet-service-core.c:4532
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2003
+#: src/core/gnunet-service-core.c:2031
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2114
+#: src/core/gnunet-service-core.c:2134
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core.c:2289
+#: src/core/gnunet-service-core.c:2314
 msgid "# transmissions delayed due to corking"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2494
+#: src/core/gnunet-service-core.c:2517
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2849
+#: src/core/gnunet-service-core.c:2857
 msgid "# messages discarded (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2906 src/core/gnunet-service-core.c:4741
+#: src/core/gnunet-service-core.c:2909 src/core/gnunet-service-core.c:4644
 msgid "# discarded CORE_SEND requests"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2919 src/core/gnunet-service-core.c:4742
+#: src/core/gnunet-service-core.c:2924 src/core/gnunet-service-core.c:4648
 msgid "# discarded lower priority CORE_SEND requests"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2994
+#: src/core/gnunet-service-core.c:2996
 #, fuzzy
 msgid "# connection requests received"
 msgstr "# byte mottogs via TCP"
@@ -4914,181 +4719,225 @@
 msgid "# connection requests ignored (already connected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3057 src/core/gnunet-service-core.c:3741
+#: src/core/gnunet-service-core.c:3054 src/core/gnunet-service-core.c:3697
 msgid "# SET_KEY messages deferred (need public key)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3070
+#: src/core/gnunet-service-core.c:3067
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3105
+#: src/core/gnunet-service-core.c:3099
 msgid "# Error extracting public key from HELLO"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3151
+#: src/core/gnunet-service-core.c:3145
 msgid "# Asking transport to connect (for SET_KEY)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3286
+#: src/core/gnunet-service-core.c:3270
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core.c:3367
+#: src/core/gnunet-service-core.c:3349
 #, c-format
 msgid ""
 "Ignoring `%s' message due to lack of public key for peer `%4s' (failed to "
 "obtain one).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3471
+#: src/core/gnunet-service-core.c:3444
 #, fuzzy
 msgid "# PING messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core.c:3483
+#: src/core/gnunet-service-core.c:3456
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3515
+#: src/core/gnunet-service-core.c:3481
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core.c:3574
+#: src/core/gnunet-service-core.c:3534
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core.c:3617
+#: src/core/gnunet-service-core.c:3572
 #, fuzzy
 msgid "# Session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core.c:3751
+#: src/core/gnunet-service-core.c:3706
 #, fuzzy, c-format
 msgid "Received `%s' message that was for `%s', not for me.  Ignoring.\n"
 msgstr "storlek på \"%s\" meddelande är för litet. Ignorerar.\n"
 
-#: src/core/gnunet-service-core.c:3796
+#: src/core/gnunet-service-core.c:3748
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core.c:3953
+#: src/core/gnunet-service-core.c:3894
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core.c:3997
+#: src/core/gnunet-service-core.c:3941
 msgid "# messages not delivered to any client"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4076 src/core/gnunet-service-core.c:4102
+#: src/core/gnunet-service-core.c:4011 src/core/gnunet-service-core.c:4036
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core.c:4088
+#: src/core/gnunet-service-core.c:4023
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core.c:4126
+#: src/core/gnunet-service-core.c:4060
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/core/gnunet-service-core.c:4129
+#: src/core/gnunet-service-core.c:4064
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core.c:4162
+#: src/core/gnunet-service-core.c:4094
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core.c:4230
+#: src/core/gnunet-service-core.c:4157
 #, fuzzy
 msgid "# session keys received"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core.c:4248
+#: src/core/gnunet-service-core.c:4173
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4306
+#: src/core/gnunet-service-core.c:4229
 #, c-format
 msgid "Unsupported message of type %u received.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4481 src/core/gnunet-service-core.c:4572
+#: src/core/gnunet-service-core.c:4403 src/core/gnunet-service-core.c:4485
 #, fuzzy
 msgid "# peers connected (transport)"
 msgstr "# av anslutna parter"
 
-#: src/core/gnunet-service-core.c:4695
+#: src/core/gnunet-service-core.c:4599
 msgid "Core service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4713
+#: src/core/gnunet-service-core.c:4617
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4751
+#: src/core/gnunet-service-core.c:4656
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/core_api.c:874
+#: src/core/core_api.c:832
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:291 src/include/gnunet_common.h:296
-#: src/include/gnunet_common.h:302
+#: src/include/gnunet_common.h:296 src/include/gnunet_common.h:301
+#: src/include/gnunet_common.h:307
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/include/gnunet_common.h:312
+#: src/include/gnunet_common.h:317
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:326
+#: src/include/gnunet_common.h:331
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
-#: src/include/gnunet_getopt_lib.h:145
+#: src/include/gnunet_getopt_lib.h:144
 msgid "print this help"
 msgstr "skriv ut denna hjälp"
 
-#: src/include/gnunet_getopt_lib.h:155
+#: src/include/gnunet_getopt_lib.h:154
 msgid "print the version number"
 msgstr "skriv ut versionsnummer"
 
-#: src/include/gnunet_getopt_lib.h:164
+#: src/include/gnunet_getopt_lib.h:163
 msgid "configure logging to write logs to LOGFILE"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:173
+#: src/include/gnunet_getopt_lib.h:172
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:182
+#: src/include/gnunet_getopt_lib.h:181
 msgid "be verbose"
 msgstr "var informativ"
 
-#: src/include/gnunet_getopt_lib.h:191
+#: src/include/gnunet_getopt_lib.h:190
 msgid "use configuration file FILENAME"
 msgstr "använd konfigurationsfil FILNAMN"
 
+#, fuzzy
+#~ msgid "Failed to connect to core service\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "# bytes successfully transmitted by plugins"
+#~ msgstr "# byte skickade av typen %d"
+
+#, fuzzy
+#~ msgid "# connected addresses"
+#~ msgstr "# av anslutna parter"
+
+#, fuzzy
+#~ msgid "# transport failed to selected peer address"
+#~ msgstr "Annonserar min transport %d till valda ändpunkter.\n"
+
+#, fuzzy
+#~ msgid "# transmission attempts failed (no address)"
+#~ msgstr "Ingen transport av typ %d är känd.\n"
+
+#, fuzzy
+#~ msgid "# PING with HELLO messages sent"
+#~ msgstr "# PING-meddelanden skapade"
+
+#, fuzzy
+#~ msgid "# PING messages sent for re-validation"
+#~ msgstr "# PING-meddelanden skapade"
+
+#, fuzzy
+#~ msgid "# bytes discarded due to disconnect"
+#~ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#, fuzzy
+#~ msgid "Received `%s' message from `%s' destined for `%s' which is not me!\n"
+#~ msgstr "Mottog PING som ej var ämnat för oss!\n"
+
+#, fuzzy
+#~ msgid "Could not send PONG to `%s': no address available\n"
+#~ msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
+
+#, fuzzy
+#~ msgid "# HELLOs received from clients"
+#~ msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
 #~ msgid "Error"
 #~ msgstr "Fel"
 

Modified: gnunet/po/vi.gmo
===================================================================
(Binary files differ)

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2011-09-13 12:43:24 UTC (rev 16810)
+++ gnunet/po/vi.po     2011-09-13 12:44:25 UTC (rev 16811)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-07-19 15:16+0200\n"
+"POT-Creation-Date: 2011-09-13 14:44+0200\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -19,275 +19,275 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/fragmentation/defragmentation.c:274
+#: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:457
+#: src/fragmentation/defragmentation.c:454
 #, fuzzy
 msgid "# fragments received"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/fragmentation/defragmentation.c:521
+#: src/fragmentation/defragmentation.c:513
 #, fuzzy
 msgid "# duplicate fragments received"
 msgstr "# các kết quả dht được nhận"
 
-#: src/fragmentation/defragmentation.c:545
+#: src/fragmentation/defragmentation.c:532
 msgid "# messages defragmented"
 msgstr "# các thông báo được chắp liền"
 
-#: src/fragmentation/fragmentation.c:181
+#: src/fragmentation/fragmentation.c:183
 #, fuzzy
 msgid "# fragments transmitted"
 msgstr "# Các tự quảng cáo được truyền"
 
-#: src/fragmentation/fragmentation.c:185
+#: src/fragmentation/fragmentation.c:186
 #, fuzzy
 msgid "# fragments retransmitted"
 msgstr "# Các tự quảng cáo được truyền"
 
-#: src/fragmentation/fragmentation.c:249
+#: src/fragmentation/fragmentation.c:248
 msgid "# messages fragmented"
 msgstr "# các thông báo bị tế phân"
 
-#: src/fragmentation/fragmentation.c:254
+#: src/fragmentation/fragmentation.c:251
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:336
+#: src/fragmentation/fragmentation.c:335
 #, fuzzy
 msgid "# fragment acknowledgements received"
 msgstr "# Các quảng cáo đồng đẳng được nhận"
 
-#: src/fragmentation/fragmentation.c:343
+#: src/fragmentation/fragmentation.c:341
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:358
+#: src/fragmentation/fragmentation.c:365
 #, fuzzy
 msgid "# fragmentation transmissions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/nat/nat.c:823
+#: src/nat/nat.c:778
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:884
+#: src/nat/nat.c:828
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/nat/nat.c:1185 src/nat/nat.c:1207
+#: src/nat/nat.c:1096 src/nat/nat.c:1113
 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/nat/nat.c:1276 src/nat/nat.c:1284
+#: src/nat/nat.c:1167 src/nat/nat.c:1177
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1422
+#: src/nat/nat.c:1309
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1440
+#: src/nat/nat.c:1321
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:317
+#: src/nat/gnunet-nat-server.c:290
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:361
+#: src/nat/gnunet-nat-server.c:329
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_test.c:376
+#: src/nat/nat_test.c:348
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/nat/nat_test.c:451
+#: src/nat/nat_test.c:418
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:772 src/vpn/gnunet-daemon-exit.c:1280
-#: src/template/gnunet-template.c:72 src/core/test_core_api_send_to_self.c:216
+#: src/vpn/gnunet-daemon-vpn.c:1275 src/vpn/gnunet-daemon-exit.c:1455
+#: src/template/gnunet-template.c:68 src/core/test_core_api_send_to_self.c:217
 msgid "help text"
 msgstr ""
 
-#: src/datacache/datacache.c:110 src/datacache/datacache.c:255
-#: src/datastore/gnunet-service-datastore.c:888
+#: src/datacache/datacache.c:108 src/datacache/datacache.c:236
+#: src/datastore/gnunet-service-datastore.c:821
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/datacache/datacache.c:138 src/datacache/datacache.c:149
-#: src/datastore/gnunet-service-datastore.c:1442
-#: src/datastore/gnunet-service-datastore.c:1641
-#: src/datastore/test_plugin_datastore.c:209
-#: src/datastore/test_plugin_datastore.c:352
-#: src/datastore/perf_plugin_datastore.c:340
-#: src/datastore/perf_plugin_datastore.c:458
+#: src/datacache/datacache.c:134 src/datacache/datacache.c:142
+#: src/datastore/gnunet-service-datastore.c:1292
+#: src/datastore/gnunet-service-datastore.c:1483
+#: src/datastore/test_plugin_datastore.c:192
+#: src/datastore/test_plugin_datastore.c:315
+#: src/datastore/perf_plugin_datastore.c:309
+#: src/datastore/perf_plugin_datastore.c:413
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
 
-#: src/datacache/datacache.c:178
+#: src/datacache/datacache.c:167
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:186
+#: src/datacache/datacache.c:176
 #, fuzzy, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/datacache/datacache.c:285
+#: src/datacache/datacache.c:262
 #, fuzzy
 msgid "# requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datacache/datacache.c:292
+#: src/datacache/datacache.c:268
 msgid "# requests filtered by bloom filter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/datacache/plugin_datacache_template.c:126
+#: src/datacache/plugin_datacache_template.c:121
 msgid "Template datacache running\n"
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:66
 #: src/datacache/plugin_datacache_sqlite.c:69
-#: src/datacache/plugin_datacache_sqlite.c:126
-#: src/datacache/plugin_datacache_sqlite.c:201
-#: src/datacache/plugin_datacache_sqlite.c:248
-#: src/datacache/plugin_datacache_sqlite.c:322
-#: src/datacache/plugin_datacache_sqlite.c:331
-#: src/datacache/plugin_datacache_sqlite.c:345
+#: src/datacache/plugin_datacache_sqlite.c:122
+#: src/datacache/plugin_datacache_sqlite.c:191
+#: src/datacache/plugin_datacache_sqlite.c:232
+#: src/datacache/plugin_datacache_sqlite.c:296
+#: src/datacache/plugin_datacache_sqlite.c:305
+#: src/datacache/plugin_datacache_sqlite.c:318
+#: src/datacache/plugin_datacache_sqlite.c:325
+#: src/datacache/plugin_datacache_sqlite.c:338
+#: src/datacache/plugin_datacache_sqlite.c:346
 #: src/datacache/plugin_datacache_sqlite.c:354
-#: src/datacache/plugin_datacache_sqlite.c:374
-#: src/datacache/plugin_datacache_sqlite.c:383
-#: src/datacache/plugin_datacache_sqlite.c:394
 #: src/datacache/plugin_datacache_mysql.c:103
 #: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:518
-#: src/datacache/plugin_datacache_mysql.c:527
-#: src/datacache/plugin_datacache_mysql.c:603
-#: src/datacache/plugin_datacache_mysql.c:619 src/util/crypto_rsa.c:84
-#: src/util/crypto_ksk.c:47 src/dht/plugin_dhtlog_mysql.c:583
-#: src/dht/plugin_dhtlog_mysql.c:592 src/dht/plugin_dhtlog_mysql.c:652
-#: src/dht/plugin_dhtlog_mysql.c:667
+#: src/datacache/plugin_datacache_mysql.c:517
+#: src/datacache/plugin_datacache_mysql.c:526
+#: src/datacache/plugin_datacache_mysql.c:598
+#: src/datacache/plugin_datacache_mysql.c:614 src/util/crypto_rsa.c:84
+#: src/util/crypto_ksk.c:47 src/dht/plugin_dhtlog_mysql.c:581
+#: src/dht/plugin_dhtlog_mysql.c:590 src/dht/plugin_dhtlog_mysql.c:648
+#: src/dht/plugin_dhtlog_mysql.c:663
 #: src/datastore/plugin_datastore_sqlite.c:61
 #: src/datastore/plugin_datastore_mysql.c:139
 #: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:599
-#: src/datastore/plugin_datastore_mysql.c:661
-#: src/datastore/plugin_datastore_mysql.c:673 src/include/gnunet_common.h:319
+#: src/datastore/plugin_datastore_mysql.c:613
+#: src/datastore/plugin_datastore_mysql.c:673
+#: src/datastore/plugin_datastore_mysql.c:685 src/include/gnunet_common.h:324
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:461
+#: src/datacache/plugin_datacache_sqlite.c:419
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:496
-#: src/datastore/plugin_datastore_sqlite.c:381
+#: src/datacache/plugin_datacache_sqlite.c:454
+#: src/datastore/plugin_datastore_sqlite.c:405
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:81
-#: src/datastore/plugin_datastore_postgres.c:95
+#: src/datacache/plugin_datacache_postgres.c:79
+#: src/datastore/plugin_datastore_postgres.c:93
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
 
-#: src/datacache/plugin_datacache_postgres.c:154
+#: src/datacache/plugin_datacache_postgres.c:149
 #, fuzzy, c-format
 msgid "Unable to initialize Postgres: %s"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/datacache/plugin_datacache_postgres.c:557
+#: src/datacache/plugin_datacache_postgres.c:500
 msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:220
-#: src/datastore/plugin_datastore_mysql.c:297
+#: src/datacache/plugin_datacache_mysql.c:224
+#: src/datastore/plugin_datastore_mysql.c:316
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/datacache/plugin_datacache_mysql.c:227
-#: src/datastore/plugin_datastore_mysql.c:304
+#: src/datacache/plugin_datacache_mysql.c:230
+#: src/datastore/plugin_datastore_mysql.c:322
 #, fuzzy, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/datacache/plugin_datacache_mysql.c:1061
+#: src/datacache/plugin_datacache_mysql.c:979
 msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1801 src/testing/testing_group.c:1814
-#: src/testing/testing_group.c:1920 src/testing/testing_group.c:1981
-#: src/testing/testing_group.c:2070 src/testing/testing_group.c:2092
-#: src/testing/testing_group.c:2231 src/testing/test_testing_topology.c:1104
-#: src/testing/test_testing_topology_blacklist.c:457
-#: src/testing/testing_peergroup.c:856
-#: src/testing/test_testing_large_topology.c:1046
-#: src/dht/test_dht_multipeer.c:833 src/dht/gnunet-dht-driver.c:4001
-#: src/dv/test_transport_api_dv.c:1102
+#: src/testing/testing_group.c:1903 src/testing/testing_group.c:1915
+#: src/testing/testing_group.c:2016 src/testing/testing_group.c:2075
+#: src/testing/testing_group.c:2164 src/testing/testing_group.c:2184
+#: src/testing/testing_group.c:2321 src/testing/test_testing_topology.c:1078
+#: src/testing/test_testing_topology_blacklist.c:448
+#: src/testing/testing_peergroup.c:876
+#: src/testing/test_testing_large_topology.c:1022
+#: src/dht/test_dht_multipeer.c:864 src/dht/gnunet-dht-driver.c:3907
+#: src/dv/test_transport_api_dv.c:1132
 #, fuzzy, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/testing/testing_group.c:1824
+#: src/testing/testing_group.c:1925
 #, fuzzy, c-format
 msgid "Target is %d connections per peer."
 msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
 
-#: src/testing/testing_group.c:2079
+#: src/testing/testing_group.c:2172
 #, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2111 src/testing/testing_group.c:2307
+#: src/testing/testing_group.c:2202 src/testing/testing_group.c:2395
 #, c-format
 msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
 msgstr ""
 "Đang kết nối các điểm nút theo địa hình học hình xuyến hai chiều: %u hàng, "
 "%u cột\n"
 
-#: src/testing/testing_group.c:2148
+#: src/testing/testing_group.c:2239
 #, c-format
 msgid "natural log of %d is %d, will run %d iterations\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2151
+#: src/testing/testing_group.c:2242
 #, c-format
 msgid "Total connections added thus far: %u!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2193
+#: src/testing/testing_group.c:2283
 #, c-format
 msgid "Total connections added for small world: %d!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2246
+#: src/testing/testing_group.c:2335
 #, c-format
 msgid "rand is %f probability is %f\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2824 src/testing/testing_group.c:3035
+#: src/testing/testing_group.c:2910 src/testing/testing_group.c:3109
 #, fuzzy, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
@@ -295,372 +295,373 @@
 msgstr ""
 "Đặc tả mạng dạng sai trong cấu hình phần « %s » cho mục nhập « %s »: %s\n"
 
-#: src/testing/testing_group.c:2935
+#: src/testing/testing_group.c:3011
 msgid "Finished copying all friend files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3051
+#: src/testing/testing_group.c:3124
 #, fuzzy, c-format
 msgid "Copying file with command cp %s %s\n"
 msgstr "« %s » thất bại với mã lỗi %s: %s\n"
 
-#: src/testing/testing_group.c:3074
+#: src/testing/testing_group.c:3147
 #, c-format
 msgid "Copying file with command scp %s %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3092
+#: src/testing/testing_group.c:3164
 #, c-format
 msgid "Checking copy status of file %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3111
+#: src/testing/testing_group.c:3182
 #, c-format
 msgid "File %d copied\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3126
+#: src/testing/testing_group.c:3197
 msgid "Finished copying all blacklist files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3496 src/testing/testing_group.c:3624
-#: src/testing/testing_group.c:4839 src/testing/testing_group.c:4982
+#: src/testing/testing_group.c:3581 src/testing/testing_group.c:3720
+#: src/testing/testing_group.c:4925 src/testing/testing_group.c:5066
 msgid "Delaying connect, we have too many outstanding connections!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3506 src/testing/testing_group.c:4851
-#: src/testing/testing_group.c:4994
+#: src/testing/testing_group.c:3591 src/testing/testing_group.c:4935
+#: src/testing/testing_group.c:5076
 #, c-format
 msgid "Creating connection, outstanding_connections is %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3518
+#: src/testing/testing_group.c:3603
 #, fuzzy, c-format
 msgid "Offering Hello of peer %s to peer %s\n"
 msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
 
-#: src/testing/testing_group.c:3636
+#: src/testing/testing_group.c:3730
 #, c-format
 msgid "Creating connection, outstanding_connections is %d (max %d)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3887
+#: src/testing/testing_group.c:3983
 msgid "Creating clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3894
+#: src/testing/testing_group.c:3990
 msgid "Creating small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3901
+#: src/testing/testing_group.c:3997
 msgid "Creating small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3907
+#: src/testing/testing_group.c:4003
 msgid "Creating ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3913
+#: src/testing/testing_group.c:4009
 msgid "Creating 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3920
+#: src/testing/testing_group.c:4015
 msgid "Creating Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3926
+#: src/testing/testing_group.c:4021
 msgid "Creating InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3933
+#: src/testing/testing_group.c:4027
 msgid "Creating Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3940
+#: src/testing/testing_group.c:4034
 msgid "Creating straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3947
+#: src/testing/testing_group.c:4040
 msgid "Creating topology from file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3966
+#: src/testing/testing_group.c:4058
 msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3983
+#: src/testing/testing_group.c:4075
 msgid "Failed during friend file copying!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3991
+#: src/testing/testing_group.c:4083
 msgid "Friend files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4010
+#: src/testing/testing_group.c:4102
 msgid "Blacklisting all but clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4018
+#: src/testing/testing_group.c:4110
 msgid "Blacklisting all but small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4028
+#: src/testing/testing_group.c:4118
 msgid "Blacklisting all but small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4036
+#: src/testing/testing_group.c:4126
 msgid "Blacklisting all but ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4044
+#: src/testing/testing_group.c:4134
 msgid "Blacklisting all but 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4052
+#: src/testing/testing_group.c:4142
 msgid "Blacklisting all but Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4060
+#: src/testing/testing_group.c:4150
 msgid "Blacklisting all but InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4097
+#: src/testing/testing_group.c:4187
 msgid "Blacklisting all but Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4105
+#: src/testing/testing_group.c:4195
 msgid "Blacklisting all but straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4122
+#: src/testing/testing_group.c:4212
 msgid "Failed during blacklist file copying!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4130
+#: src/testing/testing_group.c:4220
 msgid "Blacklist files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5213
+#: src/testing/testing_group.c:5301
 msgid "Creating clique CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5220
+#: src/testing/testing_group.c:5308
 msgid "Creating small world (ring) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5227
+#: src/testing/testing_group.c:5315
 msgid "Creating small world (2d-torus) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5233
+#: src/testing/testing_group.c:5321
 msgid "Creating ring CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5240
+#: src/testing/testing_group.c:5328
 msgid "Creating 2d torus CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5247
+#: src/testing/testing_group.c:5335
 msgid "Creating Erdos-Renyi CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5254
+#: src/testing/testing_group.c:5342
 msgid "Creating InterNAT CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5261
+#: src/testing/testing_group.c:5349
 msgid "Creating Scale Free CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5268
+#: src/testing/testing_group.c:5356
 msgid "Creating straight line CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5274
+#: src/testing/testing_group.c:5362
 msgid "Creating no CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5280
+#: src/testing/testing_group.c:5368
 #, fuzzy
 msgid "Unknown topology specification, can't connect peers!\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
 
-#: src/testing/testing_group.c:5289
+#: src/testing/testing_group.c:5378
 #, c-format
 msgid "Connecting random subset (%'.2f percent) of possible peers\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5297
+#: src/testing/testing_group.c:5386
 #, c-format
 msgid "Connecting a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5305
+#: src/testing/testing_group.c:5395
 #, c-format
 msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5315
+#: src/testing/testing_group.c:5405
 #, c-format
 msgid "Finding additional %u closest peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5923
+#: src/testing/testing_group.c:6084
 #, fuzzy
 msgid "Could not read hostkeys file!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/testing/testing_group.c:5996
+#: src/testing/testing_group.c:6154
 #, c-format
 msgid "Could not create configuration for peer number %u on `%s'!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:6119 src/testing/testing.c:1189
+#: src/testing/testing_group.c:6298 src/testing/testing.c:1272
 #, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr ""
 
-#: src/testing/testing.c:210
-#, fuzzy
-msgid "Failed to connect to core service\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/testing/testing.c:247 src/testing/testing.c:735
-#: src/testing/testing.c:1947 src/testing/testing.c:1965
-#: src/testing/testing.c:2049 src/testing/testing.c:2065
-#, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/testing/testing.c:327
+#: src/testing/testing.c:208
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:342 src/testing/testing.c:912
+#: src/testing/testing.c:222 src/testing/testing.c:822
 #, fuzzy
 msgid "`scp' did not complete cleanly.\n"
 msgstr "« %s » không phải được kết nối tới đồng đẳng nào.\n"
 
-#: src/testing/testing.c:367
+#: src/testing/testing.c:245
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:368
+#: src/testing/testing.c:246
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/testing/testing.c:430
+#: src/testing/testing.c:302
 #, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr ""
 
-#: src/testing/testing.c:440
+#: src/testing/testing.c:309
 #, fuzzy
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/testing/testing.c:441 src/testing/testing.c:638
+#: src/testing/testing.c:310 src/testing/testing.c:508
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/testing/testing.c:506
+#: src/testing/testing.c:372
 #, fuzzy, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr "Gặp lỗi khi đọc thông tin từ gnunetd.\n"
 
-#: src/testing/testing.c:510
+#: src/testing/testing.c:376
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr ""
 
-#: src/testing/testing.c:520
+#: src/testing/testing.c:386
 #, fuzzy
 msgid "`Failed to get hostkey!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/testing/testing.c:556
+#: src/testing/testing.c:420
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:627
+#: src/testing/testing.c:500
 #, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr ""
 
-#: src/testing/testing.c:637
+#: src/testing/testing.c:507
 #, fuzzy
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr "Lỗi dừng chạy gnunet-auto-share.\n"
 
-#: src/testing/testing.c:665
+#: src/testing/testing.c:531 src/testing/testing.c:630
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:666
+#: src/testing/testing.c:532 src/testing/testing.c:631
+#: src/testing/testing.c:651
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:707
-msgid "Unable to connect to CORE service for peer!\n"
-msgstr ""
+#: src/testing/testing.c:571 src/testing/testing.c:2072
+#: src/testing/testing.c:2091
+#, fuzzy
+msgid "Failed to connect to transport service!\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/testing/testing.c:769
+#: src/testing/testing.c:600
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:797
+#: src/testing/testing.c:650
+msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
+msgstr ""
+
+#: src/testing/testing.c:673 src/testing/testing.c:707
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:827
+#: src/testing/testing.c:688 src/testing/testing.c:737
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr ""
 
-#: src/testing/testing.c:899
+#: src/testing/testing.c:810
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:1277 src/testing/testing.c:1407
+#: src/testing/testing.c:988
 #, fuzzy, c-format
+msgid "Starting service %s for peer `%4s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/testing/testing.c:1360 src/testing/testing.c:1443
+#: src/testing/testing.c:1581
+#, fuzzy, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/testing/testing.c:1359
+#: src/testing/testing.c:1533
 #, fuzzy, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/testing/testing.c:1492
+#: src/testing/testing.c:1668
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1500
+#: src/testing/testing.c:1676
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "Lỗi lưu cấu hình."
 
-#: src/testing/testing.c:1532
+#: src/testing/testing.c:1707
 #, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr ""
 
-#: src/testing/testing.c:1535
+#: src/testing/testing.c:1710
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "Lỗi lưu cấu hình."
 
-#: src/testing/testing.c:1723
+#: src/testing/testing.c:1881
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/testing/testing.c:1918 src/testing/testing.c:2036
+#: src/testing/testing.c:2036
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "Lỗi nạp dịch vụ sqstore. Hãy kiểm tra lại cấu hình.\n"
 
-#: src/testing/testing.c:2107
+#: src/testing/testing.c:2238
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
@@ -669,11 +670,11 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Đã nạp truyền tải « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:202
+#: src/peerinfo/gnunet-service-peerinfo.c:197
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:251
+#: src/peerinfo/gnunet-service-peerinfo.c:241
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -681,203 +682,201 @@
 "Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ "
 "bỏ.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:318
+#: src/peerinfo/gnunet-service-peerinfo.c:306
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:266
+#: src/peerinfo/peerinfo_api_notify.c:257
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/peerinfo/test_peerinfo_api.c:112 src/hostlist/hostlist-server.c:469
-#: src/peerinfo-tool/gnunet-peerinfo.c:168 src/dv/gnunet-service-dv.c:2833
-#: src/core/gnunet-service-core.c:3036 src/core/gnunet-service-core.c:3345
+#: src/peerinfo/test_peerinfo_api.c:109 src/hostlist/hostlist-server.c:437
+#: src/peerinfo-tool/gnunet-peerinfo.c:157 src/dv/gnunet-service-dv.c:2998
+#: src/core/gnunet-service-core.c:3034 src/core/gnunet-service-core.c:3328
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/peerinfo/peerinfo_api.c:280
+#: src/peerinfo/peerinfo_api.c:276
 #, fuzzy, c-format
 msgid "Failed to transmit message to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/peerinfo/peerinfo_api.c:447
+#: src/peerinfo/peerinfo_api.c:432
 #, fuzzy
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/peerinfo/peerinfo_api.c:476 src/peerinfo/peerinfo_api.c:494
+#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
 msgid "Received invalid message from `PEERINFO' service.\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:540
+#: src/peerinfo/peerinfo_api.c:521
 #, fuzzy
 msgid "Failed to transmit iteration request to `PEERINFO' service\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/peerinfo/peerinfo_api.c:580
+#: src/peerinfo/peerinfo_api.c:555
 msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:281
-#: src/hostlist/hostlist-client.c:620
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:259
+#: src/hostlist/hostlist-client.c:622
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:298
-#: src/hostlist/hostlist-client.c:594 src/hostlist/hostlist-client.c:1384
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:274
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1338
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:311
-#: src/hostlist/hostlist-server.c:377
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:286
+#: src/hostlist/hostlist-server.c:353
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:422
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:389
 #, c-format
 msgid "Hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:265
+#: src/hostlist/gnunet-daemon-hostlist.c:253
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:300
-#: src/topology/gnunet-daemon-topology.c:1452
-#: src/topology/gnunet-daemon-topology.c:1460 src/fs/gnunet-service-fs.c:544
+#: src/hostlist/gnunet-daemon-hostlist.c:286
+#: src/topology/gnunet-daemon-topology.c:1315
+#: src/topology/gnunet-daemon-topology.c:1322 src/fs/gnunet-service-fs.c:519
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:321
+#: src/hostlist/gnunet-daemon-hostlist.c:306
 #, fuzzy
 msgid "advertise our hostlist to other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/hostlist/gnunet-daemon-hostlist.c:311
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:328
+#: src/hostlist/gnunet-daemon-hostlist.c:314
 #, fuzzy
 msgid "enable learning about hostlist servers from other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:332
+#: src/hostlist/gnunet-daemon-hostlist.c:318
 #, fuzzy
 msgid "provide a hostlist server"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:344
+#: src/hostlist/gnunet-daemon-hostlist.c:330
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:135
+#: src/hostlist/hostlist-server.c:134
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/hostlist/hostlist-server.c:164
+#: src/hostlist/hostlist-server.c:160
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:194
-#: src/topology/gnunet-daemon-topology.c:973
-#: src/transport/gnunet-service-transport.c:3160
-#: src/transport/gnunet-service-transport.c:4572
+#: src/hostlist/hostlist-server.c:187
+#: src/topology/gnunet-daemon-topology.c:900
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/hostlist/hostlist-server.c:217
+#: src/hostlist/hostlist-server.c:208
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:234
+#: src/hostlist/hostlist-server.c:224
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:289
+#: src/hostlist/hostlist-server.c:272
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/hostlist-server.c:292
+#: src/hostlist/hostlist-server.c:275
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:283
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:309
+#: src/hostlist/hostlist-server.c:290
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:313
+#: src/hostlist/hostlist-server.c:294
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/hostlist-server.c:321
+#: src/hostlist/hostlist-server.c:302
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:323
+#: src/hostlist/hostlist-server.c:305
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/hostlist-server.c:329
+#: src/hostlist/hostlist-server.c:309
 #, fuzzy
 msgid "Received request for our hostlist\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/hostlist/hostlist-server.c:331
+#: src/hostlist/hostlist-server.c:310
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/hostlist-server.c:427
+#: src/hostlist/hostlist-server.c:398
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:599
-#: src/transport/gnunet-service-transport.c:6603
-#: src/peerinfo-tool/gnunet-peerinfo.c:224 src/core/gnunet-service-core.c:4703
+#: src/hostlist/hostlist-server.c:556
+#: src/transport/gnunet-service-transport.c:458
+#: src/peerinfo-tool/gnunet-peerinfo.c:208 src/core/gnunet-service-core.c:4607
 #, fuzzy, c-format
 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:611
+#: src/hostlist/hostlist-server.c:566
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:623
+#: src/hostlist/hostlist-server.c:575
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:639
+#: src/hostlist/hostlist-server.c:589
 #, 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:679
+#: src/hostlist/hostlist-server.c:627
 #, 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"
@@ -887,387 +886,383 @@
 msgid "# bytes downloaded from hostlist servers"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:343
+#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
 #, fuzzy
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/hostlist-client.c:314 src/hostlist/hostlist-client.c:347
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
 #, fuzzy, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/hostlist/hostlist-client.c:334
+#: src/hostlist/hostlist-client.c:330
 #, fuzzy
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: src/hostlist/hostlist-client.c:383 src/hostlist/hostlist-client.c:403
+#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
 #, fuzzy, c-format
 msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 "Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi động.\n"
 
-#: src/hostlist/hostlist-client.c:480 src/hostlist/hostlist-client.c:680
-#: src/hostlist/hostlist-client.c:687 src/hostlist/hostlist-client.c:739
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:885
-#: src/hostlist/hostlist-client.c:996 src/hostlist/hostlist-client.c:1002
-#: src/transport/test_plugin_transport_https.c:787
-#: src/transport/test_plugin_transport_https.c:796
-#: src/transport/plugin_transport_http.c:2094
-#: src/transport/plugin_transport_http.c:2103
+#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
+#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
+#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
+#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
+#: src/transport/test_plugin_transport_https.c:829
+#: src/transport/test_plugin_transport_https.c:837
+#: src/transport/plugin_transport_http.c:2059
+#: src/transport/plugin_transport_http.c:2067
+#: src/transport/test_plugin_transport_http.c:795
 #: src/transport/test_plugin_transport_http.c:803
-#: src/transport/test_plugin_transport_http.c:812
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/hostlist/hostlist-client.c:661
+#: src/hostlist/hostlist-client.c:663
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:810
+#: src/hostlist/hostlist-client.c:805
 #, fuzzy, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-client.c:827
+#: src/hostlist/hostlist-client.c:822
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:848
+#: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
 msgid "%s failed for `%s' at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/hostlist/hostlist-client.c:857
+#: src/hostlist/hostlist-client.c:848
 #, fuzzy, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/hostlist/hostlist-client.c:864
+#: src/hostlist/hostlist-client.c:856
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
+#: src/hostlist/hostlist-client.c:909
 #, fuzzy, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/hostlist/hostlist-client.c:926
+#: src/hostlist/hostlist-client.c:917
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1075 src/hostlist/hostlist-client.c:1567
+#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1511
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1084
+#: src/hostlist/hostlist-client.c:1054
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1124
+#: src/hostlist/hostlist-client.c:1092
 msgid "Scheduled saving of hostlists\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1128
+#: src/hostlist/hostlist-client.c:1096
 #, c-format
 msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1151 src/hostlist/hostlist-client.c:1171
+#: src/hostlist/hostlist-client.c:1117 src/hostlist/hostlist-client.c:1133
 #, fuzzy
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1249
 #, c-format
 msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1325
+#: src/hostlist/hostlist-client.c:1280
 #, fuzzy, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 "Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi động.\n"
 
-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/hostlist-client.c:1286
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-client.c:1335
+#: src/hostlist/hostlist-client.c:1290
 #, c-format
 msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1344
+#: src/hostlist/hostlist-client.c:1301
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/hostlist-client.c:1378
+#: src/hostlist/hostlist-client.c:1334
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1380
+#: src/hostlist/hostlist-client.c:1336
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/hostlist-client.c:1416
+#: src/hostlist/hostlist-client.c:1369
 #, fuzzy, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 "Chưa ghi rõ địa chỉ URL của danh sách các máy nên không nạp và khởi động.\n"
 
-#: src/hostlist/hostlist-client.c:1429
+#: src/hostlist/hostlist-client.c:1383
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/hostlist-client.c:1436
+#: src/hostlist/hostlist-client.c:1388
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-client.c:1464 src/hostlist/hostlist-client.c:1482
+#: src/hostlist/hostlist-client.c:1412 src/hostlist/hostlist-client.c:1429
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1476
+#: src/hostlist/hostlist-client.c:1424
 #, fuzzy
 msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/hostlist-client.c:1533
+#: src/hostlist/hostlist-client.c:1476
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1536
+#: src/hostlist/hostlist-client.c:1479
 #, c-format
 msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1545
+#: src/hostlist/hostlist-client.c:1488
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1557
+#: src/hostlist/hostlist-client.c:1500
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1560
+#: src/hostlist/hostlist-client.c:1504
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/topology/gnunet-daemon-topology.c:253
+#: src/topology/gnunet-daemon-topology.c:250
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:418
+#: src/topology/gnunet-daemon-topology.c:402
 #, fuzzy
 msgid "# connect requests issued to core"
 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:718
-#: src/topology/gnunet-daemon-topology.c:832
-#: src/transport/gnunet-service-transport.c:2666
-#: src/transport/gnunet-service-transport.c:2725
+#: src/topology/gnunet-daemon-topology.c:676
+#: src/topology/gnunet-daemon-topology.c:778
+#: src/transport/gnunet-service-transport_neighbours.c:432
+#: src/transport/gnunet-service-transport_neighbours.c:627
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/topology/gnunet-daemon-topology.c:741
-#: src/topology/gnunet-daemon-topology.c:839
+#: src/topology/gnunet-daemon-topology.c:697
+#: src/topology/gnunet-daemon-topology.c:783
 #, fuzzy
 msgid "# friends connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/topology/gnunet-daemon-topology.c:1059
+#: src/topology/gnunet-daemon-topology.c:977
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1097
+#: src/topology/gnunet-daemon-topology.c:1009
 #, fuzzy, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/topology/gnunet-daemon-topology.c:1110
+#: src/topology/gnunet-daemon-topology.c:1021
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1117
+#: src/topology/gnunet-daemon-topology.c:1027
 #, fuzzy, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1036
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1134
+#: src/topology/gnunet-daemon-topology.c:1044
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1150
+#: src/topology/gnunet-daemon-topology.c:1064
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1161
+#: src/topology/gnunet-daemon-topology.c:1077
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
 
-#: src/topology/gnunet-daemon-topology.c:1176
+#: src/topology/gnunet-daemon-topology.c:1087
 #, 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:1182
+#: src/topology/gnunet-daemon-topology.c:1093
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1193
+#: src/topology/gnunet-daemon-topology.c:1103
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1200
+#: src/topology/gnunet-daemon-topology.c:1109
 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:1206
+#: src/topology/gnunet-daemon-topology.c:1116
 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:1247
+#: src/topology/gnunet-daemon-topology.c:1151
 #, 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:1316
+#: src/topology/gnunet-daemon-topology.c:1208
 #, 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:1487
+#: src/topology/gnunet-daemon-topology.c:1348
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/statistics/statistics_api.c:325
+#: src/statistics/statistics_api.c:326
 #, fuzzy
 msgid "Failed to connect to statistics service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/statistics/gnunet-statistics.c:94
+#: src/statistics/gnunet-statistics.c:89
 #, fuzzy, c-format
 msgid "Failed to obtain statistics.\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:125 src/fs/gnunet-pseudonym.c:172
+#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:162
+#: src/statistics/gnunet-statistics.c:155
 msgid "limit output to statistcs for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:165
+#: src/statistics/gnunet-statistics.c:158
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:168
+#: src/statistics/gnunet-statistics.c:161
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:177
+#: src/statistics/gnunet-statistics.c:168
 msgid "Print statistics about GNUnet operations."
 msgstr "In ra thống kê về các thao tác GNUnet."
 
-#: src/statistics/gnunet-service-statistics.c:211
+#: src/statistics/gnunet-service-statistics.c:208
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-service-statistics.c:273
+#: src/statistics/gnunet-service-statistics.c:266
 #, fuzzy, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/util/os_priority.c:116
+#: src/util/os_priority.c:110
 #, c-format
 msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
-#: src/util/os_installation.c:296
+#: src/util/os_installation.c:291
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:482 src/transport/test_transport_api.c:642
-#: src/transport/test_transport_api_reliability.c:655
-#: src/transport/test_transport_api_unreliability.c:700
+#: src/util/os_installation.c:474
 #, 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:489 src/transport/test_transport_api.c:649
-#: src/transport/test_transport_api_reliability.c:662
-#: src/transport/test_transport_api_unreliability.c:707
+#: src/util/os_installation.c:479
 #, fuzzy, c-format
 msgid "stat (%s) failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/util/common_logging.c:154 src/util/common_logging.c:492
-#: src/util/test_common_logging.c:76
+#: src/util/common_logging.c:154 src/util/common_logging.c:500
+#: src/util/test_common_logging.c:75
 msgid "DEBUG"
 msgstr "GỠ LỖI"
 
-#: src/util/common_logging.c:156 src/util/common_logging.c:490
+#: src/util/common_logging.c:156 src/util/common_logging.c:498
 #: src/util/test_common_logging.c:72
 msgid "INFO"
 msgstr "TIN"
 
-#: src/util/common_logging.c:158 src/util/common_logging.c:488
+#: src/util/common_logging.c:158 src/util/common_logging.c:496
 #: src/util/test_common_logging.c:68
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/common_logging.c:160 src/util/common_logging.c:486
-#: src/util/test_common_logging.c:64
+#: src/util/common_logging.c:160 src/util/common_logging.c:494
+#: src/util/test_common_logging.c:65
 msgid "ERROR"
 msgstr "LỖI"
 
@@ -1275,33 +1270,33 @@
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:204 src/dht/plugin_dhtlog_mysql_dump.c:837
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:602
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:635
+#: src/util/common_logging.c:214 src/dht/plugin_dhtlog_mysql_dump.c:909
 #: src/dht/plugin_dhtlog_mysql_dump_load.c:669
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:703
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:737
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:770
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:803
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:836
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:700
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:732
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:764
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:796
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:827
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:858
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:889
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/util/common_logging.c:321
+#: src/util/common_logging.c:331
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n"
 
-#: src/util/common_logging.c:493
+#: src/util/common_logging.c:501
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:575
+#: src/util/common_logging.c:583
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:615
+#: src/util/common_logging.c:621
 msgid "invalid address"
 msgstr ""
 
@@ -1314,176 +1309,176 @@
 msgid "no-name"
 msgstr "không-tên"
 
-#: src/util/test_strings.c:42 src/util/strings.c:138
+#: src/util/test_strings.c:42 src/util/strings.c:139
 msgid "b"
 msgstr "b"
 
-#: src/util/test_strings.c:45 src/util/strings.c:144
+#: src/util/test_strings.c:45 src/util/strings.c:145
 msgid "KiB"
 msgstr "KiB"
 
-#: src/util/test_strings.c:48 src/util/strings.c:156
+#: src/util/test_strings.c:48 src/util/strings.c:157
 msgid "TiB"
 msgstr "TiB"
 
-#: src/util/test_strings.c:51 src/util/strings.c:362
+#: src/util/test_strings.c:51 src/util/strings.c:363
 msgid "ms"
 msgstr "mg"
 
-#: src/util/test_strings.c:57 src/util/strings.c:371
+#: src/util/test_strings.c:56 src/util/strings.c:372
 msgid "s"
 msgstr "g"
 
-#: src/util/test_strings.c:63 src/util/strings.c:379
+#: src/util/test_strings.c:61 src/util/strings.c:380
 msgid "h"
 msgstr "g"
 
-#: src/util/connection.c:459
+#: src/util/connection.c:457
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/util/connection.c:475
+#: src/util/connection.c:472
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:647
+#: src/util/connection.c:640
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
 
-#: src/util/connection.c:869 src/util/connection.c:1043
+#: src/util/connection.c:852 src/util/connection.c:1023
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/util/connection.c:1032
+#: src/util/connection.c:1013
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Lỗi kết nối\n"
 
-#: src/util/connection.c:1558
+#: src/util/connection.c:1529
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
 "failed (%p).\n"
 msgstr ""
 
-#: src/util/connection.c:1594
+#: src/util/connection.c:1565
 #, fuzzy, c-format
 msgid "Failed to send to `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/util/plugin.c:88
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n"
 
-#: src/util/plugin.c:148
+#: src/util/plugin.c:144
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr "« %s » không giải quyết được phương pháp « %s », với lỗi: %s\n"
 
-#: src/util/plugin.c:221
+#: src/util/plugin.c:217
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr "« %s » thất bại cho thư viện « %s » với lỗi: %s\n"
 
-#: src/util/bio.c:136 src/util/bio.c:143
+#: src/util/bio.c:134 src/util/bio.c:140
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/bio.c:144
+#: src/util/bio.c:141
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:200
+#: src/util/bio.c:193
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:212
+#: src/util/bio.c:203
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:258
+#: src/util/bio.c:248
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:273
+#: src/util/bio.c:262
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/crypto_rsa.c:623 src/util/crypto_rsa.c:673
+#: src/util/crypto_rsa.c:611 src/util/crypto_rsa.c:658
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/util/crypto_rsa.c:628
+#: src/util/crypto_rsa.c:616
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
 
-#: src/util/crypto_rsa.c:648
+#: src/util/crypto_rsa.c:634
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:677 src/util/crypto_rsa.c:719
+#: src/util/crypto_rsa.c:662 src/util/crypto_rsa.c:698
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:713
+#: src/util/crypto_rsa.c:693
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:734
+#: src/util/crypto_rsa.c:714
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
 
-#: src/util/crypto_rsa.c:754
+#: src/util/crypto_rsa.c:732
 #, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:978
+#: src/util/crypto_rsa.c:953
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/util/server.c:389
+#: src/util/server.c:384
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/server.c:399
+#: src/util/server.c:392
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/util/server.c:405
+#: src/util/server.c:397
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/util/server.c:627
+#: src/util/server.c:612
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/network.c:1088
+#: src/util/network.c:1193
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -1494,7 +1489,7 @@
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:264
+#: src/util/crypto_random.c:263
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
@@ -1504,32 +1499,32 @@
 msgid "Got IP address `%s' for our host.\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:146 src/util/resolver_api.c:914
+#: src/util/test_resolver_api.c:147 src/util/resolver_api.c:873
 #, c-format
 msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:152
+#: src/util/test_resolver_api.c:154
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s %u\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/test_resolver_api.c:259
+#: src/util/test_resolver_api.c:264
 #, c-format
 msgid "gethostbyname() could not lookup IP address: %s\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:318
+#: src/util/test_resolver_api.c:329
 #, c-format
 msgid "gethostbyaddr() could not lookup hostname: %s\n"
 msgstr ""
 
-#: src/util/configuration.c:246
+#: src/util/configuration.c:244
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
 
-#: src/util/configuration.c:810
+#: src/util/configuration.c:801
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -1538,140 +1533,145 @@
 "Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong "
 "tập hợp các sự chọn được phép\n"
 
-#: src/util/gnunet-resolver.c:89
+#: src/util/gnunet-resolver.c:76
 msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/client.c:311
+#: src/util/client.c:304
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:319
+#: src/util/client.c:312
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:679
+#: src/util/client.c:669
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:728
+#: src/util/client.c:729 src/util/service.c:880
 #, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr ""
+
+#: src/util/client.c:871
+#, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/util/client.c:744
+#: src/util/client.c:887
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/client.c:1017
+#: src/util/client.c:1158
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/scheduler.c:791
+#: src/util/scheduler.c:859
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:922
+#: src/util/scheduler.c:990
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/strings.c:148
+#: src/util/strings.c:149
 msgid "MiB"
 msgstr "MiB"
 
-#: src/util/strings.c:152
+#: src/util/strings.c:153
 msgid "GiB"
 msgstr "GiB"
 
-#: src/util/strings.c:191
+#: src/util/strings.c:193
 #, c-format
 msgid "Character set requested was `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:268
+#: src/util/strings.c:271
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Lỗi mở rộng biến môi trường « $HOME »: chưa đặt biến môi trường « HOME »"
 
-#: src/util/strings.c:367
+#: src/util/strings.c:368
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:375
+#: src/util/strings.c:376
 msgid "m"
 msgstr "p"
 
-#: src/util/strings.c:383
+#: src/util/strings.c:384
 msgid " days"
 msgstr " ngày"
 
-#: src/util/strings.c:407
+#: src/util/strings.c:408
 msgid "end of time"
 msgstr ""
 
-#: src/util/disk.c:418
+#: src/util/disk.c:429
 #, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/disk.c:781
+#: src/util/disk.c:829
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Mong đợi « %s » là một thư mục.\n"
 
-#: src/util/disk.c:1134 src/util/service.c:1510
+#: src/util/disk.c:1180 src/util/service.c:1456
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Không thể lấy thông tin về người dùng « %s »: %s\n"
 
-#: src/util/disk.c:1438
+#: src/util/disk.c:1486
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:199
+#: src/util/resolver_api.c:198
 #, fuzzy, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/util/resolver_api.c:219
+#: src/util/resolver_api.c:217
 #, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:363
+#: src/util/resolver_api.c:354
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/util/resolver_api.c:367
+#: src/util/resolver_api.c:358
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "không quyết định các tên máy"
 
-#: src/util/resolver_api.c:441
+#: src/util/resolver_api.c:427
 #, c-format
 msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:827
+#: src/util/resolver_api.c:789
 #, c-format
 msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:920
+#: src/util/resolver_api.c:879
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/resolver_api.c:953
+#: src/util/resolver_api.c:911
 #, c-format
 msgid "Resolving our hostname `%s'\n"
 msgstr ""
@@ -1681,18 +1681,18 @@
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/gnunet-service-resolver.c:318
-#: src/util/gnunet-service-resolver.c:367
+#: src/util/gnunet-service-resolver.c:317
+#: src/util/gnunet-service-resolver.c:362
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
-#: src/util/gnunet-service-resolver.c:469
+#: src/util/gnunet-service-resolver.c:460
 #, c-format
 msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:516
+#: src/util/gnunet-service-resolver.c:508
 #, c-format
 msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
@@ -1702,63 +1702,63 @@
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/util/getopt.c:693
+#: src/util/getopt.c:692
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s: tùy chọn « --%s » không cho phép đối số\n"
 
-#: src/util/getopt.c:699
+#: src/util/getopt.c:697
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s: tùy chọn « %c%s » không cho phép đối số\n"
 
-#: src/util/getopt.c:718 src/util/getopt.c:887
+#: src/util/getopt.c:714 src/util/getopt.c:882
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s: tùy chọn « %s » cần thiết đối số\n"
 
-#: src/util/getopt.c:747
+#: src/util/getopt.c:743
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s: không nhận ra tùy chọn « --%s »\n"
 
-#: src/util/getopt.c:751
+#: src/util/getopt.c:747
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s: không nhận ra tùy chọn « %c%s »\n"
 
-#: src/util/getopt.c:776
+#: src/util/getopt.c:772
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s: tùy chọn không được phép -- %c\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:774
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s: tùy chọn không hợp lệ -- %c\n"
 
-#: src/util/getopt.c:806 src/util/getopt.c:936
+#: src/util/getopt.c:802 src/util/getopt.c:930
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s: tùy chọn cần thiết đối số -- %c\n"
 
-#: src/util/getopt.c:854
+#: src/util/getopt.c:850
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
 
-#: src/util/getopt.c:872
+#: src/util/getopt.c:868
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s: tùy chọn « -W %s » không cho phép đối số\n"
 
-#: src/util/getopt.c:1041
+#: src/util/getopt.c:1034
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr ""
 "Hãy sử dụng câu lệnh trợ giúp « --help » để xem danh sách các tùy chọn.\n"
 
-#: src/util/signal.c:77
+#: src/util/signal.c:78
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
@@ -1771,142 +1771,137 @@
 "Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn "
 "ngắn.\n"
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:284
+#: src/util/getopt_helpers.c:254 src/util/getopt_helpers.c:282
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 
-#: src/util/service.c:114 src/util/service.c:142 src/util/service.c:188
-#: src/util/service.c:212 src/util/service.c:219
+#: src/util/service.c:112 src/util/service.c:138 src/util/service.c:182
+#: src/util/service.c:202 src/util/service.c:209
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/service.c:171
+#: src/util/service.c:165
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
 
-#: src/util/service.c:268
+#: src/util/service.c:258
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
 
-#: src/util/service.c:304
+#: src/util/service.c:292
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/service.c:336
+#: src/util/service.c:323
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/service.c:649
+#: src/util/service.c:627
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:656
+#: src/util/service.c:632
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "\tKhông rõ miền tên « %s »\n"
 
-#: src/util/service.c:662
+#: src/util/service.c:639
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:707
+#: src/util/service.c:683
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:735
+#: src/util/service.c:712
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:857
+#: src/util/service.c:829
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:881 src/transport/plugin_transport_tcp.c:2048
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1927
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/service.c:915
+#: src/util/service.c:900
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/service.c:936
-#, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:953
+#: src/util/service.c:917
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:985
+#: src/util/service.c:947
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/util/service.c:1003
+#: src/util/service.c:965
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/util/service.c:1163 src/util/service.c:1182
+#: src/util/service.c:1121 src/util/service.c:1139
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1211
+#: src/util/service.c:1166
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1367
+#: src/util/service.c:1315
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/service.c:1402
+#: src/util/service.c:1349
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Đồng đẳng « %s » có mức tin cậy %8u\n"
 
-#: src/util/service.c:1450
+#: src/util/service.c:1397
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1455
+#: src/util/service.c:1401
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1459
+#: src/util/service.c:1405
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1511
+#: src/util/service.c:1457
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/util/service.c:1525
+#: src/util/service.c:1471
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n"
 
-#: src/util/service.c:1585
+#: src/util/service.c:1534
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -1915,70 +1910,70 @@
 msgid "`%' must be followed by HEX number"
 msgstr ""
 
-#: src/fs/fs_uri.c:275
+#: src/fs/fs_uri.c:273
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:293
+#: src/fs/fs_uri.c:291
 msgid "`++' not allowed in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:300
+#: src/fs/fs_uri.c:298
 msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:370 src/fs/fs_uri.c:377
+#: src/fs/fs_uri.c:366 src/fs/fs_uri.c:373
 msgid "Malformed SKS URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:421 src/fs/fs_uri.c:441
+#: src/fs/fs_uri.c:417 src/fs/fs_uri.c:432
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:572 src/fs/fs_uri.c:592 src/fs/fs_uri.c:602
-#: src/fs/fs_uri.c:631
+#: src/fs/fs_uri.c:562 src/fs/fs_uri.c:577 src/fs/fs_uri.c:587
+#: src/fs/fs_uri.c:615
 msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:611
+#: src/fs/fs_uri.c:597
 msgid "SKS URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:617
+#: src/fs/fs_uri.c:603
 msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:625
+#: src/fs/fs_uri.c:609
 msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:636
+#: src/fs/fs_uri.c:622
 msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:649
+#: src/fs/fs_uri.c:634
 msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:688
+#: src/fs/fs_uri.c:672
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:923
+#: src/fs/fs_uri.c:897
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/fs/fs_uri.c:930
+#: src/fs/fs_uri.c:904
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/fs/fs_uri.c:1248 src/fs/fs_uri.c:1275
+#: src/fs/fs_uri.c:1212 src/fs/fs_uri.c:1239
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1281
+#: src/fs/fs_uri.c:1245
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
@@ -1987,299 +1982,305 @@
 msgid "Failed to receive response for `%s' request from `%s' service.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/fs_list_indexed.c:119
+#: src/fs/fs_list_indexed.c:117
 #, fuzzy, c-format
 msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/fs_list_indexed.c:176
+#: src/fs/fs_list_indexed.c:164
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-service-fs_lc.c:207 src/fs/gnunet-service-fs_lc.c:377
-#: src/fs/gnunet-service-fs_lc.c:519
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
+#: src/fs/gnunet-service-fs_lc.c:480
 #, fuzzy
 msgid "# client searches active"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/fs/gnunet-service-fs_lc.c:262
+#: src/fs/gnunet-service-fs_lc.c:254
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/fs/gnunet-service-fs_lc.c:323
+#: src/fs/gnunet-service-fs_lc.c:312
 #, fuzzy
 msgid "# client searches received"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/fs/gnunet-service-fs_lc.c:367
+#: src/fs/gnunet-service-fs_lc.c:351
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/fs_publish.c:152 src/fs/fs_publish.c:462
+#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:740 src/fs/fs_publish.c:756 src/fs/fs_publish.c:797
-#: src/fs/fs_publish.c:816 src/fs/fs_publish.c:846 src/fs/fs_publish.c:1020
+#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
+#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Lỗi đánh chỉ mục tập tin « %s ». Đề nghị: thử chèn tập tin.\n"
 
-#: src/fs/fs_publish.c:742
+#: src/fs/fs_publish.c:649
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:754
+#: src/fs/fs_publish.c:661
 #, fuzzy
 msgid "unknown error"
 msgstr "Lỗi không rõ"
 
-#: src/fs/fs_publish.c:799
+#: src/fs/fs_publish.c:704
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:818
+#: src/fs/fs_publish.c:724
 #, fuzzy
 msgid "filename too long"
 msgstr "tên tập tin"
 
-#: src/fs/fs_publish.c:848
+#: src/fs/fs_publish.c:751
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:877
+#: src/fs/fs_publish.c:775
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/fs_publish.c:956
+#: src/fs/fs_publish.c:845
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/fs/fs_publish.c:964
+#: src/fs/fs_publish.c:851
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:1022
+#: src/fs/fs_publish.c:899
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1219
+#: src/fs/fs_publish.c:1078
 #, fuzzy, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr "Không đủ quyền truy cập cho « %s »: %s\n"
 
-#: src/fs/fs_publish.c:1295
+#: src/fs/fs_publish.c:1149
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1665
+#: src/fs/fs_publish.c:1482
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/fs/fs_publish.c:1702 src/fs/fs_namespace.c:890
+#: src/fs/fs_publish.c:1518 src/fs/fs_namespace.c:822
 #, fuzzy
 msgid "Internal error."
 msgstr "Lỗi VR."
 
-#: src/fs/gnunet-download.c:104
+#: src/fs/gnunet-download.c:100
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-download.c:113
+#: src/fs/gnunet-download.c:112
 #, c-format
 msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:125
+#: src/fs/gnunet-download.c:121
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-download.c:132
+#: src/fs/gnunet-download.c:129
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
 
-#: src/fs/gnunet-download.c:150 src/fs/gnunet-unindex.c:118
-#: src/fs/gnunet-search.c:199 src/fs/gnunet-publish.c:165
+#: src/fs/gnunet-download.c:144 src/fs/gnunet-unindex.c:109
+#: src/fs/gnunet-search.c:190 src/fs/gnunet-publish.c:155
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/fs/gnunet-download.c:179
+#: src/fs/gnunet-download.c:169
 #, fuzzy, c-format
 msgid "You need to specify a URI argument.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-download.c:187 src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-download.c:175 src/fs/gnunet-publish.c:426
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/fs/gnunet-download.c:197
+#: src/fs/gnunet-download.c:182
 #, c-format
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:205
+#: src/fs/gnunet-download.c:189
 #, c-format
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:224 src/fs/gnunet-unindex.c:158
-#: src/fs/gnunet-search.c:260 src/fs/gnunet-publish.c:469
+#: src/fs/gnunet-download.c:203 src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-search.c:241 src/fs/gnunet-publish.c:404
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-search.c:285
 #, fuzzy
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: src/fs/gnunet-download.c:273
+#: src/fs/gnunet-download.c:243
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "xoá việc tải về không hoàn thành (khi hủy bở dùng CTRL-C)"
 
-#: src/fs/gnunet-download.c:276 src/fs/gnunet-search.c:316
+#: src/fs/gnunet-download.c:246 src/fs/gnunet-search.c:288
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:279
+#: src/fs/gnunet-download.c:249
 msgid "write the file to FILENAME"
 msgstr "ghi tập tin vào TÊN_TẬP_TIN"
 
-#: src/fs/gnunet-download.c:283
+#: src/fs/gnunet-download.c:253
 #, fuzzy
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
 
-#: src/fs/gnunet-download.c:287
+#: src/fs/gnunet-download.c:257
 #, fuzzy
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
 
-#: src/fs/gnunet-download.c:290
+#: src/fs/gnunet-download.c:260
 msgid "download a GNUnet directory recursively"
 msgstr "tải xuống đệ quy một thư mục GNUnet"
 
-#: src/fs/gnunet-download.c:293 src/fs/gnunet-unindex.c:191
-#: src/fs/gnunet-search.c:327 src/fs/gnunet-publish.c:684
-#: src/dht/gnunet-dht-get-peer.c:201 src/dht/gnunet-dht-put.c:188
-#: src/dht/gnunet-dht-get.c:214 src/nse/nse-profiler.c:442
+#: src/fs/gnunet-download.c:263 src/fs/gnunet-unindex.c:169
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:585
+#: src/mesh/test_mesh_small.c:674 src/dht/gnunet-dht-get-peer.c:190
+#: src/dht/gnunet-dht-put.c:176 src/dht/gnunet-dht-get.c:204
+#: src/nse/gnunet-nse-profiler.c:655
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:302
+#: src/fs/gnunet-download.c:270
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:93
+#: src/fs/gnunet-unindex.c:89
 #, fuzzy, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr "Lỗi bỏ chỉ mục (không đưa ra lý do)."
 
-#: src/fs/gnunet-unindex.c:102
+#: src/fs/gnunet-unindex.c:96
 #, fuzzy, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 "\n"
 "Gặp lỗi khi bỏ chỉ mục tập tin: %s\n"
 
-#: src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-unindex.c:101
 #, fuzzy, c-format
 msgid "Unindexing done.\n"
 msgstr "Bỏ chỉ mục tập tin."
 
-#: src/fs/gnunet-unindex.c:144
+#: src/fs/gnunet-unindex.c:131
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-unindex.c:169
+#: src/fs/gnunet-unindex.c:148
 #, fuzzy, c-format
 msgid "Could not start unindex operation.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/fs/gnunet-unindex.c:200
+#: src/fs/gnunet-unindex.c:176
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/fs_namespace.c:54 src/fs/fs_namespace.c:83
+#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s' in section `%s'\n"
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/fs/fs_namespace.c:117
+#: src/fs/fs_namespace.c:107
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_namespace.c:146 src/fs/fs_namespace.c:239
+#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:449 src/fs/fs_namespace.c:471
+#: src/fs/fs_namespace.c:323
 #, fuzzy
+msgid "Unknown error"
+msgstr "Lỗi không rõ.\n"
+
+#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
+#, fuzzy
 msgid "Failed to serialize meta data"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/fs/fs_namespace.c:489
+#: src/fs/fs_namespace.c:452
 #, fuzzy
 msgid "Failed to connect to datastore service"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_namespace.c:537
+#: src/fs/fs_namespace.c:495
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/fs_namespace.c:642
+#: src/fs/fs_namespace.c:597
 #, fuzzy, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr "Lỗi thêm mục nhập vào không gian tên « %s » (có chưa ?)\n"
 
-#: src/fs/fs_namespace.c:943
+#: src/fs/fs_namespace.c:866
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/gnunet-pseudonym.c:192
+#: src/fs/gnunet-pseudonym.c:165
 #, fuzzy, c-format
 msgid "Namespace `%s' unknown.\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/fs/gnunet-pseudonym.c:284 src/fs/gnunet-pseudonym.c:291
-#: src/fs/gnunet-pseudonym.c:293
+#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
+#: src/fs/gnunet-pseudonym.c:249
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/fs/gnunet-pseudonym.c:313 src/fs/gnunet-publish.c:630
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:532
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: src/fs/gnunet-pseudonym.c:317
+#: src/fs/gnunet-pseudonym.c:272
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:321
+#: src/fs/gnunet-pseudonym.c:275
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:325
+#: src/fs/gnunet-pseudonym.c:278
 #, fuzzy
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
@@ -2288,171 +2289,185 @@
 "thêm một từ khóa bổ sung cho tất cả tập tin và thư mục (có thể chỉ ra tùy "
 "chọn này nhiều lần)"
 
-#: src/fs/gnunet-pseudonym.c:329 src/fs/gnunet-publish.c:650
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:551
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "đặt siêu dữ liệu cho KIỂU đưa ra thành GIÁ_TRỊ chỉ ra"
 
-#: src/fs/gnunet-pseudonym.c:332
+#: src/fs/gnunet-pseudonym.c:285
 #, fuzzy
 msgid "print names of local namespaces"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: src/fs/gnunet-pseudonym.c:335
+#: src/fs/gnunet-pseudonym.c:288
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:338
+#: src/fs/gnunet-pseudonym.c:291
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:341 src/fs/gnunet-publish.c:669
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:570
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:345
+#: src/fs/gnunet-pseudonym.c:297
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: src/fs/gnunet-pseudonym.c:349
+#: src/fs/gnunet-pseudonym.c:300
 #, fuzzy
 msgid "change rating of namespace ID by VALUE"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: src/fs/gnunet-pseudonym.c:359
+#: src/fs/gnunet-pseudonym.c:308
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-search.c:117
+#: src/fs/gnunet-search.c:111
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:188
+#: src/fs/gnunet-search.c:181
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-search.c:246
+#: src/fs/gnunet-search.c:231
 #, fuzzy, c-format
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-search.c:280
+#: src/fs/gnunet-search.c:255
 #, fuzzy, c-format
 msgid "Could not start searching.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-search.c:320
+#: src/fs/gnunet-search.c:291
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:324
+#: src/fs/gnunet-search.c:294
 msgid "automatically terminate search after VALUE ms"
 msgstr ""
 
-#: src/fs/gnunet-search.c:336
+#: src/fs/gnunet-search.c:301
+msgid "automatically terminate search after VALUE results are found"
+msgstr ""
+
+#: src/fs/gnunet-search.c:308
 #, fuzzy
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr "Không hiển thị kết quả tìm kiếm cho tập tin được chúng ta tải lên"
 
-#: src/fs/fs_unindex.c:64
+#: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:72
+#: src/fs/fs_unindex.c:63
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Lỗi gửi tin nhẳn.\n"
 
-#: src/fs/fs_unindex.c:261
+#: src/fs/fs_unindex.c:235
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:269
+#: src/fs/fs_unindex.c:243
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:277
+#: src/fs/fs_unindex.c:251
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/fs/fs_unindex.c:328
+#: src/fs/fs_unindex.c:296
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_unindex.c:363
+#: src/fs/fs_unindex.c:331
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/fs_unindex.c:376
+#: src/fs/fs_unindex.c:344
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_unindex.c:414
+#: src/fs/fs_unindex.c:378
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/gnunet-directory.c:53
+#: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:100
+#: src/fs/gnunet-directory.c:94
 #, fuzzy, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr "==> Thư mục « %s »:\n"
 
-#: src/fs/gnunet-directory.c:106
+#: src/fs/gnunet-directory.c:97
 #, fuzzy, c-format
 msgid "Directory `%s' contents:\n"
 msgstr "==> Thư mục « %s »:\n"
 
-#: src/fs/gnunet-directory.c:147
+#: src/fs/gnunet-directory.c:132
 #, fuzzy, c-format
 msgid "You must specify a filename to inspect."
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-directory.c:163
+#: src/fs/gnunet-directory.c:145
 #, fuzzy, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/gnunet-directory.c:203
+#: src/fs/gnunet-directory.c:176
 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
 
-#: src/fs/fs_file_information.c:362
+#: src/fs/fs_file_information.c:349
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s': %s"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/fs/fs_test_lib.c:282
+#: src/fs/fs_test_lib.c:269
 #, fuzzy, c-format
 msgid "Failed to start daemon: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:158
+#: src/fs/gnunet-service-fs_pe.c:228
 #, fuzzy
 msgid "# average retransmission delay (ms)"
 msgstr "# thời gian trung bình còn kết nối (theo miligiây)"
 
-#: src/fs/gnunet-service-fs_pe.c:241
+#: src/fs/gnunet-service-fs_pe.c:334
 msgid "# queries messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:354 src/fs/gnunet-service-fs_pe.c:423
-#: src/fs/gnunet-service-fs_pe.c:455
+#: src/fs/gnunet-service-fs_pe.c:457
+#, fuzzy
+msgid "# requests merged"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#: src/fs/gnunet-service-fs_pe.c:463
+#, fuzzy
+msgid "# requests refreshed"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#: src/fs/gnunet-service-fs_pe.c:511 src/fs/gnunet-service-fs_pe.c:586
+#: src/fs/gnunet-service-fs_pe.c:622
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/fs_getopt.c:202
+#: src/fs/fs_getopt.c:191
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2466,95 +2481,95 @@
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:118
+#: src/fs/gnunet-publish.c:115
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:128
+#: src/fs/gnunet-publish.c:123
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-publish.c:141
+#: src/fs/gnunet-publish.c:134
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:145
+#: src/fs/gnunet-publish.c:138
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/fs/gnunet-publish.c:292
+#: src/fs/gnunet-publish.c:265
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:267
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Từ khoá cho tập tin « %s »:\n"
 
-#: src/fs/gnunet-publish.c:358
+#: src/fs/gnunet-publish.c:312
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-publish.c:411
+#: src/fs/gnunet-publish.c:354
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "Không thể trích siêu dữ liệu ra một địa chỉ URI.\n"
 
-#: src/fs/gnunet-publish.c:419
+#: src/fs/gnunet-publish.c:361
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-publish.c:425
+#: src/fs/gnunet-publish.c:367
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-publish.c:434
+#: src/fs/gnunet-publish.c:375
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:445 src/fs/gnunet-publish.c:453
+#: src/fs/gnunet-publish.c:385 src/fs/gnunet-publish.c:392
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:482
+#: src/fs/gnunet-publish.c:414
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-publish.c:536
+#: src/fs/gnunet-publish.c:459
 #, fuzzy, c-format
 msgid "Could not access file: %s\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:573
+#: src/fs/gnunet-publish.c:484
 #, fuzzy, c-format
 msgid "Could not publish `%s': %s\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:507
 #, fuzzy, c-format
 msgid "Could not start publishing.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/fs/gnunet-publish.c:634
+#: src/fs/gnunet-publish.c:536
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên"
 
-#: src/fs/gnunet-publish.c:638
+#: src/fs/gnunet-publish.c:539
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:642
+#: src/fs/gnunet-publish.c:543
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2562,7 +2577,7 @@
 "in ra danh sách các từ khóa đã giải phóng cần sử dụng, nhưng không thực hiện "
 "tải lên"
 
-#: src/fs/gnunet-publish.c:646
+#: src/fs/gnunet-publish.c:547
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2570,7 +2585,7 @@
 "thêm một từ khoá bổ sung cho tập tin hoặc thư mục ở cấp đầu (có thể chỉ ra "
 "tùy chọn này nhiều lần)"
 
-#: src/fs/gnunet-publish.c:653
+#: src/fs/gnunet-publish.c:554
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2578,7 +2593,7 @@
 "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng "
 "mã hóa trong cơ sở dữ liệu GNUnet)"
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:559
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2586,16 +2601,16 @@
 "chỉ ra mã số của một phiên bản đã cập nhật để công bố trong tương lai (chỉ "
 "cho sự chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:662
+#: src/fs/gnunet-publish.c:563
 msgid "specify the priority of the content"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/fs/gnunet-publish.c:666
+#: src/fs/gnunet-publish.c:567
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "công bố các tập tin dưới biệt hiệu TÊN (đặt tập tin vào không gian tên)"
 
-#: src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-publish.c:573
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -2603,13 +2618,13 @@
 msgstr ""
 "chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
 
-#: src/fs/gnunet-publish.c:676
+#: src/fs/gnunet-publish.c:577
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "đặt mã số của phiên bản này của sự công bố (chỉ cho chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:680
+#: src/fs/gnunet-publish.c:581
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -2617,689 +2632,703 @@
 "Địa chỉ URI cần công bố (có thể được dùng thay vào gửi một tập tin để thêm "
 "từ khoá vào tập tin có địa chỉ URI tương ứng)"
 
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:594
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_directory.c:209 src/fs/fs_directory.c:221
+#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
 #, fuzzy
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
 
-#: src/fs/gnunet-service-fs_cp.c:726
+#: src/fs/gnunet-service-fs_cp.c:693
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:765
+#: src/fs/gnunet-service-fs_cp.c:728
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/fs/gnunet-service-fs_cp.c:773
+#: src/fs/gnunet-service-fs_cp.c:734
 #, fuzzy
 msgid "# replies dropped"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_cp.c:806 src/fs/gnunet-service-fs_cp.c:936
-#: src/fs/gnunet-service-fs_cp.c:1367 src/fs/gnunet-service-fs_cp.c:1414
+#: src/fs/gnunet-service-fs_cp.c:763 src/fs/gnunet-service-fs_cp.c:879
+#: src/fs/gnunet-service-fs_cp.c:1289 src/fs/gnunet-service-fs_cp.c:1326
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:889
+#: src/fs/gnunet-service-fs_cp.c:836
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:959
+#: src/fs/gnunet-service-fs_cp.c:899
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:974
+#: src/fs/gnunet-service-fs_cp.c:913
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1019
+#: src/fs/gnunet-service-fs_cp.c:951
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1087
+#: src/fs/gnunet-service-fs_cp.c:1018
 #, 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:1112
+#: src/fs/gnunet-service-fs_cp.c:1042
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1122
+#: src/fs/gnunet-service-fs_cp.c:1052
 #, 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:1201
+#: src/fs/gnunet-service-fs_cp.c:1131
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1236
+#: src/fs/gnunet-service-fs_cp.c:1165
 #, 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:1260
+#: src/fs/gnunet-service-fs_cp.c:1189
 #, 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:1329
+#: src/fs/gnunet-service-fs_cp.c:1255
 #, 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:1360
+#: src/fs/gnunet-service-fs_cp.c:1283
 #, 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:1410
+#: src/fs/gnunet-service-fs_cp.c:1324
 #, 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/fs_download.c:332
+#: src/fs/fs_download.c:309
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:354
+#: src/fs/fs_download.c:329
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:536 src/fs/fs_download.c:554
+#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:872
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/fs_download.c:1070
+#: src/fs/fs_download.c:958
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1108
+#: src/fs/fs_download.c:985
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1133
+#: src/fs/fs_download.c:1008
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_download.c:1149
+#: src/fs/fs_download.c:1020
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:1161
+#: src/fs/fs_download.c:1029
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_download.c:2017
+#: src/fs/fs_download.c:1826
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:116
-#: src/fs/gnunet-service-fs_indexing.c:177
+#: src/fs/gnunet-service-fs_indexing.c:113
+#: src/fs/gnunet-service-fs_indexing.c:163
 #, fuzzy, c-format
 msgid "Configuration option `%s' in section `%s' missing.\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:125
-#: src/fs/gnunet-service-fs_indexing.c:192
+#: src/fs/gnunet-service-fs_indexing.c:121
+#: src/fs/gnunet-service-fs_indexing.c:177
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:147
+#: src/fs/gnunet-service-fs_indexing.c:137
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/fs/gnunet-service-fs_indexing.c:252
+#: src/fs/gnunet-service-fs_indexing.c:228
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:297
+#: src/fs/gnunet-service-fs_indexing.c:266
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:548
+#: src/fs/gnunet-service-fs_indexing.c:487
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:628
+#: src/fs/gnunet-service-fs_indexing.c:552
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:632
+#: src/fs/gnunet-service-fs_indexing.c:554
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:663
+#: src/fs/gnunet-service-fs_indexing.c:569
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Đánh chỉ mục dữ liệu của tập tin « %s » bị lỗi tại vị tri %llu.\n"
 
-#: src/fs/fs_search.c:859
+#: src/fs/fs_search.c:798
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:388 src/fs/gnunet-service-fs_pr.c:633
+#: src/fs/gnunet-service-fs_pr.c:300
 #, fuzzy
+msgid "# Pending requests created"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#: src/fs/gnunet-service-fs_pr.c:379 src/fs/gnunet-service-fs_pr.c:638
+#, fuzzy
 msgid "# Pending requests active"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:769
+#: src/fs/gnunet-service-fs_pr.c:802
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:802
+#: src/fs/gnunet-service-fs_pr.c:829
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:821
+#: src/fs/gnunet-service-fs_pr.c:845
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:838
+#: src/fs/gnunet-service-fs_pr.c:860
 #, fuzzy
 msgid "# results found locally"
 msgstr "# nội dung lỗ hổng được tìm cục bộ"
 
-#: src/fs/gnunet-service-fs_pr.c:937
+#: src/fs/gnunet-service-fs_pr.c:952
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:962
+#: src/fs/gnunet-service-fs_pr.c:979
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_pr.c:999
+#: src/fs/gnunet-service-fs_pr.c:1012
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1101
+#: src/fs/gnunet-service-fs_pr.c:1102
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1122
+#: src/fs/gnunet-service-fs_pr.c:1123
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1172
+#: src/fs/gnunet-service-fs_pr.c:1170
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1186
+#: src/fs/gnunet-service-fs_pr.c:1184
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1195
+#: src/fs/gnunet-service-fs_pr.c:1193
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1209
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1230
+#: src/fs/gnunet-service-fs_pr.c:1226
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1239
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1250
+#: src/fs/gnunet-service-fs_pr.c:1244
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1275 src/fs/gnunet-service-fs_pr.c:1323
-#: src/fs/gnunet-service-fs_pr.c:1442
+#: src/fs/gnunet-service-fs_pr.c:1270 src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1426
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1342
+#: src/fs/gnunet-service-fs_pr.c:1329
 msgid "# Datastore lookups concluded (found ultimate result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1356
+#: src/fs/gnunet-service-fs_pr.c:1342
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1421
+#: src/fs/gnunet-service-fs_pr.c:1404
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1487
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1576
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/fs/fs.c:313
+#: src/fs/fs.c:284
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs.c:324
+#: src/fs/fs.c:293
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs.c:332
+#: src/fs/fs.c:299
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs.c:967
+#: src/fs/fs.c:877
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs.c:1445
+#: src/fs/fs.c:1323
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs.c:1491
+#: src/fs/fs.c:1364
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1510
+#: src/fs/fs.c:1380
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs.c:2166
+#: src/fs/fs.c:1984
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2179
+#: src/fs/fs.c:1994
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs.c:2308 src/fs/fs.c:2570
+#: src/fs/fs.c:2107 src/fs/fs.c:2346
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs.c:2331
+#: src/fs/fs.c:2124
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs.c:2347 src/fs/fs.c:2368 src/fs/fs.c:2881
+#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2555
+#: src/fs/fs.c:2337
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs.c:2831
+#: src/fs/fs.c:2583
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs.c:2924
+#: src/fs/fs.c:2669
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:682
+#: src/fs/gnunet-service-fs_push.c:642
 #, c-format
 msgid ""
 "Invalid value specified for option `%s' in section `%s', content pushing "
 "disabled\n"
 msgstr ""
 
-#: src/block/plugin_block_fs.c:138
+#: src/block/plugin_block_fs.c:128
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:105
+#: src/block/plugin_block_dht.c:99
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
 msgstr "Không biết truyền tải nào kiểu %d.\n"
 
-#: src/block/plugin_block_dht.c:114
+#: src/block/plugin_block_dht.c:106
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:126
+#: src/block/plugin_block_dht.c:115
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/block/block.c:113
+#: src/block/block.c:108
 #, fuzzy, c-format
 msgid "Loading block plugins `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/block/block.c:122
+#: src/block/block.c:118
 #, fuzzy, c-format
 msgid "Failed to load block plugin `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:953
+#: src/mesh/test_mesh_small.c:687
+msgid "Test mesh in a small network."
+msgstr ""
+
+#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:859
 #, fuzzy
 msgid "Failed to transmit shutdown ACK.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/mockup-service.c:47 src/arm/gnunet-service-arm.c:959
+#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:864
 msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:71 src/arm/gnunet-service-arm.c:987
+#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:892
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:200
+#: src/arm/gnunet-service-arm.c:206
 #, c-format
 msgid "Restarting service `%s' due to configuration file change.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:229
+#: src/arm/gnunet-service-arm.c:234
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:266
+#: src/arm/gnunet-service-arm.c:268
 msgid "Not sending status result to client: no client known\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:428
+#: src/arm/gnunet-service-arm.c:406
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-service-arm.c:432
+#: src/arm/gnunet-service-arm.c:409
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:460
+#: src/arm/gnunet-service-arm.c:435
 #, c-format
 msgid "ARM is shutting down, service `%s' not started.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:469
+#: src/arm/gnunet-service-arm.c:443
 #, c-format
 msgid "Service `%s' already running.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:480
+#: src/arm/gnunet-service-arm.c:453
 #, fuzzy, c-format
 msgid "Binary implementing service `%s' not known!\n"
 msgstr "Không thẩm tra được chữ ký: không rõ đồng đẳng « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:493
+#: src/arm/gnunet-service-arm.c:464
 #, fuzzy, c-format
 msgid "Configuration file `%s' for service `%s' not known!\n"
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/arm/gnunet-service-arm.c:531
+#: src/arm/gnunet-service-arm.c:498
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:727
+#: src/arm/gnunet-service-arm.c:665
 msgid "Stopping all services\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:785
+#: src/arm/gnunet-service-arm.c:717
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:869
+#: src/arm/gnunet-service-arm.c:790
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:874
+#: src/arm/gnunet-service-arm.c:795
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:879
+#: src/arm/gnunet-service-arm.c:800
 #, fuzzy
 msgid "unknown"
 msgstr "Lỗi không rõ"
 
-#: src/arm/gnunet-service-arm.c:891
+#: src/arm/gnunet-service-arm.c:807
 #, fuzzy, c-format
 msgid "Service `%s' stopped\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-service-arm.c:905
+#: src/arm/gnunet-service-arm.c:821
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:156
+#: src/arm/gnunet-arm.c:161
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-arm.c:160
+#: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
 msgid "Failed to stop service `%s'!\n"
 msgstr "Lỗi vào phòng « %s »\n"
 
-#: src/arm/gnunet-arm.c:166
+#: src/arm/gnunet-arm.c:171
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-arm.c:170
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Failed to start service `%s'!\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:181
 #, fuzzy, c-format
 msgid "Some error communicating with service `%s'.\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/arm/gnunet-arm.c:203
+#: src/arm/gnunet-arm.c:207
 #, fuzzy, c-format
 msgid "Service `%s' is running.\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/arm/gnunet-arm.c:208
+#: src/arm/gnunet-arm.c:212
 #, fuzzy, c-format
 msgid "Service `%s' is not running.\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/arm/gnunet-arm.c:235
+#: src/arm/gnunet-arm.c:238
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:244 src/arm/gnunet-arm.c:338
+#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:265
+#: src/arm/gnunet-arm.c:269
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/arm/gnunet-arm.c:271
+#: src/arm/gnunet-arm.c:275
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:387
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:389
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:371
+#: src/arm/gnunet-arm.c:391
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:373
+#: src/arm/gnunet-arm.c:393
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:375
+#: src/arm/gnunet-arm.c:396
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:378
+#: src/arm/gnunet-arm.c:399
 msgid "test if a particular service is running"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:380
+#: src/arm/gnunet-arm.c:402
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:382
+#: src/arm/gnunet-arm.c:404
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:391
+#: src/arm/gnunet-arm.c:407
+#, fuzzy
+msgid "timeout for completing current operation"
+msgstr "thời gian chờ sự hoàn thành của một lần lặp (theo miligiây)"
+
+#: src/arm/gnunet-arm.c:418
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:820
+#: src/arm/gnunet-service-arm_interceptor.c:803
 #, c-format
 msgid "Unable to forward to service `%s': shutdown\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:828
+#: src/arm/gnunet-service-arm_interceptor.c:812
 #, c-format
 msgid "Unable to forward to service `%s': timeout before connect\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:895
+#: src/arm/gnunet-service-arm_interceptor.c:868
 #, fuzzy, c-format
 msgid "Unable to start service `%s': %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/arm/gnunet-service-arm_interceptor.c:964
+#: src/arm/gnunet-service-arm_interceptor.c:936
 #, fuzzy, c-format
 msgid "Unable to accept connection for service `%s': %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/arm/gnunet-service-arm_interceptor.c:982
+#: src/arm/gnunet-service-arm_interceptor.c:952
 #, fuzzy, c-format
 msgid "Service `%s' started\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:1112
+#: src/arm/gnunet-service-arm_interceptor.c:1080
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/arm/gnunet-service-arm_interceptor.c:1134
+#: src/arm/gnunet-service-arm_interceptor.c:1102
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1151
+#: src/arm/gnunet-service-arm_interceptor.c:1116
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:203 src/arm/test_exponential_backoff.c:194
+#: src/arm/arm_api.c:201 src/arm/test_exponential_backoff.c:192
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:399
+#: src/arm/arm_api.c:390
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/arm/arm_api.c:414
+#: src/arm/arm_api.c:405
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/arm/arm_api.c:495
+#: src/arm/arm_api.c:469
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:568
+#: src/arm/arm_api.c:539
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:569
+#: src/arm/arm_api.c:540
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:593
+#: src/arm/arm_api.c:563
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:594
+#: src/arm/arm_api.c:566
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:626 src/arm/arm_api.c:630
+#: src/arm/arm_api.c:598 src/arm/arm_api.c:602
 #, fuzzy, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr "« %s »: Chưa nhận thông báo sau %llu miligiây.\n"
 
-#: src/arm/arm_api.c:701
+#: src/arm/arm_api.c:675
 #, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/dht/dhtlog.c:57
+#: src/dht/dhtlog.c:56
 #, c-format
 msgid "Loading `%s' dhtlog plugin\n"
 msgstr ""
@@ -3309,1150 +3338,915 @@
 msgid "Failed to load dhtlog plugin for `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:823
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:588
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:621
+#: src/dht/plugin_dhtlog_mysql_dump.c:895
 #: src/dht/plugin_dhtlog_mysql_dump_load.c:655
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:689
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:723
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:756
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:789
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:822
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:686
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:718
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:750
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:782
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:813
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:844
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:875
 #, fuzzy, c-format
 msgid "Failed to get full path for `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:852
+#: src/dht/plugin_dhtlog_mysql_dump.c:924
 #, fuzzy
 msgid "Failed to create file for dhtlog.\n"
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/dht/gnunet-dht-get-peer.c:86
+#: src/dht/gnunet-dht-get-peer.c:84
 #, c-format
 msgid "Found %u peers\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:121
+#: src/dht/gnunet-dht-get-peer.c:115
 #, fuzzy, c-format
 msgid "Found peer `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/dht/gnunet-dht-get-peer.c:195 src/dht/gnunet-dht-put.c:173
-#: src/dht/gnunet-dht-get.c:205
+#: src/dht/gnunet-dht-get-peer.c:184 src/dht/gnunet-dht-put.c:161
+#: src/dht/gnunet-dht-get.c:195
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:198 src/dht/gnunet-dht-put.c:182
-#: src/dht/gnunet-dht-get.c:211
+#: src/dht/gnunet-dht-get-peer.c:187 src/dht/gnunet-dht-put.c:170
+#: src/dht/gnunet-dht-get.c:201
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:222
+#: src/dht/gnunet-dht-get-peer.c:209
 msgid "Issue a GET PEER request to the GNUnet DHT, print results."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:96
+#: src/dht/gnunet-dht-put.c:95
 #, fuzzy, c-format
 msgid "PUT request sent!\n"
 msgstr "# độ tin cậy được tiêu phí"
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:119
 #, c-format
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:130
+#: src/dht/gnunet-dht-put.c:127
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/dht/gnunet-dht-put.c:137
+#: src/dht/gnunet-dht-put.c:132
 #, fuzzy, c-format
 msgid "Connected to %s service!\n"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/dht/gnunet-dht-put.c:153
+#: src/dht/gnunet-dht-put.c:147
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:176
+#: src/dht/gnunet-dht-put.c:164
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:179
+#: src/dht/gnunet-dht-put.c:167
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:185
+#: src/dht/gnunet-dht-put.c:173
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:209
+#: src/dht/gnunet-dht-put.c:195
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:208
+#: src/dht/gnunet-dht-get.c:198
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:235
+#: src/dht/gnunet-dht-get.c:223
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/dht_api.c:238
+#: src/dht/dht_api.c:235
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/dht/plugin_dhtlog_mysql.c:1592
+#: src/dht/plugin_dhtlog_mysql.c:1550
 #, fuzzy
 msgid "Failed to initialize MySQL database connection for dhtlog.\n"
 msgstr "Lỗi sơ khởi kết nối cơ sở dữ liệu MySQL cho kho dữ liệu.\n"
 
-#: src/transport/test_plugin_transport_udp.c:196
-#: src/transport/test_plugin_transport_https.c:1194
-#: src/transport/test_plugin_transport.c:213
-#: src/transport/gnunet-service-transport.c:6586
-#: src/transport/test_plugin_transport_http.c:1277
+#: src/transport/test_plugin_transport_udp.c:185
+#: src/transport/test_plugin_transport_https.c:1271
+#: src/transport/test_plugin_transport.c:202
+#: src/transport/gnunet-service-transport.c:435
+#: src/transport/test_plugin_transport_http.c:1232
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:207
-#: src/transport/test_plugin_transport_https.c:1260
-#: src/transport/test_plugin_transport.c:224
-#: src/transport/gnunet-service-transport.c:6621
-#: src/transport/test_plugin_transport_http.c:1303
+#: src/transport/test_plugin_transport_udp.c:195
+#: src/transport/test_plugin_transport_https.c:1335
+#: src/transport/test_plugin_transport.c:212
+#: src/transport/gnunet-service-transport.c:444
+#: src/transport/test_plugin_transport_http.c:1255
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:217
+#: src/transport/test_plugin_transport_udp.c:205
 #, fuzzy
 msgid "Loading udp transport plugin\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/test_plugin_transport_udp.c:225
+#: src/transport/test_plugin_transport_udp.c:213
 #, fuzzy
 msgid "Failed to load transport plugin for udp\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/transport/plugin_transport_wlan.c:1574
-#: src/transport/plugin_transport_wlan.c:1629
-#: src/transport/plugin_transport_wlan.c:1810
+#: src/transport/plugin_transport_wlan.c:1422
+#: src/transport/plugin_transport_wlan.c:1617
+#: src/transport/plugin_transport_wlan.c:1736
 #, c-format
 msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1955
+#: src/transport/plugin_transport_wlan.c:1854
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3213
+#: src/transport/plugin_transport_wlan.c:2710
 #, c-format
 msgid "Finished reading from wlan-helper stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:406
+#: src/transport/gnunet-service-transport_clients.c:246
+#, c-format
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:251
+#, fuzzy
+msgid "# messages dropped due to slow client"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#: src/transport/gnunet-service-transport_clients.c:394
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:511
+#, fuzzy
+msgid "# bytes payload received for other peers"
+msgstr "# các byte kiểu %d được nhận"
+
+#: src/transport/gnunet-service-transport_clients.c:528
+msgid "# bytes payload dropped (other peer was not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:579
+#, fuzzy
+msgid "# REQUEST CONNECT messages received"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/gnunet-service-transport_clients.c:607
+#, fuzzy
+msgid "# SET QUOTA messages received"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/gnunet-service-transport_neighbours.c:776
+#, fuzzy
+msgid "# messages not sent (no such peer or not connected)"
+msgstr "# các thông báo được chắp liền"
+
+#: src/transport/gnunet-service-transport_neighbours.c:796
+#, 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:864
+#, 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:882
+msgid "# ms throttling suggested"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:907
+#, fuzzy
+msgid "# KEEPALIVE messages discarded (not connected)"
+msgstr "# các thông báo được chắp liền"
+
+#: src/transport/gnunet-service-transport_neighbours.c:937
+msgid "# SET QUOTA messages ignored (no such peer)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:949
+msgid "# disconnects due to quota of 0"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:108
+msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:115
+#, fuzzy, c-format
+msgid "Starting transport plugins `%s'\n"
+msgstr "Đang nạp các truyền tải « %s »\n"
+
+#: src/transport/gnunet-service-transport_plugins.c:119
+#, fuzzy, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr "Đang nạp các truyền tải « %s »\n"
+
+#: src/transport/gnunet-service-transport_plugins.c:139
+#, fuzzy, c-format
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
+
+#: src/transport/test_plugin_transport_https.c:409
 msgid "Phase 0: Test plugin functions failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:411
+#: src/transport/test_plugin_transport_https.c:418
 msgid "Phase 1: Test connect with wrong data failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:416
+#: src/transport/test_plugin_transport_https.c:427
 msgid "Phase 2: Test session selection failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:421
+#: src/transport/test_plugin_transport_https.c:435
 msgid "Phase 3: Test sending with plugin failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:694
-#: src/transport/test_plugin_transport_http.c:700
+#: src/transport/test_plugin_transport_https.c:726
+#: src/transport/test_plugin_transport_http.c:692
 #, fuzzy, c-format
 msgid "curl failed for `%s' at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/transport/test_plugin_transport_https.c:713
-#: src/transport/test_plugin_transport_http.c:721
+#: src/transport/test_plugin_transport_https.c:746
+#: src/transport/test_plugin_transport_http.c:712
 msgid "Connecting to peer without any peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:723
-#: src/transport/test_plugin_transport_http.c:733
+#: src/transport/test_plugin_transport_https.c:759
+#: src/transport/test_plugin_transport_http.c:725
 msgid "Connecting to peer with too short peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:733
-#: src/transport/test_plugin_transport_http.c:745
+#: src/transport/test_plugin_transport_https.c:772
+#: src/transport/test_plugin_transport_http.c:738
 msgid "Connecting to peer with too long peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:743
+#: src/transport/test_plugin_transport_https.c:785
 msgid "Connecting to peer with valid peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:884
-#: src/transport/test_plugin_transport_http.c:899
+#: src/transport/test_plugin_transport_https.c:924
+#: src/transport/test_plugin_transport_http.c:887
 #, c-format
 msgid "Unknown address size: ipv6 has %u ipv4 has %u but this has %u\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:891
-#: src/transport/test_plugin_transport_http.c:906
+#: src/transport/test_plugin_transport_https.c:930
+#: src/transport/test_plugin_transport_http.c:893
 #, c-format
 msgid "Transport plugin notification for address: `%s':%u\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:994
-#: src/transport/test_plugin_transport_http.c:1021
+#: src/transport/test_plugin_transport_https.c:1038
+#: src/transport/test_plugin_transport_http.c:1002
 msgid "Connecting to peer without any peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1005
-#: src/transport/test_plugin_transport_http.c:1037
+#: src/transport/test_plugin_transport_https.c:1053
+#: src/transport/test_plugin_transport_http.c:1017
 msgid "Connecting to peer with too short peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1018
-#: src/transport/test_plugin_transport_http.c:1051
+#: src/transport/test_plugin_transport_https.c:1069
+#: src/transport/test_plugin_transport_http.c:1033
 msgid "Connecting to peer with too long peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1029
-#: src/transport/test_plugin_transport_http.c:1068
+#: src/transport/test_plugin_transport_https.c:1083
+#: src/transport/test_plugin_transport_http.c:1047
 msgid "Connecting to peer with valid peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1038
+#: src/transport/test_plugin_transport_https.c:1093
 msgid ""
 "\n"
 "Phase 1: transmit data to all suggested addresses\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1085
+#: src/transport/test_plugin_transport_https.c:1151
 msgid ""
 "\n"
 "Phase 2: session selection\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1115
+#: src/transport/test_plugin_transport_https.c:1187
 msgid ""
 "\n"
 "Phase 3: send multiple or big messages after disconnect\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1120
+#: src/transport/test_plugin_transport_https.c:1193
 #, fuzzy
 msgid "Phase 3: sending messages\n"
 msgstr "Lỗi gửi tin nhẳn.\n"
 
-#: src/transport/test_plugin_transport_https.c:1210
-#: src/transport/plugin_transport_http.c:3380
-#: src/transport/test_plugin_transport_http.c:1293
+#: src/transport/test_plugin_transport_https.c:1284
+#: src/transport/plugin_transport_http.c:3321
+#: src/transport/test_plugin_transport_http.c:1245
 #, c-format
 msgid "Require valid port number for transport plugin `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1275
+#: src/transport/test_plugin_transport_https.c:1352
 #, fuzzy, c-format
 msgid "Loading HTTPS transport plugin `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/test_plugin_transport_https.c:1281
+#: src/transport/test_plugin_transport_https.c:1358
 #, fuzzy
 msgid "Failed to load transport plugin for https\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/transport/test_plugin_transport_https.c:1290
+#: src/transport/test_plugin_transport_https.c:1368
 #, c-format
 msgid "Transport plugin returned %u addresses to connect to\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1359
+#: src/transport/test_plugin_transport_https.c:1444
 msgid ""
 "\n"
 "Phase 0\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1417
-#: src/transport/test_plugin_transport_https.c:1420
+#: src/transport/test_plugin_transport_https.c:1507
+#: src/transport/test_plugin_transport_https.c:1510
 msgid ""
 "\n"
 "delete\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_transport_api.c:583
-#: src/transport/test_transport_api_reliability.c:596
-#: src/transport/test_transport_api_unreliability.c:641
-msgid "PATH environment variable is unset.\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-list-connections.c:86
-#: src/peerinfo-tool/gnunet-peerinfo.c:214
-#: src/core/gnunet-core-list-connections.c:170
+#: src/transport/gnunet-transport-list-connections.c:91
+#: src/peerinfo-tool/gnunet-peerinfo.c:200
+#: src/core/gnunet-core-list-connections.c:166
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/transport/gnunet-transport-list-connections.c:109
-#: src/peerinfo-tool/gnunet-peerinfo.c:278
-#: src/core/gnunet-core-list-connections.c:194
+#: src/transport/gnunet-transport-list-connections.c:112
+#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/core/gnunet-core-list-connections.c:187
 msgid "don't resolve host names"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport-list-connections.c:117
-#: src/core/gnunet-core-list-connections.c:202
+#: src/transport/gnunet-transport-list-connections.c:119
+#: src/core/gnunet-core-list-connections.c:194
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/test_plugin_transport.c:236
+#: src/transport/test_plugin_transport.c:224
 #, fuzzy
 msgid "Loading tcp transport plugin\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/test_plugin_transport.c:244
+#: src/transport/test_plugin_transport.c:232
 #, fuzzy
 msgid "Failed to load transport plugin for tcp\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/transport/plugin_transport_http.c:700
-#: src/transport/plugin_transport_http.c:1259
-#: src/transport/plugin_transport_http.c:2585
+#: src/transport/gnunet-service-transport_hello.c:176
+msgid "# refreshed my HELLO"
+msgstr ""
+
+#: src/transport/plugin_transport_http.c:698
+#: src/transport/plugin_transport_http.c:1231
+#: src/transport/plugin_transport_http.c:2551
 #, fuzzy
 msgid "# HTTP peers active"
 msgstr "# Tín hiệu HTTP GET được nhận"
 
-#: src/transport/plugin_transport_http.c:1008
-#: src/transport/plugin_transport_http.c:1326
+#: src/transport/plugin_transport_http.c:993
+#: src/transport/plugin_transport_http.c:1306
 msgid "# HTTP inbound sessions for peers active"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1930
+#: src/transport/plugin_transport_http.c:1889
 #, c-format
 msgid "Connection %X: HTTP PUT to peer `%s' (`%s') failed: `%s' `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1954
+#: src/transport/plugin_transport_http.c:1915
 #, c-format
 msgid "Connection %X: HTTP GET to peer `%s' (`%s') failed: `%s' `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:2222
-#: src/transport/plugin_transport_http.c:2326
+#: src/transport/plugin_transport_http.c:2193
+#: src/transport/plugin_transport_http.c:2305
 #, fuzzy, c-format
 msgid "Connection: %X: %s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/transport/plugin_transport_http.c:2626
+#: src/transport/plugin_transport_http.c:2592
 msgid "# HTTP outbound sessions for peers active"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3407
-#: src/transport/plugin_transport_http.c:3435
+#: src/transport/plugin_transport_http.c:3349
+#: src/transport/plugin_transport_http.c:3378
 msgid "Misconfigured address to bind to in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3466
+#: src/transport/plugin_transport_http.c:3404
 #, c-format
 msgid "Required configuration options missing in section `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3502
-#, c-format
-msgid "Could not create a new TLS certificate, shell script `%s' failed!\n"
+#: src/transport/plugin_transport_http.c:3442
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3518
+#: src/transport/plugin_transport_http.c:3458
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3642
+#: src/transport/plugin_transport_http.c:3610
 #, c-format
 msgid ""
 "HTTP Server with %s could not be started on port %u! %s plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3658
+#: src/transport/plugin_transport_http.c:3626
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1145
+#: src/transport/plugin_transport_tcp.c:504
 #, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
-
-#: src/transport/gnunet-service-transport.c:1153
-#, c-format
-msgid "Blacklist file `%s' is empty.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1166
-#, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/transport/gnunet-service-transport.c:1185
-#: src/transport/gnunet-service-transport.c:1206
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
-
-#: src/transport/gnunet-service-transport.c:1195
-#: src/transport/gnunet-service-transport.c:1228
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
-msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
-
-#: src/transport/gnunet-service-transport.c:1240
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-msgstr ""
-"Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
-
-#: src/transport/gnunet-service-transport.c:1257
-#, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1303
-msgid "# bytes discarded (could not transmit to client)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1428
-msgid "# address validation timeouts"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1465
-#, c-format
-msgid ""
-"Dropping message of type %u and size %u, have %u messages pending (%u is the "
-"soft limit)\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1471
-#, fuzzy
-msgid "# messages dropped due to slow client"
-msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
-
-#: src/transport/gnunet-service-transport.c:1575
-#: src/transport/gnunet-service-transport.c:1753
-msgid "# bytes pending with plugins"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1581
-#, fuzzy
-msgid "# bytes successfully transmitted by plugins"
-msgstr "# các byte được gửi"
-
-#: src/transport/gnunet-service-transport.c:1588
-msgid "# bytes with transmission failure by plugins"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1614
-#: src/transport/gnunet-service-transport.c:2021
-#: src/transport/gnunet-service-transport.c:2028
-#: src/transport/gnunet-service-transport.c:2068
-#: src/transport/gnunet-service-transport.c:2467
-#: src/transport/gnunet-service-transport.c:2524
-#: src/transport/gnunet-service-transport.c:4917
-#, fuzzy
-msgid "# connected addresses"
-msgstr "# của các đồng đẳng đã kết nối"
-
-#: src/transport/gnunet-service-transport.c:1671
-msgid "# transport selected peer address freely"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1679
-#, fuzzy
-msgid "# transport failed to selected peer address"
-msgstr "Đang quảng cáo truyền tải %d của mình tới các đồng đẳng đã chọn.\n"
-
-#: src/transport/gnunet-service-transport.c:1692
-#: src/transport/gnunet-service-transport.c:1749
-#: src/transport/gnunet-service-transport.c:1826
-#: src/transport/gnunet-service-transport.c:4945
-#, 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.c:1696
-msgid "# bytes discarded (no destination address available)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1708
-msgid "# message delivery deferred (no address)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:1911
-#: src/transport/gnunet-service-transport.c:3838
-#, fuzzy
-msgid "# PING without HELLO messages sent"
-msgstr "# các thông báo PONG nhập thô được gửi"
-
-#: src/transport/gnunet-service-transport.c:2140
-#, fuzzy
-msgid "# transmission attempts failed (no address)"
-msgstr "Lỗi thử gửi, kiểu truyền tải %d không được hỗ trợ\n"
-
-#: src/transport/gnunet-service-transport.c:2214
-msgid "# refreshed my HELLO"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2241
-msgid "# transmitted my HELLO to other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2354
-msgid "# disconnects due to try_fast_reconnect"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2419
-msgid "# disconnects due to session end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2455
-msgid "# disconnects due to unready session"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2482
-msgid "# try_fast_reconnect thanks to plugin_env_session_end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2491
-msgid "# disconnects due to missing pong"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2532
-msgid "# disconnects due to NO pong"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2545
-msgid "# try_fast_reconnect thanks to validated_address"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2569
-msgid "# disconnects due to plugin_env_session_end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3033
-msgid "# disconnects due to timeout"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3074
-msgid "# valid peer addresses returned by PEERINFO"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3093
-msgid "# previously validated addresses lacking transport"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3123
-#: src/transport/gnunet-service-transport.c:4206
-#: src/transport/gnunet-service-transport.c:4924
-#, fuzzy
-msgid "# peer addresses considered valid"
-msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
-
-#: src/transport/gnunet-service-transport.c:3168
-#: src/transport/gnunet-service-transport.c:3258
-#: src/transport/gnunet-service-transport.c:4581
-#: src/transport/gnunet-service-transport.c:4827
-#: src/transport/gnunet-service-transport.c:4987
-#: src/transport/gnunet-service-transport.c:6336
-msgid "# outstanding peerinfo iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3220
-#: src/transport/gnunet-service-transport.c:5009
-msgid "# active neighbours"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3254
-msgid "# peerinfo new neighbor iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3266
-msgid "# HELLO's sent to new neighbors"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3562
-msgid "# disconnects due to blacklist"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3833
-#, fuzzy
-msgid "# PING with HELLO messages sent"
-msgstr "# các thông báo PING được tạo"
-
-#: src/transport/gnunet-service-transport.c:3842
-#, fuzzy
-msgid "# PING messages sent for re-validation"
-msgstr "# các thông báo PING được tạo"
-
-#: src/transport/gnunet-service-transport.c:3966
-msgid "# payload received from other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4130
-#, c-format
-msgid ""
-"Not accepting PONG from `%s' with address `%s' since I cannot confirm using "
-"this address.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4169
-msgid "Received expired signature.  Check system time.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4173
-msgid "# address validation successes"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4287
-#: src/core/gnunet-service-core.c:4287
-#, fuzzy
-msgid "# PONG messages received"
-msgstr "# các thông báo PONG đã mật mã được nhận"
-
-#: src/transport/gnunet-service-transport.c:4400
-msgid "# PING messages sent for initial validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4442
-msgid "# peer addresses scheduled for validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4451
-#, c-format
-msgid ""
-"Transport `%s' not loaded, will not try to validate peer address using this "
-"transport.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4454
-msgid "# peer addresses not validated (plugin not available)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4470
-msgid "# peer addresses not validated (loopback)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4516
-msgid "# peer addresses not validated (in progress)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4605
-msgid "# new HELLOs requiring full validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4616
-msgid "# duplicate HELLO (peer known)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4661
-msgid "# no existing neighbour record (validating HELLO)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4666
-msgid "# HELLO validations (update case)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4706
-#, fuzzy
-msgid "# HELLOs received for validation"
-msgstr "# các khối được lấy để nâng cấp"
-
-#: src/transport/gnunet-service-transport.c:4737
-msgid "# HELLOs ignored for validation (is my own HELLO)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4754
-msgid "# HELLOs ignored due to high load"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4823
-msgid "# peerinfo process hello iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4949
-#, fuzzy
-msgid "# bytes discarded due to disconnect"
-msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
-
-#: src/transport/gnunet-service-transport.c:5054
-#, fuzzy, c-format
-msgid "Received `%s' message from `%s' destined for `%s' which is not me!\n"
-msgstr "Nhận được PING « %s » không dành cho chúng ta.\n"
-
-#: src/transport/gnunet-service-transport.c:5076
-#: src/core/gnunet-service-core.c:4264
-#, fuzzy
-msgid "# PING messages received"
-msgstr "# các thông báo PING được tạo"
-
-#: src/transport/gnunet-service-transport.c:5088
-#, c-format
-msgid "Refusing to create PONG since I do not have a session with `%s'.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5161
-#, c-format
-msgid ""
-"Not confirming PING with address `%s' since I cannot confirm having this "
-"address.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5256
-msgid "# PONGs unicast via reliable transport"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5269
-msgid "# PONGs multicast to all available addresses"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5300
-#, c-format
-msgid "Could not send PONG to `%s': no address available\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5408
-#, fuzzy
-msgid "# bytes received from other peers"
-msgstr "# các byte kiểu %d được nhận"
-
-#: src/transport/gnunet-service-transport.c:5425
-#, c-format
-msgid ""
-"Dropping incoming message due to repeated bandwidth quota (%u b/s) "
-"violations (total of %u).\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5429
-#, 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.c:5466
-#, fuzzy
-msgid "# HELLO messages received from other peers"
-msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
-
-#: src/transport/gnunet-service-transport.c:5497
-msgid "# ms throttling suggested"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5547
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5621
-msgid "# HELLOs received from clients"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5714
-msgid "# payload received for other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5757
-#, fuzzy
-msgid "# REQUEST CONNECT messages received"
-msgstr "# các thông báo PONG đã mật mã được nhận"
-
-#: src/transport/gnunet-service-transport.c:5788
-#, fuzzy
-msgid "# SET QUOTA messages received"
-msgstr "# các thông báo PONG đã mật mã được nhận"
-
-#: src/transport/gnunet-service-transport.c:5796
-msgid "# SET QUOTA messages ignored (no such peer)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5819
-msgid "# disconnects due to quota of 0"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:6137
-#, fuzzy, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr "Đang nạp các truyền tải « %s »\n"
-
-#: src/transport/gnunet-service-transport.c:6149
-#, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
-
-#: src/transport/gnunet-service-transport.c:6645
-#, fuzzy, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr "Đang nạp các truyền tải « %s »\n"
-
-#: src/transport/gnunet-service-transport.c:6738
-msgid "Transport service ready.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:515
-#, fuzzy, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/transport/plugin_transport_tcp.c:606
-#: src/transport/plugin_transport_tcp.c:702
-#: src/transport/plugin_transport_tcp.c:756
-#: src/transport/plugin_transport_tcp.c:848
-#: src/transport/plugin_transport_tcp.c:1208
+#: src/transport/plugin_transport_tcp.c:590
+#: src/transport/plugin_transport_tcp.c:679
+#: src/transport/plugin_transport_tcp.c:728
+#: src/transport/plugin_transport_tcp.c:817
+#: src/transport/plugin_transport_tcp.c:1142
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:614
-#: src/transport/plugin_transport_tcp.c:877
-#: src/transport/plugin_transport_tcp.c:1623
+#: src/transport/plugin_transport_tcp.c:596
+#: src/transport/plugin_transport_tcp.c:843
+#: src/transport/plugin_transport_tcp.c:1531
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_tcp.c:706
+#: src/transport/plugin_transport_tcp.c:683
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:760
+#: src/transport/plugin_transport_tcp.c:731
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:852
+#: src/transport/plugin_transport_tcp.c:821
 #, 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:989
+#: src/transport/plugin_transport_tcp.c:942
 #, fuzzy
 msgid "# bytes TCP was asked to transmit"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:1046
+#: src/transport/plugin_transport_tcp.c:993
 msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1091
+#: src/transport/plugin_transport_tcp.c:1034
 #, fuzzy, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/transport/plugin_transport_tcp.c:1110
+#: src/transport/plugin_transport_tcp.c:1051
 msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1168
+#: src/transport/plugin_transport_tcp.c:1103
 #, fuzzy
 msgid "# bytes discarded by TCP (failed to connect)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1284
+#: src/transport/plugin_transport_tcp.c:1211
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1670
+#: src/transport/plugin_transport_tcp.c:1574
 #, 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:1831
+#: src/transport/plugin_transport_tcp.c:1722
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:1896
+#: src/transport/plugin_transport_tcp.c:1788
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2063
+#: src/transport/plugin_transport_tcp.c:1941
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2135
+#: src/transport/plugin_transport_tcp.c:2001
 #, fuzzy, c-format
 msgid "Failed to find option %s in section %s!\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/plugin_transport_tcp.c:2161
+#: src/transport/plugin_transport_tcp.c:2024
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2166
+#: src/transport/plugin_transport_tcp.c:2028
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2170
+#: src/transport/plugin_transport_tcp.c:2032
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_validation.c:520
+msgid "# address records discarded"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:606
+#: src/core/gnunet-service-core.c:4187
+#, fuzzy
+msgid "# PING messages received"
+msgstr "# các thông báo PING được tạo"
+
+#: src/transport/gnunet-service-transport_validation.c:628
+#, c-format
+msgid ""
+"Not confirming PING with address `%s' since I cannot confirm having this "
+"address.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:685
+msgid "# PONGs unicast via reliable transport"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:694
+msgid "# PONGs multicast to all available addresses"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:758
+#, c-format
+msgid ""
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:792
+#, fuzzy
+msgid "# PING without HELLO messages sent"
+msgstr "# các thông báo PONG nhập thô được gửi"
+
+#: src/transport/gnunet-service-transport_validation.c:864
+msgid "# address revalidations started"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:923
+#: src/core/gnunet-service-core.c:4210
+#, fuzzy
+msgid "# PONG messages received"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/gnunet-service-transport_validation.c:945
+msgid "# PONGs dropped, no matching pending validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:961
+msgid "# PONGs dropped, signature expired"
+msgstr ""
+
 #: src/transport/plugin_transport_smtp.c:367
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr "Nhận được thông báo dạng sai qua %s. Bị bỏ qua.\n"
 
-#: src/transport/plugin_transport_smtp.c:459
+#: src/transport/plugin_transport_smtp.c:454
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr "Chuỗi lọc vào SMTP không hợp lệ, còn thiếu « : »\n"
 
-#: src/transport/plugin_transport_smtp.c:469
+#: src/transport/plugin_transport_smtp.c:463
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr "Chuỗi lọc vào SMTP quá dài, tối đa « %s »\n"
 
-#: src/transport/plugin_transport_smtp.c:565
-#: src/transport/plugin_transport_smtp.c:576
-#: src/transport/plugin_transport_smtp.c:590
-#: src/transport/plugin_transport_smtp.c:610
-#: src/transport/plugin_transport_smtp.c:635
+#: src/transport/plugin_transport_smtp.c:558
+#: src/transport/plugin_transport_smtp.c:568
+#: src/transport/plugin_transport_smtp.c:581
+#: src/transport/plugin_transport_smtp.c:600
+#: src/transport/plugin_transport_smtp.c:623
+#: src/transport/plugin_transport_smtp.c:631
 #: src/transport/plugin_transport_smtp.c:644
-#: src/transport/plugin_transport_smtp.c:658
-#: src/transport/plugin_transport_smtp.c:670
+#: src/transport/plugin_transport_smtp.c:655
 #, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/transport/plugin_transport_smtp.c:816
+#: src/transport/plugin_transport_smtp.c:798
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr "Chưa ghi rõ địa chỉ thư điện tử nên không tạo được truyền tải SMTP.\n"
 
-#: src/transport/plugin_transport_smtp.c:833
+#: src/transport/plugin_transport_smtp.c:810
 msgid "# bytes received via SMTP"
 msgstr "# các byte đã nhận qua SMTP"
 
-#: src/transport/plugin_transport_smtp.c:834
+#: src/transport/plugin_transport_smtp.c:811
 msgid "# bytes sent via SMTP"
 msgstr "# các byte đã gửi qua SMTP"
 
-#: src/transport/plugin_transport_smtp.c:836
+#: src/transport/plugin_transport_smtp.c:813
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/test_plugin_transport_http.c:1319
+#: src/transport/test_plugin_transport_http.c:1271
 #, fuzzy, c-format
 msgid "Loading HTTP transport plugin `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/test_plugin_transport_http.c:1326
+#: src/transport/test_plugin_transport_http.c:1278
 #, fuzzy
 msgid "Failed to load transport plugin for http\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/transport/test_plugin_transport_http.c:1408
+#: src/transport/test_plugin_transport_http.c:1364
 msgid ""
 "Phase 0\n"
 "\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1352
-#: src/transport/plugin_transport_unix.c:1118
+#: src/transport/plugin_transport_udp.c:1279
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1410
+#: src/transport/plugin_transport_udp.c:1329
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/transport/plugin_transport_udp.c:1541
+#: src/transport/plugin_transport_udp.c:1455
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/transport_api.c:582
+#: src/transport/transport_api.c:570
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Nhận được thông báo bị hỏng từ đồng đẳng « %s » trong %s:%d.\n"
 
-#: src/transport/plugin_transport_unix.c:1144
+#: src/transport/plugin_transport_unix.c:1092
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/chat/chat.c:177
+#: src/transport/gnunet-service-transport_blacklist.c:247
+#, fuzzy, c-format
+msgid "Could not read blacklist file `%s'\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:254
+#, c-format
+msgid "Blacklist file `%s' is empty.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:266
+#, fuzzy, c-format
+msgid "Failed to read blacklist from `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:287
+#: src/transport/gnunet-service-transport_blacklist.c:311
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:298
+#: src/transport/gnunet-service-transport_blacklist.c:336
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:350
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+msgstr ""
+"Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:364
+#, c-format
+msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:522
+#: src/transport/gnunet-service-transport_blacklist.c:754
+msgid "# disconnects due to blacklist"
+msgstr ""
+
+#: src/chat/chat.c:175
 #, fuzzy
 msgid "Could not transmit confirmation receipt\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/chat/chat.c:288
+#: src/chat/chat.c:283
 msgid "The current user must be the the first one joined\n"
 msgstr ""
 
-#: src/chat/chat.c:424
+#: src/chat/chat.c:412
 #, fuzzy, c-format
 msgid "Unknown message type: '%u'\n"
 msgstr "\tKhông rõ miền tên « %s »\n"
 
-#: src/chat/chat.c:489
+#: src/chat/chat.c:472
 #, fuzzy, c-format
 msgid "Configuration option `%s' in section `%s' missing\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/chat/chat.c:498
+#: src/chat/chat.c:480
 #, fuzzy, c-format
 msgid "Failed to access chat home directory `%s'\n"
 msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 
-#: src/chat/chat.c:517
+#: src/chat/chat.c:498
 #, fuzzy, c-format
 msgid "Failed to create/open key in file `%s'\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/chat/chat.c:581
+#: src/chat/chat.c:559
 #, fuzzy
 msgid "Could not serialize metadata\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/chat/chat.c:701
+#: src/chat/chat.c:674
 #, fuzzy
 msgid "Failed to connect to the chat service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/chat/chat.c:707
+#: src/chat/chat.c:680
 msgid "Undefined mandatory parameter: joinCallback\n"
 msgstr ""
 
-#: src/chat/chat.c:713
+#: src/chat/chat.c:686
 msgid "Undefined mandatory parameter: messageCallback\n"
 msgstr ""
 
-#: src/chat/chat.c:719
+#: src/chat/chat.c:692
 msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:89
+#: src/chat/gnunet-chat.c:92
 #, c-format
 msgid "Joined\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:123
+#: src/chat/gnunet-chat.c:124
 msgid "anonymous"
 msgstr "nặc danh"
 
-#: src/chat/gnunet-chat.c:129
+#: src/chat/gnunet-chat.c:130
 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "« %s » nói: %s\n"
 
-#: src/chat/gnunet-chat.c:132 src/chat/gnunet-chat.c:135
+#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr "« %s » nói cho bạn: %s\n"
 
-#: src/chat/gnunet-chat.c:138
+#: src/chat/gnunet-chat.c:139
 #, fuzzy, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr "« %s » nói thật: %s\n"
 
-#: src/chat/gnunet-chat.c:141
+#: src/chat/gnunet-chat.c:142
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr "« %s » nói thật cho bạn: %s\n"
 
-#: src/chat/gnunet-chat.c:144
+#: src/chat/gnunet-chat.c:145
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr "« %s » xác nhận bạn đã nhận được: %s\n"
 
-#: src/chat/gnunet-chat.c:147
+#: src/chat/gnunet-chat.c:148
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr "« %s » xác nhận mà chỉ bạn đã nhận được: %s\n"
 
-#: src/chat/gnunet-chat.c:150
+#: src/chat/gnunet-chat.c:151
 #, fuzzy, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr "« %s » xác nhận mà bạn đã nhận được từ họ : %s\n"
 
-#: src/chat/gnunet-chat.c:153
+#: src/chat/gnunet-chat.c:156
 #, fuzzy, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr "« %s » xác nhận mà chỉ bạn đa nhận được từ họ : %s\n"
 
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:159
 #, fuzzy, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr "« %s » nói không chính thức: %s\n"
 
-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:162
 #, fuzzy, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr "<%s> đã nói bằng một kiểu tin nhẳn không rõ : %s\n"
 
-#: src/chat/gnunet-chat.c:191
+#: src/chat/gnunet-chat.c:193
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:222
+#: src/chat/gnunet-chat.c:224
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr "« %s » vào phòng\n"
 
-#: src/chat/gnunet-chat.c:222
+#: src/chat/gnunet-chat.c:224
 #, c-format
 msgid "`%s' left the room\n"
 msgstr "« %s » rời phòng\n"
 
-#: src/chat/gnunet-chat.c:286 src/chat/gnunet-chat.c:326
+#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
 #, fuzzy, c-format
 msgid "Could not change username\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/chat/gnunet-chat.c:290 src/chat/gnunet-chat.c:660
+#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:629
 #, fuzzy, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr "Đã vào phòng « %s » là người dùng « %s ».\n"
 
-#: src/chat/gnunet-chat.c:330
+#: src/chat/gnunet-chat.c:320
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "Đã thay đổi tên người dùng thành « %s ».\n"
 
-#: src/chat/gnunet-chat.c:343
+#: src/chat/gnunet-chat.c:333
 #, c-format
 msgid "Users in room `%s': "
 msgstr "Người dùng trong phòng « %s »:"
 
-#: src/chat/gnunet-chat.c:383
+#: src/chat/gnunet-chat.c:371
 #, c-format
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr "Cú pháp: /msg TÊN_NGƯỜI_DÙNG TIN_NHẲN"
 
-#: src/chat/gnunet-chat.c:391
+#: src/chat/gnunet-chat.c:379
 #, c-format
 msgid "Unknown user `%s'\n"
 msgstr "Không rõ người dùng « %s »\n"
 
-#: src/chat/gnunet-chat.c:407
+#: src/chat/gnunet-chat.c:395
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr "Người dùng « %s » hiện thời không có trong phòng này.\n"
 
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:448
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Không rõ câu lệnh « %s ».\n"
 
-#: src/chat/gnunet-chat.c:478
+#: src/chat/gnunet-chat.c:459
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
@@ -4460,7 +4254,7 @@
 "Gõ chuỗi « /join #tên_phòng » để vào một phòng trò chuyện nào đó (việc này "
 "cũng gây ra bạn ra khỏi phòng hiện tại)"
 
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:463
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
@@ -4468,97 +4262,97 @@
 "Gõ chuỗi « /nick tên_hiệu » để thay đổi tên hiệu của mình (việc này cũng gây "
 "ra bạn ra khỏi phòng hiện tại, sau đó vào lại ngay với tên mới)"
 
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:467
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 "Gõ chuỗi « /msg tên_hiệu tin_nhẳn » để gửi một tin nhẳn riêng cho người dùng "
 "có tên đó"
 
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:470
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr "Lệnh « /notice » là một biệt hiệu cho « /msg »"
 
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:472
 msgid "The `/query' command is an alias for `/msg'"
 msgstr "Lệnh « /query » là một biệt hiệu cho « /msg »"
 
-#: src/chat/gnunet-chat.c:493
+#: src/chat/gnunet-chat.c:474
 #, fuzzy
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 "Gõ chuỗi « /msg tên_hiệu tin_nhẳn » để gửi một tin nhẳn riêng cho người dùng "
 "có tên đó"
 
-#: src/chat/gnunet-chat.c:496
+#: src/chat/gnunet-chat.c:477
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:499
+#: src/chat/gnunet-chat.c:480
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:501
+#: src/chat/gnunet-chat.c:482
 #, fuzzy
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr "Lệnh « /notice » là một biệt hiệu cho « /msg »"
 
-#: src/chat/gnunet-chat.c:503
+#: src/chat/gnunet-chat.c:484
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat"
 
-#: src/chat/gnunet-chat.c:505
+#: src/chat/gnunet-chat.c:486
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr "Lệnh « /leave » là một biệt hiệu cho « /quit »"
 
-#: src/chat/gnunet-chat.c:508
+#: src/chat/gnunet-chat.c:489
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 "Gõ chuỗi « /names » để liệt kê tất cả các thành viên hiện thời trong phòng "
 "trò chuyện đó"
 
-#: src/chat/gnunet-chat.c:510
+#: src/chat/gnunet-chat.c:491
 msgid "Use `/help command' to get help for a specific command"
 msgstr "Gõ chuỗi « /help LỆNH » để xem trợ giúp về lệnh đó"
 
-#: src/chat/gnunet-chat.c:627
+#: src/chat/gnunet-chat.c:605
 #, c-format
 msgid "You must specify a nickname\n"
 msgstr "Phải ghi rõ tên hiệu\n"
 
-#: src/chat/gnunet-chat.c:652
+#: src/chat/gnunet-chat.c:621
 #, c-format
 msgid "Failed to join room `%s'\n"
 msgstr "Lỗi vào phòng « %s »\n"
 
-#: src/chat/gnunet-chat.c:685
+#: src/chat/gnunet-chat.c:654
 msgid "set the nickname to use (required)"
 msgstr "đặt tên hiệu cần dùng (cần thiết)"
 
-#: src/chat/gnunet-chat.c:688
+#: src/chat/gnunet-chat.c:657
 msgid "set the chat room to join"
 msgstr "đặt phòng trò chuyện cần vào"
 
-#: src/chat/gnunet-chat.c:702
+#: src/chat/gnunet-chat.c:669
 msgid "Join a chat on GNUnet."
 msgstr "Vào phòng trò chuyện trên GNUnet."
 
-#: src/chat/gnunet-service-chat.c:273
+#: src/chat/gnunet-service-chat.c:267
 #, fuzzy
 msgid "Failed to queue a message notification\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/chat/gnunet-service-chat.c:566
+#: src/chat/gnunet-service-chat.c:546
 #, fuzzy
 msgid "Failed to queue a join notification\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/chat/gnunet-service-chat.c:764
+#: src/chat/gnunet-service-chat.c:729
 #, fuzzy
 msgid "Failed to queue a confirmation receipt\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/chat/gnunet-service-chat.c:952
+#: src/chat/gnunet-service-chat.c:907
 #, fuzzy
 msgid "Failed to queue a leave notification\n"
 msgstr "Lỗi lưu cấu hình."
@@ -4569,30 +4363,30 @@
 msgid "Peer `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:241
+#: src/peerinfo-tool/gnunet-peerinfo.c:222
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:249
+#: src/peerinfo-tool/gnunet-peerinfo.c:229
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:261
+#: src/peerinfo-tool/gnunet-peerinfo.c:241
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:281
+#: src/peerinfo-tool/gnunet-peerinfo.c:261
 msgid "output only the identity strings"
 msgstr "chỉ xuất những chuỗi nhận diện"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:284
+#: src/peerinfo-tool/gnunet-peerinfo.c:264
 msgid "output our own identity only"
 msgstr "chỉ xuất nhận diện mình"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:292
+#: src/peerinfo-tool/gnunet-peerinfo.c:270
 #, fuzzy
 msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -4602,33 +4396,33 @@
 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:223
+#: src/datastore/plugin_datastore_sqlite.c:239
 #, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:253
+#: src/datastore/plugin_datastore_sqlite.c:266
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:669
+#: src/datastore/plugin_datastore_sqlite.c:662
 #, 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:1110
+#: src/datastore/plugin_datastore_sqlite.c:1115
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1138
+#: src/datastore/plugin_datastore_sqlite.c:1134
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1179
+#: src/datastore/plugin_datastore_sqlite.c:1173
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -4638,364 +4432,375 @@
 msgid "# bytes used in file-sharing datastore"
 msgstr "# các byte được phép trong kho dữ liệu"
 
-#: src/datastore/gnunet-service-datastore.c:347
+#: src/datastore/gnunet-service-datastore.c:331
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# các byte được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:427
+#: src/datastore/gnunet-service-datastore.c:397
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:496
+#: src/datastore/gnunet-service-datastore.c:457
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:665
+#: src/datastore/gnunet-service-datastore.c:610
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:712
+#: src/datastore/gnunet-service-datastore.c:655
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:724
+#: src/datastore/gnunet-service-datastore.c:666
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:728
+#: src/datastore/gnunet-service-datastore.c:670
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:734
+#: src/datastore/gnunet-service-datastore.c:676
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:740
-#: src/datastore/gnunet-service-datastore.c:795
-#: src/datastore/gnunet-service-datastore.c:1041
-#: src/datastore/gnunet-service-datastore.c:1596
+#: src/datastore/gnunet-service-datastore.c:681
+#: src/datastore/gnunet-service-datastore.c:735
+#: src/datastore/gnunet-service-datastore.c:953
+#: src/datastore/gnunet-service-datastore.c:1438
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:810
+#: src/datastore/gnunet-service-datastore.c:750
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:908
+#: src/datastore/gnunet-service-datastore.c:835
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1099
+#: src/datastore/gnunet-service-datastore.c:1001
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1115
+#: src/datastore/gnunet-service-datastore.c:1015
 #, fuzzy
 msgid "# requests filtered by bloomfilter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/datastore/gnunet-service-datastore.c:1150
+#: src/datastore/gnunet-service-datastore.c:1043
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1189
+#: src/datastore/gnunet-service-datastore.c:1077
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1227
+#: src/datastore/gnunet-service-datastore.c:1112
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1263
+#: src/datastore/gnunet-service-datastore.c:1139
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1276
+#: src/datastore/gnunet-service-datastore.c:1149
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1316
+#: src/datastore/gnunet-service-datastore.c:1183
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1371
+#: src/datastore/gnunet-service-datastore.c:1227
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1452
-#: src/datastore/test_plugin_datastore.c:361
-#: src/datastore/perf_plugin_datastore.c:467
+#: src/datastore/gnunet-service-datastore.c:1300
+#: src/datastore/test_plugin_datastore.c:322
+#: src/datastore/perf_plugin_datastore.c:420
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1460
+#: src/datastore/gnunet-service-datastore.c:1309
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/datastore/gnunet-service-datastore.c:1648
+#: src/datastore/gnunet-service-datastore.c:1488
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1653
+#: src/datastore/gnunet-service-datastore.c:1490
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1667
+#: src/datastore/gnunet-service-datastore.c:1500
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1680
+#: src/datastore/gnunet-service-datastore.c:1513
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/datastore/plugin_datastore_template.c:252
+#: src/datastore/plugin_datastore_template.c:241
 msgid "Template database running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:292
+#: src/datastore/datastore_api.c:287
 msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:380
+#: src/datastore/datastore_api.c:370
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:432
+#: src/datastore/datastore_api.c:417
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:462
+#: src/datastore/datastore_api.c:444
 #, fuzzy
 msgid "# queue entries created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/datastore/datastore_api.c:493
+#: src/datastore/datastore_api.c:465
 #, fuzzy
 msgid "# Requests dropped from datastore queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/datastore/datastore_api.c:543
+#: src/datastore/datastore_api.c:514
 #, fuzzy
 msgid "# datastore connections (re)created"
 msgstr "# các kết nối dht"
 
-#: src/datastore/datastore_api.c:573
+#: src/datastore/datastore_api.c:541
 msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/datastore/datastore_api.c:644
+#: src/datastore/datastore_api.c:606
 msgid "Failed to transmit request to DATASTORE.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:646
+#: src/datastore/datastore_api.c:608
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/datastore/datastore_api.c:673
+#: src/datastore/datastore_api.c:631
 #, fuzzy
 msgid "# bytes sent to datastore"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/datastore/datastore_api.c:822
+#: src/datastore/datastore_api.c:768
 #, fuzzy
 msgid "Failed to receive status response from database."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/datastore_api.c:836
+#: src/datastore/datastore_api.c:781
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:848 src/datastore/datastore_api.c:855
+#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
 #, fuzzy
 msgid "Invalid error message received from datastore service"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/datastore/datastore_api.c:864
+#: src/datastore/datastore_api.c:806
 #, fuzzy
 msgid "# status messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/datastore/datastore_api.c:947
+#: src/datastore/datastore_api.c:878
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1024
+#: src/datastore/datastore_api.c:950
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1092
+#: src/datastore/datastore_api.c:1015
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1159
+#: src/datastore/datastore_api.c:1078
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1234
+#: src/datastore/datastore_api.c:1148
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1281
+#: src/datastore/datastore_api.c:1193
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1345
+#: src/datastore/datastore_api.c:1254
 #, fuzzy
 msgid "# Results received"
 msgstr "# các kết quả dht được nhận"
 
-#: src/datastore/datastore_api.c:1424
+#: src/datastore/datastore_api.c:1326
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1492
+#: src/datastore/datastore_api.c:1393
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1563
+#: src/datastore/datastore_api.c:1457
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/plugin_datastore_mysql.c:515
+#: src/datastore/plugin_datastore_mysql.c:529
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/datastore/plugin_datastore_mysql.c:608
+#: src/datastore/plugin_datastore_mysql.c:622
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1484
+#: src/datastore/plugin_datastore_mysql.c:1500
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:177
+#: src/datastore/plugin_datastore_postgres.c:173
 #, fuzzy, c-format
 msgid "Unable to initialize Postgres with configuration `%s': %s"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/datastore/plugin_datastore_postgres.c:1116
+#: src/datastore/plugin_datastore_postgres.c:979
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:161
+#: src/dv/plugin_transport_dv.c:159
 #, fuzzy, c-format
 msgid "%s Received message from %s of type %d, distance %u!\n"
 msgstr "Nhận được thông báo bị hỏng từ đồng đẳng « %s » trong %s:%d.\n"
 
-#: src/dv/dv_api.c:179
+#: src/dv/dv_api.c:178
 #, fuzzy
 msgid "Failed to connect to the dv service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/nse/nse-profiler.c:462
-#, fuzzy
-msgid "Run a test of the NSE service."
-msgstr "Không thể truy cập đến dịch vụ"
+#: src/nse/gnunet-service-nse.c:864
+#, c-format
+msgid "Proof of work invalid: %llu!\n"
+msgstr ""
 
-#: src/nse/gnunet-service-nse.c:998
+#: src/nse/gnunet-service-nse.c:1286 src/nse/gnunet-service-nse.c:1305
+#: src/nse/gnunet-service-nse.c:1326
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1008
-msgid "NSE Service could not access hostkey.  Exiting.\n"
+#: src/nse/gnunet-service-nse.c:1293
+msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:935
+#: src/nse/gnunet-service-nse.c:1314
+#, fuzzy
+msgid "NSE service could not access hostkey.  Exiting.\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
+#: src/nse/gnunet-nse-profiler.c:673
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "Không thể truy cập đến dịch vụ"
+
+#: src/core/gnunet-service-core.c:920
 msgid "# total peer preference"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1063
+#: src/core/gnunet-service-core.c:1040
 msgid "# peer status changes"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1176
+#: src/core/gnunet-service-core.c:1236
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core.c:1662
+#: src/core/gnunet-service-core.c:1712
 #, c-format
 msgid ""
 "Client asked for preference change with peer `%s', which is not connected!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1747 src/core/gnunet-service-core.c:4318
-#: src/core/gnunet-service-core.c:4541
+#: src/core/gnunet-service-core.c:1793 src/core/gnunet-service-core.c:4240
+#: src/core/gnunet-service-core.c:4456
 msgid "# established sessions"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1794
+#: src/core/gnunet-service-core.c:1838
 msgid "# bytes encrypted"
 msgstr "# các byte đã mã hoá"
 
-#: src/core/gnunet-service-core.c:1933 src/core/gnunet-service-core.c:2781
-#: src/core/gnunet-service-core.c:4623
+#: src/core/gnunet-service-core.c:1964 src/core/gnunet-service-core.c:2793
+#: src/core/gnunet-service-core.c:4532
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2003
+#: src/core/gnunet-service-core.c:2031
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2114
+#: src/core/gnunet-service-core.c:2134
 msgid "# bytes decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core.c:2289
+#: src/core/gnunet-service-core.c:2314
 msgid "# transmissions delayed due to corking"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2494
+#: src/core/gnunet-service-core.c:2517
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2849
+#: src/core/gnunet-service-core.c:2857
 #, fuzzy
 msgid "# messages discarded (disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core.c:2906 src/core/gnunet-service-core.c:4741
+#: src/core/gnunet-service-core.c:2909 src/core/gnunet-service-core.c:4644
 msgid "# discarded CORE_SEND requests"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2919 src/core/gnunet-service-core.c:4742
+#: src/core/gnunet-service-core.c:2924 src/core/gnunet-service-core.c:4648
 msgid "# discarded lower priority CORE_SEND requests"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2994
+#: src/core/gnunet-service-core.c:2996
 #, fuzzy
 msgid "# connection requests received"
 msgstr "# các yêu cầu danh sách máy được nhận"
@@ -5004,182 +4809,230 @@
 msgid "# connection requests ignored (already connected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3057 src/core/gnunet-service-core.c:3741
+#: src/core/gnunet-service-core.c:3054 src/core/gnunet-service-core.c:3697
 msgid "# SET_KEY messages deferred (need public key)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3070
+#: src/core/gnunet-service-core.c:3067
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3105
+#: src/core/gnunet-service-core.c:3099
 msgid "# Error extracting public key from HELLO"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3151
+#: src/core/gnunet-service-core.c:3145
 msgid "# Asking transport to connect (for SET_KEY)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3286
+#: src/core/gnunet-service-core.c:3270
 #, fuzzy
 msgid "# SET_KEY and PING messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core.c:3367
+#: src/core/gnunet-service-core.c:3349
 #, c-format
 msgid ""
 "Ignoring `%s' message due to lack of public key for peer `%4s' (failed to "
 "obtain one).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3471
+#: src/core/gnunet-service-core.c:3444
 #, fuzzy
 msgid "# PING messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core.c:3483
+#: src/core/gnunet-service-core.c:3456
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3515
+#: src/core/gnunet-service-core.c:3481
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core.c:3574
+#: src/core/gnunet-service-core.c:3534
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core.c:3617
+#: src/core/gnunet-service-core.c:3572
 #, fuzzy
 msgid "# Session keys confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core.c:3751
+#: src/core/gnunet-service-core.c:3706
 #, c-format
 msgid "Received `%s' message that was for `%s', not for me.  Ignoring.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3796
+#: src/core/gnunet-service-core.c:3748
 #, fuzzy
 msgid "# SET_KEY messages decrypted"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core.c:3953
+#: src/core/gnunet-service-core.c:3894
 #, fuzzy, c-format
 msgid "# bytes of messages of type %u received"
 msgstr "# các byte nhiễu được nhận"
 
-#: src/core/gnunet-service-core.c:3997
+#: src/core/gnunet-service-core.c:3941
 msgid "# messages not delivered to any client"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4076 src/core/gnunet-service-core.c:4102
+#: src/core/gnunet-service-core.c:4011 src/core/gnunet-service-core.c:4036
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core.c:4088
+#: src/core/gnunet-service-core.c:4023
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core.c:4126
+#: src/core/gnunet-service-core.c:4060
 #, fuzzy, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr "Thông báo nhận được cũ hơn một ngày. Đã loại bỏ.\n"
 
-#: src/core/gnunet-service-core.c:4129
+#: src/core/gnunet-service-core.c:4064
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core.c:4162
+#: src/core/gnunet-service-core.c:4094
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core.c:4230
+#: src/core/gnunet-service-core.c:4157
 #, fuzzy
 msgid "# session keys received"
 msgstr "# các khoá phiên chạy bị từ chối"
 
-#: src/core/gnunet-service-core.c:4248
+#: src/core/gnunet-service-core.c:4173
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4306
+#: src/core/gnunet-service-core.c:4229
 #, c-format
 msgid "Unsupported message of type %u received.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4481 src/core/gnunet-service-core.c:4572
+#: src/core/gnunet-service-core.c:4403 src/core/gnunet-service-core.c:4485
 #, fuzzy
 msgid "# peers connected (transport)"
 msgstr "# các kết nối bị đóng (vấn đề truyền tải)"
 
-#: src/core/gnunet-service-core.c:4695
+#: src/core/gnunet-service-core.c:4599
 msgid "Core service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4713
+#: src/core/gnunet-service-core.c:4617
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4751
+#: src/core/gnunet-service-core.c:4656
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/core_api.c:874
+#: src/core/core_api.c:832
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:291 src/include/gnunet_common.h:296
-#: src/include/gnunet_common.h:302
+#: src/include/gnunet_common.h:296 src/include/gnunet_common.h:301
+#: src/include/gnunet_common.h:307
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:312
+#: src/include/gnunet_common.h:317
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:326
+#: src/include/gnunet_common.h:331
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
-#: src/include/gnunet_getopt_lib.h:145
+#: src/include/gnunet_getopt_lib.h:144
 msgid "print this help"
 msgstr "hiển thị trợ giúp này"
 
-#: src/include/gnunet_getopt_lib.h:155
+#: src/include/gnunet_getopt_lib.h:154
 msgid "print the version number"
 msgstr "hiển thị số thứ tự phiên bản"
 
-#: src/include/gnunet_getopt_lib.h:164
+#: src/include/gnunet_getopt_lib.h:163
 #, fuzzy
 msgid "configure logging to write logs to LOGFILE"
 msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
 
-#: src/include/gnunet_getopt_lib.h:173
+#: src/include/gnunet_getopt_lib.h:172
 msgid "configure logging to use LOGLEVEL"
 msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
 
-#: src/include/gnunet_getopt_lib.h:182
+#: src/include/gnunet_getopt_lib.h:181
 msgid "be verbose"
 msgstr "xuất chi tiết"
 
-#: src/include/gnunet_getopt_lib.h:191
+#: src/include/gnunet_getopt_lib.h:190
 msgid "use configuration file FILENAME"
 msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
 
+#, fuzzy
+#~ msgid "Failed to connect to core service\n"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#, fuzzy
+#~ msgid "# bytes successfully transmitted by plugins"
+#~ msgstr "# các byte được gửi"
+
+#, fuzzy
+#~ msgid "# connected addresses"
+#~ msgstr "# của các đồng đẳng đã kết nối"
+
+#, fuzzy
+#~ msgid "# transport failed to selected peer address"
+#~ msgstr "Đang quảng cáo truyền tải %d của mình tới các đồng đẳng đã chọn.\n"
+
+#, fuzzy
+#~ msgid "# transmission attempts failed (no address)"
+#~ msgstr "Lỗi thử gửi, kiểu truyền tải %d không được hỗ trợ\n"
+
+#, fuzzy
+#~ msgid "# peer addresses considered valid"
+#~ msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
+
+#, fuzzy
+#~ msgid "# PING with HELLO messages sent"
+#~ msgstr "# các thông báo PING được tạo"
+
+#, fuzzy
+#~ msgid "# PING messages sent for re-validation"
+#~ msgstr "# các thông báo PING được tạo"
+
+#, fuzzy
+#~ msgid "# HELLOs received for validation"
+#~ msgstr "# các khối được lấy để nâng cấp"
+
+#, fuzzy
+#~ msgid "# bytes discarded due to disconnect"
+#~ msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
+
+#, fuzzy
+#~ msgid "Received `%s' message from `%s' destined for `%s' which is not me!\n"
+#~ msgstr "Nhận được PING « %s » không dành cho chúng ta.\n"
+
+#, fuzzy
+#~ msgid "# HELLO messages received from other peers"
+#~ msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
+
 #~ msgid "Error"
 #~ msgstr "Lỗi"
 
@@ -5474,9 +5327,6 @@
 #~ msgid "Error: can't create service: %s\n"
 #~ msgstr "Lỗi: không thể tạo dịch vụ : %s\n"
 
-#~ msgid "Unknown error.\n"
-#~ msgstr "Lỗi không rõ.\n"
-
 #~ msgid "Error: can't access service: %s\n"
 #~ msgstr "Lỗi: không thể truy cập đến dịch vụ : %s\n"
 
@@ -5882,9 +5732,6 @@
 #~ msgid "sleep for SPACE ms after each a message block"
 #~ msgstr "ngủ KHOẢNG miligiây sau mỗi khối tin nhắn"
 
-#~ msgid "time to wait for the completion of an iteration (in ms)"
-#~ msgstr "thời gian chờ sự hoàn thành của một lần lặp (theo miligiây)"
-
 #~ msgid "number of messages in a message block"
 #~ msgstr "số tin nhắn trong một khối tin nhắn"
 

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2011-09-13 12:43:24 UTC (rev 16810)
+++ gnunet/po/zh_CN.po  2011-09-13 12:44:25 UTC (rev 16811)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-07-19 15:16+0200\n"
+"POT-Creation-Date: 2011-09-13 14:44+0200\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -16,633 +16,634 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/fragmentation/defragmentation.c:274
+#: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:457
+#: src/fragmentation/defragmentation.c:454
 msgid "# fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:521
+#: src/fragmentation/defragmentation.c:513
 msgid "# duplicate fragments received"
 msgstr ""
 
-#: src/fragmentation/defragmentation.c:545
+#: src/fragmentation/defragmentation.c:532
 msgid "# messages defragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:181
+#: src/fragmentation/fragmentation.c:183
 msgid "# fragments transmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:185
+#: src/fragmentation/fragmentation.c:186
 msgid "# fragments retransmitted"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:249
+#: src/fragmentation/fragmentation.c:248
 msgid "# messages fragmented"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:254
+#: src/fragmentation/fragmentation.c:251
 msgid "# total size of fragmented messages"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:336
+#: src/fragmentation/fragmentation.c:335
 msgid "# fragment acknowledgements received"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:343
+#: src/fragmentation/fragmentation.c:341
 msgid "# bits removed from fragmentation ACKs"
 msgstr ""
 
-#: src/fragmentation/fragmentation.c:358
+#: src/fragmentation/fragmentation.c:365
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/nat/nat.c:823
+#: src/nat/nat.c:778
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
 msgstr ""
 
-#: src/nat/nat.c:884
+#: src/nat/nat.c:828
 #, fuzzy, c-format
 msgid "Failed to start %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/nat/nat.c:1185 src/nat/nat.c:1207
+#: src/nat/nat.c:1096 src/nat/nat.c:1113
 #, fuzzy, c-format
 msgid "Malformed %s `%s' given in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/nat/nat.c:1276 src/nat/nat.c:1284
+#: src/nat/nat.c:1167 src/nat/nat.c:1177
 #, c-format
 msgid ""
 "Configuration requires `%s', but binary is not installed properly (SUID bit "
 "not set).  Option disabled.\n"
 msgstr ""
 
-#: src/nat/nat.c:1422
+#: src/nat/nat.c:1309
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
 msgstr ""
 
-#: src/nat/nat.c:1440
+#: src/nat/nat.c:1321
 #, c-format
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:317
+#: src/nat/gnunet-nat-server.c:290
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
 msgstr ""
 
-#: src/nat/gnunet-nat-server.c:361
+#: src/nat/gnunet-nat-server.c:329
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_test.c:376
+#: src/nat/nat_test.c:348
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/nat/nat_test.c:451
+#: src/nat/nat_test.c:418
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/vpn/gnunet-daemon-vpn.c:772 src/vpn/gnunet-daemon-exit.c:1280
-#: src/template/gnunet-template.c:72 src/core/test_core_api_send_to_self.c:216
+#: src/vpn/gnunet-daemon-vpn.c:1275 src/vpn/gnunet-daemon-exit.c:1455
+#: src/template/gnunet-template.c:68 src/core/test_core_api_send_to_self.c:217
 msgid "help text"
 msgstr ""
 
-#: src/datacache/datacache.c:110 src/datacache/datacache.c:255
-#: src/datastore/gnunet-service-datastore.c:888
+#: src/datacache/datacache.c:108 src/datacache/datacache.c:236
+#: src/datastore/gnunet-service-datastore.c:821
 msgid "# bytes stored"
 msgstr ""
 
-#: src/datacache/datacache.c:138 src/datacache/datacache.c:149
-#: src/datastore/gnunet-service-datastore.c:1442
-#: src/datastore/gnunet-service-datastore.c:1641
-#: src/datastore/test_plugin_datastore.c:209
-#: src/datastore/test_plugin_datastore.c:352
-#: src/datastore/perf_plugin_datastore.c:340
-#: src/datastore/perf_plugin_datastore.c:458
+#: src/datacache/datacache.c:134 src/datacache/datacache.c:142
+#: src/datastore/gnunet-service-datastore.c:1292
+#: src/datastore/gnunet-service-datastore.c:1483
+#: src/datastore/test_plugin_datastore.c:192
+#: src/datastore/test_plugin_datastore.c:315
+#: src/datastore/perf_plugin_datastore.c:309
+#: src/datastore/perf_plugin_datastore.c:413
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
 
-#: src/datacache/datacache.c:178
+#: src/datacache/datacache.c:167
 #, c-format
 msgid "Loading `%s' datacache plugin\n"
 msgstr ""
 
-#: src/datacache/datacache.c:186
+#: src/datacache/datacache.c:176
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
 msgstr ""
 
-#: src/datacache/datacache.c:285
+#: src/datacache/datacache.c:262
 msgid "# requests received"
 msgstr ""
 
-#: src/datacache/datacache.c:292
+#: src/datacache/datacache.c:268
 msgid "# requests filtered by bloom filter"
 msgstr ""
 
-#: src/datacache/plugin_datacache_template.c:126
+#: src/datacache/plugin_datacache_template.c:121
 msgid "Template datacache running\n"
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:66
 #: src/datacache/plugin_datacache_sqlite.c:69
-#: src/datacache/plugin_datacache_sqlite.c:126
-#: src/datacache/plugin_datacache_sqlite.c:201
-#: src/datacache/plugin_datacache_sqlite.c:248
-#: src/datacache/plugin_datacache_sqlite.c:322
-#: src/datacache/plugin_datacache_sqlite.c:331
-#: src/datacache/plugin_datacache_sqlite.c:345
+#: src/datacache/plugin_datacache_sqlite.c:122
+#: src/datacache/plugin_datacache_sqlite.c:191
+#: src/datacache/plugin_datacache_sqlite.c:232
+#: src/datacache/plugin_datacache_sqlite.c:296
+#: src/datacache/plugin_datacache_sqlite.c:305
+#: src/datacache/plugin_datacache_sqlite.c:318
+#: src/datacache/plugin_datacache_sqlite.c:325
+#: src/datacache/plugin_datacache_sqlite.c:338
+#: src/datacache/plugin_datacache_sqlite.c:346
 #: src/datacache/plugin_datacache_sqlite.c:354
-#: src/datacache/plugin_datacache_sqlite.c:374
-#: src/datacache/plugin_datacache_sqlite.c:383
-#: src/datacache/plugin_datacache_sqlite.c:394
 #: src/datacache/plugin_datacache_mysql.c:103
 #: src/datacache/plugin_datacache_mysql.c:110
-#: src/datacache/plugin_datacache_mysql.c:518
-#: src/datacache/plugin_datacache_mysql.c:527
-#: src/datacache/plugin_datacache_mysql.c:603
-#: src/datacache/plugin_datacache_mysql.c:619 src/util/crypto_rsa.c:84
-#: src/util/crypto_ksk.c:47 src/dht/plugin_dhtlog_mysql.c:583
-#: src/dht/plugin_dhtlog_mysql.c:592 src/dht/plugin_dhtlog_mysql.c:652
-#: src/dht/plugin_dhtlog_mysql.c:667
+#: src/datacache/plugin_datacache_mysql.c:517
+#: src/datacache/plugin_datacache_mysql.c:526
+#: src/datacache/plugin_datacache_mysql.c:598
+#: src/datacache/plugin_datacache_mysql.c:614 src/util/crypto_rsa.c:84
+#: src/util/crypto_ksk.c:47 src/dht/plugin_dhtlog_mysql.c:581
+#: src/dht/plugin_dhtlog_mysql.c:590 src/dht/plugin_dhtlog_mysql.c:648
+#: src/dht/plugin_dhtlog_mysql.c:663
 #: src/datastore/plugin_datastore_sqlite.c:61
 #: src/datastore/plugin_datastore_mysql.c:139
 #: src/datastore/plugin_datastore_mysql.c:146
-#: src/datastore/plugin_datastore_mysql.c:599
-#: src/datastore/plugin_datastore_mysql.c:661
-#: src/datastore/plugin_datastore_mysql.c:673 src/include/gnunet_common.h:319
+#: src/datastore/plugin_datastore_mysql.c:613
+#: src/datastore/plugin_datastore_mysql.c:673
+#: src/datastore/plugin_datastore_mysql.c:685 src/include/gnunet_common.h:324
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:461
+#: src/datacache/plugin_datacache_sqlite.c:419
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:496
-#: src/datastore/plugin_datastore_sqlite.c:381
+#: src/datacache/plugin_datacache_sqlite.c:454
+#: src/datastore/plugin_datastore_sqlite.c:405
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:81
-#: src/datastore/plugin_datastore_postgres.c:95
+#: src/datacache/plugin_datacache_postgres.c:79
+#: src/datastore/plugin_datastore_postgres.c:93
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
-#: src/datacache/plugin_datacache_postgres.c:154
+#: src/datacache/plugin_datacache_postgres.c:149
 #, fuzzy, c-format
 msgid "Unable to initialize Postgres: %s"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/datacache/plugin_datacache_postgres.c:557
+#: src/datacache/plugin_datacache_postgres.c:500
 msgid "Postgres datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:220
-#: src/datastore/plugin_datastore_mysql.c:297
+#: src/datacache/plugin_datacache_mysql.c:224
+#: src/datastore/plugin_datastore_mysql.c:316
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_mysql.c:227
-#: src/datastore/plugin_datastore_mysql.c:304
+#: src/datacache/plugin_datacache_mysql.c:230
+#: src/datastore/plugin_datastore_mysql.c:322
 #, fuzzy, c-format
 msgid "Could not access file `%s': %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/datacache/plugin_datacache_mysql.c:1061
+#: src/datacache/plugin_datacache_mysql.c:979
 msgid "MySQL datacache running\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1801 src/testing/testing_group.c:1814
-#: src/testing/testing_group.c:1920 src/testing/testing_group.c:1981
-#: src/testing/testing_group.c:2070 src/testing/testing_group.c:2092
-#: src/testing/testing_group.c:2231 src/testing/test_testing_topology.c:1104
-#: src/testing/test_testing_topology_blacklist.c:457
-#: src/testing/testing_peergroup.c:856
-#: src/testing/test_testing_large_topology.c:1046
-#: src/dht/test_dht_multipeer.c:833 src/dht/gnunet-dht-driver.c:4001
-#: src/dv/test_transport_api_dv.c:1102
+#: src/testing/testing_group.c:1903 src/testing/testing_group.c:1915
+#: src/testing/testing_group.c:2016 src/testing/testing_group.c:2075
+#: src/testing/testing_group.c:2164 src/testing/testing_group.c:2184
+#: src/testing/testing_group.c:2321 src/testing/test_testing_topology.c:1078
+#: src/testing/test_testing_topology_blacklist.c:448
+#: src/testing/testing_peergroup.c:876
+#: src/testing/test_testing_large_topology.c:1022
+#: src/dht/test_dht_multipeer.c:864 src/dht/gnunet-dht-driver.c:3907
+#: src/dv/test_transport_api_dv.c:1132
 #, c-format
 msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
 msgstr ""
 
-#: src/testing/testing_group.c:1824
+#: src/testing/testing_group.c:1925
 #, c-format
 msgid "Target is %d connections per peer."
 msgstr ""
 
-#: src/testing/testing_group.c:2079
+#: src/testing/testing_group.c:2172
 #, c-format
 msgid ""
 "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
 "greater than 0\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2111 src/testing/testing_group.c:2307
+#: src/testing/testing_group.c:2202 src/testing/testing_group.c:2395
 #, c-format
 msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2148
+#: src/testing/testing_group.c:2239
 #, c-format
 msgid "natural log of %d is %d, will run %d iterations\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2151
+#: src/testing/testing_group.c:2242
 #, c-format
 msgid "Total connections added thus far: %u!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2193
+#: src/testing/testing_group.c:2283
 #, c-format
 msgid "Total connections added for small world: %d!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2246
+#: src/testing/testing_group.c:2335
 #, c-format
 msgid "rand is %f probability is %f\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2824 src/testing/testing_group.c:3035
+#: src/testing/testing_group.c:2910 src/testing/testing_group.c:3109
 #, c-format
 msgid ""
 "No `%s' specified in peer configuration in section `%s', cannot copy friends "
 "file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:2935
+#: src/testing/testing_group.c:3011
 msgid "Finished copying all friend files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3051
+#: src/testing/testing_group.c:3124
 #, fuzzy, c-format
 msgid "Copying file with command cp %s %s\n"
 msgstr "“%s”以错误码 %s 失败:%s\n"
 
-#: src/testing/testing_group.c:3074
+#: src/testing/testing_group.c:3147
 #, c-format
 msgid "Copying file with command scp %s %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3092
+#: src/testing/testing_group.c:3164
 #, c-format
 msgid "Checking copy status of file %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3111
+#: src/testing/testing_group.c:3182
 #, c-format
 msgid "File %d copied\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3126
+#: src/testing/testing_group.c:3197
 msgid "Finished copying all blacklist files!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3496 src/testing/testing_group.c:3624
-#: src/testing/testing_group.c:4839 src/testing/testing_group.c:4982
+#: src/testing/testing_group.c:3581 src/testing/testing_group.c:3720
+#: src/testing/testing_group.c:4925 src/testing/testing_group.c:5066
 msgid "Delaying connect, we have too many outstanding connections!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3506 src/testing/testing_group.c:4851
-#: src/testing/testing_group.c:4994
+#: src/testing/testing_group.c:3591 src/testing/testing_group.c:4935
+#: src/testing/testing_group.c:5076
 #, c-format
 msgid "Creating connection, outstanding_connections is %d\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3518
+#: src/testing/testing_group.c:3603
 #, c-format
 msgid "Offering Hello of peer %s to peer %s\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3636
+#: src/testing/testing_group.c:3730
 #, c-format
 msgid "Creating connection, outstanding_connections is %d (max %d)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3887
+#: src/testing/testing_group.c:3983
 msgid "Creating clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3894
+#: src/testing/testing_group.c:3990
 msgid "Creating small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3901
+#: src/testing/testing_group.c:3997
 msgid "Creating small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3907
+#: src/testing/testing_group.c:4003
 msgid "Creating ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3913
+#: src/testing/testing_group.c:4009
 msgid "Creating 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3920
+#: src/testing/testing_group.c:4015
 msgid "Creating Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3926
+#: src/testing/testing_group.c:4021
 msgid "Creating InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3933
+#: src/testing/testing_group.c:4027
 msgid "Creating Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3940
+#: src/testing/testing_group.c:4034
 msgid "Creating straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3947
+#: src/testing/testing_group.c:4040
 msgid "Creating topology from file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3966
+#: src/testing/testing_group.c:4058
 msgid "Creating no allowed topology (all peers can connect at core level)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3983
+#: src/testing/testing_group.c:4075
 msgid "Failed during friend file copying!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:3991
+#: src/testing/testing_group.c:4083
 msgid "Friend files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4010
+#: src/testing/testing_group.c:4102
 msgid "Blacklisting all but clique topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4018
+#: src/testing/testing_group.c:4110
 msgid "Blacklisting all but small world (ring) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4028
+#: src/testing/testing_group.c:4118
 msgid "Blacklisting all but small world (2d-torus) topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4036
+#: src/testing/testing_group.c:4126
 msgid "Blacklisting all but ring topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4044
+#: src/testing/testing_group.c:4134
 msgid "Blacklisting all but 2d torus topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4052
+#: src/testing/testing_group.c:4142
 msgid "Blacklisting all but Erdos-Renyi topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4060
+#: src/testing/testing_group.c:4150
 msgid "Blacklisting all but InterNAT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4097
+#: src/testing/testing_group.c:4187
 msgid "Blacklisting all but Scale Free topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4105
+#: src/testing/testing_group.c:4195
 msgid "Blacklisting all but straight line topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4122
+#: src/testing/testing_group.c:4212
 msgid "Failed during blacklist file copying!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:4130
+#: src/testing/testing_group.c:4220
 msgid "Blacklist files created/copied successfully!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5213
+#: src/testing/testing_group.c:5301
 msgid "Creating clique CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5220
+#: src/testing/testing_group.c:5308
 msgid "Creating small world (ring) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5227
+#: src/testing/testing_group.c:5315
 msgid "Creating small world (2d-torus) CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5233
+#: src/testing/testing_group.c:5321
 msgid "Creating ring CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5240
+#: src/testing/testing_group.c:5328
 msgid "Creating 2d torus CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5247
+#: src/testing/testing_group.c:5335
 msgid "Creating Erdos-Renyi CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5254
+#: src/testing/testing_group.c:5342
 msgid "Creating InterNAT CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5261
+#: src/testing/testing_group.c:5349
 msgid "Creating Scale Free CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5268
+#: src/testing/testing_group.c:5356
 msgid "Creating straight line CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5274
+#: src/testing/testing_group.c:5362
 msgid "Creating no CONNECT topology\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5280
+#: src/testing/testing_group.c:5368
 msgid "Unknown topology specification, can't connect peers!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5289
+#: src/testing/testing_group.c:5378
 #, c-format
 msgid "Connecting random subset (%'.2f percent) of possible peers\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5297
+#: src/testing/testing_group.c:5386
 #, c-format
 msgid "Connecting a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5305
+#: src/testing/testing_group.c:5395
 #, c-format
 msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5315
+#: src/testing/testing_group.c:5405
 #, c-format
 msgid "Finding additional %u closest peers each (if possible)\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5923
+#: src/testing/testing_group.c:6084
 msgid "Could not read hostkeys file!\n"
 msgstr ""
 
-#: src/testing/testing_group.c:5996
+#: src/testing/testing_group.c:6154
 #, fuzzy, c-format
 msgid "Could not create configuration for peer number %u on `%s'!\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing_group.c:6119 src/testing/testing.c:1189
+#: src/testing/testing_group.c:6298 src/testing/testing.c:1272
 #, c-format
 msgid "Could not start `%s' process to copy configuration directory.\n"
 msgstr ""
 
-#: src/testing/testing.c:210
-#, fuzzy
-msgid "Failed to connect to core service\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/testing/testing.c:247 src/testing/testing.c:735
-#: src/testing/testing.c:1947 src/testing/testing.c:1965
-#: src/testing/testing.c:2049 src/testing/testing.c:2065
-#, fuzzy
-msgid "Failed to connect to transport service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/testing/testing.c:327
+#: src/testing/testing.c:208
 msgid "`scp' does not seem to terminate (timeout copying config).\n"
 msgstr ""
 
-#: src/testing/testing.c:342 src/testing/testing.c:912
+#: src/testing/testing.c:222 src/testing/testing.c:822
 msgid "`scp' did not complete cleanly.\n"
 msgstr ""
 
-#: src/testing/testing.c:367
+#: src/testing/testing.c:245
 msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:368
+#: src/testing/testing.c:246
 #, fuzzy
 msgid "Failed to create pipe for `ssh' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:430
+#: src/testing/testing.c:302
 #, c-format
 msgid "Could not start `%s' process to create hostkey.\n"
 msgstr ""
 
-#: src/testing/testing.c:440
+#: src/testing/testing.c:309
 msgid "Failed to start `gnunet-peerinfo' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:441 src/testing/testing.c:638
+#: src/testing/testing.c:310 src/testing/testing.c:508
 #, fuzzy
 msgid "Failed to start `ssh' process.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:506
+#: src/testing/testing.c:372
 #, c-format
 msgid "Error reading from gnunet-peerinfo: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:510
+#: src/testing/testing.c:376
 msgid "Malformed output from gnunet-peerinfo!\n"
 msgstr ""
 
-#: src/testing/testing.c:520
+#: src/testing/testing.c:386
 #, fuzzy
 msgid "`Failed to get hostkey!\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:556
+#: src/testing/testing.c:420
 msgid "`Failed while waiting for topology setup!\n"
 msgstr ""
 
-#: src/testing/testing.c:627
+#: src/testing/testing.c:500
 #, c-format
 msgid "Could not start `%s' process to start GNUnet.\n"
 msgstr ""
 
-#: src/testing/testing.c:637
+#: src/testing/testing.c:507
 msgid "Failed to start `gnunet-arm' process.\n"
 msgstr ""
 
-#: src/testing/testing.c:665
+#: src/testing/testing.c:531 src/testing/testing.c:630
 msgid "`gnunet-arm' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:666
+#: src/testing/testing.c:532 src/testing/testing.c:631
+#: src/testing/testing.c:651
 msgid "`ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:707
-msgid "Unable to connect to CORE service for peer!\n"
-msgstr ""
+#: src/testing/testing.c:571 src/testing/testing.c:2072
+#: src/testing/testing.c:2091
+#, fuzzy
+msgid "Failed to connect to transport service!\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:769
+#: src/testing/testing.c:600
 msgid "Unable to get HELLO for peer!\n"
 msgstr ""
 
-#: src/testing/testing.c:797
+#: src/testing/testing.c:650
+msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
+msgstr ""
+
+#: src/testing/testing.c:673 src/testing/testing.c:707
 msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:827
+#: src/testing/testing.c:688 src/testing/testing.c:737
 msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
 msgstr ""
 
-#: src/testing/testing.c:899
+#: src/testing/testing.c:810
 msgid "`scp' does not seem to terminate.\n"
 msgstr ""
 
-#: src/testing/testing.c:1277 src/testing/testing.c:1407
+#: src/testing/testing.c:988
 #, c-format
+msgid "Starting service %s for peer `%4s'\n"
+msgstr ""
+
+#: src/testing/testing.c:1360 src/testing/testing.c:1443
+#: src/testing/testing.c:1581
+#, c-format
 msgid "Terminating peer `%4s'\n"
 msgstr ""
 
-#: src/testing/testing.c:1359
+#: src/testing/testing.c:1533
 #, c-format
 msgid "Setting d->dead on peer `%4s'\n"
 msgstr ""
 
-#: src/testing/testing.c:1492
+#: src/testing/testing.c:1668
 msgid "Peer not yet running, can not change configuration at this point."
 msgstr ""
 
-#: src/testing/testing.c:1500
+#: src/testing/testing.c:1676
 #, fuzzy
 msgid "Failed to write new configuration to disk."
 msgstr "保存配置失败。"
 
-#: src/testing/testing.c:1532
+#: src/testing/testing.c:1707
 #, c-format
 msgid "Could not start `%s' process to copy configuration file.\n"
 msgstr ""
 
-#: src/testing/testing.c:1535
+#: src/testing/testing.c:1710
 #, fuzzy
 msgid "Failed to copy new configuration to remote machine."
 msgstr "保存配置失败。"
 
-#: src/testing/testing.c:1723
+#: src/testing/testing.c:1881
 #, fuzzy
 msgid "Peers failed to connect"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/testing/testing.c:1918 src/testing/testing.c:2036
+#: src/testing/testing.c:2036
 #, fuzzy
 msgid "Failed to connect to core service of first peer!\n"
 msgstr "加载 sqstore 服务失败。检查您的配置!\n"
 
-#: src/testing/testing.c:2107
+#: src/testing/testing.c:2238
 msgid "Peers are not fully running yet, can not connect!\n"
 msgstr ""
 
@@ -651,200 +652,198 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:202
+#: src/peerinfo/gnunet-service-peerinfo.c:197
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:251
+#: src/peerinfo/gnunet-service-peerinfo.c:241
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:318
+#: src/peerinfo/gnunet-service-peerinfo.c:306
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api_notify.c:266
+#: src/peerinfo/peerinfo_api_notify.c:257
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/peerinfo/test_peerinfo_api.c:112 src/hostlist/hostlist-server.c:469
-#: src/peerinfo-tool/gnunet-peerinfo.c:168 src/dv/gnunet-service-dv.c:2833
-#: src/core/gnunet-service-core.c:3036 src/core/gnunet-service-core.c:3345
+#: src/peerinfo/test_peerinfo_api.c:109 src/hostlist/hostlist-server.c:437
+#: src/peerinfo-tool/gnunet-peerinfo.c:157 src/dv/gnunet-service-dv.c:2998
+#: src/core/gnunet-service-core.c:3034 src/core/gnunet-service-core.c:3328
 #, c-format
 msgid "Error in communication with PEERINFO service\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:280
+#: src/peerinfo/peerinfo_api.c:276
 #, fuzzy, c-format
 msgid "Failed to transmit message to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/peerinfo/peerinfo_api.c:447
+#: src/peerinfo/peerinfo_api.c:432
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:476 src/peerinfo/peerinfo_api.c:494
+#: src/peerinfo/peerinfo_api.c:461 src/peerinfo/peerinfo_api.c:479
 msgid "Received invalid message from `PEERINFO' service.\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:540
+#: src/peerinfo/peerinfo_api.c:521
 #, fuzzy
 msgid "Failed to transmit iteration request to `PEERINFO' service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/peerinfo/peerinfo_api.c:580
+#: src/peerinfo/peerinfo_api.c:555
 msgid "Timeout transmitting iteration request to `PEERINFO' service.\n"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:281
-#: src/hostlist/hostlist-client.c:620
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:259
+#: src/hostlist/hostlist-client.c:622
 #, c-format
 msgid "# advertised URI `%s' downloaded"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:298
-#: src/hostlist/hostlist-client.c:594 src/hostlist/hostlist-client.c:1384
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:274
+#: src/hostlist/hostlist-client.c:592 src/hostlist/hostlist-client.c:1338
 msgid "# advertised hostlist URIs"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:311
-#: src/hostlist/hostlist-server.c:377
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:286
+#: src/hostlist/hostlist-server.c:353
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:422
+#: src/hostlist/test_gnunet_daemon_hostlist_learning.c:389
 #, c-format
 msgid "Hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:265
+#: src/hostlist/gnunet-daemon-hostlist.c:253
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:300
-#: src/topology/gnunet-daemon-topology.c:1452
-#: src/topology/gnunet-daemon-topology.c:1460 src/fs/gnunet-service-fs.c:544
+#: src/hostlist/gnunet-daemon-hostlist.c:286
+#: src/topology/gnunet-daemon-topology.c:1315
+#: src/topology/gnunet-daemon-topology.c:1322 src/fs/gnunet-service-fs.c:519
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:321
+#: src/hostlist/gnunet-daemon-hostlist.c:306
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/hostlist/gnunet-daemon-hostlist.c:311
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:328
+#: src/hostlist/gnunet-daemon-hostlist.c:314
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:332
+#: src/hostlist/gnunet-daemon-hostlist.c:318
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:344
+#: src/hostlist/gnunet-daemon-hostlist.c:330
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:135
+#: src/hostlist/hostlist-server.c:134
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:164
+#: src/hostlist/hostlist-server.c:160
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:194
-#: src/topology/gnunet-daemon-topology.c:973
-#: src/transport/gnunet-service-transport.c:3160
-#: src/transport/gnunet-service-transport.c:4572
+#: src/hostlist/hostlist-server.c:187
+#: src/topology/gnunet-daemon-topology.c:900
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:217
+#: src/hostlist/hostlist-server.c:208
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:234
+#: src/hostlist/hostlist-server.c:224
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:289
+#: src/hostlist/hostlist-server.c:272
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:292
+#: src/hostlist/hostlist-server.c:275
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:302
+#: src/hostlist/hostlist-server.c:283
 msgid "Sending 100 CONTINUE reply\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:309
+#: src/hostlist/hostlist-server.c:290
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:313
+#: src/hostlist/hostlist-server.c:294
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:321
+#: src/hostlist/hostlist-server.c:302
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:323
+#: src/hostlist/hostlist-server.c:305
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:329
+#: src/hostlist/hostlist-server.c:309
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:331
+#: src/hostlist/hostlist-server.c:310
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:427
+#: src/hostlist/hostlist-server.c:398
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:599
-#: src/transport/gnunet-service-transport.c:6603
-#: src/peerinfo-tool/gnunet-peerinfo.c:224 src/core/gnunet-service-core.c:4703
+#: src/hostlist/hostlist-server.c:556
+#: src/transport/gnunet-service-transport.c:458
+#: src/peerinfo-tool/gnunet-peerinfo.c:208 src/core/gnunet-service-core.c:4607
 #, c-format
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:611
+#: src/hostlist/hostlist-server.c:566
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:623
+#: src/hostlist/hostlist-server.c:575
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:639
+#: src/hostlist/hostlist-server.c:589
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:679
+#: src/hostlist/hostlist-server.c:627
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -853,372 +852,368 @@
 msgid "# bytes downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:343
+#: src/hostlist/hostlist-client.c:307 src/hostlist/hostlist-client.c:339
 msgid "# invalid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:314 src/hostlist/hostlist-client.c:347
+#: src/hostlist/hostlist-client.c:310 src/hostlist/hostlist-client.c:342
 #, c-format
 msgid "Invalid `%s' message received from hostlist at `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:334
+#: src/hostlist/hostlist-client.c:330
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:383 src/hostlist/hostlist-client.c:403
+#: src/hostlist/hostlist-client.c:374 src/hostlist/hostlist-client.c:395
 #, c-format
 msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:480 src/hostlist/hostlist-client.c:680
-#: src/hostlist/hostlist-client.c:687 src/hostlist/hostlist-client.c:739
-#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:885
-#: src/hostlist/hostlist-client.c:996 src/hostlist/hostlist-client.c:1002
-#: src/transport/test_plugin_transport_https.c:787
-#: src/transport/test_plugin_transport_https.c:796
-#: src/transport/plugin_transport_http.c:2094
-#: src/transport/plugin_transport_http.c:2103
+#: src/hostlist/hostlist-client.c:472 src/hostlist/hostlist-client.c:682
+#: src/hostlist/hostlist-client.c:688 src/hostlist/hostlist-client.c:740
+#: src/hostlist/hostlist-client.c:749 src/hostlist/hostlist-client.c:877
+#: src/hostlist/hostlist-client.c:967 src/hostlist/hostlist-client.c:972
+#: src/transport/test_plugin_transport_https.c:829
+#: src/transport/test_plugin_transport_https.c:837
+#: src/transport/plugin_transport_http.c:2059
+#: src/transport/plugin_transport_http.c:2067
+#: src/transport/test_plugin_transport_http.c:795
 #: src/transport/test_plugin_transport_http.c:803
-#: src/transport/test_plugin_transport_http.c:812
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:661
+#: src/hostlist/hostlist-client.c:663
 #, c-format
 msgid ""
 "Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
 "gets dismissed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:810
+#: src/hostlist/hostlist-client.c:805
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:827
+#: src/hostlist/hostlist-client.c:822
 #, c-format
 msgid "Download limit of %u bytes exceeded, stopping download\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:848
+#: src/hostlist/hostlist-client.c:842
 #, fuzzy, c-format
 msgid "%s failed for `%s' at %s:%d: `%s'\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/hostlist/hostlist-client.c:857
+#: src/hostlist/hostlist-client.c:848
 #, c-format
 msgid "Download of hostlist `%s' completed.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:864
+#: src/hostlist/hostlist-client.c:856
 #, c-format
 msgid "Adding successfully tested hostlist `%s' datastore.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:917
+#: src/hostlist/hostlist-client.c:909
 #, c-format
 msgid "Bootstrapping using hostlist at `%s'.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:926
+#: src/hostlist/hostlist-client.c:917
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1075 src/hostlist/hostlist-client.c:1567
+#: src/hostlist/hostlist-client.c:1045 src/hostlist/hostlist-client.c:1511
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1084
+#: src/hostlist/hostlist-client.c:1054
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1124
+#: src/hostlist/hostlist-client.c:1092
 msgid "Scheduled saving of hostlists\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1128
+#: src/hostlist/hostlist-client.c:1096
 #, c-format
 msgid "Hostlists will be saved to file again in %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1151 src/hostlist/hostlist-client.c:1171
+#: src/hostlist/hostlist-client.c:1117 src/hostlist/hostlist-client.c:1133
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1294
+#: src/hostlist/hostlist-client.c:1249
 #, c-format
 msgid "Initial time between hostlist downloads is %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1325
+#: src/hostlist/hostlist-client.c:1280
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot load hostlists from file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1331
+#: src/hostlist/hostlist-client.c:1286
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1335
+#: src/hostlist/hostlist-client.c:1290
 #, c-format
 msgid "Hostlist file `%s' is not existing\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1344
+#: src/hostlist/hostlist-client.c:1301
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/hostlist-client.c:1378
+#: src/hostlist/hostlist-client.c:1334
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1380
+#: src/hostlist/hostlist-client.c:1336
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1416
+#: src/hostlist/hostlist-client.c:1369
 #, c-format
 msgid ""
 "No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1429
+#: src/hostlist/hostlist-client.c:1383
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/hostlist-client.c:1436
+#: src/hostlist/hostlist-client.c:1388
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1464 src/hostlist/hostlist-client.c:1482
+#: src/hostlist/hostlist-client.c:1412 src/hostlist/hostlist-client.c:1429
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1476
+#: src/hostlist/hostlist-client.c:1424
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1533
+#: src/hostlist/hostlist-client.c:1476
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1536
+#: src/hostlist/hostlist-client.c:1479
 #, c-format
 msgid "Hostlists will be saved to file again in  %llums\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1545
+#: src/hostlist/hostlist-client.c:1488
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1557
+#: src/hostlist/hostlist-client.c:1500
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1560
+#: src/hostlist/hostlist-client.c:1504
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:253
+#: src/topology/gnunet-daemon-topology.c:250
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:418
+#: src/topology/gnunet-daemon-topology.c:402
 msgid "# connect requests issued to core"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:718
-#: src/topology/gnunet-daemon-topology.c:832
-#: src/transport/gnunet-service-transport.c:2666
-#: src/transport/gnunet-service-transport.c:2725
+#: src/topology/gnunet-daemon-topology.c:676
+#: src/topology/gnunet-daemon-topology.c:778
+#: src/transport/gnunet-service-transport_neighbours.c:432
+#: src/transport/gnunet-service-transport_neighbours.c:627
 msgid "# peers connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:741
-#: src/topology/gnunet-daemon-topology.c:839
+#: src/topology/gnunet-daemon-topology.c:697
+#: src/topology/gnunet-daemon-topology.c:783
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1059
+#: src/topology/gnunet-daemon-topology.c:977
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1097
+#: src/topology/gnunet-daemon-topology.c:1009
 #, c-format
 msgid "Option `%s' in section `%s' not specified!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1110
+#: src/topology/gnunet-daemon-topology.c:1021
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1117
+#: src/topology/gnunet-daemon-topology.c:1027
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1126
+#: src/topology/gnunet-daemon-topology.c:1036
 #, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1134
+#: src/topology/gnunet-daemon-topology.c:1044
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1150
+#: src/topology/gnunet-daemon-topology.c:1064
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1161
+#: src/topology/gnunet-daemon-topology.c:1077
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1176
+#: src/topology/gnunet-daemon-topology.c:1087
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1182
+#: src/topology/gnunet-daemon-topology.c:1093
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1193
+#: src/topology/gnunet-daemon-topology.c:1103
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1200
+#: src/topology/gnunet-daemon-topology.c:1109
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1206
+#: src/topology/gnunet-daemon-topology.c:1116
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1247
+#: src/topology/gnunet-daemon-topology.c:1151
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1316
+#: src/topology/gnunet-daemon-topology.c:1208
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1487
+#: src/topology/gnunet-daemon-topology.c:1348
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/statistics/statistics_api.c:325
+#: src/statistics/statistics_api.c:326
 #, fuzzy
 msgid "Failed to connect to statistics service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:94
+#: src/statistics/gnunet-statistics.c:89
 #, fuzzy, c-format
 msgid "Failed to obtain statistics.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:125 src/fs/gnunet-pseudonym.c:172
+#: src/statistics/gnunet-statistics.c:117 src/fs/gnunet-pseudonym.c:151
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/statistics/gnunet-statistics.c:162
+#: src/statistics/gnunet-statistics.c:155
 msgid "limit output to statistcs for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:165
+#: src/statistics/gnunet-statistics.c:158
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:168
+#: src/statistics/gnunet-statistics.c:161
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:177
+#: src/statistics/gnunet-statistics.c:168
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:211
+#: src/statistics/gnunet-service-statistics.c:208
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-service-statistics.c:273
+#: src/statistics/gnunet-service-statistics.c:266
 #, c-format
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/util/os_priority.c:116
+#: src/util/os_priority.c:110
 #, c-format
 msgid "Not installing a handler because $%s=%s\n"
 msgstr ""
 
-#: src/util/os_installation.c:296
+#: src/util/os_installation.c:291
 #, fuzzy, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:482 src/transport/test_transport_api.c:642
-#: src/transport/test_transport_api_reliability.c:655
-#: src/transport/test_transport_api_unreliability.c:700
+#: src/util/os_installation.c:474
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/util/os_installation.c:489 src/transport/test_transport_api.c:649
-#: src/transport/test_transport_api_reliability.c:662
-#: src/transport/test_transport_api_unreliability.c:707
+#: src/util/os_installation.c:479
 #, fuzzy, c-format
 msgid "stat (%s) failed: %s\n"
 msgstr "“%s”说:%s\n"
 
-#: src/util/common_logging.c:154 src/util/common_logging.c:492
-#: src/util/test_common_logging.c:76
+#: src/util/common_logging.c:154 src/util/common_logging.c:500
+#: src/util/test_common_logging.c:75
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:156 src/util/common_logging.c:490
+#: src/util/common_logging.c:156 src/util/common_logging.c:498
 #: src/util/test_common_logging.c:72
 msgid "INFO"
 msgstr "信息"
 
-#: src/util/common_logging.c:158 src/util/common_logging.c:488
+#: src/util/common_logging.c:158 src/util/common_logging.c:496
 #: src/util/test_common_logging.c:68
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:160 src/util/common_logging.c:486
-#: src/util/test_common_logging.c:64
+#: src/util/common_logging.c:160 src/util/common_logging.c:494
+#: src/util/test_common_logging.c:65
 msgid "ERROR"
 msgstr "错误"
 
@@ -1226,33 +1221,33 @@
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:204 src/dht/plugin_dhtlog_mysql_dump.c:837
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:602
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:635
+#: src/util/common_logging.c:214 src/dht/plugin_dhtlog_mysql_dump.c:909
 #: src/dht/plugin_dhtlog_mysql_dump_load.c:669
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:703
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:737
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:770
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:803
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:836
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:700
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:732
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:764
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:796
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:827
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:858
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:889
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/common_logging.c:321
+#: src/util/common_logging.c:331
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次,在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:493
+#: src/util/common_logging.c:501
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:575
+#: src/util/common_logging.c:583
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:615
+#: src/util/common_logging.c:621
 msgid "invalid address"
 msgstr ""
 
@@ -1265,176 +1260,176 @@
 msgid "no-name"
 msgstr "无名称"
 
-#: src/util/test_strings.c:42 src/util/strings.c:138
+#: src/util/test_strings.c:42 src/util/strings.c:139
 msgid "b"
 msgstr "b"
 
-#: src/util/test_strings.c:45 src/util/strings.c:144
+#: src/util/test_strings.c:45 src/util/strings.c:145
 msgid "KiB"
 msgstr "KiB"
 
-#: src/util/test_strings.c:48 src/util/strings.c:156
+#: src/util/test_strings.c:48 src/util/strings.c:157
 msgid "TiB"
 msgstr "TiB"
 
-#: src/util/test_strings.c:51 src/util/strings.c:362
+#: src/util/test_strings.c:51 src/util/strings.c:363
 msgid "ms"
 msgstr "毫秒"
 
-#: src/util/test_strings.c:57 src/util/strings.c:371
+#: src/util/test_strings.c:56 src/util/strings.c:372
 msgid "s"
 msgstr "秒"
 
-#: src/util/test_strings.c:63 src/util/strings.c:379
+#: src/util/test_strings.c:61 src/util/strings.c:380
 msgid "h"
 msgstr "时"
 
-#: src/util/connection.c:459
+#: src/util/connection.c:457
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/util/connection.c:475
+#: src/util/connection.c:472
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:647
+#: src/util/connection.c:640
 #, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
-#: src/util/connection.c:869 src/util/connection.c:1043
+#: src/util/connection.c:852 src/util/connection.c:1023
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/util/connection.c:1032
+#: src/util/connection.c:1013
 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
 
-#: src/util/connection.c:1558
+#: src/util/connection.c:1529
 #, c-format
 msgid ""
 "Could not satisfy pending transmission request, socket closed or connect "
 "failed (%p).\n"
 msgstr ""
 
-#: src/util/connection.c:1594
+#: src/util/connection.c:1565
 #, fuzzy, c-format
 msgid "Failed to send to `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/util/plugin.c:88
+#: src/util/plugin.c:87
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
 msgstr "插件机构初始化失败:%s!\n"
 
-#: src/util/plugin.c:148
+#: src/util/plugin.c:144
 #, c-format
 msgid "`%s' failed to resolve method '%s' with error: %s\n"
 msgstr ""
 
-#: src/util/plugin.c:221
+#: src/util/plugin.c:217
 #, c-format
 msgid "`%s' failed for library `%s' with error: %s\n"
 msgstr ""
 
-#: src/util/bio.c:136 src/util/bio.c:143
+#: src/util/bio.c:134 src/util/bio.c:140
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "创建用户出错"
 
-#: src/util/bio.c:144
+#: src/util/bio.c:141
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:200
+#: src/util/bio.c:193
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:212
+#: src/util/bio.c:203
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:258
+#: src/util/bio.c:248
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:273
+#: src/util/bio.c:262
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/crypto_rsa.c:623 src/util/crypto_rsa.c:673
+#: src/util/crypto_rsa.c:611 src/util/crypto_rsa.c:658
 #, fuzzy, c-format
 msgid "Could not aquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/crypto_rsa.c:628
+#: src/util/crypto_rsa.c:616
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_rsa.c:648
+#: src/util/crypto_rsa.c:634
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:677 src/util/crypto_rsa.c:719
+#: src/util/crypto_rsa.c:662 src/util/crypto_rsa.c:698
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:713
+#: src/util/crypto_rsa.c:693
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:734
+#: src/util/crypto_rsa.c:714
 #, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:754
+#: src/util/crypto_rsa.c:732
 #, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:978
+#: src/util/crypto_rsa.c:953
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/server.c:389
+#: src/util/server.c:384
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/server.c:399
+#: src/util/server.c:392
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/server.c:405
+#: src/util/server.c:397
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/server.c:627
+#: src/util/server.c:612
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "GNUNET_SERVER_receive_done after %llums\n"
 msgstr ""
 
-#: src/util/network.c:1088
+#: src/util/network.c:1193
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -1445,7 +1440,7 @@
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:264
+#: src/util/crypto_random.c:263
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
@@ -1455,171 +1450,176 @@
 msgid "Got IP address `%s' for our host.\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:146 src/util/resolver_api.c:914
+#: src/util/test_resolver_api.c:147 src/util/resolver_api.c:873
 #, c-format
 msgid "Resolving our FQDN `%s'\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:152
+#: src/util/test_resolver_api.c:154
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s %u\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/test_resolver_api.c:259
+#: src/util/test_resolver_api.c:264
 #, c-format
 msgid "gethostbyname() could not lookup IP address: %s\n"
 msgstr ""
 
-#: src/util/test_resolver_api.c:318
+#: src/util/test_resolver_api.c:329
 #, c-format
 msgid "gethostbyaddr() could not lookup hostname: %s\n"
 msgstr ""
 
-#: src/util/configuration.c:246
+#: src/util/configuration.c:244
 #, fuzzy, c-format
 msgid "Syntax error in configuration file `%s' at line %u.\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/util/configuration.c:810
+#: src/util/configuration.c:801
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:89
+#: src/util/gnunet-resolver.c:76
 msgid "Test GNUnet DNS resolver code."
 msgstr ""
 
-#: src/util/client.c:311
+#: src/util/client.c:304
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:319
+#: src/util/client.c:312
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:679
+#: src/util/client.c:669
 msgid "Failure to transmit TEST request.\n"
 msgstr ""
 
-#: src/util/client.c:728
+#: src/util/client.c:729 src/util/service.c:880
 #, c-format
+msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
+msgstr ""
+
+#: src/util/client.c:871
+#, c-format
 msgid "Could not connect to service `%s', must not be running.\n"
 msgstr ""
 
-#: src/util/client.c:744
+#: src/util/client.c:887
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1017
+#: src/util/client.c:1158
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/scheduler.c:791
+#: src/util/scheduler.c:859
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:922
+#: src/util/scheduler.c:990
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/strings.c:148
+#: src/util/strings.c:149
 msgid "MiB"
 msgstr "MiB"
 
-#: src/util/strings.c:152
+#: src/util/strings.c:153
 msgid "GiB"
 msgstr "GiB"
 
-#: src/util/strings.c:191
+#: src/util/strings.c:193
 #, c-format
 msgid "Character set requested was `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:268
+#: src/util/strings.c:271
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败:没有设置环境变量“HOME”"
 
-#: src/util/strings.c:367
+#: src/util/strings.c:368
 msgid "eternity"
 msgstr ""
 
-#: src/util/strings.c:375
+#: src/util/strings.c:376
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:383
+#: src/util/strings.c:384
 msgid " days"
 msgstr " 天"
 
-#: src/util/strings.c:407
+#: src/util/strings.c:408
 msgid "end of time"
 msgstr ""
 
-#: src/util/disk.c:418
+#: src/util/disk.c:429
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%s': %u\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/disk.c:781
+#: src/util/disk.c:829
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录!\n"
 
-#: src/util/disk.c:1134 src/util/service.c:1510
+#: src/util/disk.c:1180 src/util/service.c:1456
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/util/disk.c:1438
+#: src/util/disk.c:1486
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:199
+#: src/util/resolver_api.c:198
 #, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:219
+#: src/util/resolver_api.c:217
 #, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:363
+#: src/util/resolver_api.c:354
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/util/resolver_api.c:367
+#: src/util/resolver_api.c:358
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:441
+#: src/util/resolver_api.c:427
 #, c-format
 msgid "Resolver returns `%s' for IP `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:827
+#: src/util/resolver_api.c:789
 #, c-format
 msgid "Resolver returns `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:920
+#: src/util/resolver_api.c:879
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/resolver_api.c:953
+#: src/util/resolver_api.c:911
 #, c-format
 msgid "Resolving our hostname `%s'\n"
 msgstr ""
@@ -1629,18 +1629,18 @@
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/gnunet-service-resolver.c:318
-#: src/util/gnunet-service-resolver.c:367
+#: src/util/gnunet-service-resolver.c:317
+#: src/util/gnunet-service-resolver.c:362
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/util/gnunet-service-resolver.c:469
+#: src/util/gnunet-service-resolver.c:460
 #, c-format
 msgid "Resolver asked to look up `%s'.\n"
 msgstr ""
 
-#: src/util/gnunet-service-resolver.c:516
+#: src/util/gnunet-service-resolver.c:508
 #, c-format
 msgid "Resolver asked to look up IP address `%s'.\n"
 msgstr ""
@@ -1650,62 +1650,62 @@
 msgid "%s: option `%s' is ambiguous\n"
 msgstr "%s:选项“%s”有歧义\n"
 
-#: src/util/getopt.c:693
+#: src/util/getopt.c:692
 #, c-format
 msgid "%s: option `--%s' does not allow an argument\n"
 msgstr "%s:选项“--%s”不允许有参数\n"
 
-#: src/util/getopt.c:699
+#: src/util/getopt.c:697
 #, c-format
 msgid "%s: option `%c%s' does not allow an argument\n"
 msgstr "%s:选项“%c%s”不允许有参数\n"
 
-#: src/util/getopt.c:718 src/util/getopt.c:887
+#: src/util/getopt.c:714 src/util/getopt.c:882
 #, c-format
 msgid "%s: option `%s' requires an argument\n"
 msgstr "%s:选项“%s”要求有一个参数\n"
 
-#: src/util/getopt.c:747
+#: src/util/getopt.c:743
 #, c-format
 msgid "%s: unrecognized option `--%s'\n"
 msgstr "%s:无法识别的选项“--%s”\n"
 
-#: src/util/getopt.c:751
+#: src/util/getopt.c:747
 #, c-format
 msgid "%s: unrecognized option `%c%s'\n"
 msgstr "%s:无法识别的选项“%c%s”\n"
 
-#: src/util/getopt.c:776
+#: src/util/getopt.c:772
 #, c-format
 msgid "%s: illegal option -- %c\n"
 msgstr "%s:非法选项 -- %c\n"
 
-#: src/util/getopt.c:778
+#: src/util/getopt.c:774
 #, c-format
 msgid "%s: invalid option -- %c\n"
 msgstr "%s:无效选项 -- %c\n"
 
-#: src/util/getopt.c:806 src/util/getopt.c:936
+#: src/util/getopt.c:802 src/util/getopt.c:930
 #, c-format
 msgid "%s: option requires an argument -- %c\n"
 msgstr "%s:选项要求有一个参数 -- %c\n"
 
-#: src/util/getopt.c:854
+#: src/util/getopt.c:850
 #, c-format
 msgid "%s: option `-W %s' is ambiguous\n"
 msgstr "%s:选项“-W %s”有歧义\n"
 
-#: src/util/getopt.c:872
+#: src/util/getopt.c:868
 #, c-format
 msgid "%s: option `-W %s' does not allow an argument\n"
 msgstr "%s:选项“-W %s” 不允许有参数\n"
 
-#: src/util/getopt.c:1041
+#: src/util/getopt.c:1034
 #, c-format
 msgid "Use --help to get a list of options.\n"
 msgstr "请使用 --help 获取选项列表。\n"
 
-#: src/util/signal.c:77
+#: src/util/signal.c:78
 #, c-format
 msgid "signal (%d, %p) returned %d.\n"
 msgstr ""
@@ -1716,142 +1716,137 @@
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "长选项的必选参数对短选项也是必选的。\n"
 
-#: src/util/getopt_helpers.c:255 src/util/getopt_helpers.c:284
+#: src/util/getopt_helpers.c:254 src/util/getopt_helpers.c:282
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/service.c:114 src/util/service.c:142 src/util/service.c:188
-#: src/util/service.c:212 src/util/service.c:219
+#: src/util/service.c:112 src/util/service.c:138 src/util/service.c:182
+#: src/util/service.c:202 src/util/service.c:209
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/util/service.c:171
+#: src/util/service.c:165
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/util/service.c:268
+#: src/util/service.c:258
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾:“%s”)\n"
 
-#: src/util/service.c:304
+#: src/util/service.c:292
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 
-#: src/util/service.c:336
+#: src/util/service.c:323
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
 
-#: src/util/service.c:649
+#: src/util/service.c:627
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:656
+#: src/util/service.c:632
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/util/service.c:662
+#: src/util/service.c:639
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:707
+#: src/util/service.c:683
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:735
+#: src/util/service.c:712
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:857
+#: src/util/service.c:829
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:881 src/transport/plugin_transport_tcp.c:2048
+#: src/util/service.c:850 src/transport/plugin_transport_tcp.c:1927
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/service.c:915
+#: src/util/service.c:900
 #, c-format
-msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr ""
-
-#: src/util/service.c:936
-#, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:953
+#: src/util/service.c:917
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:985
+#: src/util/service.c:947
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/util/service.c:1003
+#: src/util/service.c:965
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/service.c:1163 src/util/service.c:1182
+#: src/util/service.c:1121 src/util/service.c:1139
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1211
+#: src/util/service.c:1166
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1367
+#: src/util/service.c:1315
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/util/service.c:1402
+#: src/util/service.c:1349
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1450
+#: src/util/service.c:1397
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1455
+#: src/util/service.c:1401
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1459
+#: src/util/service.c:1405
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1511
+#: src/util/service.c:1457
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/util/service.c:1525
+#: src/util/service.c:1471
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”:%s\n"
 
-#: src/util/service.c:1585
+#: src/util/service.c:1534
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -1860,70 +1855,70 @@
 msgid "`%' must be followed by HEX number"
 msgstr ""
 
-#: src/fs/fs_uri.c:275
+#: src/fs/fs_uri.c:273
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:293
+#: src/fs/fs_uri.c:291
 msgid "`++' not allowed in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:300
+#: src/fs/fs_uri.c:298
 msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:370 src/fs/fs_uri.c:377
+#: src/fs/fs_uri.c:366 src/fs/fs_uri.c:373
 msgid "Malformed SKS URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:421 src/fs/fs_uri.c:441
+#: src/fs/fs_uri.c:417 src/fs/fs_uri.c:432
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:572 src/fs/fs_uri.c:592 src/fs/fs_uri.c:602
-#: src/fs/fs_uri.c:631
+#: src/fs/fs_uri.c:562 src/fs/fs_uri.c:577 src/fs/fs_uri.c:587
+#: src/fs/fs_uri.c:615
 msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:611
+#: src/fs/fs_uri.c:597
 msgid "SKS URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:617
+#: src/fs/fs_uri.c:603
 msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:625
+#: src/fs/fs_uri.c:609
 msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:636
+#: src/fs/fs_uri.c:622
 msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:649
+#: src/fs/fs_uri.c:634
 msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:688
+#: src/fs/fs_uri.c:672
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:923
+#: src/fs/fs_uri.c:897
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "立即保存配置?"
 
-#: src/fs/fs_uri.c:930
+#: src/fs/fs_uri.c:904
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/fs/fs_uri.c:1248 src/fs/fs_uri.c:1275
+#: src/fs/fs_uri.c:1212 src/fs/fs_uri.c:1239
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1281
+#: src/fs/fs_uri.c:1245
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -1932,451 +1927,469 @@
 msgid "Failed to receive response for `%s' request from `%s' service.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:119
+#: src/fs/fs_list_indexed.c:117
 #, c-format
 msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
 msgstr ""
 
-#: src/fs/fs_list_indexed.c:176
+#: src/fs/fs_list_indexed.c:164
 #, fuzzy, c-format
 msgid "Failed to not connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-service-fs_lc.c:207 src/fs/gnunet-service-fs_lc.c:377
-#: src/fs/gnunet-service-fs_lc.c:519
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:359
+#: src/fs/gnunet-service-fs_lc.c:480
 msgid "# client searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:262
+#: src/fs/gnunet-service-fs_lc.c:254
 msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:323
+#: src/fs/gnunet-service-fs_lc.c:312
 msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:367
+#: src/fs/gnunet-service-fs_lc.c:351
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
-#: src/fs/fs_publish.c:152 src/fs/fs_publish.c:462
+#: src/fs/fs_publish.c:142 src/fs/fs_publish.c:410
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:740 src/fs/fs_publish.c:756 src/fs/fs_publish.c:797
-#: src/fs/fs_publish.c:816 src/fs/fs_publish.c:846 src/fs/fs_publish.c:1020
+#: src/fs/fs_publish.c:647 src/fs/fs_publish.c:664 src/fs/fs_publish.c:703
+#: src/fs/fs_publish.c:723 src/fs/fs_publish.c:750 src/fs/fs_publish.c:898
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:742
+#: src/fs/fs_publish.c:649
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:754
+#: src/fs/fs_publish.c:661
 #, fuzzy
 msgid "unknown error"
 msgstr "未知错误"
 
-#: src/fs/fs_publish.c:799
+#: src/fs/fs_publish.c:704
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:818
+#: src/fs/fs_publish.c:724
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:848
+#: src/fs/fs_publish.c:751
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:877
+#: src/fs/fs_publish.c:775
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_publish.c:956
+#: src/fs/fs_publish.c:845
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:964
+#: src/fs/fs_publish.c:851
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1022
+#: src/fs/fs_publish.c:899
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1219
+#: src/fs/fs_publish.c:1078
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1295
+#: src/fs/fs_publish.c:1149
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:1665
+#: src/fs/fs_publish.c:1482
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:1702 src/fs/fs_namespace.c:890
+#: src/fs/fs_publish.c:1518 src/fs/fs_namespace.c:822
 #, fuzzy
 msgid "Internal error."
 msgstr "未知错误。\n"
 
-#: src/fs/gnunet-download.c:104
+#: src/fs/gnunet-download.c:100
 #, fuzzy, c-format
 msgid "Starting download `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-download.c:113
+#: src/fs/gnunet-download.c:112
 #, c-format
 msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s)\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:125
+#: src/fs/gnunet-download.c:121
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:132
+#: src/fs/gnunet-download.c:129
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:150 src/fs/gnunet-unindex.c:118
-#: src/fs/gnunet-search.c:199 src/fs/gnunet-publish.c:165
+#: src/fs/gnunet-download.c:144 src/fs/gnunet-unindex.c:109
+#: src/fs/gnunet-search.c:190 src/fs/gnunet-publish.c:155
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:179
+#: src/fs/gnunet-download.c:169
 #, fuzzy, c-format
 msgid "You need to specify a URI argument.\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-download.c:187 src/fs/gnunet-publish.c:497
+#: src/fs/gnunet-download.c:175 src/fs/gnunet-publish.c:426
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/fs/gnunet-download.c:197
+#: src/fs/gnunet-download.c:182
 #, c-format
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:205
+#: src/fs/gnunet-download.c:189
 #, c-format
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:224 src/fs/gnunet-unindex.c:158
-#: src/fs/gnunet-search.c:260 src/fs/gnunet-publish.c:469
+#: src/fs/gnunet-download.c:203 src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-search.c:241 src/fs/gnunet-publish.c:404
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-download.c:270 src/fs/gnunet-search.c:313
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-search.c:285
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:273
+#: src/fs/gnunet-download.c:243
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:276 src/fs/gnunet-search.c:316
+#: src/fs/gnunet-download.c:246 src/fs/gnunet-search.c:288
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:279
+#: src/fs/gnunet-download.c:249
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:283
+#: src/fs/gnunet-download.c:253
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:287
+#: src/fs/gnunet-download.c:257
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:290
+#: src/fs/gnunet-download.c:260
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:293 src/fs/gnunet-unindex.c:191
-#: src/fs/gnunet-search.c:327 src/fs/gnunet-publish.c:684
-#: src/dht/gnunet-dht-get-peer.c:201 src/dht/gnunet-dht-put.c:188
-#: src/dht/gnunet-dht-get.c:214 src/nse/nse-profiler.c:442
+#: src/fs/gnunet-download.c:263 src/fs/gnunet-unindex.c:169
+#: src/fs/gnunet-search.c:297 src/fs/gnunet-publish.c:585
+#: src/mesh/test_mesh_small.c:674 src/dht/gnunet-dht-get-peer.c:190
+#: src/dht/gnunet-dht-put.c:176 src/dht/gnunet-dht-get.c:204
+#: src/nse/gnunet-nse-profiler.c:655
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:302
+#: src/fs/gnunet-download.c:270
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:93
+#: src/fs/gnunet-unindex.c:89
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:102
+#: src/fs/gnunet-unindex.c:96
 #, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:108
+#: src/fs/gnunet-unindex.c:101
 #, c-format
 msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:144
+#: src/fs/gnunet-unindex.c:131
 #, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:169
+#: src/fs/gnunet-unindex.c:148
 #, c-format
 msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:200
+#: src/fs/gnunet-unindex.c:176
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/fs/fs_namespace.c:54 src/fs/fs_namespace.c:83
+#: src/fs/fs_namespace.c:52 src/fs/fs_namespace.c:78
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s' in section `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/fs/fs_namespace.c:117
+#: src/fs/fs_namespace.c:107
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_namespace.c:146 src/fs/fs_namespace.c:239
+#: src/fs/fs_namespace.c:129 src/fs/fs_namespace.c:217
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/fs/fs_namespace.c:449 src/fs/fs_namespace.c:471
+#: src/fs/fs_namespace.c:323
 #, fuzzy
+msgid "Unknown error"
+msgstr "未知错误"
+
+#: src/fs/fs_namespace.c:412 src/fs/fs_namespace.c:433
+#, fuzzy
 msgid "Failed to serialize meta data"
 msgstr "发送消息失败。\n"
 
-#: src/fs/fs_namespace.c:489
+#: src/fs/fs_namespace.c:452
 #, fuzzy
 msgid "Failed to connect to datastore service"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_namespace.c:537
+#: src/fs/fs_namespace.c:495
 #, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:642
+#: src/fs/fs_namespace.c:597
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:943
+#: src/fs/fs_namespace.c:866
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:192
+#: src/fs/gnunet-pseudonym.c:165
 #, c-format
 msgid "Namespace `%s' unknown.\n"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:284 src/fs/gnunet-pseudonym.c:291
-#: src/fs/gnunet-pseudonym.c:293
+#: src/fs/gnunet-pseudonym.c:240 src/fs/gnunet-pseudonym.c:247
+#: src/fs/gnunet-pseudonym.c:249
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s:选项“%s”有歧义\n"
 
-#: src/fs/gnunet-pseudonym.c:313 src/fs/gnunet-publish.c:630
+#: src/fs/gnunet-pseudonym.c:269 src/fs/gnunet-publish.c:532
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:317
+#: src/fs/gnunet-pseudonym.c:272
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:321
+#: src/fs/gnunet-pseudonym.c:275
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:325
+#: src/fs/gnunet-pseudonym.c:278
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:329 src/fs/gnunet-publish.c:650
+#: src/fs/gnunet-pseudonym.c:282 src/fs/gnunet-publish.c:551
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:332
+#: src/fs/gnunet-pseudonym.c:285
 msgid "print names of local namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:335
+#: src/fs/gnunet-pseudonym.c:288
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:338
+#: src/fs/gnunet-pseudonym.c:291
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:341 src/fs/gnunet-publish.c:669
+#: src/fs/gnunet-pseudonym.c:294 src/fs/gnunet-publish.c:570
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:345
+#: src/fs/gnunet-pseudonym.c:297
 msgid "specify ID of the root of the namespace"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:349
+#: src/fs/gnunet-pseudonym.c:300
 msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:359
+#: src/fs/gnunet-pseudonym.c:308
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-search.c:117
+#: src/fs/gnunet-search.c:111
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:188
+#: src/fs/gnunet-search.c:181
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "创建用户出错"
 
-#: src/fs/gnunet-search.c:246
+#: src/fs/gnunet-search.c:231
 #, c-format
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:280
+#: src/fs/gnunet-search.c:255
 #, c-format
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:320
+#: src/fs/gnunet-search.c:291
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:324
+#: src/fs/gnunet-search.c:294
 msgid "automatically terminate search after VALUE ms"
 msgstr ""
 
-#: src/fs/gnunet-search.c:336
+#: src/fs/gnunet-search.c:301
+msgid "automatically terminate search after VALUE results are found"
+msgstr ""
+
+#: src/fs/gnunet-search.c:308
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/fs_unindex.c:64
+#: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:72
+#: src/fs/fs_unindex.c:63
 #, fuzzy
 msgid "Failed to read file"
 msgstr "发送消息失败。\n"
 
-#: src/fs/fs_unindex.c:261
+#: src/fs/fs_unindex.c:235
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:269
+#: src/fs/fs_unindex.c:243
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:277
+#: src/fs/fs_unindex.c:251
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "“%s”的参数无效。\n"
 
-#: src/fs/fs_unindex.c:328
+#: src/fs/fs_unindex.c:296
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:363
+#: src/fs/fs_unindex.c:331
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_unindex.c:376
+#: src/fs/fs_unindex.c:344
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_unindex.c:414
+#: src/fs/fs_unindex.c:378
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/gnunet-directory.c:53
+#: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:100
+#: src/fs/gnunet-directory.c:94
 #, c-format
 msgid "Directory `%s' meta data:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:106
+#: src/fs/gnunet-directory.c:97
 #, c-format
 msgid "Directory `%s' contents:\n"
 msgstr ""
 
-#: src/fs/gnunet-directory.c:147
+#: src/fs/gnunet-directory.c:132
 #, fuzzy, c-format
 msgid "You must specify a filename to inspect."
 msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-directory.c:163
+#: src/fs/gnunet-directory.c:145
 #, fuzzy, c-format
 msgid "Failed to read directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-directory.c:203
+#: src/fs/gnunet-directory.c:176
 #, fuzzy
 msgid "Display contents of a GNUnet directory"
 msgstr "更改 GNUnet 目录的权限出错"
 
-#: src/fs/fs_file_information.c:362
+#: src/fs/fs_file_information.c:349
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s': %s"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/fs/fs_test_lib.c:282
+#: src/fs/fs_test_lib.c:269
 #, fuzzy, c-format
 msgid "Failed to start daemon: %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/fs/gnunet-service-fs_pe.c:158
+#: src/fs/gnunet-service-fs_pe.c:228
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:241
+#: src/fs/gnunet-service-fs_pe.c:334
 msgid "# queries messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:354 src/fs/gnunet-service-fs_pe.c:423
-#: src/fs/gnunet-service-fs_pe.c:455
+#: src/fs/gnunet-service-fs_pe.c:457
+msgid "# requests merged"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:463
+msgid "# requests refreshed"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pe.c:511 src/fs/gnunet-service-fs_pe.c:586
+#: src/fs/gnunet-service-fs_pe.c:622
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/fs_getopt.c:202
+#: src/fs/fs_getopt.c:191
 #, c-format
 msgid ""
 "Unknown metadata type in metadata option `%s'.  Using metadata type "
@@ -2388,806 +2401,819 @@
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:118
+#: src/fs/gnunet-publish.c:115
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:128
+#: src/fs/gnunet-publish.c:123
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:141
+#: src/fs/gnunet-publish.c:134
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:145
+#: src/fs/gnunet-publish.c:138
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:292
+#: src/fs/gnunet-publish.c:265
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-publish.c:299
+#: src/fs/gnunet-publish.c:267
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-publish.c:358
+#: src/fs/gnunet-publish.c:312
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/fs/gnunet-publish.c:411
+#: src/fs/gnunet-publish.c:354
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:419
+#: src/fs/gnunet-publish.c:361
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:425
+#: src/fs/gnunet-publish.c:367
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:434
+#: src/fs/gnunet-publish.c:375
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:445 src/fs/gnunet-publish.c:453
+#: src/fs/gnunet-publish.c:385 src/fs/gnunet-publish.c:392
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:482
+#: src/fs/gnunet-publish.c:414
 #, fuzzy, c-format
 msgid "Could not create namespace `%s'\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-publish.c:536
+#: src/fs/gnunet-publish.c:459
 #, fuzzy, c-format
 msgid "Could not access file: %s\n"
 msgstr "错误:无法访问服务:%s\n"
 
-#: src/fs/gnunet-publish.c:573
+#: src/fs/gnunet-publish.c:484
 #, fuzzy, c-format
 msgid "Could not publish `%s': %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:507
 #, c-format
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:634
+#: src/fs/gnunet-publish.c:536
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:638
+#: src/fs/gnunet-publish.c:539
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:642
+#: src/fs/gnunet-publish.c:543
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:646
+#: src/fs/gnunet-publish.c:547
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:653
+#: src/fs/gnunet-publish.c:554
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:559
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:662
+#: src/fs/gnunet-publish.c:563
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:666
+#: src/fs/gnunet-publish.c:567
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:672
+#: src/fs/gnunet-publish.c:573
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:676
+#: src/fs/gnunet-publish.c:577
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:680
+#: src/fs/gnunet-publish.c:581
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:594
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/fs_directory.c:209 src/fs/fs_directory.c:221
+#: src/fs/fs_directory.c:202 src/fs/fs_directory.c:214
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:726
+#: src/fs/gnunet-service-fs_cp.c:693
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %llu ms\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:765
+#: src/fs/gnunet-service-fs_cp.c:728
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:773
+#: src/fs/gnunet-service-fs_cp.c:734
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:806 src/fs/gnunet-service-fs_cp.c:936
-#: src/fs/gnunet-service-fs_cp.c:1367 src/fs/gnunet-service-fs_cp.c:1414
+#: src/fs/gnunet-service-fs_cp.c:763 src/fs/gnunet-service-fs_cp.c:879
+#: src/fs/gnunet-service-fs_cp.c:1289 src/fs/gnunet-service-fs_cp.c:1326
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:889
+#: src/fs/gnunet-service-fs_cp.c:836
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:959
+#: src/fs/gnunet-service-fs_cp.c:899
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:974
+#: src/fs/gnunet-service-fs_cp.c:913
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1019
+#: src/fs/gnunet-service-fs_cp.c:951
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1087
+#: src/fs/gnunet-service-fs_cp.c:1018
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1112
+#: src/fs/gnunet-service-fs_cp.c:1042
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1122
+#: src/fs/gnunet-service-fs_cp.c:1052
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1201
+#: src/fs/gnunet-service-fs_cp.c:1131
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1236
+#: src/fs/gnunet-service-fs_cp.c:1165
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1260
+#: src/fs/gnunet-service-fs_cp.c:1189
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1329
+#: src/fs/gnunet-service-fs_cp.c:1255
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1360
+#: src/fs/gnunet-service-fs_cp.c:1283
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1410
+#: src/fs/gnunet-service-fs_cp.c:1324
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/fs_download.c:332
+#: src/fs/fs_download.c:309
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:354
+#: src/fs/fs_download.c:329
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:536 src/fs/fs_download.c:554
+#: src/fs/fs_download.c:487 src/fs/fs_download.c:499
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_download.c:977
+#: src/fs/fs_download.c:872
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1070
+#: src/fs/fs_download.c:958
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)\n"
 msgstr ""
 
-#: src/fs/fs_download.c:1108
+#: src/fs/fs_download.c:985
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1133
+#: src/fs/fs_download.c:1008
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_download.c:1149
+#: src/fs/fs_download.c:1020
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_download.c:1161
+#: src/fs/fs_download.c:1029
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_download.c:2017
+#: src/fs/fs_download.c:1826
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:116
-#: src/fs/gnunet-service-fs_indexing.c:177
+#: src/fs/gnunet-service-fs_indexing.c:113
+#: src/fs/gnunet-service-fs_indexing.c:163
 #, fuzzy, c-format
 msgid "Configuration option `%s' in section `%s' missing.\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:125
-#: src/fs/gnunet-service-fs_indexing.c:192
+#: src/fs/gnunet-service-fs_indexing.c:121
+#: src/fs/gnunet-service-fs_indexing.c:177
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:147
+#: src/fs/gnunet-service-fs_indexing.c:137
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "创建用户出错"
 
-#: src/fs/gnunet-service-fs_indexing.c:252
+#: src/fs/gnunet-service-fs_indexing.c:228
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:297
+#: src/fs/gnunet-service-fs_indexing.c:266
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:548
+#: src/fs/gnunet-service-fs_indexing.c:487
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:628
+#: src/fs/gnunet-service-fs_indexing.c:552
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:632
+#: src/fs/gnunet-service-fs_indexing.c:554
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:663
+#: src/fs/gnunet-service-fs_indexing.c:569
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/fs_search.c:859
+#: src/fs/fs_search.c:798
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:388 src/fs/gnunet-service-fs_pr.c:633
+#: src/fs/gnunet-service-fs_pr.c:300
+msgid "# Pending requests created"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_pr.c:379 src/fs/gnunet-service-fs_pr.c:638
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:769
+#: src/fs/gnunet-service-fs_pr.c:802
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:802
+#: src/fs/gnunet-service-fs_pr.c:829
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:821
+#: src/fs/gnunet-service-fs_pr.c:845
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:838
+#: src/fs/gnunet-service-fs_pr.c:860
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:937
+#: src/fs/gnunet-service-fs_pr.c:952
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:962
+#: src/fs/gnunet-service-fs_pr.c:979
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:999
+#: src/fs/gnunet-service-fs_pr.c:1012
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1101
+#: src/fs/gnunet-service-fs_pr.c:1102
 #, c-format
 msgid "Datastore lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1122
+#: src/fs/gnunet-service-fs_pr.c:1123
 #, c-format
 msgid "On-demand lookup already took %llu ms!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1172
+#: src/fs/gnunet-service-fs_pr.c:1170
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1186
+#: src/fs/gnunet-service-fs_pr.c:1184
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1195
+#: src/fs/gnunet-service-fs_pr.c:1193
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1211
+#: src/fs/gnunet-service-fs_pr.c:1209
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1230
+#: src/fs/gnunet-service-fs_pr.c:1226
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1239
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1250
+#: src/fs/gnunet-service-fs_pr.c:1244
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1275 src/fs/gnunet-service-fs_pr.c:1323
-#: src/fs/gnunet-service-fs_pr.c:1442
+#: src/fs/gnunet-service-fs_pr.c:1270 src/fs/gnunet-service-fs_pr.c:1311
+#: src/fs/gnunet-service-fs_pr.c:1426
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1342
+#: src/fs/gnunet-service-fs_pr.c:1329
 msgid "# Datastore lookups concluded (found ultimate result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1356
+#: src/fs/gnunet-service-fs_pr.c:1342
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1421
+#: src/fs/gnunet-service-fs_pr.c:1404
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1508
+#: src/fs/gnunet-service-fs_pr.c:1487
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1576
 #, fuzzy, c-format
 msgid "Configuration fails to specify `%s', assuming default value."
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/fs/fs.c:313
+#: src/fs/fs.c:284
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs.c:324
+#: src/fs/fs.c:293
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/fs.c:332
+#: src/fs/fs.c:299
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs.c:967
+#: src/fs/fs.c:877
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs.c:1445
+#: src/fs/fs.c:1323
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
 msgstr ""
 
-#: src/fs/fs.c:1491
+#: src/fs/fs.c:1364
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:1510
+#: src/fs/fs.c:1380
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs.c:2166
+#: src/fs/fs.c:1984
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2179
+#: src/fs/fs.c:1994
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs.c:2308 src/fs/fs.c:2570
+#: src/fs/fs.c:2107 src/fs/fs.c:2346
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs.c:2331
+#: src/fs/fs.c:2124
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs.c:2347 src/fs/fs.c:2368 src/fs/fs.c:2881
+#: src/fs/fs.c:2136 src/fs/fs.c:2155 src/fs/fs.c:2631
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs.c:2555
+#: src/fs/fs.c:2337
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs.c:2831
+#: src/fs/fs.c:2583
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs.c:2924
+#: src/fs/fs.c:2669
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_push.c:682
+#: src/fs/gnunet-service-fs_push.c:642
 #, c-format
 msgid ""
 "Invalid value specified for option `%s' in section `%s', content pushing "
 "disabled\n"
 msgstr ""
 
-#: src/block/plugin_block_fs.c:138
+#: src/block/plugin_block_fs.c:128
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:105
+#: src/block/plugin_block_dht.c:99
 #, c-format
 msgid "Block not of type %u\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:114
+#: src/block/plugin_block_dht.c:106
 msgid "Size mismatch for block\n"
 msgstr ""
 
-#: src/block/plugin_block_dht.c:126
+#: src/block/plugin_block_dht.c:115
 #, c-format
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/block/block.c:113
+#: src/block/block.c:108
 #, c-format
 msgid "Loading block plugins `%s'\n"
 msgstr ""
 
-#: src/block/block.c:122
+#: src/block/block.c:118
 #, fuzzy, c-format
 msgid "Failed to load block plugin `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:953
+#: src/mesh/test_mesh_small.c:687
+msgid "Test mesh in a small network."
+msgstr ""
+
+#: src/arm/mockup-service.c:41 src/arm/gnunet-service-arm.c:859
 msgid "Failed to transmit shutdown ACK.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:47 src/arm/gnunet-service-arm.c:959
+#: src/arm/mockup-service.c:46 src/arm/gnunet-service-arm.c:864
 msgid "Transmitting shutdown ACK.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:71 src/arm/gnunet-service-arm.c:987
+#: src/arm/mockup-service.c:69 src/arm/gnunet-service-arm.c:892
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:200
+#: src/arm/gnunet-service-arm.c:206
 #, c-format
 msgid "Restarting service `%s' due to configuration file change.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:229
+#: src/arm/gnunet-service-arm.c:234
 msgid "Could not send status result to client\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:266
+#: src/arm/gnunet-service-arm.c:268
 msgid "Not sending status result to client: no client known\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:428
+#: src/arm/gnunet-service-arm.c:406
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-service-arm.c:432
+#: src/arm/gnunet-service-arm.c:409
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:460
+#: src/arm/gnunet-service-arm.c:435
 #, c-format
 msgid "ARM is shutting down, service `%s' not started.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:469
+#: src/arm/gnunet-service-arm.c:443
 #, c-format
 msgid "Service `%s' already running.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:480
+#: src/arm/gnunet-service-arm.c:453
 #, c-format
 msgid "Binary implementing service `%s' not known!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:493
+#: src/arm/gnunet-service-arm.c:464
 #, fuzzy, c-format
 msgid "Configuration file `%s' for service `%s' not known!\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/arm/gnunet-service-arm.c:531
+#: src/arm/gnunet-service-arm.c:498
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:727
+#: src/arm/gnunet-service-arm.c:665
 msgid "Stopping all services\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:785
+#: src/arm/gnunet-service-arm.c:717
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:869
+#: src/arm/gnunet-service-arm.c:790
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:874
+#: src/arm/gnunet-service-arm.c:795
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:879
+#: src/arm/gnunet-service-arm.c:800
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:891
+#: src/arm/gnunet-service-arm.c:807
 #, fuzzy, c-format
 msgid "Service `%s' stopped\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-service-arm.c:905
+#: src/arm/gnunet-service-arm.c:821
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will try to restart it!\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:156
+#: src/arm/gnunet-arm.c:161
 #, fuzzy, c-format
 msgid "Service `%s' has been started.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:160
+#: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
 msgid "Failed to stop service `%s'!\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/arm/gnunet-arm.c:166
+#: src/arm/gnunet-arm.c:171
 #, fuzzy, c-format
 msgid "Service `%s' has been stopped.\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:170
+#: src/arm/gnunet-arm.c:175
 #, fuzzy, c-format
 msgid "Failed to start service `%s'!\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:177
+#: src/arm/gnunet-arm.c:181
 #, c-format
 msgid "Some error communicating with service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:203
+#: src/arm/gnunet-arm.c:207
 #, c-format
 msgid "Service `%s' is running.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:208
+#: src/arm/gnunet-arm.c:212
 #, c-format
 msgid "Service `%s' is not running.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:235
+#: src/arm/gnunet-arm.c:238
 #, c-format
 msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:244 src/arm/gnunet-arm.c:338
+#: src/arm/gnunet-arm.c:246 src/arm/gnunet-arm.c:356
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:265
+#: src/arm/gnunet-arm.c:269
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:271
+#: src/arm/gnunet-arm.c:275
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:367
+#: src/arm/gnunet-arm.c:387
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:369
+#: src/arm/gnunet-arm.c:389
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:371
+#: src/arm/gnunet-arm.c:391
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:373
+#: src/arm/gnunet-arm.c:393
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:375
+#: src/arm/gnunet-arm.c:396
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:378
+#: src/arm/gnunet-arm.c:399
 msgid "test if a particular service is running"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:380
+#: src/arm/gnunet-arm.c:402
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:382
+#: src/arm/gnunet-arm.c:404
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:391
+#: src/arm/gnunet-arm.c:407
+#, fuzzy
+msgid "timeout for completing current operation"
+msgstr "等待一次迭代完成的时间(毫秒)"
+
+#: src/arm/gnunet-arm.c:418
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:820
+#: src/arm/gnunet-service-arm_interceptor.c:803
 #, c-format
 msgid "Unable to forward to service `%s': shutdown\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:828
+#: src/arm/gnunet-service-arm_interceptor.c:812
 #, c-format
 msgid "Unable to forward to service `%s': timeout before connect\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:895
+#: src/arm/gnunet-service-arm_interceptor.c:868
 #, fuzzy, c-format
 msgid "Unable to start service `%s': %s\n"
 msgstr "无法保存配置文件“%s”:"
 
-#: src/arm/gnunet-service-arm_interceptor.c:964
+#: src/arm/gnunet-service-arm_interceptor.c:936
 #, fuzzy, c-format
 msgid "Unable to accept connection for service `%s': %s\n"
 msgstr "无法保存配置文件“%s”:"
 
-#: src/arm/gnunet-service-arm_interceptor.c:982
+#: src/arm/gnunet-service-arm_interceptor.c:952
 #, fuzzy, c-format
 msgid "Service `%s' started\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-service-arm_interceptor.c:1112
+#: src/arm/gnunet-service-arm_interceptor.c:1080
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户:"
 
-#: src/arm/gnunet-service-arm_interceptor.c:1134
+#: src/arm/gnunet-service-arm_interceptor.c:1102
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm_interceptor.c:1151
+#: src/arm/gnunet-service-arm_interceptor.c:1116
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:203 src/arm/test_exponential_backoff.c:194
+#: src/arm/arm_api.c:201 src/arm/test_exponential_backoff.c:192
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:399
+#: src/arm/arm_api.c:390
 #, fuzzy, c-format
 msgid "Configuration failes to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/arm/arm_api.c:414
+#: src/arm/arm_api.c:405
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/arm/arm_api.c:495
+#: src/arm/arm_api.c:469
 #, c-format
 msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 msgstr ""
 
-#: src/arm/arm_api.c:568
+#: src/arm/arm_api.c:539
 #, c-format
 msgid "Requesting start of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:569
+#: src/arm/arm_api.c:540
 #, c-format
 msgid "Requesting termination of service `%s'.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:593
+#: src/arm/arm_api.c:563
 #, c-format
 msgid "Error while trying to transmit request to start `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:594
+#: src/arm/arm_api.c:566
 #, c-format
 msgid "Error while trying to transmit request to stop `%s' to ARM\n"
 msgstr ""
 
-#: src/arm/arm_api.c:626 src/arm/arm_api.c:630
+#: src/arm/arm_api.c:598 src/arm/arm_api.c:602
 #, c-format
 msgid "Asked to start service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/arm/arm_api.c:701
+#: src/arm/arm_api.c:675
 #, c-format
 msgid "Stopping service `%s' within %llu ms\n"
 msgstr ""
 
-#: src/dht/dhtlog.c:57
+#: src/dht/dhtlog.c:56
 #, c-format
 msgid "Loading `%s' dhtlog plugin\n"
 msgstr ""
@@ -3197,1205 +3223,978 @@
 msgid "Failed to load dhtlog plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:823
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:588
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:621
+#: src/dht/plugin_dhtlog_mysql_dump.c:895
 #: src/dht/plugin_dhtlog_mysql_dump_load.c:655
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:689
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:723
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:756
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:789
-#: src/dht/plugin_dhtlog_mysql_dump_load.c:822
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:686
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:718
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:750
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:782
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:813
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:844
+#: src/dht/plugin_dhtlog_mysql_dump_load.c:875
 #, fuzzy, c-format
 msgid "Failed to get full path for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/dht/plugin_dhtlog_mysql_dump.c:852
+#: src/dht/plugin_dhtlog_mysql_dump.c:924
 #, fuzzy
 msgid "Failed to create file for dhtlog.\n"
 msgstr "无法为守护程序创建用户账户。"
 
-#: src/dht/gnunet-dht-get-peer.c:86
+#: src/dht/gnunet-dht-get-peer.c:84
 #, c-format
 msgid "Found %u peers\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:121
+#: src/dht/gnunet-dht-get-peer.c:115
 #, fuzzy, c-format
 msgid "Found peer `%s'\n"
 msgstr "未知的用户“%s”\n"
 
-#: src/dht/gnunet-dht-get-peer.c:195 src/dht/gnunet-dht-put.c:173
-#: src/dht/gnunet-dht-get.c:205
+#: src/dht/gnunet-dht-get-peer.c:184 src/dht/gnunet-dht-put.c:161
+#: src/dht/gnunet-dht-get.c:195
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:198 src/dht/gnunet-dht-put.c:182
-#: src/dht/gnunet-dht-get.c:211
+#: src/dht/gnunet-dht-get-peer.c:187 src/dht/gnunet-dht-put.c:170
+#: src/dht/gnunet-dht-get.c:201
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get-peer.c:222
+#: src/dht/gnunet-dht-get-peer.c:209
 msgid "Issue a GET PEER request to the GNUnet DHT, print results."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:96
+#: src/dht/gnunet-dht-put.c:95
 #, c-format
 msgid "PUT request sent!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:121
+#: src/dht/gnunet-dht-put.c:119
 #, c-format
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:130
+#: src/dht/gnunet-dht-put.c:127
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/dht/gnunet-dht-put.c:137
+#: src/dht/gnunet-dht-put.c:132
 #, fuzzy, c-format
 msgid "Connected to %s service!\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/dht/gnunet-dht-put.c:153
+#: src/dht/gnunet-dht-put.c:147
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:176
+#: src/dht/gnunet-dht-put.c:164
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:179
+#: src/dht/gnunet-dht-put.c:167
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:185
+#: src/dht/gnunet-dht-put.c:173
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:209
+#: src/dht/gnunet-dht-put.c:195
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:208
+#: src/dht/gnunet-dht-get.c:198
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:235
+#: src/dht/gnunet-dht-get.c:223
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/dht_api.c:238
+#: src/dht/dht_api.c:235
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/plugin_dhtlog_mysql.c:1592
+#: src/dht/plugin_dhtlog_mysql.c:1550
 msgid "Failed to initialize MySQL database connection for dhtlog.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:196
-#: src/transport/test_plugin_transport_https.c:1194
-#: src/transport/test_plugin_transport.c:213
-#: src/transport/gnunet-service-transport.c:6586
-#: src/transport/test_plugin_transport_http.c:1277
+#: src/transport/test_plugin_transport_udp.c:185
+#: src/transport/test_plugin_transport_https.c:1271
+#: src/transport/test_plugin_transport.c:202
+#: src/transport/gnunet-service-transport.c:435
+#: src/transport/test_plugin_transport_http.c:1232
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:207
-#: src/transport/test_plugin_transport_https.c:1260
-#: src/transport/test_plugin_transport.c:224
-#: src/transport/gnunet-service-transport.c:6621
-#: src/transport/test_plugin_transport_http.c:1303
+#: src/transport/test_plugin_transport_udp.c:195
+#: src/transport/test_plugin_transport_https.c:1335
+#: src/transport/test_plugin_transport.c:212
+#: src/transport/gnunet-service-transport.c:444
+#: src/transport/test_plugin_transport_http.c:1255
 msgid "Transport service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:217
+#: src/transport/test_plugin_transport_udp.c:205
 msgid "Loading udp transport plugin\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_udp.c:225
+#: src/transport/test_plugin_transport_udp.c:213
 msgid "Failed to load transport plugin for udp\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1574
-#: src/transport/plugin_transport_wlan.c:1629
-#: src/transport/plugin_transport_wlan.c:1810
+#: src/transport/plugin_transport_wlan.c:1422
+#: src/transport/plugin_transport_wlan.c:1617
+#: src/transport/plugin_transport_wlan.c:1736
 #, c-format
 msgid "Error writing to wlan healper. errno == %d, ERROR: %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1955
+#: src/transport/plugin_transport_wlan.c:1854
 #, c-format
 msgid "Wlan Address len %d is wrong\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:3213
+#: src/transport/plugin_transport_wlan.c:2710
 #, c-format
 msgid "Finished reading from wlan-helper stdout with code: %d\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:406
+#: src/transport/gnunet-service-transport_clients.c:246
+#, c-format
+msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:251
+msgid "# messages dropped due to slow client"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:394
+#, c-format
+msgid "Rejecting control connection from peer `%s', which is not me!\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:511
+msgid "# bytes payload received for other peers"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:528
+msgid "# bytes payload dropped (other peer was not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:579
+msgid "# REQUEST CONNECT messages received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_clients.c:607
+msgid "# SET QUOTA messages received"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:776
+msgid "# messages not sent (no such peer or not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:796
+msgid "# bytes in message queue for other peers"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:864
+msgid "# bandwidth quota violations by other peers"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:882
+msgid "# ms throttling suggested"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:907
+msgid "# KEEPALIVE messages discarded (not connected)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:937
+msgid "# SET QUOTA messages ignored (no such peer)"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_neighbours.c:949
+msgid "# disconnects due to quota of 0"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:108
+msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:115
+#, c-format
+msgid "Starting transport plugins `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:119
+#, c-format
+msgid "Loading `%s' transport plugin\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_plugins.c:139
+#, fuzzy, c-format
+msgid "Failed to load transport plugin for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/transport/test_plugin_transport_https.c:409
 msgid "Phase 0: Test plugin functions failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:411
+#: src/transport/test_plugin_transport_https.c:418
 msgid "Phase 1: Test connect with wrong data failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:416
+#: src/transport/test_plugin_transport_https.c:427
 msgid "Phase 2: Test session selection failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:421
+#: src/transport/test_plugin_transport_https.c:435
 msgid "Phase 3: Test sending with plugin failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:694
-#: src/transport/test_plugin_transport_http.c:700
+#: src/transport/test_plugin_transport_https.c:726
+#: src/transport/test_plugin_transport_http.c:692
 #, c-format
 msgid "curl failed for `%s' at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:713
-#: src/transport/test_plugin_transport_http.c:721
+#: src/transport/test_plugin_transport_https.c:746
+#: src/transport/test_plugin_transport_http.c:712
 msgid "Connecting to peer without any peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:723
-#: src/transport/test_plugin_transport_http.c:733
+#: src/transport/test_plugin_transport_https.c:759
+#: src/transport/test_plugin_transport_http.c:725
 msgid "Connecting to peer with too short peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:733
-#: src/transport/test_plugin_transport_http.c:745
+#: src/transport/test_plugin_transport_https.c:772
+#: src/transport/test_plugin_transport_http.c:738
 msgid "Connecting to peer with too long peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:743
+#: src/transport/test_plugin_transport_https.c:785
 msgid "Connecting to peer with valid peer identification: test failed\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:884
-#: src/transport/test_plugin_transport_http.c:899
+#: src/transport/test_plugin_transport_https.c:924
+#: src/transport/test_plugin_transport_http.c:887
 #, c-format
 msgid "Unknown address size: ipv6 has %u ipv4 has %u but this has %u\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:891
-#: src/transport/test_plugin_transport_http.c:906
+#: src/transport/test_plugin_transport_https.c:930
+#: src/transport/test_plugin_transport_http.c:893
 #, c-format
 msgid "Transport plugin notification for address: `%s':%u\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:994
-#: src/transport/test_plugin_transport_http.c:1021
+#: src/transport/test_plugin_transport_https.c:1038
+#: src/transport/test_plugin_transport_http.c:1002
 msgid "Connecting to peer without any peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1005
-#: src/transport/test_plugin_transport_http.c:1037
+#: src/transport/test_plugin_transport_https.c:1053
+#: src/transport/test_plugin_transport_http.c:1017
 msgid "Connecting to peer with too short peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1018
-#: src/transport/test_plugin_transport_http.c:1051
+#: src/transport/test_plugin_transport_https.c:1069
+#: src/transport/test_plugin_transport_http.c:1033
 msgid "Connecting to peer with too long peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1029
-#: src/transport/test_plugin_transport_http.c:1068
+#: src/transport/test_plugin_transport_https.c:1083
+#: src/transport/test_plugin_transport_http.c:1047
 msgid "Connecting to peer with valid peer identification.\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1038
+#: src/transport/test_plugin_transport_https.c:1093
 msgid ""
 "\n"
 "Phase 1: transmit data to all suggested addresses\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1085
+#: src/transport/test_plugin_transport_https.c:1151
 msgid ""
 "\n"
 "Phase 2: session selection\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1115
+#: src/transport/test_plugin_transport_https.c:1187
 msgid ""
 "\n"
 "Phase 3: send multiple or big messages after disconnect\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1120
+#: src/transport/test_plugin_transport_https.c:1193
 #, fuzzy
 msgid "Phase 3: sending messages\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/test_plugin_transport_https.c:1210
-#: src/transport/plugin_transport_http.c:3380
-#: src/transport/test_plugin_transport_http.c:1293
+#: src/transport/test_plugin_transport_https.c:1284
+#: src/transport/plugin_transport_http.c:3321
+#: src/transport/test_plugin_transport_http.c:1245
 #, c-format
 msgid "Require valid port number for transport plugin `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1275
+#: src/transport/test_plugin_transport_https.c:1352
 #, c-format
 msgid "Loading HTTPS transport plugin `%s'\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1281
+#: src/transport/test_plugin_transport_https.c:1358
 msgid "Failed to load transport plugin for https\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1290
+#: src/transport/test_plugin_transport_https.c:1368
 #, c-format
 msgid "Transport plugin returned %u addresses to connect to\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1359
+#: src/transport/test_plugin_transport_https.c:1444
 msgid ""
 "\n"
 "Phase 0\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_https.c:1417
-#: src/transport/test_plugin_transport_https.c:1420
+#: src/transport/test_plugin_transport_https.c:1507
+#: src/transport/test_plugin_transport_https.c:1510
 msgid ""
 "\n"
 "delete\n"
 "\n"
 msgstr ""
 
-#: src/transport/test_transport_api.c:583
-#: src/transport/test_transport_api_reliability.c:596
-#: src/transport/test_transport_api_unreliability.c:641
-msgid "PATH environment variable is unset.\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-list-connections.c:86
-#: src/peerinfo-tool/gnunet-peerinfo.c:214
-#: src/core/gnunet-core-list-connections.c:170
+#: src/transport/gnunet-transport-list-connections.c:91
+#: src/peerinfo-tool/gnunet-peerinfo.c:200
+#: src/core/gnunet-core-list-connections.c:166
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/transport/gnunet-transport-list-connections.c:109
-#: src/peerinfo-tool/gnunet-peerinfo.c:278
-#: src/core/gnunet-core-list-connections.c:194
+#: src/transport/gnunet-transport-list-connections.c:112
+#: src/peerinfo-tool/gnunet-peerinfo.c:258
+#: src/core/gnunet-core-list-connections.c:187
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/transport/gnunet-transport-list-connections.c:117
-#: src/core/gnunet-core-list-connections.c:202
+#: src/transport/gnunet-transport-list-connections.c:119
+#: src/core/gnunet-core-list-connections.c:194
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/transport/test_plugin_transport.c:236
+#: src/transport/test_plugin_transport.c:224
 msgid "Loading tcp transport plugin\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport.c:244
+#: src/transport/test_plugin_transport.c:232
 msgid "Failed to load transport plugin for tcp\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:700
-#: src/transport/plugin_transport_http.c:1259
-#: src/transport/plugin_transport_http.c:2585
+#: src/transport/gnunet-service-transport_hello.c:176
+msgid "# refreshed my HELLO"
+msgstr ""
+
+#: src/transport/plugin_transport_http.c:698
+#: src/transport/plugin_transport_http.c:1231
+#: src/transport/plugin_transport_http.c:2551
 msgid "# HTTP peers active"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1008
-#: src/transport/plugin_transport_http.c:1326
+#: src/transport/plugin_transport_http.c:993
+#: src/transport/plugin_transport_http.c:1306
 msgid "# HTTP inbound sessions for peers active"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1930
+#: src/transport/plugin_transport_http.c:1889
 #, c-format
 msgid "Connection %X: HTTP PUT to peer `%s' (`%s') failed: `%s' `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1954
+#: src/transport/plugin_transport_http.c:1915
 #, c-format
 msgid "Connection %X: HTTP GET to peer `%s' (`%s') failed: `%s' `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:2222
-#: src/transport/plugin_transport_http.c:2326
+#: src/transport/plugin_transport_http.c:2193
+#: src/transport/plugin_transport_http.c:2305
 #, c-format
 msgid "Connection: %X: %s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:2626
+#: src/transport/plugin_transport_http.c:2592
 msgid "# HTTP outbound sessions for peers active"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3407
-#: src/transport/plugin_transport_http.c:3435
+#: src/transport/plugin_transport_http.c:3349
+#: src/transport/plugin_transport_http.c:3378
 msgid "Misconfigured address to bind to in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3466
+#: src/transport/plugin_transport_http.c:3404
 #, c-format
 msgid "Required configuration options missing in section `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3502
-#, c-format
-msgid "Could not create a new TLS certificate, shell script `%s' failed!\n"
+#: src/transport/plugin_transport_http.c:3442
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3518
+#: src/transport/plugin_transport_http.c:3458
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3642
+#: src/transport/plugin_transport_http.c:3610
 #, c-format
 msgid ""
 "HTTP Server with %s could not be started on port %u! %s plugin failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:3658
+#: src/transport/plugin_transport_http.c:3626
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1145
-#, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "无法解析“%s”(%s):%s\n"
-
-#: src/transport/gnunet-service-transport.c:1153
+#: src/transport/plugin_transport_tcp.c:504
 #, c-format
-msgid "Blacklist file `%s' is empty.\n"
+msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1166
-#, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/transport/gnunet-service-transport.c:1185
-#: src/transport/gnunet-service-transport.c:1206
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr "配置文件“%s”第 %d 行有语法错误。\n"
-
-#: src/transport/gnunet-service-transport.c:1195
-#: src/transport/gnunet-service-transport.c:1228
-#, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+#: src/transport/plugin_transport_tcp.c:590
+#: src/transport/plugin_transport_tcp.c:679
+#: src/transport/plugin_transport_tcp.c:728
+#: src/transport/plugin_transport_tcp.c:817
+#: src/transport/plugin_transport_tcp.c:1142
+msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1240
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-msgstr "配置文件“%s”第 %d 行有语法错误。\n"
-
-#: src/transport/gnunet-service-transport.c:1257
-#, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+#: src/transport/plugin_transport_tcp.c:596
+#: src/transport/plugin_transport_tcp.c:843
+#: src/transport/plugin_transport_tcp.c:1531
+msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1303
-msgid "# bytes discarded (could not transmit to client)"
+#: src/transport/plugin_transport_tcp.c:683
+msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1428
-msgid "# address validation timeouts"
+#: src/transport/plugin_transport_tcp.c:731
+msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1465
-#, c-format
-msgid ""
-"Dropping message of type %u and size %u, have %u messages pending (%u is the "
-"soft limit)\n"
+#: src/transport/plugin_transport_tcp.c:821
+msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1471
-msgid "# messages dropped due to slow client"
+#: src/transport/plugin_transport_tcp.c:942
+msgid "# bytes TCP was asked to transmit"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1575
-#: src/transport/gnunet-service-transport.c:1753
-msgid "# bytes pending with plugins"
+#: src/transport/plugin_transport_tcp.c:993
+msgid "# bytes discarded by TCP (no address and no connection)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1581
-msgid "# bytes successfully transmitted by plugins"
+#: src/transport/plugin_transport_tcp.c:1034
+#, c-format
+msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1588
-msgid "# bytes with transmission failure by plugins"
+#: src/transport/plugin_transport_tcp.c:1051
+msgid "Found valid IPv4 NAT address (creating session)!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1614
-#: src/transport/gnunet-service-transport.c:2021
-#: src/transport/gnunet-service-transport.c:2028
-#: src/transport/gnunet-service-transport.c:2068
-#: src/transport/gnunet-service-transport.c:2467
-#: src/transport/gnunet-service-transport.c:2524
-#: src/transport/gnunet-service-transport.c:4917
-msgid "# connected addresses"
+#: src/transport/plugin_transport_tcp.c:1103
+msgid "# bytes discarded by TCP (failed to connect)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1671
-msgid "# transport selected peer address freely"
+#: src/transport/plugin_transport_tcp.c:1211
+msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1679
-msgid "# transport failed to selected peer address"
+#: src/transport/plugin_transport_tcp.c:1574
+msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1692
-#: src/transport/gnunet-service-transport.c:1749
-#: src/transport/gnunet-service-transport.c:1826
-#: src/transport/gnunet-service-transport.c:4945
-msgid "# bytes in message queue for other peers"
+#: src/transport/plugin_transport_tcp.c:1722
+msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1696
-msgid "# bytes discarded (no destination address available)"
+#: src/transport/plugin_transport_tcp.c:1788
+msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1708
-msgid "# message delivery deferred (no address)"
-msgstr ""
+#: src/transport/plugin_transport_tcp.c:1941
+#, fuzzy
+msgid "Failed to start service.\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport.c:1911
-#: src/transport/gnunet-service-transport.c:3838
-msgid "# PING without HELLO messages sent"
+#: src/transport/plugin_transport_tcp.c:2001
+#, c-format
+msgid "Failed to find option %s in section %s!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2140
-msgid "# transmission attempts failed (no address)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2214
-msgid "# refreshed my HELLO"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2241
-msgid "# transmitted my HELLO to other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2354
-msgid "# disconnects due to try_fast_reconnect"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2419
-msgid "# disconnects due to session end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2455
-msgid "# disconnects due to unready session"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2482
-msgid "# try_fast_reconnect thanks to plugin_env_session_end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2491
-msgid "# disconnects due to missing pong"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2532
-msgid "# disconnects due to NO pong"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2545
-msgid "# try_fast_reconnect thanks to validated_address"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:2569
-msgid "# disconnects due to plugin_env_session_end"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3033
-msgid "# disconnects due to timeout"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3074
-msgid "# valid peer addresses returned by PEERINFO"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3093
-msgid "# previously validated addresses lacking transport"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3123
-#: src/transport/gnunet-service-transport.c:4206
-#: src/transport/gnunet-service-transport.c:4924
-msgid "# peer addresses considered valid"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3168
-#: src/transport/gnunet-service-transport.c:3258
-#: src/transport/gnunet-service-transport.c:4581
-#: src/transport/gnunet-service-transport.c:4827
-#: src/transport/gnunet-service-transport.c:4987
-#: src/transport/gnunet-service-transport.c:6336
-msgid "# outstanding peerinfo iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3220
-#: src/transport/gnunet-service-transport.c:5009
-msgid "# active neighbours"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3254
-msgid "# peerinfo new neighbor iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3266
-msgid "# HELLO's sent to new neighbors"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3562
-msgid "# disconnects due to blacklist"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3833
-msgid "# PING with HELLO messages sent"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3842
-msgid "# PING messages sent for re-validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:3966
-msgid "# payload received from other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4130
+#: src/transport/plugin_transport_tcp.c:2024
 #, c-format
-msgid ""
-"Not accepting PONG from `%s' with address `%s' since I cannot confirm using "
-"this address.\n"
+msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:4169
-msgid "Received expired signature.  Check system time.\n"
+#: src/transport/plugin_transport_tcp.c:2028
+msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:4173
-msgid "# address validation successes"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4287
-#: src/core/gnunet-service-core.c:4287
-msgid "# PONG messages received"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4400
-msgid "# PING messages sent for initial validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4442
-msgid "# peer addresses scheduled for validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4451
+#: src/transport/plugin_transport_tcp.c:2032
 #, c-format
-msgid ""
-"Transport `%s' not loaded, will not try to validate peer address using this "
-"transport.\n"
+msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:4454
-msgid "# peer addresses not validated (plugin not available)"
+#: src/transport/gnunet-service-transport_validation.c:520
+msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:4470
-msgid "# peer addresses not validated (loopback)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4516
-msgid "# peer addresses not validated (in progress)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4605
-msgid "# new HELLOs requiring full validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4616
-msgid "# duplicate HELLO (peer known)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4661
-msgid "# no existing neighbour record (validating HELLO)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4666
-msgid "# HELLO validations (update case)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4706
-msgid "# HELLOs received for validation"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4737
-msgid "# HELLOs ignored for validation (is my own HELLO)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4754
-msgid "# HELLOs ignored due to high load"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4823
-msgid "# peerinfo process hello iterate requests"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:4949
-msgid "# bytes discarded due to disconnect"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5054
-#, c-format
-msgid "Received `%s' message from `%s' destined for `%s' which is not me!\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5076
-#: src/core/gnunet-service-core.c:4264
+#: src/transport/gnunet-service-transport_validation.c:606
+#: src/core/gnunet-service-core.c:4187
 msgid "# PING messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5088
+#: src/transport/gnunet-service-transport_validation.c:628
 #, c-format
-msgid "Refusing to create PONG since I do not have a session with `%s'.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5161
-#, c-format
 msgid ""
 "Not confirming PING with address `%s' since I cannot confirm having this "
 "address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5256
+#: src/transport/gnunet-service-transport_validation.c:685
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5269
+#: src/transport/gnunet-service-transport_validation.c:694
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5300
+#: src/transport/gnunet-service-transport_validation.c:758
 #, c-format
-msgid "Could not send PONG to `%s': no address available\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5408
-msgid "# bytes received from other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5425
-#, c-format
 msgid ""
-"Dropping incoming message due to repeated bandwidth quota (%u b/s) "
-"violations (total of %u).\n"
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5429
-msgid "# bandwidth quota violations by other peers"
+#: src/transport/gnunet-service-transport_validation.c:792
+msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5466
-msgid "# HELLO messages received from other peers"
+#: src/transport/gnunet-service-transport_validation.c:864
+msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5497
-msgid "# ms throttling suggested"
+#: src/transport/gnunet-service-transport_validation.c:923
+#: src/core/gnunet-service-core.c:4210
+msgid "# PONG messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5547
-#, c-format
-msgid "Rejecting control connection from peer `%s', which is not me!\n"
+#: src/transport/gnunet-service-transport_validation.c:945
+msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5621
-msgid "# HELLOs received from clients"
+#: src/transport/gnunet-service-transport_validation.c:961
+msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:5714
-msgid "# payload received for other peers"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5757
-msgid "# REQUEST CONNECT messages received"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5788
-msgid "# SET QUOTA messages received"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5796
-msgid "# SET QUOTA messages ignored (no such peer)"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:5819
-msgid "# disconnects due to quota of 0"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:6137
-#, c-format
-msgid "Loading `%s' transport plugin\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:6149
-#, fuzzy, c-format
-msgid "Failed to load transport plugin for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/transport/gnunet-service-transport.c:6645
-#, c-format
-msgid "Starting transport plugins `%s'\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport.c:6738
-msgid "Transport service ready.\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:515
-#, c-format
-msgid "Unexpected address length: %u bytes\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:606
-#: src/transport/plugin_transport_tcp.c:702
-#: src/transport/plugin_transport_tcp.c:756
-#: src/transport/plugin_transport_tcp.c:848
-#: src/transport/plugin_transport_tcp.c:1208
-msgid "# bytes currently in TCP buffers"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:614
-#: src/transport/plugin_transport_tcp.c:877
-#: src/transport/plugin_transport_tcp.c:1623
-msgid "# TCP sessions active"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:706
-msgid "# bytes discarded by TCP (timeout)"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:760
-msgid "# bytes transmitted via TCP"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:852
-msgid "# bytes discarded by TCP (disconnect)"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:989
-msgid "# bytes TCP was asked to transmit"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1046
-msgid "# bytes discarded by TCP (no address and no connection)"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1091
-#, c-format
-msgid "Address of unexpected length: %u\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1110
-msgid "Found valid IPv4 NAT address (creating session)!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1168
-msgid "# bytes discarded by TCP (failed to connect)"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1284
-msgid "# transport-service disconnect requests for TCP"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1670
-msgid "# TCP WELCOME messages received"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1831
-msgid "# bytes received via TCP"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1896
-msgid "# network-level TCP disconnect events"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2063
-#, fuzzy
-msgid "Failed to start service.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/transport/plugin_transport_tcp.c:2135
-#, c-format
-msgid "Failed to find option %s in section %s!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2161
-#, c-format
-msgid "TCP transport listening on port %llu\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2166
-msgid "TCP transport not listening on any port (client only)\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2170
-#, c-format
-msgid "TCP transport advertises itself as being on port %llu\n"
-msgstr ""
-
 #: src/transport/plugin_transport_smtp.c:367
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:459
+#: src/transport/plugin_transport_smtp.c:454
 msgid "SMTP filter string to invalid, lacks ': '\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:469
+#: src/transport/plugin_transport_smtp.c:463
 #, c-format
 msgid "SMTP filter string to long, capped to `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:565
-#: src/transport/plugin_transport_smtp.c:576
-#: src/transport/plugin_transport_smtp.c:590
-#: src/transport/plugin_transport_smtp.c:610
-#: src/transport/plugin_transport_smtp.c:635
+#: src/transport/plugin_transport_smtp.c:558
+#: src/transport/plugin_transport_smtp.c:568
+#: src/transport/plugin_transport_smtp.c:581
+#: src/transport/plugin_transport_smtp.c:600
+#: src/transport/plugin_transport_smtp.c:623
+#: src/transport/plugin_transport_smtp.c:631
 #: src/transport/plugin_transport_smtp.c:644
-#: src/transport/plugin_transport_smtp.c:658
-#: src/transport/plugin_transport_smtp.c:670
+#: src/transport/plugin_transport_smtp.c:655
 #, c-format
 msgid "SMTP: `%s' failed: %s.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:816
+#: src/transport/plugin_transport_smtp.c:798
 msgid "No email-address specified, can not start SMTP transport.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:833
+#: src/transport/plugin_transport_smtp.c:810
 msgid "# bytes received via SMTP"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:834
+#: src/transport/plugin_transport_smtp.c:811
 msgid "# bytes sent via SMTP"
 msgstr ""
 
-#: src/transport/plugin_transport_smtp.c:836
+#: src/transport/plugin_transport_smtp.c:813
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/test_plugin_transport_http.c:1319
+#: src/transport/test_plugin_transport_http.c:1271
 #, c-format
 msgid "Loading HTTP transport plugin `%s'\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_http.c:1326
+#: src/transport/test_plugin_transport_http.c:1278
 msgid "Failed to load transport plugin for http\n"
 msgstr ""
 
-#: src/transport/test_plugin_transport_http.c:1408
+#: src/transport/test_plugin_transport_http.c:1364
 msgid ""
 "Phase 0\n"
 "\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1352
-#: src/transport/plugin_transport_unix.c:1118
+#: src/transport/plugin_transport_udp.c:1279
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1410
+#: src/transport/plugin_transport_udp.c:1329
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_udp.c:1541
+#: src/transport/plugin_transport_udp.c:1455
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/transport_api.c:582
+#: src/transport/transport_api.c:570
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_unix.c:1144
+#: src/transport/plugin_transport_unix.c:1092
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/chat/chat.c:177
+#: src/transport/gnunet-service-transport_blacklist.c:247
+#, fuzzy, c-format
+msgid "Could not read blacklist file `%s'\n"
+msgstr "无法解析“%s”(%s):%s\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:254
+#, c-format
+msgid "Blacklist file `%s' is empty.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:266
+#, fuzzy, c-format
+msgid "Failed to read blacklist from `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:287
+#: src/transport/gnunet-service-transport_blacklist.c:311
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+msgstr "配置文件“%s”第 %d 行有语法错误。\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:298
+#: src/transport/gnunet-service-transport_blacklist.c:336
+#, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:350
+#, fuzzy, c-format
+msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+msgstr "配置文件“%s”第 %d 行有语法错误。\n"
+
+#: src/transport/gnunet-service-transport_blacklist.c:364
+#, c-format
+msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_blacklist.c:522
+#: src/transport/gnunet-service-transport_blacklist.c:754
+msgid "# disconnects due to blacklist"
+msgstr ""
+
+#: src/chat/chat.c:175
 msgid "Could not transmit confirmation receipt\n"
 msgstr ""
 
-#: src/chat/chat.c:288
+#: src/chat/chat.c:283
 msgid "The current user must be the the first one joined\n"
 msgstr ""
 
-#: src/chat/chat.c:424
+#: src/chat/chat.c:412
 #, fuzzy, c-format
 msgid "Unknown message type: '%u'\n"
 msgstr "未知操作“%s”。\n"
 
-#: src/chat/chat.c:489
+#: src/chat/chat.c:472
 #, fuzzy, c-format
 msgid "Configuration option `%s' in section `%s' missing\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/chat/chat.c:498
+#: src/chat/chat.c:480
 #, fuzzy, c-format
 msgid "Failed to access chat home directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/chat/chat.c:517
+#: src/chat/chat.c:498
 #, fuzzy, c-format
 msgid "Failed to create/open key in file `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/chat/chat.c:581
+#: src/chat/chat.c:559
 msgid "Could not serialize metadata\n"
 msgstr ""
 
-#: src/chat/chat.c:701
+#: src/chat/chat.c:674
 #, fuzzy
 msgid "Failed to connect to the chat service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/chat/chat.c:707
+#: src/chat/chat.c:680
 msgid "Undefined mandatory parameter: joinCallback\n"
 msgstr ""
 
-#: src/chat/chat.c:713
+#: src/chat/chat.c:686
 msgid "Undefined mandatory parameter: messageCallback\n"
 msgstr ""
 
-#: src/chat/chat.c:719
+#: src/chat/chat.c:692
 msgid "Undefined mandatory parameter: memberCallback\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:89
+#: src/chat/gnunet-chat.c:92
 #, c-format
 msgid "Joined\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:123
+#: src/chat/gnunet-chat.c:124
 msgid "anonymous"
 msgstr "匿名"
 
-#: src/chat/gnunet-chat.c:129
+#: src/chat/gnunet-chat.c:130
 #, fuzzy, c-format
 msgid "(%s) `%s' said: %s\n"
 msgstr "“%s”说:%s\n"
 
-#: src/chat/gnunet-chat.c:132 src/chat/gnunet-chat.c:135
+#: src/chat/gnunet-chat.c:133 src/chat/gnunet-chat.c:136
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you: %s\n"
 msgstr "“%s”对您说:%s\n"
 
-#: src/chat/gnunet-chat.c:138
+#: src/chat/gnunet-chat.c:139
 #, fuzzy, c-format
 msgid "(%s) `%s' said for sure: %s\n"
 msgstr "“%s”对您说:%s\n"
 
-#: src/chat/gnunet-chat.c:141
+#: src/chat/gnunet-chat.c:142
 #, fuzzy, c-format
 msgid "(%s) `%s' said to you for sure: %s\n"
 msgstr "“%s”对您说:%s\n"
 
-#: src/chat/gnunet-chat.c:144
+#: src/chat/gnunet-chat.c:145
 #, c-format
 msgid "(%s) `%s' was confirmed that you received: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:147
+#: src/chat/gnunet-chat.c:148
 #, c-format
 msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:150
+#: src/chat/gnunet-chat.c:151
 #, c-format
 msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:153
+#: src/chat/gnunet-chat.c:156
 #, c-format
 msgid ""
 "(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:156
+#: src/chat/gnunet-chat.c:159
 #, fuzzy, c-format
 msgid "(%s) `%s' said off the record: %s\n"
 msgstr "“%s”对您说:%s\n"
 
-#: src/chat/gnunet-chat.c:159
+#: src/chat/gnunet-chat.c:162
 #, c-format
 msgid "(%s) <%s> said using an unknown message type: %s\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:191
+#: src/chat/gnunet-chat.c:193
 #, c-format
 msgid "'%s' acknowledged message #%d\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:222
+#: src/chat/gnunet-chat.c:224
 #, c-format
 msgid "`%s' entered the room\n"
 msgstr "“%s”进入了房间\n"
 
-#: src/chat/gnunet-chat.c:222
+#: src/chat/gnunet-chat.c:224
 #, c-format
 msgid "`%s' left the room\n"
 msgstr "“%s”离开了房间\n"
 
-#: src/chat/gnunet-chat.c:286 src/chat/gnunet-chat.c:326
+#: src/chat/gnunet-chat.c:284 src/chat/gnunet-chat.c:316
 #, fuzzy, c-format
 msgid "Could not change username\n"
 msgstr "已将用户名改为“%s”。\n"
 
-#: src/chat/gnunet-chat.c:290 src/chat/gnunet-chat.c:660
+#: src/chat/gnunet-chat.c:288 src/chat/gnunet-chat.c:629
 #, c-format
 msgid "Joining room `%s' as user `%s'...\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:330
+#: src/chat/gnunet-chat.c:320
 #, fuzzy, c-format
 msgid "Changed username to `%s'\n"
 msgstr "已将用户名改为“%s”。\n"
 
-#: src/chat/gnunet-chat.c:343
+#: src/chat/gnunet-chat.c:333
 #, c-format
 msgid "Users in room `%s': "
 msgstr "房间“%s”中的用户:"
 
-#: src/chat/gnunet-chat.c:383
+#: src/chat/gnunet-chat.c:371
 #, c-format
 msgid "Syntax: /msg USERNAME MESSAGE"
 msgstr "语法:/msg 用户名 消息"
 
-#: src/chat/gnunet-chat.c:391
+#: src/chat/gnunet-chat.c:379
 #, c-format
 msgid "Unknown user `%s'\n"
 msgstr "未知的用户“%s”\n"
 
-#: src/chat/gnunet-chat.c:407
+#: src/chat/gnunet-chat.c:395
 #, c-format
 msgid "User `%s' is currently not in the room!\n"
 msgstr "用户“%s”当前不在房间里!\n"
 
-#: src/chat/gnunet-chat.c:467
+#: src/chat/gnunet-chat.c:448
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/chat/gnunet-chat.c:478
+#: src/chat/gnunet-chat.c:459
 msgid ""
 "Use `/join #roomname' to join a chat room. Joining a room will cause you to "
 "leave the current room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:482
+#: src/chat/gnunet-chat.c:463
 msgid ""
 "Use `/nick nickname' to change your nickname.  This will cause you to leave "
 "the current room and immediately rejoin it with the new name."
 msgstr ""
 
-#: src/chat/gnunet-chat.c:486
+#: src/chat/gnunet-chat.c:467
 msgid ""
 "Use `/msg nickname message' to send a private message to the specified user"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:489
+#: src/chat/gnunet-chat.c:470
 msgid "The `/notice' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:491
+#: src/chat/gnunet-chat.c:472
 msgid "The `/query' command is an alias for `/msg'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:493
+#: src/chat/gnunet-chat.c:474
 msgid "Use `/sig message' to send a signed public message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:496
+#: src/chat/gnunet-chat.c:477
 msgid "Use `/ack message' to require signed acknowledgment of the message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:499
+#: src/chat/gnunet-chat.c:480
 msgid "Use `/anonymous message' to send a public anonymous message"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:501
+#: src/chat/gnunet-chat.c:482
 msgid "The `/anon' command is an alias for `/anonymous'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:503
+#: src/chat/gnunet-chat.c:484
 msgid "Use `/quit' to terminate gnunet-chat"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:505
+#: src/chat/gnunet-chat.c:486
 msgid "The `/leave' command is an alias for `/quit'"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:508
+#: src/chat/gnunet-chat.c:489
 msgid "Use `/names' to list all of the current members in the chat room"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:510
+#: src/chat/gnunet-chat.c:491
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:627
+#: src/chat/gnunet-chat.c:605
 #, c-format
 msgid "You must specify a nickname\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/chat/gnunet-chat.c:652
+#: src/chat/gnunet-chat.c:621
 #, c-format
 msgid "Failed to join room `%s'\n"
 msgstr ""
 
-#: src/chat/gnunet-chat.c:685
+#: src/chat/gnunet-chat.c:654
 msgid "set the nickname to use (required)"
 msgstr "设置要使用的昵称(必须)"
 
-#: src/chat/gnunet-chat.c:688
+#: src/chat/gnunet-chat.c:657
 msgid "set the chat room to join"
 msgstr "设置要加入的聊天室"
 
-#: src/chat/gnunet-chat.c:702
+#: src/chat/gnunet-chat.c:669
 msgid "Join a chat on GNUnet."
 msgstr ""
 
-#: src/chat/gnunet-service-chat.c:273
+#: src/chat/gnunet-service-chat.c:267
 #, fuzzy
 msgid "Failed to queue a message notification\n"
 msgstr "保存配置失败。"
 
-#: src/chat/gnunet-service-chat.c:566
+#: src/chat/gnunet-service-chat.c:546
 #, fuzzy
 msgid "Failed to queue a join notification\n"
 msgstr "保存配置失败。"
 
-#: src/chat/gnunet-service-chat.c:764
+#: src/chat/gnunet-service-chat.c:729
 #, fuzzy
 msgid "Failed to queue a confirmation receipt\n"
 msgstr "保存配置失败。"
 
-#: src/chat/gnunet-service-chat.c:952
+#: src/chat/gnunet-service-chat.c:907
 #, fuzzy
 msgid "Failed to queue a leave notification\n"
 msgstr "保存配置失败。"
@@ -4406,30 +4205,30 @@
 msgid "Peer `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:241
+#: src/peerinfo-tool/gnunet-peerinfo.c:222
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:249
+#: src/peerinfo-tool/gnunet-peerinfo.c:229
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:261
+#: src/peerinfo-tool/gnunet-peerinfo.c:241
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:281
+#: src/peerinfo-tool/gnunet-peerinfo.c:261
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:284
+#: src/peerinfo-tool/gnunet-peerinfo.c:264
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:292
+#: src/peerinfo-tool/gnunet-peerinfo.c:270
 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -4439,33 +4238,33 @@
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:223
+#: src/datastore/plugin_datastore_sqlite.c:239
 #, c-format
 msgid "Option `%s' in section `%s' missing in configuration!\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:253
+#: src/datastore/plugin_datastore_sqlite.c:266
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:669
+#: src/datastore/plugin_datastore_sqlite.c:662
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1110
+#: src/datastore/plugin_datastore_sqlite.c:1115
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1138
+#: src/datastore/plugin_datastore_sqlite.c:1134
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1179
+#: src/datastore/plugin_datastore_sqlite.c:1173
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
@@ -4474,336 +4273,347 @@
 msgid "# bytes used in file-sharing datastore"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:347
+#: src/datastore/gnunet-service-datastore.c:331
 msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:427
+#: src/datastore/gnunet-service-datastore.c:397
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:496
+#: src/datastore/gnunet-service-datastore.c:457
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:665
+#: src/datastore/gnunet-service-datastore.c:610
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:712
+#: src/datastore/gnunet-service-datastore.c:655
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:724
+#: src/datastore/gnunet-service-datastore.c:666
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:728
+#: src/datastore/gnunet-service-datastore.c:670
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:734
+#: src/datastore/gnunet-service-datastore.c:676
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:740
-#: src/datastore/gnunet-service-datastore.c:795
-#: src/datastore/gnunet-service-datastore.c:1041
-#: src/datastore/gnunet-service-datastore.c:1596
+#: src/datastore/gnunet-service-datastore.c:681
+#: src/datastore/gnunet-service-datastore.c:735
+#: src/datastore/gnunet-service-datastore.c:953
+#: src/datastore/gnunet-service-datastore.c:1438
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:810
+#: src/datastore/gnunet-service-datastore.c:750
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:908
+#: src/datastore/gnunet-service-datastore.c:835
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1099
+#: src/datastore/gnunet-service-datastore.c:1001
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1115
+#: src/datastore/gnunet-service-datastore.c:1015
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1150
+#: src/datastore/gnunet-service-datastore.c:1043
 msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1189
+#: src/datastore/gnunet-service-datastore.c:1077
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1227
+#: src/datastore/gnunet-service-datastore.c:1112
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1263
+#: src/datastore/gnunet-service-datastore.c:1139
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1276
+#: src/datastore/gnunet-service-datastore.c:1149
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1316
+#: src/datastore/gnunet-service-datastore.c:1183
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1371
+#: src/datastore/gnunet-service-datastore.c:1227
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1452
-#: src/datastore/test_plugin_datastore.c:361
-#: src/datastore/perf_plugin_datastore.c:467
+#: src/datastore/gnunet-service-datastore.c:1300
+#: src/datastore/test_plugin_datastore.c:322
+#: src/datastore/perf_plugin_datastore.c:420
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1460
+#: src/datastore/gnunet-service-datastore.c:1309
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1648
+#: src/datastore/gnunet-service-datastore.c:1488
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1653
+#: src/datastore/gnunet-service-datastore.c:1490
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1667
+#: src/datastore/gnunet-service-datastore.c:1500
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1680
+#: src/datastore/gnunet-service-datastore.c:1513
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/datastore/plugin_datastore_template.c:252
+#: src/datastore/plugin_datastore_template.c:241
 msgid "Template database running\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:292
+#: src/datastore/datastore_api.c:287
 msgid "Failed to transmit request to drop database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:380
+#: src/datastore/datastore_api.c:370
 msgid "# queue entry timeouts"
 msgstr ""
 
-#: src/datastore/datastore_api.c:432
+#: src/datastore/datastore_api.c:417
 msgid "# queue overflows"
 msgstr ""
 
-#: src/datastore/datastore_api.c:462
+#: src/datastore/datastore_api.c:444
 msgid "# queue entries created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:493
+#: src/datastore/datastore_api.c:465
 msgid "# Requests dropped from datastore queue"
 msgstr ""
 
-#: src/datastore/datastore_api.c:543
+#: src/datastore/datastore_api.c:514
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:573
+#: src/datastore/datastore_api.c:541
 msgid "# reconnected to DATASTORE"
 msgstr ""
 
-#: src/datastore/datastore_api.c:644
+#: src/datastore/datastore_api.c:606
 msgid "Failed to transmit request to DATASTORE.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:646
+#: src/datastore/datastore_api.c:608
 msgid "# transmission request failures"
 msgstr ""
 
-#: src/datastore/datastore_api.c:673
+#: src/datastore/datastore_api.c:631
 msgid "# bytes sent to datastore"
 msgstr ""
 
-#: src/datastore/datastore_api.c:822
+#: src/datastore/datastore_api.c:768
 msgid "Failed to receive status response from database."
 msgstr ""
 
-#: src/datastore/datastore_api.c:836
+#: src/datastore/datastore_api.c:781
 msgid "Error reading response from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:848 src/datastore/datastore_api.c:855
+#: src/datastore/datastore_api.c:793 src/datastore/datastore_api.c:799
 msgid "Invalid error message received from datastore service"
 msgstr ""
 
-#: src/datastore/datastore_api.c:864
+#: src/datastore/datastore_api.c:806
 msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:947
+#: src/datastore/datastore_api.c:878
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1024
+#: src/datastore/datastore_api.c:950
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1092
+#: src/datastore/datastore_api.c:1015
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1159
+#: src/datastore/datastore_api.c:1078
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1234
+#: src/datastore/datastore_api.c:1148
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1281
+#: src/datastore/datastore_api.c:1193
 msgid "Failed to receive response from database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1345
+#: src/datastore/datastore_api.c:1254
 msgid "# Results received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1424
+#: src/datastore/datastore_api.c:1326
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1492
+#: src/datastore/datastore_api.c:1393
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1563
+#: src/datastore/datastore_api.c:1457
 msgid "# GET requests executed"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:515
+#: src/datastore/plugin_datastore_mysql.c:529
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/plugin_datastore_mysql.c:608
+#: src/datastore/plugin_datastore_mysql.c:622
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1484
+#: src/datastore/plugin_datastore_mysql.c:1500
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:177
+#: src/datastore/plugin_datastore_postgres.c:173
 #, fuzzy, c-format
 msgid "Unable to initialize Postgres with configuration `%s': %s"
 msgstr "无法保存配置文件“%s”:"
 
-#: src/datastore/plugin_datastore_postgres.c:1116
+#: src/datastore/plugin_datastore_postgres.c:979
 msgid "Postgres database running\n"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:161
+#: src/dv/plugin_transport_dv.c:159
 #, c-format
 msgid "%s Received message from %s of type %d, distance %u!\n"
 msgstr ""
 
-#: src/dv/dv_api.c:179
+#: src/dv/dv_api.c:178
 #, fuzzy
 msgid "Failed to connect to the dv service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/nse/nse-profiler.c:462
-#, fuzzy
-msgid "Run a test of the NSE service."
-msgstr "无法访问该服务"
+#: src/nse/gnunet-service-nse.c:864
+#, c-format
+msgid "Proof of work invalid: %llu!\n"
+msgstr ""
 
-#: src/nse/gnunet-service-nse.c:998
+#: src/nse/gnunet-service-nse.c:1286 src/nse/gnunet-service-nse.c:1305
+#: src/nse/gnunet-service-nse.c:1326
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1008
-msgid "NSE Service could not access hostkey.  Exiting.\n"
+#: src/nse/gnunet-service-nse.c:1293
+msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:935
+#: src/nse/gnunet-service-nse.c:1314
+#, fuzzy
+msgid "NSE service could not access hostkey.  Exiting.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/nse/gnunet-nse-profiler.c:673
+#, fuzzy
+msgid "Measure quality and performance of the NSE service."
+msgstr "无法访问该服务"
+
+#: src/core/gnunet-service-core.c:920
 msgid "# total peer preference"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1063
+#: src/core/gnunet-service-core.c:1040
 msgid "# peer status changes"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1176
+#: src/core/gnunet-service-core.c:1236
 msgid "# send requests dropped (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1662
+#: src/core/gnunet-service-core.c:1712
 #, c-format
 msgid ""
 "Client asked for preference change with peer `%s', which is not connected!\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1747 src/core/gnunet-service-core.c:4318
-#: src/core/gnunet-service-core.c:4541
+#: src/core/gnunet-service-core.c:1793 src/core/gnunet-service-core.c:4240
+#: src/core/gnunet-service-core.c:4456
 msgid "# established sessions"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1794
+#: src/core/gnunet-service-core.c:1838
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:1933 src/core/gnunet-service-core.c:2781
-#: src/core/gnunet-service-core.c:4623
+#: src/core/gnunet-service-core.c:1964 src/core/gnunet-service-core.c:2793
+#: src/core/gnunet-service-core.c:4532
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2003
+#: src/core/gnunet-service-core.c:2031
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2114
+#: src/core/gnunet-service-core.c:2134
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2289
+#: src/core/gnunet-service-core.c:2314
 msgid "# transmissions delayed due to corking"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2494
+#: src/core/gnunet-service-core.c:2517
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2849
+#: src/core/gnunet-service-core.c:2857
 msgid "# messages discarded (disconnected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2906 src/core/gnunet-service-core.c:4741
+#: src/core/gnunet-service-core.c:2909 src/core/gnunet-service-core.c:4644
 msgid "# discarded CORE_SEND requests"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2919 src/core/gnunet-service-core.c:4742
+#: src/core/gnunet-service-core.c:2924 src/core/gnunet-service-core.c:4648
 msgid "# discarded lower priority CORE_SEND requests"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:2994
+#: src/core/gnunet-service-core.c:2996
 msgid "# connection requests received"
 msgstr ""
 
@@ -4811,169 +4621,173 @@
 msgid "# connection requests ignored (already connected)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3057 src/core/gnunet-service-core.c:3741
+#: src/core/gnunet-service-core.c:3054 src/core/gnunet-service-core.c:3697
 msgid "# SET_KEY messages deferred (need public key)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3070
+#: src/core/gnunet-service-core.c:3067
 msgid "# Delayed connecting due to lack of public key"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3105
+#: src/core/gnunet-service-core.c:3099
 msgid "# Error extracting public key from HELLO"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3151
+#: src/core/gnunet-service-core.c:3145
 msgid "# Asking transport to connect (for SET_KEY)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3286
+#: src/core/gnunet-service-core.c:3270
 msgid "# SET_KEY and PING messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3367
+#: src/core/gnunet-service-core.c:3349
 #, c-format
 msgid ""
 "Ignoring `%s' message due to lack of public key for peer `%4s' (failed to "
 "obtain one).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3471
+#: src/core/gnunet-service-core.c:3444
 msgid "# PING messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3483
+#: src/core/gnunet-service-core.c:3456
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3515
+#: src/core/gnunet-service-core.c:3481
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3574
+#: src/core/gnunet-service-core.c:3534
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3617
+#: src/core/gnunet-service-core.c:3572
 msgid "# Session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3751
+#: src/core/gnunet-service-core.c:3706
 #, c-format
 msgid "Received `%s' message that was for `%s', not for me.  Ignoring.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3796
+#: src/core/gnunet-service-core.c:3748
 msgid "# SET_KEY messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3953
+#: src/core/gnunet-service-core.c:3894
 #, c-format
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:3997
+#: src/core/gnunet-service-core.c:3941
 msgid "# messages not delivered to any client"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4076 src/core/gnunet-service-core.c:4102
+#: src/core/gnunet-service-core.c:4011 src/core/gnunet-service-core.c:4036
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4088
+#: src/core/gnunet-service-core.c:4023
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4126
+#: src/core/gnunet-service-core.c:4060
 #, c-format
 msgid "Message received far too old (%llu ms). Content ignored.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4129
+#: src/core/gnunet-service-core.c:4064
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4162
+#: src/core/gnunet-service-core.c:4094
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4230
+#: src/core/gnunet-service-core.c:4157
 msgid "# session keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4248
+#: src/core/gnunet-service-core.c:4173
 msgid "# failed to decrypt message (no session key)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4306
+#: src/core/gnunet-service-core.c:4229
 #, c-format
 msgid "Unsupported message of type %u received.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4481 src/core/gnunet-service-core.c:4572
+#: src/core/gnunet-service-core.c:4403 src/core/gnunet-service-core.c:4485
 msgid "# peers connected (transport)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4695
+#: src/core/gnunet-service-core.c:4599
 msgid "Core service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4713
+#: src/core/gnunet-service-core.c:4617
 msgid "Core service could not access hostkey.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:4751
+#: src/core/gnunet-service-core.c:4656
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/core_api.c:874
+#: src/core/core_api.c:832
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:291 src/include/gnunet_common.h:296
-#: src/include/gnunet_common.h:302
+#: src/include/gnunet_common.h:296 src/include/gnunet_common.h:301
+#: src/include/gnunet_common.h:307
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:312
+#: src/include/gnunet_common.h:317
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:326
+#: src/include/gnunet_common.h:331
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:145
+#: src/include/gnunet_getopt_lib.h:144
 msgid "print this help"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:155
+#: src/include/gnunet_getopt_lib.h:154
 msgid "print the version number"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:164
+#: src/include/gnunet_getopt_lib.h:163
 msgid "configure logging to write logs to LOGFILE"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:173
+#: src/include/gnunet_getopt_lib.h:172
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:182
+#: src/include/gnunet_getopt_lib.h:181
 msgid "be verbose"
 msgstr ""
 
-#: src/include/gnunet_getopt_lib.h:191
+#: src/include/gnunet_getopt_lib.h:190
 msgid "use configuration file FILENAME"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Failed to connect to core service\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
 #~ msgid "Error"
 #~ msgstr "错误"
 
@@ -5566,9 +5380,6 @@
 #~ msgid "message size"
 #~ msgstr "消息尺寸"
 
-#~ msgid "time to wait for the completion of an iteration (in ms)"
-#~ msgstr "等待一次迭代完成的时间(毫秒)"
-
 #~ msgid "number of messages in a message block"
 #~ msgstr "一个消息块中的消息数量"
 




reply via email to

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