[GNUnet-SVN] r34788 - in gnunet: po src/include src/rps

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34788 - in gnunet: po src/include src/rps

From:	gnunet
Subject:	[GNUnet-SVN] r34788 - in gnunet: po src/include src/rps
Date:	Wed, 24 Dec 2014 17:59:19 +0100
Author: ch3
Date: 2014-12-24 17:59:19 +0100 (Wed, 24 Dec 2014)
New Revision: 34788

Modified:
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
   gnunet/src/include/gnunet_rps_service.h
   gnunet/src/rps/gnunet-service-rps.c
   gnunet/src/rps/test_rps.conf
   gnunet/src/rps/test_rps_multipeer.c
Log:
minor fixes

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2014-12-24 15:11:43 UTC (rev 34787)
+++ gnunet/po/de.po     2014-12-24 16:59:19 UTC (rev 34788)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-06-04 18:25+0200\n"
+"POT-Creation-Date: 2014-12-09 00:23+0100\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -358,149 +358,149 @@
 msgid "Received last message for %s \n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2793 src/ats/gnunet-ats-solver-eval.c:2827
-#: src/ats/gnunet-service-ats_addresses.c:1675
-#: src/ats/gnunet-service-ats_addresses.c:1719
+#: src/ats/gnunet-ats-solver-eval.c:2804 src/ats/gnunet-ats-solver-eval.c:2838
+#: src/ats/gnunet-service-ats_addresses.c:1781
+#: src/ats/gnunet-service-ats_addresses.c:1825
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#: src/ats/gnunet-service-ats_addresses.c:1682
+#: src/ats/gnunet-ats-solver-eval.c:2810
+#: src/ats/gnunet-service-ats_addresses.c:1788
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2806
-#: src/ats/gnunet-service-ats_addresses.c:1690
+#: src/ats/gnunet-ats-solver-eval.c:2817
+#: src/ats/gnunet-service-ats_addresses.c:1796
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2833
-#: src/ats/gnunet-service-ats_addresses.c:1726
+#: src/ats/gnunet-ats-solver-eval.c:2844
+#: src/ats/gnunet-service-ats_addresses.c:1832
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#: src/ats/gnunet-service-ats_addresses.c:1734
+#: src/ats/gnunet-ats-solver-eval.c:2851
+#: src/ats/gnunet-service-ats_addresses.c:1840
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3397
-#: src/ats-tests/gnunet-solver-eval.c:919
+#: src/ats/gnunet-ats-solver-eval.c:3410
+#: src/ats-tests/gnunet-solver-eval.c:918
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3400
-#: src/ats-tests/gnunet-solver-eval.c:922
-#: src/ats-tests/gnunet-solver-eval.c:925
+#: src/ats/gnunet-ats-solver-eval.c:3413
+#: src/ats-tests/gnunet-solver-eval.c:921
+#: src/ats-tests/gnunet-solver-eval.c:924
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3403
+#: src/ats/gnunet-ats-solver-eval.c:3416
 msgid "be verbose"
 msgstr "umfangreiche Meldungen ausgeben"
 
-#: src/ats/gnunet-ats-solver-eval.c:3406
+#: src/ats/gnunet-ats-solver-eval.c:3419
 #, fuzzy
 msgid "print logging"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3409
+#: src/ats/gnunet-ats-solver-eval.c:3422
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3412
+#: src/ats/gnunet-ats-solver-eval.c:3425
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1912
+#: src/ats/gnunet-service-ats_addresses.c:2039
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1915
+#: src/ats/gnunet-service-ats_addresses.c:2042
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1938
+#: src/ats/gnunet-service-ats_addresses.c:2065
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/ats/plugin_ats_mlp.c:949
+#: src/ats/plugin_ats_mlp.c:1344
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1542
+#: src/ats/plugin_ats_mlp.c:1941
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/ats/plugin_ats_mlp.c:1589
+#: src/ats/plugin_ats_mlp.c:1988
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2299
+#: src/ats/plugin_ats_mlp.c:2704
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2339 src/ats/plugin_ats_mlp.c:2356
-#: src/ats/plugin_ats_mlp.c:2388 src/ats/plugin_ats_mlp.c:2406
-#: src/ats/plugin_ats_mlp.c:2425 src/ats/plugin_ats_proportional.c:458
-#: src/ats/plugin_ats_proportional.c:475 src/ats/plugin_ats_ril.c:2220
-#: src/ats/plugin_ats_ril.c:2237 src/ats/plugin_ats_ril.c:2254
-#: src/ats/plugin_ats_ril.c:2271 src/ats/plugin_ats_ril.c:2288
-#: src/ats/plugin_ats_ril.c:2305 src/ats/plugin_ats_ril.c:2322
-#: src/ats/plugin_ats_ril.c:2339
+#: src/ats/plugin_ats_mlp.c:2744 src/ats/plugin_ats_mlp.c:2761
+#: src/ats/plugin_ats_mlp.c:2793 src/ats/plugin_ats_mlp.c:2811
+#: src/ats/plugin_ats_mlp.c:2830 src/ats/plugin_ats_proportional.c:1989
+#: src/ats/plugin_ats_proportional.c:2010 src/ats/plugin_ats_ril.c:2718
+#: src/ats/plugin_ats_ril.c:2735 src/ats/plugin_ats_ril.c:2752
+#: src/ats/plugin_ats_ril.c:2769 src/ats/plugin_ats_ril.c:2786
+#: src/ats/plugin_ats_ril.c:2803 src/ats/plugin_ats_ril.c:2820
+#: src/ats/plugin_ats_ril.c:2837
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/ats/plugin_ats_mlp.c:2512
+#: src/ats/plugin_ats_mlp.c:2917
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2521
+#: src/ats/plugin_ats_mlp.c:2926
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2937
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2540
+#: src/ats/plugin_ats_mlp.c:2945
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2551
+#: src/ats/plugin_ats_mlp.c:2956
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1819
+#: src/ats/plugin_ats_proportional.c:1847
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
@@ -538,7 +538,7 @@
 msgid "Could not connect master [%u] and slave [%u]\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:673
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:677
 #, fuzzy
 msgid "Initialization failed, shutdown\n"
 msgstr "Initialisierung des Plugin Mechanismuses fehlgeschlagen: %s!\n"
@@ -559,169 +559,187 @@
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:169
+#: src/ats-tool/gnunet-ats.c:296
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:171
+#: src/ats-tool/gnunet-ats.c:300
 #, c-format
-msgid "ATS returned results for %u addresses\n"
+msgid "ATS returned stat_results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:258
+#: src/ats-tool/gnunet-ats.c:378
+msgid "active "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:378
+msgid "inactive "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:427
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/ats-tool/gnunet-ats.c:467
+#: src/ats-tool/gnunet-ats.c:544
+#, fuzzy, c-format
+msgid "Removed address of peer `%s' with plugin `%s'\n"
+msgstr "Verfügbare(r) Transport(e): %s\n"
+
+#: src/ats-tool/gnunet-ats.c:747
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:487 src/namestore/gnunet-namestore.c:639
-#: src/transport/gnunet-transport.c:1349
+#: src/ats-tool/gnunet-ats.c:779 src/namestore/gnunet-namestore.c:700
+#: src/transport/gnunet-transport.c:1855
+#: src/transport/gnunet-transport-profiler.c:531
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/ats-tool/gnunet-ats.c:499 src/transport/gnunet-transport.c:1358
+#: src/ats-tool/gnunet-ats.c:793 src/transport/gnunet-transport.c:1864
+#: src/transport/gnunet-transport-profiler.c:549
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:803
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:524 src/ats-tool/gnunet-ats.c:543
-#: src/ats-tool/gnunet-ats.c:560 src/ats-tool/gnunet-ats.c:597
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:825 src/ats-tool/gnunet-ats.c:851
+#: src/ats-tool/gnunet-ats.c:879 src/ats-tool/gnunet-ats.c:925
+#, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/ats-tool/gnunet-ats.c:532 src/ats-tool/gnunet-ats.c:549
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:837 src/ats-tool/gnunet-ats.c:863
+#, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/ats-tool/gnunet-ats.c:569
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:891
+#, fuzzy
 msgid "No preference type given!\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats-tool/gnunet-ats.c:574
-#, c-format
+#: src/ats-tool/gnunet-ats.c:898
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:590
+#: src/ats-tool/gnunet-ats.c:916
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:648
+#: src/ats-tool/gnunet-ats.c:984
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:650
+#: src/ats-tool/gnunet-ats.c:986
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:653
+#: src/ats-tool/gnunet-ats.c:989
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/ats-tool/gnunet-ats.c:655
+#: src/ats-tool/gnunet-ats.c:991
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:657
+#: src/ats-tool/gnunet-ats.c:993
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats-tool/gnunet-ats.c:659
+#: src/ats-tool/gnunet-ats.c:995
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:661
+#: src/ats-tool/gnunet-ats.c:997
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:664
+#: src/ats-tool/gnunet-ats.c:1000
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:666
+#: src/ats-tool/gnunet-ats.c:1002
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:669
+#: src/ats-tool/gnunet-ats.c:1005
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:676
+#: src/ats-tool/gnunet-ats.c:1012
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:357
+#: src/cadet/gnunet-cadet.c:376
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/cadet/gnunet-cadet.c:607
+#: src/cadet/gnunet-cadet.c:626
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/cadet/gnunet-cadet.c:650
+#: src/cadet/gnunet-cadet.c:669
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/cadet/gnunet-cadet.c:716
+#: src/cadet/gnunet-cadet.c:735
 msgid "You must NOT give a TARGETwhen using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:807
+#: src/cadet/gnunet-cadet.c:832
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:810
+#: src/cadet/gnunet-cadet.c:835
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:816
+#: src/cadet/gnunet-cadet.c:838
+msgid "dump debug information to STDERR"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:844
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:819
+#: src/cadet/gnunet-cadet.c:847
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:822
+#: src/cadet/gnunet-cadet.c:850
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:825
+#: src/cadet/gnunet-cadet.c:853
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-cadet.c:828
+#: src/cadet/gnunet-cadet.c:856
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/cadet/gnunet-service-cadet_peer.c:429
+#: src/cadet/gnunet-service-cadet_peer.c:496
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -736,8 +754,8 @@
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:443
-#: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
-#: src/set/gnunet-set-profiler.c:292
+#: src/set/gnunet-set-profiler.c:289 src/set/gnunet-set-profiler.c:292
+#: src/set/gnunet-set-profiler.c:295
 #, fuzzy
 msgid "number of values"
 msgstr "Anzahl an Durchläufen"
@@ -756,270 +774,271 @@
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:557
-#: src/conversation/conversation_api_call.c:470
+#: src/conversation/conversation_api.c:493
+#: src/conversation/conversation_api_call.c:475
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/conversation_api.c:681
+#: src/conversation/conversation_api.c:617
 #, fuzzy
 msgid "number too large"
 msgstr "Anzahl an Durchläufen"
 
-#: src/conversation/gnunet-conversation.c:264
+#: src/conversation/gnunet-conversation.c:269
 #, c-format
 msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:286
+#: src/conversation/gnunet-conversation.c:291
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:319
+#: src/conversation/gnunet-conversation.c:323
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:324
+#: src/conversation/gnunet-conversation.c:328
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:342
+#: src/conversation/gnunet-conversation.c:346
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:356
+#: src/conversation/gnunet-conversation.c:360
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/conversation/gnunet-conversation.c:368
+#: src/conversation/gnunet-conversation.c:372
 #, c-format
 msgid ""
 "Phone active on line %u.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:390
+#: src/conversation/gnunet-conversation.c:394
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:397
+#: src/conversation/gnunet-conversation.c:401
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/conversation/gnunet-conversation.c:404
+#: src/conversation/gnunet-conversation.c:408
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/conversation/gnunet-conversation.c:411
-msgid "Call terminated\n"
+#: src/conversation/gnunet-conversation.c:416
+#, c-format
+msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:417
+#: src/conversation/gnunet-conversation.c:425
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:423
+#: src/conversation/gnunet-conversation.c:431
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:428
+#: src/conversation/gnunet-conversation.c:436
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:495
+#: src/conversation/gnunet-conversation.c:504
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/conversation/gnunet-conversation.c:511
-#: src/conversation/gnunet-conversation.c:525
+#: src/conversation/gnunet-conversation.c:520
+#: src/conversation/gnunet-conversation.c:534
 #, fuzzy, c-format
 msgid "Ego `%s' not available\n"
 msgstr "gconfig ist nicht verfügbar\n"
 
-#: src/conversation/gnunet-conversation.c:518
-#: src/conversation/gnunet-conversation.c:575
+#: src/conversation/gnunet-conversation.c:527
+#: src/conversation/gnunet-conversation.c:584
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:533
-#: src/conversation/gnunet-conversation.c:588
+#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:597
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:544
+#: src/conversation/gnunet-conversation.c:552
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:599
+#: src/conversation/gnunet-conversation.c:608
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:625
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:647
+#: src/conversation/gnunet-conversation.c:655
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:670
+#: src/conversation/gnunet-conversation.c:678
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:675
+#: src/conversation/gnunet-conversation.c:683
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:681
-#: src/conversation/gnunet-conversation.c:705
+#: src/conversation/gnunet-conversation.c:689
+#: src/conversation/gnunet-conversation.c:713
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:686
+#: src/conversation/gnunet-conversation.c:694
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:695
+#: src/conversation/gnunet-conversation.c:703
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
 
-#: src/conversation/gnunet-conversation.c:700
+#: src/conversation/gnunet-conversation.c:708
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:719
+#: src/conversation/gnunet-conversation.c:727
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:725
+#: src/conversation/gnunet-conversation.c:733
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/conversation/gnunet-conversation.c:753
-#: src/conversation/gnunet-conversation.c:768
+#: src/conversation/gnunet-conversation.c:761
+#: src/conversation/gnunet-conversation.c:776
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:801
-#: src/conversation/gnunet-conversation.c:817
+#: src/conversation/gnunet-conversation.c:809
+#: src/conversation/gnunet-conversation.c:825
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:832
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:833
+#: src/conversation/gnunet-conversation.c:841
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:850
+#: src/conversation/gnunet-conversation.c:858
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:885
+#: src/conversation/gnunet-conversation.c:893
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:893
+#: src/conversation/gnunet-conversation.c:901
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:910
+#: src/conversation/gnunet-conversation.c:918
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:937
+#: src/conversation/gnunet-conversation.c:944
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:939
+#: src/conversation/gnunet-conversation.c:946
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:941
+#: src/conversation/gnunet-conversation.c:948
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:943
+#: src/conversation/gnunet-conversation.c:950
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:945
+#: src/conversation/gnunet-conversation.c:952
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:947
+#: src/conversation/gnunet-conversation.c:954
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:949
+#: src/conversation/gnunet-conversation.c:956
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:951
+#: src/conversation/gnunet-conversation.c:958
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Erlaubt es Clients die Konfiguration von gnunetd abzufragen"
 
-#: src/conversation/gnunet-conversation.c:953
+#: src/conversation/gnunet-conversation.c:960
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1151
+#: src/conversation/gnunet-conversation.c:1168
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/conversation/gnunet-conversation.c:1164
+#: src/conversation/gnunet-conversation.c:1181
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym `%s' wurde gelöscht.\n"
 
-#: src/conversation/gnunet-conversation.c:1199
+#: src/conversation/gnunet-conversation.c:1216
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 
-#: src/conversation/gnunet-conversation.c:1223
+#: src/conversation/gnunet-conversation.c:1240
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/conversation/gnunet-conversation.c:1249
+#: src/conversation/gnunet-conversation.c:1266
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1252
+#: src/conversation/gnunet-conversation.c:1269
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1276
+#: src/conversation/gnunet-conversation.c:1295
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1047,6 +1066,7 @@
 
 #: src/conversation/gnunet-conversation-test.c:248
 #: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
+#: src/sensordashboard/gnunet-sensordashboard.c:70
 #: src/template/gnunet-template.c:70
 #, fuzzy
 msgid "help text"
@@ -1057,63 +1077,63 @@
 msgid "pa_stream_write() failed: %s\n"
 msgstr "`%s' schlug fehl: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:587
+#: src/conversation/gnunet-helper-audio-playback.c:589
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:612
+#: src/conversation/gnunet-helper-audio-playback.c:614
 #: src/conversation/gnunet-helper-audio-record.c:545
 #, fuzzy
 msgid "Connection established.\n"
 msgstr "Collection beendet.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:617
+#: src/conversation/gnunet-helper-audio-playback.c:619
 #: src/conversation/gnunet-helper-audio-record.c:550
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "`%s' schlug fehl: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:631
+#: src/conversation/gnunet-helper-audio-playback.c:633
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:644
+#: src/conversation/gnunet-helper-audio-playback.c:646
 #: src/conversation/gnunet-helper-audio-record.c:576
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:665
+#: src/conversation/gnunet-helper-audio-playback.c:667
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:671
+#: src/conversation/gnunet-helper-audio-playback.c:673
 #: src/conversation/gnunet-helper-audio-record.c:605
 #, fuzzy
 msgid "pa_mainloop_new() failed.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:685
+#: src/conversation/gnunet-helper-audio-playback.c:687
 #: src/conversation/gnunet-helper-audio-record.c:620
 #, fuzzy
 msgid "pa_context_new() failed.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:692
+#: src/conversation/gnunet-helper-audio-playback.c:694
 #: src/conversation/gnunet-helper-audio-record.c:626
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "`%s' schlug fehl: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:698
+#: src/conversation/gnunet-helper-audio-playback.c:700
 #: src/conversation/gnunet-helper-audio-record.c:632
 #, fuzzy
 msgid "pa_mainloop_run() failed.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:768
+#: src/conversation/gnunet-helper-audio-playback.c:770
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
@@ -1184,17 +1204,17 @@
 msgid "Failed to allocate %d bytes for second packet\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/conversation/gnunet-service-conversation.c:852
+#: src/conversation/gnunet-service-conversation.c:853
 msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:943
+#: src/conversation/gnunet-service-conversation.c:944
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1349
+#: src/conversation/gnunet-service-conversation.c:1351
 #, fuzzy, c-format
 msgid "Received incoming Cadet channel on port %u\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
@@ -1260,7 +1280,7 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:705
+#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:761
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültige Kommandozeilen Parameter:\n"
@@ -1271,7 +1291,7 @@
 msgid "Failed to connect to CORE service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:1590
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2115
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -1306,150 +1326,150 @@
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:549
+#: src/core/gnunet-service-core_kx.c:565
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:601
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:688
+#: src/core/gnunet-service-core_kx.c:703
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:732
+#: src/core/gnunet-service-core_kx.c:747
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:832
+#: src/core/gnunet-service-core_kx.c:847
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:839
+#: src/core/gnunet-service-core_kx.c:854
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:873
+#: src/core/gnunet-service-core_kx.c:888
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:884
+#: src/core/gnunet-service-core_kx.c:899
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_kx.c:983
+#: src/core/gnunet-service-core_kx.c:998
 #: src/transport/gnunet-service-transport_validation.c:1016
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:991
+#: src/core/gnunet-service-core_kx.c:1006
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:1018
+#: src/core/gnunet-service-core_kx.c:1033
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1035
+#: src/core/gnunet-service-core_kx.c:1049
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1061
+#: src/core/gnunet-service-core_kx.c:1075
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1072
+#: src/core/gnunet-service-core_kx.c:1086
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1139
-#: src/transport/gnunet-service-transport_validation.c:1328
+#: src/core/gnunet-service-core_kx.c:1153
+#: src/transport/gnunet-service-transport_validation.c:1359
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1145
+#: src/core/gnunet-service-core_kx.c:1159
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1150
+#: src/core/gnunet-service-core_kx.c:1164
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:1180
+#: src/core/gnunet-service-core_kx.c:1194
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1215
+#: src/core/gnunet-service-core_kx.c:1229
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1226
+#: src/core/gnunet-service-core_kx.c:1240
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_kx.c:1233
+#: src/core/gnunet-service-core_kx.c:1247
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1374
+#: src/core/gnunet-service-core_kx.c:1386
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1381
+#: src/core/gnunet-service-core_kx.c:1393
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1384
+#: src/core/gnunet-service-core_kx.c:1396
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1430
-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1442
+#: src/core/gnunet-service-core_kx.c:1467
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1442
+#: src/core/gnunet-service-core_kx.c:1454
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1484
+#: src/core/gnunet-service-core_kx.c:1496
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1492
+#: src/core/gnunet-service-core_kx.c:1504
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1527
+#: src/core/gnunet-service-core_kx.c:1539
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
@@ -1477,14 +1497,13 @@
 #: src/core/gnunet-service-core_sessions.c:328
 #: src/dht/gnunet-service-dht_neighbours.c:662
 #: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:3586
-#: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
-#: src/topology/gnunet-daemon-topology.c:707
-#: src/topology/gnunet-daemon-topology.c:808
+#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1517
+#: src/topology/gnunet-daemon-topology.c:734
+#: src/topology/gnunet-daemon-topology.c:835
 #: src/transport/gnunet-service-transport_neighbours.c:917
 #: src/transport/gnunet-service-transport_neighbours.c:1141
-#: src/transport/gnunet-service-transport_neighbours.c:3146
-#: src/transport/gnunet-service-transport_neighbours.c:3449
+#: src/transport/gnunet-service-transport_neighbours.c:3177
+#: src/transport/gnunet-service-transport_neighbours.c:3491
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
@@ -1560,7 +1579,7 @@
 msgid "Heap datacache running\n"
 msgstr "sqlite Datenspeicher"
 
-#: src/datacache/plugin_datacache_postgres.c:392
+#: src/datacache/plugin_datacache_postgres.c:391
 msgid "Postgres datacache running\n"
 msgstr ""
 
@@ -1580,24 +1599,24 @@
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
-#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:44
+#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:622
+#: src/include/gnunet_common.h:631 src/scalarproduct/scalarproduct.h:35
 #, 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:450
+#: src/datacache/plugin_datacache_sqlite.c:449
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:484
-#: src/datastore/plugin_datastore_sqlite.c:404
-#: src/namecache/plugin_namecache_sqlite.c:295
-#: src/namestore/plugin_namestore_sqlite.c:327
+#: src/datacache/plugin_datacache_sqlite.c:483
+#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/namecache/plugin_namecache_sqlite.c:292
+#: src/namestore/plugin_namestore_sqlite.c:324
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:491
+#: src/datacache/plugin_datacache_sqlite.c:490
 #, fuzzy, c-format
 msgid "Failed to close statement %p: %d\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -1911,14 +1930,14 @@
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:824
+#: src/datastore/plugin_datastore_postgres.c:832
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr ""
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:860
+#: src/datastore/plugin_datastore_postgres.c:868
 #: src/namecache/plugin_namecache_postgres.c:414
 #: src/namestore/plugin_namestore_postgres.c:569
 msgid "Postgres database running\n"
@@ -1935,31 +1954,31 @@
 #: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
-#: src/peerstore/plugin_peerstore_sqlite.c:434
-#: src/psycstore/plugin_psycstore_sqlite.c:319
+#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/psycstore/plugin_psycstore_sqlite.c:329
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:663
+#: src/datastore/plugin_datastore_sqlite.c:661
 #, 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:1156
+#: src/datastore/plugin_datastore_sqlite.c:1154
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1175
+#: src/datastore/plugin_datastore_sqlite.c:1173
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1215
-#: src/namecache/plugin_namecache_sqlite.c:583
-#: src/namestore/plugin_namestore_sqlite.c:719
+#: src/datastore/plugin_datastore_sqlite.c:1213
+#: src/namecache/plugin_namecache_sqlite.c:580
+#: src/namestore/plugin_namestore_sqlite.c:716
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite Datenspeicher"
@@ -1968,7 +1987,7 @@
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:376
+#: src/dht/dht_api.c:403
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -2016,7 +2035,7 @@
 
 #: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:939
 #: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
@@ -2034,6 +2053,53 @@
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
+#: src/dht/gnunet_dht_profiler.c:1392
+#: src/testbed/gnunet-testbed-profiler.c:267
+#, fuzzy, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
+
+#: src/dht/gnunet_dht_profiler.c:1417
+#, fuzzy
+msgid "number of peers to start"
+msgstr "Anzahl an Durchläufen"
+
+#: src/dht/gnunet_dht_profiler.c:1420
+msgid ""
+"maximum number of times we try to search for successor circle formation (0 "
+"for R5N)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:864
+#: src/testbed/gnunet-testbed-profiler.c:306
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1426
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1429
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1432
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1435
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1438
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1456
+#, fuzzy
+msgid "Measure quality and performance of the DHT service."
+msgstr "Auf den Dienst konnte nicht zugegriffen werden"
+
 #: src/dht/gnunet-dht-put.c:118
 #, fuzzy
 msgid "PUT request sent with key"
@@ -2082,114 +2148,114 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:176
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:193
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-xdht_clients.c:838
+#: src/dht/gnunet-service-xdht_clients.c:844
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# Client Trace-Anfragen empfangen"
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:925
+#: src/dht/gnunet-service-xdht_clients.c:928
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-xdht_clients.c:1010
+#: src/dht/gnunet-service-xdht_clients.c:993
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-xdht_clients.c:1211
+#: src/dht/gnunet-service-xdht_clients.c:1195
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:1040
-#: src/dht/gnunet-service-xdht_clients.c:498
+#: src/dht/gnunet-service-xdht_clients.c:503
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1053
-#: src/dht/gnunet-service-xdht_clients.c:511
+#: src/dht/gnunet-service-xdht_clients.c:517
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1090
-#: src/dht/gnunet-service-xdht_clients.c:548
+#: src/dht/gnunet-service-xdht_clients.c:554
 #, fuzzy, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:1113
-#: src/dht/gnunet-service-xdht_clients.c:571
+#: src/dht/gnunet-service-xdht_clients.c:577
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:1167
 #: src/dht/gnunet-service-dht_clients.c:1210
-#: src/dht/gnunet-service-xdht_clients.c:625
-#: src/dht/gnunet-service-xdht_clients.c:668
+#: src/dht/gnunet-service-xdht_clients.c:631
+#: src/dht/gnunet-service-xdht_clients.c:674
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1177
-#: src/dht/gnunet-service-xdht_clients.c:635
+#: src/dht/gnunet-service-xdht_clients.c:641
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
 
 #: src/dht/gnunet-service-dht_datacache.c:68
-#: src/dht/gnunet-service-xdht_datacache.c:69
+#: src/dht/gnunet-service-xdht_datacache.c:71
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# Bytes empfangen über TCP"
 
 #: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-xdht_datacache.c:79
+#: src/dht/gnunet-service-xdht_datacache.c:82
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:213
+#: src/dht/gnunet-service-xdht_datacache.c:221
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:244
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:240
+#: src/dht/gnunet-service-xdht_datacache.c:250
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:246
+#: src/dht/gnunet-service-xdht_datacache.c:256
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:258
+#: src/dht/gnunet-service-xdht_datacache.c:268
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:261
+#: src/dht/gnunet-service-xdht_datacache.c:271
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:234
-#: src/dht/gnunet-service-xdht_datacache.c:298
+#: src/dht/gnunet-service-xdht_datacache.c:309
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# Client Trace-Anfragen empfangen"
@@ -2210,18 +2276,18 @@
 msgstr "# PING Nachrichten erstellt"
 
 #: src/dht/gnunet-service-dht_neighbours.c:764
+#: src/dht/gnunet-service-xdht_neighbours.c:6055
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:745
+#: src/dht/gnunet-service-xdht_neighbours.c:1012
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:786
 #, fuzzy
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Client Trace-Anfragen empfangen"
@@ -2255,15 +2321,15 @@
 #: src/dht/gnunet-service-dht_neighbours.c:1328
 #: src/dht/gnunet-service-dht_neighbours.c:1452
 #: src/dht/gnunet-service-dht_neighbours.c:1557
-#: src/dht/gnunet-service-xdht_neighbours.c:843
-#: src/dht/gnunet-service-xdht_neighbours.c:910
-#: src/dht/gnunet-service-xdht_neighbours.c:980
-#: src/dht/gnunet-service-xdht_neighbours.c:1040
-#: src/dht/gnunet-service-xdht_neighbours.c:1098
-#: src/dht/gnunet-service-xdht_neighbours.c:1157
-#: src/dht/gnunet-service-xdht_neighbours.c:1218
-#: src/dht/gnunet-service-xdht_neighbours.c:1280
-#: src/dht/gnunet-service-xdht_neighbours.c:1341
+#: src/dht/gnunet-service-xdht_neighbours.c:1121
+#: src/dht/gnunet-service-xdht_neighbours.c:1190
+#: src/dht/gnunet-service-xdht_neighbours.c:1240
+#: src/dht/gnunet-service-xdht_neighbours.c:1304
+#: src/dht/gnunet-service-xdht_neighbours.c:1371
+#: src/dht/gnunet-service-xdht_neighbours.c:1433
+#: src/dht/gnunet-service-xdht_neighbours.c:1495
+#: src/dht/gnunet-service-xdht_neighbours.c:1557
+#: src/dht/gnunet-service-xdht_neighbours.c:1617
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
@@ -2369,6 +2435,110 @@
 msgid "# DHT requests combined"
 msgstr "# Client Trace-Anfragen empfangen"
 
+#: src/dht/gnunet-service-xdht_neighbours.c:1824
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail_length = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1829
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail[%d]=%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1849
+#, c-format
+msgid ""
+"\n"
+"SUPU************  FRIEND_PEERMAP of %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1859
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1880
+#, c-format
+msgid ""
+"\n"
+"SUPU************  FINGER_TABLE of %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1889
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail_id[%d]=%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1902
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail[%d] = %s "
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:3551
+msgid "# FINGERS_COUNT"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:3692
+#: src/dht/gnunet-service-xdht_neighbours.c:3930
+#: src/dht/gnunet-service-xdht_neighbours.c:4083
+#: src/dht/gnunet-service-xdht_neighbours.c:4233
+#: src/dht/gnunet-service-xdht_neighbours.c:4414
+#: src/dht/gnunet-service-xdht_neighbours.c:4929
+#: src/dht/gnunet-service-xdht_neighbours.c:5323
+#: src/dht/gnunet-service-xdht_neighbours.c:5416
+#: src/dht/gnunet-service-xdht_neighbours.c:5505
+#: src/dht/gnunet-service-xdht_neighbours.c:5609
+#: src/dht/gnunet-service-xdht_neighbours.c:5753
+#: src/dht/gnunet-service-xdht_neighbours.c:5842
+#, fuzzy
+msgid "# Bytes received from other peers"
+msgstr "# Bytes des Typs %d empfangen"
+
+#: src/dht/gnunet-service-xdht_routing.c:256
+#, c-format
+msgid ""
+"\n"
+"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:264
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->trail_id = %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:267
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->next_hop = %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:270
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->prev_hop = %s"
+msgstr ""
+
 #: src/dht/plugin_block_dht.c:138
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
@@ -2383,12 +2553,12 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:257
+#: src/dns/dnsparser.c:254
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/dns/dnsparser.c:856
+#: src/dns/dnsparser.c:818
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -2418,15 +2588,15 @@
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:355
+#: src/dns/gnunet-dns-monitor.c:352
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:358
+#: src/dns/gnunet-dns-monitor.c:355
 msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:369
+#: src/dns/gnunet-dns-monitor.c:366
 msgid "Monitor DNS queries."
 msgstr ""
 
@@ -2857,6 +3027,7 @@
 msgstr ""
 
 #: src/fragmentation/defragmentation.c:456
+#: src/transport/plugin_transport_wlan.c:1474
 #, fuzzy
 msgid "# fragments received"
 msgstr "# verworfener Nachrichten"
@@ -2907,71 +3078,71 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/fs/fs_api.c:465
+#: src/fs/fs_api.c:474
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:474
+#: src/fs/fs_api.c:485
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:480
+#: src/fs/fs_api.c:493
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1066
+#: src/fs/fs_api.c:1101
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1571
+#: src/fs/fs_api.c:1621
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1585
+#: src/fs/fs_api.c:1635
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2242
+#: src/fs/fs_api.c:2293
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2252
+#: src/fs/fs_api.c:2303
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2619
+#: src/fs/fs_api.c:2431 src/fs/fs_api.c:2679
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2395
+#: src/fs/fs_api.c:2449
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2409 src/fs/fs_api.c:2428 src/fs/fs_api.c:2911
+#: src/fs/fs_api.c:2464 src/fs/fs_api.c:2483 src/fs/fs_api.c:2975
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2610
+#: src/fs/fs_api.c:2669
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2855
+#: src/fs/fs_api.c:2918
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2949
+#: src/fs/fs_api.c:3013
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3085,69 +3256,69 @@
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
+#: src/fs/fs_publish.c:126 src/fs/fs_publish.c:431
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:667 src/fs/fs_publish.c:684 src/fs/fs_publish.c:723
-#: src/fs/fs_publish.c:744 src/fs/fs_publish.c:768 src/fs/fs_publish.c:914
+#: src/fs/fs_publish.c:683 src/fs/fs_publish.c:700 src/fs/fs_publish.c:739
+#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:934
 #, 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:669
+#: src/fs/fs_publish.c:685
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:681
+#: src/fs/fs_publish.c:697
 #, fuzzy
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/fs_publish.c:725
+#: src/fs/fs_publish.c:741
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:745
+#: src/fs/fs_publish.c:761
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:770
+#: src/fs/fs_publish.c:786
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:793
+#: src/fs/fs_publish.c:809
 #, 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:862
+#: src/fs/fs_publish.c:878
 #, 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:868
+#: src/fs/fs_publish.c:884
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:915
+#: src/fs/fs_publish.c:936
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/fs/fs_publish.c:1151
+#: src/fs/fs_publish.c:1172
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1243
+#: src/fs/fs_publish.c:1263
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3157,17 +3328,17 @@
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish_ublock.c:219
+#: src/fs/fs_publish_ublock.c:243
 #, fuzzy
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
 
-#: src/fs/fs_search.c:751 src/fs/fs_search.c:817
+#: src/fs/fs_search.c:778 src/fs/fs_search.c:848
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/fs/fs_search.c:876
+#: src/fs/fs_search.c:907
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3249,81 +3420,81 @@
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:379
+#: src/fs/fs_uri.c:378
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:423
+#: src/fs/fs_uri.c:422
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:438
+#: src/fs/fs_uri.c:437
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:517
+#: src/fs/fs_uri.c:516
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:532
+#: src/fs/fs_uri.c:531
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:542
+#: src/fs/fs_uri.c:541
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:550
+#: src/fs/fs_uri.c:549
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:558
+#: src/fs/fs_uri.c:557
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:563
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:570
+#: src/fs/fs_uri.c:569
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:579
+#: src/fs/fs_uri.c:578
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:584
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:591
+#: src/fs/fs_uri.c:590
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:603
+#: src/fs/fs_uri.c:602
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:642
+#: src/fs/fs_uri.c:641
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:866
+#: src/fs/fs_uri.c:865
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/fs/fs_uri.c:872
+#: src/fs/fs_uri.c:871
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/fs/fs_uri.c:1057 src/fs/fs_uri.c:1084
+#: src/fs/fs_uri.c:1056 src/fs/fs_uri.c:1083
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1090
+#: src/fs/fs_uri.c:1089
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3361,23 +3532,23 @@
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:824
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:886
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:828
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:890
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:831
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:893
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:917
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:924
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -3451,7 +3622,7 @@
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Upload abgewiesen!"
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:304
 #: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
@@ -3462,7 +3633,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:665
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:712
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
@@ -3475,7 +3646,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:856
 #: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -3540,129 +3711,134 @@
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
+#: src/fs/gnunet-publish.c:238 src/fs/gnunet-publish.c:250
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:250
+#: src/fs/gnunet-publish.c:257
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/fs/gnunet-publish.c:260
+#: src/fs/gnunet-publish.c:268
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:273
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/fs/gnunet-publish.c:283
+#: src/fs/gnunet-publish.c:281
+#, fuzzy, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr "Ich bin Peer `%s'.\n"
+
+#: src/fs/gnunet-publish.c:301
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/fs/gnunet-publish.c:401
+#: src/fs/gnunet-publish.c:427
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:403
+#: src/fs/gnunet-publish.c:429
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/fs/gnunet-publish.c:542
+#: src/fs/gnunet-publish.c:572
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:597
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-publish.c:598
+#: src/fs/gnunet-publish.c:631
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/gnunet-publish.c:600
+#: src/fs/gnunet-publish.c:635
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:641
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:610
+#: src/fs/gnunet-publish.c:648
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/fs/gnunet-publish.c:614
+#: src/fs/gnunet-publish.c:653
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-publish.c:660
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:625
+#: src/fs/gnunet-publish.c:669
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/gnunet-publish.c:656
+#: src/fs/gnunet-publish.c:701
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/fs/gnunet-publish.c:682
+#: src/fs/gnunet-publish.c:733
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-publish.c:695
+#: src/fs/gnunet-publish.c:747
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:803
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:754
+#: src/fs/gnunet-publish.c:810
 #, 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:760
+#: src/fs/gnunet-publish.c:816
 #, 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:768 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:824 src/vpn/gnunet-vpn.c:209
 #, 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:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1387 src/transport/gnunet-transport.c:1417
-#: src/transport/gnunet-transport.c:1447
+#: src/fs/gnunet-publish.c:835 src/fs/gnunet-publish.c:843
+#: src/transport/gnunet-transport.c:1893 src/transport/gnunet-transport.c:1923
+#: src/transport/gnunet-transport.c:1953
 #, 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:835
+#: src/fs/gnunet-publish.c:897
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3670,7 +3846,7 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:839
+#: src/fs/gnunet-publish.c:901
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3678,13 +3854,13 @@
 "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:843
+#: src/fs/gnunet-publish.c:905
 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-publish.c:846
+#: src/fs/gnunet-publish.c:908
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3692,7 +3868,7 @@
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/fs/gnunet-publish.c:851
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3700,32 +3876,32 @@
 "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:859
+#: src/fs/gnunet-publish.c:921
 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:865
+#: src/fs/gnunet-publish.c:927
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:869
+#: src/fs/gnunet-publish.c:931
 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:873
+#: src/fs/gnunet-publish.c:935
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:889
+#: src/fs/gnunet-publish.c:951
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3769,24 +3945,26 @@
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:545
+#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:540
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: src/fs/gnunet-service-fs.c:645 src/hostlist/gnunet-daemon-hostlist.c:303
-#: src/topology/gnunet-daemon-topology.c:1260
-#: src/topology/gnunet-daemon-topology.c:1267
+#: src/fs/gnunet-service-fs.c:650 src/hostlist/gnunet-daemon-hostlist.c:303
+#: src/sensordashboard/gnunet-service-sensordashboard.c:854
+#: src/sensordashboard/gnunet-service-sensordashboard.c:862
+#: src/topology/gnunet-daemon-topology.c:1287
+#: src/topology/gnunet-daemon-topology.c:1294
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:484
+#: src/fs/gnunet-service-fs_cadet_client.c:494
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:498
+#: src/fs/gnunet-service-fs_cadet_client.c:508
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# Bytes empfangen über TCP"
@@ -3796,116 +3974,116 @@
 msgid "# Blocks transferred via cadet"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:352
+#: src/fs/gnunet-service-fs_cadet_server.c:361
 #, fuzzy
-msgid "# queries received via cadet not answered"
+msgid "# queries received via CADET not answered"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:432
+#: src/fs/gnunet-service-fs_cadet_server.c:441
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:476
+#: src/fs/gnunet-service-fs_cadet_server.c:485
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "GNUnet Konfiguration"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:482
-#: src/fs/gnunet-service-fs_cadet_server.c:522
+#: src/fs/gnunet-service-fs_cadet_server.c:491
+#: src/fs/gnunet-service-fs_cadet_server.c:531
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# verbundener Knoten"
 
-#: src/fs/gnunet-service-fs_cp.c:682
+#: src/fs/gnunet-service-fs_cp.c:698
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:686
+#: src/fs/gnunet-service-fs_cp.c:702
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:721
+#: src/fs/gnunet-service-fs_cp.c:737
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/fs/gnunet-service-fs_cp.c:727
+#: src/fs/gnunet-service-fs_cp.c:743
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301
+#: src/fs/gnunet-service-fs_cp.c:768 src/fs/gnunet-service-fs_cp.c:1317
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:845
+#: src/fs/gnunet-service-fs_cp.c:861
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:898
+#: src/fs/gnunet-service-fs_cp.c:914
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:906
+#: src/fs/gnunet-service-fs_cp.c:922
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:920
+#: src/fs/gnunet-service-fs_cp.c:936
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:958
+#: src/fs/gnunet-service-fs_cp.c:974
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1026
+#: src/fs/gnunet-service-fs_cp.c:1042
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1051
+#: src/fs/gnunet-service-fs_cp.c:1067
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1061
+#: src/fs/gnunet-service-fs_cp.c:1077
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1139
+#: src/fs/gnunet-service-fs_cp.c:1155
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1173
+#: src/fs/gnunet-service-fs_cp.c:1189
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1195
+#: src/fs/gnunet-service-fs_cp.c:1211
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1246
+#: src/fs/gnunet-service-fs_cp.c:1262
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1270
+#: src/fs/gnunet-service-fs_cp.c:1286
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1299
+#: src/fs/gnunet-service-fs_cp.c:1315
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1670
+#: src/fs/gnunet-service-fs_cp.c:1691
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -3957,22 +4135,22 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:370
 #, fuzzy
 msgid "# client searches active"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:256
+#: src/fs/gnunet-service-fs_lc.c:258
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:327
+#: src/fs/gnunet-service-fs_lc.c:329
 #, fuzzy
 msgid "# client searches received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:362
+#: src/fs/gnunet-service-fs_lc.c:364
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -4104,7 +4282,7 @@
 msgstr ""
 
 #: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
-#: src/fs/gnunet-service-fs_pr.c:1590
+#: src/fs/gnunet-service-fs_pr.c:1612
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
@@ -4116,11 +4294,11 @@
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1566
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1651
+#: src/fs/gnunet-service-fs_pr.c:1673
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -4170,7 +4348,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:695
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:696
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
@@ -4251,62 +4429,67 @@
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:227
+#: src/gns/gnunet-gns.c:215
 #, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+#, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:308
+#: src/gns/gnunet-gns.c:314
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:347 src/gns/gnunet-gns-helper-service-w32.c:798
+#: src/gns/gnunet-gns.c:353 src/gns/gnunet-gns-helper-service-w32.c:798
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:386 src/gns/gnunet-gns-helper-service-w32.c:828
+#: src/gns/gnunet-gns.c:392 src/gns/gnunet-gns-helper-service-w32.c:828
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns.c:399
+#: src/gns/gnunet-gns.c:405
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:449
+#: src/gns/gnunet-gns.c:455
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:452
+#: src/gns/gnunet-gns.c:458
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:455
+#: src/gns/gnunet-gns.c:461
 #, fuzzy
 msgid "Specify timeout for the lookup"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:458
+#: src/gns/gnunet-gns.c:464
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:461
+#: src/gns/gnunet-gns.c:467
 #, fuzzy
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:464
+#: src/gns/gnunet-gns.c:470
 #, fuzzy
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:478
+#: src/gns/gnunet-gns.c:484
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet Netzwerk Topologie tracen."
@@ -4337,8 +4520,8 @@
 #: src/hostlist/gnunet-daemon-hostlist_client.c:931
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1026
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/transport/plugin_transport_http_client.c:1095
-#: src/transport/plugin_transport_http_client.c:1110
+#: src/transport/plugin_transport_http_client.c:595
+#: src/transport/plugin_transport_http_client.c:613
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
@@ -4408,67 +4591,67 @@
 msgid "Failed to pass client to MHD\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2504
+#: src/gns/gnunet-gns-proxy.c:2518
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2533
+#: src/gns/gnunet-gns-proxy.c:2547
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
+#: src/gns/gnunet-gns-proxy.c:2565 src/gns/gnunet-gns-proxy.c:2594
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2631
+#: src/gns/gnunet-gns-proxy.c:2645
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2970
+#: src/gns/gnunet-gns-proxy.c:2984
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3010
+#: src/gns/gnunet-gns-proxy.c:3024
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3072
+#: src/gns/gnunet-gns-proxy.c:3086
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:3113
+#: src/gns/gnunet-gns-proxy.c:3127
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3116
+#: src/gns/gnunet-gns-proxy.c:3130
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3135
+#: src/gns/gnunet-gns-proxy.c:3149
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:862
+#: src/gns/gnunet-service-gns.c:864
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/gns/gnunet-service-gns.c:870
+#: src/gns/gnunet-service-gns.c:872
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/gns/gnunet-service-gns.c:903
+#: src/gns/gnunet-service-gns.c:905
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns.c:919
+#: src/gns/gnunet-service-gns.c:921
 #, fuzzy
 msgid "valid public key required"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -4483,190 +4666,216 @@
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:832
+#: src/gns/gnunet-service-gns_resolver.c:650
+#, c-format
+msgid "Protocol `%s' unknown, skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:661
+#, c-format
+msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:854
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:974
+#: src/gns/gnunet-service-gns_resolver.c:996
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1333
+#: src/gns/gnunet-service-gns_resolver.c:1356
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1831
+#: src/gns/gnunet-service-gns_resolver.c:1886
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1855
+#: src/gns/gnunet-service-gns_resolver.c:1910
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2137
+#: src/gns/gnunet-service-gns_resolver.c:2192
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2286
+#: src/gns/gnunet-service-gns_resolver.c:2341
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:151
+#: src/gns/plugin_gnsrecord_gns.c:172
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:180
+#: src/gns/plugin_gnsrecord_gns.c:201
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:222
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:217
+#: src/gns/plugin_gnsrecord_gns.c:245
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:293
+#: src/gns/plugin_gnsrecord_gns.c:280
 #, fuzzy, c-format
+msgid "Unable to parse BOX record string `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:291
+#, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:314
+#: src/gnsrecord/plugin_gnsrecord_dns.c:312
 #, fuzzy, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:336
+#: src/gnsrecord/plugin_gnsrecord_dns.c:334
 #, fuzzy, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:420
+#: src/gnsrecord/plugin_gnsrecord_dns.c:418
 #, fuzzy, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:452
+#: src/gnsrecord/plugin_gnsrecord_dns.c:455
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:471
+#: src/gnsrecord/plugin_gnsrecord_dns.c:474
 #, fuzzy, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:494
+#: src/gnsrecord/plugin_gnsrecord_dns.c:497
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:514
+#: src/gnsrecord/plugin_gnsrecord_dns.c:520
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:529
+#: src/gnsrecord/plugin_gnsrecord_dns.c:535
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:549
+#: src/gnsrecord/plugin_gnsrecord_dns.c:562
 #, fuzzy, c-format
+msgid "Unable to parse SRV record `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:578
+#, fuzzy, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:595
+#, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:567
+#: src/gnsrecord/plugin_gnsrecord_dns.c:619
+#: src/gnsrecord/plugin_gnsrecord_dns.c:635
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hello/gnunet-hello.c:123
+#: src/hello/gnunet-hello.c:126
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:129
+#: src/hello/gnunet-hello.c:132
 #, fuzzy, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/hello/gnunet-hello.c:137
+#: src/hello/gnunet-hello.c:140
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:144
+#: src/hello/gnunet-hello.c:147
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183
+#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:196
 #, fuzzy, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/hello/gnunet-hello.c:170
+#: src/hello/gnunet-hello.c:173
 #, fuzzy, c-format
 msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hello/gnunet-hello.c:195
+#: src/hello/gnunet-hello.c:208
 #, fuzzy, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/hello/gnunet-hello.c:203
+#: src/hello/gnunet-hello.c:216
 #, c-format
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:957
+#: src/hello/hello.c:955
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/hello/hello.c:966
+#: src/hello/hello.c:964
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/hello/hello.c:976
+#: src/hello/hello.c:974
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hello/hello.c:986
+#: src/hello/hello.c:984
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/hello/hello.c:1004
+#: src/hello/hello.c:1002
 #, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:1012
+#: src/hello/hello.c:1010
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1031
+#: src/hello/hello.c:1025
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/hello/hello.c:1104
+#: src/hello/hello.c:1098
 #, c-format
 msgid "HELLO URI contained %u addresses, added %u addresses\n"
 msgstr ""
@@ -4836,7 +5045,7 @@
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1581
-#: src/transport/plugin_transport_http_client.c:1866
+#: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
@@ -4860,108 +5069,118 @@
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:143
+#: src/hostlist/gnunet-daemon-hostlist_server.c:165
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# bytes in der Datenbank"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:168
+#: src/hostlist/gnunet-daemon-hostlist_server.c:190
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:203
-#: src/hostlist/gnunet-daemon-hostlist_server.c:534
-#: src/peerinfo-tool/gnunet-peerinfo.c:361
-#: src/peerinfo-tool/gnunet-peerinfo.c:430
-#: src/peerinfo-tool/gnunet-peerinfo.c:501
-#: src/topology/gnunet-daemon-topology.c:925
+#: src/hostlist/gnunet-daemon-hostlist_server.c:225
+#: src/hostlist/gnunet-daemon-hostlist_server.c:535
+#: src/peerinfo-tool/gnunet-peerinfo.c:367
+#: src/peerinfo-tool/gnunet-peerinfo.c:452
+#: src/peerinfo-tool/gnunet-peerinfo.c:535
+#: src/topology/gnunet-daemon-topology.c:952
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:227
+#: src/hostlist/gnunet-daemon-hostlist_server.c:249
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:243
+#: src/hostlist/gnunet-daemon-hostlist_server.c:265
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:363
+#: src/hostlist/gnunet-daemon-hostlist_server.c:365
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:366
+#: src/hostlist/gnunet-daemon-hostlist_server.c:368
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:380
+#: src/hostlist/gnunet-daemon-hostlist_server.c:382
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:384
+#: src/hostlist/gnunet-daemon-hostlist_server.c:386
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:391
+#: src/hostlist/gnunet-daemon-hostlist_server.c:393
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:394
+#: src/hostlist/gnunet-daemon-hostlist_server.c:396
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:399
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:403
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:448
+#: src/hostlist/gnunet-daemon-hostlist_server.c:449
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:496
+#: src/hostlist/gnunet-daemon-hostlist_server.c:497
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:683
-#: src/peerinfo-tool/gnunet-peerinfo.c:650
-#: src/transport/gnunet-service-transport.c:1136
+#: src/hostlist/gnunet-daemon-hostlist_server.c:684
+#: src/peerinfo-tool/gnunet-peerinfo.c:696
+#: src/transport/gnunet-service-transport.c:1127
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:707
+#: src/hostlist/gnunet-daemon-hostlist_server.c:708
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:722
+#: src/hostlist/gnunet-daemon-hostlist_server.c:723
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:760
+#: src/hostlist/gnunet-daemon-hostlist_server.c:736
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr "`%s' ist nicht verfügbar."
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:749
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
+msgstr "`%s' ist nicht verfügbar."
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:770
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:780
+#: src/hostlist/gnunet-daemon-hostlist_server.c:790
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:820
+#: src/hostlist/gnunet-daemon-hostlist_server.c:830
 #, 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"
@@ -5068,7 +5287,7 @@
 msgid "No records found for `%s'"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:402
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -5078,7 +5297,7 @@
 msgid "You must specify which zone should be accessed\n"
 msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
 
-#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:783
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:844
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -5088,7 +5307,7 @@
 msgid "You must specify a name\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1020
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1084
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -5097,7 +5316,7 @@
 msgid "spezifies the public key of the zone to look in"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1055
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1116
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
@@ -5112,230 +5331,238 @@
 msgid "Failed to create indices\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/namestore/gnunet-namestore.c:308
+#: src/namestore/gnunet-namestore.c:303
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:337
+#: src/namestore/gnunet-namestore.c:332
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:344
+#: src/namestore/gnunet-namestore.c:339
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:567
+#: src/namestore/gnunet-namestore.c:477 src/namestore/gnunet-namestore.c:485
+#: src/namestore/gnunet-namestore.c:493
 #, c-format
+msgid "A %s record exists already under `%s', no other records can be added.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:507 src/namestore/gnunet-namestore.c:519
+#: src/namestore/gnunet-namestore.c:531
+#, c-format
+msgid "Records already exist under `%s', cannot add `%s' record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:628
+#, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:606
+#: src/namestore/gnunet-namestore.c:667
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:647
+#: src/namestore/gnunet-namestore.c:708
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:658
-#: src/namestore/gnunet-namestore-fcfsd.c:970
+#: src/namestore/gnunet-namestore.c:719
+#: src/namestore/gnunet-namestore-fcfsd.c:984
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/namestore/gnunet-namestore.c:666 src/namestore/gnunet-namestore.c:675
-#: src/namestore/gnunet-namestore.c:692 src/namestore/gnunet-namestore.c:714
-#: src/namestore/gnunet-namestore.c:754
+#: src/namestore/gnunet-namestore.c:727 src/namestore/gnunet-namestore.c:736
+#: src/namestore/gnunet-namestore.c:753 src/namestore/gnunet-namestore.c:775
+#: src/namestore/gnunet-namestore.c:815
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/namestore/gnunet-namestore.c:667 src/namestore/gnunet-namestore.c:676
-#: src/namestore/gnunet-namestore.c:693 src/namestore/gnunet-namestore.c:715
+#: src/namestore/gnunet-namestore.c:728 src/namestore/gnunet-namestore.c:737
+#: src/namestore/gnunet-namestore.c:754 src/namestore/gnunet-namestore.c:776
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:684
+#: src/namestore/gnunet-namestore.c:745
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/namestore/gnunet-namestore.c:704
+#: src/namestore/gnunet-namestore.c:765
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
 
-#: src/namestore/gnunet-namestore.c:740
+#: src/namestore/gnunet-namestore.c:801
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:755
+#: src/namestore/gnunet-namestore.c:816
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:803
-#: src/peerinfo-tool/gnunet-peerinfo.c:734
+#: src/namestore/gnunet-namestore.c:868
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:838
+#: src/namestore/gnunet-namestore.c:903
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:878
+#: src/namestore/gnunet-namestore.c:943
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:905
+#: src/namestore/gnunet-namestore.c:970
 #, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:941
+#: src/namestore/gnunet-namestore.c:1006
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/namestore/gnunet-namestore.c:953
+#: src/namestore/gnunet-namestore.c:1018
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore.c:1002
+#: src/namestore/gnunet-namestore.c:1066
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1005
+#: src/namestore/gnunet-namestore.c:1069
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1008
+#: src/namestore/gnunet-namestore.c:1072
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1011
+#: src/namestore/gnunet-namestore.c:1075
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1014
+#: src/namestore/gnunet-namestore.c:1078
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/namestore/gnunet-namestore.c:1017
+#: src/namestore/gnunet-namestore.c:1081
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/namestore/gnunet-namestore.c:1023
+#: src/namestore/gnunet-namestore.c:1087
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/namestore/gnunet-namestore.c:1026
+#: src/namestore/gnunet-namestore.c:1090
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1029
+#: src/namestore/gnunet-namestore.c:1093
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1032
+#: src/namestore/gnunet-namestore.c:1096
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1035
+#: src/namestore/gnunet-namestore.c:1099
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1038
-msgid "create record that is pending approval (and thus for now inactive)"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1041
+#: src/namestore/gnunet-namestore.c:1102
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1044
+#: src/namestore/gnunet-namestore.c:1105
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:464
+#: src/namestore/gnunet-namestore-fcfsd.c:478
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:491
+#: src/namestore/gnunet-namestore-fcfsd.c:505
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:525
+#: src/namestore/gnunet-namestore-fcfsd.c:539
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:534
+#: src/namestore/gnunet-namestore-fcfsd.c:548
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:596
+#: src/namestore/gnunet-namestore-fcfsd.c:610
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:652
+#: src/namestore/gnunet-namestore-fcfsd.c:666
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:668
+#: src/namestore/gnunet-namestore-fcfsd.c:682
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:704
+#: src/namestore/gnunet-namestore-fcfsd.c:718
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:712
+#: src/namestore/gnunet-namestore-fcfsd.c:726
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:910
+#: src/namestore/gnunet-namestore-fcfsd.c:924
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:936
+#: src/namestore/gnunet-namestore-fcfsd.c:950
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:978
+#: src/namestore/gnunet-namestore-fcfsd.c:992
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1011
+#: src/namestore/gnunet-namestore-fcfsd.c:1025
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
@@ -5357,66 +5584,58 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:175
-msgid "NAT traversal with ICMP Server timed out.\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:207
+#: src/nat/nat_auto.c:179
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:208
+#: src/nat/nat_auto.c:180
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:229
+#: src/nat/nat_auto.c:201
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/nat/nat_auto.c:284
+#: src/nat/nat_auto.c:249
 #, fuzzy, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Ungültiger RPC `%s' empfangen.\n"
 
-#: src/nat/nat_auto.c:362
+#: src/nat/nat_auto.c:327
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:378
+#: src/nat/nat_auto.c:343
 #, fuzzy, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
 
-#: src/nat/nat_auto.c:441
+#: src/nat/nat_auto.c:406
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:442
+#: src/nat/nat_auto.c:407
 #, fuzzy
 msgid "upnpc not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/nat/nat_auto.c:472
+#: src/nat/nat_auto.c:437
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:480
+#: src/nat/nat_auto.c:445 src/nat/nat_auto.c:490
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:488
+#: src/nat/nat_auto.c:453 src/nat/nat_auto.c:498
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:527
-msgid "gnunet-helper-nat-client found, enabling it\n"
+#: src/nat/nat_auto.c:483
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:528
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
-msgstr ""
-
 #: src/nat/nat.c:867
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
@@ -5462,6 +5681,88 @@
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
+#: src/nat/nat.c:1575
+msgid "Operation Successful"
+msgstr ""
+
+#: src/nat/nat.c:1577
+msgid "Internal Failure (IPC, ...)"
+msgstr ""
+
+#: src/nat/nat.c:1579
+msgid "Failure in network subsystem, check permissions."
+msgstr ""
+
+#: src/nat/nat.c:1581
+msgid "Encountered timeout while performing operation"
+msgstr ""
+
+#: src/nat/nat.c:1583
+msgid "detected that we are offline"
+msgstr ""
+
+#: src/nat/nat.c:1585
+#, fuzzy
+msgid "`upnpc` command not found"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/nat/nat.c:1587
+#, fuzzy
+msgid "Failed to run `upnpc` command"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/nat/nat.c:1589
+#, fuzzy
+msgid "`upnpc' command took too long, process killed"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/nat/nat.c:1591
+msgid "`upnpc' command failed to establish port mapping"
+msgstr ""
+
+#: src/nat/nat.c:1593
+#, fuzzy
+msgid "`external-ip' command not found"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/nat/nat.c:1595
+#, fuzzy
+msgid "Failed to run `external-ip` command"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/nat/nat.c:1597
+msgid "`external-ip' command output invalid"
+msgstr ""
+
+#: src/nat/nat.c:1599
+msgid "no valid address was returned by `external-ip'"
+msgstr ""
+
+#: src/nat/nat.c:1601
+#, fuzzy
+msgid "Could not determine interface with internal/local network address"
+msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
+
+#: src/nat/nat.c:1603
+msgid "No functioning gnunet-helper-nat-server installation found"
+msgstr ""
+
+#: src/nat/nat.c:1605
+msgid "NAT test could not be initialized"
+msgstr ""
+
+#: src/nat/nat.c:1607
+msgid "NAT test timeout reached"
+msgstr ""
+
+#: src/nat/nat.c:1609
+msgid "could not register NAT"
+msgstr ""
+
+#: src/nat/nat.c:1611
+msgid "No working gnunet-helper-nat-client installation found"
+msgstr ""
+
 #: src/nat/nat_mini.c:203
 msgid "`external-ip' command not found\n"
 msgstr ""
@@ -5470,17 +5771,17 @@
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:351
+#: src/nat/nat_test.c:360
 #, 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:423
+#: src/nat/nat_test.c:462
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_test.c:453
+#: src/nat/nat_test.c:497
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Fehler beim Starten der Collection.\n"
@@ -5508,10 +5809,6 @@
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:864 src/testbed/gnunet-testbed-profiler.c:306
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
 #: src/nse/gnunet-nse-profiler.c:867
 msgid "name of the file for writing the main results"
 msgstr ""
@@ -5530,7 +5827,7 @@
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
 #: src/nse/gnunet-service-nse.c:1517
-#: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248
+#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:248
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5550,11 +5847,11 @@
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:466
+#: src/peerinfo/gnunet-service-peerinfo.c:468
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:503
+#: src/peerinfo/gnunet-service-peerinfo.c:506
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5562,52 +5859,52 @@
 "Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
 "Datei wurde entfernt.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:653
+#: src/peerinfo/gnunet-service-peerinfo.c:662
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:658
+#: src/peerinfo/gnunet-service-peerinfo.c:668
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:994
+#: src/peerinfo/gnunet-service-peerinfo.c:1037
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1287
+#: src/peerinfo/gnunet-service-peerinfo.c:1358
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1298
+#: src/peerinfo/gnunet-service-peerinfo.c:1371
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:236
+#: src/peerinfo/peerinfo_api.c:237
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:356 src/sensor/sensor_api.c:519
+#: src/peerinfo/peerinfo_api.c:363
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/peerinfo/peerinfo_api.c:506
+#: src/peerinfo/peerinfo_api.c:519
 #, 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:547 src/peerinfo/peerinfo_api.c:566
-#: src/peerinfo/peerinfo_api.c:581 src/peerinfo/peerinfo_api.c:592
-#: src/peerinfo/peerinfo_api.c:603
+#: src/peerinfo/peerinfo_api.c:563 src/peerinfo/peerinfo_api.c:586
+#: src/peerinfo/peerinfo_api.c:603 src/peerinfo/peerinfo_api.c:616
+#: src/peerinfo/peerinfo_api.c:631
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
 
-#: src/peerinfo/peerinfo_api.c:678
+#: src/peerinfo/peerinfo_api.c:720
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
@@ -5617,146 +5914,206 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:233
+#: src/peerinfo-tool/gnunet-peerinfo.c:230
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:240
+#: src/peerinfo-tool/gnunet-peerinfo.c:237
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:282
+#: src/peerinfo-tool/gnunet-peerinfo.c:286
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:439
+#: src/peerinfo-tool/gnunet-peerinfo.c:462
 #, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:447
+#: src/peerinfo-tool/gnunet-peerinfo.c:471
 #, fuzzy, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr "ungültige `%s' Nachricht empfangen: %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:456
+#: src/peerinfo-tool/gnunet-peerinfo.c:483
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:469
+#: src/peerinfo-tool/gnunet-peerinfo.c:502
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:533
+#: src/peerinfo-tool/gnunet-peerinfo.c:570
 #, fuzzy, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fehler bei %s:%d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:644
+#: src/peerinfo-tool/gnunet-peerinfo.c:687
 #, fuzzy, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:665 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:718 src/util/gnunet-scrypt.c:224
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:756
+#: src/peerinfo-tool/gnunet-peerinfo.c:816
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:800
+#: src/peerinfo-tool/gnunet-peerinfo.c:865
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:803
+#: src/peerinfo-tool/gnunet-peerinfo.c:868
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:806
+#: src/peerinfo-tool/gnunet-peerinfo.c:871
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:809
+#: src/peerinfo-tool/gnunet-peerinfo.c:874
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:812
+#: src/peerinfo-tool/gnunet-peerinfo.c:877
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:815
+#: src/peerinfo-tool/gnunet-peerinfo.c:880
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:818
+#: src/peerinfo-tool/gnunet-peerinfo.c:883
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:821
+#: src/peerinfo-tool/gnunet-peerinfo.c:886
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:832
+#: src/peerinfo-tool/gnunet-peerinfo.c:900
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:128
+#: src/transport/gnunet-service-transport_plugins.c:127
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:133
+#: src/transport/gnunet-service-transport_plugins.c:132
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Teste Transport(e) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:165
+#: src/transport/gnunet-service-transport_plugins.c:164
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/peerstore/gnunet-peerstore.c:97
+#: src/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:486
+#: src/peerstore/gnunet-service-peerstore.c:343
 #, fuzzy
+msgid "Malformed iterate request.\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/peerstore/gnunet-service-peerstore.c:350
+msgid "Sub system not supplied in client iterate request.\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:399
+#, fuzzy
+msgid "Malformed store request from client\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/peerstore/gnunet-service-peerstore.c:407
+msgid "Full key not supplied in client store request\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:427
+#, fuzzy
+msgid "Failed to store requested value, sqlite database error."
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/peerstore/gnunet-service-peerstore.c:509
+msgid "No database backend configured\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:520
+#, fuzzy, c-format
+msgid "Could not load database backend `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/peerstore/peerstore_api.c:299 src/sensor/sensor_api.c:179
+#, c-format
+msgid "Received an error notification from MQ of type: %d\n"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:370
+msgid "Iteration canceled due to reconnection."
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:635
+#, fuzzy
+msgid "Unexpected iteration response, this should not happen.\n"
+msgstr "Ausgabeformat ist unbekannt, dies sollte nicht passieren.\n"
+
+#: src/peerstore/peerstore_api.c:646
+#, fuzzy
 msgid "Error communicating with `PEERSTORE' service."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/peerstore/peerstore_api.c:503
+#: src/peerstore/peerstore_api.c:665
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:352
-#: src/psycstore/plugin_psycstore_sqlite.c:276
+#: src/peerstore/peerstore_api.c:804
+msgid ""
+"Problem receiving a watch response, no way to determine which request.\n"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:815
+msgid "Received a watch result for a non existing watch.\n"
+msgstr ""
+
+#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/psycstore/plugin_psycstore_sqlite.c:286
 #, fuzzy, c-format
 msgid ""
 "Error executing SQL query: %s\n"
 "  %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:377
-#: src/psycstore/plugin_psycstore_sqlite.c:253
+#: src/peerstore/plugin_peerstore_sqlite.c:401
+#: src/psycstore/plugin_psycstore_sqlite.c:263
 #, fuzzy, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
 "  %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
+#: src/peerstore/plugin_peerstore_sqlite.c:483
+#, fuzzy, c-format
+msgid "Unable to create indices: %s.\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
 #: src/postgres/postgres.c:59
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
@@ -5767,84 +6124,84 @@
 msgid "Unable to initialize Postgres: %s"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:200
+#: src/psycstore/gnunet-service-psycstore.c:260
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:224
+#: src/psycstore/gnunet-service-psycstore.c:284
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:246
+#: src/psycstore/gnunet-service-psycstore.c:306
 #, fuzzy
 msgid "Failed to store fragment!\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:272
+#: src/psycstore/gnunet-service-psycstore.c:362
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:299
+#: src/psycstore/gnunet-service-psycstore.c:402
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:328
+#: src/psycstore/gnunet-service-psycstore.c:433
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:356
+#: src/psycstore/gnunet-service-psycstore.c:461
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:392
-#: src/psycstore/gnunet-service-psycstore.c:465
+#: src/psycstore/gnunet-service-psycstore.c:497
+#: src/psycstore/gnunet-service-psycstore.c:570
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:408
+#: src/psycstore/gnunet-service-psycstore.c:513
 #, fuzzy
 msgid "Failed to begin modifying state!\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:431
+#: src/psycstore/gnunet-service-psycstore.c:536
 #, fuzzy, c-format
 msgid "Unknown operator: %c\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:441
+#: src/psycstore/gnunet-service-psycstore.c:546
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:479
+#: src/psycstore/gnunet-service-psycstore.c:584
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:495
+#: src/psycstore/gnunet-service-psycstore.c:600
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:515
-#: src/psycstore/gnunet-service-psycstore.c:534
+#: src/psycstore/gnunet-service-psycstore.c:620
+#: src/psycstore/gnunet-service-psycstore.c:639
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:557
-#: src/psycstore/gnunet-service-psycstore.c:608
+#: src/psycstore/gnunet-service-psycstore.c:662
+#: src/psycstore/gnunet-service-psycstore.c:713
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:584
-#: src/psycstore/gnunet-service-psycstore.c:623
+#: src/psycstore/gnunet-service-psycstore.c:689
+#: src/psycstore/gnunet-service-psycstore.c:728
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
@@ -5854,7 +6211,7 @@
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1796
+#: src/psycstore/plugin_psycstore_sqlite.c:1933
 #, fuzzy
 msgid "SQLite database running\n"
 msgstr "sqlite Datenspeicher"
@@ -6117,334 +6474,348 @@
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:272
-msgid "Duplicate revocation received from peer. Ignored.\n"
-msgstr ""
-
-#: src/revocation/gnunet-service-revocation.c:434
+#: src/revocation/gnunet-service-revocation.c:433
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:486
+#: src/revocation/gnunet-service-revocation.c:483
+#: src/revocation/gnunet-service-revocation.c:730
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:812
+#: src/revocation/gnunet-service-revocation.c:822
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:224
+#: src/rps/gnunet-rps.c:67
+msgid "rps"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:222
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:231
+#: src/scalarproduct/gnunet-scalarproduct.c:229
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:238
-msgid "Please give a session key for --input_key!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:250
+#: src/scalarproduct/gnunet-scalarproduct.c:242
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:261
+#: src/scalarproduct/gnunet-scalarproduct.c:253
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:283
+#: src/scalarproduct/gnunet-scalarproduct.c:275
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:296
+#: src/scalarproduct/gnunet-scalarproduct.c:294
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:345
+#: src/scalarproduct/gnunet-scalarproduct.c:344
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:347
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:350
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:360
+#: src/scalarproduct/gnunet-scalarproduct.c:359
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:678
-#, fuzzy, c-format
-msgid "Client %p disconnected from us.\n"
-msgstr "`%s' hat sich mit `%s' verbunden.\n"
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1418
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1529
+#, fuzzy
+msgid "Connect to CADET failed\n"
+msgstr " Verbindung fehlgeschlagen (Bug?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:748
-#, fuzzy, c-format
-msgid "Could not send message to client (%p)!\n"
-msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+msgid "dkg start delay"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:759
-#, c-format
-msgid "Sending session-end notification to client (%p) for session %s\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+msgid "dkg timeout"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:781
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1459
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+msgid "threshold"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "also profile decryption"
+msgstr ""
+
+#: src/sensordashboard/gnunet-service-sensordashboard.c:353
 #, fuzzy, c-format
-msgid "Successfully created new channel to peer (%s)!\n"
-msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
+msgid "Error trying to send a message to peer `%s'.\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:818
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1469
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1539
+#: src/sensor/gnunet-sensor.c:162
 #, fuzzy
-msgid "Transmitting service request.\n"
-msgstr "Collection `%s' begonnen.\n"
+msgid "Retrieve information about all defined sensors"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:830
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
+#: src/sensor/gnunet-sensor.c:165
 #, fuzzy
-msgid "Could not send message to channel!\n"
-msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+msgid "Retrieve information about a single sensor"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:891
-#: src/scalarproduct/gnunet-service-scalarproduct.c:991
-#, fuzzy
-msgid "Could not send service-response message via cadet!)\n"
-msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+#: src/sensor/gnunet-sensor.c:168
+msgid "Force an anomaly on a sensor, use only for testing"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1442
-#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
+#: src/sensor/gnunet-sensor.c:175
+msgid "sensor"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1550
+#: src/sensor/gnunet-sensor-profiler.c:728
+msgid "Invalid or missing number of peers. Set at least 2 peers.\n"
+msgstr ""
+
+#: src/sensor/gnunet-sensor-profiler.c:735
 #, fuzzy
-msgid "Could not send service-request multipart message to channel!\n"
-msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+msgid "Missing or invalid topology file.\n"
+msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1579
-#, c-format
-msgid ""
-"Got client-responder-session with key %s and a matching service-request-"
-"session set, processing.\n"
-msgstr ""
+#: src/sensor/gnunet-sensor-profiler.c:781
+#, fuzzy
+msgid "Number of peers to run"
+msgstr "Anzahl an Durchläufen"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1601
-#, c-format
-msgid ""
-"Got client-responder-session with key %s but NO matching service-request-"
-"session set, queuing element for later use.\n"
+#: src/sensor/gnunet-sensor-profiler.c:783
+msgid "Path to topology file"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1618
-#, c-format
-msgid "Creating new channel for session with key %s.\n"
+#: src/sensor/gnunet-sensor-profiler.c:786
+msgid "Change the interval of running sensors to given value"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1777
-#, c-format
-msgid ""
-"Duplicate session information received, can not create new session with key `"
-"%s'\n"
-msgstr ""
+#: src/sensor/gnunet-sensor-profiler.c:789
+#, fuzzy
+msgid "Number of peers to simulate anomalies on"
+msgstr "Anzahl an Durchläufen"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1862
+#: src/sensor/gnunet-sensor-profiler.c:796
+#, fuzzy
+msgid "Profiler for sensor service"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:202
+#, fuzzy
+msgid "Received an invalid sensor value."
+msgstr "Ungültige Anfrage `%s' empfangen (falsche Tabelle)\n"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:293
+#, fuzzy
+msgid "Analysis model not defined in configuration.\n"
+msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:302
 #, fuzzy, c-format
-msgid "New incoming channel from peer %s.\n"
-msgstr "`%s' hat sich mit `%s' verbunden.\n"
+msgid "Could not load analysis model `%s'.\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
+#: src/sensor/gnunet-service-sensor_analysis.c:310
+#, fuzzy
+msgid "Could not connect to peerstore service.\n"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:233
+#, fuzzy
+msgid "Unknown value type expected by sensor, this should not happen.\n"
+msgstr "Ausgabeformat ist unbekannt, dies sollte nicht passieren.\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:268
+#, fuzzy, c-format
+msgid "Received an invalid value for sensor `%s': %s\n"
+msgstr ""
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"angeben, in dem FS Daten gespeichert werden.\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:345
 #, c-format
-msgid "Peer disconnected, terminating session %s with peer (%s)\n"
+msgid "Sensor `%s': External process should not be a path, disabling sensor.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2270
+#: src/sensor/gnunet-service-sensor_monitoring.c:368
 #, c-format
 msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
+"Sensor `%s' process `%s' problem: binary doesn't exist or not executable\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2297
+#: src/sensor/gnunet-service-sensor_monitoring.c:416
 #, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid "Sensor `%s' execution task already set, this should not happen\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2318
+#: src/sensor/gnunet-service-sensor_reporting.c:828
+#, fuzzy
+msgid "Double creation of proof-of-work, this should not happen.\n"
+msgstr "Ausgabeformat ist unbekannt, dies sollte nicht passieren.\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:834
+#, fuzzy
+msgid "Failed to create pow and signature block.\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:1044
 #, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid "PEERSTORE error: %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2565
-msgid "Shutting down, initiating cleanup.\n"
+#: src/sensor/gnunet-service-sensor_reporting.c:1149
+#: src/sensor/gnunet-service-sensor_reporting.c:1407
+#, fuzzy
+msgid "Failed to connect to CORE service.\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:1156
+msgid "Peer identity received from CORE init doesn't match ours.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2659
+#: src/sensor/gnunet-service-sensor_reporting.c:1396
 #, fuzzy
-msgid "Connect to CADET failed\n"
-msgstr " Verbindung fehlgeschlagen (Bug?)\n"
+msgid "Failed to connect to peerstore service.\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2664
+#: src/sensor/gnunet-service-sensor_reporting.c:1417
+#: src/sensor/gnunet-service-sensor_update.c:781
 #, fuzzy
-msgid "CADET initialized\n"
-msgstr " Verbindung fehlgeschlagen\n"
+msgid "Failed to connect to CADET service.\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
-msgid "dkg start delay"
+#: src/sensor/gnunet-service-sensor_reporting.c:1424
+#, fuzzy
+msgid "Failed to load my private key.\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/sensor/gnunet-service-sensor_update.c:327
+#, c-format
+msgid "Error trying to send a message to update point `%s'.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
-msgid "dkg timeout"
+#: src/sensor/gnunet-service-sensor_update.c:418
+#, fuzzy, c-format
+msgid "Failed to connect to update point `%s'.\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/sensor/plugin_sensor_model_gaussian.c:203
+msgid "Missing `TRAINING_WINDOW' value in configuration.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
-msgid "threshold"
+#: src/sensor/plugin_sensor_model_gaussian.c:221
+msgid "Missing `CONFIDENCE_INTERVAL' value in configuration.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
-msgid "also profile decryption"
+#: src/sensor/plugin_sensor_model_gaussian.c:229
+msgid "Missing `WEIGHT_INC' value in configuration.\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor.c:148
+#: src/sensor/sensor_api.c:296
 #, fuzzy
-msgid "Retrieve information about all defined sensors"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
+msgid "Iterate request canceled due to disconnection.\n"
+msgstr "# Knotenankündigungen empfangen"
 
-#: src/sensor/gnunet-sensor.c:151
-#, fuzzy
-msgid "Retrieve information about a single sensor"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/sensor/gnunet-sensor.c:160
-msgid "sensor"
+#: src/sensor/sensor_api.c:307
+msgid "Force anomaly request canceled due to disconnection.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:367
+#: src/sensor/sensor_api.c:374
 #, fuzzy
+msgid "Timeout transmitting iteration request to `SENSOR' service."
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/sensor/sensor_util_lib.c:107
+#, fuzzy
 msgid "Error reading sensor version\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/sensor/gnunet-service-sensor.c:373
+#: src/sensor/sensor_util_lib.c:116
 msgid "Invalid sensor version number, format should be major.minor\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:385
+#: src/sensor/sensor_util_lib.c:131
 #, fuzzy
 msgid "Error reading sensor category\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/sensor/gnunet-service-sensor.c:413
+#: src/sensor/sensor_util_lib.c:164
 #, fuzzy
 msgid "Error reading sensor run interval\n"
 msgstr "Hostkey wurde erfolgreich erzeugt.\n"
 
-#: src/sensor/gnunet-service-sensor.c:419
-#, c-format
-msgid "Sensor run interval too low (%<PRIu64> < %d)\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor.c:436
+#: src/sensor/sensor_util_lib.c:191
 #, fuzzy
 msgid "Error reading sensor source\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/sensor/gnunet-service-sensor.c:445
+#: src/sensor/sensor_util_lib.c:206
 msgid "Error reading sensor gnunet-statistics source information\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:455
+#: src/sensor/sensor_util_lib.c:218
 #, fuzzy
 msgid "Error reading sensor process name\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/sensor/gnunet-service-sensor.c:464
+#: src/sensor/sensor_util_lib.c:233
 msgid "Error reading sensor expected datatype\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:470
+#: src/sensor/sensor_util_lib.c:241
 msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:498
+#: src/sensor/sensor_util_lib.c:299
 #, fuzzy, c-format
 msgid "Failed to access sensor file: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/sensor/gnunet-service-sensor.c:506
+#: src/sensor/sensor_util_lib.c:308
 #, fuzzy, c-format
 msgid "Failed to load sensor definition: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/sensor/gnunet-service-sensor.c:559
+#: src/sensor/sensor_util_lib.c:370
 #, c-format
 msgid "Sensor `%s' already exists with same or newer version\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:566
-#, c-format
-msgid "Upgrading sensor `%s' to a newer version\n"
+#: src/sensor/sensor_util_lib.c:387
+#, fuzzy, c-format
+msgid "Error adding new sensor `%s' to global hashmap.\n"
 msgstr ""
+"\n"
+"Fehler beim Uploaden der Datei: %s\n"
 
-#: src/sensor/gnunet-service-sensor.c:571
-#, c-format
-msgid ""
-"Error adding new sensor `%s' to global hashmap, this should not happen\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor.c:595
+#: src/sensor/sensor_util_lib.c:412
 #, fuzzy, c-format
 msgid "Error loading sensor from file: %s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/sensor/gnunet-service-sensor.c:599
-#, c-format
-msgid "Sensor `%s' added to global hashmap\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor.c:635
-#, fuzzy, c-format
-msgid "Reloading sensor definitions from directory `%s'\n"
-msgstr "Dateien aus dem GNUnet herunterladen."
-
-#: src/sensor/gnunet-service-sensor.c:640
-#, fuzzy, c-format
-msgid "Loaded %d sensors from directory `%s'\n"
-msgstr "Dateien aus dem GNUnet herunterladen."
-
-#: src/sensor/sensor_api.c:345
+#: src/set/gnunet-service-set.c:1529
 #, fuzzy
-msgid "Timeout transmitting iteration request to `SENSOR' service."
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
-#: src/sensor/sensor_api.c:388
-#, fuzzy
-msgid "Failed to receive response from `SENSOR' service."
-msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
-
-#: src/sensor/sensor_api.c:431
-#, fuzzy
-msgid "Received invalid message from `SENSOR' service."
-msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
-
-#: src/set/gnunet-service-set.c:1431
-#, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
@@ -6470,7 +6841,7 @@
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:295
+#: src/set/gnunet-set-profiler.c:298
 msgid "oeration to execute"
 msgstr ""
 
@@ -6594,37 +6965,37 @@
 msgid "Invalid topology: %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/testbed/generate-underlay-topology.c:252
+#: src/testbed/generate-underlay-topology.c:253
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:258
+#: src/testbed/generate-underlay-topology.c:259
 #, fuzzy, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/testbed/generate-underlay-topology.c:266
+#: src/testbed/generate-underlay-topology.c:267
 #, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:280
+#: src/testbed/generate-underlay-topology.c:281
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:286
+#: src/testbed/generate-underlay-topology.c:287
 #, fuzzy, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Ungültiger Parameter für `%s' bei %s:%d.\n"
 
-#: src/testbed/generate-underlay-topology.c:335
+#: src/testbed/generate-underlay-topology.c:336
 #: src/testbed/gnunet-testbed-profiler.c:293
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:344
+#: src/testbed/generate-underlay-topology.c:345
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6648,7 +7019,7 @@
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:331
+#: src/testbed/gnunet-daemon-latency-logger.c:333
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
@@ -6659,7 +7030,7 @@
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:235 src/testing/list-keys.c:50
-#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
+#: src/testing/testing.c:293 src/util/gnunet-ecc.c:295
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6700,11 +7071,6 @@
 msgid "Spawning process `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:267
-#, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
-
 #: src/testbed/gnunet-testbed-profiler.c:296
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
@@ -6956,66 +7322,67 @@
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:255
+#: src/topology/gnunet-daemon-topology.c:265
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:388
+#: src/topology/gnunet-daemon-topology.c:406
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:728
-#: src/topology/gnunet-daemon-topology.c:813
+#: src/topology/gnunet-daemon-topology.c:756
+#: src/topology/gnunet-daemon-topology.c:840
 #, fuzzy
 msgid "# friends connected"
 msgstr "# verbundener Knoten"
 
-#: src/topology/gnunet-daemon-topology.c:993
+#: src/topology/gnunet-daemon-topology.c:1020
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1022
+#: src/topology/gnunet-daemon-topology.c:1049
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1029
+#: src/topology/gnunet-daemon-topology.c:1056
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1050
+#: src/topology/gnunet-daemon-topology.c:1077
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1052
+#: src/topology/gnunet-daemon-topology.c:1079
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1057
+#: src/topology/gnunet-daemon-topology.c:1084
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1063
+#: src/topology/gnunet-daemon-topology.c:1090
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1094
+#: src/topology/gnunet-daemon-topology.c:1121
+#: src/transport/plugin_transport_wlan.c:1444
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1151
+#: src/topology/gnunet-daemon-topology.c:1178
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/topology/gnunet-daemon-topology.c:1296
+#: src/topology/gnunet-daemon-topology.c:1323
 msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
@@ -7029,8 +7396,8 @@
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:464
-#: src/transport/gnunet-service-transport_blacklist.c:745
+#: src/transport/gnunet-service-transport_blacklist.c:465
+#: src/transport/gnunet-service-transport_blacklist.c:748
 msgid "# disconnects due to blacklist"
 msgstr ""
 
@@ -7056,63 +7423,63 @@
 "Es konnte keine IP für das Gerät `%s' unter Verwendung von `%s' ermittelt "
 "werden.\n"
 
-#: src/transport/gnunet-service-transport.c:755
+#: src/transport/gnunet-service-transport.c:757
 #, c-format
 msgid ""
 "Address or session unknown: failed to update properties for peer `%s' plugin "
 "`%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1106
+#: src/transport/gnunet-service-transport.c:1094
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/transport/gnunet-service-transport_clients.c:432
+#: src/transport/gnunet-service-transport_clients.c:463
 #, 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:439
+#: src/transport/gnunet-service-transport_clients.c:470
 #, fuzzy
 msgid "# messages dropped due to slow client"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_clients.c:596
+#: src/transport/gnunet-service-transport_clients.c:630
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:737
+#: src/transport/gnunet-service-transport_clients.c:771
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:770
+#: src/transport/gnunet-service-transport_clients.c:804
 #, fuzzy, c-format
 msgid "Blacklist refuses connection attempt to peer `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-service-transport_clients.c:776
+#: src/transport/gnunet-service-transport_clients.c:810
 #, fuzzy, c-format
 msgid "Blacklist allows connection attempt to peer `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-service-transport_clients.c:801
+#: src/transport/gnunet-service-transport_clients.c:836
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_clients.c:815
+#: src/transport/gnunet-service-transport_clients.c:850
 #, fuzzy, c-format
 msgid "Received a request connect message for peer `%s'\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/transport/gnunet-service-transport_clients.c:826
+#: src/transport/gnunet-service-transport_clients.c:861
 #, fuzzy
 msgid "# REQUEST DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_clients.c:840
+#: src/transport/gnunet-service-transport_clients.c:875
 #, fuzzy, c-format
 msgid "Received a request disconnect message for peer `%s'\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
@@ -7197,171 +7564,171 @@
 
 #: src/transport/gnunet-service-transport_neighbours.c:1685
 #, fuzzy, c-format
-msgid ""
-"Failed to send CONNECT message to peer `%s' using address `%s' session %p\n"
+msgid "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1712
-msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
-msgstr ""
+#, fuzzy
+msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1757
 #, fuzzy
-msgid "# SESSION_CONNECT messages sent"
+msgid "# SYN messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1773
 #, fuzzy, c-format
-msgid "Failed to transmit CONNECT message via plugin to %s\n"
+msgid "Failed to transmit SYN message via plugin to %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1800
-msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
-msgstr ""
+#, fuzzy
+msgid "# Failed attempts to switch addresses (failed to send SYN)"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1849
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Failed to send CONNECT_ACK message to peer `%s' using address `%s' session "
-"%p\n"
-msgstr ""
+"Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1904
 #, fuzzy
-msgid "# CONNECT_ACK messages sent"
+msgid "# SYN_ACK messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1919
 #, fuzzy, c-format
-msgid "Failed to transmit CONNECT_ACK message via plugin to %s\n"
+msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2196
+#: src/transport/gnunet-service-transport_neighbours.c:2199
 #, fuzzy, c-format
 msgid "Blacklisting disapproved to connect to peer `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2316
+#: src/transport/gnunet-service-transport_neighbours.c:2324
 #, fuzzy
-msgid "# CONNECT messages received"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
+msgid "# SYN messages received"
+msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2321
+#: src/transport/gnunet-service-transport_neighbours.c:2329
 #, c-format
-msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
+msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2594
+#: src/transport/gnunet-service-transport_neighbours.c:2626
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3016
+#: src/transport/gnunet-service-transport_neighbours.c:3047
 #, fuzzy
 msgid "# Failed attempts to switch addresses (no response)"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3111
+#: src/transport/gnunet-service-transport_neighbours.c:3142
 #, fuzzy
-msgid "# CONNECT_ACK messages received"
+msgid "# SYN_ACK messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3119
+#: src/transport/gnunet-service-transport_neighbours.c:3150
 #, fuzzy
-msgid "# unexpected CONNECT_ACK messages (no peer)"
+msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3133
-#: src/transport/gnunet-service-transport_neighbours.c:3168
+#: src/transport/gnunet-service-transport_neighbours.c:3164
+#: src/transport/gnunet-service-transport_neighbours.c:3199
 #, fuzzy
-msgid "# unexpected CONNECT_ACK messages (not ready)"
+msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3180
+#: src/transport/gnunet-service-transport_neighbours.c:3211
 #, fuzzy
-msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
+msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3203
+#: src/transport/gnunet-service-transport_neighbours.c:3234
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3211
+#: src/transport/gnunet-service-transport_neighbours.c:3242
 #, fuzzy
-msgid "# unexpected CONNECT_ACK messages (disconnecting)"
+msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3399
+#: src/transport/gnunet-service-transport_neighbours.c:3441
 #, fuzzy
-msgid "# SESSION_ACK messages received"
+msgid "# ACK messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3435
+#: src/transport/gnunet-service-transport_neighbours.c:3477
 #, fuzzy
-msgid "# unexpected SESSION_ACK messages"
+msgid "# unexpected ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3509
+#: src/transport/gnunet-service-transport_neighbours.c:3551
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3524
+#: src/transport/gnunet-service-transport_neighbours.c:3566
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3564
+#: src/transport/gnunet-service-transport_neighbours.c:3611
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3570
+#: src/transport/gnunet-service-transport_neighbours.c:3617
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3579
+#: src/transport/gnunet-service-transport_neighbours.c:3626
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3706
+#: src/transport/gnunet-service-transport_neighbours.c:3753
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_plugins.c:120
+#: src/transport/gnunet-service-transport_plugins.c:119
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:178
-#: src/transport/gnunet-service-transport_plugins.c:186
-#: src/transport/gnunet-service-transport_plugins.c:194
-#: src/transport/gnunet-service-transport_plugins.c:202
-#: src/transport/gnunet-service-transport_plugins.c:210
-#: src/transport/gnunet-service-transport_plugins.c:218
-#: src/transport/gnunet-service-transport_plugins.c:226
-#: src/transport/gnunet-service-transport_plugins.c:234
-#: src/transport/gnunet-service-transport_plugins.c:242
-#: src/transport/gnunet-service-transport_plugins.c:250
-#: src/transport/gnunet-service-transport_plugins.c:258
+#: src/transport/gnunet-service-transport_plugins.c:177
+#: src/transport/gnunet-service-transport_plugins.c:185
+#: src/transport/gnunet-service-transport_plugins.c:193
+#: src/transport/gnunet-service-transport_plugins.c:201
+#: src/transport/gnunet-service-transport_plugins.c:209
+#: src/transport/gnunet-service-transport_plugins.c:217
+#: src/transport/gnunet-service-transport_plugins.c:225
+#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
+#: src/transport/gnunet-service-transport_plugins.c:249
+#: src/transport/gnunet-service-transport_plugins.c:257
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:265
+#: src/transport/gnunet-service-transport_plugins.c:264
 #, fuzzy, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Fehler beim Laden des Plugins `%s' bei %s:%d. Plugin wird entladen.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:488
+#: src/transport/gnunet-service-transport_validation.c:493
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:558
+#: src/transport/gnunet-service-transport_validation.c:563
 #, 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:616
+#: src/transport/gnunet-service-transport_validation.c:624
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
@@ -7418,80 +7785,88 @@
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1356
+#: src/transport/gnunet-service-transport_validation.c:1387
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1371
+#: src/transport/gnunet-service-transport_validation.c:1402
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1493
+#: src/transport/gnunet-service-transport_validation.c:1526
 #, fuzzy, c-format
 msgid "Validation received new %s message for peer `%s' with size %u\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1500
+#: src/transport/gnunet-service-transport_validation.c:1533
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/transport/gnunet-transport.c:388
+#: src/transport/gnunet-transport.c:573
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:396
+#: src/transport/gnunet-transport.c:582
+#: src/transport/gnunet-transport-profiler.c:274
 #, fuzzy, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/transport/gnunet-transport.c:436
+#: src/transport/gnunet-transport.c:614
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:449
+#: src/transport/gnunet-transport.c:629
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transport/gnunet-transport.c:459
+#: src/transport/gnunet-transport.c:641
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/transport/gnunet-transport.c:483
+#: src/transport/gnunet-transport.c:668 src/transport/gnunet-transport.c:698
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/transport/gnunet-transport.c:487
+#: src/transport/gnunet-transport.c:673
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/transport/gnunet-transport.c:491
+#: src/transport/gnunet-transport.c:678
 #, fuzzy, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/transport/gnunet-transport.c:495
+#: src/transport/gnunet-transport.c:683
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/gnunet-transport.c:499
+#: src/transport/gnunet-transport.c:688
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:614
+#: src/transport/gnunet-transport.c:704
 #, fuzzy, c-format
+msgid "Configuration for plugin `%s' is working!\n"
+msgstr ""
+"Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
+"angeben, in dem FS Daten gespeichert werden.\n"
+
+#: src/transport/gnunet-transport.c:823
+#, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
 "\t%s%s\n"
@@ -7499,394 +7874,448 @@
 "\t%s%s\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:643
+#: src/transport/gnunet-transport.c:859
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:717 src/transport/gnunet-transport.c:1240
+#: src/transport/gnunet-transport.c:958 src/transport/gnunet-transport.c:1707
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:784
+#: src/transport/gnunet-transport.c:1026
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:798
+#: src/transport/gnunet-transport.c:1040
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:823
+#: src/transport/gnunet-transport.c:1065
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/gnunet-transport.c:866
+#: src/transport/gnunet-transport.c:1111
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:888
+#: src/transport/gnunet-transport.c:1134
+#: src/transport/gnunet-transport-profiler.c:406
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:912
+#: src/transport/gnunet-transport.c:1158
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:943
+#: src/transport/gnunet-transport.c:1191
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:966
+#: src/transport/gnunet-transport.c:1214
+#: src/transport/gnunet-transport-profiler.c:434
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:988 src/transport/gnunet-transport.c:1009
+#: src/transport/gnunet-transport.c:1239 src/transport/gnunet-transport.c:1265
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:989
+#: src/transport/gnunet-transport.c:1241
 #, fuzzy
 msgid "Connected to"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:1010
+#: src/transport/gnunet-transport.c:1267
 #, fuzzy
 msgid "Disconnected from"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:1031
+#: src/transport/gnunet-transport.c:1291
+#: src/transport/gnunet-transport-profiler.c:458
 #, fuzzy, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/transport/gnunet-transport.c:1061
+#: src/transport/gnunet-transport.c:1323
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1072
+#: src/transport/gnunet-transport.c:1335
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:1300 src/transport/gnunet-transport.c:1325
+#: src/transport/gnunet-transport.c:1792
+#: src/transport/gnunet-transport-profiler.c:492
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:1369
+#: src/transport/gnunet-transport.c:1829
+#, fuzzy
+msgid "Failed to send disconnect request to transport service\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#: src/transport/gnunet-transport.c:1875
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
-"%s, %s\n"
+"%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1377
+#: src/transport/gnunet-transport.c:1883
 #, c-format
 msgid ""
-"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
+"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1396 src/transport/gnunet-transport.c:1426
-#: src/transport/gnunet-transport.c:1456 src/transport/gnunet-transport.c:1479
-#: src/transport/gnunet-transport.c:1523
+#: src/transport/gnunet-transport.c:1902 src/transport/gnunet-transport.c:1932
+#: src/transport/gnunet-transport.c:1964 src/transport/gnunet-transport.c:1990
+#: src/transport/gnunet-transport.c:2046
+#: src/transport/gnunet-transport-profiler.c:578
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:1405 src/transport/gnunet-transport.c:1435
-#: src/transport/gnunet-transport.c:1465
+#: src/transport/gnunet-transport.c:1911 src/transport/gnunet-transport.c:1941
+#: src/transport/gnunet-transport.c:1975
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/gnunet-transport.c:1484
+#: src/transport/gnunet-transport.c:1995
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1569
+#: src/transport/gnunet-transport.c:2094
 #, fuzzy
-msgid "print information for all peers (instead of only connected peers )"
+msgid "print information for all peers (instead of only connected peers)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1572
+#: src/transport/gnunet-transport.c:2097
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1575
+#: src/transport/gnunet-transport.c:2100
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:1578
+#: src/transport/gnunet-transport.c:2103
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:1581
+#: src/transport/gnunet-transport.c:2106
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1584
+#: src/transport/gnunet-transport.c:2109
 #, fuzzy
-msgid "print information for all pending validations continously"
+msgid "print information for all pending validations continuously"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1587
+#: src/transport/gnunet-transport.c:2112
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1593
+#: src/transport/gnunet-transport.c:2118
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1595
+#: src/transport/gnunet-transport.c:2121
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:1597
+#: src/transport/gnunet-transport.c:2124
+#: src/transport/gnunet-transport-profiler.c:638
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1599
+#: src/transport/gnunet-transport.c:2127
+msgid "monitor plugin sessions"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:2130
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1602
+#: src/transport/gnunet-transport.c:2133
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1611
+#: src/transport/gnunet-transport.c:2144
+#: src/transport/gnunet-transport-profiler.c:649
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_bluetooth.c:621
-msgid "# Bluetooth ACKs sent"
+#: src/transport/gnunet-transport-profiler.c:218
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:640
-#, fuzzy
-msgid "# Bluetooth messages defragmented"
-msgstr "# defragmentierter Nachrichten"
+#: src/transport/gnunet-transport-profiler.c:254
+#, c-format
+msgid "%u;%u;%llu;%llu;%.2f;%.2f"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:686
-#: src/transport/plugin_transport_bluetooth.c:737
-#: src/transport/plugin_transport_bluetooth.c:1942
-#, fuzzy
-msgid "# Bluetooth sessions allocated"
-msgstr "# Sitzungsschlüssel akzeptiert"
+#: src/transport/gnunet-transport-profiler.c:263
+#, c-format
+msgid ";%llu;%.2f"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:837
-#, fuzzy
-msgid "# Bluetooth message fragments sent"
-msgstr "# fragmentierter Nachrichten"
+#: src/transport/gnunet-transport-profiler.c:280
+msgid "\n"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:861
-msgid "# Bluetooth messages pending (with fragmentation)"
+#: src/transport/gnunet-transport-profiler.c:332
+msgid "."
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:969
-#: src/transport/plugin_transport_bluetooth.c:1054
-#: src/transport/plugin_transport_bluetooth.c:1944
-#, fuzzy
-msgid "# Bluetooth MAC endpoints allocated"
-msgstr "# Client Trace-Anfragen empfangen"
+#: src/transport/gnunet-transport-profiler.c:352
+#, c-format
+msgid ""
+"\n"
+"Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1307
+#: src/transport/gnunet-transport-profiler.c:400
+#, fuzzy, c-format
+msgid "Connected to different peer `%s'\n"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#: src/transport/gnunet-transport-profiler.c:483
+#, fuzzy, c-format
+msgid "Retrying to connect to `%s'\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/transport/gnunet-transport-profiler.c:508
+#, fuzzy, c-format
+msgid "Denying connection to `%s'\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/transport/gnunet-transport-profiler.c:537
 #, fuzzy
-msgid "# HELLO messages received via Bluetooth"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
+msgid "Message size too big!\n"
+msgstr "Nachrichtengröße"
 
-#: src/transport/plugin_transport_bluetooth.c:1331
+#: src/transport/gnunet-transport-profiler.c:543
 #, fuzzy
-msgid "# fragments received via Bluetooth"
-msgstr "# verworfener Nachrichten"
+msgid "No peer identity given\n"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/plugin_transport_bluetooth.c:1341
+#: src/transport/gnunet-transport-profiler.c:558
+#, fuzzy, c-format
+msgid "Trying to send %u messages with size %u to peer `%s'\n"
+msgstr "Verwende %u Nachrichten der Größe %u %umal.\n"
+
+#: src/transport/gnunet-transport-profiler.c:564
+#, fuzzy, c-format
+msgid "Trying to receive messages from peer `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/transport/gnunet-transport-profiler.c:569
 #, fuzzy
-msgid "# ACKs received via Bluetooth"
-msgstr "# Bytes empfangen über TCP"
+msgid "No operation given\n"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/plugin_transport_bluetooth.c:1401
+#: src/transport/gnunet-transport-profiler.c:623
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:626
 #, fuzzy
-msgid "# Bluetooth DATA messages discarded due to CRC32 error"
-msgstr "# defragmentierter Nachrichten"
+msgid "receive data from peer"
+msgstr "# Bytes des Typs %d empfangen"
 
-#: src/transport/plugin_transport_bluetooth.c:1512
+#: src/transport/gnunet-transport-profiler.c:629
 #, fuzzy
-msgid "# DATA messages received via Bluetooth"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
+msgid "iterations"
+msgstr "Weitere Einstellungen"
 
-#: src/transport/plugin_transport_bluetooth.c:1547
+#: src/transport/gnunet-transport-profiler.c:632
 #, fuzzy
-msgid "# Bluetooth DATA messages processed"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
+msgid "number of messages to send"
+msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
 
-#: src/transport/plugin_transport_bluetooth.c:1610
+#: src/transport/gnunet-transport-profiler.c:635
 #, fuzzy
-msgid "# HELLO beacons sent via Bluetooth"
-msgstr "# Bytes gesendet über UDP"
+msgid "message size to use"
+msgstr "Nachrichtengröße"
 
-#: src/transport/plugin_transport_bluetooth.c:1923
-#, c-format
-msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
+#: src/transport/plugin_transport_http_client.c:1491
+#: src/transport/plugin_transport_http_server.c:2271
+#: src/transport/plugin_transport_http_server.c:3436
+#: src/transport/plugin_transport_tcp.c:2826
+#: src/transport/plugin_transport_tcp.c:2833
+msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1685
+#: src/transport/plugin_transport_http_client.c:2115
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1760
-#: src/transport/plugin_transport_http_server.c:3031
+#: src/transport/plugin_transport_http_client.c:2164
+#: src/transport/plugin_transport_http_server.c:3170
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1785
-#: src/transport/plugin_transport_http_server.c:3088
+#: src/transport/plugin_transport_http_client.c:2181
+#: src/transport/plugin_transport_http_server.c:3240
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
 "beträgt %8.3f KB/s.\n"
 
-#: src/transport/plugin_transport_http_client.c:1819
-#: src/transport/plugin_transport_http_server.c:2931
+#: src/transport/plugin_transport_http_client.c:2215
 #, fuzzy, c-format
-msgid "Maximum number of connections is %u\n"
+msgid "Maximum number of requests is %u\n"
 msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
 
-#: src/transport/plugin_transport_http_server.c:1423
+#: src/transport/plugin_transport_http_server.c:1761
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1687
+#: src/transport/plugin_transport_http_server.c:1992
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1695
+#: src/transport/plugin_transport_http_server.c:2000
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1982
+#: src/transport/plugin_transport_http_server.c:2150
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2006
+#: src/transport/plugin_transport_http_server.c:2173
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2429
+#: src/transport/plugin_transport_http_server.c:2297
+msgid "Could not load or create server certificate! Loading plugin failed!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2604
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/transport/plugin_transport_http_server.c:2461 src/util/service.c:700
+#: src/transport/plugin_transport_http_server.c:2638 src/util/service.c:700
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_http_server.c:2478 src/util/service.c:719
+#: src/transport/plugin_transport_http_server.c:2656 src/util/service.c:719
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transport/plugin_transport_http_server.c:2589
+#: src/transport/plugin_transport_http_server.c:2769
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2661
+#: src/transport/plugin_transport_http_server.c:2847
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2754
+#: src/transport/plugin_transport_http_server.c:2946
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2768
+#: src/transport/plugin_transport_http_server.c:2961
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2775
+#: src/transport/plugin_transport_http_server.c:2967
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
 
-#: src/transport/plugin_transport_http_server.c:2786
+#: src/transport/plugin_transport_http_server.c:2978
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2793
+#: src/transport/plugin_transport_http_server.c:2984
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2808
+#: src/transport/plugin_transport_http_server.c:2998
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/transport/plugin_transport_http_server.c:2818
+#: src/transport/plugin_transport_http_server.c:3008
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2839
+#: src/transport/plugin_transport_http_server.c:3030
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/transport/plugin_transport_http_server.c:2849
+#: src/transport/plugin_transport_http_server.c:3040
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2901
+#: src/transport/plugin_transport_http_server.c:3103
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/transport/plugin_transport_http_server.c:2917
+#: src/transport/plugin_transport_http_server.c:3124
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_server.c:3141
+#, fuzzy, c-format
+msgid "Maximum number of connections is %u\n"
+msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
+
+#: src/transport/plugin_transport_http_server.c:3448
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
@@ -7941,91 +8370,86 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:565
+#: src/transport/plugin_transport_tcp.c:648
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:787
-#: src/transport/plugin_transport_tcp.c:962
-#: src/transport/plugin_transport_tcp.c:2047
-#: src/transport/plugin_transport_tcp.c:2620
+#: src/transport/plugin_transport_tcp.c:829
+#: src/transport/plugin_transport_tcp.c:1044
+#: src/transport/plugin_transport_tcp.c:2232
+#: src/transport/plugin_transport_tcp.c:2932
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_tcp.c:823
-#: src/transport/plugin_transport_tcp.c:955
-#: src/transport/plugin_transport_tcp.c:1045
-#: src/transport/plugin_transport_tcp.c:1093
-#: src/transport/plugin_transport_tcp.c:1259
-#: src/transport/plugin_transport_tcp.c:1277
+#: src/transport/plugin_transport_tcp.c:870
+#: src/transport/plugin_transport_tcp.c:1027
+#: src/transport/plugin_transport_tcp.c:1146
+#: src/transport/plugin_transport_tcp.c:1214
+#: src/transport/plugin_transport_tcp.c:1312
+#: src/transport/plugin_transport_tcp.c:1336
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transport/plugin_transport_tcp.c:826
+#: src/transport/plugin_transport_tcp.c:873
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1048
+#: src/transport/plugin_transport_tcp.c:1149
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1096
+#: src/transport/plugin_transport_tcp.c:1218
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:1233
-#, c-format
-msgid "Trying to send with invalid session %p\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1504
+#: src/transport/plugin_transport_tcp.c:1611
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1609
+#: src/transport/plugin_transport_tcp.c:1775
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2097
+#: src/transport/plugin_transport_tcp.c:2282
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:2257
+#: src/transport/plugin_transport_tcp.c:2452
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2321
+#: src/transport/plugin_transport_tcp.c:2524
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2490 src/util/service.c:582
+#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:582
 #: src/util/service.c:588
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2504
+#: src/transport/plugin_transport_tcp.c:2776
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2607
+#: src/transport/plugin_transport_tcp.c:2919
 #, 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:2611
+#: src/transport/plugin_transport_tcp.c:2923
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2615
+#: src/transport/plugin_transport_tcp.c:2927
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -8050,139 +8474,139 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1513
+#: src/transport/plugin_transport_udp.c:1655
 #, c-format
 msgid ""
 "Trying to create session for address of unexpected length %u (should be %u "
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2602
+#: src/transport/plugin_transport_udp.c:2881
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2616
+#: src/transport/plugin_transport_udp.c:2894
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2961
+#: src/transport/plugin_transport_udp.c:3247
+#, fuzzy, c-format
+msgid "Failed to bind UDP socket to %s: %s\n"
+msgstr "Fehler beim Binden an UDP6 Port %d.\n"
+
+#: src/transport/plugin_transport_udp.c:3255
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3056
+#: src/transport/plugin_transport_udp.c:3414
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3097
+#: src/transport/plugin_transport_udp.c:3461
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_udp.c:3168
+#: src/transport/plugin_transport_udp.c:3529
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/transport/plugin_transport_unix.c:1321
+#: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/transport/plugin_transport_unix.c:1645
-#, fuzzy
-msgid "No UNIXPATH given in configuration!\n"
-msgstr "Fehler beim Speichern der Konfiguration!"
+#: src/transport/plugin_transport_unix.c:1416
+#, fuzzy, c-format
+msgid "Cannot bind to `%s'\n"
+msgstr "`%s' konnte nicht gehashed werden.\n"
 
-#: src/transport/plugin_transport_unix.c:1681
+#: src/transport/plugin_transport_unix.c:1817
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_wlan.c:620
-msgid "# WLAN ACKs sent"
+#: src/transport/plugin_transport_wlan.c:725
+msgid "# ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:639
+#: src/transport/plugin_transport_wlan.c:745
 #, fuzzy
-msgid "# WLAN messages defragmented"
+msgid "# Messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:688
-#: src/transport/plugin_transport_wlan.c:772
-#: src/transport/plugin_transport_wlan.c:1948
+#: src/transport/plugin_transport_wlan.c:786
+#: src/transport/plugin_transport_wlan.c:873
 #, fuzzy
-msgid "# WLAN sessions allocated"
+msgid "# Sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_wlan.c:876
+#: src/transport/plugin_transport_wlan.c:989
 #, fuzzy
-msgid "# WLAN message fragments sent"
+msgid "# message fragments sent"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:900
-msgid "# WLAN messages pending (with fragmentation)"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:1015
+#, fuzzy
+msgid "# messages pending (with fragmentation)"
+msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1008
-#: src/transport/plugin_transport_wlan.c:1098
-#: src/transport/plugin_transport_wlan.c:1950
+#: src/transport/plugin_transport_wlan.c:1129
+#: src/transport/plugin_transport_wlan.c:1222
+#: src/transport/plugin_transport_wlan.c:2185
 #, fuzzy
-msgid "# WLAN MAC endpoints allocated"
+msgid "# MAC endpoints allocated"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1302
+#: src/transport/plugin_transport_wlan.c:1487
 #, fuzzy
-msgid "# HELLO messages received via WLAN"
-msgstr "# verschlüsselter PONG Nachrichten empfangen"
-
-#: src/transport/plugin_transport_wlan.c:1326
-#, fuzzy
-msgid "# fragments received via WLAN"
-msgstr "# verworfener Nachrichten"
-
-#: src/transport/plugin_transport_wlan.c:1336
-#, fuzzy
-msgid "# ACKs received via WLAN"
+msgid "# ACKs received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_wlan.c:1396
+#: src/transport/plugin_transport_wlan.c:1555
 #, fuzzy
-msgid "# WLAN DATA messages discarded due to CRC32 error"
+msgid "# DATA messages discarded due to CRC32 error"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1518
+#: src/transport/plugin_transport_wlan.c:1696
 #, fuzzy
-msgid "# DATA messages received via WLAN"
+msgid "# DATA messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1553
+#: src/transport/plugin_transport_wlan.c:1730
 #, fuzzy
-msgid "# WLAN DATA messages processed"
+msgid "# DATA messages processed"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1616
+#: src/transport/plugin_transport_wlan.c:1793
 #, fuzzy
-msgid "# HELLO beacons sent via WLAN"
+msgid "# HELLO beacons sent"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transport/plugin_transport_wlan.c:1929
+#: src/transport/plugin_transport_wlan.c:2160
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:739
+#: src/transport/plugin_transport_wlan.c:2182
+#, fuzzy
+msgid "# sessions allocated"
+msgstr "# Sitzungsschlüssel akzeptiert"
+
+#: src/transport/transport_api.c:767
 #, 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/transport-testing.c:584
+#: src/transport/transport-testing.c:603
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
@@ -8362,12 +8786,12 @@
 "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:751 src/util/connection.c:919
+#: src/util/connection.c:751 src/util/connection.c:914
 #, 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:910
+#: src/util/connection.c:904
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -8435,12 +8859,12 @@
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/disk.c:1184
+#: src/util/disk.c:1202
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1546 src/util/service.c:1323
+#: src/util/disk.c:1564 src/util/service.c:1323
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
@@ -8555,81 +8979,82 @@
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/util/gnunet-ecc.c:75
+#: src/util/gnunet-ecc.c:81
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/util/gnunet-ecc.c:81
+#: src/util/gnunet-ecc.c:117
 #, c-format
+msgid "Generating %u keys like %s, please wait"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:130
+#, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:97
+#: src/util/gnunet-ecc.c:171
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/gnunet-ecc.c:107
+#: src/util/gnunet-ecc.c:181
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr "Fertigstellen"
 
-#: src/util/gnunet-ecc.c:110
+#: src/util/gnunet-ecc.c:184
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:199
+#: src/util/gnunet-ecc.c:277
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
 
-#: src/util/gnunet-ecc.c:210
+#: src/util/gnunet-ecc.c:288
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/util/gnunet-ecc.c:232
+#: src/util/gnunet-ecc.c:310
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/gnunet-ecc.c:283
+#: src/util/gnunet-ecc.c:361
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:349
+#: src/util/gnunet-ecc.c:411
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:352
+#: src/util/gnunet-ecc.c:414
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:355
+#: src/util/gnunet-ecc.c:417
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:358
+#: src/util/gnunet-ecc.c:420
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:361
-msgid "print the hash of the public key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:364
+#: src/util/gnunet-ecc.c:423
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:375
+#: src/util/gnunet-ecc.c:434
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
@@ -8663,13 +9088,13 @@
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/util/gnunet-service-resolver.c:299
+#: src/util/gnunet-service-resolver.c:310
 #, fuzzy, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/gnunet-service-resolver.c:371
-#: src/util/gnunet-service-resolver.c:412
+#: src/util/gnunet-service-resolver.c:382
+#: src/util/gnunet-service-resolver.c:423
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
@@ -8718,7 +9143,7 @@
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1355 src/util/network.c:1480
+#: src/util/network.c:1361 src/util/network.c:1486
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8782,12 +9207,12 @@
 msgid "Malformed configuration, exit ...\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/util/resolver_api.c:198
+#: src/util/resolver_api.c:201
 #, 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:216
+#: src/util/resolver_api.c:220
 #, fuzzy, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
@@ -8795,17 +9220,17 @@
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/util/resolver_api.c:348
+#: 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:352
+#: src/util/resolver_api.c:361
 #, 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:908
+#: src/util/resolver_api.c:974
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
@@ -8834,7 +9259,7 @@
 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:892
+#: src/util/server.c:894
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8937,114 +9362,114 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:433
+#: src/util/strings.c:434
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:561
+#: src/util/strings.c:562
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:658
+#: src/util/strings.c:659
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:662
+#: src/util/strings.c:663
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:664
+#: src/util/strings.c:665
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:670
+#: src/util/strings.c:671
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:676
+#: src/util/strings.c:677
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:682
+#: src/util/strings.c:683
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:688
+#: src/util/strings.c:689
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:695
+#: src/util/strings.c:696
 #, fuzzy
 msgid "day"
 msgstr " Tage"
 
-#: src/util/strings.c:697
+#: src/util/strings.c:698
 #, fuzzy
 msgid "days"
 msgstr " Tage"
 
-#: src/util/strings.c:726
+#: src/util/strings.c:727
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1159
+#: src/util/strings.c:1192
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1167
+#: src/util/strings.c:1200
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1173
+#: src/util/strings.c:1206
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1180
+#: src/util/strings.c:1213
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1189
+#: src/util/strings.c:1222
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/util/strings.c:1395 src/util/strings.c:1411
+#: src/util/strings.c:1428 src/util/strings.c:1444
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1420
+#: src/util/strings.c:1453
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/util/strings.c:1503 src/util/strings.c:1534 src/util/strings.c:1582
-#: src/util/strings.c:1603
+#: src/util/strings.c:1536 src/util/strings.c:1567 src/util/strings.c:1615
+#: src/util/strings.c:1636
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/strings.c:1560
+#: src/util/strings.c:1593
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ungültige Netzwerk Notation ('/%d ist nicht gültig in IPv4 CIDR)."
 
-#: src/util/strings.c:1612
+#: src/util/strings.c:1645
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/util/strings.c:1664
+#: src/util/strings.c:1697
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
 
-#: src/util/strings.c:1714
+#: src/util/strings.c:1747
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/strings.c:1745
+#: src/util/strings.c:1778
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
@@ -9233,23 +9658,148 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573
-#: src/include/gnunet_common.h:581
+#: src/include/gnunet_common.h:586 src/include/gnunet_common.h:593
+#: src/include/gnunet_common.h:601
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:593
+#: src/include/gnunet_common.h:613
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:620 src/include/gnunet_common.h:629
+#: src/include/gnunet_common.h:640 src/include/gnunet_common.h:649
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
+#~ msgid "Client %p disconnected from us.\n"
+#~ msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#, fuzzy
+#~ msgid "Could not send message to client (%p)!\n"
+#~ msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+
+#, fuzzy
+#~ msgid "Successfully created new channel to peer (%s)!\n"
+#~ msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Transmitting service request.\n"
+#~ msgstr "Collection `%s' begonnen.\n"
+
+#, fuzzy
+#~ msgid "Could not send message to channel!\n"
+#~ msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+
+#, fuzzy
+#~ msgid "Could not send service-response message via cadet!)\n"
+#~ msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+
+#, fuzzy
+#~ msgid "Could not send service-request multipart message to channel!\n"
+#~ msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+
+#, fuzzy
+#~ msgid "New incoming channel from peer %s.\n"
+#~ msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#, fuzzy
+#~ msgid "CADET initialized\n"
+#~ msgstr " Verbindung fehlgeschlagen\n"
+
+#, fuzzy
+#~ msgid "Reloading sensor definitions from directory `%s'\n"
+#~ msgstr "Dateien aus dem GNUnet herunterladen."
+
+#, fuzzy
+#~ msgid "Loaded %d sensors from directory `%s'\n"
+#~ msgstr "Dateien aus dem GNUnet herunterladen."
+
+#, fuzzy
+#~ msgid "Failed to receive response from `SENSOR' service."
+#~ msgstr ""
+#~ "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
+
+#, fuzzy
+#~ msgid "Received invalid message from `SENSOR' service."
+#~ msgstr "Ungültige `%s' Anfrage von `%s' empfangen.\n"
+
+#, fuzzy
+#~ msgid "# SESSION_CONNECT messages sent"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#, fuzzy
+#~ msgid "# CONNECT messages received"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#, fuzzy
+#~ msgid "# Bluetooth messages defragmented"
+#~ msgstr "# defragmentierter Nachrichten"
+
+#, fuzzy
+#~ msgid "# Bluetooth sessions allocated"
+#~ msgstr "# Sitzungsschlüssel akzeptiert"
+
+#, fuzzy
+#~ msgid "# Bluetooth message fragments sent"
+#~ msgstr "# fragmentierter Nachrichten"
+
+#, fuzzy
+#~ msgid "# Bluetooth MAC endpoints allocated"
+#~ msgstr "# Client Trace-Anfragen empfangen"
+
+#, fuzzy
+#~ msgid "# HELLO messages received via Bluetooth"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#, fuzzy
+#~ msgid "# fragments received via Bluetooth"
+#~ msgstr "# verworfener Nachrichten"
+
+#, fuzzy
+#~ msgid "# ACKs received via Bluetooth"
+#~ msgstr "# Bytes empfangen über TCP"
+
+#, fuzzy
+#~ msgid "# Bluetooth DATA messages discarded due to CRC32 error"
+#~ msgstr "# defragmentierter Nachrichten"
+
+#, fuzzy
+#~ msgid "# DATA messages received via Bluetooth"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#, fuzzy
+#~ msgid "# Bluetooth DATA messages processed"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#, fuzzy
+#~ msgid "# HELLO beacons sent via Bluetooth"
+#~ msgstr "# Bytes gesendet über UDP"
+
+#, fuzzy
+#~ msgid "No UNIXPATH given in configuration!\n"
+#~ msgstr "Fehler beim Speichern der Konfiguration!"
+
+#, fuzzy
+#~ msgid "# WLAN messages defragmented"
+#~ msgstr "# defragmentierter Nachrichten"
+
+#, fuzzy
+#~ msgid "# HELLO messages received via WLAN"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#, fuzzy
+#~ msgid "# fragments received via WLAN"
+#~ msgstr "# verworfener Nachrichten"
+
+#, fuzzy
+#~ msgid "# DATA messages received via WLAN"
+#~ msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#, fuzzy
 #~ msgid "Peer `%s'\n"
 #~ msgstr "Ich bin Peer `%s'.\n"
 
@@ -9262,14 +9812,6 @@
 #~ msgstr "# Bytes empfangen über HTTP"
 
 #, fuzzy
-#~ msgid "Failed to run `upnpc` command"
-#~ msgstr "Fehler beim Starten der Collection.\n"
-
-#, fuzzy
-#~ msgid "`upnpc` command not found"
-#~ msgstr "Kommando `%s' wurde nicht gefunden!\n"
-
-#, fuzzy
 #~ msgid "Could not convert `%s' to integer.\n"
 #~ msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
@@ -9319,10 +9861,6 @@
 #~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
 #, fuzzy
-#~ msgid "Could not find option `%s:%s' in configuration.\n"
-#~ msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
-
-#, fuzzy
 #~ msgid "Peer `%s' disconnected\n"
 #~ msgstr "# verbundener Knoten"
 
@@ -9493,10 +10031,6 @@
 #~ "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
 #, fuzzy
-#~ msgid "number of peers to start"
-#~ msgstr "Anzahl an Durchläufen"
-
-#, fuzzy
 #~ msgid "Failed to read or generate private key: %s\n"
 #~ msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
@@ -9543,10 +10077,6 @@
 #~ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
 #, fuzzy
-#~ msgid "Failed to create new signature"
-#~ msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
-
-#, fuzzy
 #~ msgid "Failed to put new set of records in database"
 #~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
@@ -9616,10 +10146,6 @@
 #~ msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
 #, fuzzy
-#~ msgid "Failed to transmit shutdown request to client.\n"
-#~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
-#, fuzzy
 #~ msgid "Service `%s' was already running.\n"
 #~ msgstr "Diese Suche läuft bereits!\n"
 
@@ -9660,10 +10186,6 @@
 #~ "Abbruch.\n"
 
 #, fuzzy
-#~ msgid "Could not read blacklist file `%s'\n"
-#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#, fuzzy
 #~ msgid "Failed to read blacklist from `%s'\n"
 #~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
@@ -9700,10 +10222,6 @@
 #~ msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
 #, fuzzy
-#~ msgid "Failed to connect to datastore service"
-#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#, fuzzy
 #~ msgid "Failed to parse URI `%s' from KBlock!\n"
 #~ msgstr "Datei `%s' hat URI: %s\n"
 
@@ -10062,10 +10580,6 @@
 #~ msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
 #, fuzzy
-#~ msgid "# peers disconnected due to global disconnect"
-#~ msgstr "# Knotenankündigungen empfangen"
-
-#, fuzzy
 #~ msgid "# messages not sent (no such peer or not connected)"
 #~ msgstr "# defragmentierter Nachrichten"
 
@@ -10801,9 +11315,6 @@
 #~ msgid "`%s' registering handlers %d %d %d\n"
 #~ msgstr "`%s' registriert Handler %d %d %d\n"
 
-#~ msgid "Using %u messages of size %u for %u times.\n"
-#~ msgstr "Verwende %u Nachrichten der Größe %u %umal.\n"
-
 #~ msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
 #~ msgstr "Zeiten:   Max %16llu  Min %16llu  Mittel %12.3f  Varianz %12.3f\n"
 
@@ -10822,15 +11333,9 @@
 #~ msgid "output in gnuplot format"
 #~ msgstr "Ausgabe im gnuplot Format"
 
-#~ msgid "number of messages to use per iteration"
-#~ msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
-
 #~ msgid "receiver host identifier (ENC file name)"
 #~ msgstr "Bezeichner des Empfängerhosts (ENC Dateiname)"
 
-#~ msgid "message size"
-#~ msgstr "Nachrichtengröße"
-
 #~ msgid "sleep for SPACE ms after each a message block"
 #~ msgstr "Für SPACE ms nach jedem Nachrichtenblock pausieren"
 
@@ -10877,9 +11382,6 @@
 #~ msgid "\tvariance %8.4f\n"
 #~ msgstr "\tVarianz %8.4f\n"
 
-#~ msgid "Output format not known, this should not happen.\n"
-#~ msgstr "Ausgabeformat ist unbekannt, dies sollte nicht passieren.\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Did not receive the message from gnunetd. Is gnunetd running?\n"
@@ -11359,9 +11861,6 @@
 #~ msgid "Cannot get size of file `%s'"
 #~ msgstr "Die Größe der Datei `%s' konnte nicht ermittelt werden"
 
-#~ msgid "Cannot hash `%s'.\n"
-#~ msgstr "`%s' konnte nicht gehashed werden.\n"
-
 #~ msgid "Initialization for indexing file `%s' failed.\n"
 #~ msgstr "Initialisierung der Indizierung der Datei `%s' fehlgeschlagen.\n"
 
@@ -11819,10 +12318,6 @@
 #~ msgstr "Wert der Option anzeigen"
 
 #, fuzzy
-#~ msgid "General options"
-#~ msgstr "Weitere Einstellungen"
-
-#, fuzzy
 #~ msgid "Options related to gnunet-gtk"
 #~ msgstr "Nicht verbunden zu gnunetd."
 
@@ -12720,9 +13215,6 @@
 #~ msgid "Received invalid `%s' request (size %d)\n"
 #~ msgstr "Ungültige Anfrage `%s' empfangen (Größe %d)\n"
 
-#~ msgid "Received invalid `%s' request (wrong table)\n"
-#~ msgstr "Ungültige Anfrage `%s' empfangen (falsche Tabelle)\n"
-
 #~ msgid "Received unknown request type %d at %s:%d\n"
 #~ msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n"
 

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2014-12-24 15:11:43 UTC (rev 34787)
+++ gnunet/po/es.po     2014-12-24 16:59:19 UTC (rev 34788)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-06-04 18:25+0200\n"
+"POT-Creation-Date: 2014-12-09 00:23+0100\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -382,9 +382,9 @@
 msgid "Received last message for %s \n"
 msgstr "Recibido último mensaje para %s\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2793 src/ats/gnunet-ats-solver-eval.c:2827
-#: src/ats/gnunet-service-ats_addresses.c:1675
-#: src/ats/gnunet-service-ats_addresses.c:1719
+#: src/ats/gnunet-ats-solver-eval.c:2804 src/ats/gnunet-ats-solver-eval.c:2838
+#: src/ats/gnunet-service-ats_addresses.c:1781
+#: src/ats/gnunet-service-ats_addresses.c:1825
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
@@ -394,14 +394,14 @@
 "de banda predeterminado %llu\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#: src/ats/gnunet-service-ats_addresses.c:1682
+#: src/ats/gnunet-ats-solver-eval.c:2810
+#: src/ats/gnunet-service-ats_addresses.c:1788
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2806
-#: src/ats/gnunet-service-ats_addresses.c:1690
+#: src/ats/gnunet-ats-solver-eval.c:2817
+#: src/ats/gnunet-service-ats_addresses.c:1796
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
@@ -411,14 +411,14 @@
 "de banda predeterminado %llu\n"
 
 # Miguel: "Inbound" lo he traducido como entrada en todo el texto.
-#: src/ats/gnunet-ats-solver-eval.c:2833
-#: src/ats/gnunet-service-ats_addresses.c:1726
+#: src/ats/gnunet-ats-solver-eval.c:2844
+#: src/ats/gnunet-service-ats_addresses.c:1832
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr "La cuota de entrada configurada para la red «%s» es %llu\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#: src/ats/gnunet-service-ats_addresses.c:1734
+#: src/ats/gnunet-ats-solver-eval.c:2851
+#: src/ats/gnunet-service-ats_addresses.c:1840
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
@@ -427,82 +427,82 @@
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3397
-#: src/ats-tests/gnunet-solver-eval.c:919
+#: src/ats/gnunet-ats-solver-eval.c:3410
+#: src/ats-tests/gnunet-solver-eval.c:918
 #, fuzzy
 msgid "solver to use"
 msgstr "valor a establecer"
 
-#: src/ats/gnunet-ats-solver-eval.c:3400
-#: src/ats-tests/gnunet-solver-eval.c:922
-#: src/ats-tests/gnunet-solver-eval.c:925
+#: src/ats/gnunet-ats-solver-eval.c:3413
+#: src/ats-tests/gnunet-solver-eval.c:921
+#: src/ats-tests/gnunet-solver-eval.c:924
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3403
+#: src/ats/gnunet-ats-solver-eval.c:3416
 msgid "be verbose"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3406
+#: src/ats/gnunet-ats-solver-eval.c:3419
 #, fuzzy
 msgid "print logging"
 msgstr "Iniciando descarga «%s».\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3409
+#: src/ats/gnunet-ats-solver-eval.c:3422
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3412
+#: src/ats/gnunet-ats-solver-eval.c:3425
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1912
+#: src/ats/gnunet-service-ats_addresses.c:2039
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1915
+#: src/ats/gnunet-service-ats_addresses.c:2042
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1938
+#: src/ats/gnunet-service-ats_addresses.c:2065
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
 
-#: src/ats/plugin_ats_mlp.c:949
+#: src/ats/plugin_ats_mlp.c:1344
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1542
+#: src/ats/plugin_ats_mlp.c:1941
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
 
-#: src/ats/plugin_ats_mlp.c:1589
+#: src/ats/plugin_ats_mlp.c:1988
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2299
+#: src/ats/plugin_ats_mlp.c:2704
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2339 src/ats/plugin_ats_mlp.c:2356
-#: src/ats/plugin_ats_mlp.c:2388 src/ats/plugin_ats_mlp.c:2406
-#: src/ats/plugin_ats_mlp.c:2425 src/ats/plugin_ats_proportional.c:458
-#: src/ats/plugin_ats_proportional.c:475 src/ats/plugin_ats_ril.c:2220
-#: src/ats/plugin_ats_ril.c:2237 src/ats/plugin_ats_ril.c:2254
-#: src/ats/plugin_ats_ril.c:2271 src/ats/plugin_ats_ril.c:2288
-#: src/ats/plugin_ats_ril.c:2305 src/ats/plugin_ats_ril.c:2322
-#: src/ats/plugin_ats_ril.c:2339
+#: src/ats/plugin_ats_mlp.c:2744 src/ats/plugin_ats_mlp.c:2761
+#: src/ats/plugin_ats_mlp.c:2793 src/ats/plugin_ats_mlp.c:2811
+#: src/ats/plugin_ats_mlp.c:2830 src/ats/plugin_ats_proportional.c:1989
+#: src/ats/plugin_ats_proportional.c:2010 src/ats/plugin_ats_ril.c:2718
+#: src/ats/plugin_ats_ril.c:2735 src/ats/plugin_ats_ril.c:2752
+#: src/ats/plugin_ats_ril.c:2769 src/ats/plugin_ats_ril.c:2786
+#: src/ats/plugin_ats_ril.c:2803 src/ats/plugin_ats_ril.c:2820
+#: src/ats/plugin_ats_ril.c:2837
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
 
-#: src/ats/plugin_ats_mlp.c:2512
+#: src/ats/plugin_ats_mlp.c:2917
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
@@ -511,7 +511,7 @@
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/plugin_ats_mlp.c:2521
+#: src/ats/plugin_ats_mlp.c:2926
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
@@ -521,26 +521,26 @@
 "ancho de banda predeterminado (%llu)\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2937
 #, fuzzy, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/plugin_ats_mlp.c:2540
+#: src/ats/plugin_ats_mlp.c:2945
 #, fuzzy, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/plugin_ats_mlp.c:2551
+#: src/ats/plugin_ats_mlp.c:2956
 #, fuzzy, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
-#: src/ats/plugin_ats_proportional.c:1819
+#: src/ats/plugin_ats_proportional.c:1847
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "No se encontró la IP del host «%s»: %s\n"
@@ -578,7 +578,7 @@
 msgid "Could not connect master [%u] and slave [%u]\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:673
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:677
 #, fuzzy
 msgid "Initialization failed, shutdown\n"
 msgstr "¡La inicialización del mecanismo de módulos falló: %s!\n"
@@ -603,19 +603,27 @@
 # Son difíciles de no calcar, puesto que no conozco como expresar
 # el concepto de obtener una dirección a partir de un nombre
 # en castellano sin la palabra resolver. :-)
-#: src/ats-tool/gnunet-ats.c:169
+#: src/ats-tool/gnunet-ats.c:296
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr "%u resoluciones de dirección pasaron de plazo\n"
 
-#: src/ats-tool/gnunet-ats.c:171
-#, c-format
-msgid "ATS returned results for %u addresses\n"
+#: src/ats-tool/gnunet-ats.c:300
+#, fuzzy, c-format
+msgid "ATS returned stat_results for %u addresses\n"
 msgstr "El ATS devolvió resultados para %u direcciones\n"
 
+#: src/ats-tool/gnunet-ats.c:378
+msgid "active "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:378
+msgid "inactive "
+msgstr ""
+
 # Miguel: "Plugin" está traducido como módulo en todo el texto
 # puesto que no hay módulos fijos en contraposición a cargables.
-#: src/ats-tool/gnunet-ats.c:258
+#: src/ats-tool/gnunet-ats.c:427
 #, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
@@ -624,157 +632,166 @@
 "Par «%s» módulo «%s», dirección «%s», «%s» subida: %u Bytes/s, bajada %u "
 "Bytes/s, %s\n"
 
-#: src/ats-tool/gnunet-ats.c:467
+#: src/ats-tool/gnunet-ats.c:544
+#, fuzzy, c-format
+msgid "Removed address of peer `%s' with plugin `%s'\n"
+msgstr "Eliminando dirección de transporte «%s»\n"
+
+#: src/ats-tool/gnunet-ats.c:747
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr "Cuota para la red «%11s» (entrada/salida): %10s / %10s\n"
 
-#: src/ats-tool/gnunet-ats.c:487 src/namestore/gnunet-namestore.c:639
-#: src/transport/gnunet-transport.c:1349
+#: src/ats-tool/gnunet-ats.c:779 src/namestore/gnunet-namestore.c:700
+#: src/transport/gnunet-transport.c:1855
+#: src/transport/gnunet-transport-profiler.c:531
 #, c-format
 msgid "Service `%s' is not running\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/ats-tool/gnunet-ats.c:499 src/transport/gnunet-transport.c:1358
+#: src/ats-tool/gnunet-ats.c:793 src/transport/gnunet-transport.c:1864
+#: src/transport/gnunet-transport-profiler.c:549
 #, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:803
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr "Por favor, seleccione una operación: %s o %s o %s o %s o %s\n"
 
-#: src/ats-tool/gnunet-ats.c:524 src/ats-tool/gnunet-ats.c:543
-#: src/ats-tool/gnunet-ats.c:560 src/ats-tool/gnunet-ats.c:597
-#, c-format
+#: src/ats-tool/gnunet-ats.c:825 src/ats-tool/gnunet-ats.c:851
+#: src/ats-tool/gnunet-ats.c:879 src/ats-tool/gnunet-ats.c:925
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "No se puede conectar al servicio ATS, saliendo...\n"
 
-#: src/ats-tool/gnunet-ats.c:532 src/ats-tool/gnunet-ats.c:549
-#, c-format
+#: src/ats-tool/gnunet-ats.c:837 src/ats-tool/gnunet-ats.c:863
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "No se puede iniciar una petición al servicio ATS, saliendo...\n"
 
-#: src/ats-tool/gnunet-ats.c:569
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:891
+#, fuzzy
 msgid "No preference type given!\n"
 msgstr "establece las preferencias para el par dado"
 
-#: src/ats-tool/gnunet-ats.c:574
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:898
+#, fuzzy
 msgid "No peer given!\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/ats-tool/gnunet-ats.c:590
+#: src/ats-tool/gnunet-ats.c:916
 #, fuzzy
 msgid "Valid type required\n"
 msgstr "Tipo requerido\n"
 
-#: src/ats-tool/gnunet-ats.c:648
+#: src/ats-tool/gnunet-ats.c:984
 msgid "get list of active addresses currently used"
 msgstr "obtiene una lista de direcciones activas usadas actualmente"
 
-#: src/ats-tool/gnunet-ats.c:650
+#: src/ats-tool/gnunet-ats.c:986
 msgid "get list of all active addresses"
 msgstr "obtiene una lista de todas las direcciones activas"
 
-#: src/ats-tool/gnunet-ats.c:653
+#: src/ats-tool/gnunet-ats.c:989
 msgid "do not resolve IP addresses to hostnames"
 msgstr "no resuelve direcciones IP a nombres de máquina"
 
 # Miguel: Aquí he dejado monitorización porque esto es
 # del servicio de traducción de direcciones.
-#: src/ats-tool/gnunet-ats.c:655
+#: src/ats-tool/gnunet-ats.c:991
 msgid "monitor mode"
 msgstr "modo de monitorización"
 
-#: src/ats-tool/gnunet-ats.c:657
+#: src/ats-tool/gnunet-ats.c:993
 msgid "set preference for the given peer"
 msgstr "establece las preferencias para el par dado"
 
-#: src/ats-tool/gnunet-ats.c:659
+#: src/ats-tool/gnunet-ats.c:995
 msgid "print all configured quotas"
 msgstr "imprime todas las cuotas configuradas"
 
 # Miguel: He preferido extender id a identificación por claridad.
-#: src/ats-tool/gnunet-ats.c:661
+#: src/ats-tool/gnunet-ats.c:997
 msgid "peer id"
 msgstr "identificación del par"
 
 # Miguel: No me he encontrado esta opción todavía,
 # pero creo que son palabras clave.
-#: src/ats-tool/gnunet-ats.c:664
+#: src/ats-tool/gnunet-ats.c:1000
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 "tipo de preferencia a modificar: latency (latencia) | bandwidth (ancho de "
 "banda)"
 
-#: src/ats-tool/gnunet-ats.c:666
+#: src/ats-tool/gnunet-ats.c:1002
 msgid "preference value"
 msgstr "valor de preferencia"
 
 # Miguel: ¿Algo menos forzado que "salida prolija"?
-#: src/ats-tool/gnunet-ats.c:669
+#: src/ats-tool/gnunet-ats.c:1005
 msgid "verbose output (include ATS address properties)"
 msgstr "salida prolija (incluye las propiedades de direcciones del ATS)"
 
-#: src/ats-tool/gnunet-ats.c:676
+#: src/ats-tool/gnunet-ats.c:1012
 msgid "Print information about ATS state"
 msgstr "Imprime información acerca del estado del ATS"
 
-#: src/cadet/gnunet-cadet.c:357
+#: src/cadet/gnunet-cadet.c:376
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/cadet/gnunet-cadet.c:607
+#: src/cadet/gnunet-cadet.c:626
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/cadet/gnunet-cadet.c:650
+#: src/cadet/gnunet-cadet.c:669
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/cadet/gnunet-cadet.c:716
+#: src/cadet/gnunet-cadet.c:735
 msgid "You must NOT give a TARGETwhen using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:807
+#: src/cadet/gnunet-cadet.c:832
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:810
+#: src/cadet/gnunet-cadet.c:835
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:816
+#: src/cadet/gnunet-cadet.c:838
+msgid "dump debug information to STDERR"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:844
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:819
+#: src/cadet/gnunet-cadet.c:847
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:822
+#: src/cadet/gnunet-cadet.c:850
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:825
+#: src/cadet/gnunet-cadet.c:853
 msgid "provide information about a particular tunnel"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-cadet.c:828
+#: src/cadet/gnunet-cadet.c:856
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/cadet/gnunet-service-cadet_peer.c:429
+#: src/cadet/gnunet-service-cadet_peer.c:496
 msgid "Wrong CORE service\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
@@ -788,8 +805,8 @@
 msgstr "¿cuántos pares reciben un valor?"
 
 #: src/consensus/gnunet-consensus-profiler.c:443
-#: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
-#: src/set/gnunet-set-profiler.c:292
+#: src/set/gnunet-set-profiler.c:289 src/set/gnunet-set-profiler.c:292
+#: src/set/gnunet-set-profiler.c:295
 msgid "number of values"
 msgstr "número de valores"
 
@@ -808,273 +825,274 @@
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:557
-#: src/conversation/conversation_api_call.c:470
+#: src/conversation/conversation_api.c:493
+#: src/conversation/conversation_api_call.c:475
 #, fuzzy
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/conversation/conversation_api.c:681
+#: src/conversation/conversation_api.c:617
 #, fuzzy
 msgid "number too large"
 msgstr "número de valores"
 
-#: src/conversation/gnunet-conversation.c:264
+#: src/conversation/gnunet-conversation.c:269
 #, c-format
 msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:286
+#: src/conversation/gnunet-conversation.c:291
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:319
+#: src/conversation/gnunet-conversation.c:323
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:324
+#: src/conversation/gnunet-conversation.c:328
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:342
+#: src/conversation/gnunet-conversation.c:346
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:356
+#: src/conversation/gnunet-conversation.c:360
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
 
-#: src/conversation/gnunet-conversation.c:368
+#: src/conversation/gnunet-conversation.c:372
 #, c-format
 msgid ""
 "Phone active on line %u.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:390
+#: src/conversation/gnunet-conversation.c:394
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:397
+#: src/conversation/gnunet-conversation.c:401
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/conversation/gnunet-conversation.c:404
+#: src/conversation/gnunet-conversation.c:408
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 
-#: src/conversation/gnunet-conversation.c:411
-msgid "Call terminated\n"
+#: src/conversation/gnunet-conversation.c:416
+#, c-format
+msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:417
+#: src/conversation/gnunet-conversation.c:425
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:423
+#: src/conversation/gnunet-conversation.c:431
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:428
+#: src/conversation/gnunet-conversation.c:436
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:495
+#: src/conversation/gnunet-conversation.c:504
 #, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Comando desconocido «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:511
-#: src/conversation/gnunet-conversation.c:525
+#: src/conversation/gnunet-conversation.c:520
+#: src/conversation/gnunet-conversation.c:534
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:518
-#: src/conversation/gnunet-conversation.c:575
+#: src/conversation/gnunet-conversation.c:527
+#: src/conversation/gnunet-conversation.c:584
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:533
-#: src/conversation/gnunet-conversation.c:588
+#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:597
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:544
+#: src/conversation/gnunet-conversation.c:552
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:599
+#: src/conversation/gnunet-conversation.c:608
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:625
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:647
+#: src/conversation/gnunet-conversation.c:655
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:670
+#: src/conversation/gnunet-conversation.c:678
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:675
+#: src/conversation/gnunet-conversation.c:683
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:681
-#: src/conversation/gnunet-conversation.c:705
+#: src/conversation/gnunet-conversation.c:689
+#: src/conversation/gnunet-conversation.c:713
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:686
+#: src/conversation/gnunet-conversation.c:694
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:695
+#: src/conversation/gnunet-conversation.c:703
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "Detectada dirección de la red interna «%s».\n"
 
-#: src/conversation/gnunet-conversation.c:700
+#: src/conversation/gnunet-conversation.c:708
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:719
+#: src/conversation/gnunet-conversation.c:727
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:725
+#: src/conversation/gnunet-conversation.c:733
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Par «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:753
-#: src/conversation/gnunet-conversation.c:768
+#: src/conversation/gnunet-conversation.c:761
+#: src/conversation/gnunet-conversation.c:776
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:801
-#: src/conversation/gnunet-conversation.c:817
+#: src/conversation/gnunet-conversation.c:809
+#: src/conversation/gnunet-conversation.c:825
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:832
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:833
+#: src/conversation/gnunet-conversation.c:841
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:850
+#: src/conversation/gnunet-conversation.c:858
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:885
+#: src/conversation/gnunet-conversation.c:893
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:893
+#: src/conversation/gnunet-conversation.c:901
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:910
+#: src/conversation/gnunet-conversation.c:918
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:937
+#: src/conversation/gnunet-conversation.c:944
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:939
+#: src/conversation/gnunet-conversation.c:946
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:941
+#: src/conversation/gnunet-conversation.c:948
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:943
+#: src/conversation/gnunet-conversation.c:950
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:945
+#: src/conversation/gnunet-conversation.c:952
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:947
+#: src/conversation/gnunet-conversation.c:954
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:949
+#: src/conversation/gnunet-conversation.c:956
 #, fuzzy
 msgid "Use `/status' to print status information"
 msgstr "ser prolijo (imprime información de progreso)"
 
-#: src/conversation/gnunet-conversation.c:951
+#: src/conversation/gnunet-conversation.c:958
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Use «/quit» para finalizar «gnunet-chat»"
 
-#: src/conversation/gnunet-conversation.c:953
+#: src/conversation/gnunet-conversation.c:960
 msgid "Use `/help command' to get help for a specific command"
 msgstr "Use «/help comando» para obtener ayuda sobre un comando específico"
 
-#: src/conversation/gnunet-conversation.c:1151
+#: src/conversation/gnunet-conversation.c:1168
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/conversation/gnunet-conversation.c:1164
+#: src/conversation/gnunet-conversation.c:1181
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "El pseudónimo '%s' fue borrado.\n"
 
-#: src/conversation/gnunet-conversation.c:1199
+#: src/conversation/gnunet-conversation.c:1216
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Debes especificar un fichero a inspeccionar.\n"
 
-#: src/conversation/gnunet-conversation.c:1223
+#: src/conversation/gnunet-conversation.c:1240
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Se produjo un fallo al iniciar el proceso «gnunet-peerinfo».\n"
 
-#: src/conversation/gnunet-conversation.c:1249
+#: src/conversation/gnunet-conversation.c:1266
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1252
+#: src/conversation/gnunet-conversation.c:1269
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1276
+#: src/conversation/gnunet-conversation.c:1295
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1102,6 +1120,7 @@
 
 #: src/conversation/gnunet-conversation-test.c:248
 #: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
+#: src/sensordashboard/gnunet-sensordashboard.c:70
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr "texto de ayuda"
@@ -1111,64 +1130,64 @@
 msgid "pa_stream_write() failed: %s\n"
 msgstr "stadísticas (%s) falló: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:587
+#: src/conversation/gnunet-helper-audio-playback.c:589
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:612
+#: src/conversation/gnunet-helper-audio-playback.c:614
 #: src/conversation/gnunet-helper-audio-record.c:545
 #, fuzzy
 msgid "Connection established.\n"
 msgstr "Colección detenida.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:617
+#: src/conversation/gnunet-helper-audio-playback.c:619
 #: src/conversation/gnunet-helper-audio-record.c:550
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "stadísticas (%s) falló: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:631
+#: src/conversation/gnunet-helper-audio-playback.c:633
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:644
+#: src/conversation/gnunet-helper-audio-playback.c:646
 #: src/conversation/gnunet-helper-audio-record.c:576
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:665
+#: src/conversation/gnunet-helper-audio-playback.c:667
 #: src/conversation/gnunet-helper-audio-record.c:599
 #, fuzzy
 msgid "Wrong Spec\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:671
+#: src/conversation/gnunet-helper-audio-playback.c:673
 #: src/conversation/gnunet-helper-audio-record.c:605
 #, fuzzy
 msgid "pa_mainloop_new() failed.\n"
 msgstr "La operación ha fallado.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:685
+#: src/conversation/gnunet-helper-audio-playback.c:687
 #: src/conversation/gnunet-helper-audio-record.c:620
 #, fuzzy
 msgid "pa_context_new() failed.\n"
 msgstr "La operación ha fallado.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:692
+#: src/conversation/gnunet-helper-audio-playback.c:694
 #: src/conversation/gnunet-helper-audio-record.c:626
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "# reconexiones rápidas fallidas"
 
-#: src/conversation/gnunet-helper-audio-playback.c:698
+#: src/conversation/gnunet-helper-audio-playback.c:700
 #: src/conversation/gnunet-helper-audio-record.c:632
 #, fuzzy
 msgid "pa_mainloop_run() failed.\n"
 msgstr "La operación ha fallado.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:768
+#: src/conversation/gnunet-helper-audio-playback.c:770
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
@@ -1238,17 +1257,17 @@
 msgstr ""
 "Se produjo un fallo al alojar las direcciones IP para el nuevo destino\n"
 
-#: src/conversation/gnunet-service-conversation.c:852
+#: src/conversation/gnunet-service-conversation.c:853
 msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:943
+#: src/conversation/gnunet-service-conversation.c:944
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1349
+#: src/conversation/gnunet-service-conversation.c:1351
 #, fuzzy, c-format
 msgid "Received incoming Cadet channel on port %u\n"
 msgstr "Desconectado de %s\n"
@@ -1317,7 +1336,7 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr "%24s: %-17s %4s   (%u conexiones en total)\n"
 
-#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:705
+#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:761
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Parámetro no válido «%s» en la línea de comandos\n"
@@ -1329,7 +1348,7 @@
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
 # Miguel: ¿Quizá continuamente fuese mejor?
-#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:1590
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2115
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
@@ -1362,54 +1381,54 @@
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de mensajes del tipo %u recibidos"
 
-#: src/core/gnunet-service-core_kx.c:549
+#: src/core/gnunet-service-core_kx.c:565
 msgid "# bytes encrypted"
 msgstr "# bytes cifrados"
 
-#: src/core/gnunet-service-core_kx.c:601
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes decrypted"
 msgstr "# bytes descifrados"
 
-#: src/core/gnunet-service-core_kx.c:688
+#: src/core/gnunet-service-core_kx.c:703
 msgid "# key exchanges initiated"
 msgstr "# intercambio de claves iniciados"
 
-#: src/core/gnunet-service-core_kx.c:732
+#: src/core/gnunet-service-core_kx.c:747
 msgid "# key exchanges stopped"
 msgstr "# intercambio de claves parados"
 
-#: src/core/gnunet-service-core_kx.c:832
+#: src/core/gnunet-service-core_kx.c:847
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:839
+#: src/core/gnunet-service-core_kx.c:854
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_kx.c:873
+#: src/core/gnunet-service-core_kx.c:888
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:884
+#: src/core/gnunet-service-core_kx.c:899
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# mensajes «SET_KEY» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:983
+#: src/core/gnunet-service-core_kx.c:998
 #: src/transport/gnunet-service-transport_validation.c:1016
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/core/gnunet-service-core_kx.c:991
+#: src/core/gnunet-service-core_kx.c:1006
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/core/gnunet-service-core_kx.c:1018
+#: src/core/gnunet-service-core_kx.c:1033
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
@@ -1418,84 +1437,84 @@
 "Recibido PING de «%s» para una identidad diferente: Yo soy «%s», identidad "
 "del PONG: «%s»\n"
 
-#: src/core/gnunet-service-core_kx.c:1035
+#: src/core/gnunet-service-core_kx.c:1049
 msgid "# PONG messages created"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:1061
+#: src/core/gnunet-service-core_kx.c:1075
 msgid "# sessions terminated by timeout"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1072
+#: src/core/gnunet-service-core_kx.c:1086
 msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
 
-#: src/core/gnunet-service-core_kx.c:1139
-#: src/transport/gnunet-service-transport_validation.c:1328
+#: src/core/gnunet-service-core_kx.c:1153
+#: src/transport/gnunet-service-transport_validation.c:1359
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1145
+#: src/core/gnunet-service-core_kx.c:1159
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1150
+#: src/core/gnunet-service-core_kx.c:1164
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/core/gnunet-service-core_kx.c:1180
+#: src/core/gnunet-service-core_kx.c:1194
 msgid "# PONG messages decrypted"
 msgstr "# mensajes PONG descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1215
+#: src/core/gnunet-service-core_kx.c:1229
 msgid "# session keys confirmed via PONG"
 msgstr "# claves de sesión confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1226
+#: src/core/gnunet-service-core_kx.c:1240
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/core/gnunet-service-core_kx.c:1233
+#: src/core/gnunet-service-core_kx.c:1247
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1374
+#: src/core/gnunet-service-core_kx.c:1386
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1381
+#: src/core/gnunet-service-core_kx.c:1393
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1384
+#: src/core/gnunet-service-core_kx.c:1396
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1430
-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1442
+#: src/core/gnunet-service-core_kx.c:1467
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1442
+#: src/core/gnunet-service-core_kx.c:1454
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1484
+#: src/core/gnunet-service-core_kx.c:1496
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1492
+#: src/core/gnunet-service-core_kx.c:1504
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1527
+#: src/core/gnunet-service-core_kx.c:1539
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
@@ -1522,14 +1541,13 @@
 #: src/core/gnunet-service-core_sessions.c:328
 #: src/dht/gnunet-service-dht_neighbours.c:662
 #: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:3586
-#: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
-#: src/topology/gnunet-daemon-topology.c:707
-#: src/topology/gnunet-daemon-topology.c:808
+#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1517
+#: src/topology/gnunet-daemon-topology.c:734
+#: src/topology/gnunet-daemon-topology.c:835
 #: src/transport/gnunet-service-transport_neighbours.c:917
 #: src/transport/gnunet-service-transport_neighbours.c:1141
-#: src/transport/gnunet-service-transport_neighbours.c:3146
-#: src/transport/gnunet-service-transport_neighbours.c:3449
+#: src/transport/gnunet-service-transport_neighbours.c:3177
+#: src/transport/gnunet-service-transport_neighbours.c:3491
 msgid "# peers connected"
 msgstr "# pares conectados"
 
@@ -1599,7 +1617,7 @@
 msgid "Heap datacache running\n"
 msgstr "Caché de datos de montículo (heap) ejecutándose\n"
 
-#: src/datacache/plugin_datacache_postgres.c:392
+#: src/datacache/plugin_datacache_postgres.c:391
 msgid "Postgres datacache running\n"
 msgstr "Caché de datos Postgres ejecutándose\n"
 
@@ -1619,25 +1637,25 @@
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
-#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:44
+#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:622
+#: src/include/gnunet_common.h:631 src/scalarproduct/scalarproduct.h:35
 #, 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:450
+#: src/datacache/plugin_datacache_sqlite.c:449
 msgid "Sqlite datacache running\n"
 msgstr "Caché de datos Sqlite ejecutándose\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:484
-#: src/datastore/plugin_datastore_sqlite.c:404
-#: src/namecache/plugin_namecache_sqlite.c:295
-#: src/namestore/plugin_namestore_sqlite.c:327
+#: src/datacache/plugin_datacache_sqlite.c:483
+#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/namecache/plugin_namecache_sqlite.c:292
+#: src/namestore/plugin_namestore_sqlite.c:324
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 "Se intentó cerrar sqlite sin finalizar todas las sentencias preparadas.\n"
 
-#: src/datacache/plugin_datacache_sqlite.c:491
+#: src/datacache/plugin_datacache_sqlite.c:490
 #, c-format
 msgid "Failed to close statement %p: %d\n"
 msgstr "Se produjo un fallo al cerrar la sentencia %p: %d\n"
@@ -1942,11 +1960,11 @@
 msgid "Mysql database running\n"
 msgstr "Base de datos Mysql ejecutándose\n"
 
-#: src/datastore/plugin_datastore_postgres.c:824
+#: src/datastore/plugin_datastore_postgres.c:832
 msgid "Failed to drop table from database.\n"
 msgstr "Se produjo un fallo al borrar una tabla de la base de datos.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:860
+#: src/datastore/plugin_datastore_postgres.c:868
 #: src/namecache/plugin_namecache_postgres.c:414
 #: src/namestore/plugin_namestore_postgres.c:569
 msgid "Postgres database running\n"
@@ -1963,25 +1981,25 @@
 #: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
-#: src/peerstore/plugin_peerstore_sqlite.c:434
-#: src/psycstore/plugin_psycstore_sqlite.c:319
+#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/psycstore/plugin_psycstore_sqlite.c:329
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Imposible inicializar SQLite: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:663
+#: src/datastore/plugin_datastore_sqlite.c:661
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 "Datos no válidos en la base de datos.  Intentando arreglar (por borrado).\n"
 
 # to should be too, i think
-#: src/datastore/plugin_datastore_sqlite.c:1156
+#: src/datastore/plugin_datastore_sqlite.c:1154
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 "la versión de sqlite es muy antigua para determinar el tamaño, se asume "
 "cero\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1175
+#: src/datastore/plugin_datastore_sqlite.c:1173
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
@@ -1990,9 +2008,9 @@
 "Usando la utilización de páginas de sqlite para estimar el «payload» (%llu "
 "páginas de %llu bytes de tamaño)\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1215
-#: src/namecache/plugin_namecache_sqlite.c:583
-#: src/namestore/plugin_namestore_sqlite.c:719
+#: src/datastore/plugin_datastore_sqlite.c:1213
+#: src/namecache/plugin_namecache_sqlite.c:580
+#: src/namestore/plugin_namestore_sqlite.c:716
 msgid "Sqlite database running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
 
@@ -2000,7 +2018,7 @@
 msgid "Template database running\n"
 msgstr "Base de datos de plantilla ejecutándose\n"
 
-#: src/dht/dht_api.c:376
+#: src/dht/dht_api.c:403
 msgid "Failed to connect to the DHT service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
@@ -2048,7 +2066,7 @@
 
 #: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:939
 #: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
@@ -2067,6 +2085,54 @@
 msgid "Prints all packets that go through the DHT."
 msgstr "Imprime todos los paquetes que pasan por la DHT."
 
+#: src/dht/gnunet_dht_profiler.c:1392
+#: src/testbed/gnunet-testbed-profiler.c:267
+#, fuzzy, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "El número máximo de conexiones es %u\n"
+
+#: src/dht/gnunet_dht_profiler.c:1417
+msgid "number of peers to start"
+msgstr "número de pares para empezar"
+
+#: src/dht/gnunet_dht_profiler.c:1420
+msgid ""
+"maximum number of times we try to search for successor circle formation (0 "
+"for R5N)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:864
+#: src/testbed/gnunet-testbed-profiler.c:306
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+"nombre del fichero con la información de acceso usada para la batería de "
+"pruebas"
+
+#: src/dht/gnunet_dht_profiler.c:1426
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1429
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1432
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1435
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1438
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1456
+#, fuzzy
+msgid "Measure quality and performance of the DHT service."
+msgstr "Medir la calidad y rendimiento del servicio NSE."
+
 #: src/dht/gnunet-dht-put.c:118
 msgid "PUT request sent with key"
 msgstr "Petición «PUT» enviada con clave"
@@ -2115,112 +2181,112 @@
 "Inicianco una petición «PUT» a la DHT de GNUnet para insertar «DATA» bajo "
 "«KEY»."
 
-#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:176
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:193
 msgid "Failed to connect to transport service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio de transporte!\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-xdht_clients.c:838
+#: src/dht/gnunet-service-xdht_clients.c:844
 msgid "# GET requests from clients injected"
 msgstr "# peticiones «GET» inyectadas de clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:925
+#: src/dht/gnunet-service-xdht_clients.c:928
 msgid "# PUT requests received from clients"
 msgstr "# peticiones «PUT» recibidas de clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-xdht_clients.c:1010
+#: src/dht/gnunet-service-xdht_clients.c:993
 msgid "# GET requests received from clients"
 msgstr "# peticiones «GET» recibidas de clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-xdht_clients.c:1211
+#: src/dht/gnunet-service-xdht_clients.c:1195
 msgid "# GET STOP requests received from clients"
 msgstr "# peticiones «GET STOP» recibidas de clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:1040
-#: src/dht/gnunet-service-xdht_clients.c:498
+#: src/dht/gnunet-service-xdht_clients.c:503
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 "# Coincidencias de clave, diferencias de tipo en la respuesta (REPLY) del "
 "cliente (CLIENT)"
 
 #: src/dht/gnunet-service-dht_clients.c:1053
-#: src/dht/gnunet-service-xdht_clients.c:511
+#: src/dht/gnunet-service-xdht_clients.c:517
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 "# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) omitidas"
 
 #: src/dht/gnunet-service-dht_clients.c:1090
-#: src/dht/gnunet-service-xdht_clients.c:548
+#: src/dht/gnunet-service-xdht_clients.c:554
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr "¡Tipo de bloque no soportado (%u) en la petición!\n"
 
 #: src/dht/gnunet-service-dht_clients.c:1113
-#: src/dht/gnunet-service-xdht_clients.c:571
+#: src/dht/gnunet-service-xdht_clients.c:577
 msgid "# RESULTS queued for clients"
 msgstr "# Resultados (RESULTS) encolados para clientes"
 
 #: src/dht/gnunet-service-dht_clients.c:1167
 #: src/dht/gnunet-service-dht_clients.c:1210
-#: src/dht/gnunet-service-xdht_clients.c:625
-#: src/dht/gnunet-service-xdht_clients.c:668
+#: src/dht/gnunet-service-xdht_clients.c:631
+#: src/dht/gnunet-service-xdht_clients.c:674
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 "# Respuestas (REPLIES) ignoradas para clientes (CLIENTS) (sin coincidencia)"
 
 #: src/dht/gnunet-service-dht_clients.c:1177
-#: src/dht/gnunet-service-xdht_clients.c:635
+#: src/dht/gnunet-service-xdht_clients.c:641
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 "¡No se pudo enviar respuesta al cliente, el mensaje es demasiado grande!\n"
 
 #: src/dht/gnunet-service-dht_datacache.c:68
-#: src/dht/gnunet-service-xdht_datacache.c:69
+#: src/dht/gnunet-service-xdht_datacache.c:71
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "¡Petición %s recibida, pero no tiene caché de datos!\n"
 
 #: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-xdht_datacache.c:79
+#: src/dht/gnunet-service-xdht_datacache.c:82
 msgid "# ITEMS stored in datacache"
 msgstr "# Elementos (ITEMS) almacenados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:213
+#: src/dht/gnunet-service-xdht_datacache.c:221
 msgid "# Good RESULTS found in datacache"
 msgstr "# Buenos resultados (RESULTS) encontrados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:244
 msgid "# Duplicate RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) duplicados encontrados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:240
+#: src/dht/gnunet-service-xdht_datacache.c:250
 msgid "# Invalid RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) no válidos encontrados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:246
+#: src/dht/gnunet-service-xdht_datacache.c:256
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) irrelevantes encontrados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:258
+#: src/dht/gnunet-service-xdht_datacache.c:268
 msgid "# Unsupported RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) no soportados encontrados en la caché de datos"
 
 #: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:261
+#: src/dht/gnunet-service-xdht_datacache.c:271
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr "¡Tipo de bloque no soportado (%u) en respuesta local!\n"
 
 #: src/dht/gnunet-service-dht_datacache.c:234
-#: src/dht/gnunet-service-xdht_datacache.c:298
+#: src/dht/gnunet-service-xdht_datacache.c:309
 msgid "# GET requests given to datacache"
 msgstr "# Peticiones «GET» realizadas a la caché de datos"
 
@@ -2238,16 +2304,16 @@
 msgstr "# mensajes «FIND PEER» iniciados"
 
 #: src/dht/gnunet-service-dht_neighbours.c:764
+#: src/dht/gnunet-service-xdht_neighbours.c:6055
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# Mensajes encolados descartados (par desconectado)"
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:745
+#: src/dht/gnunet-service-xdht_neighbours.c:1012
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes transmitidos a otros pares"
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:786
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Bytes de ancho de banda solicitados por el servicio principal"
 
@@ -2277,15 +2343,15 @@
 #: src/dht/gnunet-service-dht_neighbours.c:1328
 #: src/dht/gnunet-service-dht_neighbours.c:1452
 #: src/dht/gnunet-service-dht_neighbours.c:1557
-#: src/dht/gnunet-service-xdht_neighbours.c:843
-#: src/dht/gnunet-service-xdht_neighbours.c:910
-#: src/dht/gnunet-service-xdht_neighbours.c:980
-#: src/dht/gnunet-service-xdht_neighbours.c:1040
-#: src/dht/gnunet-service-xdht_neighbours.c:1098
-#: src/dht/gnunet-service-xdht_neighbours.c:1157
-#: src/dht/gnunet-service-xdht_neighbours.c:1218
-#: src/dht/gnunet-service-xdht_neighbours.c:1280
-#: src/dht/gnunet-service-xdht_neighbours.c:1341
+#: src/dht/gnunet-service-xdht_neighbours.c:1121
+#: src/dht/gnunet-service-xdht_neighbours.c:1190
+#: src/dht/gnunet-service-xdht_neighbours.c:1240
+#: src/dht/gnunet-service-xdht_neighbours.c:1304
+#: src/dht/gnunet-service-xdht_neighbours.c:1371
+#: src/dht/gnunet-service-xdht_neighbours.c:1433
+#: src/dht/gnunet-service-xdht_neighbours.c:1495
+#: src/dht/gnunet-service-xdht_neighbours.c:1557
+#: src/dht/gnunet-service-xdht_neighbours.c:1617
 msgid "# P2P messages dropped due to full queue"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
@@ -2386,6 +2452,110 @@
 msgid "# DHT requests combined"
 msgstr "# Peticiones a la DHT combinadas"
 
+#: src/dht/gnunet-service-xdht_neighbours.c:1824
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail_length = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1829
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail[%d]=%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1849
+#, c-format
+msgid ""
+"\n"
+"SUPU************  FRIEND_PEERMAP of %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1859
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1880
+#, c-format
+msgid ""
+"\n"
+"SUPU************  FINGER_TABLE of %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1889
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail_id[%d]=%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1902
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail[%d] = %s "
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:3551
+msgid "# FINGERS_COUNT"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:3692
+#: src/dht/gnunet-service-xdht_neighbours.c:3930
+#: src/dht/gnunet-service-xdht_neighbours.c:4083
+#: src/dht/gnunet-service-xdht_neighbours.c:4233
+#: src/dht/gnunet-service-xdht_neighbours.c:4414
+#: src/dht/gnunet-service-xdht_neighbours.c:4929
+#: src/dht/gnunet-service-xdht_neighbours.c:5323
+#: src/dht/gnunet-service-xdht_neighbours.c:5416
+#: src/dht/gnunet-service-xdht_neighbours.c:5505
+#: src/dht/gnunet-service-xdht_neighbours.c:5609
+#: src/dht/gnunet-service-xdht_neighbours.c:5753
+#: src/dht/gnunet-service-xdht_neighbours.c:5842
+#, fuzzy
+msgid "# Bytes received from other peers"
+msgstr "# respuestas recibidas de otros pares"
+
+#: src/dht/gnunet-service-xdht_routing.c:256
+#, c-format
+msgid ""
+"\n"
+"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:264
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->trail_id = %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:267
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->next_hop = %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:270
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->prev_hop = %s"
+msgstr ""
+
 #: src/dht/plugin_block_dht.c:138
 #, c-format
 msgid "Block not of type %u\n"
@@ -2400,14 +2570,14 @@
 msgid "Block of type %u is malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/dns/dnsparser.c:257
+#: src/dns/dnsparser.c:254
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 "Se produjo un fallo al convertir el nombre en formato DNS IDNA «%s» a UTF-8: "
 "%s\n"
 
-#: src/dns/dnsparser.c:856
+#: src/dns/dnsparser.c:818
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
@@ -2439,15 +2609,15 @@
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr "Recibida respuesta DNS demasiado pequeña (%u bytes)"
 
-#: src/dns/gnunet-dns-monitor.c:355
+#: src/dns/gnunet-dns-monitor.c:352
 msgid "only monitor DNS queries"
 msgstr "sólo monitorizar consultas DNS"
 
-#: src/dns/gnunet-dns-monitor.c:358
+#: src/dns/gnunet-dns-monitor.c:355
 msgid "only monitor DNS replies"
 msgstr "sólo monitorizar respuestas DNS"
 
-#: src/dns/gnunet-dns-monitor.c:369
+#: src/dns/gnunet-dns-monitor.c:366
 msgid "Monitor DNS queries."
 msgstr "Monitorizar consultas DNS."
 
@@ -2882,6 +3052,7 @@
 msgstr "# reconocimientos enviados por framentos"
 
 #: src/fragmentation/defragmentation.c:456
+#: src/transport/plugin_transport_wlan.c:1474
 msgid "# fragments received"
 msgstr "# fragmentos recibidos"
 
@@ -2925,79 +3096,79 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# transmisiones de fragmentos completadas"
 
-#: src/fs/fs_api.c:465
+#: src/fs/fs_api.c:474
 #, c-format
 msgid "Could not open file `%s': %s"
 msgstr "No se pudo abrir el fichero «%s»: %s"
 
-#: src/fs/fs_api.c:474
+#: src/fs/fs_api.c:485
 #, c-format
 msgid "Could not read file `%s': %s"
 msgstr "No se pudo leer el fichero «%s»: %s"
 
 # Short read??
-#: src/fs/fs_api.c:480
+#: src/fs/fs_api.c:493
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr "¡Lectura corta leyendo del fichero «%s»!"
 
-#: src/fs/fs_api.c:1066
+#: src/fs/fs_api.c:1101
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1571
+#: src/fs/fs_api.c:1621
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr "Fallo mientras se reiniciaba la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1585
+#: src/fs/fs_api.c:1635
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:2242
+#: src/fs/fs_api.c:2293
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de publicación «%s»: "
 "%s\n"
 
-#: src/fs/fs_api.c:2252
+#: src/fs/fs_api.c:2303
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de desindexado «%s»: %s\n"
 
-#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2619
+#: src/fs/fs_api.c:2431 src/fs/fs_api.c:2679
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-descarga «%s»: %s\n"
 
-#: src/fs/fs_api.c:2395
+#: src/fs/fs_api.c:2449
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2409 src/fs/fs_api.c:2428 src/fs/fs_api.c:2911
+#: src/fs/fs_api.c:2464 src/fs/fs_api.c:2483 src/fs/fs_api.c:2975
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2610
+#: src/fs/fs_api.c:2669
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 "Se produjo un fallo al retomar la sub-descarga «%s»: no se pudo abrir el "
 "fichero «%s»\n"
 
-#: src/fs/fs_api.c:2855
+#: src/fs/fs_api.c:2918
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 "No se pudo retomar la búsqueda en ejecución, se retomará como una búsqueda "
 "en pausa\n"
 
-#: src/fs/fs_api.c:2949
+#: src/fs/fs_api.c:3013
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3127,65 +3298,65 @@
 msgid "Failed to connect to datastore."
 msgstr "Se produjo un fallo al conectar con el almacén de datos."
 
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
+#: src/fs/fs_publish.c:126 src/fs/fs_publish.c:431
 #, c-format
 msgid "Publishing failed: %s"
 msgstr "Publicación fallida: %s"
 
-#: src/fs/fs_publish.c:667 src/fs/fs_publish.c:684 src/fs/fs_publish.c:723
-#: src/fs/fs_publish.c:744 src/fs/fs_publish.c:768 src/fs/fs_publish.c:914
+#: src/fs/fs_publish.c:683 src/fs/fs_publish.c:700 src/fs/fs_publish.c:739
+#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:934
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "No se pudo indexar el fichero «%s»: %s.  Se intentará insertar.\n"
 
-#: src/fs/fs_publish.c:669
+#: src/fs/fs_publish.c:685
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 "expiración del plazo en la petición de inicio de indexado (index-start) al "
 "servicio «fs»"
 
-#: src/fs/fs_publish.c:681
+#: src/fs/fs_publish.c:697
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: src/fs/fs_publish.c:725
+#: src/fs/fs_publish.c:741
 msgid "failed to compute hash"
 msgstr "se produjo un fallo al calcular el hash"
 
-#: src/fs/fs_publish.c:745
+#: src/fs/fs_publish.c:761
 msgid "filename too long"
 msgstr "nombre de fichero demasiado largo"
 
-#: src/fs/fs_publish.c:770
+#: src/fs/fs_publish.c:786
 msgid "could not connect to `fs' service"
 msgstr "no se pudo conectar con el servicio «fs»"
 
-#: src/fs/fs_publish.c:793
+#: src/fs/fs_publish.c:809
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/fs/fs_publish.c:862
+#: src/fs/fs_publish.c:878
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "La subida recursiva falló en «%s»: %s"
 
-#: src/fs/fs_publish.c:868
+#: src/fs/fs_publish.c:884
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Subida recursiva fallida: %s"
 
-#: src/fs/fs_publish.c:915
+#: src/fs/fs_publish.c:936
 msgid "needs to be an actual file"
 msgstr "tiene que ser un fichero de verdad"
 
-#: src/fs/fs_publish.c:1151
+#: src/fs/fs_publish.c:1172
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr "Espacio insuficiente para publicar: %s"
 
-#: src/fs/fs_publish.c:1243
+#: src/fs/fs_publish.c:1263
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr "Reservando espacio para %u entradas y %llu bytes para publicación\n"
@@ -3194,16 +3365,16 @@
 msgid "Could not connect to datastore."
 msgstr "No se pudo conectar con el almacén de datos."
 
-#: src/fs/fs_publish_ublock.c:219
+#: src/fs/fs_publish_ublock.c:243
 msgid "Internal error."
 msgstr "Error interno."
 
-#: src/fs/fs_search.c:751 src/fs/fs_search.c:817
+#: src/fs/fs_search.c:778 src/fs/fs_search.c:848
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Se produjo un fallo al procesar la URI: %s\n"
 
-#: src/fs/fs_search.c:876
+#: src/fs/fs_search.c:907
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3282,93 +3453,93 @@
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:379
+#: src/fs/fs_uri.c:378
 #, fuzzy
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:423
+#: src/fs/fs_uri.c:422
 #, fuzzy
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr "URI CHK mal formada"
 
-#: src/fs/fs_uri.c:438
+#: src/fs/fs_uri.c:437
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:517
+#: src/fs/fs_uri.c:516
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:532
+#: src/fs/fs_uri.c:531
 #, fuzzy
 msgid "LOC URI malformed (no CHK)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:542
+#: src/fs/fs_uri.c:541
 #, fuzzy
 msgid "LOC URI malformed (missing LOC)"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:550
+#: src/fs/fs_uri.c:549
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
 
-#: src/fs/fs_uri.c:558
+#: src/fs/fs_uri.c:557
 #, fuzzy
 msgid "LOC URI malformed (could not decode public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
 
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:563
 #, fuzzy
 msgid "LOC URI malformed (could not find signature)"
 msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
 
-#: src/fs/fs_uri.c:570
+#: src/fs/fs_uri.c:569
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
 
-#: src/fs/fs_uri.c:579
+#: src/fs/fs_uri.c:578
 #, fuzzy
 msgid "LOC URI malformed (could not decode signature)"
 msgstr "URI SKS mal formada (no se pudo decodificar la firma)"
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:584
 #, fuzzy
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
 
-#: src/fs/fs_uri.c:591
+#: src/fs/fs_uri.c:590
 #, fuzzy
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
 
-#: src/fs/fs_uri.c:603
+#: src/fs/fs_uri.c:602
 #, fuzzy
 msgid "LOC URI malformed (signature failed validation)"
 msgstr "URI SKS mal formada (se produjo un fallo al validar la firma)"
 
-#: src/fs/fs_uri.c:642
+#: src/fs/fs_uri.c:641
 msgid "Unrecognized URI type"
 msgstr "Tipo de URI no reconocido"
 
-#: src/fs/fs_uri.c:866
+#: src/fs/fs_uri.c:865
 msgid "Lacking key configuration settings.\n"
 msgstr "Falta configuración sobre las opciones de claves.\n"
 
-#: src/fs/fs_uri.c:872
+#: src/fs/fs_uri.c:871
 #, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "No se pudo acceder al fichero de clave de máquina «%s».\n"
 
-#: src/fs/fs_uri.c:1057 src/fs/fs_uri.c:1084
+#: src/fs/fs_uri.c:1056 src/fs/fs_uri.c:1083
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/fs/fs_uri.c:1090
+#: src/fs/fs_uri.c:1089
 msgid "Number of double-quotes not balanced!\n"
 msgstr "¡Número de comillas dobles no balanceado!\n"
 
@@ -3406,24 +3577,24 @@
 "Debes especificar uno y solo un nombre de directorio para publicación "
 "automática.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:824
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:886
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del emisor"
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:828
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:890
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 "deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:831
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:893
 msgid "do not use libextractor to add keywords or metadata"
 msgstr "no usar libextractor para añadir palabras clave o metadatos"
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:917
 msgid "specify the priority of the content"
 msgstr "especificar la prioridad del contenido"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:924
 msgid "set the desired replication LEVEL"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
@@ -3496,7 +3667,7 @@
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Finalizada descarga «%s» (%s/s).\n"
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:304
 #: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
@@ -3506,7 +3677,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "Tiene que especificar una URI como parámetro.\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:665
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:712
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Se produjo un fallo al procesar la URI: %s\n"
@@ -3519,7 +3690,7 @@
 msgid "Target filename must be specified.\n"
 msgstr "El nombre de fichero de destino debe ser especificado.\n"
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:856
 #: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -3589,91 +3760,96 @@
 "ejecuta una batería de pruebas para medir el rendimiento de la compartición "
 "de ficheros"
 
-#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
+#: src/fs/gnunet-publish.c:238 src/fs/gnunet-publish.c:250
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr "Publicando «%s» en %llu/%llu (%s restantes)\n"
 
-#: src/fs/gnunet-publish.c:250
+#: src/fs/gnunet-publish.c:257
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Error publicando: %s.\n"
 
-#: src/fs/gnunet-publish.c:260
+#: src/fs/gnunet-publish.c:268
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr "Publicación «%s» finalizada.\n"
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:273
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr "La URI es «%s».\n"
 
-#: src/fs/gnunet-publish.c:283
+#: src/fs/gnunet-publish.c:281
+#, fuzzy, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr "La URI es «%s».\n"
+
+#: src/fs/gnunet-publish.c:301
 msgid "Cleanup after abort complete.\n"
 msgstr "Limpieza completada\n"
 
-#: src/fs/gnunet-publish.c:401
+#: src/fs/gnunet-publish.c:427
 #, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Metadatos para el fichero «%s» (%s)\n"
 
-#: src/fs/gnunet-publish.c:403
+#: src/fs/gnunet-publish.c:429
 #, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Palabras clave para el fichero «%s» (%s)\n"
 
-#: src/fs/gnunet-publish.c:542
+#: src/fs/gnunet-publish.c:572
 msgid "Could not publish\n"
 msgstr "No se pudo publicar\n"
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:597
 msgid "Could not start publishing.\n"
 msgstr "No se pudo empezar a publicar.\n"
 
-#: src/fs/gnunet-publish.c:598
+#: src/fs/gnunet-publish.c:631
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/fs/gnunet-publish.c:600
+#: src/fs/gnunet-publish.c:635
 #, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Escaneando fichero «%s».\n"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:641
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr "Hubo un problema procesando el fichero «%s», omitiéndolo.\n"
 
-#: src/fs/gnunet-publish.c:610
+#: src/fs/gnunet-publish.c:648
 msgid "Preprocessing complete.\n"
 msgstr "Preprocesado completo.\n"
 
-#: src/fs/gnunet-publish.c:614
+#: src/fs/gnunet-publish.c:653
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Extracción de metadatos del fichero «%s» completa.\n"
 
-#: src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-publish.c:660
 msgid "Meta data extraction has finished.\n"
 msgstr "La extracción de metadatos ha finalizado.\n"
 
-#: src/fs/gnunet-publish.c:625
+#: src/fs/gnunet-publish.c:669
 msgid "Internal error scanning directory.\n"
 msgstr "Error interno escaneando directorio.\n"
 
-#: src/fs/gnunet-publish.c:656
+#: src/fs/gnunet-publish.c:701
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Espacio de nombres «%s» desconocido.\n"
 
-#: src/fs/gnunet-publish.c:682
+#: src/fs/gnunet-publish.c:733
 #, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Se produjo un fallo al acceder «%s»: %s\n"
 
-#: src/fs/gnunet-publish.c:695
+#: src/fs/gnunet-publish.c:747
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
@@ -3681,34 +3857,34 @@
 "Se produjo un fallo al iniciar el meta-escáner de directorios.  ¿Está "
 "«gnunet-helper-publish-fs» instalado?\n"
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:803
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "¡No se pueden extraer metadatos de una URI!\n"
 
-#: src/fs/gnunet-publish.c:754
+#: src/fs/gnunet-publish.c:810
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Se debe especificar uno y solo un nombre de fichero para insertar.\n"
 
-#: src/fs/gnunet-publish.c:760
+#: src/fs/gnunet-publish.c:816
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "No se puede especificar una URI y un nombre de fichero.\n"
 
-#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:824 src/vpn/gnunet-vpn.c:209
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n"
 
-#: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1387 src/transport/gnunet-transport.c:1417
-#: src/transport/gnunet-transport.c:1447
+#: src/fs/gnunet-publish.c:835 src/fs/gnunet-publish.c:843
+#: src/transport/gnunet-transport.c:1893 src/transport/gnunet-transport.c:1923
+#: src/transport/gnunet-transport.c:1953
 #, 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:835
+#: src/fs/gnunet-publish.c:897
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3716,7 +3892,7 @@
 "imprimir una lista de las palabras clave extraídas que podrían ser usadas, "
 "pero sin realizar la subida"
 
-#: src/fs/gnunet-publish.c:839
+#: src/fs/gnunet-publish.c:901
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3724,11 +3900,11 @@
 "añadir una palabra 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:843
+#: src/fs/gnunet-publish.c:905
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "establece los metadatos para el tipo TYPE dado al valor VALUE dado"
 
-#: src/fs/gnunet-publish.c:846
+#: src/fs/gnunet-publish.c:908
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3736,7 +3912,7 @@
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "cifrada en la base de datos de GNUnet)"
 
-#: src/fs/gnunet-publish.c:851
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3744,13 +3920,13 @@
 "especificar la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio de nombres únicamente)"
 
-#: src/fs/gnunet-publish.c:859
+#: src/fs/gnunet-publish.c:921
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publicar los ficheros bajo el seudónimo NAME (coloca el fichero en el "
 "espacio)"
 
-#: src/fs/gnunet-publish.c:865
+#: src/fs/gnunet-publish.c:927
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
@@ -3758,14 +3934,14 @@
 "únicamente simular el proceso pero no publicar nada realmente (útil para "
 "calcular URI)"
 
-#: src/fs/gnunet-publish.c:869
+#: src/fs/gnunet-publish.c:931
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "establece la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:873
+#: src/fs/gnunet-publish.c:935
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3773,7 +3949,7 @@
 "URI a ser publicada (puede ser usado en vez de pasar un fichero para añadir "
 "claves con el fichero con la URI respectiva)"
 
-#: src/fs/gnunet-publish.c:889
+#: src/fs/gnunet-publish.c:951
 msgid "Publish a file or directory on GNUnet"
 msgstr "Publicar un fichero o un directorio en GNUnet"
 
@@ -3817,23 +3993,25 @@
 msgid "# running average P2P latency (ms)"
 msgstr "# latencia media de P2P en ejecución (ms)"
 
-#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:545
+#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:540
 msgid "# Loopback routes suppressed"
 msgstr "# Rutas en bucle local eliminadas"
 
-#: src/fs/gnunet-service-fs.c:645 src/hostlist/gnunet-daemon-hostlist.c:303
-#: src/topology/gnunet-daemon-topology.c:1260
-#: src/topology/gnunet-daemon-topology.c:1267
+#: src/fs/gnunet-service-fs.c:650 src/hostlist/gnunet-daemon-hostlist.c:303
+#: src/sensordashboard/gnunet-service-sensordashboard.c:854
+#: src/sensordashboard/gnunet-service-sensordashboard.c:862
+#: src/topology/gnunet-daemon-topology.c:1287
+#: src/topology/gnunet-daemon-topology.c:1294
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Se produjo un fallo al conectar con el servicio «%s».\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:484
+#: src/fs/gnunet-service-fs_cadet_client.c:494
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# respuestas recibidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:498
+#: src/fs/gnunet-service-fs_cadet_client.c:508
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# respuestas recibidas omitidas vía «stream»"
@@ -3843,105 +4021,105 @@
 msgid "# Blocks transferred via cadet"
 msgstr "# Bloques transferidos vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:352
+#: src/fs/gnunet-service-fs_cadet_server.c:361
 #, fuzzy
-msgid "# queries received via cadet not answered"
+msgid "# queries received via CADET not answered"
 msgstr "# consultas recibidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:432
+#: src/fs/gnunet-service-fs_cadet_server.c:441
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# consultas recibidas vía «stream»"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:476
+#: src/fs/gnunet-service-fs_cadet_server.c:485
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# conexiones de clientes «stream» rechazadas"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:482
-#: src/fs/gnunet-service-fs_cadet_server.c:522
+#: src/fs/gnunet-service-fs_cadet_server.c:491
+#: src/fs/gnunet-service-fs_cadet_server.c:531
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# conexiones «stream» activas"
 
-#: src/fs/gnunet-service-fs_cp.c:682
+#: src/fs/gnunet-service-fs_cp.c:698
 msgid "# migration stop messages received"
 msgstr "# mensajes de detención de migración recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:686
+#: src/fs/gnunet-service-fs_cp.c:702
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr "Migración de contenido al par «%s» bloqueada durante %s\n"
 
-#: src/fs/gnunet-service-fs_cp.c:721
+#: src/fs/gnunet-service-fs_cp.c:737
 msgid "# replies transmitted to other peers"
 msgstr "# respuestas transmitidas a otros pares"
 
-#: src/fs/gnunet-service-fs_cp.c:727
+#: src/fs/gnunet-service-fs_cp.c:743
 msgid "# replies dropped"
 msgstr "# respuestas omitidas"
 
-#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301
+#: src/fs/gnunet-service-fs_cp.c:768 src/fs/gnunet-service-fs_cp.c:1317
 msgid "# P2P searches active"
 msgstr "# busquedas P2P activas"
 
-#: src/fs/gnunet-service-fs_cp.c:845
+#: src/fs/gnunet-service-fs_cp.c:861
 msgid "# artificial delays introduced (ms)"
 msgstr "# retardos artificiales introducidos (ms)"
 
-#: src/fs/gnunet-service-fs_cp.c:898
+#: src/fs/gnunet-service-fs_cp.c:914
 msgid "# replies dropped due to type mismatch"
 msgstr "# respuestas omitidas debido a incompatibilidad de tipos"
 
-#: src/fs/gnunet-service-fs_cp.c:906
+#: src/fs/gnunet-service-fs_cp.c:922
 msgid "# replies received for other peers"
 msgstr "# respuestas recibidas de otros pares"
 
-#: src/fs/gnunet-service-fs_cp.c:920
+#: src/fs/gnunet-service-fs_cp.c:936
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr "# respuestas omitidas debido a insuficiente tráfico de cobertura"
 
-#: src/fs/gnunet-service-fs_cp.c:958
+#: src/fs/gnunet-service-fs_cp.c:974
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr "# búsquedas P2P destruidas debido a respuesta definitiva"
 
-#: src/fs/gnunet-service-fs_cp.c:1026
+#: src/fs/gnunet-service-fs_cp.c:1042
 msgid "# requests done for free (low load)"
 msgstr "# peticiones realizadas gratuitamente (baja carga)"
 
-#: src/fs/gnunet-service-fs_cp.c:1051
+#: src/fs/gnunet-service-fs_cp.c:1067
 msgid "# request dropped, priority insufficient"
 msgstr "# peticiones omitidas, prioridad insuficiente"
 
-#: src/fs/gnunet-service-fs_cp.c:1061
+#: src/fs/gnunet-service-fs_cp.c:1077
 msgid "# requests done for a price (normal load)"
 msgstr "# peticiones realizadas por un precio (carga normal)"
 
-#: src/fs/gnunet-service-fs_cp.c:1139
+#: src/fs/gnunet-service-fs_cp.c:1155
 msgid "# GET requests received (from other peers)"
 msgstr "# peticiones «GET» recibidas (de otros pares)"
 
-#: src/fs/gnunet-service-fs_cp.c:1173
+#: src/fs/gnunet-service-fs_cp.c:1189
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# peticiones omitidas debido a que el iniciador no está conectado"
 
-#: src/fs/gnunet-service-fs_cp.c:1195
+#: src/fs/gnunet-service-fs_cp.c:1211
 msgid "# requests dropped due to missing reverse route"
 msgstr "# peticiones omitidas debido a falta de ruta inversa"
 
-#: src/fs/gnunet-service-fs_cp.c:1246
+#: src/fs/gnunet-service-fs_cp.c:1262
 msgid "# requests dropped due TTL underflow"
 msgstr "# peticiones omitidas debido a expiración del TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1270
+#: src/fs/gnunet-service-fs_cp.c:1286
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# peticiones omitidas debido a una petición de mayor TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1299
+#: src/fs/gnunet-service-fs_cp.c:1315
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes de búsqueda P2P recibidos y procesados"
 
-#: src/fs/gnunet-service-fs_cp.c:1670
+#: src/fs/gnunet-service-fs_cp.c:1691
 msgid "# migration stop messages sent"
 msgstr "# mensajes de detención de migración enviados"
 
@@ -3996,19 +4174,19 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "El fichero indexado «%s» ha cambiado en el desplazamiento %llu\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:370
 msgid "# client searches active"
 msgstr "# búsquedas de clientes activas"
 
-#: src/fs/gnunet-service-fs_lc.c:256
+#: src/fs/gnunet-service-fs_lc.c:258
 msgid "# replies received for local clients"
 msgstr "# respuestas recibidas de clientes locales"
 
-#: src/fs/gnunet-service-fs_lc.c:327
+#: src/fs/gnunet-service-fs_lc.c:329
 msgid "# client searches received"
 msgstr "# búsquedas de clientes recibidas"
 
-#: src/fs/gnunet-service-fs_lc.c:362
+#: src/fs/gnunet-service-fs_lc.c:364
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 "# búsquedas de clientes actualizadas (contenido unido visto en la lista)"
@@ -4133,7 +4311,7 @@
 msgstr "# búsquedas fallidas de bloques bajo demanda"
 
 #: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
-#: src/fs/gnunet-service-fs_pr.c:1590
+#: src/fs/gnunet-service-fs_pr.c:1612
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (error encolando)"
 
@@ -4146,11 +4324,11 @@
 msgid "# Datastore lookups concluded (load too high)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (carga demasiado alta)"
 
-#: src/fs/gnunet-service-fs_pr.c:1566
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# Datastore lookups initiated"
 msgstr "# Búsquedas en el almacén de datos iniciadas"
 
-#: src/fs/gnunet-service-fs_pr.c:1651
+#: src/fs/gnunet-service-fs_pr.c:1673
 msgid "# GAP PUT messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
@@ -4197,7 +4375,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n"
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:695
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:696
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Número de puerto %llu no válido.  Saliendo.\n"
@@ -4282,61 +4460,66 @@
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)"
 
-#: src/gns/gnunet-gns.c:227
+#: src/gns/gnunet-gns.c:215
 #, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+#, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:308
+#: src/gns/gnunet-gns.c:314
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:347 src/gns/gnunet-gns-helper-service-w32.c:798
+#: src/gns/gnunet-gns.c:353 src/gns/gnunet-gns-helper-service-w32.c:798
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:386 src/gns/gnunet-gns-helper-service-w32.c:828
+#: src/gns/gnunet-gns.c:392 src/gns/gnunet-gns-helper-service-w32.c:828
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/gns/gnunet-gns.c:399
+#: src/gns/gnunet-gns.c:405
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:449
+#: src/gns/gnunet-gns.c:455
 msgid "Lookup a record for the given name"
 msgstr "Buscar el registro para el nombre dado"
 
-#: src/gns/gnunet-gns.c:452
+#: src/gns/gnunet-gns.c:458
 msgid "Specify the type of the record to lookup"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:455
+#: src/gns/gnunet-gns.c:461
 #, fuzzy
 msgid "Specify timeout for the lookup"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:458
+#: src/gns/gnunet-gns.c:464
 msgid "No unneeded output"
 msgstr "Sin salida innecesaria"
 
-#: src/gns/gnunet-gns.c:461
+#: src/gns/gnunet-gns.c:467
 #, fuzzy
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:464
+#: src/gns/gnunet-gns.c:470
 #, fuzzy
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:478
+#: src/gns/gnunet-gns.c:484
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Herramienta de acceso GNUnet GNS"
@@ -4367,8 +4550,8 @@
 #: src/hostlist/gnunet-daemon-hostlist_client.c:931
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1026
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/transport/plugin_transport_http_client.c:1095
-#: src/transport/plugin_transport_http_client.c:1110
+#: src/transport/plugin_transport_http_client.c:595
+#: src/transport/plugin_transport_http_client.c:613
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
@@ -4438,66 +4621,66 @@
 msgid "Failed to pass client to MHD\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/gns/gnunet-gns-proxy.c:2504
+#: src/gns/gnunet-gns-proxy.c:2518
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2533
+#: src/gns/gnunet-gns-proxy.c:2547
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
+#: src/gns/gnunet-gns-proxy.c:2565 src/gns/gnunet-gns-proxy.c:2594
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2631
+#: src/gns/gnunet-gns-proxy.c:2645
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:2970
+#: src/gns/gnunet-gns-proxy.c:2984
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3010
+#: src/gns/gnunet-gns-proxy.c:3024
 #, fuzzy, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 "Ningún puerto fue configurado para el módulo «%s», no se puede probar\n"
 
-#: src/gns/gnunet-gns-proxy.c:3072
+#: src/gns/gnunet-gns-proxy.c:3086
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:3113
+#: src/gns/gnunet-gns-proxy.c:3127
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3116
+#: src/gns/gnunet-gns-proxy.c:3130
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3135
+#: src/gns/gnunet-gns-proxy.c:3149
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
-#: src/gns/gnunet-service-gns.c:862
+#: src/gns/gnunet-service-gns.c:864
 msgid "Failed to connect to the namestore!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/gns/gnunet-service-gns.c:870
+#: src/gns/gnunet-service-gns.c:872
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/gns/gnunet-service-gns.c:903
+#: src/gns/gnunet-service-gns.c:905
 msgid "Could not connect to DHT!\n"
 msgstr "¡No se pudo conectar a la DHT!\n"
 
-#: src/gns/gnunet-service-gns.c:919
+#: src/gns/gnunet-service-gns.c:921
 #, fuzzy
 msgid "valid public key required"
 msgstr "Tipo requerido\n"
@@ -4512,205 +4695,233 @@
 msgid "Failed to connect to the DNS service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio GNS!\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:832
+#: src/gns/gnunet-service-gns_resolver.c:650
+#, fuzzy, c-format
+msgid "Protocol `%s' unknown, skipping labels.\n"
+msgstr "Módulo «%s» no encontrado\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:661
+#, c-format
+msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:854
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:974
+#: src/gns/gnunet-service-gns_resolver.c:996
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1333
+#: src/gns/gnunet-service-gns_resolver.c:1356
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1831
+#: src/gns/gnunet-service-gns_resolver.c:1886
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1855
+#: src/gns/gnunet-service-gns_resolver.c:1910
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2137
+#: src/gns/gnunet-service-gns_resolver.c:2192
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2286
+#: src/gns/gnunet-service-gns_resolver.c:2341
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:151
+#: src/gns/plugin_gnsrecord_gns.c:172
 #, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "No se pudo procesar el registro PKEY «%s»\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:180
+#: src/gns/plugin_gnsrecord_gns.c:201
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "No se pudo procesar el registro SOA «%s»\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:222
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr ""
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:217
+#: src/gns/plugin_gnsrecord_gns.c:245
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:293
+#: src/gns/plugin_gnsrecord_gns.c:280
+#, fuzzy, c-format
+msgid "Unable to parse BOX record string `%s'\n"
+msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:291
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "No se pudo procesar la dirección IPv4 «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:314
+#: src/gnsrecord/plugin_gnsrecord_dns.c:312
 #, fuzzy, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr ""
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:336
+#: src/gnsrecord/plugin_gnsrecord_dns.c:334
 #, fuzzy, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr ""
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:420
+#: src/gnsrecord/plugin_gnsrecord_dns.c:418
 #, fuzzy, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr ""
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:452
+#: src/gnsrecord/plugin_gnsrecord_dns.c:455
 #, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "No se pudo procesar el registro SOA «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:471
+#: src/gnsrecord/plugin_gnsrecord_dns.c:474
 #, fuzzy, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:494
+#: src/gnsrecord/plugin_gnsrecord_dns.c:497
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr ""
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:514
+#: src/gnsrecord/plugin_gnsrecord_dns.c:520
 #, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "No se pudo procesar el registro MX «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:529
+#: src/gnsrecord/plugin_gnsrecord_dns.c:535
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr ""
 "Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
 "de «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:549
+#: src/gnsrecord/plugin_gnsrecord_dns.c:562
+#, fuzzy, c-format
+msgid "Unable to parse SRV record `%s'\n"
+msgstr "No se pudo procesar el registro SOA «%s»\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:578
+#, fuzzy, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr ""
+"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
+"de «%s»\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:595
 #, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "No se pudo procesar dirección IPv4 «%s»\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:567
+#: src/gnsrecord/plugin_gnsrecord_dns.c:619
+#: src/gnsrecord/plugin_gnsrecord_dns.c:635
 #, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
 
-#: src/hello/gnunet-hello.c:123
+#: src/hello/gnunet-hello.c:126
 msgid "Call with name of HELLO file to modify.\n"
 msgstr "Llamar con el nombre del fichero «HELLO» para modificar.\n"
 
-#: src/hello/gnunet-hello.c:129
+#: src/hello/gnunet-hello.c:132
 #, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr "Error accediendo al fichero «%s»: %s\n"
 
-#: src/hello/gnunet-hello.c:137
+#: src/hello/gnunet-hello.c:140
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr "El fichero «%s» es demasiado grande para ser un «HELLO»\n"
 
-#: src/hello/gnunet-hello.c:144
+#: src/hello/gnunet-hello.c:147
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr "El fichero «%s» es demasiado pequeño para ser un «HELLO»\n"
 
-#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183
+#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:196
 #, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Error abriendo fichero «%s»: %s\n"
 
-#: src/hello/gnunet-hello.c:170
+#: src/hello/gnunet-hello.c:173
 #, c-format
 msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr "No se encontró un «HELLO» bien formado en el fichero «%s»\n"
 
-#: src/hello/gnunet-hello.c:195
+#: src/hello/gnunet-hello.c:208
 #, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "Error escribiendo «HELLO» al fichero «%s»: %s\n"
 
-#: src/hello/gnunet-hello.c:203
+#: src/hello/gnunet-hello.c:216
 #, c-format
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:957
+#: src/hello/hello.c:955
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: falta el tiempo de "
 "expiración\n"
 
-#: src/hello/hello.c:966
+#: src/hello/hello.c:964
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: tiempo de expiración no "
 "válido\n"
 
-#: src/hello/hello.c:976
+#: src/hello/hello.c:974
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: mal formado\n"
 
-#: src/hello/hello.c:986
+#: src/hello/hello.c:984
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: falta el módulo de "
 "transporte\n"
 
-#: src/hello/hello.c:1004
+#: src/hello/hello.c:1002
 #, fuzzy, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/hello/hello.c:1012
+#: src/hello/hello.c:1010
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr "El módulo «%s» no soporta URI todavía\n"
 
-#: src/hello/hello.c:1031
+#: src/hello/hello.c:1025
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
 "Se produjo un fallo al procesar «%s» como una dirección para el módulo «%s»\n"
 
-#: src/hello/hello.c:1104
+#: src/hello/hello.c:1098
 #, c-format
 msgid "HELLO URI contained %u addresses, added %u addresses\n"
 msgstr ""
@@ -4886,7 +5097,7 @@
 msgstr "# URI de listas de máquinas escritas a fichero"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1581
-#: src/transport/plugin_transport_http_client.c:1866
+#: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
@@ -4912,108 +5123,118 @@
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "El fichero de listas de máquinas «%s» no pudo ser eliminado\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:143
+#: src/hostlist/gnunet-daemon-hostlist_server.c:165
 msgid "bytes in hostlist"
 msgstr "bytes en la lista de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:168
+#: src/hostlist/gnunet-daemon-hostlist_server.c:190
 msgid "expired addresses encountered"
 msgstr "direcciones expiradas encontradas"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:203
-#: src/hostlist/gnunet-daemon-hostlist_server.c:534
-#: src/peerinfo-tool/gnunet-peerinfo.c:361
-#: src/peerinfo-tool/gnunet-peerinfo.c:430
-#: src/peerinfo-tool/gnunet-peerinfo.c:501
-#: src/topology/gnunet-daemon-topology.c:925
+#: src/hostlist/gnunet-daemon-hostlist_server.c:225
+#: src/hostlist/gnunet-daemon-hostlist_server.c:535
+#: src/peerinfo-tool/gnunet-peerinfo.c:367
+#: src/peerinfo-tool/gnunet-peerinfo.c:452
+#: src/peerinfo-tool/gnunet-peerinfo.c:535
+#: src/topology/gnunet-daemon-topology.c:952
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 "Error en la comunicación con el servicio de información de pares (PEERINFO): "
 "%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:227
+#: src/hostlist/gnunet-daemon-hostlist_server.c:249
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr "«HELLO» sin dirección encontrados (ignorados)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:243
+#: src/hostlist/gnunet-daemon-hostlist_server.c:265
 msgid "bytes not included in hostlist (size limit)"
 msgstr "bytes no incluidos en la lista de máquinas (límite de tamaño)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:363
+#: src/hostlist/gnunet-daemon-hostlist_server.c:365
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:366
+#: src/hostlist/gnunet-daemon-hostlist_server.c:368
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "Peticiones de listas de máquinas rechazadas (no HTTP GET)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:380
+#: src/hostlist/gnunet-daemon-hostlist_server.c:382
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr "Rechazando petición «%s» con %llu bytes de datos de subida\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:384
+#: src/hostlist/gnunet-daemon-hostlist_server.c:386
 msgid "hostlist requests refused (upload data)"
 msgstr "Peticiones de listas de máquinas rechazadas (datos de subida)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:391
+#: src/hostlist/gnunet-daemon-hostlist_server.c:393
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 "No se pudo manejar una petición de lista de máquinas debido a que no hay una "
 "respuesta todavía\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:394
+#: src/hostlist/gnunet-daemon-hostlist_server.c:396
 msgid "hostlist requests refused (not ready)"
 msgstr "Peticiones de listas de máquinas rechazadas (no preparados)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:399
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 msgid "Received request for our hostlist\n"
 msgstr "Peticiones recibidas de nuestra lista de máquinas\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:403
 msgid "hostlist requests processed"
 msgstr "Peticiones de lista de máquinas procesadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:448
+#: src/hostlist/gnunet-daemon-hostlist_server.c:449
 msgid "# hostlist advertisements send"
 msgstr "# anuncios de listas de máquinas enviados"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:496
+#: src/hostlist/gnunet-daemon-hostlist_server.c:497
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 "Los mensajes de anuncio no pudieron encolarse por el servicio principal\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:683
-#: src/peerinfo-tool/gnunet-peerinfo.c:650
-#: src/transport/gnunet-service-transport.c:1136
+#: src/hostlist/gnunet-daemon-hostlist_server.c:684
+#: src/peerinfo-tool/gnunet-peerinfo.c:696
+#: src/transport/gnunet-service-transport.c:1127
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
 "Saliendo.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:707
+#: src/hostlist/gnunet-daemon-hostlist_server.c:708
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr "Servicio de listas de máquinas arranca en %s:%llu\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:722
+#: src/hostlist/gnunet-daemon-hostlist_server.c:723
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Dirección para obtener la lista de máquinas: «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:760
+#: src/hostlist/gnunet-daemon-hostlist_server.c:736
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:749
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
+msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:770
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:780
+#: src/hostlist/gnunet-daemon-hostlist_server.c:790
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:820
+#: src/hostlist/gnunet-daemon-hostlist_server.c:830
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -5128,7 +5349,7 @@
 msgid "No records found for `%s'"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:402
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr "\tRegistro corrupto o no soportado del tipo %u\n"
@@ -5138,7 +5359,7 @@
 msgid "You must specify which zone should be accessed\n"
 msgstr "Se debe especificar un apodo\n"
 
-#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:783
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:844
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
@@ -5148,7 +5369,7 @@
 msgid "You must specify a name\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1020
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1084
 msgid "name of the record to add/delete/display"
 msgstr "nombre del registro a añadir/borrar/mostrar"
 
@@ -5157,7 +5378,7 @@
 msgid "spezifies the public key of the zone to look in"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1055
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1116
 msgid "GNUnet zone manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
 
@@ -5171,226 +5392,234 @@
 msgid "Failed to create indices\n"
 msgstr "Se produjo un fallo al crear los índices\n"
 
-#: src/namestore/gnunet-namestore.c:308
+#: src/namestore/gnunet-namestore.c:303
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr "No se pudo añadir el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:337
+#: src/namestore/gnunet-namestore.c:332
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:344
+#: src/namestore/gnunet-namestore.c:339
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:567
+#: src/namestore/gnunet-namestore.c:477 src/namestore/gnunet-namestore.c:485
+#: src/namestore/gnunet-namestore.c:493
 #, c-format
+msgid "A %s record exists already under `%s', no other records can be added.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:507 src/namestore/gnunet-namestore.c:519
+#: src/namestore/gnunet-namestore.c:531
+#, c-format
+msgid "Records already exist under `%s', cannot add `%s' record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:628
+#, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:606
+#: src/namestore/gnunet-namestore.c:667
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:647
+#: src/namestore/gnunet-namestore.c:708
 #, c-format
 msgid "No options given\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/namestore/gnunet-namestore.c:658
-#: src/namestore/gnunet-namestore-fcfsd.c:970
+#: src/namestore/gnunet-namestore.c:719
+#: src/namestore/gnunet-namestore-fcfsd.c:984
 msgid "Failed to connect to namestore\n"
 msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
 
-#: src/namestore/gnunet-namestore.c:666 src/namestore/gnunet-namestore.c:675
-#: src/namestore/gnunet-namestore.c:692 src/namestore/gnunet-namestore.c:714
-#: src/namestore/gnunet-namestore.c:754
+#: src/namestore/gnunet-namestore.c:727 src/namestore/gnunet-namestore.c:736
+#: src/namestore/gnunet-namestore.c:753 src/namestore/gnunet-namestore.c:775
+#: src/namestore/gnunet-namestore.c:815
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:667 src/namestore/gnunet-namestore.c:676
-#: src/namestore/gnunet-namestore.c:693 src/namestore/gnunet-namestore.c:715
+#: src/namestore/gnunet-namestore.c:728 src/namestore/gnunet-namestore.c:737
+#: src/namestore/gnunet-namestore.c:754 src/namestore/gnunet-namestore.c:776
 msgid "add"
 msgstr "añadir"
 
-#: src/namestore/gnunet-namestore.c:684
+#: src/namestore/gnunet-namestore.c:745
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:704
+#: src/namestore/gnunet-namestore.c:765
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "Valor «%s» no válido para el tipo de registro «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:740
+#: src/namestore/gnunet-namestore.c:801
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:755
+#: src/namestore/gnunet-namestore.c:816
 msgid "del"
 msgstr "borrar"
 
-#: src/namestore/gnunet-namestore.c:803
-#: src/peerinfo-tool/gnunet-peerinfo.c:734
+#: src/namestore/gnunet-namestore.c:868
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:838
+#: src/namestore/gnunet-namestore.c:903
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:878
+#: src/namestore/gnunet-namestore.c:943
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/namestore/gnunet-namestore.c:905
+#: src/namestore/gnunet-namestore.c:970
 #, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/namestore/gnunet-namestore.c:941
+#: src/namestore/gnunet-namestore.c:1006
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/namestore/gnunet-namestore.c:953
+#: src/namestore/gnunet-namestore.c:1018
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/namestore/gnunet-namestore.c:1002
+#: src/namestore/gnunet-namestore.c:1066
 msgid "add record"
 msgstr "añadir registro"
 
-#: src/namestore/gnunet-namestore.c:1005
+#: src/namestore/gnunet-namestore.c:1069
 msgid "delete record"
 msgstr "borrar registro"
 
-#: src/namestore/gnunet-namestore.c:1008
+#: src/namestore/gnunet-namestore.c:1072
 msgid "display records"
 msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore.c:1011
+#: src/namestore/gnunet-namestore.c:1075
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 "tiempo de expiración del registro a usar (únicamente para añadir), nunca "
 "(\"never\") es posible"
 
-#: src/namestore/gnunet-namestore.c:1014
+#: src/namestore/gnunet-namestore.c:1078
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
-#: src/namestore/gnunet-namestore.c:1017
+#: src/namestore/gnunet-namestore.c:1081
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/namestore/gnunet-namestore.c:1023
+#: src/namestore/gnunet-namestore.c:1087
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "establece las preferencias para el par dado"
 
-#: src/namestore/gnunet-namestore.c:1026
+#: src/namestore/gnunet-namestore.c:1090
 msgid "type of the record to add/delete/display"
 msgstr "tipo del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:1029
+#: src/namestore/gnunet-namestore.c:1093
 msgid "URI to import into our zone"
 msgstr "URI a importar a nuestra zona"
 
-#: src/namestore/gnunet-namestore.c:1032
+#: src/namestore/gnunet-namestore.c:1096
 msgid "value of the record to add/delete"
 msgstr "valor del registro a añadir/borrar"
 
-#: src/namestore/gnunet-namestore.c:1035
+#: src/namestore/gnunet-namestore.c:1099
 msgid "create or list public record"
 msgstr "crear o listar registros públicos"
 
-#: src/namestore/gnunet-namestore.c:1038
-msgid "create record that is pending approval (and thus for now inactive)"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1041
+#: src/namestore/gnunet-namestore.c:1102
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1044
+#: src/namestore/gnunet-namestore.c:1105
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "nombre de la sección a la que acceder"
 
 # form??
-#: src/namestore/gnunet-namestore-fcfsd.c:464
+#: src/namestore/gnunet-namestore-fcfsd.c:478
 #, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Forma de valor no soportada «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:491
+#: src/namestore/gnunet-namestore-fcfsd.c:505
 #, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:525
+#: src/namestore/gnunet-namestore-fcfsd.c:539
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr "Encontrado nombre «%s» para la clave dada\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:534
+#: src/namestore/gnunet-namestore-fcfsd.c:548
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:596
+#: src/namestore/gnunet-namestore-fcfsd.c:610
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr "Encontrados %u registros para el dominio «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:652
+#: src/namestore/gnunet-namestore-fcfsd.c:666
 #, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:668
+#: src/namestore/gnunet-namestore-fcfsd.c:682
 #, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:704
+#: src/namestore/gnunet-namestore-fcfsd.c:718
 msgid "Domain name must not contain `.'\n"
 msgstr "El nombre de dominio no puede contener «.»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:712
+#: src/namestore/gnunet-namestore-fcfsd.c:726
 msgid "Domain name must not contain `+'\n"
 msgstr "El nombre de dominio no puede contener «+»\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:910
+#: src/namestore/gnunet-namestore-fcfsd.c:924
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:936
+#: src/namestore/gnunet-namestore-fcfsd.c:950
 msgid "Failed to start HTTP server\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:978
+#: src/namestore/gnunet-namestore-fcfsd.c:992
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1011
+#: src/namestore/gnunet-namestore-fcfsd.c:1025
 #, fuzzy
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
@@ -5416,66 +5645,56 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr "Demonio de ayuda en las pruebas de recorrido NAT de GNUnet"
 
-#: src/nat/nat_auto.c:175
-msgid "NAT traversal with ICMP Server timed out.\n"
-msgstr "Recorrido NAT con servidor ICMP expirado.\n"
-
-#: src/nat/nat_auto.c:207
+#: src/nat/nat_auto.c:179
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr "Recorrido NAT con servidor ICMP satisfactorio.\n"
 
-#: src/nat/nat_auto.c:208
+#: src/nat/nat_auto.c:180
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr "Recorrido NAT con servidor ICMP fallido.\n"
 
-#: src/nat/nat_auto.c:229
+#: src/nat/nat_auto.c:201
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Probando conexión inversa con el servidor ICMP.\n"
 
-#: src/nat/nat_auto.c:284
+#: src/nat/nat_auto.c:249
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Detectada IP externa «%s»\n"
 
-#: src/nat/nat_auto.c:362
+#: src/nat/nat_auto.c:327
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 "Este sistema tiene una dirección IPv6 global, fijando IPv6 a habilitado.\n"
 
-#: src/nat/nat_auto.c:378
+#: src/nat/nat_auto.c:343
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "Detectada dirección de la red interna «%s».\n"
 
-#: src/nat/nat_auto.c:441
+#: src/nat/nat_auto.c:406
 msgid "upnpc found, enabling its use\n"
 msgstr "«upnpc» encontrado, habilitando su uso\n"
 
-#: src/nat/nat_auto.c:442
+#: src/nat/nat_auto.c:407
 msgid "upnpc not found\n"
 msgstr "«upnpc» no encontrado\n"
 
-#: src/nat/nat_auto.c:472
+#: src/nat/nat_auto.c:437
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:480
+#: src/nat/nat_auto.c:445 src/nat/nat_auto.c:490
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:488
+#: src/nat/nat_auto.c:453 src/nat/nat_auto.c:498
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
 
-#: src/nat/nat_auto.c:527
-msgid "gnunet-helper-nat-client found, enabling it\n"
-msgstr "«gnunet-helper-nat-client» encontrado, habilitando su uso\n"
-
-#: src/nat/nat_auto.c:528
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+#: src/nat/nat_auto.c:483
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
-"«gnunet-helper-nat-client» no encontrado o detrás de NAT, deshabilitando su "
-"uso\n"
 
 #: src/nat/nat.c:867
 #, c-format
@@ -5527,6 +5746,91 @@
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr "Ejecutando gnunet-helper-nat-client %s %s %u\n"
 
+#: src/nat/nat.c:1575
+msgid "Operation Successful"
+msgstr ""
+
+#: src/nat/nat.c:1577
+msgid "Internal Failure (IPC, ...)"
+msgstr ""
+
+#: src/nat/nat.c:1579
+msgid "Failure in network subsystem, check permissions."
+msgstr ""
+
+#: src/nat/nat.c:1581
+msgid "Encountered timeout while performing operation"
+msgstr ""
+
+#: src/nat/nat.c:1583
+msgid "detected that we are offline"
+msgstr ""
+
+#: src/nat/nat.c:1585
+#, fuzzy
+msgid "`upnpc` command not found"
+msgstr "comando «upnpc» no encontrado\n"
+
+#: src/nat/nat.c:1587
+#, fuzzy
+msgid "Failed to run `upnpc` command"
+msgstr "Se produjo un fallo al ejecutar «%s»\n"
+
+#: src/nat/nat.c:1589
+#, fuzzy
+msgid "`upnpc' command took too long, process killed"
+msgstr "comando «upnpc» no encontrado\n"
+
+#: src/nat/nat.c:1591
+msgid "`upnpc' command failed to establish port mapping"
+msgstr ""
+
+#: src/nat/nat.c:1593
+#, fuzzy
+msgid "`external-ip' command not found"
+msgstr "comando «external-ip» no encontrado\n"
+
+#: src/nat/nat.c:1595
+#, fuzzy
+msgid "Failed to run `external-ip` command"
+msgstr "Se produjo un fallo al ejecutar «%s»\n"
+
+#: src/nat/nat.c:1597
+#, fuzzy
+msgid "`external-ip' command output invalid"
+msgstr "comando «external-ip» no encontrado\n"
+
+#: src/nat/nat.c:1599
+msgid "no valid address was returned by `external-ip'"
+msgstr ""
+
+#: src/nat/nat.c:1601
+#, fuzzy
+msgid "Could not determine interface with internal/local network address"
+msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
+
+#: src/nat/nat.c:1603
+#, fuzzy
+msgid "No functioning gnunet-helper-nat-server installation found"
+msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
+
+#: src/nat/nat.c:1605
+msgid "NAT test could not be initialized"
+msgstr ""
+
+#: src/nat/nat.c:1607
+msgid "NAT test timeout reached"
+msgstr ""
+
+#: src/nat/nat.c:1609
+msgid "could not register NAT"
+msgstr ""
+
+#: src/nat/nat.c:1611
+#, fuzzy
+msgid "No working gnunet-helper-nat-client installation found"
+msgstr "No se ha encontrado un «gnunet-helper-nat-server» funcional\n"
+
 #: src/nat/nat_mini.c:203
 msgid "`external-ip' command not found\n"
 msgstr "comando «external-ip» no encontrado\n"
@@ -5535,18 +5839,18 @@
 msgid "`upnpc' command not found\n"
 msgstr "comando «upnpc» no encontrado\n"
 
-#: src/nat/nat_test.c:351
+#: src/nat/nat_test.c:360
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Se produjo un fallo al conectar con «gnunet-nat-server»\n"
 
-#: src/nat/nat_test.c:423
+#: src/nat/nat_test.c:462
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 "Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para "
 "pruebas NAT: %s\n"
 
-#: src/nat/nat_test.c:453
+#: src/nat/nat_test.c:497
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
@@ -5574,12 +5878,6 @@
 msgstr ""
 "nombre del fichero para escribir información y estadísticas de la conexión"
 
-#: src/nse/gnunet-nse-profiler.c:864 src/testbed/gnunet-testbed-profiler.c:306
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-"nombre del fichero con la información de acceso usada para la batería de "
-"pruebas"
-
 #: src/nse/gnunet-nse-profiler.c:867
 msgid "name of the file for writing the main results"
 msgstr "nombre del fichero en el que escribir los resultados principales"
@@ -5597,7 +5895,7 @@
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
 #: src/nse/gnunet-service-nse.c:1517
-#: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248
+#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:248
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5617,11 +5915,11 @@
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:466
+#: src/peerinfo/gnunet-service-peerinfo.c:468
 msgid "# peers known"
 msgstr "# pares conocidos"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:503
+#: src/peerinfo/gnunet-service-peerinfo.c:506
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5629,54 +5927,54 @@
 "El fichero «%s» en el directorio «%s» no sigue la convención de nombres. "
 "Eliminado.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:653
+#: src/peerinfo/gnunet-service-peerinfo.c:662
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:658
+#: src/peerinfo/gnunet-service-peerinfo.c:668
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "¡Aún no se han encontrado pares en «%s»!\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:994
+#: src/peerinfo/gnunet-service-peerinfo.c:1037
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1287
+#: src/peerinfo/gnunet-service-peerinfo.c:1358
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr "Importando HELLO de «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1298
+#: src/peerinfo/gnunet-service-peerinfo.c:1371
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:236
+#: src/peerinfo/peerinfo_api.c:237
 msgid "aborted due to explicit disconnect request"
 msgstr "abortado debido a petición de desconexión explícita"
 
-#: src/peerinfo/peerinfo_api.c:356 src/sensor/sensor_api.c:519
+#: src/peerinfo/peerinfo_api.c:363
 msgid "failed to transmit request (service down?)"
 msgstr ""
 "se produjo un fallo al transmitir la petición (¿está caido el servicio?)"
 
 # Miguel: "Failed to receive" también aquí está traducido como
 # "no se obtuvo respuesta" por claridad.
-#: src/peerinfo/peerinfo_api.c:506
+#: src/peerinfo/peerinfo_api.c:519
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 "No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
 
-#: src/peerinfo/peerinfo_api.c:547 src/peerinfo/peerinfo_api.c:566
-#: src/peerinfo/peerinfo_api.c:581 src/peerinfo/peerinfo_api.c:592
-#: src/peerinfo/peerinfo_api.c:603
+#: src/peerinfo/peerinfo_api.c:563 src/peerinfo/peerinfo_api.c:586
+#: src/peerinfo/peerinfo_api.c:603 src/peerinfo/peerinfo_api.c:616
+#: src/peerinfo/peerinfo_api.c:631
 msgid "Received invalid message from `PEERINFO' service."
 msgstr ""
 "Recibido mensaje no válido del servicio de información de pares (PEERINFO)."
 
-#: src/peerinfo/peerinfo_api.c:678
+#: src/peerinfo/peerinfo_api.c:720
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr ""
 "Petición de transmisión de iteración de expiración al servicio de "
@@ -5687,146 +5985,214 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "No se pudo conectar al servicio %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:233
+#: src/peerinfo-tool/gnunet-peerinfo.c:230
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Par «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:240
+#: src/peerinfo-tool/gnunet-peerinfo.c:237
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:282
+#: src/peerinfo-tool/gnunet-peerinfo.c:286
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Se produjo un fallo al resolver la dirección para el par «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:439
+#: src/peerinfo-tool/gnunet-peerinfo.c:462
 #, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:447
+#: src/peerinfo-tool/gnunet-peerinfo.c:471
 #, fuzzy, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr "recibido mensaje '%s' no válido: %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:456
+#: src/peerinfo-tool/gnunet-peerinfo.c:483
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:469
+#: src/peerinfo-tool/gnunet-peerinfo.c:502
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:533
+#: src/peerinfo-tool/gnunet-peerinfo.c:570
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fallo añadiendo «HELLO»: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:644
+#: src/peerinfo-tool/gnunet-peerinfo.c:687
 #, fuzzy, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:665 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:718 src/util/gnunet-scrypt.c:224
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "La carga de la clave de la máquina desde «%s» ha fallado.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:756
+#: src/peerinfo-tool/gnunet-peerinfo.c:816
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par «%s».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:800
+#: src/peerinfo-tool/gnunet-peerinfo.c:865
 msgid "don't resolve host names"
 msgstr "no resolver nombres de máquina"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:803
+#: src/peerinfo-tool/gnunet-peerinfo.c:868
 msgid "output only the identity strings"
 msgstr "mostrar únicamente las cadenas de identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:806
+#: src/peerinfo-tool/gnunet-peerinfo.c:871
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:809
+#: src/peerinfo-tool/gnunet-peerinfo.c:874
 msgid "output our own identity only"
 msgstr "muestra únicamente nuestra propia identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:812
+#: src/peerinfo-tool/gnunet-peerinfo.c:877
 msgid "list all known peers"
 msgstr "mostrar todos los pares conocidos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:815
+#: src/peerinfo-tool/gnunet-peerinfo.c:880
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:818
+#: src/peerinfo-tool/gnunet-peerinfo.c:883
 msgid "also output HELLO uri(s)"
 msgstr "también mostrar las URI de «HELLO»"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:821
+#: src/peerinfo-tool/gnunet-peerinfo.c:886
 msgid "add given HELLO uri to the database"
 msgstr "añade la URI de «HELLO» dada a la base de datos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:832
+#: src/peerinfo-tool/gnunet-peerinfo.c:900
 msgid "Print information about peers."
 msgstr "Imprimir información sobre los pares."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:128
+#: src/transport/gnunet-service-transport_plugins.c:127
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Iniciando los módulos de transporte «%s»\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:133
+#: src/transport/gnunet-service-transport_plugins.c:132
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Cargando el módulo de transporte «%s»\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:165
+#: src/transport/gnunet-service-transport_plugins.c:164
 #, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
-#: src/peerstore/gnunet-peerstore.c:97
+#: src/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
 
+#: src/peerstore/gnunet-service-peerstore.c:343
+#, fuzzy
+msgid "Malformed iterate request.\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+#: src/peerstore/gnunet-service-peerstore.c:350
+msgid "Sub system not supplied in client iterate request.\n"
+msgstr ""
+
+# Miguel: "shutdown request" se refiere a finalizar el
+# que hace de cliente.
+#: src/peerstore/gnunet-service-peerstore.c:399
+#, fuzzy
+msgid "Malformed store request from client\n"
+msgstr ""
+"Se produjo un fallo al transmitir una petición de apagado al cliente.\n"
+
+#: src/peerstore/gnunet-service-peerstore.c:407
+msgid "Full key not supplied in client store request\n"
+msgstr ""
+
+# Miguel: "Drop" en bases de datos es eliminar una tabla
+# del modelo.
+#: src/peerstore/gnunet-service-peerstore.c:427
+#, fuzzy
+msgid "Failed to store requested value, sqlite database error."
+msgstr ""
+"Se produjo un fallo al transmitir la petición de eliminación a la base de "
+"datos.\n"
+
+#: src/peerstore/gnunet-service-peerstore.c:509
+#, fuzzy
+msgid "No database backend configured\n"
+msgstr "No hay nombre de máquina externo configurado\n"
+
+#: src/peerstore/gnunet-service-peerstore.c:520
+#, fuzzy, c-format
+msgid "Could not load database backend `%s'\n"
+msgstr "No se pudo leer el fichero de la lista negra «%s»\n"
+
+#: src/peerstore/peerstore_api.c:299 src/sensor/sensor_api.c:179
+#, c-format
+msgid "Received an error notification from MQ of type: %d\n"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:370
+msgid "Iteration canceled due to reconnection."
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:635
+#, fuzzy
+msgid "Unexpected iteration response, this should not happen.\n"
+msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
+
 # Miguel: ¿Conectar y conexión?
-#: src/peerstore/peerstore_api.c:486
+#: src/peerstore/peerstore_api.c:646
 #, fuzzy
 msgid "Error communicating with `PEERSTORE' service."
 msgstr "Error al comunicar con el servicio ARM.\n"
 
-#: src/peerstore/peerstore_api.c:503
+#: src/peerstore/peerstore_api.c:665
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Recibida petición DNS mal formada de %s\n"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:352
-#: src/psycstore/plugin_psycstore_sqlite.c:276
+#: src/peerstore/peerstore_api.c:804
+msgid ""
+"Problem receiving a watch response, no way to determine which request.\n"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:815
+msgid "Received a watch result for a non existing watch.\n"
+msgstr ""
+
+#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/psycstore/plugin_psycstore_sqlite.c:286
 #, fuzzy, c-format
 msgid ""
 "Error executing SQL query: %s\n"
 "  %s\n"
 msgstr "Error abriendo fichero «%s»: %s\n"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:377
-#: src/psycstore/plugin_psycstore_sqlite.c:253
+#: src/peerstore/plugin_peerstore_sqlite.c:401
+#: src/psycstore/plugin_psycstore_sqlite.c:263
 #, fuzzy, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
 "  %s\n"
 msgstr "Error leyendo de «%s»: %s\n"
 
+#: src/peerstore/plugin_peerstore_sqlite.c:483
+#, fuzzy, c-format
+msgid "Unable to create indices: %s.\n"
+msgstr "Se produjo un fallo al crear los índices\n"
+
 #: src/postgres/postgres.c:59
 #, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
@@ -5837,84 +6203,84 @@
 msgid "Unable to initialize Postgres: %s"
 msgstr "No se pudo inicializar Postgres: %s"
 
-#: src/psycstore/gnunet-service-psycstore.c:200
+#: src/psycstore/gnunet-service-psycstore.c:260
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:224
+#: src/psycstore/gnunet-service-psycstore.c:284
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:246
+#: src/psycstore/gnunet-service-psycstore.c:306
 #, fuzzy
 msgid "Failed to store fragment!\n"
 msgstr "Se produjo un fallo al iniciar el demonio: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:272
+#: src/psycstore/gnunet-service-psycstore.c:362
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:299
+#: src/psycstore/gnunet-service-psycstore.c:402
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:328
+#: src/psycstore/gnunet-service-psycstore.c:433
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: mal formado\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:356
+#: src/psycstore/gnunet-service-psycstore.c:461
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:392
-#: src/psycstore/gnunet-service-psycstore.c:465
+#: src/psycstore/gnunet-service-psycstore.c:497
+#: src/psycstore/gnunet-service-psycstore.c:570
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:408
+#: src/psycstore/gnunet-service-psycstore.c:513
 #, fuzzy
 msgid "Failed to begin modifying state!\n"
 msgstr "Se produjo un fallo al cargar el estado: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:431
+#: src/psycstore/gnunet-service-psycstore.c:536
 #, fuzzy, c-format
 msgid "Unknown operator: %c\n"
 msgstr "Operación desconocida '%s'\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:441
+#: src/psycstore/gnunet-service-psycstore.c:546
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Se produjo un fallo al cargar el estado: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:479
+#: src/psycstore/gnunet-service-psycstore.c:584
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:495
+#: src/psycstore/gnunet-service-psycstore.c:600
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:515
-#: src/psycstore/gnunet-service-psycstore.c:534
+#: src/psycstore/gnunet-service-psycstore.c:620
+#: src/psycstore/gnunet-service-psycstore.c:639
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:557
-#: src/psycstore/gnunet-service-psycstore.c:608
+#: src/psycstore/gnunet-service-psycstore.c:662
+#: src/psycstore/gnunet-service-psycstore.c:713
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:584
-#: src/psycstore/gnunet-service-psycstore.c:623
+#: src/psycstore/gnunet-service-psycstore.c:689
+#: src/psycstore/gnunet-service-psycstore.c:728
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
@@ -5924,7 +6290,7 @@
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "«%s» falló en %s: %d con el error: %s\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1796
+#: src/psycstore/plugin_psycstore_sqlite.c:1933
 #, fuzzy
 msgid "SQLite database running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
@@ -6188,349 +6554,352 @@
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:272
-#, fuzzy
-msgid "Duplicate revocation received from peer. Ignored.\n"
-msgstr "Opciones de paquete IPv4 recibidas.  Ignoradas.\n"
-
-#: src/revocation/gnunet-service-revocation.c:434
+#: src/revocation/gnunet-service-revocation.c:433
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:486
+#: src/revocation/gnunet-service-revocation.c:483
+#: src/revocation/gnunet-service-revocation.c:730
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:812
+#: src/revocation/gnunet-service-revocation.c:822
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "No se pudo conectar con el almacén de datos."
 
-#: src/scalarproduct/gnunet-scalarproduct.c:224
+#: src/rps/gnunet-rps.c:67
+msgid "rps"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:222
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Debes especificar un fichero a inspeccionar.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:231
+#: src/scalarproduct/gnunet-scalarproduct.c:229
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:238
-msgid "Please give a session key for --input_key!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:250
+#: src/scalarproduct/gnunet-scalarproduct.c:242
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:261
+#: src/scalarproduct/gnunet-scalarproduct.c:253
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:283
+#: src/scalarproduct/gnunet-scalarproduct.c:275
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:296
+#: src/scalarproduct/gnunet-scalarproduct.c:294
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "No se pudo conectar al servicio %s.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:345
+#: src/scalarproduct/gnunet-scalarproduct.c:344
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:347
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:350
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:360
+#: src/scalarproduct/gnunet-scalarproduct.c:359
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:678
-#, fuzzy, c-format
-msgid "Client %p disconnected from us.\n"
-msgstr "Desconectado de %s\n"
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1418
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1529
+#, fuzzy
+msgid "Connect to CADET failed\n"
+msgstr "Conexión fallida (¿bug?)\n"
 
-# Miguel: Si no me equivoco, "status result" es un
-# resultado de tipo estado.
-#: src/scalarproduct/gnunet-service-scalarproduct.c:748
-#, fuzzy, c-format
-msgid "Could not send message to client (%p)!\n"
-msgstr "No se pudo mandar el resultado (estado) al cliente\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+msgid "dkg start delay"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:759
-#, c-format
-msgid "Sending session-end notification to client (%p) for session %s\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+msgid "dkg timeout"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:781
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1459
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+msgid "threshold"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "also profile decryption"
+msgstr ""
+
+#: src/sensordashboard/gnunet-service-sensordashboard.c:353
 #, fuzzy, c-format
-msgid "Successfully created new channel to peer (%s)!\n"
-msgstr "Conectado satisfactoriamente a «%s»\n"
+msgid "Error trying to send a message to peer `%s'.\n"
+msgstr ""
+"Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
+"«%s»\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:818
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1469
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1539
+#: src/sensor/gnunet-sensor.c:162
 #, fuzzy
-msgid "Transmitting service request.\n"
-msgstr "Reiniciando el servicio «%s»\n"
+msgid "Retrieve information about all defined sensors"
+msgstr "proveer información acerca de un túnel en particular"
 
-# Miguel: Si no me equivoco, "list result" es un resultado
-# de tipo lista.
-#: src/scalarproduct/gnunet-service-scalarproduct.c:830
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
+#: src/sensor/gnunet-sensor.c:165
 #, fuzzy
-msgid "Could not send message to channel!\n"
-msgstr "No se pudo mandar el resultado (lista) al cliente\n"
+msgid "Retrieve information about a single sensor"
+msgstr "proveer información acerca de un túnel en particular"
 
-# Miguel: Si no me equivoco, "list result" es un resultado
-# de tipo lista.
-#: src/scalarproduct/gnunet-service-scalarproduct.c:891
-#: src/scalarproduct/gnunet-service-scalarproduct.c:991
-#, fuzzy
-msgid "Could not send service-response message via cadet!)\n"
-msgstr "No se pudo mandar el resultado (lista) al cliente\n"
+#: src/sensor/gnunet-sensor.c:168
+msgid "Force an anomaly on a sensor, use only for testing"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1442
-#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
+#: src/sensor/gnunet-sensor.c:175
+msgid "sensor"
 msgstr ""
 
-# Miguel: Si no me equivoco, "list result" es un resultado
-# de tipo lista.
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1550
+#: src/sensor/gnunet-sensor-profiler.c:728
+msgid "Invalid or missing number of peers. Set at least 2 peers.\n"
+msgstr ""
+
+#: src/sensor/gnunet-sensor-profiler.c:735
 #, fuzzy
-msgid "Could not send service-request multipart message to channel!\n"
-msgstr "No se pudo mandar el resultado (lista) al cliente\n"
+msgid "Missing or invalid topology file.\n"
+msgstr "Parámetro no válido «%s»\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1579
-#, c-format
-msgid ""
-"Got client-responder-session with key %s and a matching service-request-"
-"session set, processing.\n"
-msgstr ""
+#: src/sensor/gnunet-sensor-profiler.c:781
+#, fuzzy
+msgid "Number of peers to run"
+msgstr "número de pares para empezar"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1601
-#, c-format
-msgid ""
-"Got client-responder-session with key %s but NO matching service-request-"
-"session set, queuing element for later use.\n"
+#: src/sensor/gnunet-sensor-profiler.c:783
+msgid "Path to topology file"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1618
-#, c-format
-msgid "Creating new channel for session with key %s.\n"
+#: src/sensor/gnunet-sensor-profiler.c:786
+msgid "Change the interval of running sensors to given value"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1777
-#, c-format
-msgid ""
-"Duplicate session information received, can not create new session with key `"
-"%s'\n"
-msgstr ""
+#: src/sensor/gnunet-sensor-profiler.c:789
+#, fuzzy
+msgid "Number of peers to simulate anomalies on"
+msgstr "número de pares para empezar"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1862
+#: src/sensor/gnunet-sensor-profiler.c:796
+#, fuzzy
+msgid "Profiler for sensor service"
+msgstr "Perfilador para expresiones regulares."
+
+#: src/sensor/gnunet-service-sensor_analysis.c:202
+#, fuzzy
+msgid "Received an invalid sensor value."
+msgstr "Recibida petición '%s' no válida (tabla errónea)\n"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:293
+#, fuzzy
+msgid "Analysis model not defined in configuration.\n"
+msgstr "No se pudo encontrar la opción «%s:%s» en la configuración.\n"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:302
 #, fuzzy, c-format
-msgid "New incoming channel from peer %s.\n"
-msgstr "Desconectado de %s\n"
+msgid "Could not load analysis model `%s'.\n"
+msgstr "No se pudo leer el fichero de la lista negra «%s»\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
+#: src/sensor/gnunet-service-sensor_analysis.c:310
+#, fuzzy
+msgid "Could not connect to peerstore service.\n"
+msgstr "No se pudo conectar al servicio %s.\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:233
+#, fuzzy
+msgid "Unknown value type expected by sensor, this should not happen.\n"
+msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:268
+#, fuzzy, c-format
+msgid "Received an invalid value for sensor `%s': %s\n"
+msgstr ""
+"La configuración especifica un valor no válido en la opción «%s» de la "
+"sección «%s»: %s\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:345
 #, c-format
-msgid "Peer disconnected, terminating session %s with peer (%s)\n"
+msgid "Sensor `%s': External process should not be a path, disabling sensor.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2270
+#: src/sensor/gnunet-service-sensor_monitoring.c:368
 #, c-format
 msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
+"Sensor `%s' process `%s' problem: binary doesn't exist or not executable\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2297
+#: src/sensor/gnunet-service-sensor_monitoring.c:416
 #, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid "Sensor `%s' execution task already set, this should not happen\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2318
+#: src/sensor/gnunet-service-sensor_reporting.c:828
+#, fuzzy
+msgid "Double creation of proof-of-work, this should not happen.\n"
+msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:834
+#, fuzzy
+msgid "Failed to create pow and signature block.\n"
+msgstr "Se produjo un fallo al crear una nueva firma"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:1044
 #, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid "PEERSTORE error: %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2565
-msgid "Shutting down, initiating cleanup.\n"
+#: src/sensor/gnunet-service-sensor_reporting.c:1149
+#: src/sensor/gnunet-service-sensor_reporting.c:1407
+#, fuzzy
+msgid "Failed to connect to CORE service.\n"
+msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:1156
+msgid "Peer identity received from CORE init doesn't match ours.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2659
+#: src/sensor/gnunet-service-sensor_reporting.c:1396
 #, fuzzy
-msgid "Connect to CADET failed\n"
-msgstr "Conexión fallida (¿bug?)\n"
+msgid "Failed to connect to peerstore service.\n"
+msgstr "Se produjo un fallo al conectar con el servicio de almacenamiento"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2664
+#: src/sensor/gnunet-service-sensor_reporting.c:1417
+#: src/sensor/gnunet-service-sensor_update.c:781
 #, fuzzy
-msgid "CADET initialized\n"
-msgstr "Conexión fallida\n"
+msgid "Failed to connect to CADET service.\n"
+msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
-msgid "dkg start delay"
+#: src/sensor/gnunet-service-sensor_reporting.c:1424
+#, fuzzy
+msgid "Failed to load my private key.\n"
+msgstr "Se produjo un fallo al cargar el estado: %s\n"
+
+#: src/sensor/gnunet-service-sensor_update.c:327
+#, c-format
+msgid "Error trying to send a message to update point `%s'.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
-msgid "dkg timeout"
+#: src/sensor/gnunet-service-sensor_update.c:418
+#, fuzzy, c-format
+msgid "Failed to connect to update point `%s'.\n"
+msgstr "Se produjo un fallo al conectar con «%s»\n"
+
+#: src/sensor/plugin_sensor_model_gaussian.c:203
+msgid "Missing `TRAINING_WINDOW' value in configuration.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
-msgid "threshold"
+#: src/sensor/plugin_sensor_model_gaussian.c:221
+msgid "Missing `CONFIDENCE_INTERVAL' value in configuration.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
-msgid "also profile decryption"
+#: src/sensor/plugin_sensor_model_gaussian.c:229
+msgid "Missing `WEIGHT_INC' value in configuration.\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor.c:148
+#: src/sensor/sensor_api.c:296
 #, fuzzy
-msgid "Retrieve information about all defined sensors"
-msgstr "proveer información acerca de un túnel en particular"
+msgid "Iterate request canceled due to disconnection.\n"
+msgstr "# pares desconectados debido a desconexión global"
 
-#: src/sensor/gnunet-sensor.c:151
+#: src/sensor/sensor_api.c:307
+msgid "Force anomaly request canceled due to disconnection.\n"
+msgstr ""
+
+#: src/sensor/sensor_api.c:374
 #, fuzzy
-msgid "Retrieve information about a single sensor"
-msgstr "proveer información acerca de un túnel en particular"
-
-#: src/sensor/gnunet-sensor.c:160
-msgid "sensor"
+msgid "Timeout transmitting iteration request to `SENSOR' service."
 msgstr ""
+"Petición de transmisión de iteración de expiración al servicio de "
+"información de pares (PEERINFO)."
 
-#: src/sensor/gnunet-service-sensor.c:367
+#: src/sensor/sensor_util_lib.c:107
 #, fuzzy
 msgid "Error reading sensor version\n"
 msgstr "Error leyendo «%s»: %s"
 
-#: src/sensor/gnunet-service-sensor.c:373
+#: src/sensor/sensor_util_lib.c:116
 msgid "Invalid sensor version number, format should be major.minor\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:385
+#: src/sensor/sensor_util_lib.c:131
 #, fuzzy
 msgid "Error reading sensor category\n"
 msgstr "Error leyendo «%s»: %s"
 
-#: src/sensor/gnunet-service-sensor.c:413
+#: src/sensor/sensor_util_lib.c:164
 #, fuzzy
 msgid "Error reading sensor run interval\n"
 msgstr "Error creando el túnel\n"
 
-#: src/sensor/gnunet-service-sensor.c:419
-#, c-format
-msgid "Sensor run interval too low (%<PRIu64> < %d)\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor.c:436
+#: src/sensor/sensor_util_lib.c:191
 #, fuzzy
 msgid "Error reading sensor source\n"
 msgstr "Error leyendo «%s»: %s"
 
-#: src/sensor/gnunet-service-sensor.c:445
+#: src/sensor/sensor_util_lib.c:206
 msgid "Error reading sensor gnunet-statistics source information\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:455
+#: src/sensor/sensor_util_lib.c:218
 #, fuzzy
 msgid "Error reading sensor process name\n"
 msgstr "Error leyendo de «%s»: %s\n"
 
-#: src/sensor/gnunet-service-sensor.c:464
+#: src/sensor/sensor_util_lib.c:233
 msgid "Error reading sensor expected datatype\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:470
+#: src/sensor/sensor_util_lib.c:241
 msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:498
+#: src/sensor/sensor_util_lib.c:299
 #, fuzzy, c-format
 msgid "Failed to access sensor file: %s\n"
 msgstr "Se produjo un fallo al acceder «%s»: %s\n"
 
-#: src/sensor/gnunet-service-sensor.c:506
+#: src/sensor/sensor_util_lib.c:308
 #, fuzzy, c-format
 msgid "Failed to load sensor definition: %s\n"
 msgstr "Se produjo un fallo al abrir «%s» para escritura: %s\n"
 
-#: src/sensor/gnunet-service-sensor.c:559
+#: src/sensor/sensor_util_lib.c:370
 #, c-format
 msgid "Sensor `%s' already exists with same or newer version\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:566
-#, c-format
-msgid "Upgrading sensor `%s' to a newer version\n"
+#: src/sensor/sensor_util_lib.c:387
+#, fuzzy, c-format
+msgid "Error adding new sensor `%s' to global hashmap.\n"
 msgstr ""
+"\n"
+"Error subiendo el fichero %s\n"
 
-#: src/sensor/gnunet-service-sensor.c:571
-#, c-format
-msgid ""
-"Error adding new sensor `%s' to global hashmap, this should not happen\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor.c:595
+#: src/sensor/sensor_util_lib.c:412
 #, fuzzy, c-format
 msgid "Error loading sensor from file: %s\n"
 msgstr ""
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/sensor/gnunet-service-sensor.c:599
-#, c-format
-msgid "Sensor `%s' added to global hashmap\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor.c:635
-#, fuzzy, c-format
-msgid "Reloading sensor definitions from directory `%s'\n"
-msgstr "Descarga los ficheros de GNUnet"
-
-#: src/sensor/gnunet-service-sensor.c:640
-#, fuzzy, c-format
-msgid "Loaded %d sensors from directory `%s'\n"
-msgstr "Descarga los ficheros de GNUnet"
-
-#: src/sensor/sensor_api.c:345
+#: src/set/gnunet-service-set.c:1529
 #, fuzzy
-msgid "Timeout transmitting iteration request to `SENSOR' service."
-msgstr ""
-"Petición de transmisión de iteración de expiración al servicio de "
-"información de pares (PEERINFO)."
-
-# Miguel: "Failed to receive" también aquí está traducido como
-# "no se obtuvo respuesta" por claridad.
-#: src/sensor/sensor_api.c:388
-#, fuzzy
-msgid "Failed to receive response from `SENSOR' service."
-msgstr ""
-"No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
-
-#: src/sensor/sensor_api.c:431
-#, fuzzy
-msgid "Received invalid message from `SENSOR' service."
-msgstr ""
-"Recibido mensaje no válido del servicio de información de pares (PEERINFO)."
-
-#: src/set/gnunet-service-set.c:1431
-#, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
@@ -6557,7 +6926,7 @@
 msgid "ibf size"
 msgstr "tamaño ibf"
 
-#: src/set/gnunet-set-profiler.c:295
+#: src/set/gnunet-set-profiler.c:298
 msgid "oeration to execute"
 msgstr ""
 
@@ -6683,37 +7052,37 @@
 msgid "Invalid topology: %s\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/testbed/generate-underlay-topology.c:252
+#: src/testbed/generate-underlay-topology.c:253
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:258
+#: src/testbed/generate-underlay-topology.c:259
 #, fuzzy, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/testbed/generate-underlay-topology.c:266
+#: src/testbed/generate-underlay-topology.c:267
 #, fuzzy, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr "¡Falló mientras se esperaba la configuración topológica!\n"
 
-#: src/testbed/generate-underlay-topology.c:280
+#: src/testbed/generate-underlay-topology.c:281
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:286
+#: src/testbed/generate-underlay-topology.c:287
 #, fuzzy, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Argumento no válido para '%s' en %s:%d.\n"
 
-#: src/testbed/generate-underlay-topology.c:335
+#: src/testbed/generate-underlay-topology.c:336
 #: src/testbed/gnunet-testbed-profiler.c:293
 msgid "create COUNT number of peers"
 msgstr "crea «COUNT» número de pares"
 
-#: src/testbed/generate-underlay-topology.c:344
+#: src/testbed/generate-underlay-topology.c:345
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6737,7 +7106,7 @@
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:331
+#: src/testbed/gnunet-daemon-latency-logger.c:333
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
@@ -6748,7 +7117,7 @@
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:235 src/testing/list-keys.c:50
-#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
+#: src/testing/testing.c:293 src/util/gnunet-ecc.c:295
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr "El fichero de máquinas no tiene el formato correcto: %s\n"
@@ -6789,11 +7158,6 @@
 msgid "Spawning process `%s'\n"
 msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:267
-#, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "El número máximo de conexiones es %u\n"
-
 #: src/testbed/gnunet-testbed-profiler.c:296
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr "tolerar un número «COUNT» de continuas expiraciones de plazo"
@@ -7062,44 +7426,44 @@
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr "«gnunet-arm» o «ssh» no parecen terminar.\n"
 
-#: src/topology/gnunet-daemon-topology.c:255
+#: src/topology/gnunet-daemon-topology.c:265
 msgid "# peers blacklisted"
 msgstr "# pares en la lista negra"
 
-#: src/topology/gnunet-daemon-topology.c:388
+#: src/topology/gnunet-daemon-topology.c:406
 msgid "# connect requests issued to transport"
 msgstr "# peticiones de conexión requeridas al servicio de transporte"
 
-#: src/topology/gnunet-daemon-topology.c:728
-#: src/topology/gnunet-daemon-topology.c:813
+#: src/topology/gnunet-daemon-topology.c:756
+#: src/topology/gnunet-daemon-topology.c:840
 msgid "# friends connected"
 msgstr "# amigos conectados"
 
-#: src/topology/gnunet-daemon-topology.c:993
+#: src/topology/gnunet-daemon-topology.c:1020
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 "¡Se produjo un fallo al conectar con el servicio principal, no se puede "
 "gestionar la topología!\n"
 
-#: src/topology/gnunet-daemon-topology.c:1022
+#: src/topology/gnunet-daemon-topology.c:1049
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr "Me he encontrado «%s» en mi lista de amigos (inútil, ignorado)\n"
 
-#: src/topology/gnunet-daemon-topology.c:1029
+#: src/topology/gnunet-daemon-topology.c:1056
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr "Encontrado amigo «%s» en la configuración\n"
 
-#: src/topology/gnunet-daemon-topology.c:1050
+#: src/topology/gnunet-daemon-topology.c:1077
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1052
+#: src/topology/gnunet-daemon-topology.c:1079
 msgid "# friends in configuration"
 msgstr "# amigos en configuración"
 
-#: src/topology/gnunet-daemon-topology.c:1057
+#: src/topology/gnunet-daemon-topology.c:1084
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
@@ -7107,23 +7471,24 @@
 "Menos amigos especificados que los requeridos por el contador mínimo de "
 "amigos. Sólo me conectaré a amigos.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1063
+#: src/topology/gnunet-daemon-topology.c:1090
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 "Más conexiones amistosas requeridas que el número objetivo total de "
 "conexiones.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1094
+#: src/topology/gnunet-daemon-topology.c:1121
+#: src/transport/plugin_transport_wlan.c:1444
 msgid "# HELLO messages received"
 msgstr "# mensajes «HELLO» recibidos"
 
 # gossiped??
-#: src/topology/gnunet-daemon-topology.c:1151
+#: src/topology/gnunet-daemon-topology.c:1178
 msgid "# HELLO messages gossipped"
 msgstr "# Mensajes «HELLO» rumoreados"
 
-#: src/topology/gnunet-daemon-topology.c:1296
+#: src/topology/gnunet-daemon-topology.c:1323
 #, fuzzy
 msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
@@ -7140,8 +7505,8 @@
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:464
-#: src/transport/gnunet-service-transport_blacklist.c:745
+#: src/transport/gnunet-service-transport_blacklist.c:465
+#: src/transport/gnunet-service-transport_blacklist.c:748
 msgid "# disconnects due to blacklist"
 msgstr "# desconexiones debido a la lista negra"
 
@@ -7163,64 +7528,64 @@
 msgid "Could not obtain a valid network for `%s' %s (%s)\n"
 msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
 
-#: src/transport/gnunet-service-transport.c:755
+#: src/transport/gnunet-service-transport.c:757
 #, c-format
 msgid ""
 "Address or session unknown: failed to update properties for peer `%s' plugin "
 "`%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1106
+#: src/transport/gnunet-service-transport.c:1094
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 "El servicio de transporte carece de opciones de configuración de clave.  "
 "Saliendo.\n"
 
-#: src/transport/gnunet-service-transport_clients.c:432
+#: src/transport/gnunet-service-transport_clients.c:463
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
 msgstr ""
 "Mensaje omitido de tipo %u y tamaño %u, hay %u/%u mensajes pendientes\n"
 
-#: src/transport/gnunet-service-transport_clients.c:439
+#: src/transport/gnunet-service-transport_clients.c:470
 msgid "# messages dropped due to slow client"
 msgstr "# mensajes omitidos debido a un cliente lento"
 
-#: src/transport/gnunet-service-transport_clients.c:596
+#: src/transport/gnunet-service-transport_clients.c:630
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr "¡Rechazando conexión de control del par «%s», que no soy yo!\n"
 
-#: src/transport/gnunet-service-transport_clients.c:737
+#: src/transport/gnunet-service-transport_clients.c:771
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr "# bytes de «payload» omitidos (el otro par no estaba conectado)"
 
-#: src/transport/gnunet-service-transport_clients.c:770
+#: src/transport/gnunet-service-transport_clients.c:804
 #, fuzzy, c-format
 msgid "Blacklist refuses connection attempt to peer `%s'\n"
 msgstr "Se produjo un fallo al conectar con «%s»\n"
 
-#: src/transport/gnunet-service-transport_clients.c:776
+#: src/transport/gnunet-service-transport_clients.c:810
 #, fuzzy, c-format
 msgid "Blacklist allows connection attempt to peer `%s'\n"
 msgstr "Se produjo un fallo al conectar con «%s»\n"
 
-#: src/transport/gnunet-service-transport_clients.c:801
+#: src/transport/gnunet-service-transport_clients.c:836
 msgid "# REQUEST CONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_clients.c:815
+#: src/transport/gnunet-service-transport_clients.c:850
 #, fuzzy, c-format
 msgid "Received a request connect message for peer `%s'\n"
 msgstr "Recibido último mensaje para %s\n"
 
-#: src/transport/gnunet-service-transport_clients.c:826
+#: src/transport/gnunet-service-transport_clients.c:861
 #, fuzzy
 msgid "# REQUEST DISCONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_clients.c:840
+#: src/transport/gnunet-service-transport_clients.c:875
 #, fuzzy, c-format
 msgid "Received a request disconnect message for peer `%s'\n"
 msgstr "Recibido último mensaje para %s\n"
@@ -7295,160 +7660,164 @@
 
 #: src/transport/gnunet-service-transport_neighbours.c:1685
 #, fuzzy, c-format
-msgid ""
-"Failed to send CONNECT message to peer `%s' using address `%s' session %p\n"
+msgid "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
 msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1712
-msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
-msgstr ""
+#, fuzzy
+msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
+msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1757
 #, fuzzy
-msgid "# SESSION_CONNECT messages sent"
+msgid "# SYN messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1773
 #, fuzzy, c-format
-msgid "Failed to transmit CONNECT message via plugin to %s\n"
+msgid "Failed to transmit SYN message via plugin to %s\n"
 msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1800
-msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
-msgstr ""
+#, fuzzy
+msgid "# Failed attempts to switch addresses (failed to send SYN)"
+msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1849
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Failed to send CONNECT_ACK message to peer `%s' using address `%s' session "
-"%p\n"
-msgstr ""
+"Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
+msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1904
 #, fuzzy
-msgid "# CONNECT_ACK messages sent"
+msgid "# SYN_ACK messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1919
 #, fuzzy, c-format
-msgid "Failed to transmit CONNECT_ACK message via plugin to %s\n"
+msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
 msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2196
+#: src/transport/gnunet-service-transport_neighbours.c:2199
 #, fuzzy, c-format
 msgid "Blacklisting disapproved to connect to peer `%s'\n"
 msgstr "Se produjo un fallo al conectar con «%s»\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2316
+#: src/transport/gnunet-service-transport_neighbours.c:2324
 #, fuzzy
-msgid "# CONNECT messages received"
-msgstr "# mensajes «REQUEST CONNECT» recibidos"
+msgid "# SYN messages received"
+msgstr "# mensajes PING recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2321
+#: src/transport/gnunet-service-transport_neighbours.c:2329
 #, c-format
-msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
+msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2594
+#: src/transport/gnunet-service-transport_neighbours.c:2626
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3016
+#: src/transport/gnunet-service-transport_neighbours.c:3047
 #, fuzzy
 msgid "# Failed attempts to switch addresses (no response)"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3111
+#: src/transport/gnunet-service-transport_neighbours.c:3142
 #, fuzzy
-msgid "# CONNECT_ACK messages received"
-msgstr "# mensajes «REQUEST CONNECT» recibidos"
+msgid "# SYN_ACK messages received"
+msgstr "# mensajes SET QUOTA recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3119
-msgid "# unexpected CONNECT_ACK messages (no peer)"
+#: src/transport/gnunet-service-transport_neighbours.c:3150
+#, fuzzy
+msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3133
-#: src/transport/gnunet-service-transport_neighbours.c:3168
-msgid "# unexpected CONNECT_ACK messages (not ready)"
+#: src/transport/gnunet-service-transport_neighbours.c:3164
+#: src/transport/gnunet-service-transport_neighbours.c:3199
+#, fuzzy
+msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3180
-msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
+#: src/transport/gnunet-service-transport_neighbours.c:3211
+#, fuzzy
+msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (esperando en el ATS)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3203
+#: src/transport/gnunet-service-transport_neighbours.c:3234
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3211
-msgid "# unexpected CONNECT_ACK messages (disconnecting)"
+#: src/transport/gnunet-service-transport_neighbours.c:3242
+#, fuzzy
+msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3399
+#: src/transport/gnunet-service-transport_neighbours.c:3441
 #, fuzzy
-msgid "# SESSION_ACK messages received"
-msgstr "# mensajes SET QUOTA recibidos"
+msgid "# ACK messages received"
+msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3435
+#: src/transport/gnunet-service-transport_neighbours.c:3477
 #, fuzzy
-msgid "# unexpected SESSION_ACK messages"
+msgid "# unexpected ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3509
+#: src/transport/gnunet-service-transport_neighbours.c:3551
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr "# Mensajes «SET QUOTA» ignorados (no existe tal par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3524
+#: src/transport/gnunet-service-transport_neighbours.c:3566
 msgid "# disconnects due to quota of 0"
 msgstr "# desconexiones debido a una cuota de 0"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3564
+#: src/transport/gnunet-service-transport_neighbours.c:3611
 #, fuzzy
 msgid "# disconnect messages ignored (malformed)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3570
+#: src/transport/gnunet-service-transport_neighbours.c:3617
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3579
+#: src/transport/gnunet-service-transport_neighbours.c:3626
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3706
+#: src/transport/gnunet-service-transport_neighbours.c:3753
 msgid "# disconnected from peer upon explicit request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
-#: src/transport/gnunet-service-transport_plugins.c:120
+#: src/transport/gnunet-service-transport_plugins.c:119
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr "El servicio de transporte carece de la opción «NEIGHBOUR_LIMIT».\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:178
-#: src/transport/gnunet-service-transport_plugins.c:186
-#: src/transport/gnunet-service-transport_plugins.c:194
-#: src/transport/gnunet-service-transport_plugins.c:202
-#: src/transport/gnunet-service-transport_plugins.c:210
-#: src/transport/gnunet-service-transport_plugins.c:218
-#: src/transport/gnunet-service-transport_plugins.c:226
-#: src/transport/gnunet-service-transport_plugins.c:234
-#: src/transport/gnunet-service-transport_plugins.c:242
-#: src/transport/gnunet-service-transport_plugins.c:250
-#: src/transport/gnunet-service-transport_plugins.c:258
+#: src/transport/gnunet-service-transport_plugins.c:177
+#: src/transport/gnunet-service-transport_plugins.c:185
+#: src/transport/gnunet-service-transport_plugins.c:193
+#: src/transport/gnunet-service-transport_plugins.c:201
+#: src/transport/gnunet-service-transport_plugins.c:209
+#: src/transport/gnunet-service-transport_plugins.c:217
+#: src/transport/gnunet-service-transport_plugins.c:225
+#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
+#: src/transport/gnunet-service-transport_plugins.c:249
+#: src/transport/gnunet-service-transport_plugins.c:257
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:265
+#: src/transport/gnunet-service-transport_plugins.c:264
 #, fuzzy, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Falló al cargar el plugin '%s' en %s:%d. Descargando plugin.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:488
+#: src/transport/gnunet-service-transport_validation.c:493
 msgid "# address records discarded"
 msgstr "# registros de direcciones descartados"
 
-#: src/transport/gnunet-service-transport_validation.c:558
+#: src/transport/gnunet-service-transport_validation.c:563
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
@@ -7457,7 +7826,7 @@
 "No transmitiendo «%s» con «%s», mensaje demasiado grande (¡%u bytes!). Esto "
 "no debería suceder.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:616
+#: src/transport/gnunet-service-transport_validation.c:624
 msgid "# PING without HELLO messages sent"
 msgstr "# Mensajes PING sin HELLO mandados"
 
@@ -7516,77 +7885,83 @@
 msgid "# PONGs multicast to all available addresses"
 msgstr "# multicast de PONG a todas las direcciones disponibles"
 
-#: src/transport/gnunet-service-transport_validation.c:1356
+#: src/transport/gnunet-service-transport_validation.c:1387
 msgid "# PONGs dropped, no matching pending validation"
 msgstr "# PONG omitidos, no hay una validación pendiente coincidente"
 
-#: src/transport/gnunet-service-transport_validation.c:1371
+#: src/transport/gnunet-service-transport_validation.c:1402
 msgid "# PONGs dropped, signature expired"
 msgstr "# Mensajes PONG omitidos, firma expirada"
 
-#: src/transport/gnunet-service-transport_validation.c:1493
+#: src/transport/gnunet-service-transport_validation.c:1526
 #, fuzzy, c-format
 msgid "Validation received new %s message for peer `%s' with size %u\n"
 msgstr "Recibido último mensaje para %s\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1500
+#: src/transport/gnunet-service-transport_validation.c:1533
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
 
-#: src/transport/gnunet-transport.c:388
+#: src/transport/gnunet-transport.c:573
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Transmitidos %llu bytes/s (%llu bytes en %s)\n"
 
-#: src/transport/gnunet-transport.c:396
+#: src/transport/gnunet-transport.c:582
+#: src/transport/gnunet-transport-profiler.c:274
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Recibidos %llu bytes/s (%llu bytes en %s)\n"
 
-#: src/transport/gnunet-transport.c:436
+#: src/transport/gnunet-transport.c:614
 #, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Se produjo un fallo al conectar con «%s»\n"
 
-#: src/transport/gnunet-transport.c:449
+#: src/transport/gnunet-transport.c:629
 #, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Se produjo un fallo al resolver la dirección para el par «%s»\n"
 
 # Miguel: La traducción no es literal, pero me parece más correcta
 # en castellano.
-#: src/transport/gnunet-transport.c:459
+#: src/transport/gnunet-transport.c:641
 msgid "Failed to list connections, timeout occured\n"
 msgstr "No se pudieron listar las conexiones, expiró el plazo\n"
 
-#: src/transport/gnunet-transport.c:483
+#: src/transport/gnunet-transport.c:668 src/transport/gnunet-transport.c:698
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
 
-#: src/transport/gnunet-transport.c:487
+#: src/transport/gnunet-transport.c:673
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
 
-#: src/transport/gnunet-transport.c:491
+#: src/transport/gnunet-transport.c:678
 #, fuzzy, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr "Error interno escaneando «%s».\n"
 
-#: src/transport/gnunet-transport.c:495
+#: src/transport/gnunet-transport.c:683
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/transport/gnunet-transport.c:499
+#: src/transport/gnunet-transport.c:688
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:614
+#: src/transport/gnunet-transport.c:704
 #, fuzzy, c-format
+msgid "Configuration for plugin `%s' is working!\n"
+msgstr "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
+
+#: src/transport/gnunet-transport.c:823
+#, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
 "\t%s%s\n"
@@ -7594,44 +7969,45 @@
 "\t%s%s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:643
+#: src/transport/gnunet-transport.c:859
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:717 src/transport/gnunet-transport.c:1240
+#: src/transport/gnunet-transport.c:958 src/transport/gnunet-transport.c:1707
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/transport/gnunet-transport.c:784
+#: src/transport/gnunet-transport.c:1026
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 "No hay módulos de transporte configurados, el par nunca se comunicará\n"
 
-#: src/transport/gnunet-transport.c:798
+#: src/transport/gnunet-transport.c:1040
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 "Ningún puerto fue configurado para el módulo «%s», no se puede probar\n"
 
-#: src/transport/gnunet-transport.c:823
+#: src/transport/gnunet-transport.c:1065
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Se produjo un fallo al arrancar %s\n"
 
-#: src/transport/gnunet-transport.c:866
+#: src/transport/gnunet-transport.c:1111
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Transmitiendo %u bytes a %s\n"
 
-#: src/transport/gnunet-transport.c:888
+#: src/transport/gnunet-transport.c:1134
+#: src/transport/gnunet-transport-profiler.c:406
 #, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Conectado satisfactoriamente a «%s»\n"
 
-#: src/transport/gnunet-transport.c:912
+#: src/transport/gnunet-transport.c:1158
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -7640,245 +8016,292 @@
 "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
 "bloques de %u Kb\n"
 
-#: src/transport/gnunet-transport.c:943
+#: src/transport/gnunet-transport.c:1191
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "Conectado satisfactoriamente a «%s»\n"
 
-#: src/transport/gnunet-transport.c:966
+#: src/transport/gnunet-transport.c:1214
+#: src/transport/gnunet-transport-profiler.c:434
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "Desconectado del par «%s» mientras probaba\n"
 
-#: src/transport/gnunet-transport.c:988 src/transport/gnunet-transport.c:1009
+#: src/transport/gnunet-transport.c:1239 src/transport/gnunet-transport.c:1265
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr "%24s: %-17s %4s   (%u conexiones en total)\n"
 
-#: src/transport/gnunet-transport.c:989
+#: src/transport/gnunet-transport.c:1241
 msgid "Connected to"
 msgstr "Conectado a"
 
-#: src/transport/gnunet-transport.c:1010
+#: src/transport/gnunet-transport.c:1267
 msgid "Disconnected from"
 msgstr "Desconectado de"
 
-#: src/transport/gnunet-transport.c:1031
+#: src/transport/gnunet-transport.c:1291
+#: src/transport/gnunet-transport-profiler.c:458
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Recibidos %u bytes de %s\n"
 
-#: src/transport/gnunet-transport.c:1061
+#: src/transport/gnunet-transport.c:1323
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1072
+#: src/transport/gnunet-transport.c:1335
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:1300 src/transport/gnunet-transport.c:1325
+#: src/transport/gnunet-transport.c:1792
+#: src/transport/gnunet-transport-profiler.c:492
 msgid "Failed to send connect request to transport service\n"
 msgstr ""
 "Se produjo un fallo al enviar una petición de conexión al servicio de "
 "transporte\n"
 
-#: src/transport/gnunet-transport.c:1369
-#, c-format
+#: src/transport/gnunet-transport.c:1829
+#, fuzzy
+msgid "Failed to send disconnect request to transport service\n"
+msgstr ""
+"Se produjo un fallo al enviar una petición de conexión al servicio de "
+"transporte\n"
+
+#: src/transport/gnunet-transport.c:1875
+#, fuzzy, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
-"%s, %s\n"
+"%s, %s %s\n"
 msgstr ""
 "Múltiples operaciones introducidas. Por favor, seleccione únicamente una "
 "operación: %s, %s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1377
-#, c-format
+#: src/transport/gnunet-transport.c:1883
+#, fuzzy, c-format
 msgid ""
-"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
+"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 "Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
 "%s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:1396 src/transport/gnunet-transport.c:1426
-#: src/transport/gnunet-transport.c:1456 src/transport/gnunet-transport.c:1479
-#: src/transport/gnunet-transport.c:1523
+#: src/transport/gnunet-transport.c:1902 src/transport/gnunet-transport.c:1932
+#: src/transport/gnunet-transport.c:1964 src/transport/gnunet-transport.c:1990
+#: src/transport/gnunet-transport.c:2046
+#: src/transport/gnunet-transport-profiler.c:578
 msgid "Failed to connect to transport service\n"
 msgstr "Se produjo un fallo al conectar con el servicio de transporte\n"
 
-#: src/transport/gnunet-transport.c:1405 src/transport/gnunet-transport.c:1435
-#: src/transport/gnunet-transport.c:1465
+#: src/transport/gnunet-transport.c:1911 src/transport/gnunet-transport.c:1941
+#: src/transport/gnunet-transport.c:1975
 msgid "Failed to send request to transport service\n"
 msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
 
-#: src/transport/gnunet-transport.c:1484
+#: src/transport/gnunet-transport.c:1995
 msgid "Starting to receive benchmark data\n"
 msgstr "Empezando a recibir datos de prueba\n"
 
-#: src/transport/gnunet-transport.c:1569
+#: src/transport/gnunet-transport.c:2094
 #, fuzzy
-msgid "print information for all peers (instead of only connected peers )"
+msgid "print information for all peers (instead of only connected peers)"
 msgstr "Imprime información sobre los pares conectados."
 
-#: src/transport/gnunet-transport.c:1572
+#: src/transport/gnunet-transport.c:2097
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr "medir cómo de rápido recibimos datos de todos los pares (hasta CTRL-C)"
 
-#: src/transport/gnunet-transport.c:1575
+#: src/transport/gnunet-transport.c:2100
 msgid "connect to a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:1578
+#: src/transport/gnunet-transport.c:2103
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:1581
+#: src/transport/gnunet-transport.c:2106
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "Imprime información de los pares de GNUnet."
 
 # Miguel: ¿Quizá continuamente fuese mejor?
-#: src/transport/gnunet-transport.c:1584
+#: src/transport/gnunet-transport.c:2109
 #, fuzzy
-msgid "print information for all pending validations continously"
+msgid "print information for all pending validations continuously"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
 
-#: src/transport/gnunet-transport.c:1587
+#: src/transport/gnunet-transport.c:2112
 msgid "provide information about all current connections (once)"
 msgstr "provee información sobre todas las conexiones actuales (una vez)"
 
-#: src/transport/gnunet-transport.c:1593
+#: src/transport/gnunet-transport.c:2118
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 "provee información sobre todas los eventos de conexión y desconexión "
 "(continuamente)"
 
-#: src/transport/gnunet-transport.c:1595
+#: src/transport/gnunet-transport.c:2121
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
-#: src/transport/gnunet-transport.c:1597
+#: src/transport/gnunet-transport.c:2124
+#: src/transport/gnunet-transport-profiler.c:638
 msgid "peer identity"
 msgstr "identidad del par"
 
-#: src/transport/gnunet-transport.c:1599
+#: src/transport/gnunet-transport.c:2127
+#, fuzzy
+msgid "monitor plugin sessions"
+msgstr "# sesiones wlan pendientes"
+
+#: src/transport/gnunet-transport.c:2130
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr "enviar data para prueba a otro par (hasta CTRL-C)"
 
-#: src/transport/gnunet-transport.c:1602
+#: src/transport/gnunet-transport.c:2133
 msgid "test transport configuration (involves external server)"
 msgstr "probar configuración de transporte (requiere un servidor externo)"
 
-#: src/transport/gnunet-transport.c:1611
+#: src/transport/gnunet-transport.c:2144
+#: src/transport/gnunet-transport-profiler.c:649
 msgid "Direct access to transport service."
 msgstr "Acceso directo al servicio de transporte."
 
-#: src/transport/plugin_transport_bluetooth.c:621
-#, fuzzy
-msgid "# Bluetooth ACKs sent"
-msgstr "# ACK WLAN enviados"
+#: src/transport/gnunet-transport-profiler.c:218
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:640
-#, fuzzy
-msgid "# Bluetooth messages defragmented"
-msgstr "# mensajes defragmentados"
+#: src/transport/gnunet-transport-profiler.c:254
+#, c-format
+msgid "%u;%u;%llu;%llu;%.2f;%.2f"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:686
-#: src/transport/plugin_transport_bluetooth.c:737
-#: src/transport/plugin_transport_bluetooth.c:1942
-#, fuzzy
-msgid "# Bluetooth sessions allocated"
-msgstr "# sesiones WLAN alojadas"
+#: src/transport/gnunet-transport-profiler.c:263
+#, c-format
+msgid ";%llu;%.2f"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:837
-#, fuzzy
-msgid "# Bluetooth message fragments sent"
-msgstr "# fragmentos de mensaje WLAN enviados"
+#: src/transport/gnunet-transport-profiler.c:280
+msgid "\n"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:861
-#, fuzzy
-msgid "# Bluetooth messages pending (with fragmentation)"
-msgstr "# mensajes WLAN pendientes (con fragmentación)"
+#: src/transport/gnunet-transport-profiler.c:332
+msgid "."
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:969
-#: src/transport/plugin_transport_bluetooth.c:1054
-#: src/transport/plugin_transport_bluetooth.c:1944
-#, fuzzy
-msgid "# Bluetooth MAC endpoints allocated"
-msgstr "# MAC de destino WLAN alojadas"
+#: src/transport/gnunet-transport-profiler.c:352
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
+msgstr ""
+"Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
+"bloques de %u Kb\n"
 
-#: src/transport/plugin_transport_bluetooth.c:1307
+#: src/transport/gnunet-transport-profiler.c:400
+#, fuzzy, c-format
+msgid "Connected to different peer `%s'\n"
+msgstr "Conectado a %s.\n"
+
+#: src/transport/gnunet-transport-profiler.c:483
+#, fuzzy, c-format
+msgid "Retrying to connect to `%s'\n"
+msgstr "Intentando conectar a «%s» (%p)\n"
+
+#: src/transport/gnunet-transport-profiler.c:508
+#, fuzzy, c-format
+msgid "Denying connection to `%s'\n"
+msgstr "Aceptando conexión desde «%s»: %p\n"
+
+#: src/transport/gnunet-transport-profiler.c:537
 #, fuzzy
-msgid "# HELLO messages received via Bluetooth"
-msgstr "# mensajes HELLO recibidos vía WLAN"
+msgid "Message size too big!\n"
+msgstr "tamaño del mensaje"
 
-#: src/transport/plugin_transport_bluetooth.c:1331
+#: src/transport/gnunet-transport-profiler.c:543
 #, fuzzy
-msgid "# fragments received via Bluetooth"
-msgstr "# fragmentos recibidos vía WLAN"
+msgid "No peer identity given\n"
+msgstr "No se han proporcionado opciones\n"
 
-#: src/transport/plugin_transport_bluetooth.c:1341
+#: src/transport/gnunet-transport-profiler.c:558
+#, fuzzy, c-format
+msgid "Trying to send %u messages with size %u to peer `%s'\n"
+msgstr "Usando %u mensajes de un tamaño de %u durante %u veces.\n"
+
+#: src/transport/gnunet-transport-profiler.c:564
+#, fuzzy, c-format
+msgid "Trying to receive messages from peer `%s'\n"
+msgstr ""
+"Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
+"«%s»\n"
+
+#: src/transport/gnunet-transport-profiler.c:569
 #, fuzzy
-msgid "# ACKs received via Bluetooth"
-msgstr "# ACK recibidos vía WLAN"
+msgid "No operation given\n"
+msgstr "No se han proporcionado opciones\n"
 
-#: src/transport/plugin_transport_bluetooth.c:1401
+#: src/transport/gnunet-transport-profiler.c:623
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:626
 #, fuzzy
-msgid "# Bluetooth DATA messages discarded due to CRC32 error"
-msgstr "# mensajes DATA WLAN descartados debido a un error en el CRC32"
+msgid "receive data from peer"
+msgstr "# respuestas recibidas de otros pares"
 
-#: src/transport/plugin_transport_bluetooth.c:1512
+#: src/transport/gnunet-transport-profiler.c:629
 #, fuzzy
-msgid "# DATA messages received via Bluetooth"
-msgstr "# mensajes «DATA» recibidos vía WLAN"
+msgid "iterations"
+msgstr "Otras configuraciones"
 
-#: src/transport/plugin_transport_bluetooth.c:1547
+#: src/transport/gnunet-transport-profiler.c:632
 #, fuzzy
-msgid "# Bluetooth DATA messages processed"
-msgstr "# mensajes «DATA» WLAN procesados"
+msgid "number of messages to send"
+msgstr "número de mensajes a usar por iteración"
 
-#: src/transport/plugin_transport_bluetooth.c:1610
+#: src/transport/gnunet-transport-profiler.c:635
 #, fuzzy
-msgid "# HELLO beacons sent via Bluetooth"
-msgstr "# «beacons HELLO» enviados vía WLAN"
+msgid "message size to use"
+msgstr "tamaño del mensaje"
 
-#: src/transport/plugin_transport_bluetooth.c:1923
-#, fuzzy, c-format
-msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
+#: src/transport/plugin_transport_http_client.c:1491
+#: src/transport/plugin_transport_http_server.c:2271
+#: src/transport/plugin_transport_http_server.c:3436
+#: src/transport/plugin_transport_tcp.c:2826
+#: src/transport/plugin_transport_tcp.c:2833
+msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
-"El ejecutable auxiliar «%s» no tiene activado el bit SUID, no se puede "
-"ejecutar el transporte WLAN\n"
 
-#: src/transport/plugin_transport_http_client.c:1685
+#: src/transport/plugin_transport_http_client.c:2115
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 "¡No se pudo inicializar el multi-manejador de curl, no se pudo iniciar el "
 "módulo %s!\n"
 
-#: src/transport/plugin_transport_http_client.c:1760
-#: src/transport/plugin_transport_http_server.c:3031
+#: src/transport/plugin_transport_http_client.c:2164
+#: src/transport/plugin_transport_http_server.c:3170
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
-#: src/transport/plugin_transport_http_client.c:1785
-#: src/transport/plugin_transport_http_server.c:3088
+#: src/transport/plugin_transport_http_client.c:2181
+#: src/transport/plugin_transport_http_server.c:3240
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Finalización del módulo «%s» completa\n"
 
-#: src/transport/plugin_transport_http_client.c:1819
-#: src/transport/plugin_transport_http_server.c:2931
-#, c-format
-msgid "Maximum number of connections is %u\n"
+#: src/transport/plugin_transport_http_client.c:2215
+#, fuzzy, c-format
+msgid "Maximum number of requests is %u\n"
 msgstr "El número máximo de conexiones es %u\n"
 
-#: src/transport/plugin_transport_http_server.c:1423
+#: src/transport/plugin_transport_http_server.c:1761
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -7887,12 +8310,12 @@
 "Acceso desde la conexión %p (%u de %u) para «%s» «%s» URL «%s» con tamaño de "
 "los datos de subida %u\n"
 
-#: src/transport/plugin_transport_http_server.c:1687
+#: src/transport/plugin_transport_http_server.c:1992
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr "Aceptando conexión (%u de %u) desde «%s»\n"
 
-#: src/transport/plugin_transport_http_server.c:1695
+#: src/transport/plugin_transport_http_server.c:2000
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
@@ -7900,7 +8323,7 @@
 "El servidor ha alcanzado el número máximo de conexiones (%u), rechazando "
 "nueva conexión\n"
 
-#: src/transport/plugin_transport_http_server.c:1982
+#: src/transport/plugin_transport_http_server.c:2150
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
@@ -7908,94 +8331,103 @@
 "¡No se pudo crear un certificado TLS nuevo, el programa «gnunet-transport-"
 "certificate-creation» no pudo ser iniciado!\n"
 
-#: src/transport/plugin_transport_http_server.c:2006
+#: src/transport/plugin_transport_http_server.c:2173
 #, fuzzy, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 "¡No se encontró ningún certificado TLS útil y se produjo un fallo al crear "
 "uno!\n"
 
-#: src/transport/plugin_transport_http_server.c:2429
+#: src/transport/plugin_transport_http_server.c:2297
+msgid "Could not load or create server certificate! Loading plugin failed!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2604
 msgid "Require valid port number for service in configuration!\n"
 msgstr "¡Se necesita un puerto válido para el servicio en la configuración!\n"
 
-#: src/transport/plugin_transport_http_server.c:2461 src/util/service.c:700
+#: src/transport/plugin_transport_http_server.c:2638 src/util/service.c:700
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2478 src/util/service.c:719
+#: src/transport/plugin_transport_http_server.c:2656 src/util/service.c:719
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "No se encontró la dirección %s para «%s».\n"
 
-#: src/transport/plugin_transport_http_server.c:2589
+#: src/transport/plugin_transport_http_server.c:2769
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr "Encontradas %u direcciones para comunicar al servicio NAT\n"
 
-#: src/transport/plugin_transport_http_server.c:2661
+#: src/transport/plugin_transport_http_server.c:2847
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n"
 
-#: src/transport/plugin_transport_http_server.c:2754
+#: src/transport/plugin_transport_http_server.c:2946
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "El soporte IPv4 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2768
+#: src/transport/plugin_transport_http_server.c:2961
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "El soporte IPv6 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2775
+#: src/transport/plugin_transport_http_server.c:2967
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "¡Ni IPv4 ni IPv6 están habilitadas! Corrija la configuración\n"
 
-#: src/transport/plugin_transport_http_server.c:2786
+#: src/transport/plugin_transport_http_server.c:2978
 msgid "Port is required! Fix in configuration\n"
 msgstr "¡El puerto es necesario! Corrija la configuración\n"
 
-#: src/transport/plugin_transport_http_server.c:2793
+#: src/transport/plugin_transport_http_server.c:2984
 #, c-format
 msgid "Using port %u\n"
 msgstr "Usando puerto %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2808
+#: src/transport/plugin_transport_http_server.c:2998
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "¡La dirección IPv4 «%s» especificada en el fichero de configuración no es "
 "válida!\n"
 
-#: src/transport/plugin_transport_http_server.c:2818
+#: src/transport/plugin_transport_http_server.c:3008
 #, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Asociando a la dirección IPv4 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2839
+#: src/transport/plugin_transport_http_server.c:3030
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "¡La dirección IPv6 «%s» especificada en el fichero de configuración no es "
 "válida!\n"
 
-#: src/transport/plugin_transport_http_server.c:2849
+#: src/transport/plugin_transport_http_server.c:3040
 #, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Asociando a la dirección IPv6 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2901
+#: src/transport/plugin_transport_http_server.c:3103
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Usando nombre de máquina externo «%s»\n"
 
-#: src/transport/plugin_transport_http_server.c:2917
+#: src/transport/plugin_transport_http_server.c:3124
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Notificando al transporte sólo el nombre de máquina «%s»\n"
 
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_server.c:3141
+#, c-format
+msgid "Maximum number of connections is %u\n"
+msgstr "El número máximo de conexiones es %u\n"
+
+#: src/transport/plugin_transport_http_server.c:3448
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "¡Imposible obtener «HELLO» del par!\n"
@@ -8045,65 +8477,60 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por SMTP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:565
+#: src/transport/plugin_transport_tcp.c:648
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Longitud de dirección inesperada: %u bytes\n"
 
-#: src/transport/plugin_transport_tcp.c:787
-#: src/transport/plugin_transport_tcp.c:962
-#: src/transport/plugin_transport_tcp.c:2047
-#: src/transport/plugin_transport_tcp.c:2620
+#: src/transport/plugin_transport_tcp.c:829
+#: src/transport/plugin_transport_tcp.c:1044
+#: src/transport/plugin_transport_tcp.c:2232
+#: src/transport/plugin_transport_tcp.c:2932
 msgid "# TCP sessions active"
 msgstr "# Sesiones TCP activas"
 
-#: src/transport/plugin_transport_tcp.c:823
-#: src/transport/plugin_transport_tcp.c:955
-#: src/transport/plugin_transport_tcp.c:1045
-#: src/transport/plugin_transport_tcp.c:1093
-#: src/transport/plugin_transport_tcp.c:1259
-#: src/transport/plugin_transport_tcp.c:1277
+#: src/transport/plugin_transport_tcp.c:870
+#: src/transport/plugin_transport_tcp.c:1027
+#: src/transport/plugin_transport_tcp.c:1146
+#: src/transport/plugin_transport_tcp.c:1214
+#: src/transport/plugin_transport_tcp.c:1312
+#: src/transport/plugin_transport_tcp.c:1336
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes actualmente en los buffer TCP"
 
-#: src/transport/plugin_transport_tcp.c:826
+#: src/transport/plugin_transport_tcp.c:873
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes descartados por TCP (desconectado)"
 
-#: src/transport/plugin_transport_tcp.c:1048
+#: src/transport/plugin_transport_tcp.c:1149
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (expirados)"
 
-#: src/transport/plugin_transport_tcp.c:1096
+#: src/transport/plugin_transport_tcp.c:1218
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:1233
-#, c-format
-msgid "Trying to send with invalid session %p\n"
-msgstr "Intentando enviar con una sesión no válida %p\n"
-
-#: src/transport/plugin_transport_tcp.c:1504
+#: src/transport/plugin_transport_tcp.c:1611
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1609
+#: src/transport/plugin_transport_tcp.c:1775
 msgid "# transport-service disconnect requests for TCP"
 msgstr "# peticiones de desconexión del servicio de transporte por TCP"
 
-#: src/transport/plugin_transport_tcp.c:2097
+#: src/transport/plugin_transport_tcp.c:2282
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
 
-#: src/transport/plugin_transport_tcp.c:2257
+#: src/transport/plugin_transport_tcp.c:2452
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:2321
+#: src/transport/plugin_transport_tcp.c:2524
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
-#: src/transport/plugin_transport_tcp.c:2490 src/util/service.c:582
+#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:582
 #: src/util/service.c:588
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
@@ -8111,20 +8538,20 @@
 "¡Se requiere un número de puerto válido para el servicio «%s» en la "
 "configuración!\n"
 
-#: src/transport/plugin_transport_tcp.c:2504
+#: src/transport/plugin_transport_tcp.c:2776
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
 
-#: src/transport/plugin_transport_tcp.c:2607
+#: src/transport/plugin_transport_tcp.c:2919
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "Transporte TCP escuchando en el puerto %llu\n"
 
-#: src/transport/plugin_transport_tcp.c:2611
+#: src/transport/plugin_transport_tcp.c:2923
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n"
 
-#: src/transport/plugin_transport_tcp.c:2615
+#: src/transport/plugin_transport_tcp.c:2927
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr "El transporte TCP anuncia que está en el puerto %llu\n"
@@ -8149,14 +8576,14 @@
 "Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el "
 "«socket» en el puerto %d\n"
 
-#: src/transport/plugin_transport_udp.c:1513
+#: src/transport/plugin_transport_udp.c:1655
 #, c-format
 msgid ""
 "Trying to create session for address of unexpected length %u (should be %u "
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2602
+#: src/transport/plugin_transport_udp.c:2881
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
@@ -8165,7 +8592,7 @@
 "UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, "
 "compruebe su configuración de red\n"
 
-#: src/transport/plugin_transport_udp.c:2616
+#: src/transport/plugin_transport_udp.c:2894
 #, fuzzy
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
@@ -8175,109 +8602,121 @@
 "configuración de red y deshabilite IPv6 si su conexión carece de una "
 "dirección IPv6 global\n"
 
-#: src/transport/plugin_transport_udp.c:2961
+#: src/transport/plugin_transport_udp.c:3247
+#, fuzzy, c-format
+msgid "Failed to bind UDP socket to %s: %s\n"
+msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
+
+#: src/transport/plugin_transport_udp.c:3255
 msgid "Failed to open UDP sockets\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:3056
+#: src/transport/plugin_transport_udp.c:3414
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr "La opción «%s» dada está fuera de rango: %llu > %u\n"
 
-#: src/transport/plugin_transport_udp.c:3097
+#: src/transport/plugin_transport_udp.c:3461
 #, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Dirección IPv6 no válida: «%s»\n"
 
-#: src/transport/plugin_transport_udp.c:3168
+#: src/transport/plugin_transport_udp.c:3529
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Se produjo un fallo al crear una nueva firma"
 
-#: src/transport/plugin_transport_unix.c:1321
+#: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/transport/plugin_transport_unix.c:1645
-#, fuzzy
-msgid "No UNIXPATH given in configuration!\n"
-msgstr "¡%s mal formada «%s» dada en la configuración!\n"
+#: src/transport/plugin_transport_unix.c:1416
+#, fuzzy, c-format
+msgid "Cannot bind to `%s'\n"
+msgstr "Imposible hallar el hash de '%s'.\n"
 
-#: src/transport/plugin_transport_unix.c:1681
+#: src/transport/plugin_transport_unix.c:1817
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UNIX\n"
 
-#: src/transport/plugin_transport_wlan.c:620
-msgid "# WLAN ACKs sent"
+#: src/transport/plugin_transport_wlan.c:725
+#, fuzzy
+msgid "# ACKs sent"
 msgstr "# ACK WLAN enviados"
 
-#: src/transport/plugin_transport_wlan.c:639
-msgid "# WLAN messages defragmented"
-msgstr "# mensajes WLAN defragmentados"
+#: src/transport/plugin_transport_wlan.c:745
+#, fuzzy
+msgid "# Messages defragmented"
+msgstr "# mensajes defragmentados"
 
-#: src/transport/plugin_transport_wlan.c:688
-#: src/transport/plugin_transport_wlan.c:772
-#: src/transport/plugin_transport_wlan.c:1948
-msgid "# WLAN sessions allocated"
+#: src/transport/plugin_transport_wlan.c:786
+#: src/transport/plugin_transport_wlan.c:873
+#, fuzzy
+msgid "# Sessions allocated"
 msgstr "# sesiones WLAN alojadas"
 
-#: src/transport/plugin_transport_wlan.c:876
-msgid "# WLAN message fragments sent"
+#: src/transport/plugin_transport_wlan.c:989
+#, fuzzy
+msgid "# message fragments sent"
 msgstr "# fragmentos de mensaje WLAN enviados"
 
-#: src/transport/plugin_transport_wlan.c:900
-msgid "# WLAN messages pending (with fragmentation)"
+#: src/transport/plugin_transport_wlan.c:1015
+#, fuzzy
+msgid "# messages pending (with fragmentation)"
 msgstr "# mensajes WLAN pendientes (con fragmentación)"
 
-#: src/transport/plugin_transport_wlan.c:1008
-#: src/transport/plugin_transport_wlan.c:1098
-#: src/transport/plugin_transport_wlan.c:1950
-msgid "# WLAN MAC endpoints allocated"
+#: src/transport/plugin_transport_wlan.c:1129
+#: src/transport/plugin_transport_wlan.c:1222
+#: src/transport/plugin_transport_wlan.c:2185
+#, fuzzy
+msgid "# MAC endpoints allocated"
 msgstr "# MAC de destino WLAN alojadas"
 
-#: src/transport/plugin_transport_wlan.c:1302
-msgid "# HELLO messages received via WLAN"
-msgstr "# mensajes HELLO recibidos vía WLAN"
-
-#: src/transport/plugin_transport_wlan.c:1326
-msgid "# fragments received via WLAN"
-msgstr "# fragmentos recibidos vía WLAN"
-
-#: src/transport/plugin_transport_wlan.c:1336
-msgid "# ACKs received via WLAN"
+#: src/transport/plugin_transport_wlan.c:1487
+#, fuzzy
+msgid "# ACKs received"
 msgstr "# ACK recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1396
-msgid "# WLAN DATA messages discarded due to CRC32 error"
+#: src/transport/plugin_transport_wlan.c:1555
+#, fuzzy
+msgid "# DATA messages discarded due to CRC32 error"
 msgstr "# mensajes DATA WLAN descartados debido a un error en el CRC32"
 
-#: src/transport/plugin_transport_wlan.c:1518
-msgid "# DATA messages received via WLAN"
-msgstr "# mensajes «DATA» recibidos vía WLAN"
+#: src/transport/plugin_transport_wlan.c:1696
+#, fuzzy
+msgid "# DATA messages received"
+msgstr "# Mensajes «GAP PUT» recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1553
-msgid "# WLAN DATA messages processed"
+#: src/transport/plugin_transport_wlan.c:1730
+#, fuzzy
+msgid "# DATA messages processed"
 msgstr "# mensajes «DATA» WLAN procesados"
 
-#: src/transport/plugin_transport_wlan.c:1616
-msgid "# HELLO beacons sent via WLAN"
+#: src/transport/plugin_transport_wlan.c:1793
+#, fuzzy
+msgid "# HELLO beacons sent"
 msgstr "# «beacons HELLO» enviados vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1929
+#: src/transport/plugin_transport_wlan.c:2160
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 "El ejecutable auxiliar «%s» no tiene activado el bit SUID, no se puede "
 "ejecutar el transporte WLAN\n"
 
-#: src/transport/transport_api.c:739
+#: src/transport/plugin_transport_wlan.c:2182
+#, fuzzy
+msgid "# sessions allocated"
+msgstr "# sesiones WLAN alojadas"
+
+#: src/transport/transport_api.c:767
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Recibido mensaje inesperado del tipo %u en %s:%u\n"
 
-#: src/transport/transport-testing.c:584
+#: src/transport/transport-testing.c:603
 msgid "Failed to initialize testing library!\n"
 msgstr "¡Se produjo un fallo al inicializar la biblioteca de pruebas!\n"
 
@@ -8462,12 +8901,12 @@
 "Se produjo un fallo al establecer la conexión TCP a «%s:%u», no quedan "
 "direcciones por probar.\n"
 
-#: src/util/connection.c:751 src/util/connection.c:919
+#: src/util/connection.c:751 src/util/connection.c:914
 #, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Intentando conectar a «%s» (%p)\n"
 
-#: src/util/connection.c:910
+#: src/util/connection.c:904
 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "El intento de conectar a «%s» falló\n"
@@ -8541,12 +8980,12 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt no tiene la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/disk.c:1184
+#: src/util/disk.c:1202
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
 
-#: src/util/disk.c:1546 src/util/service.c:1323
+#: src/util/disk.c:1564 src/util/service.c:1323
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n"
@@ -8660,17 +9099,22 @@
 msgid "Manipulate GNUnet configuration files"
 msgstr "Manipular ficheros de configuración de GNUnet"
 
-#: src/util/gnunet-ecc.c:75
+#: src/util/gnunet-ecc.c:81
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Se produjo un fallo al abrir «%s»: %s\n"
 
-#: src/util/gnunet-ecc.c:81
+#: src/util/gnunet-ecc.c:117
+#, fuzzy, c-format
+msgid "Generating %u keys like %s, please wait"
+msgstr "Generando %u claves, por favor, espere"
+
+#: src/util/gnunet-ecc.c:130
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr "Generando %u claves, por favor, espere"
 
-#: src/util/gnunet-ecc.c:97
+#: src/util/gnunet-ecc.c:171
 #, c-format
 msgid ""
 "\n"
@@ -8679,64 +9123,60 @@
 "\n"
 "Se produjo un fallo al escribir en «%s»: %s\n"
 
-#: src/util/gnunet-ecc.c:107
+#: src/util/gnunet-ecc.c:181
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr "¡Finalizado!\n"
 
-#: src/util/gnunet-ecc.c:110
+#: src/util/gnunet-ecc.c:184
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:199
+#: src/util/gnunet-ecc.c:277
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "El fichero de máquinas %s no fue encontrado\n"
 
-#: src/util/gnunet-ecc.c:210
+#: src/util/gnunet-ecc.c:288
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "El archivo de amigos «%s» está vacío.\n"
 
-#: src/util/gnunet-ecc.c:232
+#: src/util/gnunet-ecc.c:310
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "¡No se puede leer el fichero de claves de máquina!\n"
 
-#: src/util/gnunet-ecc.c:283
+#: src/util/gnunet-ecc.c:361
 msgid "No hostkey file specified on command line\n"
 msgstr "No se ha especificado la clave de máquina en la línea de comandos\n"
 
-#: src/util/gnunet-ecc.c:349
+#: src/util/gnunet-ecc.c:411
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:352
+#: src/util/gnunet-ecc.c:414
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:355
+#: src/util/gnunet-ecc.c:417
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr "crea «COUNT» pares de claves pública-privada (para pruebas)"
 
-#: src/util/gnunet-ecc.c:358
+#: src/util/gnunet-ecc.c:420
 msgid "print the public key in ASCII format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:361
-msgid "print the hash of the public key in ASCII format"
-msgstr "imprime el hash de la clave pública en formato ASCII"
-
-#: src/util/gnunet-ecc.c:364
+#: src/util/gnunet-ecc.c:423
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:375
+#: src/util/gnunet-ecc.c:434
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
@@ -8769,13 +9209,13 @@
 msgid "Manipulate GNUnet proof of work files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
-#: src/util/gnunet-service-resolver.c:299
+#: src/util/gnunet-service-resolver.c:310
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "No se pudo resolver «%s» (%s): %s\n"
 
-#: src/util/gnunet-service-resolver.c:371
-#: src/util/gnunet-service-resolver.c:412
+#: src/util/gnunet-service-resolver.c:382
+#: src/util/gnunet-service-resolver.c:423
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "No se encontró la IP del host «%s»: %s\n"
@@ -8826,7 +9266,7 @@
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr "Imposible acortar la ruta unix «%s» manteniendo el nombre único\n"
 
-#: src/util/network.c:1355 src/util/network.c:1480
+#: src/util/network.c:1361 src/util/network.c:1486
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8892,12 +9332,12 @@
 msgid "Malformed configuration, exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/util/resolver_api.c:198
+#: src/util/resolver_api.c:201
 #, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr "¡Se debe especificar «%s» para «%s» en la configuración!\n"
 
-#: src/util/resolver_api.c:216
+#: src/util/resolver_api.c:220
 #, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
@@ -8905,17 +9345,17 @@
 "¡Se debe especificar «%s» o una dirección numérica IP para «%s» de «%s» en "
 "la configuración!\n"
 
-#: src/util/resolver_api.c:348
+#: src/util/resolver_api.c:354
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "Expiración de plazo intentando resolver la dirección IP «%s».\n"
 
-#: src/util/resolver_api.c:352
+#: src/util/resolver_api.c:361
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Expiración de plazo intentando resolver el nombre de máquina «%s».\n"
 
-#: src/util/resolver_api.c:908
+#: src/util/resolver_api.c:974
 #, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr ""
@@ -8945,7 +9385,7 @@
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "«%s» falló para «%.*s»: dirección en uso actualmente\n"
 
-#: src/util/server.c:892
+#: src/util/server.c:894
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9061,118 +9501,118 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:433
+#: src/util/strings.c:434
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr "Los conjuntos de caracteres pedidos fueron «%s»->«%s»\n"
 
-#: src/util/strings.c:561
+#: src/util/strings.c:562
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Se produjo un fallo al expandir «$HOME»: variable de entorno «HOME» no "
 "establecida"
 
-#: src/util/strings.c:658
+#: src/util/strings.c:659
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:662
+#: src/util/strings.c:663
 msgid "forever"
 msgstr "para siempre"
 
-#: src/util/strings.c:664
+#: src/util/strings.c:665
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:670
+#: src/util/strings.c:671
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:676
+#: src/util/strings.c:677
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:682
+#: src/util/strings.c:683
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:688
+#: src/util/strings.c:689
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:695
+#: src/util/strings.c:696
 msgid "day"
 msgstr "día"
 
-#: src/util/strings.c:697
+#: src/util/strings.c:698
 msgid "days"
 msgstr "días"
 
-#: src/util/strings.c:726
+#: src/util/strings.c:727
 msgid "end of time"
 msgstr "fin del plazo"
 
-#: src/util/strings.c:1159
+#: src/util/strings.c:1192
 msgid "IPv6 address did not start with `['\n"
 msgstr "La dirección IPv6 no empezaba con «[»\n"
 
-#: src/util/strings.c:1167
+#: src/util/strings.c:1200
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr "La dirección IPv6 contenía «:» para separar el número de puerto\n"
 
-#: src/util/strings.c:1173
+#: src/util/strings.c:1206
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 "La dirección IPv6 contenía «]» antes de «:» para separar el número de "
 "puerto\n"
 
-#: src/util/strings.c:1180
+#: src/util/strings.c:1213
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 "La dirección IPv6 contenía un número de puerto válido después del último "
 "«:»\n"
 
-#: src/util/strings.c:1189
+#: src/util/strings.c:1222
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Dirección IPv6 «%s» no válida: %s\n"
 
-#: src/util/strings.c:1395 src/util/strings.c:1411
+#: src/util/strings.c:1428 src/util/strings.c:1444
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1420
+#: src/util/strings.c:1453
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/util/strings.c:1503 src/util/strings.c:1534 src/util/strings.c:1582
-#: src/util/strings.c:1603
+#: src/util/strings.c:1536 src/util/strings.c:1567 src/util/strings.c:1615
+#: src/util/strings.c:1636
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: «%s»\n"
 
-#: src/util/strings.c:1560
+#: src/util/strings.c:1593
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Notación de red no válida («/%d» no es válido en IPv4 CIDR)."
 
-#: src/util/strings.c:1612
+#: src/util/strings.c:1645
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/util/strings.c:1664
+#: src/util/strings.c:1697
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Notación de red no válida (no termina con «;»: «%s»)\n"
 
-#: src/util/strings.c:1714
+#: src/util/strings.c:1747
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Formato «%s» erroneo para máscara de red\n"
 
-#: src/util/strings.c:1745
+#: src/util/strings.c:1778
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato «%s» erroneo para red\n"
@@ -9358,22 +9798,190 @@
 msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
 
-#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573
-#: src/include/gnunet_common.h:581
+#: src/include/gnunet_common.h:586 src/include/gnunet_common.h:593
+#: src/include/gnunet_common.h:601
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Aserción fallida en %s:%d.\n"
 
-#: src/include/gnunet_common.h:593
+#: src/include/gnunet_common.h:613
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Violación externa del protocolo detectada en %s:%d.\n"
 
-#: src/include/gnunet_common.h:620 src/include/gnunet_common.h:629
+#: src/include/gnunet_common.h:640 src/include/gnunet_common.h:649
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 
+#~ msgid "NAT traversal with ICMP Server timed out.\n"
+#~ msgstr "Recorrido NAT con servidor ICMP expirado.\n"
+
+#~ msgid "gnunet-helper-nat-client found, enabling it\n"
+#~ msgstr "«gnunet-helper-nat-client» encontrado, habilitando su uso\n"
+
+#~ msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+#~ msgstr ""
+#~ "«gnunet-helper-nat-client» no encontrado o detrás de NAT, deshabilitando "
+#~ "su uso\n"
+
+#, fuzzy
+#~ msgid "Duplicate revocation received from peer. Ignored.\n"
+#~ msgstr "Opciones de paquete IPv4 recibidas.  Ignoradas.\n"
+
+#, fuzzy
+#~ msgid "Client %p disconnected from us.\n"
+#~ msgstr "Desconectado de %s\n"
+
+# Miguel: Si no me equivoco, "status result" es un
+# resultado de tipo estado.
+#, fuzzy
+#~ msgid "Could not send message to client (%p)!\n"
+#~ msgstr "No se pudo mandar el resultado (estado) al cliente\n"
+
+#, fuzzy
+#~ msgid "Successfully created new channel to peer (%s)!\n"
+#~ msgstr "Conectado satisfactoriamente a «%s»\n"
+
+#, fuzzy
+#~ msgid "Transmitting service request.\n"
+#~ msgstr "Reiniciando el servicio «%s»\n"
+
+# Miguel: Si no me equivoco, "list result" es un resultado
+# de tipo lista.
+#, fuzzy
+#~ msgid "Could not send message to channel!\n"
+#~ msgstr "No se pudo mandar el resultado (lista) al cliente\n"
+
+# Miguel: Si no me equivoco, "list result" es un resultado
+# de tipo lista.
+#, fuzzy
+#~ msgid "Could not send service-response message via cadet!)\n"
+#~ msgstr "No se pudo mandar el resultado (lista) al cliente\n"
+
+# Miguel: Si no me equivoco, "list result" es un resultado
+# de tipo lista.
+#, fuzzy
+#~ msgid "Could not send service-request multipart message to channel!\n"
+#~ msgstr "No se pudo mandar el resultado (lista) al cliente\n"
+
+#, fuzzy
+#~ msgid "New incoming channel from peer %s.\n"
+#~ msgstr "Desconectado de %s\n"
+
+#, fuzzy
+#~ msgid "CADET initialized\n"
+#~ msgstr "Conexión fallida\n"
+
+#, fuzzy
+#~ msgid "Reloading sensor definitions from directory `%s'\n"
+#~ msgstr "Descarga los ficheros de GNUnet"
+
+#, fuzzy
+#~ msgid "Loaded %d sensors from directory `%s'\n"
+#~ msgstr "Descarga los ficheros de GNUnet"
+
+# Miguel: "Failed to receive" también aquí está traducido como
+# "no se obtuvo respuesta" por claridad.
+#, fuzzy
+#~ msgid "Failed to receive response from `SENSOR' service."
+#~ msgstr ""
+#~ "No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
+
+#, fuzzy
+#~ msgid "Received invalid message from `SENSOR' service."
+#~ msgstr ""
+#~ "Recibido mensaje no válido del servicio de información de pares "
+#~ "(PEERINFO)."
+
+#, fuzzy
+#~ msgid "# SESSION_CONNECT messages sent"
+#~ msgstr "# Mensajes «DISCONNECT» enviados"
+
+#, fuzzy
+#~ msgid "# CONNECT messages received"
+#~ msgstr "# mensajes «REQUEST CONNECT» recibidos"
+
+#, fuzzy
+#~ msgid "# Bluetooth ACKs sent"
+#~ msgstr "# ACK WLAN enviados"
+
+#, fuzzy
+#~ msgid "# Bluetooth messages defragmented"
+#~ msgstr "# mensajes defragmentados"
+
+#, fuzzy
+#~ msgid "# Bluetooth sessions allocated"
+#~ msgstr "# sesiones WLAN alojadas"
+
+#, fuzzy
+#~ msgid "# Bluetooth message fragments sent"
+#~ msgstr "# fragmentos de mensaje WLAN enviados"
+
+#, fuzzy
+#~ msgid "# Bluetooth messages pending (with fragmentation)"
+#~ msgstr "# mensajes WLAN pendientes (con fragmentación)"
+
+#, fuzzy
+#~ msgid "# Bluetooth MAC endpoints allocated"
+#~ msgstr "# MAC de destino WLAN alojadas"
+
+#, fuzzy
+#~ msgid "# HELLO messages received via Bluetooth"
+#~ msgstr "# mensajes HELLO recibidos vía WLAN"
+
+#, fuzzy
+#~ msgid "# fragments received via Bluetooth"
+#~ msgstr "# fragmentos recibidos vía WLAN"
+
+#, fuzzy
+#~ msgid "# ACKs received via Bluetooth"
+#~ msgstr "# ACK recibidos vía WLAN"
+
+#, fuzzy
+#~ msgid "# Bluetooth DATA messages discarded due to CRC32 error"
+#~ msgstr "# mensajes DATA WLAN descartados debido a un error en el CRC32"
+
+#, fuzzy
+#~ msgid "# DATA messages received via Bluetooth"
+#~ msgstr "# mensajes «DATA» recibidos vía WLAN"
+
+#, fuzzy
+#~ msgid "# Bluetooth DATA messages processed"
+#~ msgstr "# mensajes «DATA» WLAN procesados"
+
+#, fuzzy
+#~ msgid "# HELLO beacons sent via Bluetooth"
+#~ msgstr "# «beacons HELLO» enviados vía WLAN"
+
+#, fuzzy
+#~ msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
+#~ msgstr ""
+#~ "El ejecutable auxiliar «%s» no tiene activado el bit SUID, no se puede "
+#~ "ejecutar el transporte WLAN\n"
+
+#~ msgid "Trying to send with invalid session %p\n"
+#~ msgstr "Intentando enviar con una sesión no válida %p\n"
+
+#, fuzzy
+#~ msgid "No UNIXPATH given in configuration!\n"
+#~ msgstr "¡%s mal formada «%s» dada en la configuración!\n"
+
+#~ msgid "# WLAN messages defragmented"
+#~ msgstr "# mensajes WLAN defragmentados"
+
+#~ msgid "# HELLO messages received via WLAN"
+#~ msgstr "# mensajes HELLO recibidos vía WLAN"
+
+#~ msgid "# fragments received via WLAN"
+#~ msgstr "# fragmentos recibidos vía WLAN"
+
+#~ msgid "# DATA messages received via WLAN"
+#~ msgstr "# mensajes «DATA» recibidos vía WLAN"
+
+#~ msgid "print the hash of the public key in ASCII format"
+#~ msgstr "imprime el hash de la clave pública en formato ASCII"
+
 #~ msgid "Peer `%s'\n"
 #~ msgstr "Par «%s»\n"
 
@@ -9397,22 +10005,6 @@
 #~ msgstr "«gnunet-helper-nat-server» encontrado, probándolo\n"
 
 #, fuzzy
-#~ msgid "`external-ip' command not found"
-#~ msgstr "comando «external-ip» no encontrado\n"
-
-#, fuzzy
-#~ msgid "Failed to run `upnpc` command"
-#~ msgstr "Se produjo un fallo al ejecutar «%s»\n"
-
-#, fuzzy
-#~ msgid "`upnpc' command took too long, process killed"
-#~ msgstr "comando «upnpc» no encontrado\n"
-
-#, fuzzy
-#~ msgid "`upnpc` command not found"
-#~ msgstr "comando «upnpc» no encontrado\n"
-
-#, fuzzy
 #~ msgid "Could not convert `%s' to integer.\n"
 #~ msgstr "No se pudo conectar al servicio %s.\n"
 
@@ -9477,9 +10069,6 @@
 #~ msgstr ""
 #~ "El servicio NSE carece de opciones de configuración de clave.  Saliendo.\n"
 
-#~ msgid "Could not find option `%s:%s' in configuration.\n"
-#~ msgstr "No se pudo encontrar la opción «%s:%s» en la configuración.\n"
-
 #~ msgid "Peer `%s': %s <unable to resolve address>\n"
 #~ msgstr "Par «%s»: %s <no se puede resolver la dirección>\n"
 
@@ -9539,9 +10128,6 @@
 #~ "¡La dirección IPv6 «%s» especificada para el módulo %s en el fichero de "
 #~ "configuración no es válida! ¡Asociándose a todas las direcciones!\n"
 
-#~ msgid "No external hostname configured\n"
-#~ msgstr "No hay nombre de máquina externo configurado\n"
-
 #~ msgid "Starting `%s' process to generate entropy\n"
 #~ msgstr "Iniciando el proceso «%s» para generar entropía\n"
 
@@ -9740,9 +10326,6 @@
 #~ msgid "start peers with the given template configuration"
 #~ msgstr "inicia los pares con la plantilla de configuración dada"
 
-#~ msgid "number of peers to start"
-#~ msgstr "número de pares para empezar"
-
 #, fuzzy
 #~ msgid "Failed to read or generate private key: %s\n"
 #~ msgstr "Se produjo un fallo al leer o crear una clave de zona privada\n"
@@ -9816,9 +10399,6 @@
 #~ msgid "Could not parse zone key file `%s'\n"
 #~ msgstr "No se pudo procesar el fichero de clave de zona «%s»\n"
 
-#~ msgid "Failed to create new signature"
-#~ msgstr "Se produjo un fallo al crear una nueva firma"
-
 #~ msgid "Failed to put new set of records in database"
 #~ msgstr ""
 #~ "Se produjo un fallo al insertar un nuevo conjunto de registros en la base "
@@ -9910,12 +10490,6 @@
 #~ msgstr ""
 #~ "número de cadenas de búsqueda a leer del fichero de cadenas de búsqueda"
 
-# Miguel: "shutdown request" se refiere a finalizar el
-# que hace de cliente.
-#~ msgid "Failed to transmit shutdown request to client.\n"
-#~ msgstr ""
-#~ "Se produjo un fallo al transmitir una petición de apagado al cliente.\n"
-
 #~ msgid "Service `%s' was already running.\n"
 #~ msgstr "El servicio «%s» aún estaba ejecutándose.\n"
 
@@ -9992,9 +10566,6 @@
 #~ msgid "Profiler for testbed"
 #~ msgstr "Analizador de rendimiento para la batería de pruebas"
 
-#~ msgid "Could not read blacklist file `%s'\n"
-#~ msgstr "No se pudo leer el fichero de la lista negra «%s»\n"
-
 #~ msgid "Failed to read blacklist from `%s'\n"
 #~ msgstr "Se produjo un fallo al leer la lista negra de «%s»\n"
 
@@ -10038,9 +10609,6 @@
 #~ msgid "Failed to serialize meta data"
 #~ msgstr "Se produjo un fallo al serializar metadatos"
 
-#~ msgid "Failed to connect to datastore service"
-#~ msgstr "Se produjo un fallo al conectar con el servicio de almacenamiento"
-
 #~ msgid "Failed to parse URI `%s' from KBlock!\n"
 #~ msgstr "¡Se produjo un fallo al procesar la URI «%s» del KBlock!\n"
 
@@ -10792,9 +11360,6 @@
 #~ msgid "# peers disconnected due to timeout"
 #~ msgstr "# pares desconectados debido a expiración de plazo"
 
-#~ msgid "# peers disconnected due to global disconnect"
-#~ msgstr "# pares desconectados debido a desconexión global"
-
 #~ msgid "# messages not sent (no such peer or not connected)"
 #~ msgstr "# mensajes no enviados (no existe tal par o no está conectado)"
 
@@ -10819,9 +11384,6 @@
 #~ msgid "# wlan session created"
 #~ msgstr "# sesiones wlan creadas"
 
-#~ msgid "# wlan pending sessions"
-#~ msgstr "# sesiones wlan pendientes"
-
 #~ msgid "# wlan pending fragments"
 #~ msgstr "# fragmentos wlan pendientes"
 
@@ -11632,18 +12194,9 @@
 #~ msgid "`%s' registering handlers %d %d %d\n"
 #~ msgstr "'%s' registrando manejadores %d %d %d\n"
 
-#~ msgid "Using %u messages of size %u for %u times.\n"
-#~ msgstr "Usando %u mensajes de un tamaño de %u durante %u veces.\n"
-
 #~ msgid "output in gnuplot format"
 #~ msgstr "salida en formato de gnuplot"
 
-#~ msgid "number of messages to use per iteration"
-#~ msgstr "número de mensajes a usar por iteración"
-
-#~ msgid "message size"
-#~ msgstr "tamaño del mensaje"
-
 #~ msgid "sleep for SPACE ms after each a message block"
 #~ msgstr "duerme durante SPACE ms después de cada bloque de mensajes"
 
@@ -11688,9 +12241,6 @@
 #~ msgid "\tvariance %8.4f\n"
 #~ msgstr "\tvariance %8.4f\n"
 
-#~ msgid "Output format not known, this should not happen.\n"
-#~ msgstr "El formato de salida es desconocido, ésto no debería pasar.\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Did not receive the message from gnunetd. Is gnunetd running?\n"
@@ -12119,9 +12669,6 @@
 #~ msgid "Cannot get size of file `%s'"
 #~ msgstr "Imposible determinar el tamaño del fichero '%s'"
 
-#~ msgid "Cannot hash `%s'.\n"
-#~ msgstr "Imposible hallar el hash de '%s'.\n"
-
 #~ msgid "Initialization for indexing file `%s' failed.\n"
 #~ msgstr ""
 #~ "Durante la inicialización de la indexación del fichero '%s' se produjo un "
@@ -12523,10 +13070,6 @@
 #~ msgstr "Muestra el valor de la opción"
 
 #, fuzzy
-#~ msgid "General options"
-#~ msgstr "Otras configuraciones"
-
-#, fuzzy
 #~ msgid "Full pathname of GNUnet client HOME directory"
 #~ msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
@@ -13300,9 +13843,6 @@
 #~ msgid "Received invalid `%s' request (size %d)\n"
 #~ msgstr "Recibida petición '%s' no válida (tamaño %d)\n"
 
-#~ msgid "Received invalid `%s' request (wrong table)\n"
-#~ msgstr "Recibida petición '%s' no válida (tabla errónea)\n"
-
 #~ msgid "This client already participates in the given DHT!\n"
 #~ msgstr "Este cliente ya participa en el DHT dado\n"
 

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2014-12-24 15:11:43 UTC (rev 34787)
+++ gnunet/po/sv.po     2014-12-24 16:59:19 UTC (rev 34788)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-06-04 18:25+0200\n"
+"POT-Creation-Date: 2014-12-09 00:23+0100\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -356,149 +356,149 @@
 msgid "Received last message for %s \n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2793 src/ats/gnunet-ats-solver-eval.c:2827
-#: src/ats/gnunet-service-ats_addresses.c:1675
-#: src/ats/gnunet-service-ats_addresses.c:1719
+#: src/ats/gnunet-ats-solver-eval.c:2804 src/ats/gnunet-ats-solver-eval.c:2838
+#: src/ats/gnunet-service-ats_addresses.c:1781
+#: src/ats/gnunet-service-ats_addresses.c:1825
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#: src/ats/gnunet-service-ats_addresses.c:1682
+#: src/ats/gnunet-ats-solver-eval.c:2810
+#: src/ats/gnunet-service-ats_addresses.c:1788
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2806
-#: src/ats/gnunet-service-ats_addresses.c:1690
+#: src/ats/gnunet-ats-solver-eval.c:2817
+#: src/ats/gnunet-service-ats_addresses.c:1796
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2833
-#: src/ats/gnunet-service-ats_addresses.c:1726
+#: src/ats/gnunet-ats-solver-eval.c:2844
+#: src/ats/gnunet-service-ats_addresses.c:1832
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#: src/ats/gnunet-service-ats_addresses.c:1734
+#: src/ats/gnunet-ats-solver-eval.c:2851
+#: src/ats/gnunet-service-ats_addresses.c:1840
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3397
-#: src/ats-tests/gnunet-solver-eval.c:919
+#: src/ats/gnunet-ats-solver-eval.c:3410
+#: src/ats-tests/gnunet-solver-eval.c:918
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3400
-#: src/ats-tests/gnunet-solver-eval.c:922
-#: src/ats-tests/gnunet-solver-eval.c:925
+#: src/ats/gnunet-ats-solver-eval.c:3413
+#: src/ats-tests/gnunet-solver-eval.c:921
+#: src/ats-tests/gnunet-solver-eval.c:924
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3403
+#: src/ats/gnunet-ats-solver-eval.c:3416
 msgid "be verbose"
 msgstr "var informativ"
 
-#: src/ats/gnunet-ats-solver-eval.c:3406
+#: src/ats/gnunet-ats-solver-eval.c:3419
 #, fuzzy
 msgid "print logging"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3409
+#: src/ats/gnunet-ats-solver-eval.c:3422
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3412
+#: src/ats/gnunet-ats-solver-eval.c:3425
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1912
+#: src/ats/gnunet-service-ats_addresses.c:2039
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1915
+#: src/ats/gnunet-service-ats_addresses.c:2042
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1938
+#: src/ats/gnunet-service-ats_addresses.c:2065
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/ats/plugin_ats_mlp.c:949
+#: src/ats/plugin_ats_mlp.c:1344
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1542
+#: src/ats/plugin_ats_mlp.c:1941
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/ats/plugin_ats_mlp.c:1589
+#: src/ats/plugin_ats_mlp.c:1988
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2299
+#: src/ats/plugin_ats_mlp.c:2704
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2339 src/ats/plugin_ats_mlp.c:2356
-#: src/ats/plugin_ats_mlp.c:2388 src/ats/plugin_ats_mlp.c:2406
-#: src/ats/plugin_ats_mlp.c:2425 src/ats/plugin_ats_proportional.c:458
-#: src/ats/plugin_ats_proportional.c:475 src/ats/plugin_ats_ril.c:2220
-#: src/ats/plugin_ats_ril.c:2237 src/ats/plugin_ats_ril.c:2254
-#: src/ats/plugin_ats_ril.c:2271 src/ats/plugin_ats_ril.c:2288
-#: src/ats/plugin_ats_ril.c:2305 src/ats/plugin_ats_ril.c:2322
-#: src/ats/plugin_ats_ril.c:2339
+#: src/ats/plugin_ats_mlp.c:2744 src/ats/plugin_ats_mlp.c:2761
+#: src/ats/plugin_ats_mlp.c:2793 src/ats/plugin_ats_mlp.c:2811
+#: src/ats/plugin_ats_mlp.c:2830 src/ats/plugin_ats_proportional.c:1989
+#: src/ats/plugin_ats_proportional.c:2010 src/ats/plugin_ats_ril.c:2718
+#: src/ats/plugin_ats_ril.c:2735 src/ats/plugin_ats_ril.c:2752
+#: src/ats/plugin_ats_ril.c:2769 src/ats/plugin_ats_ril.c:2786
+#: src/ats/plugin_ats_ril.c:2803 src/ats/plugin_ats_ril.c:2820
+#: src/ats/plugin_ats_ril.c:2837
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/ats/plugin_ats_mlp.c:2512
+#: src/ats/plugin_ats_mlp.c:2917
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2521
+#: src/ats/plugin_ats_mlp.c:2926
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2937
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2540
+#: src/ats/plugin_ats_mlp.c:2945
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2551
+#: src/ats/plugin_ats_mlp.c:2956
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1819
+#: src/ats/plugin_ats_proportional.c:1847
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
@@ -536,7 +536,7 @@
 msgid "Could not connect master [%u] and slave [%u]\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:673
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:677
 #, fuzzy
 msgid "Initialization failed, shutdown\n"
 msgstr "Initiering av insticksmekanism misslyckades: %s!\n"
@@ -557,169 +557,187 @@
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:169
+#: src/ats-tool/gnunet-ats.c:296
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:171
+#: src/ats-tool/gnunet-ats.c:300
 #, c-format
-msgid "ATS returned results for %u addresses\n"
+msgid "ATS returned stat_results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:258
+#: src/ats-tool/gnunet-ats.c:378
+msgid "active "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:378
+msgid "inactive "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:427
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/ats-tool/gnunet-ats.c:467
+#: src/ats-tool/gnunet-ats.c:544
+#, fuzzy, c-format
+msgid "Removed address of peer `%s' with plugin `%s'\n"
+msgstr "Tillgängliga transport(er): %s\n"
+
+#: src/ats-tool/gnunet-ats.c:747
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:487 src/namestore/gnunet-namestore.c:639
-#: src/transport/gnunet-transport.c:1349
+#: src/ats-tool/gnunet-ats.c:779 src/namestore/gnunet-namestore.c:700
+#: src/transport/gnunet-transport.c:1855
+#: src/transport/gnunet-transport-profiler.c:531
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/ats-tool/gnunet-ats.c:499 src/transport/gnunet-transport.c:1358
+#: src/ats-tool/gnunet-ats.c:793 src/transport/gnunet-transport.c:1864
+#: src/transport/gnunet-transport-profiler.c:549
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:803
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:524 src/ats-tool/gnunet-ats.c:543
-#: src/ats-tool/gnunet-ats.c:560 src/ats-tool/gnunet-ats.c:597
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:825 src/ats-tool/gnunet-ats.c:851
+#: src/ats-tool/gnunet-ats.c:879 src/ats-tool/gnunet-ats.c:925
+#, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:532 src/ats-tool/gnunet-ats.c:549
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:837 src/ats-tool/gnunet-ats.c:863
+#, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:569
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:891
+#, fuzzy
 msgid "No preference type given!\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:574
-#, c-format
+#: src/ats-tool/gnunet-ats.c:898
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:590
+#: src/ats-tool/gnunet-ats.c:916
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:648
+#: src/ats-tool/gnunet-ats.c:984
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:650
+#: src/ats-tool/gnunet-ats.c:986
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:653
+#: src/ats-tool/gnunet-ats.c:989
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/ats-tool/gnunet-ats.c:655
+#: src/ats-tool/gnunet-ats.c:991
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:657
+#: src/ats-tool/gnunet-ats.c:993
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:659
+#: src/ats-tool/gnunet-ats.c:995
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:661
+#: src/ats-tool/gnunet-ats.c:997
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:664
+#: src/ats-tool/gnunet-ats.c:1000
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:666
+#: src/ats-tool/gnunet-ats.c:1002
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:669
+#: src/ats-tool/gnunet-ats.c:1005
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:676
+#: src/ats-tool/gnunet-ats.c:1012
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:357
+#: src/cadet/gnunet-cadet.c:376
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/cadet/gnunet-cadet.c:607
+#: src/cadet/gnunet-cadet.c:626
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/cadet/gnunet-cadet.c:650
+#: src/cadet/gnunet-cadet.c:669
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/cadet/gnunet-cadet.c:716
+#: src/cadet/gnunet-cadet.c:735
 msgid "You must NOT give a TARGETwhen using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:807
+#: src/cadet/gnunet-cadet.c:832
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:810
+#: src/cadet/gnunet-cadet.c:835
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:816
+#: src/cadet/gnunet-cadet.c:838
+msgid "dump debug information to STDERR"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:844
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:819
+#: src/cadet/gnunet-cadet.c:847
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:822
+#: src/cadet/gnunet-cadet.c:850
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:825
+#: src/cadet/gnunet-cadet.c:853
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-cadet.c:828
+#: src/cadet/gnunet-cadet.c:856
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/cadet/gnunet-service-cadet_peer.c:429
+#: src/cadet/gnunet-service-cadet_peer.c:496
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -734,8 +752,8 @@
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:443
-#: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
-#: src/set/gnunet-set-profiler.c:292
+#: src/set/gnunet-set-profiler.c:289 src/set/gnunet-set-profiler.c:292
+#: src/set/gnunet-set-profiler.c:295
 #, fuzzy
 msgid "number of values"
 msgstr "antal iterationer"
@@ -754,270 +772,271 @@
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:557
-#: src/conversation/conversation_api_call.c:470
+#: src/conversation/conversation_api.c:493
+#: src/conversation/conversation_api_call.c:475
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/conversation_api.c:681
+#: src/conversation/conversation_api.c:617
 #, fuzzy
 msgid "number too large"
 msgstr "antal iterationer"
 
-#: src/conversation/gnunet-conversation.c:264
+#: src/conversation/gnunet-conversation.c:269
 #, c-format
 msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:286
+#: src/conversation/gnunet-conversation.c:291
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:319
+#: src/conversation/gnunet-conversation.c:323
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:324
+#: src/conversation/gnunet-conversation.c:328
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:342
+#: src/conversation/gnunet-conversation.c:346
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:356
+#: src/conversation/gnunet-conversation.c:360
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/conversation/gnunet-conversation.c:368
+#: src/conversation/gnunet-conversation.c:372
 #, c-format
 msgid ""
 "Phone active on line %u.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:390
+#: src/conversation/gnunet-conversation.c:394
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:397
+#: src/conversation/gnunet-conversation.c:401
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/conversation/gnunet-conversation.c:404
+#: src/conversation/gnunet-conversation.c:408
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/conversation/gnunet-conversation.c:411
-msgid "Call terminated\n"
+#: src/conversation/gnunet-conversation.c:416
+#, c-format
+msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:417
+#: src/conversation/gnunet-conversation.c:425
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:423
+#: src/conversation/gnunet-conversation.c:431
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:428
+#: src/conversation/gnunet-conversation.c:436
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:495
+#: src/conversation/gnunet-conversation.c:504
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/conversation/gnunet-conversation.c:511
-#: src/conversation/gnunet-conversation.c:525
+#: src/conversation/gnunet-conversation.c:520
+#: src/conversation/gnunet-conversation.c:534
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:518
-#: src/conversation/gnunet-conversation.c:575
+#: src/conversation/gnunet-conversation.c:527
+#: src/conversation/gnunet-conversation.c:584
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:533
-#: src/conversation/gnunet-conversation.c:588
+#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:597
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:544
+#: src/conversation/gnunet-conversation.c:552
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:599
+#: src/conversation/gnunet-conversation.c:608
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:625
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:647
+#: src/conversation/gnunet-conversation.c:655
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:670
+#: src/conversation/gnunet-conversation.c:678
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:675
+#: src/conversation/gnunet-conversation.c:683
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:681
-#: src/conversation/gnunet-conversation.c:705
+#: src/conversation/gnunet-conversation.c:689
+#: src/conversation/gnunet-conversation.c:713
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:686
+#: src/conversation/gnunet-conversation.c:694
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:695
+#: src/conversation/gnunet-conversation.c:703
 #, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:700
+#: src/conversation/gnunet-conversation.c:708
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:719
+#: src/conversation/gnunet-conversation.c:727
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:725
+#: src/conversation/gnunet-conversation.c:733
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/conversation/gnunet-conversation.c:753
-#: src/conversation/gnunet-conversation.c:768
+#: src/conversation/gnunet-conversation.c:761
+#: src/conversation/gnunet-conversation.c:776
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:801
-#: src/conversation/gnunet-conversation.c:817
+#: src/conversation/gnunet-conversation.c:809
+#: src/conversation/gnunet-conversation.c:825
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:832
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:833
+#: src/conversation/gnunet-conversation.c:841
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:850
+#: src/conversation/gnunet-conversation.c:858
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:885
+#: src/conversation/gnunet-conversation.c:893
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:893
+#: src/conversation/gnunet-conversation.c:901
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:910
+#: src/conversation/gnunet-conversation.c:918
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:937
+#: src/conversation/gnunet-conversation.c:944
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:939
+#: src/conversation/gnunet-conversation.c:946
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:941
+#: src/conversation/gnunet-conversation.c:948
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:943
+#: src/conversation/gnunet-conversation.c:950
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:945
+#: src/conversation/gnunet-conversation.c:952
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:947
+#: src/conversation/gnunet-conversation.c:954
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:949
+#: src/conversation/gnunet-conversation.c:956
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:951
+#: src/conversation/gnunet-conversation.c:958
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "tillåter klienter att fastställa gnunetds konfiguration"
 
-#: src/conversation/gnunet-conversation.c:953
+#: src/conversation/gnunet-conversation.c:960
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1151
+#: src/conversation/gnunet-conversation.c:1168
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/conversation/gnunet-conversation.c:1164
+#: src/conversation/gnunet-conversation.c:1181
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Pseudonym \"%s\" togs bort.\n"
 
-#: src/conversation/gnunet-conversation.c:1199
+#: src/conversation/gnunet-conversation.c:1216
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/conversation/gnunet-conversation.c:1223
+#: src/conversation/gnunet-conversation.c:1240
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/conversation/gnunet-conversation.c:1249
+#: src/conversation/gnunet-conversation.c:1266
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1252
+#: src/conversation/gnunet-conversation.c:1269
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1276
+#: src/conversation/gnunet-conversation.c:1295
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1045,6 +1064,7 @@
 
 #: src/conversation/gnunet-conversation-test.c:248
 #: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
+#: src/sensordashboard/gnunet-sensordashboard.c:70
 #: src/template/gnunet-template.c:70
 #, fuzzy
 msgid "help text"
@@ -1055,63 +1075,63 @@
 msgid "pa_stream_write() failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:587
+#: src/conversation/gnunet-helper-audio-playback.c:589
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:612
+#: src/conversation/gnunet-helper-audio-playback.c:614
 #: src/conversation/gnunet-helper-audio-record.c:545
 #, fuzzy
 msgid "Connection established.\n"
 msgstr "Samling stoppad.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:617
+#: src/conversation/gnunet-helper-audio-playback.c:619
 #: src/conversation/gnunet-helper-audio-record.c:550
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "\"%s\" %s misslyckades: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:631
+#: src/conversation/gnunet-helper-audio-playback.c:633
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:644
+#: src/conversation/gnunet-helper-audio-playback.c:646
 #: src/conversation/gnunet-helper-audio-record.c:576
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:665
+#: src/conversation/gnunet-helper-audio-playback.c:667
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:671
+#: src/conversation/gnunet-helper-audio-playback.c:673
 #: src/conversation/gnunet-helper-audio-record.c:605
 #, fuzzy
 msgid "pa_mainloop_new() failed.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:685
+#: src/conversation/gnunet-helper-audio-playback.c:687
 #: src/conversation/gnunet-helper-audio-record.c:620
 #, fuzzy
 msgid "pa_context_new() failed.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:692
+#: src/conversation/gnunet-helper-audio-playback.c:694
 #: src/conversation/gnunet-helper-audio-record.c:626
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "# av anslutna parter"
 
-#: src/conversation/gnunet-helper-audio-playback.c:698
+#: src/conversation/gnunet-helper-audio-playback.c:700
 #: src/conversation/gnunet-helper-audio-record.c:632
 #, fuzzy
 msgid "pa_mainloop_run() failed.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:768
+#: src/conversation/gnunet-helper-audio-playback.c:770
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
@@ -1182,17 +1202,17 @@
 msgid "Failed to allocate %d bytes for second packet\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/conversation/gnunet-service-conversation.c:852
+#: src/conversation/gnunet-service-conversation.c:853
 msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:943
+#: src/conversation/gnunet-service-conversation.c:944
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1349
+#: src/conversation/gnunet-service-conversation.c:1351
 #, fuzzy, c-format
 msgid "Received incoming Cadet channel on port %u\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
@@ -1258,7 +1278,7 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:705
+#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:761
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
@@ -1269,7 +1289,7 @@
 msgid "Failed to connect to CORE service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:1590
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2115
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -1303,150 +1323,150 @@
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:549
+#: src/core/gnunet-service-core_kx.c:565
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/core/gnunet-service-core_kx.c:601
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:688
+#: src/core/gnunet-service-core_kx.c:703
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:732
+#: src/core/gnunet-service-core_kx.c:747
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:832
+#: src/core/gnunet-service-core_kx.c:847
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:839
+#: src/core/gnunet-service-core_kx.c:854
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:873
+#: src/core/gnunet-service-core_kx.c:888
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:884
+#: src/core/gnunet-service-core_kx.c:899
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:983
+#: src/core/gnunet-service-core_kx.c:998
 #: src/transport/gnunet-service-transport_validation.c:1016
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:991
+#: src/core/gnunet-service-core_kx.c:1006
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1018
+#: src/core/gnunet-service-core_kx.c:1033
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1035
+#: src/core/gnunet-service-core_kx.c:1049
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1061
+#: src/core/gnunet-service-core_kx.c:1075
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1072
+#: src/core/gnunet-service-core_kx.c:1086
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1139
-#: src/transport/gnunet-service-transport_validation.c:1328
+#: src/core/gnunet-service-core_kx.c:1153
+#: src/transport/gnunet-service-transport_validation.c:1359
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1145
+#: src/core/gnunet-service-core_kx.c:1159
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1150
+#: src/core/gnunet-service-core_kx.c:1164
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1180
+#: src/core/gnunet-service-core_kx.c:1194
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1215
+#: src/core/gnunet-service-core_kx.c:1229
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1226
+#: src/core/gnunet-service-core_kx.c:1240
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
 
-#: src/core/gnunet-service-core_kx.c:1233
+#: src/core/gnunet-service-core_kx.c:1247
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1374
+#: src/core/gnunet-service-core_kx.c:1386
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1381
+#: src/core/gnunet-service-core_kx.c:1393
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1384
+#: src/core/gnunet-service-core_kx.c:1396
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1430
-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1442
+#: src/core/gnunet-service-core_kx.c:1467
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1442
+#: src/core/gnunet-service-core_kx.c:1454
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1484
+#: src/core/gnunet-service-core_kx.c:1496
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1492
+#: src/core/gnunet-service-core_kx.c:1504
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1527
+#: src/core/gnunet-service-core_kx.c:1539
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
@@ -1474,14 +1494,13 @@
 #: src/core/gnunet-service-core_sessions.c:328
 #: src/dht/gnunet-service-dht_neighbours.c:662
 #: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:3586
-#: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
-#: src/topology/gnunet-daemon-topology.c:707
-#: src/topology/gnunet-daemon-topology.c:808
+#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1517
+#: src/topology/gnunet-daemon-topology.c:734
+#: src/topology/gnunet-daemon-topology.c:835
 #: src/transport/gnunet-service-transport_neighbours.c:917
 #: src/transport/gnunet-service-transport_neighbours.c:1141
-#: src/transport/gnunet-service-transport_neighbours.c:3146
-#: src/transport/gnunet-service-transport_neighbours.c:3449
+#: src/transport/gnunet-service-transport_neighbours.c:3177
+#: src/transport/gnunet-service-transport_neighbours.c:3491
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
@@ -1555,7 +1574,7 @@
 msgid "Heap datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_postgres.c:392
+#: src/datacache/plugin_datacache_postgres.c:391
 msgid "Postgres datacache running\n"
 msgstr ""
 
@@ -1575,24 +1594,24 @@
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
-#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:44
+#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:622
+#: src/include/gnunet_common.h:631 src/scalarproduct/scalarproduct.h:35
 #, 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:450
+#: src/datacache/plugin_datacache_sqlite.c:449
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:484
-#: src/datastore/plugin_datastore_sqlite.c:404
-#: src/namecache/plugin_namecache_sqlite.c:295
-#: src/namestore/plugin_namestore_sqlite.c:327
+#: src/datacache/plugin_datacache_sqlite.c:483
+#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/namecache/plugin_namecache_sqlite.c:292
+#: src/namestore/plugin_namestore_sqlite.c:324
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:491
+#: src/datacache/plugin_datacache_sqlite.c:490
 #, fuzzy, c-format
 msgid "Failed to close statement %p: %d\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -1893,12 +1912,12 @@
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:824
+#: src/datastore/plugin_datastore_postgres.c:832
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/plugin_datastore_postgres.c:860
+#: src/datastore/plugin_datastore_postgres.c:868
 #: src/namecache/plugin_namecache_postgres.c:414
 #: src/namestore/plugin_namestore_postgres.c:569
 msgid "Postgres database running\n"
@@ -1915,30 +1934,30 @@
 #: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
-#: src/peerstore/plugin_peerstore_sqlite.c:434
-#: src/psycstore/plugin_psycstore_sqlite.c:319
+#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/psycstore/plugin_psycstore_sqlite.c:329
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:663
+#: src/datastore/plugin_datastore_sqlite.c:661
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1156
+#: src/datastore/plugin_datastore_sqlite.c:1154
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1175
+#: src/datastore/plugin_datastore_sqlite.c:1173
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1215
-#: src/namecache/plugin_namecache_sqlite.c:583
-#: src/namestore/plugin_namestore_sqlite.c:719
+#: src/datastore/plugin_datastore_sqlite.c:1213
+#: src/namecache/plugin_namecache_sqlite.c:580
+#: src/namestore/plugin_namestore_sqlite.c:716
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -1946,7 +1965,7 @@
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:376
+#: src/dht/dht_api.c:403
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -1994,7 +2013,7 @@
 
 #: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:939
 #: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
@@ -2012,6 +2031,53 @@
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
+#: src/dht/gnunet_dht_profiler.c:1392
+#: src/testbed/gnunet-testbed-profiler.c:267
+#, fuzzy, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "Maximalt antal chattklienter uppnått.\n"
+
+#: src/dht/gnunet_dht_profiler.c:1417
+#, fuzzy
+msgid "number of peers to start"
+msgstr "antal iterationer"
+
+#: src/dht/gnunet_dht_profiler.c:1420
+msgid ""
+"maximum number of times we try to search for successor circle formation (0 "
+"for R5N)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:864
+#: src/testbed/gnunet-testbed-profiler.c:306
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1426
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1429
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1432
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1435
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1438
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1456
+#, fuzzy
+msgid "Measure quality and performance of the DHT service."
+msgstr "Kan inte tillgå tjänsten"
+
 #: src/dht/gnunet-dht-put.c:118
 #, fuzzy
 msgid "PUT request sent with key"
@@ -2060,114 +2126,114 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:176
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:193
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-xdht_clients.c:838
+#: src/dht/gnunet-service-xdht_clients.c:844
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# byte mottogs via TCP"
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:925
+#: src/dht/gnunet-service-xdht_clients.c:928
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-xdht_clients.c:1010
+#: src/dht/gnunet-service-xdht_clients.c:993
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-xdht_clients.c:1211
+#: src/dht/gnunet-service-xdht_clients.c:1195
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:1040
-#: src/dht/gnunet-service-xdht_clients.c:498
+#: src/dht/gnunet-service-xdht_clients.c:503
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1053
-#: src/dht/gnunet-service-xdht_clients.c:511
+#: src/dht/gnunet-service-xdht_clients.c:517
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1090
-#: src/dht/gnunet-service-xdht_clients.c:548
+#: src/dht/gnunet-service-xdht_clients.c:554
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1113
-#: src/dht/gnunet-service-xdht_clients.c:571
+#: src/dht/gnunet-service-xdht_clients.c:577
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:1167
 #: src/dht/gnunet-service-dht_clients.c:1210
-#: src/dht/gnunet-service-xdht_clients.c:625
-#: src/dht/gnunet-service-xdht_clients.c:668
+#: src/dht/gnunet-service-xdht_clients.c:631
+#: src/dht/gnunet-service-xdht_clients.c:674
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1177
-#: src/dht/gnunet-service-xdht_clients.c:635
+#: src/dht/gnunet-service-xdht_clients.c:641
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "Kunde inte skicka meddelande till gnunetd\n"
 
 #: src/dht/gnunet-service-dht_datacache.c:68
-#: src/dht/gnunet-service-xdht_datacache.c:69
+#: src/dht/gnunet-service-xdht_datacache.c:71
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# byte mottagna av typen %d"
 
 #: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-xdht_datacache.c:79
+#: src/dht/gnunet-service-xdht_datacache.c:82
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:213
+#: src/dht/gnunet-service-xdht_datacache.c:221
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:244
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:240
+#: src/dht/gnunet-service-xdht_datacache.c:250
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:246
+#: src/dht/gnunet-service-xdht_datacache.c:256
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:258
+#: src/dht/gnunet-service-xdht_datacache.c:268
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:261
+#: src/dht/gnunet-service-xdht_datacache.c:271
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:234
-#: src/dht/gnunet-service-xdht_datacache.c:298
+#: src/dht/gnunet-service-xdht_datacache.c:309
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# byte mottogs via TCP"
@@ -2188,18 +2254,18 @@
 msgstr "# PING-meddelanden skapade"
 
 #: src/dht/gnunet-service-dht_neighbours.c:764
+#: src/dht/gnunet-service-xdht_neighbours.c:6055
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:745
+#: src/dht/gnunet-service-xdht_neighbours.c:1012
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:786
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
@@ -2231,15 +2297,15 @@
 #: src/dht/gnunet-service-dht_neighbours.c:1328
 #: src/dht/gnunet-service-dht_neighbours.c:1452
 #: src/dht/gnunet-service-dht_neighbours.c:1557
-#: src/dht/gnunet-service-xdht_neighbours.c:843
-#: src/dht/gnunet-service-xdht_neighbours.c:910
-#: src/dht/gnunet-service-xdht_neighbours.c:980
-#: src/dht/gnunet-service-xdht_neighbours.c:1040
-#: src/dht/gnunet-service-xdht_neighbours.c:1098
-#: src/dht/gnunet-service-xdht_neighbours.c:1157
-#: src/dht/gnunet-service-xdht_neighbours.c:1218
-#: src/dht/gnunet-service-xdht_neighbours.c:1280
-#: src/dht/gnunet-service-xdht_neighbours.c:1341
+#: src/dht/gnunet-service-xdht_neighbours.c:1121
+#: src/dht/gnunet-service-xdht_neighbours.c:1190
+#: src/dht/gnunet-service-xdht_neighbours.c:1240
+#: src/dht/gnunet-service-xdht_neighbours.c:1304
+#: src/dht/gnunet-service-xdht_neighbours.c:1371
+#: src/dht/gnunet-service-xdht_neighbours.c:1433
+#: src/dht/gnunet-service-xdht_neighbours.c:1495
+#: src/dht/gnunet-service-xdht_neighbours.c:1557
+#: src/dht/gnunet-service-xdht_neighbours.c:1617
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
@@ -2345,6 +2411,110 @@
 msgid "# DHT requests combined"
 msgstr "# byte mottogs via TCP"
 
+#: src/dht/gnunet-service-xdht_neighbours.c:1824
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail_length = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1829
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail[%d]=%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1849
+#, c-format
+msgid ""
+"\n"
+"SUPU************  FRIEND_PEERMAP of %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1859
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1880
+#, c-format
+msgid ""
+"\n"
+"SUPU************  FINGER_TABLE of %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1889
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail_id[%d]=%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1902
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail[%d] = %s "
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:3551
+msgid "# FINGERS_COUNT"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:3692
+#: src/dht/gnunet-service-xdht_neighbours.c:3930
+#: src/dht/gnunet-service-xdht_neighbours.c:4083
+#: src/dht/gnunet-service-xdht_neighbours.c:4233
+#: src/dht/gnunet-service-xdht_neighbours.c:4414
+#: src/dht/gnunet-service-xdht_neighbours.c:4929
+#: src/dht/gnunet-service-xdht_neighbours.c:5323
+#: src/dht/gnunet-service-xdht_neighbours.c:5416
+#: src/dht/gnunet-service-xdht_neighbours.c:5505
+#: src/dht/gnunet-service-xdht_neighbours.c:5609
+#: src/dht/gnunet-service-xdht_neighbours.c:5753
+#: src/dht/gnunet-service-xdht_neighbours.c:5842
+#, fuzzy
+msgid "# Bytes received from other peers"
+msgstr "# byte mottagna av typen %d"
+
+#: src/dht/gnunet-service-xdht_routing.c:256
+#, c-format
+msgid ""
+"\n"
+"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:264
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->trail_id = %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:267
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->next_hop = %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:270
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->prev_hop = %s"
+msgstr ""
+
 #: src/dht/plugin_block_dht.c:138
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
@@ -2359,12 +2529,12 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:257
+#: src/dns/dnsparser.c:254
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/dns/dnsparser.c:856
+#: src/dns/dnsparser.c:818
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -2394,15 +2564,15 @@
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:355
+#: src/dns/gnunet-dns-monitor.c:352
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:358
+#: src/dns/gnunet-dns-monitor.c:355
 msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:369
+#: src/dns/gnunet-dns-monitor.c:366
 msgid "Monitor DNS queries."
 msgstr ""
 
@@ -2833,6 +3003,7 @@
 msgstr ""
 
 #: src/fragmentation/defragmentation.c:456
+#: src/transport/plugin_transport_wlan.c:1474
 #, fuzzy
 msgid "# fragments received"
 msgstr "# byte mottogs via TCP"
@@ -2882,71 +3053,71 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/fs_api.c:465
+#: src/fs/fs_api.c:474
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:474
+#: src/fs/fs_api.c:485
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:480
+#: src/fs/fs_api.c:493
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1066
+#: src/fs/fs_api.c:1101
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:1571
+#: src/fs/fs_api.c:1621
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1585
+#: src/fs/fs_api.c:1635
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2242
+#: src/fs/fs_api.c:2293
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2252
+#: src/fs/fs_api.c:2303
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2619
+#: src/fs/fs_api.c:2431 src/fs/fs_api.c:2679
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2395
+#: src/fs/fs_api.c:2449
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2409 src/fs/fs_api.c:2428 src/fs/fs_api.c:2911
+#: src/fs/fs_api.c:2464 src/fs/fs_api.c:2483 src/fs/fs_api.c:2975
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2610
+#: src/fs/fs_api.c:2669
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2855
+#: src/fs/fs_api.c:2918
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2949
+#: src/fs/fs_api.c:3013
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3059,68 +3230,68 @@
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
+#: src/fs/fs_publish.c:126 src/fs/fs_publish.c:431
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:667 src/fs/fs_publish.c:684 src/fs/fs_publish.c:723
-#: src/fs/fs_publish.c:744 src/fs/fs_publish.c:768 src/fs/fs_publish.c:914
+#: src/fs/fs_publish.c:683 src/fs/fs_publish.c:700 src/fs/fs_publish.c:739
+#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:934
 #, 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:669
+#: src/fs/fs_publish.c:685
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:681
+#: src/fs/fs_publish.c:697
 #, fuzzy
 msgid "unknown error"
 msgstr "Okänt fel"
 
-#: src/fs/fs_publish.c:725
+#: src/fs/fs_publish.c:741
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:745
+#: src/fs/fs_publish.c:761
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:770
+#: src/fs/fs_publish.c:786
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:793
+#: src/fs/fs_publish.c:809
 #, 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:862
+#: src/fs/fs_publish.c:878
 #, 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:868
+#: src/fs/fs_publish.c:884
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:915
+#: src/fs/fs_publish.c:936
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1151
+#: src/fs/fs_publish.c:1172
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1243
+#: src/fs/fs_publish.c:1263
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3130,17 +3301,17 @@
 msgid "Could not connect to datastore."
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish_ublock.c:219
+#: src/fs/fs_publish_ublock.c:243
 #, fuzzy
 msgid "Internal error."
 msgstr "Okänt fel.\n"
 
-#: src/fs/fs_search.c:751 src/fs/fs_search.c:817
+#: src/fs/fs_search.c:778 src/fs/fs_search.c:848
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/fs_search.c:876
+#: src/fs/fs_search.c:907
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3222,81 +3393,81 @@
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:379
+#: src/fs/fs_uri.c:378
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:423
+#: src/fs/fs_uri.c:422
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:438
+#: src/fs/fs_uri.c:437
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:517
+#: src/fs/fs_uri.c:516
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:532
+#: src/fs/fs_uri.c:531
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:542
+#: src/fs/fs_uri.c:541
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:550
+#: src/fs/fs_uri.c:549
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:558
+#: src/fs/fs_uri.c:557
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:563
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:570
+#: src/fs/fs_uri.c:569
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:579
+#: src/fs/fs_uri.c:578
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:584
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:591
+#: src/fs/fs_uri.c:590
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:603
+#: src/fs/fs_uri.c:602
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:642
+#: src/fs/fs_uri.c:641
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:866
+#: src/fs/fs_uri.c:865
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/fs/fs_uri.c:872
+#: src/fs/fs_uri.c:871
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/fs/fs_uri.c:1057 src/fs/fs_uri.c:1084
+#: src/fs/fs_uri.c:1056 src/fs/fs_uri.c:1083
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1090
+#: src/fs/fs_uri.c:1089
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3334,23 +3505,23 @@
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:824
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:886
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:828
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:890
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:831
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:893
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:917
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:924
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -3424,7 +3595,7 @@
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Uppladdning vägrades!"
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:304
 #: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
@@ -3435,7 +3606,7 @@
 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:240 src/fs/gnunet-publish.c:665
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:712
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
@@ -3448,7 +3619,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:856
 #: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -3513,178 +3684,183 @@
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
+#: src/fs/gnunet-publish.c:238 src/fs/gnunet-publish.c:250
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:250
+#: src/fs/gnunet-publish.c:257
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-publish.c:260
+#: src/fs/gnunet-publish.c:268
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:273
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:283
+#: src/fs/gnunet-publish.c:281
+#, fuzzy, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr "Jag är ändpunkt \"%s\".\n"
+
+#: src/fs/gnunet-publish.c:301
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "\"%s\" uppstart klar.\n"
 
-#: src/fs/gnunet-publish.c:401
+#: src/fs/gnunet-publish.c:427
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:403
+#: src/fs/gnunet-publish.c:429
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/fs/gnunet-publish.c:542
+#: src/fs/gnunet-publish.c:572
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:597
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:598
+#: src/fs/gnunet-publish.c:631
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:600
+#: src/fs/gnunet-publish.c:635
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:641
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:610
+#: src/fs/gnunet-publish.c:648
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "Nedstängning klar.\n"
 
-#: src/fs/gnunet-publish.c:614
+#: src/fs/gnunet-publish.c:653
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-publish.c:660
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:625
+#: src/fs/gnunet-publish.c:669
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/gnunet-publish.c:656
+#: src/fs/gnunet-publish.c:701
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
 
-#: src/fs/gnunet-publish.c:682
+#: src/fs/gnunet-publish.c:733
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-publish.c:695
+#: src/fs/gnunet-publish.c:747
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:803
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:754
+#: src/fs/gnunet-publish.c:810
 #, 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:760
+#: src/fs/gnunet-publish.c:816
 #, 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:768 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:824 src/vpn/gnunet-vpn.c:209
 #, 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:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1387 src/transport/gnunet-transport.c:1417
-#: src/transport/gnunet-transport.c:1447
+#: src/fs/gnunet-publish.c:835 src/fs/gnunet-publish.c:843
+#: src/transport/gnunet-transport.c:1893 src/transport/gnunet-transport.c:1923
+#: src/transport/gnunet-transport.c:1953
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:835
+#: src/fs/gnunet-publish.c:897
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:839
+#: src/fs/gnunet-publish.c:901
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:843
+#: src/fs/gnunet-publish.c:905
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:846
+#: src/fs/gnunet-publish.c:908
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:851
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:859
+#: src/fs/gnunet-publish.c:921
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:865
+#: src/fs/gnunet-publish.c:927
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:869
+#: src/fs/gnunet-publish.c:931
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:873
+#: src/fs/gnunet-publish.c:935
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:889
+#: src/fs/gnunet-publish.c:951
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3728,23 +3904,25 @@
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:545
+#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:540
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:645 src/hostlist/gnunet-daemon-hostlist.c:303
-#: src/topology/gnunet-daemon-topology.c:1260
-#: src/topology/gnunet-daemon-topology.c:1267
+#: src/fs/gnunet-service-fs.c:650 src/hostlist/gnunet-daemon-hostlist.c:303
+#: src/sensordashboard/gnunet-service-sensordashboard.c:854
+#: src/sensordashboard/gnunet-service-sensordashboard.c:862
+#: src/topology/gnunet-daemon-topology.c:1287
+#: src/topology/gnunet-daemon-topology.c:1294
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:484
+#: src/fs/gnunet-service-fs_cadet_client.c:494
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:498
+#: src/fs/gnunet-service-fs_cadet_client.c:508
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# byte mottagna av typen %d"
@@ -3754,110 +3932,110 @@
 msgid "# Blocks transferred via cadet"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:352
+#: src/fs/gnunet-service-fs_cadet_server.c:361
 #, fuzzy
-msgid "# queries received via cadet not answered"
+msgid "# queries received via CADET not answered"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:432
+#: src/fs/gnunet-service-fs_cadet_server.c:441
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:476
+#: src/fs/gnunet-service-fs_cadet_server.c:485
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "Nätverksanslutning"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:482
-#: src/fs/gnunet-service-fs_cadet_server.c:522
+#: src/fs/gnunet-service-fs_cadet_server.c:491
+#: src/fs/gnunet-service-fs_cadet_server.c:531
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "Nätverksanslutning"
 
-#: src/fs/gnunet-service-fs_cp.c:682
+#: src/fs/gnunet-service-fs_cp.c:698
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:686
+#: src/fs/gnunet-service-fs_cp.c:702
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:721
+#: src/fs/gnunet-service-fs_cp.c:737
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:727
+#: src/fs/gnunet-service-fs_cp.c:743
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301
+#: src/fs/gnunet-service-fs_cp.c:768 src/fs/gnunet-service-fs_cp.c:1317
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:845
+#: src/fs/gnunet-service-fs_cp.c:861
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:898
+#: src/fs/gnunet-service-fs_cp.c:914
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:906
+#: src/fs/gnunet-service-fs_cp.c:922
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:920
+#: src/fs/gnunet-service-fs_cp.c:936
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:958
+#: src/fs/gnunet-service-fs_cp.c:974
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1026
+#: src/fs/gnunet-service-fs_cp.c:1042
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1051
+#: src/fs/gnunet-service-fs_cp.c:1067
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1061
+#: src/fs/gnunet-service-fs_cp.c:1077
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1139
+#: src/fs/gnunet-service-fs_cp.c:1155
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1173
+#: src/fs/gnunet-service-fs_cp.c:1189
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1195
+#: src/fs/gnunet-service-fs_cp.c:1211
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1246
+#: src/fs/gnunet-service-fs_cp.c:1262
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1270
+#: src/fs/gnunet-service-fs_cp.c:1286
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1299
+#: src/fs/gnunet-service-fs_cp.c:1315
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1670
+#: src/fs/gnunet-service-fs_cp.c:1691
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -3909,22 +4087,22 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:370
 #, fuzzy
 msgid "# client searches active"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_lc.c:256
+#: src/fs/gnunet-service-fs_lc.c:258
 #, fuzzy
 msgid "# replies received for local clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:327
+#: src/fs/gnunet-service-fs_lc.c:329
 #, fuzzy
 msgid "# client searches received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_lc.c:362
+#: src/fs/gnunet-service-fs_lc.c:364
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -4054,7 +4232,7 @@
 msgstr ""
 
 #: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
-#: src/fs/gnunet-service-fs_pr.c:1590
+#: src/fs/gnunet-service-fs_pr.c:1612
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
@@ -4066,11 +4244,11 @@
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1566
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1651
+#: src/fs/gnunet-service-fs_pr.c:1673
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -4120,7 +4298,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:695
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:696
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
@@ -4201,62 +4379,67 @@
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:227
+#: src/gns/gnunet-gns.c:215
 #, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+#, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:308
+#: src/gns/gnunet-gns.c:314
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:347 src/gns/gnunet-gns-helper-service-w32.c:798
+#: src/gns/gnunet-gns.c:353 src/gns/gnunet-gns-helper-service-w32.c:798
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:386 src/gns/gnunet-gns-helper-service-w32.c:828
+#: src/gns/gnunet-gns.c:392 src/gns/gnunet-gns-helper-service-w32.c:828
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:399
+#: src/gns/gnunet-gns.c:405
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:449
+#: src/gns/gnunet-gns.c:455
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:452
+#: src/gns/gnunet-gns.c:458
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:455
+#: src/gns/gnunet-gns.c:461
 #, fuzzy
 msgid "Specify timeout for the lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:458
+#: src/gns/gnunet-gns.c:464
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:461
+#: src/gns/gnunet-gns.c:467
 #, fuzzy
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:464
+#: src/gns/gnunet-gns.c:470
 #, fuzzy
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:478
+#: src/gns/gnunet-gns.c:484
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Spåra GNUnets nätverkstopologi."
@@ -4287,8 +4470,8 @@
 #: src/hostlist/gnunet-daemon-hostlist_client.c:931
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1026
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/transport/plugin_transport_http_client.c:1095
-#: src/transport/plugin_transport_http_client.c:1110
+#: src/transport/plugin_transport_http_client.c:595
+#: src/transport/plugin_transport_http_client.c:613
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -4358,67 +4541,67 @@
 msgid "Failed to pass client to MHD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2504
+#: src/gns/gnunet-gns-proxy.c:2518
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2533
+#: src/gns/gnunet-gns-proxy.c:2547
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
+#: src/gns/gnunet-gns-proxy.c:2565 src/gns/gnunet-gns-proxy.c:2594
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2631
+#: src/gns/gnunet-gns-proxy.c:2645
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2970
+#: src/gns/gnunet-gns-proxy.c:2984
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3010
+#: src/gns/gnunet-gns-proxy.c:3024
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3072
+#: src/gns/gnunet-gns-proxy.c:3086
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-proxy.c:3113
+#: src/gns/gnunet-gns-proxy.c:3127
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3116
+#: src/gns/gnunet-gns-proxy.c:3130
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3135
+#: src/gns/gnunet-gns-proxy.c:3149
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:862
+#: src/gns/gnunet-service-gns.c:864
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:870
+#: src/gns/gnunet-service-gns.c:872
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:903
+#: src/gns/gnunet-service-gns.c:905
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:919
+#: src/gns/gnunet-service-gns.c:921
 #, fuzzy
 msgid "valid public key required"
 msgstr "Ogiltigt argument: \"%s\"\n"
@@ -4432,190 +4615,216 @@
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:832
+#: src/gns/gnunet-service-gns_resolver.c:650
+#, c-format
+msgid "Protocol `%s' unknown, skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:661
+#, c-format
+msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:854
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:974
+#: src/gns/gnunet-service-gns_resolver.c:996
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1333
+#: src/gns/gnunet-service-gns_resolver.c:1356
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1831
+#: src/gns/gnunet-service-gns_resolver.c:1886
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1855
+#: src/gns/gnunet-service-gns_resolver.c:1910
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2137
+#: src/gns/gnunet-service-gns_resolver.c:2192
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2286
+#: src/gns/gnunet-service-gns_resolver.c:2341
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:151
+#: src/gns/plugin_gnsrecord_gns.c:172
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:180
+#: src/gns/plugin_gnsrecord_gns.c:201
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:222
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:217
+#: src/gns/plugin_gnsrecord_gns.c:245
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:293
+#: src/gns/plugin_gnsrecord_gns.c:280
 #, fuzzy, c-format
+msgid "Unable to parse BOX record string `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:291
+#, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:314
+#: src/gnsrecord/plugin_gnsrecord_dns.c:312
 #, fuzzy, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:336
+#: src/gnsrecord/plugin_gnsrecord_dns.c:334
 #, fuzzy, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:420
+#: src/gnsrecord/plugin_gnsrecord_dns.c:418
 #, fuzzy, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:452
+#: src/gnsrecord/plugin_gnsrecord_dns.c:455
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:471
+#: src/gnsrecord/plugin_gnsrecord_dns.c:474
 #, fuzzy, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:494
+#: src/gnsrecord/plugin_gnsrecord_dns.c:497
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:514
+#: src/gnsrecord/plugin_gnsrecord_dns.c:520
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:529
+#: src/gnsrecord/plugin_gnsrecord_dns.c:535
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:549
+#: src/gnsrecord/plugin_gnsrecord_dns.c:562
 #, fuzzy, c-format
+msgid "Unable to parse SRV record `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:578
+#, fuzzy, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:595
+#, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:567
+#: src/gnsrecord/plugin_gnsrecord_dns.c:619
+#: src/gnsrecord/plugin_gnsrecord_dns.c:635
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hello/gnunet-hello.c:123
+#: src/hello/gnunet-hello.c:126
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:129
+#: src/hello/gnunet-hello.c:132
 #, fuzzy, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/hello/gnunet-hello.c:137
+#: src/hello/gnunet-hello.c:140
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:144
+#: src/hello/gnunet-hello.c:147
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183
+#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:196
 #, fuzzy, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/hello/gnunet-hello.c:170
+#: src/hello/gnunet-hello.c:173
 #, fuzzy, c-format
 msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/hello/gnunet-hello.c:195
+#: src/hello/gnunet-hello.c:208
 #, fuzzy, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/hello/gnunet-hello.c:203
+#: src/hello/gnunet-hello.c:216
 #, c-format
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:957
+#: src/hello/hello.c:955
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:966
+#: src/hello/hello.c:964
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:976
+#: src/hello/hello.c:974
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hello/hello.c:986
+#: src/hello/hello.c:984
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hello/hello.c:1004
+#: src/hello/hello.c:1002
 #, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:1012
+#: src/hello/hello.c:1010
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1031
+#: src/hello/hello.c:1025
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/hello/hello.c:1104
+#: src/hello/hello.c:1098
 #, c-format
 msgid "HELLO URI contained %u addresses, added %u addresses\n"
 msgstr ""
@@ -4781,7 +4990,7 @@
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1581
-#: src/transport/plugin_transport_http_client.c:1866
+#: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
@@ -4805,103 +5014,113 @@
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:143
+#: src/hostlist/gnunet-daemon-hostlist_server.c:165
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# byte krypterade"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:168
+#: src/hostlist/gnunet-daemon-hostlist_server.c:190
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:203
-#: src/hostlist/gnunet-daemon-hostlist_server.c:534
-#: src/peerinfo-tool/gnunet-peerinfo.c:361
-#: src/peerinfo-tool/gnunet-peerinfo.c:430
-#: src/peerinfo-tool/gnunet-peerinfo.c:501
-#: src/topology/gnunet-daemon-topology.c:925
+#: src/hostlist/gnunet-daemon-hostlist_server.c:225
+#: src/hostlist/gnunet-daemon-hostlist_server.c:535
+#: src/peerinfo-tool/gnunet-peerinfo.c:367
+#: src/peerinfo-tool/gnunet-peerinfo.c:452
+#: src/peerinfo-tool/gnunet-peerinfo.c:535
+#: src/topology/gnunet-daemon-topology.c:952
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:227
+#: src/hostlist/gnunet-daemon-hostlist_server.c:249
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:243
+#: src/hostlist/gnunet-daemon-hostlist_server.c:265
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:363
+#: src/hostlist/gnunet-daemon-hostlist_server.c:365
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:366
+#: src/hostlist/gnunet-daemon-hostlist_server.c:368
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:380
+#: src/hostlist/gnunet-daemon-hostlist_server.c:382
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:384
+#: src/hostlist/gnunet-daemon-hostlist_server.c:386
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:391
+#: src/hostlist/gnunet-daemon-hostlist_server.c:393
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:394
+#: src/hostlist/gnunet-daemon-hostlist_server.c:396
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:399
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:403
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:448
+#: src/hostlist/gnunet-daemon-hostlist_server.c:449
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:496
+#: src/hostlist/gnunet-daemon-hostlist_server.c:497
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:683
-#: src/peerinfo-tool/gnunet-peerinfo.c:650
-#: src/transport/gnunet-service-transport.c:1136
+#: src/hostlist/gnunet-daemon-hostlist_server.c:684
+#: src/peerinfo-tool/gnunet-peerinfo.c:696
+#: src/transport/gnunet-service-transport.c:1127
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:707
+#: src/hostlist/gnunet-daemon-hostlist_server.c:708
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:722
+#: src/hostlist/gnunet-daemon-hostlist_server.c:723
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:760
+#: src/hostlist/gnunet-daemon-hostlist_server.c:736
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:749
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:770
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:780
+#: src/hostlist/gnunet-daemon-hostlist_server.c:790
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:820
+#: src/hostlist/gnunet-daemon-hostlist_server.c:830
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -5008,7 +5227,7 @@
 msgid "No records found for `%s'"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:402
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -5018,7 +5237,7 @@
 msgid "You must specify which zone should be accessed\n"
 msgstr "anger vilken TRANSPORT som ska testas"
 
-#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:783
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:844
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
@@ -5028,7 +5247,7 @@
 msgid "You must specify a name\n"
 msgstr "Du måste ange en mottagare!\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1020
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1084
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -5037,7 +5256,7 @@
 msgid "spezifies the public key of the zone to look in"
 msgstr "ange prioritet för innehållet"
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1055
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1116
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
@@ -5052,231 +5271,239 @@
 msgid "Failed to create indices\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/namestore/gnunet-namestore.c:308
+#: src/namestore/gnunet-namestore.c:303
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:337
+#: src/namestore/gnunet-namestore.c:332
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:344
+#: src/namestore/gnunet-namestore.c:339
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:567
+#: src/namestore/gnunet-namestore.c:477 src/namestore/gnunet-namestore.c:485
+#: src/namestore/gnunet-namestore.c:493
 #, c-format
+msgid "A %s record exists already under `%s', no other records can be added.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:507 src/namestore/gnunet-namestore.c:519
+#: src/namestore/gnunet-namestore.c:531
+#, c-format
+msgid "Records already exist under `%s', cannot add `%s' record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:628
+#, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:606
+#: src/namestore/gnunet-namestore.c:667
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:647
+#: src/namestore/gnunet-namestore.c:708
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:658
-#: src/namestore/gnunet-namestore-fcfsd.c:970
+#: src/namestore/gnunet-namestore.c:719
+#: src/namestore/gnunet-namestore-fcfsd.c:984
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:666 src/namestore/gnunet-namestore.c:675
-#: src/namestore/gnunet-namestore.c:692 src/namestore/gnunet-namestore.c:714
-#: src/namestore/gnunet-namestore.c:754
+#: src/namestore/gnunet-namestore.c:727 src/namestore/gnunet-namestore.c:736
+#: src/namestore/gnunet-namestore.c:753 src/namestore/gnunet-namestore.c:775
+#: src/namestore/gnunet-namestore.c:815
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore.c:667 src/namestore/gnunet-namestore.c:676
-#: src/namestore/gnunet-namestore.c:693 src/namestore/gnunet-namestore.c:715
+#: src/namestore/gnunet-namestore.c:728 src/namestore/gnunet-namestore.c:737
+#: src/namestore/gnunet-namestore.c:754 src/namestore/gnunet-namestore.c:776
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:684
+#: src/namestore/gnunet-namestore.c:745
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore.c:704
+#: src/namestore/gnunet-namestore.c:765
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
 
-#: src/namestore/gnunet-namestore.c:740
+#: src/namestore/gnunet-namestore.c:801
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:755
+#: src/namestore/gnunet-namestore.c:816
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:803
-#: src/peerinfo-tool/gnunet-peerinfo.c:734
+#: src/namestore/gnunet-namestore.c:868
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:838
+#: src/namestore/gnunet-namestore.c:903
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:878
+#: src/namestore/gnunet-namestore.c:943
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:905
+#: src/namestore/gnunet-namestore.c:970
 #, fuzzy, c-format
 msgid "No default ego configured in identity service\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
 
-#: src/namestore/gnunet-namestore.c:941
+#: src/namestore/gnunet-namestore.c:1006
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/namestore/gnunet-namestore.c:953
+#: src/namestore/gnunet-namestore.c:1018
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1002
+#: src/namestore/gnunet-namestore.c:1066
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1005
+#: src/namestore/gnunet-namestore.c:1069
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1008
+#: src/namestore/gnunet-namestore.c:1072
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1011
+#: src/namestore/gnunet-namestore.c:1075
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1014
+#: src/namestore/gnunet-namestore.c:1078
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1017
+#: src/namestore/gnunet-namestore.c:1081
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1023
+#: src/namestore/gnunet-namestore.c:1087
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1026
+#: src/namestore/gnunet-namestore.c:1090
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1029
+#: src/namestore/gnunet-namestore.c:1093
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1032
+#: src/namestore/gnunet-namestore.c:1096
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1035
+#: src/namestore/gnunet-namestore.c:1099
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1038
-msgid "create record that is pending approval (and thus for now inactive)"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1041
+#: src/namestore/gnunet-namestore.c:1102
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1044
+#: src/namestore/gnunet-namestore.c:1105
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:464
+#: src/namestore/gnunet-namestore-fcfsd.c:478
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:491
+#: src/namestore/gnunet-namestore-fcfsd.c:505
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:525
+#: src/namestore/gnunet-namestore-fcfsd.c:539
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:534
+#: src/namestore/gnunet-namestore-fcfsd.c:548
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:596
+#: src/namestore/gnunet-namestore-fcfsd.c:610
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:652
+#: src/namestore/gnunet-namestore-fcfsd.c:666
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:668
+#: src/namestore/gnunet-namestore-fcfsd.c:682
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:704
+#: src/namestore/gnunet-namestore-fcfsd.c:718
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:712
+#: src/namestore/gnunet-namestore-fcfsd.c:726
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:910
+#: src/namestore/gnunet-namestore-fcfsd.c:924
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:936
+#: src/namestore/gnunet-namestore-fcfsd.c:950
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:978
+#: src/namestore/gnunet-namestore-fcfsd.c:992
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1011
+#: src/namestore/gnunet-namestore-fcfsd.c:1025
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
@@ -5298,66 +5525,58 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:175
-msgid "NAT traversal with ICMP Server timed out.\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:207
+#: src/nat/nat_auto.c:179
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:208
+#: src/nat/nat_auto.c:180
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:229
+#: src/nat/nat_auto.c:201
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/nat/nat_auto.c:284
+#: src/nat/nat_auto.c:249
 #, fuzzy, c-format
 msgid "Detected external IP `%s'\n"
 msgstr "Mottog ogiltig RPC \"%s\".\n"
 
-#: src/nat/nat_auto.c:362
+#: src/nat/nat_auto.c:327
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:378
+#: src/nat/nat_auto.c:343
 #, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:441
+#: src/nat/nat_auto.c:406
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:442
+#: src/nat/nat_auto.c:407
 #, fuzzy
 msgid "upnpc not found\n"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/nat/nat_auto.c:472
+#: src/nat/nat_auto.c:437
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:480
+#: src/nat/nat_auto.c:445 src/nat/nat_auto.c:490
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:488
+#: src/nat/nat_auto.c:453 src/nat/nat_auto.c:498
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:527
-msgid "gnunet-helper-nat-client found, enabling it\n"
+#: src/nat/nat_auto.c:483
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:528
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
-msgstr ""
-
 #: src/nat/nat.c:867
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
@@ -5403,6 +5622,88 @@
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
+#: src/nat/nat.c:1575
+msgid "Operation Successful"
+msgstr ""
+
+#: src/nat/nat.c:1577
+msgid "Internal Failure (IPC, ...)"
+msgstr ""
+
+#: src/nat/nat.c:1579
+msgid "Failure in network subsystem, check permissions."
+msgstr ""
+
+#: src/nat/nat.c:1581
+msgid "Encountered timeout while performing operation"
+msgstr ""
+
+#: src/nat/nat.c:1583
+msgid "detected that we are offline"
+msgstr ""
+
+#: src/nat/nat.c:1585
+#, fuzzy
+msgid "`upnpc` command not found"
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/nat/nat.c:1587
+#, fuzzy
+msgid "Failed to run `upnpc` command"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/nat/nat.c:1589
+#, fuzzy
+msgid "`upnpc' command took too long, process killed"
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/nat/nat.c:1591
+msgid "`upnpc' command failed to establish port mapping"
+msgstr ""
+
+#: src/nat/nat.c:1593
+#, fuzzy
+msgid "`external-ip' command not found"
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/nat/nat.c:1595
+#, fuzzy
+msgid "Failed to run `external-ip` command"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/nat/nat.c:1597
+msgid "`external-ip' command output invalid"
+msgstr ""
+
+#: src/nat/nat.c:1599
+msgid "no valid address was returned by `external-ip'"
+msgstr ""
+
+#: src/nat/nat.c:1601
+#, fuzzy
+msgid "Could not determine interface with internal/local network address"
+msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
+
+#: src/nat/nat.c:1603
+msgid "No functioning gnunet-helper-nat-server installation found"
+msgstr ""
+
+#: src/nat/nat.c:1605
+msgid "NAT test could not be initialized"
+msgstr ""
+
+#: src/nat/nat.c:1607
+msgid "NAT test timeout reached"
+msgstr ""
+
+#: src/nat/nat.c:1609
+msgid "could not register NAT"
+msgstr ""
+
+#: src/nat/nat.c:1611
+msgid "No working gnunet-helper-nat-client installation found"
+msgstr ""
+
 #: src/nat/nat_mini.c:203
 msgid "`external-ip' command not found\n"
 msgstr ""
@@ -5411,17 +5712,17 @@
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:351
+#: src/nat/nat_test.c:360
 #, fuzzy
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/nat/nat_test.c:423
+#: src/nat/nat_test.c:462
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_test.c:453
+#: src/nat/nat_test.c:497
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Misslyckades att starta samling.\n"
@@ -5449,10 +5750,6 @@
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:864 src/testbed/gnunet-testbed-profiler.c:306
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
 #: src/nse/gnunet-nse-profiler.c:867
 msgid "name of the file for writing the main results"
 msgstr ""
@@ -5471,7 +5768,7 @@
 msgstr "Kan inte tillgå tjänsten"
 
 #: src/nse/gnunet-service-nse.c:1517
-#: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248
+#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:248
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5491,62 +5788,62 @@
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:466
+#: src/peerinfo/gnunet-service-peerinfo.c:468
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:503
+#: src/peerinfo/gnunet-service-peerinfo.c:506
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:653
+#: src/peerinfo/gnunet-service-peerinfo.c:662
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:658
+#: src/peerinfo/gnunet-service-peerinfo.c:668
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:994
+#: src/peerinfo/gnunet-service-peerinfo.c:1037
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1287
+#: src/peerinfo/gnunet-service-peerinfo.c:1358
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1298
+#: src/peerinfo/gnunet-service-peerinfo.c:1371
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:236
+#: src/peerinfo/peerinfo_api.c:237
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:356 src/sensor/sensor_api.c:519
+#: src/peerinfo/peerinfo_api.c:363
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/peerinfo/peerinfo_api.c:506
+#: src/peerinfo/peerinfo_api.c:519
 #, 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:547 src/peerinfo/peerinfo_api.c:566
-#: src/peerinfo/peerinfo_api.c:581 src/peerinfo/peerinfo_api.c:592
-#: src/peerinfo/peerinfo_api.c:603
+#: src/peerinfo/peerinfo_api.c:563 src/peerinfo/peerinfo_api.c:586
+#: src/peerinfo/peerinfo_api.c:603 src/peerinfo/peerinfo_api.c:616
+#: src/peerinfo/peerinfo_api.c:631
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
 
-#: src/peerinfo/peerinfo_api.c:678
+#: src/peerinfo/peerinfo_api.c:720
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -5556,146 +5853,206 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:233
+#: src/peerinfo-tool/gnunet-peerinfo.c:230
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:240
+#: src/peerinfo-tool/gnunet-peerinfo.c:237
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:282
+#: src/peerinfo-tool/gnunet-peerinfo.c:286
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:439
+#: src/peerinfo-tool/gnunet-peerinfo.c:462
 #, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:447
+#: src/peerinfo-tool/gnunet-peerinfo.c:471
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:456
+#: src/peerinfo-tool/gnunet-peerinfo.c:483
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:469
+#: src/peerinfo-tool/gnunet-peerinfo.c:502
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:533
+#: src/peerinfo-tool/gnunet-peerinfo.c:570
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:644
+#: src/peerinfo-tool/gnunet-peerinfo.c:687
 #, fuzzy, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:665 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:718 src/util/gnunet-scrypt.c:224
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:756
+#: src/peerinfo-tool/gnunet-peerinfo.c:816
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:800
+#: src/peerinfo-tool/gnunet-peerinfo.c:865
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:803
+#: src/peerinfo-tool/gnunet-peerinfo.c:868
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:806
+#: src/peerinfo-tool/gnunet-peerinfo.c:871
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:809
+#: src/peerinfo-tool/gnunet-peerinfo.c:874
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:812
+#: src/peerinfo-tool/gnunet-peerinfo.c:877
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:815
+#: src/peerinfo-tool/gnunet-peerinfo.c:880
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:818
+#: src/peerinfo-tool/gnunet-peerinfo.c:883
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:821
+#: src/peerinfo-tool/gnunet-peerinfo.c:886
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:832
+#: src/peerinfo-tool/gnunet-peerinfo.c:900
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:128
+#: src/transport/gnunet-service-transport_plugins.c:127
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:133
+#: src/transport/gnunet-service-transport_plugins.c:132
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Testar transport(er) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:165
+#: src/transport/gnunet-service-transport_plugins.c:164
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/peerstore/gnunet-peerstore.c:97
+#: src/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:486
+#: src/peerstore/gnunet-service-peerstore.c:343
 #, fuzzy
+msgid "Malformed iterate request.\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/peerstore/gnunet-service-peerstore.c:350
+msgid "Sub system not supplied in client iterate request.\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:399
+#, fuzzy
+msgid "Malformed store request from client\n"
+msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
+
+#: src/peerstore/gnunet-service-peerstore.c:407
+msgid "Full key not supplied in client store request\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:427
+#, fuzzy
+msgid "Failed to store requested value, sqlite database error."
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#: src/peerstore/gnunet-service-peerstore.c:509
+msgid "No database backend configured\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:520
+#, fuzzy, c-format
+msgid "Could not load database backend `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/peerstore/peerstore_api.c:299 src/sensor/sensor_api.c:179
+#, c-format
+msgid "Received an error notification from MQ of type: %d\n"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:370
+msgid "Iteration canceled due to reconnection."
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:635
+#, fuzzy
+msgid "Unexpected iteration response, this should not happen.\n"
+msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
+
+#: src/peerstore/peerstore_api.c:646
+#, fuzzy
 msgid "Error communicating with `PEERSTORE' service."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/peerstore/peerstore_api.c:503
+#: src/peerstore/peerstore_api.c:665
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:352
-#: src/psycstore/plugin_psycstore_sqlite.c:276
+#: src/peerstore/peerstore_api.c:804
+msgid ""
+"Problem receiving a watch response, no way to determine which request.\n"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:815
+msgid "Received a watch result for a non existing watch.\n"
+msgstr ""
+
+#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/psycstore/plugin_psycstore_sqlite.c:286
 #, fuzzy, c-format
 msgid ""
 "Error executing SQL query: %s\n"
 "  %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:377
-#: src/psycstore/plugin_psycstore_sqlite.c:253
+#: src/peerstore/plugin_peerstore_sqlite.c:401
+#: src/psycstore/plugin_psycstore_sqlite.c:263
 #, fuzzy, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
 "  %s\n"
 msgstr "Fel vid skapandet av användare"
 
+#: src/peerstore/plugin_peerstore_sqlite.c:483
+#, fuzzy, c-format
+msgid "Unable to create indices: %s.\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
 #: src/postgres/postgres.c:59
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
@@ -5706,84 +6063,84 @@
 msgid "Unable to initialize Postgres: %s"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:200
+#: src/psycstore/gnunet-service-psycstore.c:260
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:224
+#: src/psycstore/gnunet-service-psycstore.c:284
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:246
+#: src/psycstore/gnunet-service-psycstore.c:306
 #, fuzzy
 msgid "Failed to store fragment!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:272
+#: src/psycstore/gnunet-service-psycstore.c:362
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:299
+#: src/psycstore/gnunet-service-psycstore.c:402
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:328
+#: src/psycstore/gnunet-service-psycstore.c:433
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:356
+#: src/psycstore/gnunet-service-psycstore.c:461
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:392
-#: src/psycstore/gnunet-service-psycstore.c:465
+#: src/psycstore/gnunet-service-psycstore.c:497
+#: src/psycstore/gnunet-service-psycstore.c:570
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:408
+#: src/psycstore/gnunet-service-psycstore.c:513
 #, fuzzy
 msgid "Failed to begin modifying state!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:431
+#: src/psycstore/gnunet-service-psycstore.c:536
 #, fuzzy, c-format
 msgid "Unknown operator: %c\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:441
+#: src/psycstore/gnunet-service-psycstore.c:546
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:479
+#: src/psycstore/gnunet-service-psycstore.c:584
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:495
+#: src/psycstore/gnunet-service-psycstore.c:600
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:515
-#: src/psycstore/gnunet-service-psycstore.c:534
+#: src/psycstore/gnunet-service-psycstore.c:620
+#: src/psycstore/gnunet-service-psycstore.c:639
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:557
-#: src/psycstore/gnunet-service-psycstore.c:608
+#: src/psycstore/gnunet-service-psycstore.c:662
+#: src/psycstore/gnunet-service-psycstore.c:713
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:584
-#: src/psycstore/gnunet-service-psycstore.c:623
+#: src/psycstore/gnunet-service-psycstore.c:689
+#: src/psycstore/gnunet-service-psycstore.c:728
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
@@ -5793,7 +6150,7 @@
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1796
+#: src/psycstore/plugin_psycstore_sqlite.c:1933
 msgid "SQLite database running\n"
 msgstr ""
 
@@ -6056,334 +6413,346 @@
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:272
-msgid "Duplicate revocation received from peer. Ignored.\n"
-msgstr ""
-
-#: src/revocation/gnunet-service-revocation.c:434
+#: src/revocation/gnunet-service-revocation.c:433
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:486
+#: src/revocation/gnunet-service-revocation.c:483
+#: src/revocation/gnunet-service-revocation.c:730
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:812
+#: src/revocation/gnunet-service-revocation.c:822
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:224
+#: src/rps/gnunet-rps.c:67
+msgid "rps"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:222
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Du måste ange en lista av filer att lägga in.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:231
+#: src/scalarproduct/gnunet-scalarproduct.c:229
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:238
-msgid "Please give a session key for --input_key!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:250
+#: src/scalarproduct/gnunet-scalarproduct.c:242
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:261
+#: src/scalarproduct/gnunet-scalarproduct.c:253
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:283
+#: src/scalarproduct/gnunet-scalarproduct.c:275
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:296
+#: src/scalarproduct/gnunet-scalarproduct.c:294
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:345
+#: src/scalarproduct/gnunet-scalarproduct.c:344
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:347
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:350
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:360
+#: src/scalarproduct/gnunet-scalarproduct.c:359
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:678
-#, fuzzy, c-format
-msgid "Client %p disconnected from us.\n"
-msgstr "\"%s\" ansluten till \"%s\".\n"
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1418
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1529
+#, fuzzy
+msgid "Connect to CADET failed\n"
+msgstr " Anslutning misslyckades (fel?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:748
-#, fuzzy, c-format
-msgid "Could not send message to client (%p)!\n"
-msgstr "Kunde inte skicka begäran till gnunetd.\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+msgid "dkg start delay"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:759
-#, c-format
-msgid "Sending session-end notification to client (%p) for session %s\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+msgid "dkg timeout"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:781
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1459
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+msgid "threshold"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "also profile decryption"
+msgstr ""
+
+#: src/sensordashboard/gnunet-service-sensordashboard.c:353
 #, fuzzy, c-format
-msgid "Successfully created new channel to peer (%s)!\n"
-msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
+msgid "Error trying to send a message to peer `%s'.\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:818
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1469
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1539
+#: src/sensor/gnunet-sensor.c:162
 #, fuzzy
-msgid "Transmitting service request.\n"
-msgstr "Startade samling \"%s\".\n"
+msgid "Retrieve information about all defined sensors"
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:830
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
+#: src/sensor/gnunet-sensor.c:165
 #, fuzzy
-msgid "Could not send message to channel!\n"
-msgstr "Kunde inte skicka begäran till gnunetd.\n"
+msgid "Retrieve information about a single sensor"
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:891
-#: src/scalarproduct/gnunet-service-scalarproduct.c:991
-#, fuzzy
-msgid "Could not send service-response message via cadet!)\n"
-msgstr "Kunde inte skicka begäran till gnunetd.\n"
+#: src/sensor/gnunet-sensor.c:168
+msgid "Force an anomaly on a sensor, use only for testing"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1442
-#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
+#: src/sensor/gnunet-sensor.c:175
+msgid "sensor"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1550
+#: src/sensor/gnunet-sensor-profiler.c:728
+msgid "Invalid or missing number of peers. Set at least 2 peers.\n"
+msgstr ""
+
+#: src/sensor/gnunet-sensor-profiler.c:735
 #, fuzzy
-msgid "Could not send service-request multipart message to channel!\n"
-msgstr "Kunde inte skicka begäran till gnunetd.\n"
+msgid "Missing or invalid topology file.\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1579
-#, c-format
-msgid ""
-"Got client-responder-session with key %s and a matching service-request-"
-"session set, processing.\n"
-msgstr ""
+#: src/sensor/gnunet-sensor-profiler.c:781
+#, fuzzy
+msgid "Number of peers to run"
+msgstr "antal iterationer"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1601
-#, c-format
-msgid ""
-"Got client-responder-session with key %s but NO matching service-request-"
-"session set, queuing element for later use.\n"
+#: src/sensor/gnunet-sensor-profiler.c:783
+msgid "Path to topology file"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1618
-#, c-format
-msgid "Creating new channel for session with key %s.\n"
+#: src/sensor/gnunet-sensor-profiler.c:786
+msgid "Change the interval of running sensors to given value"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1777
-#, c-format
-msgid ""
-"Duplicate session information received, can not create new session with key `"
-"%s'\n"
-msgstr ""
+#: src/sensor/gnunet-sensor-profiler.c:789
+#, fuzzy
+msgid "Number of peers to simulate anomalies on"
+msgstr "antal iterationer"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1862
+#: src/sensor/gnunet-sensor-profiler.c:796
+#, fuzzy
+msgid "Profiler for sensor service"
+msgstr "Fel vid skapandet av användare"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:202
+#, fuzzy
+msgid "Received an invalid sensor value."
+msgstr "Mottog ogiltig \"%s\" begäran (fel tabell)\n"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:293
+#, fuzzy
+msgid "Analysis model not defined in configuration.\n"
+msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:302
 #, fuzzy, c-format
-msgid "New incoming channel from peer %s.\n"
-msgstr "\"%s\" ansluten till \"%s\".\n"
+msgid "Could not load analysis model `%s'.\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
+#: src/sensor/gnunet-service-sensor_analysis.c:310
+#, fuzzy
+msgid "Could not connect to peerstore service.\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:233
+#, fuzzy
+msgid "Unknown value type expected by sensor, this should not happen.\n"
+msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:268
+#, fuzzy, c-format
+msgid "Received an invalid value for sensor `%s': %s\n"
+msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:345
 #, c-format
-msgid "Peer disconnected, terminating session %s with peer (%s)\n"
+msgid "Sensor `%s': External process should not be a path, disabling sensor.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2270
+#: src/sensor/gnunet-service-sensor_monitoring.c:368
 #, c-format
 msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
+"Sensor `%s' process `%s' problem: binary doesn't exist or not executable\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2297
+#: src/sensor/gnunet-service-sensor_monitoring.c:416
 #, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid "Sensor `%s' execution task already set, this should not happen\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2318
+#: src/sensor/gnunet-service-sensor_reporting.c:828
+#, fuzzy
+msgid "Double creation of proof-of-work, this should not happen.\n"
+msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:834
+#, fuzzy
+msgid "Failed to create pow and signature block.\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:1044
 #, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid "PEERSTORE error: %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2565
-msgid "Shutting down, initiating cleanup.\n"
+#: src/sensor/gnunet-service-sensor_reporting.c:1149
+#: src/sensor/gnunet-service-sensor_reporting.c:1407
+#, fuzzy
+msgid "Failed to connect to CORE service.\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:1156
+msgid "Peer identity received from CORE init doesn't match ours.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2659
+#: src/sensor/gnunet-service-sensor_reporting.c:1396
 #, fuzzy
-msgid "Connect to CADET failed\n"
-msgstr " Anslutning misslyckades (fel?)\n"
+msgid "Failed to connect to peerstore service.\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2664
+#: src/sensor/gnunet-service-sensor_reporting.c:1417
+#: src/sensor/gnunet-service-sensor_update.c:781
 #, fuzzy
-msgid "CADET initialized\n"
-msgstr " Anslutning misslyckades\n"
+msgid "Failed to connect to CADET service.\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
-msgid "dkg start delay"
+#: src/sensor/gnunet-service-sensor_reporting.c:1424
+#, fuzzy
+msgid "Failed to load my private key.\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/sensor/gnunet-service-sensor_update.c:327
+#, c-format
+msgid "Error trying to send a message to update point `%s'.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
-msgid "dkg timeout"
+#: src/sensor/gnunet-service-sensor_update.c:418
+#, fuzzy, c-format
+msgid "Failed to connect to update point `%s'.\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/sensor/plugin_sensor_model_gaussian.c:203
+msgid "Missing `TRAINING_WINDOW' value in configuration.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
-msgid "threshold"
+#: src/sensor/plugin_sensor_model_gaussian.c:221
+msgid "Missing `CONFIDENCE_INTERVAL' value in configuration.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
-msgid "also profile decryption"
+#: src/sensor/plugin_sensor_model_gaussian.c:229
+msgid "Missing `WEIGHT_INC' value in configuration.\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor.c:148
+#: src/sensor/sensor_api.c:296
 #, fuzzy
-msgid "Retrieve information about all defined sensors"
-msgstr "Skriv ut information om GNUnets motparter."
+msgid "Iterate request canceled due to disconnection.\n"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/sensor/gnunet-sensor.c:151
-#, fuzzy
-msgid "Retrieve information about a single sensor"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/sensor/gnunet-sensor.c:160
-msgid "sensor"
+#: src/sensor/sensor_api.c:307
+msgid "Force anomaly request canceled due to disconnection.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:367
+#: src/sensor/sensor_api.c:374
 #, fuzzy
+msgid "Timeout transmitting iteration request to `SENSOR' service."
+msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
+
+#: src/sensor/sensor_util_lib.c:107
+#, fuzzy
 msgid "Error reading sensor version\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/sensor/gnunet-service-sensor.c:373
+#: src/sensor/sensor_util_lib.c:116
 msgid "Invalid sensor version number, format should be major.minor\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:385
+#: src/sensor/sensor_util_lib.c:131
 #, fuzzy
 msgid "Error reading sensor category\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/sensor/gnunet-service-sensor.c:413
+#: src/sensor/sensor_util_lib.c:164
 #, fuzzy
 msgid "Error reading sensor run interval\n"
 msgstr "Klar med skapandet av värdnyckel.\n"
 
-#: src/sensor/gnunet-service-sensor.c:419
-#, c-format
-msgid "Sensor run interval too low (%<PRIu64> < %d)\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor.c:436
+#: src/sensor/sensor_util_lib.c:191
 #, fuzzy
 msgid "Error reading sensor source\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/sensor/gnunet-service-sensor.c:445
+#: src/sensor/sensor_util_lib.c:206
 msgid "Error reading sensor gnunet-statistics source information\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:455
+#: src/sensor/sensor_util_lib.c:218
 #, fuzzy
 msgid "Error reading sensor process name\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/sensor/gnunet-service-sensor.c:464
+#: src/sensor/sensor_util_lib.c:233
 msgid "Error reading sensor expected datatype\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:470
+#: src/sensor/sensor_util_lib.c:241
 msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:498
+#: src/sensor/sensor_util_lib.c:299
 #, fuzzy, c-format
 msgid "Failed to access sensor file: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/sensor/gnunet-service-sensor.c:506
+#: src/sensor/sensor_util_lib.c:308
 #, fuzzy, c-format
 msgid "Failed to load sensor definition: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/sensor/gnunet-service-sensor.c:559
+#: src/sensor/sensor_util_lib.c:370
 #, c-format
 msgid "Sensor `%s' already exists with same or newer version\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:566
-#, c-format
-msgid "Upgrading sensor `%s' to a newer version\n"
+#: src/sensor/sensor_util_lib.c:387
+#, fuzzy, c-format
+msgid "Error adding new sensor `%s' to global hashmap.\n"
 msgstr ""
+"\n"
+"Fel vid uppladdning av fil: %s\n"
 
-#: src/sensor/gnunet-service-sensor.c:571
-#, c-format
-msgid ""
-"Error adding new sensor `%s' to global hashmap, this should not happen\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor.c:595
+#: src/sensor/sensor_util_lib.c:412
 #, fuzzy, c-format
 msgid "Error loading sensor from file: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/sensor/gnunet-service-sensor.c:599
-#, c-format
-msgid "Sensor `%s' added to global hashmap\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor.c:635
-#, fuzzy, c-format
-msgid "Reloading sensor definitions from directory `%s'\n"
-msgstr "Ladda ner filer från GNUnet."
-
-#: src/sensor/gnunet-service-sensor.c:640
-#, fuzzy, c-format
-msgid "Loaded %d sensors from directory `%s'\n"
-msgstr "Ladda ner filer från GNUnet."
-
-#: src/sensor/sensor_api.c:345
+#: src/set/gnunet-service-set.c:1529
 #, fuzzy
-msgid "Timeout transmitting iteration request to `SENSOR' service."
-msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
-
-#: src/sensor/sensor_api.c:388
-#, fuzzy
-msgid "Failed to receive response from `SENSOR' service."
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
-
-#: src/sensor/sensor_api.c:431
-#, fuzzy
-msgid "Received invalid message from `SENSOR' service."
-msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
-
-#: src/set/gnunet-service-set.c:1431
-#, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
@@ -6409,7 +6778,7 @@
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:295
+#: src/set/gnunet-set-profiler.c:298
 msgid "oeration to execute"
 msgstr ""
 
@@ -6531,37 +6900,37 @@
 msgid "Invalid topology: %s\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/testbed/generate-underlay-topology.c:252
+#: src/testbed/generate-underlay-topology.c:253
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:258
+#: src/testbed/generate-underlay-topology.c:259
 #, fuzzy, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/testbed/generate-underlay-topology.c:266
+#: src/testbed/generate-underlay-topology.c:267
 #, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:280
+#: src/testbed/generate-underlay-topology.c:281
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:286
+#: src/testbed/generate-underlay-topology.c:287
 #, fuzzy, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/testbed/generate-underlay-topology.c:335
+#: src/testbed/generate-underlay-topology.c:336
 #: src/testbed/gnunet-testbed-profiler.c:293
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:344
+#: src/testbed/generate-underlay-topology.c:345
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6585,7 +6954,7 @@
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:331
+#: src/testbed/gnunet-daemon-latency-logger.c:333
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
@@ -6596,7 +6965,7 @@
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:235 src/testing/list-keys.c:50
-#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
+#: src/testing/testing.c:293 src/util/gnunet-ecc.c:295
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6635,11 +7004,6 @@
 msgid "Spawning process `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:267
-#, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "Maximalt antal chattklienter uppnått.\n"
-
 #: src/testbed/gnunet-testbed-profiler.c:296
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
@@ -6888,65 +7252,66 @@
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:255
+#: src/topology/gnunet-daemon-topology.c:265
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:388
+#: src/topology/gnunet-daemon-topology.c:406
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# byte mottogs via TCP"
 
-#: src/topology/gnunet-daemon-topology.c:728
-#: src/topology/gnunet-daemon-topology.c:813
+#: src/topology/gnunet-daemon-topology.c:756
+#: src/topology/gnunet-daemon-topology.c:840
 #, fuzzy
 msgid "# friends connected"
 msgstr "# av anslutna parter"
 
-#: src/topology/gnunet-daemon-topology.c:993
+#: src/topology/gnunet-daemon-topology.c:1020
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1022
+#: src/topology/gnunet-daemon-topology.c:1049
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1029
+#: src/topology/gnunet-daemon-topology.c:1056
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1050
+#: src/topology/gnunet-daemon-topology.c:1077
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1052
+#: src/topology/gnunet-daemon-topology.c:1079
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1057
+#: src/topology/gnunet-daemon-topology.c:1084
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1063
+#: src/topology/gnunet-daemon-topology.c:1090
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1094
+#: src/topology/gnunet-daemon-topology.c:1121
+#: src/transport/plugin_transport_wlan.c:1444
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/topology/gnunet-daemon-topology.c:1151
+#: src/topology/gnunet-daemon-topology.c:1178
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1296
+#: src/topology/gnunet-daemon-topology.c:1323
 msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
@@ -6960,8 +7325,8 @@
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:464
-#: src/transport/gnunet-service-transport_blacklist.c:745
+#: src/transport/gnunet-service-transport_blacklist.c:465
+#: src/transport/gnunet-service-transport_blacklist.c:748
 msgid "# disconnects due to blacklist"
 msgstr ""
 
@@ -6985,62 +7350,62 @@
 msgid "Could not obtain a valid network for `%s' %s (%s)\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport.c:755
+#: src/transport/gnunet-service-transport.c:757
 #, c-format
 msgid ""
 "Address or session unknown: failed to update properties for peer `%s' plugin "
 "`%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1106
+#: src/transport/gnunet-service-transport.c:1094
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/transport/gnunet-service-transport_clients.c:432
+#: src/transport/gnunet-service-transport_clients.c:463
 #, 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:439
+#: src/transport/gnunet-service-transport_clients.c:470
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:596
+#: src/transport/gnunet-service-transport_clients.c:630
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:737
+#: src/transport/gnunet-service-transport_clients.c:771
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:770
+#: src/transport/gnunet-service-transport_clients.c:804
 #, fuzzy, c-format
 msgid "Blacklist refuses connection attempt to peer `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_clients.c:776
+#: src/transport/gnunet-service-transport_clients.c:810
 #, fuzzy, c-format
 msgid "Blacklist allows connection attempt to peer `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_clients.c:801
+#: src/transport/gnunet-service-transport_clients.c:836
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_clients.c:815
+#: src/transport/gnunet-service-transport_clients.c:850
 #, fuzzy, c-format
 msgid "Received a request connect message for peer `%s'\n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_clients.c:826
+#: src/transport/gnunet-service-transport_clients.c:861
 #, fuzzy
 msgid "# REQUEST DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_clients.c:840
+#: src/transport/gnunet-service-transport_clients.c:875
 #, fuzzy, c-format
 msgid "Received a request disconnect message for peer `%s'\n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
@@ -7123,171 +7488,171 @@
 
 #: src/transport/gnunet-service-transport_neighbours.c:1685
 #, fuzzy, c-format
-msgid ""
-"Failed to send CONNECT message to peer `%s' using address `%s' session %p\n"
+msgid "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1712
-msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
-msgstr ""
+#, fuzzy
+msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1757
 #, fuzzy
-msgid "# SESSION_CONNECT messages sent"
+msgid "# SYN messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1773
 #, fuzzy, c-format
-msgid "Failed to transmit CONNECT message via plugin to %s\n"
+msgid "Failed to transmit SYN message via plugin to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1800
-msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
-msgstr ""
+#, fuzzy
+msgid "# Failed attempts to switch addresses (failed to send SYN)"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1849
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Failed to send CONNECT_ACK message to peer `%s' using address `%s' session "
-"%p\n"
-msgstr ""
+"Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1904
 #, fuzzy
-msgid "# CONNECT_ACK messages sent"
+msgid "# SYN_ACK messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1919
 #, fuzzy, c-format
-msgid "Failed to transmit CONNECT_ACK message via plugin to %s\n"
+msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2196
+#: src/transport/gnunet-service-transport_neighbours.c:2199
 #, fuzzy, c-format
 msgid "Blacklisting disapproved to connect to peer `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2316
+#: src/transport/gnunet-service-transport_neighbours.c:2324
 #, fuzzy
-msgid "# CONNECT messages received"
-msgstr "# krypterade PONG-meddelanden mottagna"
+msgid "# SYN messages received"
+msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2321
+#: src/transport/gnunet-service-transport_neighbours.c:2329
 #, c-format
-msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
+msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2594
+#: src/transport/gnunet-service-transport_neighbours.c:2626
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3016
+#: src/transport/gnunet-service-transport_neighbours.c:3047
 #, fuzzy
 msgid "# Failed attempts to switch addresses (no response)"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3111
+#: src/transport/gnunet-service-transport_neighbours.c:3142
 #, fuzzy
-msgid "# CONNECT_ACK messages received"
+msgid "# SYN_ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3119
+#: src/transport/gnunet-service-transport_neighbours.c:3150
 #, fuzzy
-msgid "# unexpected CONNECT_ACK messages (no peer)"
+msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3133
-#: src/transport/gnunet-service-transport_neighbours.c:3168
+#: src/transport/gnunet-service-transport_neighbours.c:3164
+#: src/transport/gnunet-service-transport_neighbours.c:3199
 #, fuzzy
-msgid "# unexpected CONNECT_ACK messages (not ready)"
+msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3180
+#: src/transport/gnunet-service-transport_neighbours.c:3211
 #, fuzzy
-msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
+msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3203
+#: src/transport/gnunet-service-transport_neighbours.c:3234
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3211
+#: src/transport/gnunet-service-transport_neighbours.c:3242
 #, fuzzy
-msgid "# unexpected CONNECT_ACK messages (disconnecting)"
+msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3399
+#: src/transport/gnunet-service-transport_neighbours.c:3441
 #, fuzzy
-msgid "# SESSION_ACK messages received"
+msgid "# ACK messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3435
+#: src/transport/gnunet-service-transport_neighbours.c:3477
 #, fuzzy
-msgid "# unexpected SESSION_ACK messages"
+msgid "# unexpected ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3509
+#: src/transport/gnunet-service-transport_neighbours.c:3551
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3524
+#: src/transport/gnunet-service-transport_neighbours.c:3566
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3564
+#: src/transport/gnunet-service-transport_neighbours.c:3611
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3570
+#: src/transport/gnunet-service-transport_neighbours.c:3617
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3579
+#: src/transport/gnunet-service-transport_neighbours.c:3626
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3706
+#: src/transport/gnunet-service-transport_neighbours.c:3753
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-service-transport_plugins.c:120
+#: src/transport/gnunet-service-transport_plugins.c:119
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:178
-#: src/transport/gnunet-service-transport_plugins.c:186
-#: src/transport/gnunet-service-transport_plugins.c:194
-#: src/transport/gnunet-service-transport_plugins.c:202
-#: src/transport/gnunet-service-transport_plugins.c:210
-#: src/transport/gnunet-service-transport_plugins.c:218
-#: src/transport/gnunet-service-transport_plugins.c:226
-#: src/transport/gnunet-service-transport_plugins.c:234
-#: src/transport/gnunet-service-transport_plugins.c:242
-#: src/transport/gnunet-service-transport_plugins.c:250
-#: src/transport/gnunet-service-transport_plugins.c:258
+#: src/transport/gnunet-service-transport_plugins.c:177
+#: src/transport/gnunet-service-transport_plugins.c:185
+#: src/transport/gnunet-service-transport_plugins.c:193
+#: src/transport/gnunet-service-transport_plugins.c:201
+#: src/transport/gnunet-service-transport_plugins.c:209
+#: src/transport/gnunet-service-transport_plugins.c:217
+#: src/transport/gnunet-service-transport_plugins.c:225
+#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
+#: src/transport/gnunet-service-transport_plugins.c:249
+#: src/transport/gnunet-service-transport_plugins.c:257
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:265
+#: src/transport/gnunet-service-transport_plugins.c:264
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:488
+#: src/transport/gnunet-service-transport_validation.c:493
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:558
+#: src/transport/gnunet-service-transport_validation.c:563
 #, 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:616
+#: src/transport/gnunet-service-transport_validation.c:624
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
@@ -7344,76 +7709,82 @@
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1356
+#: src/transport/gnunet-service-transport_validation.c:1387
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1371
+#: src/transport/gnunet-service-transport_validation.c:1402
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1493
+#: src/transport/gnunet-service-transport_validation.c:1526
 #, fuzzy, c-format
 msgid "Validation received new %s message for peer `%s' with size %u\n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1500
+#: src/transport/gnunet-service-transport_validation.c:1533
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:388
+#: src/transport/gnunet-transport.c:573
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:396
+#: src/transport/gnunet-transport.c:582
+#: src/transport/gnunet-transport-profiler.c:274
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:436
+#: src/transport/gnunet-transport.c:614
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:449
+#: src/transport/gnunet-transport.c:629
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/gnunet-transport.c:459
+#: src/transport/gnunet-transport.c:641
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:483
+#: src/transport/gnunet-transport.c:668 src/transport/gnunet-transport.c:698
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/transport/gnunet-transport.c:487
+#: src/transport/gnunet-transport.c:673
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/transport/gnunet-transport.c:491
+#: src/transport/gnunet-transport.c:678
 #, fuzzy, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/transport/gnunet-transport.c:495
+#: src/transport/gnunet-transport.c:683
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/gnunet-transport.c:499
+#: src/transport/gnunet-transport.c:688
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:614
+#: src/transport/gnunet-transport.c:704
 #, fuzzy, c-format
+msgid "Configuration for plugin `%s' is working!\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/transport/gnunet-transport.c:823
+#, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
 "\t%s%s\n"
@@ -7421,392 +7792,446 @@
 "\t%s%s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:643
+#: src/transport/gnunet-transport.c:859
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:717 src/transport/gnunet-transport.c:1240
+#: src/transport/gnunet-transport.c:958 src/transport/gnunet-transport.c:1707
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:784
+#: src/transport/gnunet-transport.c:1026
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:798
+#: src/transport/gnunet-transport.c:1040
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:823
+#: src/transport/gnunet-transport.c:1065
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/gnunet-transport.c:866
+#: src/transport/gnunet-transport.c:1111
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:888
+#: src/transport/gnunet-transport.c:1134
+#: src/transport/gnunet-transport-profiler.c:406
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:912
+#: src/transport/gnunet-transport.c:1158
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:943
+#: src/transport/gnunet-transport.c:1191
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:966
+#: src/transport/gnunet-transport.c:1214
+#: src/transport/gnunet-transport-profiler.c:434
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:988 src/transport/gnunet-transport.c:1009
+#: src/transport/gnunet-transport.c:1239 src/transport/gnunet-transport.c:1265
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:989
+#: src/transport/gnunet-transport.c:1241
 #, fuzzy
 msgid "Connected to"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1010
+#: src/transport/gnunet-transport.c:1267
 #, fuzzy
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1031
+#: src/transport/gnunet-transport.c:1291
+#: src/transport/gnunet-transport-profiler.c:458
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1061
+#: src/transport/gnunet-transport.c:1323
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1072
+#: src/transport/gnunet-transport.c:1335
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:1300 src/transport/gnunet-transport.c:1325
+#: src/transport/gnunet-transport.c:1792
+#: src/transport/gnunet-transport-profiler.c:492
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1369
+#: src/transport/gnunet-transport.c:1829
+#, fuzzy
+msgid "Failed to send disconnect request to transport service\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/transport/gnunet-transport.c:1875
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
-"%s, %s\n"
+"%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1377
+#: src/transport/gnunet-transport.c:1883
 #, c-format
 msgid ""
-"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
+"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1396 src/transport/gnunet-transport.c:1426
-#: src/transport/gnunet-transport.c:1456 src/transport/gnunet-transport.c:1479
-#: src/transport/gnunet-transport.c:1523
+#: src/transport/gnunet-transport.c:1902 src/transport/gnunet-transport.c:1932
+#: src/transport/gnunet-transport.c:1964 src/transport/gnunet-transport.c:1990
+#: src/transport/gnunet-transport.c:2046
+#: src/transport/gnunet-transport-profiler.c:578
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1405 src/transport/gnunet-transport.c:1435
-#: src/transport/gnunet-transport.c:1465
+#: src/transport/gnunet-transport.c:1911 src/transport/gnunet-transport.c:1941
+#: src/transport/gnunet-transport.c:1975
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1484
+#: src/transport/gnunet-transport.c:1995
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1569
+#: src/transport/gnunet-transport.c:2094
 #, fuzzy
-msgid "print information for all peers (instead of only connected peers )"
+msgid "print information for all peers (instead of only connected peers)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1572
+#: src/transport/gnunet-transport.c:2097
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1575
+#: src/transport/gnunet-transport.c:2100
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1578
+#: src/transport/gnunet-transport.c:2103
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1581
+#: src/transport/gnunet-transport.c:2106
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1584
+#: src/transport/gnunet-transport.c:2109
 #, fuzzy
-msgid "print information for all pending validations continously"
+msgid "print information for all pending validations continuously"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1587
+#: src/transport/gnunet-transport.c:2112
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1593
+#: src/transport/gnunet-transport.c:2118
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1595
+#: src/transport/gnunet-transport.c:2121
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:1597
+#: src/transport/gnunet-transport.c:2124
+#: src/transport/gnunet-transport-profiler.c:638
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1599
+#: src/transport/gnunet-transport.c:2127
+msgid "monitor plugin sessions"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:2130
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1602
+#: src/transport/gnunet-transport.c:2133
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1611
+#: src/transport/gnunet-transport.c:2144
+#: src/transport/gnunet-transport-profiler.c:649
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/plugin_transport_bluetooth.c:621
-msgid "# Bluetooth ACKs sent"
+#: src/transport/gnunet-transport-profiler.c:218
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:640
-#, fuzzy
-msgid "# Bluetooth messages defragmented"
-msgstr "# PING-meddelanden skapade"
+#: src/transport/gnunet-transport-profiler.c:254
+#, c-format
+msgid "%u;%u;%llu;%llu;%.2f;%.2f"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:686
-#: src/transport/plugin_transport_bluetooth.c:737
-#: src/transport/plugin_transport_bluetooth.c:1942
-#, fuzzy
-msgid "# Bluetooth sessions allocated"
-msgstr "# sessionsnycklar accepterade"
+#: src/transport/gnunet-transport-profiler.c:263
+#, c-format
+msgid ";%llu;%.2f"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:837
-#, fuzzy
-msgid "# Bluetooth message fragments sent"
-msgstr "# byte mottogs via TCP"
+#: src/transport/gnunet-transport-profiler.c:280
+msgid "\n"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:861
-msgid "# Bluetooth messages pending (with fragmentation)"
+#: src/transport/gnunet-transport-profiler.c:332
+msgid "."
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:969
-#: src/transport/plugin_transport_bluetooth.c:1054
-#: src/transport/plugin_transport_bluetooth.c:1944
-#, fuzzy
-msgid "# Bluetooth MAC endpoints allocated"
-msgstr "# byte mottogs via TCP"
+#: src/transport/gnunet-transport-profiler.c:352
+#, c-format
+msgid ""
+"\n"
+"Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1307
+#: src/transport/gnunet-transport-profiler.c:400
+#, fuzzy, c-format
+msgid "Connected to different peer `%s'\n"
+msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#: src/transport/gnunet-transport-profiler.c:483
+#, fuzzy, c-format
+msgid "Retrying to connect to `%s'\n"
+msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
+
+#: src/transport/gnunet-transport-profiler.c:508
+#, fuzzy, c-format
+msgid "Denying connection to `%s'\n"
+msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
+
+#: src/transport/gnunet-transport-profiler.c:537
 #, fuzzy
-msgid "# HELLO messages received via Bluetooth"
-msgstr "# krypterade PONG-meddelanden mottagna"
+msgid "Message size too big!\n"
+msgstr "meddelandestorlek"
 
-#: src/transport/plugin_transport_bluetooth.c:1331
+#: src/transport/gnunet-transport-profiler.c:543
 #, fuzzy
-msgid "# fragments received via Bluetooth"
-msgstr "# byte mottogs via TCP"
+msgid "No peer identity given\n"
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/plugin_transport_bluetooth.c:1341
+#: src/transport/gnunet-transport-profiler.c:558
+#, c-format
+msgid "Trying to send %u messages with size %u to peer `%s'\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:564
+#, fuzzy, c-format
+msgid "Trying to receive messages from peer `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/transport/gnunet-transport-profiler.c:569
 #, fuzzy
-msgid "# ACKs received via Bluetooth"
-msgstr "# byte mottogs via TCP"
+msgid "No operation given\n"
+msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/plugin_transport_bluetooth.c:1401
+#: src/transport/gnunet-transport-profiler.c:623
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:626
 #, fuzzy
-msgid "# Bluetooth DATA messages discarded due to CRC32 error"
-msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+msgid "receive data from peer"
+msgstr "# byte mottagna av typen %d"
 
-#: src/transport/plugin_transport_bluetooth.c:1512
+#: src/transport/gnunet-transport-profiler.c:629
 #, fuzzy
-msgid "# DATA messages received via Bluetooth"
-msgstr "# krypterade PONG-meddelanden mottagna"
+msgid "iterations"
+msgstr "Visa alla alternativ"
 
-#: src/transport/plugin_transport_bluetooth.c:1547
+#: src/transport/gnunet-transport-profiler.c:632
 #, fuzzy
-msgid "# Bluetooth DATA messages processed"
-msgstr "# krypterade PONG-meddelanden mottagna"
+msgid "number of messages to send"
+msgstr "antal meddelanden att använda per iteration"
 
-#: src/transport/plugin_transport_bluetooth.c:1610
+#: src/transport/gnunet-transport-profiler.c:635
 #, fuzzy
-msgid "# HELLO beacons sent via Bluetooth"
-msgstr "# byte skickade via UDP"
+msgid "message size to use"
+msgstr "meddelandestorlek"
 
-#: src/transport/plugin_transport_bluetooth.c:1923
-#, c-format
-msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
+#: src/transport/plugin_transport_http_client.c:1491
+#: src/transport/plugin_transport_http_server.c:2271
+#: src/transport/plugin_transport_http_server.c:3436
+#: src/transport/plugin_transport_tcp.c:2826
+#: src/transport/plugin_transport_tcp.c:2833
+msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1685
+#: src/transport/plugin_transport_http_client.c:2115
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1760
-#: src/transport/plugin_transport_http_server.c:3031
+#: src/transport/plugin_transport_http_client.c:2164
+#: src/transport/plugin_transport_http_server.c:3170
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1785
-#: src/transport/plugin_transport_http_server.c:3088
+#: src/transport/plugin_transport_http_client.c:2181
+#: src/transport/plugin_transport_http_server.c:3240
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 "Uppladdning av \"%s\" klar, aktuell genomsnittshastighet är %8.3f kbps.\n"
 
-#: src/transport/plugin_transport_http_client.c:1819
-#: src/transport/plugin_transport_http_server.c:2931
+#: src/transport/plugin_transport_http_client.c:2215
 #, fuzzy, c-format
-msgid "Maximum number of connections is %u\n"
+msgid "Maximum number of requests is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/transport/plugin_transport_http_server.c:1423
+#: src/transport/plugin_transport_http_server.c:1761
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1687
+#: src/transport/plugin_transport_http_server.c:1992
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1695
+#: src/transport/plugin_transport_http_server.c:2000
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1982
+#: src/transport/plugin_transport_http_server.c:2150
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2006
+#: src/transport/plugin_transport_http_server.c:2173
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2429
+#: src/transport/plugin_transport_http_server.c:2297
+msgid "Could not load or create server certificate! Loading plugin failed!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2604
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/transport/plugin_transport_http_server.c:2461 src/util/service.c:700
+#: src/transport/plugin_transport_http_server.c:2638 src/util/service.c:700
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_http_server.c:2478 src/util/service.c:719
+#: src/transport/plugin_transport_http_server.c:2656 src/util/service.c:719
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/plugin_transport_http_server.c:2589
+#: src/transport/plugin_transport_http_server.c:2769
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2661
+#: src/transport/plugin_transport_http_server.c:2847
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2754
+#: src/transport/plugin_transport_http_server.c:2946
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2768
+#: src/transport/plugin_transport_http_server.c:2961
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2775
+#: src/transport/plugin_transport_http_server.c:2967
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2786
+#: src/transport/plugin_transport_http_server.c:2978
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/plugin_transport_http_server.c:2793
+#: src/transport/plugin_transport_http_server.c:2984
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2808
+#: src/transport/plugin_transport_http_server.c:2998
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2818
+#: src/transport/plugin_transport_http_server.c:3008
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2839
+#: src/transport/plugin_transport_http_server.c:3030
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2849
+#: src/transport/plugin_transport_http_server.c:3040
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2901
+#: src/transport/plugin_transport_http_server.c:3103
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2917
+#: src/transport/plugin_transport_http_server.c:3124
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_server.c:3141
+#, fuzzy, c-format
+msgid "Maximum number of connections is %u\n"
+msgstr "Maximalt antal chattklienter uppnått.\n"
+
+#: src/transport/plugin_transport_http_server.c:3448
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "Kunde inte initiera SQLite.\n"
@@ -7859,91 +8284,86 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:565
+#: src/transport/plugin_transport_tcp.c:648
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:787
-#: src/transport/plugin_transport_tcp.c:962
-#: src/transport/plugin_transport_tcp.c:2047
-#: src/transport/plugin_transport_tcp.c:2620
+#: src/transport/plugin_transport_tcp.c:829
+#: src/transport/plugin_transport_tcp.c:1044
+#: src/transport/plugin_transport_tcp.c:2232
+#: src/transport/plugin_transport_tcp.c:2932
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:823
-#: src/transport/plugin_transport_tcp.c:955
-#: src/transport/plugin_transport_tcp.c:1045
-#: src/transport/plugin_transport_tcp.c:1093
-#: src/transport/plugin_transport_tcp.c:1259
-#: src/transport/plugin_transport_tcp.c:1277
+#: src/transport/plugin_transport_tcp.c:870
+#: src/transport/plugin_transport_tcp.c:1027
+#: src/transport/plugin_transport_tcp.c:1146
+#: src/transport/plugin_transport_tcp.c:1214
+#: src/transport/plugin_transport_tcp.c:1312
+#: src/transport/plugin_transport_tcp.c:1336
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_tcp.c:826
+#: src/transport/plugin_transport_tcp.c:873
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1048
+#: src/transport/plugin_transport_tcp.c:1149
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1096
+#: src/transport/plugin_transport_tcp.c:1218
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:1233
-#, c-format
-msgid "Trying to send with invalid session %p\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1504
+#: src/transport/plugin_transport_tcp.c:1611
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1609
+#: src/transport/plugin_transport_tcp.c:1775
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2097
+#: src/transport/plugin_transport_tcp.c:2282
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:2257
+#: src/transport/plugin_transport_tcp.c:2452
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2321
+#: src/transport/plugin_transport_tcp.c:2524
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2490 src/util/service.c:582
+#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:582
 #: src/util/service.c:588
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2504
+#: src/transport/plugin_transport_tcp.c:2776
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2607
+#: src/transport/plugin_transport_tcp.c:2919
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2611
+#: src/transport/plugin_transport_tcp.c:2923
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2615
+#: src/transport/plugin_transport_tcp.c:2927
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7968,139 +8388,139 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1513
+#: src/transport/plugin_transport_udp.c:1655
 #, c-format
 msgid ""
 "Trying to create session for address of unexpected length %u (should be %u "
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2602
+#: src/transport/plugin_transport_udp.c:2881
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2616
+#: src/transport/plugin_transport_udp.c:2894
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2961
+#: src/transport/plugin_transport_udp.c:3247
+#, fuzzy, c-format
+msgid "Failed to bind UDP socket to %s: %s\n"
+msgstr "Misslyckades att binda till UDP6-port %d.\n"
+
+#: src/transport/plugin_transport_udp.c:3255
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:3056
+#: src/transport/plugin_transport_udp.c:3414
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3097
+#: src/transport/plugin_transport_udp.c:3461
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_udp.c:3168
+#: src/transport/plugin_transport_udp.c:3529
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1321
+#: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1645
-#, fuzzy
-msgid "No UNIXPATH given in configuration!\n"
-msgstr "Kunde inte spara konfiguration!"
+#: src/transport/plugin_transport_unix.c:1416
+#, fuzzy, c-format
+msgid "Cannot bind to `%s'\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1681
+#: src/transport/plugin_transport_unix.c:1817
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_wlan.c:620
-msgid "# WLAN ACKs sent"
+#: src/transport/plugin_transport_wlan.c:725
+msgid "# ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:639
+#: src/transport/plugin_transport_wlan.c:745
 #, fuzzy
-msgid "# WLAN messages defragmented"
+msgid "# Messages defragmented"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/plugin_transport_wlan.c:688
-#: src/transport/plugin_transport_wlan.c:772
-#: src/transport/plugin_transport_wlan.c:1948
+#: src/transport/plugin_transport_wlan.c:786
+#: src/transport/plugin_transport_wlan.c:873
 #, fuzzy
-msgid "# WLAN sessions allocated"
+msgid "# Sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_wlan.c:876
+#: src/transport/plugin_transport_wlan.c:989
 #, fuzzy
-msgid "# WLAN message fragments sent"
+msgid "# message fragments sent"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:900
-msgid "# WLAN messages pending (with fragmentation)"
-msgstr ""
-
-#: src/transport/plugin_transport_wlan.c:1008
-#: src/transport/plugin_transport_wlan.c:1098
-#: src/transport/plugin_transport_wlan.c:1950
+#: src/transport/plugin_transport_wlan.c:1015
 #, fuzzy
-msgid "# WLAN MAC endpoints allocated"
+msgid "# messages pending (with fragmentation)"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1302
+#: src/transport/plugin_transport_wlan.c:1129
+#: src/transport/plugin_transport_wlan.c:1222
+#: src/transport/plugin_transport_wlan.c:2185
 #, fuzzy
-msgid "# HELLO messages received via WLAN"
-msgstr "# krypterade PONG-meddelanden mottagna"
-
-#: src/transport/plugin_transport_wlan.c:1326
-#, fuzzy
-msgid "# fragments received via WLAN"
+msgid "# MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1336
+#: src/transport/plugin_transport_wlan.c:1487
 #, fuzzy
-msgid "# ACKs received via WLAN"
+msgid "# ACKs received"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1396
+#: src/transport/plugin_transport_wlan.c:1555
 #, fuzzy
-msgid "# WLAN DATA messages discarded due to CRC32 error"
+msgid "# DATA messages discarded due to CRC32 error"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_wlan.c:1518
+#: src/transport/plugin_transport_wlan.c:1696
 #, fuzzy
-msgid "# DATA messages received via WLAN"
+msgid "# DATA messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1553
+#: src/transport/plugin_transport_wlan.c:1730
 #, fuzzy
-msgid "# WLAN DATA messages processed"
+msgid "# DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1616
+#: src/transport/plugin_transport_wlan.c:1793
 #, fuzzy
-msgid "# HELLO beacons sent via WLAN"
+msgid "# HELLO beacons sent"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_wlan.c:1929
+#: src/transport/plugin_transport_wlan.c:2160
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:739
+#: src/transport/plugin_transport_wlan.c:2182
+#, fuzzy
+msgid "# sessions allocated"
+msgstr "# sessionsnycklar accepterade"
+
+#: src/transport/transport_api.c:767
 #, 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/transport-testing.c:584
+#: src/transport/transport-testing.c:603
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -8274,12 +8694,12 @@
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/connection.c:751 src/util/connection.c:919
+#: src/util/connection.c:751 src/util/connection.c:914
 #, 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:910
+#: src/util/connection.c:904
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Anslutning misslyckades\n"
@@ -8346,12 +8766,12 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 
-#: src/util/disk.c:1184
+#: src/util/disk.c:1202
 #, 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:1546 src/util/service.c:1323
+#: src/util/disk.c:1564 src/util/service.c:1323
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
@@ -8466,81 +8886,82 @@
 msgid "Manipulate GNUnet configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet-ecc.c:75
+#: src/util/gnunet-ecc.c:81
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/gnunet-ecc.c:81
+#: src/util/gnunet-ecc.c:117
 #, c-format
+msgid "Generating %u keys like %s, please wait"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:130
+#, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:97
+#: src/util/gnunet-ecc.c:171
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/gnunet-ecc.c:107
+#: src/util/gnunet-ecc.c:181
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr "Slutför"
 
-#: src/util/gnunet-ecc.c:110
+#: src/util/gnunet-ecc.c:184
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:199
+#: src/util/gnunet-ecc.c:277
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/util/gnunet-ecc.c:210
+#: src/util/gnunet-ecc.c:288
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/util/gnunet-ecc.c:232
+#: src/util/gnunet-ecc.c:310
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/util/gnunet-ecc.c:283
+#: src/util/gnunet-ecc.c:361
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:349
+#: src/util/gnunet-ecc.c:411
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:352
+#: src/util/gnunet-ecc.c:414
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:355
+#: src/util/gnunet-ecc.c:417
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:358
+#: src/util/gnunet-ecc.c:420
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:361
-msgid "print the hash of the public key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:364
+#: src/util/gnunet-ecc.c:423
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:375
+#: src/util/gnunet-ecc.c:434
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -8574,13 +8995,13 @@
 msgid "Manipulate GNUnet proof of work files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet-service-resolver.c:299
+#: src/util/gnunet-service-resolver.c:310
 #, fuzzy, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/gnunet-service-resolver.c:371
-#: src/util/gnunet-service-resolver.c:412
+#: src/util/gnunet-service-resolver.c:382
+#: src/util/gnunet-service-resolver.c:423
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
@@ -8629,7 +9050,7 @@
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1355 src/util/network.c:1480
+#: src/util/network.c:1361 src/util/network.c:1486
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8693,12 +9114,12 @@
 msgid "Malformed configuration, exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/util/resolver_api.c:198
+#: src/util/resolver_api.c:201
 #, 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:216
+#: src/util/resolver_api.c:220
 #, fuzzy, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
@@ -8706,17 +9127,17 @@
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/util/resolver_api.c:348
+#: src/util/resolver_api.c:354
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:352
+#: src/util/resolver_api.c:361
 #, 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:908
+#: src/util/resolver_api.c:974
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
@@ -8746,7 +9167,7 @@
 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:892
+#: src/util/server.c:894
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8849,114 +9270,114 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:433
+#: src/util/strings.c:434
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:561
+#: src/util/strings.c:562
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:658
+#: src/util/strings.c:659
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:662
+#: src/util/strings.c:663
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:664
+#: src/util/strings.c:665
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:670
+#: src/util/strings.c:671
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:676
+#: src/util/strings.c:677
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:682
+#: src/util/strings.c:683
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:688
+#: src/util/strings.c:689
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:695
+#: src/util/strings.c:696
 #, fuzzy
 msgid "day"
 msgstr " dagar"
 
-#: src/util/strings.c:697
+#: src/util/strings.c:698
 #, fuzzy
 msgid "days"
 msgstr " dagar"
 
-#: src/util/strings.c:726
+#: src/util/strings.c:727
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1159
+#: src/util/strings.c:1192
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1167
+#: src/util/strings.c:1200
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1173
+#: src/util/strings.c:1206
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1180
+#: src/util/strings.c:1213
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1189
+#: src/util/strings.c:1222
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/util/strings.c:1395 src/util/strings.c:1411
+#: src/util/strings.c:1428 src/util/strings.c:1444
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1420
+#: src/util/strings.c:1453
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/strings.c:1503 src/util/strings.c:1534 src/util/strings.c:1582
-#: src/util/strings.c:1603
+#: src/util/strings.c:1536 src/util/strings.c:1567 src/util/strings.c:1615
+#: src/util/strings.c:1636
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1560
+#: src/util/strings.c:1593
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
 
-#: src/util/strings.c:1612
+#: src/util/strings.c:1645
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1664
+#: src/util/strings.c:1697
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/util/strings.c:1714
+#: src/util/strings.c:1747
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/util/strings.c:1745
+#: src/util/strings.c:1778
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
@@ -9144,23 +9565,143 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573
-#: src/include/gnunet_common.h:581
+#: src/include/gnunet_common.h:586 src/include/gnunet_common.h:593
+#: src/include/gnunet_common.h:601
 #, 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:593
+#: src/include/gnunet_common.h:613
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:620 src/include/gnunet_common.h:629
+#: src/include/gnunet_common.h:640 src/include/gnunet_common.h:649
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid "Client %p disconnected from us.\n"
+#~ msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Could not send message to client (%p)!\n"
+#~ msgstr "Kunde inte skicka begäran till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Successfully created new channel to peer (%s)!\n"
+#~ msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Transmitting service request.\n"
+#~ msgstr "Startade samling \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Could not send message to channel!\n"
+#~ msgstr "Kunde inte skicka begäran till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Could not send service-response message via cadet!)\n"
+#~ msgstr "Kunde inte skicka begäran till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Could not send service-request multipart message to channel!\n"
+#~ msgstr "Kunde inte skicka begäran till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "New incoming channel from peer %s.\n"
+#~ msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#, fuzzy
+#~ msgid "CADET initialized\n"
+#~ msgstr " Anslutning misslyckades\n"
+
+#, fuzzy
+#~ msgid "Reloading sensor definitions from directory `%s'\n"
+#~ msgstr "Ladda ner filer från GNUnet."
+
+#, fuzzy
+#~ msgid "Loaded %d sensors from directory `%s'\n"
+#~ msgstr "Ladda ner filer från GNUnet."
+
+#, fuzzy
+#~ msgid "Failed to receive response from `SENSOR' service."
+#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#, fuzzy
+#~ msgid "Received invalid message from `SENSOR' service."
+#~ msgstr "mottog ogiltigt \"%s\" meddelande: %s.\n"
+
+#, fuzzy
+#~ msgid "# SESSION_CONNECT messages sent"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "# CONNECT messages received"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "# Bluetooth messages defragmented"
+#~ msgstr "# PING-meddelanden skapade"
+
+#, fuzzy
+#~ msgid "# Bluetooth sessions allocated"
+#~ msgstr "# sessionsnycklar accepterade"
+
+#, fuzzy
+#~ msgid "# Bluetooth message fragments sent"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# Bluetooth MAC endpoints allocated"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# HELLO messages received via Bluetooth"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "# fragments received via Bluetooth"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# ACKs received via Bluetooth"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# Bluetooth DATA messages discarded due to CRC32 error"
+#~ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#, fuzzy
+#~ msgid "# DATA messages received via Bluetooth"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "# Bluetooth DATA messages processed"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "# HELLO beacons sent via Bluetooth"
+#~ msgstr "# byte skickade via UDP"
+
+#, fuzzy
+#~ msgid "No UNIXPATH given in configuration!\n"
+#~ msgstr "Kunde inte spara konfiguration!"
+
+#, fuzzy
+#~ msgid "# HELLO messages received via WLAN"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
+
+#, fuzzy
+#~ msgid "# fragments received via WLAN"
+#~ msgstr "# byte mottogs via TCP"
+
+#, fuzzy
+#~ msgid "# DATA messages received via WLAN"
+#~ msgstr "# krypterade PONG-meddelanden mottagna"
+
+#, fuzzy
 #~ msgid "Peer `%s'\n"
 #~ msgstr "Jag är ändpunkt \"%s\".\n"
 
@@ -9173,14 +9714,6 @@
 #~ msgstr "# byte mottagna via HTTP"
 
 #, fuzzy
-#~ msgid "Failed to run `upnpc` command"
-#~ msgstr "Misslyckades att starta samling.\n"
-
-#, fuzzy
-#~ msgid "`upnpc` command not found"
-#~ msgstr "Kommando \"%s\" hittades inte!\n"
-
-#, fuzzy
 #~ msgid "Could not convert `%s' to integer.\n"
 #~ msgstr "Kunde inte ansluta till gnunetd.\n"
 
@@ -9230,10 +9763,6 @@
 #~ msgstr "Skriv ut information om GNUnets motparter."
 
 #, fuzzy
-#~ msgid "Could not find option `%s:%s' in configuration.\n"
-#~ msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
-
-#, fuzzy
 #~ msgid "Peer `%s' disconnected\n"
 #~ msgstr "# av anslutna parter"
 
@@ -9373,10 +9902,6 @@
 #~ msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
 #, fuzzy
-#~ msgid "number of peers to start"
-#~ msgstr "antal iterationer"
-
-#, fuzzy
 #~ msgid "Failed to read or generate private key: %s\n"
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
@@ -9413,10 +9938,6 @@
 #~ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
 #, fuzzy
-#~ msgid "Failed to create new signature"
-#~ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-
-#, fuzzy
 #~ msgid "Failed to put new set of records in database"
 #~ msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
@@ -9522,10 +10043,6 @@
 #~ "Avslutar.\n"
 
 #, fuzzy
-#~ msgid "Could not read blacklist file `%s'\n"
-#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#, fuzzy
 #~ msgid "Failed to read blacklist from `%s'\n"
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
@@ -9558,10 +10075,6 @@
 #~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
 #, fuzzy
-#~ msgid "Failed to connect to datastore service"
-#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#, fuzzy
 #~ msgid "Failed to parse URI `%s' from KBlock!\n"
 #~ msgstr "Fil \"%s\" har URI: %s\n"
 
@@ -9850,10 +10363,6 @@
 #~ msgstr "# av anslutna parter"
 
 #, fuzzy
-#~ msgid "# peers disconnected due to global disconnect"
-#~ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
-
-#, fuzzy
 #~ msgid "# unexpected CONNECT_ACK messages"
 #~ msgstr "skicka ANTAL meddelanden"
 
@@ -9862,10 +10371,6 @@
 #~ msgstr "# sessionsnycklar accepterade"
 
 #, fuzzy
-#~ msgid "# wlan pending fragments"
-#~ msgstr "# byte mottogs via TCP"
-
-#, fuzzy
 #~ msgid "# wlan whole messages received"
 #~ msgstr "# krypterade PONG-meddelanden mottagna"
 
@@ -10280,12 +10785,6 @@
 #~ msgid "output in gnuplot format"
 #~ msgstr "utdata i gnuplot-format"
 
-#~ msgid "number of messages to use per iteration"
-#~ msgstr "antal meddelanden att använda per iteration"
-
-#~ msgid "message size"
-#~ msgstr "meddelandestorlek"
-
 #~ msgid "number of messages in a message block"
 #~ msgstr "antal meddelanden i ett meddelandeblock"
 
@@ -10307,9 +10806,6 @@
 #~ msgid "\tmin      %u\n"
 #~ msgstr "\tmin      %u\n"
 
-#~ msgid "Output format not known, this should not happen.\n"
-#~ msgstr "Utdataformat är inte känt, detta bör inte hända.\n"
-
 #, fuzzy
 #~ msgid "# bytes received in plaintext of type %d"
 #~ msgstr "# byte mottagna av typen %d"
@@ -10777,10 +11273,6 @@
 #~ msgstr "Nätverksgränssnitt:"
 
 #, fuzzy
-#~ msgid "General options"
-#~ msgstr "Visa alla alternativ"
-
-#, fuzzy
 #~ msgid "Options related to gnunet-gtk"
 #~ msgstr "Ej ansluten till gnunetd."
 
@@ -10836,9 +11328,6 @@
 #~ msgid "Failed to send `%s'.  Closing connection.\n"
 #~ msgstr "Misslyckades att skicka \"%s\".  Stänger anslutning.\n"
 
-#~ msgid "Received invalid `%s' request (wrong table)\n"
-#~ msgstr "Mottog ogiltig \"%s\" begäran (fel tabell)\n"
-
 #~ msgid "gnunetd signaled error in response to `%s' message\n"
 #~ msgstr "gnunetd signalerade fel i svar till \"%s\" meddelande\n"
 

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2014-12-24 15:11:43 UTC (rev 34787)
+++ gnunet/po/vi.po     2014-12-24 16:59:19 UTC (rev 34788)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-06-04 18:25+0200\n"
+"POT-Creation-Date: 2014-12-09 00:23+0100\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -362,149 +362,149 @@
 msgid "Received last message for %s \n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:2793 src/ats/gnunet-ats-solver-eval.c:2827
-#: src/ats/gnunet-service-ats_addresses.c:1675
-#: src/ats/gnunet-service-ats_addresses.c:1719
+#: src/ats/gnunet-ats-solver-eval.c:2804 src/ats/gnunet-ats-solver-eval.c:2838
+#: src/ats/gnunet-service-ats_addresses.c:1781
+#: src/ats/gnunet-service-ats_addresses.c:1825
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#: src/ats/gnunet-service-ats_addresses.c:1682
+#: src/ats/gnunet-ats-solver-eval.c:2810
+#: src/ats/gnunet-service-ats_addresses.c:1788
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2806
-#: src/ats/gnunet-service-ats_addresses.c:1690
+#: src/ats/gnunet-ats-solver-eval.c:2817
+#: src/ats/gnunet-service-ats_addresses.c:1796
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2833
-#: src/ats/gnunet-service-ats_addresses.c:1726
+#: src/ats/gnunet-ats-solver-eval.c:2844
+#: src/ats/gnunet-service-ats_addresses.c:1832
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#: src/ats/gnunet-service-ats_addresses.c:1734
+#: src/ats/gnunet-ats-solver-eval.c:2851
+#: src/ats/gnunet-service-ats_addresses.c:1840
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3397
-#: src/ats-tests/gnunet-solver-eval.c:919
+#: src/ats/gnunet-ats-solver-eval.c:3410
+#: src/ats-tests/gnunet-solver-eval.c:918
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3400
-#: src/ats-tests/gnunet-solver-eval.c:922
-#: src/ats-tests/gnunet-solver-eval.c:925
+#: src/ats/gnunet-ats-solver-eval.c:3413
+#: src/ats-tests/gnunet-solver-eval.c:921
+#: src/ats-tests/gnunet-solver-eval.c:924
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3403
+#: src/ats/gnunet-ats-solver-eval.c:3416
 msgid "be verbose"
 msgstr "xuất chi tiết"
 
-#: src/ats/gnunet-ats-solver-eval.c:3406
+#: src/ats/gnunet-ats-solver-eval.c:3419
 #, fuzzy
 msgid "print logging"
 msgstr "Theo dõi"
 
-#: src/ats/gnunet-ats-solver-eval.c:3409
+#: src/ats/gnunet-ats-solver-eval.c:3422
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3412
+#: src/ats/gnunet-ats-solver-eval.c:3425
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1912
+#: src/ats/gnunet-service-ats_addresses.c:2039
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1915
+#: src/ats/gnunet-service-ats_addresses.c:2042
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1938
+#: src/ats/gnunet-service-ats_addresses.c:2065
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/ats/plugin_ats_mlp.c:949
+#: src/ats/plugin_ats_mlp.c:1344
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1542
+#: src/ats/plugin_ats_mlp.c:1941
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/ats/plugin_ats_mlp.c:1589
+#: src/ats/plugin_ats_mlp.c:1988
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2299
+#: src/ats/plugin_ats_mlp.c:2704
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2339 src/ats/plugin_ats_mlp.c:2356
-#: src/ats/plugin_ats_mlp.c:2388 src/ats/plugin_ats_mlp.c:2406
-#: src/ats/plugin_ats_mlp.c:2425 src/ats/plugin_ats_proportional.c:458
-#: src/ats/plugin_ats_proportional.c:475 src/ats/plugin_ats_ril.c:2220
-#: src/ats/plugin_ats_ril.c:2237 src/ats/plugin_ats_ril.c:2254
-#: src/ats/plugin_ats_ril.c:2271 src/ats/plugin_ats_ril.c:2288
-#: src/ats/plugin_ats_ril.c:2305 src/ats/plugin_ats_ril.c:2322
-#: src/ats/plugin_ats_ril.c:2339
+#: src/ats/plugin_ats_mlp.c:2744 src/ats/plugin_ats_mlp.c:2761
+#: src/ats/plugin_ats_mlp.c:2793 src/ats/plugin_ats_mlp.c:2811
+#: src/ats/plugin_ats_mlp.c:2830 src/ats/plugin_ats_proportional.c:1989
+#: src/ats/plugin_ats_proportional.c:2010 src/ats/plugin_ats_ril.c:2718
+#: src/ats/plugin_ats_ril.c:2735 src/ats/plugin_ats_ril.c:2752
+#: src/ats/plugin_ats_ril.c:2769 src/ats/plugin_ats_ril.c:2786
+#: src/ats/plugin_ats_ril.c:2803 src/ats/plugin_ats_ril.c:2820
+#: src/ats/plugin_ats_ril.c:2837
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/ats/plugin_ats_mlp.c:2512
+#: src/ats/plugin_ats_mlp.c:2917
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2521
+#: src/ats/plugin_ats_mlp.c:2926
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2937
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2540
+#: src/ats/plugin_ats_mlp.c:2945
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2551
+#: src/ats/plugin_ats_mlp.c:2956
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1819
+#: src/ats/plugin_ats_proportional.c:1847
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
@@ -542,7 +542,7 @@
 msgid "Could not connect master [%u] and slave [%u]\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:673
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:677
 #, fuzzy
 msgid "Initialization failed, shutdown\n"
 msgstr "Lỗi sơ khởi cơ chế phần bổ sung: %s\n"
@@ -564,169 +564,188 @@
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:169
+#: src/ats-tool/gnunet-ats.c:296
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:171
+#: src/ats-tool/gnunet-ats.c:300
 #, c-format
-msgid "ATS returned results for %u addresses\n"
+msgid "ATS returned stat_results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:258
+#: src/ats-tool/gnunet-ats.c:378
+msgid "active "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:378
+msgid "inactive "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:427
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr "Đồng đẳng « %s » có mức tin cậy %8u và địa chỉ « %s »\n"
 
-#: src/ats-tool/gnunet-ats.c:467
+#: src/ats-tool/gnunet-ats.c:544
+#, fuzzy, c-format
+msgid "Removed address of peer `%s' with plugin `%s'\n"
+msgstr "Đã nạp truyền tải « %s »\n"
+
+#: src/ats-tool/gnunet-ats.c:747
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:487 src/namestore/gnunet-namestore.c:639
-#: src/transport/gnunet-transport.c:1349
+#: src/ats-tool/gnunet-ats.c:779 src/namestore/gnunet-namestore.c:700
+#: src/transport/gnunet-transport.c:1855
+#: src/transport/gnunet-transport-profiler.c:531
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/ats-tool/gnunet-ats.c:499 src/transport/gnunet-transport.c:1358
+#: src/ats-tool/gnunet-ats.c:793 src/transport/gnunet-transport.c:1864
+#: src/transport/gnunet-transport-profiler.c:549
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:803
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:524 src/ats-tool/gnunet-ats.c:543
-#: src/ats-tool/gnunet-ats.c:560 src/ats-tool/gnunet-ats.c:597
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:825 src/ats-tool/gnunet-ats.c:851
+#: src/ats-tool/gnunet-ats.c:879 src/ats-tool/gnunet-ats.c:925
+#, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/ats-tool/gnunet-ats.c:532 src/ats-tool/gnunet-ats.c:549
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:837 src/ats-tool/gnunet-ats.c:863
+#, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/ats-tool/gnunet-ats.c:569
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:891
+#, fuzzy
 msgid "No preference type given!\n"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/ats-tool/gnunet-ats.c:574
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:898
+#, fuzzy
 msgid "No peer given!\n"
 msgstr "chưa đưa ra tên"
 
-#: src/ats-tool/gnunet-ats.c:590
+#: src/ats-tool/gnunet-ats.c:916
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:648
+#: src/ats-tool/gnunet-ats.c:984
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:650
+#: src/ats-tool/gnunet-ats.c:986
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:653
+#: src/ats-tool/gnunet-ats.c:989
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/ats-tool/gnunet-ats.c:655
+#: src/ats-tool/gnunet-ats.c:991
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:657
+#: src/ats-tool/gnunet-ats.c:993
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/ats-tool/gnunet-ats.c:659
+#: src/ats-tool/gnunet-ats.c:995
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:661
+#: src/ats-tool/gnunet-ats.c:997
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:664
+#: src/ats-tool/gnunet-ats.c:1000
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:666
+#: src/ats-tool/gnunet-ats.c:1002
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:669
+#: src/ats-tool/gnunet-ats.c:1005
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:676
+#: src/ats-tool/gnunet-ats.c:1012
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:357
+#: src/cadet/gnunet-cadet.c:376
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/cadet/gnunet-cadet.c:607
+#: src/cadet/gnunet-cadet.c:626
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/cadet/gnunet-cadet.c:650
+#: src/cadet/gnunet-cadet.c:669
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/cadet/gnunet-cadet.c:716
+#: src/cadet/gnunet-cadet.c:735
 msgid "You must NOT give a TARGETwhen using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:807
+#: src/cadet/gnunet-cadet.c:832
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:810
+#: src/cadet/gnunet-cadet.c:835
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:816
+#: src/cadet/gnunet-cadet.c:838
+msgid "dump debug information to STDERR"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:844
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:819
+#: src/cadet/gnunet-cadet.c:847
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:822
+#: src/cadet/gnunet-cadet.c:850
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:825
+#: src/cadet/gnunet-cadet.c:853
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-cadet.c:828
+#: src/cadet/gnunet-cadet.c:856
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/cadet/gnunet-service-cadet_peer.c:429
+#: src/cadet/gnunet-service-cadet_peer.c:496
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -741,8 +760,8 @@
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:443
-#: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
-#: src/set/gnunet-set-profiler.c:292
+#: src/set/gnunet-set-profiler.c:289 src/set/gnunet-set-profiler.c:292
+#: src/set/gnunet-set-profiler.c:295
 #, fuzzy
 msgid "number of values"
 msgstr "số lần lặp lại"
@@ -761,270 +780,271 @@
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:557
-#: src/conversation/conversation_api_call.c:470
+#: src/conversation/conversation_api.c:493
+#: src/conversation/conversation_api_call.c:475
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/conversation_api.c:681
+#: src/conversation/conversation_api.c:617
 #, fuzzy
 msgid "number too large"
 msgstr "số lần lặp lại"
 
-#: src/conversation/gnunet-conversation.c:264
+#: src/conversation/gnunet-conversation.c:269
 #, c-format
 msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:286
+#: src/conversation/gnunet-conversation.c:291
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:319
+#: src/conversation/gnunet-conversation.c:323
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:324
+#: src/conversation/gnunet-conversation.c:328
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:342
+#: src/conversation/gnunet-conversation.c:346
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:356
+#: src/conversation/gnunet-conversation.c:360
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/conversation/gnunet-conversation.c:368
+#: src/conversation/gnunet-conversation.c:372
 #, c-format
 msgid ""
 "Phone active on line %u.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:390
+#: src/conversation/gnunet-conversation.c:394
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:397
+#: src/conversation/gnunet-conversation.c:401
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/conversation/gnunet-conversation.c:404
+#: src/conversation/gnunet-conversation.c:408
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/conversation/gnunet-conversation.c:411
-msgid "Call terminated\n"
+#: src/conversation/gnunet-conversation.c:416
+#, c-format
+msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:417
+#: src/conversation/gnunet-conversation.c:425
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:423
+#: src/conversation/gnunet-conversation.c:431
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:428
+#: src/conversation/gnunet-conversation.c:436
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:495
+#: src/conversation/gnunet-conversation.c:504
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "Không rõ câu lệnh « %s ».\n"
 
-#: src/conversation/gnunet-conversation.c:511
-#: src/conversation/gnunet-conversation.c:525
+#: src/conversation/gnunet-conversation.c:520
+#: src/conversation/gnunet-conversation.c:534
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:518
-#: src/conversation/gnunet-conversation.c:575
+#: src/conversation/gnunet-conversation.c:527
+#: src/conversation/gnunet-conversation.c:584
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:533
-#: src/conversation/gnunet-conversation.c:588
+#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:597
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:544
+#: src/conversation/gnunet-conversation.c:552
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:599
+#: src/conversation/gnunet-conversation.c:608
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:625
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:647
+#: src/conversation/gnunet-conversation.c:655
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:670
+#: src/conversation/gnunet-conversation.c:678
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:675
+#: src/conversation/gnunet-conversation.c:683
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:681
-#: src/conversation/gnunet-conversation.c:705
+#: src/conversation/gnunet-conversation.c:689
+#: src/conversation/gnunet-conversation.c:713
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:686
+#: src/conversation/gnunet-conversation.c:694
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:695
+#: src/conversation/gnunet-conversation.c:703
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/conversation/gnunet-conversation.c:700
+#: src/conversation/gnunet-conversation.c:708
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:719
+#: src/conversation/gnunet-conversation.c:727
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:725
+#: src/conversation/gnunet-conversation.c:733
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/conversation/gnunet-conversation.c:753
-#: src/conversation/gnunet-conversation.c:768
+#: src/conversation/gnunet-conversation.c:761
+#: src/conversation/gnunet-conversation.c:776
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:801
-#: src/conversation/gnunet-conversation.c:817
+#: src/conversation/gnunet-conversation.c:809
+#: src/conversation/gnunet-conversation.c:825
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:832
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:833
+#: src/conversation/gnunet-conversation.c:841
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:850
+#: src/conversation/gnunet-conversation.c:858
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:885
+#: src/conversation/gnunet-conversation.c:893
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:893
+#: src/conversation/gnunet-conversation.c:901
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:910
+#: src/conversation/gnunet-conversation.c:918
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:937
+#: src/conversation/gnunet-conversation.c:944
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:939
+#: src/conversation/gnunet-conversation.c:946
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:941
+#: src/conversation/gnunet-conversation.c:948
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:943
+#: src/conversation/gnunet-conversation.c:950
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:945
+#: src/conversation/gnunet-conversation.c:952
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:947
+#: src/conversation/gnunet-conversation.c:954
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:949
+#: src/conversation/gnunet-conversation.c:956
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:951
+#: src/conversation/gnunet-conversation.c:958
 #, fuzzy
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat"
 
-#: src/conversation/gnunet-conversation.c:953
+#: src/conversation/gnunet-conversation.c:960
 msgid "Use `/help command' to get help for a specific command"
 msgstr "Gõ chuỗi « /help LỆNH » để xem trợ giúp về lệnh đó"
 
-#: src/conversation/gnunet-conversation.c:1151
+#: src/conversation/gnunet-conversation.c:1168
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/conversation/gnunet-conversation.c:1164
+#: src/conversation/gnunet-conversation.c:1181
 #, fuzzy, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr "Biệt hiệu « %s » bị xoá.\n"
 
-#: src/conversation/gnunet-conversation.c:1199
+#: src/conversation/gnunet-conversation.c:1216
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/conversation/gnunet-conversation.c:1223
+#: src/conversation/gnunet-conversation.c:1240
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/conversation/gnunet-conversation.c:1249
+#: src/conversation/gnunet-conversation.c:1266
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1252
+#: src/conversation/gnunet-conversation.c:1269
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1276
+#: src/conversation/gnunet-conversation.c:1295
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1052,6 +1072,7 @@
 
 #: src/conversation/gnunet-conversation-test.c:248
 #: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
+#: src/sensordashboard/gnunet-sensordashboard.c:70
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr ""
@@ -1061,63 +1082,63 @@
 msgid "pa_stream_write() failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:587
+#: src/conversation/gnunet-helper-audio-playback.c:589
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:612
+#: src/conversation/gnunet-helper-audio-playback.c:614
 #: src/conversation/gnunet-helper-audio-record.c:545
 #, fuzzy
 msgid "Connection established.\n"
 msgstr "Thu thập bị dừng.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:617
+#: src/conversation/gnunet-helper-audio-playback.c:619
 #: src/conversation/gnunet-helper-audio-record.c:550
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "SMTP: « %s » bị lỗi: %s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:631
+#: src/conversation/gnunet-helper-audio-playback.c:633
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:644
+#: src/conversation/gnunet-helper-audio-playback.c:646
 #: src/conversation/gnunet-helper-audio-record.c:576
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:665
+#: src/conversation/gnunet-helper-audio-playback.c:667
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:671
+#: src/conversation/gnunet-helper-audio-playback.c:673
 #: src/conversation/gnunet-helper-audio-record.c:605
 #, fuzzy
 msgid "pa_mainloop_new() failed.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:685
+#: src/conversation/gnunet-helper-audio-playback.c:687
 #: src/conversation/gnunet-helper-audio-record.c:620
 #, fuzzy
 msgid "pa_context_new() failed.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:692
+#: src/conversation/gnunet-helper-audio-playback.c:694
 #: src/conversation/gnunet-helper-audio-record.c:626
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/conversation/gnunet-helper-audio-playback.c:698
+#: src/conversation/gnunet-helper-audio-playback.c:700
 #: src/conversation/gnunet-helper-audio-record.c:632
 #, fuzzy
 msgid "pa_mainloop_run() failed.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:768
+#: src/conversation/gnunet-helper-audio-playback.c:770
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
@@ -1186,17 +1207,17 @@
 msgid "Failed to allocate %d bytes for second packet\n"
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/conversation/gnunet-service-conversation.c:852
+#: src/conversation/gnunet-service-conversation.c:853
 msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:943
+#: src/conversation/gnunet-service-conversation.c:944
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1349
+#: src/conversation/gnunet-service-conversation.c:1351
 #, fuzzy, c-format
 msgid "Received incoming Cadet channel on port %u\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
@@ -1262,7 +1283,7 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:705
+#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:761
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
@@ -1273,7 +1294,7 @@
 msgid "Failed to connect to CORE service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:1590
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2115
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -1308,150 +1329,150 @@
 msgid "# bytes of messages of type %u received"
 msgstr "# các byte nhiễu được nhận"
 
-#: src/core/gnunet-service-core_kx.c:549
+#: src/core/gnunet-service-core_kx.c:565
 msgid "# bytes encrypted"
 msgstr "# các byte đã mã hoá"
 
-#: src/core/gnunet-service-core_kx.c:601
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:688
+#: src/core/gnunet-service-core_kx.c:703
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:732
+#: src/core/gnunet-service-core_kx.c:747
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:832
+#: src/core/gnunet-service-core_kx.c:847
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:839
+#: src/core/gnunet-service-core_kx.c:854
 #, fuzzy
 msgid "# ephemeral keys received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_kx.c:873
+#: src/core/gnunet-service-core_kx.c:888
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:884
+#: src/core/gnunet-service-core_kx.c:899
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages received"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_kx.c:983
+#: src/core/gnunet-service-core_kx.c:998
 #: src/transport/gnunet-service-transport_validation.c:1016
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:991
+#: src/core/gnunet-service-core_kx.c:1006
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_kx.c:1018
+#: src/core/gnunet-service-core_kx.c:1033
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1035
+#: src/core/gnunet-service-core_kx.c:1049
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1061
+#: src/core/gnunet-service-core_kx.c:1075
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1072
+#: src/core/gnunet-service-core_kx.c:1086
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# các thông báo PING nhập thô được gửi"
 
-#: src/core/gnunet-service-core_kx.c:1139
-#: src/transport/gnunet-service-transport_validation.c:1328
+#: src/core/gnunet-service-core_kx.c:1153
+#: src/transport/gnunet-service-transport_validation.c:1359
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1145
+#: src/core/gnunet-service-core_kx.c:1159
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1150
+#: src/core/gnunet-service-core_kx.c:1164
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_kx.c:1180
+#: src/core/gnunet-service-core_kx.c:1194
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1215
+#: src/core/gnunet-service-core_kx.c:1229
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1226
+#: src/core/gnunet-service-core_kx.c:1240
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/core/gnunet-service-core_kx.c:1233
+#: src/core/gnunet-service-core_kx.c:1247
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1374
+#: src/core/gnunet-service-core_kx.c:1386
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1381
+#: src/core/gnunet-service-core_kx.c:1393
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1384
+#: src/core/gnunet-service-core_kx.c:1396
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1430
-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1442
+#: src/core/gnunet-service-core_kx.c:1467
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1442
+#: src/core/gnunet-service-core_kx.c:1454
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1484
+#: src/core/gnunet-service-core_kx.c:1496
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1492
+#: src/core/gnunet-service-core_kx.c:1504
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1527
+#: src/core/gnunet-service-core_kx.c:1539
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
@@ -1479,14 +1500,13 @@
 #: src/core/gnunet-service-core_sessions.c:328
 #: src/dht/gnunet-service-dht_neighbours.c:662
 #: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:3586
-#: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
-#: src/topology/gnunet-daemon-topology.c:707
-#: src/topology/gnunet-daemon-topology.c:808
+#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1517
+#: src/topology/gnunet-daemon-topology.c:734
+#: src/topology/gnunet-daemon-topology.c:835
 #: src/transport/gnunet-service-transport_neighbours.c:917
 #: src/transport/gnunet-service-transport_neighbours.c:1141
-#: src/transport/gnunet-service-transport_neighbours.c:3146
-#: src/transport/gnunet-service-transport_neighbours.c:3449
+#: src/transport/gnunet-service-transport_neighbours.c:3177
+#: src/transport/gnunet-service-transport_neighbours.c:3491
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
@@ -1562,7 +1582,7 @@
 msgid "Heap datacache running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/datacache/plugin_datacache_postgres.c:392
+#: src/datacache/plugin_datacache_postgres.c:391
 msgid "Postgres datacache running\n"
 msgstr ""
 
@@ -1582,24 +1602,24 @@
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
-#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:44
+#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:622
+#: src/include/gnunet_common.h:631 src/scalarproduct/scalarproduct.h:35
 #, 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:450
+#: src/datacache/plugin_datacache_sqlite.c:449
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:484
-#: src/datastore/plugin_datastore_sqlite.c:404
-#: src/namecache/plugin_namecache_sqlite.c:295
-#: src/namestore/plugin_namestore_sqlite.c:327
+#: src/datacache/plugin_datacache_sqlite.c:483
+#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/namecache/plugin_namecache_sqlite.c:292
+#: src/namestore/plugin_namestore_sqlite.c:324
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:491
+#: src/datacache/plugin_datacache_sqlite.c:490
 #, fuzzy, c-format
 msgid "Failed to close statement %p: %d\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -1912,14 +1932,14 @@
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:824
+#: src/datastore/plugin_datastore_postgres.c:832
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:860
+#: src/datastore/plugin_datastore_postgres.c:868
 #: src/namecache/plugin_namecache_postgres.c:414
 #: src/namestore/plugin_namestore_postgres.c:569
 msgid "Postgres database running\n"
@@ -1936,31 +1956,31 @@
 #: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
-#: src/peerstore/plugin_peerstore_sqlite.c:434
-#: src/psycstore/plugin_psycstore_sqlite.c:319
+#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/psycstore/plugin_psycstore_sqlite.c:329
 #, 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:663
+#: src/datastore/plugin_datastore_sqlite.c:661
 #, 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:1156
+#: src/datastore/plugin_datastore_sqlite.c:1154
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1175
+#: src/datastore/plugin_datastore_sqlite.c:1173
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1215
-#: src/namecache/plugin_namecache_sqlite.c:583
-#: src/namestore/plugin_namestore_sqlite.c:719
+#: src/datastore/plugin_datastore_sqlite.c:1213
+#: src/namecache/plugin_namecache_sqlite.c:580
+#: src/namestore/plugin_namestore_sqlite.c:716
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -1969,7 +1989,7 @@
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:376
+#: src/dht/dht_api.c:403
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -2017,7 +2037,7 @@
 
 #: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:939
 #: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
@@ -2035,6 +2055,53 @@
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
+#: src/dht/gnunet_dht_profiler.c:1392
+#: src/testbed/gnunet-testbed-profiler.c:267
+#, fuzzy, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "tăng sổ tối đa các kết nối TCP/IP"
+
+#: src/dht/gnunet_dht_profiler.c:1417
+#, fuzzy
+msgid "number of peers to start"
+msgstr "số lần lặp lại"
+
+#: src/dht/gnunet_dht_profiler.c:1420
+msgid ""
+"maximum number of times we try to search for successor circle formation (0 "
+"for R5N)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:864
+#: src/testbed/gnunet-testbed-profiler.c:306
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1426
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1429
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1432
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1435
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1438
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1456
+#, fuzzy
+msgid "Measure quality and performance of the DHT service."
+msgstr "Không thể truy cập đến dịch vụ"
+
 #: src/dht/gnunet-dht-put.c:118
 #, fuzzy
 msgid "PUT request sent with key"
@@ -2083,112 +2150,112 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:176
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:193
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-xdht_clients.c:838
+#: src/dht/gnunet-service-xdht_clients.c:844
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:925
+#: src/dht/gnunet-service-xdht_clients.c:928
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
 #: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-xdht_clients.c:1010
+#: src/dht/gnunet-service-xdht_clients.c:993
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-xdht_clients.c:1211
+#: src/dht/gnunet-service-xdht_clients.c:1195
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
 #: src/dht/gnunet-service-dht_clients.c:1040
-#: src/dht/gnunet-service-xdht_clients.c:498
+#: src/dht/gnunet-service-xdht_clients.c:503
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1053
-#: src/dht/gnunet-service-xdht_clients.c:511
+#: src/dht/gnunet-service-xdht_clients.c:517
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1090
-#: src/dht/gnunet-service-xdht_clients.c:548
+#: src/dht/gnunet-service-xdht_clients.c:554
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1113
-#: src/dht/gnunet-service-xdht_clients.c:571
+#: src/dht/gnunet-service-xdht_clients.c:577
 msgid "# RESULTS queued for clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1167
 #: src/dht/gnunet-service-dht_clients.c:1210
-#: src/dht/gnunet-service-xdht_clients.c:625
-#: src/dht/gnunet-service-xdht_clients.c:668
+#: src/dht/gnunet-service-xdht_clients.c:631
+#: src/dht/gnunet-service-xdht_clients.c:674
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1177
-#: src/dht/gnunet-service-xdht_clients.c:635
+#: src/dht/gnunet-service-xdht_clients.c:641
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:68
-#: src/dht/gnunet-service-xdht_datacache.c:69
+#: src/dht/gnunet-service-xdht_datacache.c:71
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# các byte kiểu %d được nhận"
 
 #: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-xdht_datacache.c:79
+#: src/dht/gnunet-service-xdht_datacache.c:82
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:213
+#: src/dht/gnunet-service-xdht_datacache.c:221
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:244
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:240
+#: src/dht/gnunet-service-xdht_datacache.c:250
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:246
+#: src/dht/gnunet-service-xdht_datacache.c:256
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:258
+#: src/dht/gnunet-service-xdht_datacache.c:268
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:261
+#: src/dht/gnunet-service-xdht_datacache.c:271
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:234
-#: src/dht/gnunet-service-xdht_datacache.c:298
+#: src/dht/gnunet-service-xdht_datacache.c:309
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
@@ -2209,18 +2276,18 @@
 msgstr "# các thông báo PING được tạo"
 
 #: src/dht/gnunet-service-dht_neighbours.c:764
+#: src/dht/gnunet-service-xdht_neighbours.c:6055
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# các thông báo được chắp liền"
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:745
+#: src/dht/gnunet-service-xdht_neighbours.c:1012
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:786
 #, fuzzy
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
@@ -2254,15 +2321,15 @@
 #: src/dht/gnunet-service-dht_neighbours.c:1328
 #: src/dht/gnunet-service-dht_neighbours.c:1452
 #: src/dht/gnunet-service-dht_neighbours.c:1557
-#: src/dht/gnunet-service-xdht_neighbours.c:843
-#: src/dht/gnunet-service-xdht_neighbours.c:910
-#: src/dht/gnunet-service-xdht_neighbours.c:980
-#: src/dht/gnunet-service-xdht_neighbours.c:1040
-#: src/dht/gnunet-service-xdht_neighbours.c:1098
-#: src/dht/gnunet-service-xdht_neighbours.c:1157
-#: src/dht/gnunet-service-xdht_neighbours.c:1218
-#: src/dht/gnunet-service-xdht_neighbours.c:1280
-#: src/dht/gnunet-service-xdht_neighbours.c:1341
+#: src/dht/gnunet-service-xdht_neighbours.c:1121
+#: src/dht/gnunet-service-xdht_neighbours.c:1190
+#: src/dht/gnunet-service-xdht_neighbours.c:1240
+#: src/dht/gnunet-service-xdht_neighbours.c:1304
+#: src/dht/gnunet-service-xdht_neighbours.c:1371
+#: src/dht/gnunet-service-xdht_neighbours.c:1433
+#: src/dht/gnunet-service-xdht_neighbours.c:1495
+#: src/dht/gnunet-service-xdht_neighbours.c:1557
+#: src/dht/gnunet-service-xdht_neighbours.c:1617
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
@@ -2369,6 +2436,110 @@
 msgid "# DHT requests combined"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
+#: src/dht/gnunet-service-xdht_neighbours.c:1824
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail_length = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1829
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail[%d]=%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1849
+#, c-format
+msgid ""
+"\n"
+"SUPU************  FRIEND_PEERMAP of %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1859
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1880
+#, c-format
+msgid ""
+"\n"
+"SUPU************  FINGER_TABLE of %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1889
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail_id[%d]=%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1902
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail[%d] = %s "
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:3551
+msgid "# FINGERS_COUNT"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:3692
+#: src/dht/gnunet-service-xdht_neighbours.c:3930
+#: src/dht/gnunet-service-xdht_neighbours.c:4083
+#: src/dht/gnunet-service-xdht_neighbours.c:4233
+#: src/dht/gnunet-service-xdht_neighbours.c:4414
+#: src/dht/gnunet-service-xdht_neighbours.c:4929
+#: src/dht/gnunet-service-xdht_neighbours.c:5323
+#: src/dht/gnunet-service-xdht_neighbours.c:5416
+#: src/dht/gnunet-service-xdht_neighbours.c:5505
+#: src/dht/gnunet-service-xdht_neighbours.c:5609
+#: src/dht/gnunet-service-xdht_neighbours.c:5753
+#: src/dht/gnunet-service-xdht_neighbours.c:5842
+#, fuzzy
+msgid "# Bytes received from other peers"
+msgstr "# các byte kiểu %d được nhận"
+
+#: src/dht/gnunet-service-xdht_routing.c:256
+#, c-format
+msgid ""
+"\n"
+"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:264
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->trail_id = %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:267
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->next_hop = %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:270
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->prev_hop = %s"
+msgstr ""
+
 #: src/dht/plugin_block_dht.c:138
 #, fuzzy, c-format
 msgid "Block not of type %u\n"
@@ -2383,12 +2554,12 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:257
+#: src/dns/dnsparser.c:254
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/dns/dnsparser.c:856
+#: src/dns/dnsparser.c:818
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -2418,15 +2589,15 @@
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:355
+#: src/dns/gnunet-dns-monitor.c:352
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:358
+#: src/dns/gnunet-dns-monitor.c:355
 msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:369
+#: src/dns/gnunet-dns-monitor.c:366
 msgid "Monitor DNS queries."
 msgstr ""
 
@@ -2857,6 +3028,7 @@
 msgstr ""
 
 #: src/fragmentation/defragmentation.c:456
+#: src/transport/plugin_transport_wlan.c:1474
 #, fuzzy
 msgid "# fragments received"
 msgstr "# các mảnh bị loại bỏ"
@@ -2907,71 +3079,71 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/fs/fs_api.c:465
+#: src/fs/fs_api.c:474
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:474
+#: src/fs/fs_api.c:485
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:480
+#: src/fs/fs_api.c:493
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1066
+#: src/fs/fs_api.c:1101
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:1571
+#: src/fs/fs_api.c:1621
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1585
+#: src/fs/fs_api.c:1635
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2242
+#: src/fs/fs_api.c:2293
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2252
+#: src/fs/fs_api.c:2303
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2619
+#: src/fs/fs_api.c:2431 src/fs/fs_api.c:2679
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2395
+#: src/fs/fs_api.c:2449
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2409 src/fs/fs_api.c:2428 src/fs/fs_api.c:2911
+#: src/fs/fs_api.c:2464 src/fs/fs_api.c:2483 src/fs/fs_api.c:2975
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2610
+#: src/fs/fs_api.c:2669
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2855
+#: src/fs/fs_api.c:2918
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2949
+#: src/fs/fs_api.c:3013
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -3086,64 +3258,64 @@
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
+#: src/fs/fs_publish.c:126 src/fs/fs_publish.c:431
 #, 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:667 src/fs/fs_publish.c:684 src/fs/fs_publish.c:723
-#: src/fs/fs_publish.c:744 src/fs/fs_publish.c:768 src/fs/fs_publish.c:914
+#: src/fs/fs_publish.c:683 src/fs/fs_publish.c:700 src/fs/fs_publish.c:739
+#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:934
 #, 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:669
+#: src/fs/fs_publish.c:685
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:681
+#: src/fs/fs_publish.c:697
 #, fuzzy
 msgid "unknown error"
 msgstr "Lỗi không rõ"
 
-#: src/fs/fs_publish.c:725
+#: src/fs/fs_publish.c:741
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:745
+#: src/fs/fs_publish.c:761
 #, fuzzy
 msgid "filename too long"
 msgstr "tên tập tin"
 
-#: src/fs/fs_publish.c:770
+#: src/fs/fs_publish.c:786
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:793
+#: src/fs/fs_publish.c:809
 #, 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:862
+#: src/fs/fs_publish.c:878
 #, 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:868
+#: src/fs/fs_publish.c:884
 #, 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:915
+#: src/fs/fs_publish.c:936
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1151
+#: src/fs/fs_publish.c:1172
 #, 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:1243
+#: src/fs/fs_publish.c:1263
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3153,17 +3325,17 @@
 msgid "Could not connect to datastore."
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/fs/fs_publish_ublock.c:219
+#: src/fs/fs_publish_ublock.c:243
 #, fuzzy
 msgid "Internal error."
 msgstr "Lỗi VR."
 
-#: src/fs/fs_search.c:751 src/fs/fs_search.c:817
+#: src/fs/fs_search.c:778 src/fs/fs_search.c:848
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/fs/fs_search.c:876
+#: src/fs/fs_search.c:907
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3242,81 +3414,81 @@
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:379
+#: src/fs/fs_uri.c:378
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:423
+#: src/fs/fs_uri.c:422
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:438
+#: src/fs/fs_uri.c:437
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:517
+#: src/fs/fs_uri.c:516
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:532
+#: src/fs/fs_uri.c:531
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:542
+#: src/fs/fs_uri.c:541
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:550
+#: src/fs/fs_uri.c:549
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:558
+#: src/fs/fs_uri.c:557
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:563
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:570
+#: src/fs/fs_uri.c:569
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:579
+#: src/fs/fs_uri.c:578
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:584
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:591
+#: src/fs/fs_uri.c:590
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:603
+#: src/fs/fs_uri.c:602
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:642
+#: src/fs/fs_uri.c:641
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:866
+#: src/fs/fs_uri.c:865
 #, 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:872
+#: src/fs/fs_uri.c:871
 #, 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:1057 src/fs/fs_uri.c:1084
+#: src/fs/fs_uri.c:1056 src/fs/fs_uri.c:1083
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1090
+#: src/fs/fs_uri.c:1089
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
@@ -3352,23 +3524,23 @@
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:824
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:886
 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-auto-share.c:741 src/fs/gnunet-publish.c:828
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:890
 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-auto-share.c:744 src/fs/gnunet-publish.c:831
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:893
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:917
 msgid "specify the priority of the content"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:924
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -3443,7 +3615,7 @@
 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:209 src/fs/gnunet-publish.c:286
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:304
 #: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
@@ -3454,7 +3626,7 @@
 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:240 src/fs/gnunet-publish.c:665
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:712
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
@@ -3467,7 +3639,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:856
 #: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -3535,128 +3707,133 @@
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
+#: src/fs/gnunet-publish.c:238 src/fs/gnunet-publish.c:250
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:250
+#: src/fs/gnunet-publish.c:257
 #, 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:260
+#: src/fs/gnunet-publish.c:268
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:273
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/fs/gnunet-publish.c:283
+#: src/fs/gnunet-publish.c:281
+#, fuzzy, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr "Tôi là đồng đẳng « %s ».\n"
+
+#: src/fs/gnunet-publish.c:301
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "Hoàn thành khởi chạy « %s ».\n"
 
-#: src/fs/gnunet-publish.c:401
+#: src/fs/gnunet-publish.c:427
 #, 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:403
+#: src/fs/gnunet-publish.c:429
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Từ khoá cho tập tin « %s »:\n"
 
-#: src/fs/gnunet-publish.c:542
+#: src/fs/gnunet-publish.c:572
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:597
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/fs/gnunet-publish.c:598
+#: src/fs/gnunet-publish.c:631
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/gnunet-publish.c:600
+#: src/fs/gnunet-publish.c:635
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:641
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:610
+#: src/fs/gnunet-publish.c:648
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:614
+#: src/fs/gnunet-publish.c:653
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-publish.c:660
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:625
+#: src/fs/gnunet-publish.c:669
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/gnunet-publish.c:656
+#: src/fs/gnunet-publish.c:701
 #, fuzzy, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/fs/gnunet-publish.c:682
+#: src/fs/gnunet-publish.c:733
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:695
+#: src/fs/gnunet-publish.c:747
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:803
 #, 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:754
+#: src/fs/gnunet-publish.c:810
 #, 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:760
+#: src/fs/gnunet-publish.c:816
 #, 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:768 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:824 src/vpn/gnunet-vpn.c:209
 #, 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:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1387 src/transport/gnunet-transport.c:1417
-#: src/transport/gnunet-transport.c:1447
+#: src/fs/gnunet-publish.c:835 src/fs/gnunet-publish.c:843
+#: src/transport/gnunet-transport.c:1893 src/transport/gnunet-transport.c:1923
+#: src/transport/gnunet-transport.c:1953
 #, 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:835
+#: src/fs/gnunet-publish.c:897
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3664,7 +3841,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:839
+#: src/fs/gnunet-publish.c:901
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3672,11 +3849,11 @@
 "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:843
+#: src/fs/gnunet-publish.c:905
 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-publish.c:846
+#: src/fs/gnunet-publish.c:908
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3684,7 +3861,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:851
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3692,12 +3869,12 @@
 "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:859
+#: src/fs/gnunet-publish.c:921
 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:865
+#: src/fs/gnunet-publish.c:927
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -3705,13 +3882,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:869
+#: src/fs/gnunet-publish.c:931
 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:873
+#: src/fs/gnunet-publish.c:935
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3719,7 +3896,7 @@
 "Đị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:889
+#: src/fs/gnunet-publish.c:951
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3764,24 +3941,26 @@
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:545
+#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:540
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# tổng số định tuyến lỗ hổng thành công"
 
-#: src/fs/gnunet-service-fs.c:645 src/hostlist/gnunet-daemon-hostlist.c:303
-#: src/topology/gnunet-daemon-topology.c:1260
-#: src/topology/gnunet-daemon-topology.c:1267
+#: src/fs/gnunet-service-fs.c:650 src/hostlist/gnunet-daemon-hostlist.c:303
+#: src/sensordashboard/gnunet-service-sensordashboard.c:854
+#: src/sensordashboard/gnunet-service-sensordashboard.c:862
+#: src/topology/gnunet-daemon-topology.c:1287
+#: src/topology/gnunet-daemon-topology.c:1294
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:484
+#: src/fs/gnunet-service-fs_cadet_client.c:494
 #, fuzzy
 msgid "# replies received via cadet"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:498
+#: src/fs/gnunet-service-fs_cadet_client.c:508
 #, fuzzy
 msgid "# replies received via cadet dropped"
 msgstr "# các byte kiểu %d được nhận"
@@ -3791,117 +3970,117 @@
 msgid "# Blocks transferred via cadet"
 msgstr "# các byte được gửi"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:352
+#: src/fs/gnunet-service-fs_cadet_server.c:361
 #, fuzzy
-msgid "# queries received via cadet not answered"
+msgid "# queries received via CADET not answered"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:432
+#: src/fs/gnunet-service-fs_cadet_server.c:441
 #, fuzzy
 msgid "# queries received via cadet"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:476
+#: src/fs/gnunet-service-fs_cadet_server.c:485
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr "# các kết nối dht"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:482
-#: src/fs/gnunet-service-fs_cadet_server.c:522
+#: src/fs/gnunet-service-fs_cadet_server.c:491
+#: src/fs/gnunet-service-fs_cadet_server.c:531
 #, fuzzy
 msgid "# cadet connections active"
 msgstr "# các kết nối dht"
 
-#: src/fs/gnunet-service-fs_cp.c:682
+#: src/fs/gnunet-service-fs_cp.c:698
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:686
+#: src/fs/gnunet-service-fs_cp.c:702
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:721
+#: src/fs/gnunet-service-fs_cp.c:737
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/fs/gnunet-service-fs_cp.c:727
+#: src/fs/gnunet-service-fs_cp.c:743
 #, fuzzy
 msgid "# replies dropped"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301
+#: src/fs/gnunet-service-fs_cp.c:768 src/fs/gnunet-service-fs_cp.c:1317
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:845
+#: src/fs/gnunet-service-fs_cp.c:861
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:898
+#: src/fs/gnunet-service-fs_cp.c:914
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:906
+#: src/fs/gnunet-service-fs_cp.c:922
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:920
+#: src/fs/gnunet-service-fs_cp.c:936
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:958
+#: src/fs/gnunet-service-fs_cp.c:974
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1026
+#: src/fs/gnunet-service-fs_cp.c:1042
 #, 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:1051
+#: src/fs/gnunet-service-fs_cp.c:1067
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1061
+#: src/fs/gnunet-service-fs_cp.c:1077
 #, 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:1139
+#: src/fs/gnunet-service-fs_cp.c:1155
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1173
+#: src/fs/gnunet-service-fs_cp.c:1189
 #, 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:1195
+#: src/fs/gnunet-service-fs_cp.c:1211
 #, 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:1246
+#: src/fs/gnunet-service-fs_cp.c:1262
 #, 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:1270
+#: src/fs/gnunet-service-fs_cp.c:1286
 #, 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:1299
+#: src/fs/gnunet-service-fs_cp.c:1315
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:1670
+#: src/fs/gnunet-service-fs_cp.c:1691
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
@@ -3952,22 +4131,22 @@
 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/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:370
 #, 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:256
+#: src/fs/gnunet-service-fs_lc.c:258
 #, 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:327
+#: src/fs/gnunet-service-fs_lc.c:329
 #, 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:362
+#: src/fs/gnunet-service-fs_lc.c:364
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -4101,7 +4280,7 @@
 msgstr ""
 
 #: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
-#: src/fs/gnunet-service-fs_pr.c:1590
+#: src/fs/gnunet-service-fs_pr.c:1612
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
@@ -4113,11 +4292,11 @@
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1566
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1651
+#: src/fs/gnunet-service-fs_pr.c:1673
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -4169,7 +4348,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:695
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:696
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
@@ -4250,62 +4429,67 @@
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:227
+#: src/gns/gnunet-gns.c:215
 #, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+#, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:308
+#: src/gns/gnunet-gns.c:314
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:347 src/gns/gnunet-gns-helper-service-w32.c:798
+#: src/gns/gnunet-gns.c:353 src/gns/gnunet-gns-helper-service-w32.c:798
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:386 src/gns/gnunet-gns-helper-service-w32.c:828
+#: src/gns/gnunet-gns.c:392 src/gns/gnunet-gns-helper-service-w32.c:828
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:399
+#: src/gns/gnunet-gns.c:405
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:449
+#: src/gns/gnunet-gns.c:455
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:452
+#: src/gns/gnunet-gns.c:458
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns.c:455
+#: src/gns/gnunet-gns.c:461
 #, fuzzy
 msgid "Specify timeout for the lookup"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns.c:458
+#: src/gns/gnunet-gns.c:464
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:461
+#: src/gns/gnunet-gns.c:467
 #, fuzzy
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns.c:464
+#: src/gns/gnunet-gns.c:470
 #, fuzzy
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns.c:478
+#: src/gns/gnunet-gns.c:484
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "Bản ghi lỗi GNUnet"
@@ -4336,8 +4520,8 @@
 #: src/hostlist/gnunet-daemon-hostlist_client.c:931
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1026
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/transport/plugin_transport_http_client.c:1095
-#: src/transport/plugin_transport_http_client.c:1110
+#: src/transport/plugin_transport_http_client.c:595
+#: src/transport/plugin_transport_http_client.c:613
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
@@ -4407,67 +4591,67 @@
 msgid "Failed to pass client to MHD\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2504
+#: src/gns/gnunet-gns-proxy.c:2518
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2533
+#: src/gns/gnunet-gns-proxy.c:2547
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
+#: src/gns/gnunet-gns-proxy.c:2565 src/gns/gnunet-gns-proxy.c:2594
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2631
+#: src/gns/gnunet-gns-proxy.c:2645
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2970
+#: src/gns/gnunet-gns-proxy.c:2984
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3010
+#: src/gns/gnunet-gns-proxy.c:3024
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3072
+#: src/gns/gnunet-gns-proxy.c:3086
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:3113
+#: src/gns/gnunet-gns-proxy.c:3127
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3116
+#: src/gns/gnunet-gns-proxy.c:3130
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3135
+#: src/gns/gnunet-gns-proxy.c:3149
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:862
+#: src/gns/gnunet-service-gns.c:864
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/gns/gnunet-service-gns.c:870
+#: src/gns/gnunet-service-gns.c:872
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/gns/gnunet-service-gns.c:903
+#: src/gns/gnunet-service-gns.c:905
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/gns/gnunet-service-gns.c:919
+#: src/gns/gnunet-service-gns.c:921
 #, fuzzy
 msgid "valid public key required"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
@@ -4482,190 +4666,216 @@
 msgid "Failed to connect to the DNS service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:832
+#: src/gns/gnunet-service-gns_resolver.c:650
+#, c-format
+msgid "Protocol `%s' unknown, skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:661
+#, c-format
+msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:854
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:974
+#: src/gns/gnunet-service-gns_resolver.c:996
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1333
+#: src/gns/gnunet-service-gns_resolver.c:1356
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1831
+#: src/gns/gnunet-service-gns_resolver.c:1886
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1855
+#: src/gns/gnunet-service-gns_resolver.c:1910
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2137
+#: src/gns/gnunet-service-gns_resolver.c:2192
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2286
+#: src/gns/gnunet-service-gns_resolver.c:2341
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:151
+#: src/gns/plugin_gnsrecord_gns.c:172
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:180
+#: src/gns/plugin_gnsrecord_gns.c:201
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:222
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:217
+#: src/gns/plugin_gnsrecord_gns.c:245
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:293
+#: src/gns/plugin_gnsrecord_gns.c:280
 #, fuzzy, c-format
+msgid "Unable to parse BOX record string `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:291
+#, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:314
+#: src/gnsrecord/plugin_gnsrecord_dns.c:312
 #, fuzzy, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:336
+#: src/gnsrecord/plugin_gnsrecord_dns.c:334
 #, fuzzy, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:420
+#: src/gnsrecord/plugin_gnsrecord_dns.c:418
 #, fuzzy, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:452
+#: src/gnsrecord/plugin_gnsrecord_dns.c:455
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:471
+#: src/gnsrecord/plugin_gnsrecord_dns.c:474
 #, fuzzy, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:494
+#: src/gnsrecord/plugin_gnsrecord_dns.c:497
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:514
+#: src/gnsrecord/plugin_gnsrecord_dns.c:520
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:529
+#: src/gnsrecord/plugin_gnsrecord_dns.c:535
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:549
+#: src/gnsrecord/plugin_gnsrecord_dns.c:562
 #, fuzzy, c-format
+msgid "Unable to parse SRV record `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:578
+#, fuzzy, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:595
+#, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:567
+#: src/gnsrecord/plugin_gnsrecord_dns.c:619
+#: src/gnsrecord/plugin_gnsrecord_dns.c:635
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/hello/gnunet-hello.c:123
+#: src/hello/gnunet-hello.c:126
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:129
+#: src/hello/gnunet-hello.c:132
 #, fuzzy, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/hello/gnunet-hello.c:137
+#: src/hello/gnunet-hello.c:140
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:144
+#: src/hello/gnunet-hello.c:147
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183
+#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:196
 #, fuzzy, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/hello/gnunet-hello.c:170
+#: src/hello/gnunet-hello.c:173
 #, fuzzy, c-format
 msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr "Không tìm thấy tập tin nào trong thư mục « %s »\n"
 
-#: src/hello/gnunet-hello.c:195
+#: src/hello/gnunet-hello.c:208
 #, fuzzy, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/hello/gnunet-hello.c:203
+#: src/hello/gnunet-hello.c:216
 #, c-format
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:957
+#: src/hello/hello.c:955
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:966
+#: src/hello/hello.c:964
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:976
+#: src/hello/hello.c:974
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/hello/hello.c:986
+#: src/hello/hello.c:984
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/hello/hello.c:1004
+#: src/hello/hello.c:1002
 #, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:1012
+#: src/hello/hello.c:1010
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1031
+#: src/hello/hello.c:1025
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/hello/hello.c:1104
+#: src/hello/hello.c:1098
 #, c-format
 msgid "HELLO URI contained %u addresses, added %u addresses\n"
 msgstr ""
@@ -4837,7 +5047,7 @@
 msgstr "# các byte danh sách máy được trả về"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1581
-#: src/transport/plugin_transport_http_client.c:1866
+#: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
@@ -4861,109 +5071,119 @@
 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/hostlist/gnunet-daemon-hostlist_server.c:143
+#: src/hostlist/gnunet-daemon-hostlist_server.c:165
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:168
+#: src/hostlist/gnunet-daemon-hostlist_server.c:190
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:203
-#: src/hostlist/gnunet-daemon-hostlist_server.c:534
-#: src/peerinfo-tool/gnunet-peerinfo.c:361
-#: src/peerinfo-tool/gnunet-peerinfo.c:430
-#: src/peerinfo-tool/gnunet-peerinfo.c:501
-#: src/topology/gnunet-daemon-topology.c:925
+#: src/hostlist/gnunet-daemon-hostlist_server.c:225
+#: src/hostlist/gnunet-daemon-hostlist_server.c:535
+#: src/peerinfo-tool/gnunet-peerinfo.c:367
+#: src/peerinfo-tool/gnunet-peerinfo.c:452
+#: src/peerinfo-tool/gnunet-peerinfo.c:535
+#: src/topology/gnunet-daemon-topology.c:952
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:227
+#: src/hostlist/gnunet-daemon-hostlist_server.c:249
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:243
+#: src/hostlist/gnunet-daemon-hostlist_server.c:265
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:363
+#: src/hostlist/gnunet-daemon-hostlist_server.c:365
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:366
+#: src/hostlist/gnunet-daemon-hostlist_server.c:368
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:380
+#: src/hostlist/gnunet-daemon-hostlist_server.c:382
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:384
+#: src/hostlist/gnunet-daemon-hostlist_server.c:386
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:391
+#: src/hostlist/gnunet-daemon-hostlist_server.c:393
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:394
+#: src/hostlist/gnunet-daemon-hostlist_server.c:396
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:399
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 #, fuzzy
 msgid "Received request for our hostlist\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:403
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:448
+#: src/hostlist/gnunet-daemon-hostlist_server.c:449
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:496
+#: src/hostlist/gnunet-daemon-hostlist_server.c:497
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:683
-#: src/peerinfo-tool/gnunet-peerinfo.c:650
-#: src/transport/gnunet-service-transport.c:1136
+#: src/hostlist/gnunet-daemon-hostlist_server.c:684
+#: src/peerinfo-tool/gnunet-peerinfo.c:696
+#: src/transport/gnunet-service-transport.c:1127
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:707
+#: src/hostlist/gnunet-daemon-hostlist_server.c:708
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:722
+#: src/hostlist/gnunet-daemon-hostlist_server.c:723
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:760
+#: src/hostlist/gnunet-daemon-hostlist_server.c:736
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr "« %s » không sẵn sàng.\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:749
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
+msgstr "« %s » không sẵn sàng.\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:770
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:780
+#: src/hostlist/gnunet-daemon-hostlist_server.c:790
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:820
+#: src/hostlist/gnunet-daemon-hostlist_server.c:830
 #, 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"
@@ -5070,7 +5290,7 @@
 msgid "No records found for `%s'"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:402
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -5080,7 +5300,7 @@
 msgid "You must specify which zone should be accessed\n"
 msgstr "chỉ ra TRUYỀN_TẢI nào cần được thử nghiệm"
 
-#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:783
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:844
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
@@ -5090,7 +5310,7 @@
 msgid "You must specify a name\n"
 msgstr "Phải ghi rõ tên hiệu\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1020
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1084
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -5099,7 +5319,7 @@
 msgid "spezifies the public key of the zone to look in"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1055
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1116
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
@@ -5114,224 +5334,232 @@
 msgid "Failed to create indices\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/namestore/gnunet-namestore.c:308
+#: src/namestore/gnunet-namestore.c:303
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:337
+#: src/namestore/gnunet-namestore.c:332
 #, fuzzy, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:344
+#: src/namestore/gnunet-namestore.c:339
 #, fuzzy, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:567
+#: src/namestore/gnunet-namestore.c:477 src/namestore/gnunet-namestore.c:485
+#: src/namestore/gnunet-namestore.c:493
 #, c-format
+msgid "A %s record exists already under `%s', no other records can be added.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:507 src/namestore/gnunet-namestore.c:519
+#: src/namestore/gnunet-namestore.c:531
+#, c-format
+msgid "Records already exist under `%s', cannot add `%s' record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:628
+#, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:606
+#: src/namestore/gnunet-namestore.c:667
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:647
+#: src/namestore/gnunet-namestore.c:708
 #, fuzzy, c-format
 msgid "No options given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/namestore/gnunet-namestore.c:658
-#: src/namestore/gnunet-namestore-fcfsd.c:970
+#: src/namestore/gnunet-namestore.c:719
+#: src/namestore/gnunet-namestore-fcfsd.c:984
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/namestore/gnunet-namestore.c:666 src/namestore/gnunet-namestore.c:675
-#: src/namestore/gnunet-namestore.c:692 src/namestore/gnunet-namestore.c:714
-#: src/namestore/gnunet-namestore.c:754
+#: src/namestore/gnunet-namestore.c:727 src/namestore/gnunet-namestore.c:736
+#: src/namestore/gnunet-namestore.c:753 src/namestore/gnunet-namestore.c:775
+#: src/namestore/gnunet-namestore.c:815
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/namestore/gnunet-namestore.c:667 src/namestore/gnunet-namestore.c:676
-#: src/namestore/gnunet-namestore.c:693 src/namestore/gnunet-namestore.c:715
+#: src/namestore/gnunet-namestore.c:728 src/namestore/gnunet-namestore.c:737
+#: src/namestore/gnunet-namestore.c:754 src/namestore/gnunet-namestore.c:776
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:684
+#: src/namestore/gnunet-namestore.c:745
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/namestore/gnunet-namestore.c:704
+#: src/namestore/gnunet-namestore.c:765
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:740
+#: src/namestore/gnunet-namestore.c:801
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:755
+#: src/namestore/gnunet-namestore.c:816
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:803
-#: src/peerinfo-tool/gnunet-peerinfo.c:734
+#: src/namestore/gnunet-namestore.c:868
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/namestore/gnunet-namestore.c:838
+#: src/namestore/gnunet-namestore.c:903
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/namestore/gnunet-namestore.c:878
+#: src/namestore/gnunet-namestore.c:943
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:905
+#: src/namestore/gnunet-namestore.c:970
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:941
+#: src/namestore/gnunet-namestore.c:1006
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/namestore/gnunet-namestore.c:953
+#: src/namestore/gnunet-namestore.c:1018
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1002
+#: src/namestore/gnunet-namestore.c:1066
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1005
+#: src/namestore/gnunet-namestore.c:1069
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1008
+#: src/namestore/gnunet-namestore.c:1072
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1011
+#: src/namestore/gnunet-namestore.c:1075
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1014
+#: src/namestore/gnunet-namestore.c:1078
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/namestore/gnunet-namestore.c:1017
+#: src/namestore/gnunet-namestore.c:1081
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/namestore/gnunet-namestore.c:1023
+#: src/namestore/gnunet-namestore.c:1087
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/namestore/gnunet-namestore.c:1026
+#: src/namestore/gnunet-namestore.c:1090
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1029
+#: src/namestore/gnunet-namestore.c:1093
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1032
+#: src/namestore/gnunet-namestore.c:1096
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1035
+#: src/namestore/gnunet-namestore.c:1099
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1038
-msgid "create record that is pending approval (and thus for now inactive)"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1041
+#: src/namestore/gnunet-namestore.c:1102
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1044
+#: src/namestore/gnunet-namestore.c:1105
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:464
+#: src/namestore/gnunet-namestore-fcfsd.c:478
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:491
+#: src/namestore/gnunet-namestore-fcfsd.c:505
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:525
+#: src/namestore/gnunet-namestore-fcfsd.c:539
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:534
+#: src/namestore/gnunet-namestore-fcfsd.c:548
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:596
+#: src/namestore/gnunet-namestore-fcfsd.c:610
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:652
+#: src/namestore/gnunet-namestore-fcfsd.c:666
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:668
+#: src/namestore/gnunet-namestore-fcfsd.c:682
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:704
+#: src/namestore/gnunet-namestore-fcfsd.c:718
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:712
+#: src/namestore/gnunet-namestore-fcfsd.c:726
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:910
+#: src/namestore/gnunet-namestore-fcfsd.c:924
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:936
+#: src/namestore/gnunet-namestore-fcfsd.c:950
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:978
+#: src/namestore/gnunet-namestore-fcfsd.c:992
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1011
+#: src/namestore/gnunet-namestore-fcfsd.c:1025
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
@@ -5353,65 +5581,57 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:175
-msgid "NAT traversal with ICMP Server timed out.\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:207
+#: src/nat/nat_auto.c:179
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:208
+#: src/nat/nat_auto.c:180
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:229
+#: src/nat/nat_auto.c:201
 #, fuzzy
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/nat/nat_auto.c:284
+#: src/nat/nat_auto.c:249
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:362
+#: src/nat/nat_auto.c:327
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:378
+#: src/nat/nat_auto.c:343
 #, fuzzy, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/nat/nat_auto.c:441
+#: src/nat/nat_auto.c:406
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:442
+#: src/nat/nat_auto.c:407
 msgid "upnpc not found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:472
+#: src/nat/nat_auto.c:437
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:480
+#: src/nat/nat_auto.c:445 src/nat/nat_auto.c:490
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:488
+#: src/nat/nat_auto.c:453 src/nat/nat_auto.c:498
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:527
-msgid "gnunet-helper-nat-client found, enabling it\n"
+#: src/nat/nat_auto.c:483
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:528
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
-msgstr ""
-
 #: src/nat/nat.c:867
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
@@ -5457,6 +5677,85 @@
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
+#: src/nat/nat.c:1575
+msgid "Operation Successful"
+msgstr ""
+
+#: src/nat/nat.c:1577
+msgid "Internal Failure (IPC, ...)"
+msgstr ""
+
+#: src/nat/nat.c:1579
+msgid "Failure in network subsystem, check permissions."
+msgstr ""
+
+#: src/nat/nat.c:1581
+msgid "Encountered timeout while performing operation"
+msgstr ""
+
+#: src/nat/nat.c:1583
+msgid "detected that we are offline"
+msgstr ""
+
+#: src/nat/nat.c:1585
+msgid "`upnpc` command not found"
+msgstr ""
+
+#: src/nat/nat.c:1587
+#, fuzzy
+msgid "Failed to run `upnpc` command"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/nat/nat.c:1589
+msgid "`upnpc' command took too long, process killed"
+msgstr ""
+
+#: src/nat/nat.c:1591
+msgid "`upnpc' command failed to establish port mapping"
+msgstr ""
+
+#: src/nat/nat.c:1593
+msgid "`external-ip' command not found"
+msgstr ""
+
+#: src/nat/nat.c:1595
+#, fuzzy
+msgid "Failed to run `external-ip` command"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/nat/nat.c:1597
+msgid "`external-ip' command output invalid"
+msgstr ""
+
+#: src/nat/nat.c:1599
+msgid "no valid address was returned by `external-ip'"
+msgstr ""
+
+#: src/nat/nat.c:1601
+#, fuzzy
+msgid "Could not determine interface with internal/local network address"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
+#: src/nat/nat.c:1603
+msgid "No functioning gnunet-helper-nat-server installation found"
+msgstr ""
+
+#: src/nat/nat.c:1605
+msgid "NAT test could not be initialized"
+msgstr ""
+
+#: src/nat/nat.c:1607
+msgid "NAT test timeout reached"
+msgstr ""
+
+#: src/nat/nat.c:1609
+msgid "could not register NAT"
+msgstr ""
+
+#: src/nat/nat.c:1611
+msgid "No working gnunet-helper-nat-client installation found"
+msgstr ""
+
 #: src/nat/nat_mini.c:203
 msgid "`external-ip' command not found\n"
 msgstr ""
@@ -5465,17 +5764,17 @@
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:351
+#: src/nat/nat_test.c:360
 #, 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:423
+#: src/nat/nat_test.c:462
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_test.c:453
+#: src/nat/nat_test.c:497
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
@@ -5503,10 +5802,6 @@
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:864 src/testbed/gnunet-testbed-profiler.c:306
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
 #: src/nse/gnunet-nse-profiler.c:867
 msgid "name of the file for writing the main results"
 msgstr ""
@@ -5525,7 +5820,7 @@
 msgstr "Không thể truy cập đến dịch vụ"
 
 #: src/nse/gnunet-service-nse.c:1517
-#: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248
+#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:248
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "Giá trị không nằm trong phạm vi được phép."
@@ -5546,11 +5841,11 @@
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:466
+#: src/peerinfo/gnunet-service-peerinfo.c:468
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:503
+#: src/peerinfo/gnunet-service-peerinfo.c:506
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -5558,56 +5853,56 @@
 "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:653
+#: src/peerinfo/gnunet-service-peerinfo.c:662
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:658
+#: src/peerinfo/gnunet-service-peerinfo.c:668
 #, 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/gnunet-service-peerinfo.c:994
+#: src/peerinfo/gnunet-service-peerinfo.c:1037
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1287
+#: src/peerinfo/gnunet-service-peerinfo.c:1358
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1298
+#: src/peerinfo/gnunet-service-peerinfo.c:1371
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:236
+#: src/peerinfo/peerinfo_api.c:237
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:356 src/sensor/sensor_api.c:519
+#: src/peerinfo/peerinfo_api.c:363
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/peerinfo_api.c:506
+#: src/peerinfo/peerinfo_api.c:519
 #, 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:547 src/peerinfo/peerinfo_api.c:566
-#: src/peerinfo/peerinfo_api.c:581 src/peerinfo/peerinfo_api.c:592
-#: src/peerinfo/peerinfo_api.c:603
+#: src/peerinfo/peerinfo_api.c:563 src/peerinfo/peerinfo_api.c:586
+#: src/peerinfo/peerinfo_api.c:603 src/peerinfo/peerinfo_api.c:616
+#: src/peerinfo/peerinfo_api.c:631
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/peerinfo/peerinfo_api.c:678
+#: src/peerinfo/peerinfo_api.c:720
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -5617,147 +5912,209 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:233
+#: src/peerinfo-tool/gnunet-peerinfo.c:230
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:240
+#: src/peerinfo-tool/gnunet-peerinfo.c:237
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:282
+#: src/peerinfo-tool/gnunet-peerinfo.c:286
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:439
+#: src/peerinfo-tool/gnunet-peerinfo.c:462
 #, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:447
+#: src/peerinfo-tool/gnunet-peerinfo.c:471
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:456
+#: src/peerinfo-tool/gnunet-peerinfo.c:483
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:469
+#: src/peerinfo-tool/gnunet-peerinfo.c:502
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:533
+#: src/peerinfo-tool/gnunet-peerinfo.c:570
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:644
+#: src/peerinfo-tool/gnunet-peerinfo.c:687
 #, fuzzy, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:665 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:718 src/util/gnunet-scrypt.c:224
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:756
+#: src/peerinfo-tool/gnunet-peerinfo.c:816
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:800
+#: src/peerinfo-tool/gnunet-peerinfo.c:865
 msgid "don't resolve host names"
 msgstr "không quyết định các tên máy"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:803
+#: src/peerinfo-tool/gnunet-peerinfo.c:868
 msgid "output only the identity strings"
 msgstr "chỉ xuất những chuỗi nhận diện"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:806
+#: src/peerinfo-tool/gnunet-peerinfo.c:871
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:809
+#: src/peerinfo-tool/gnunet-peerinfo.c:874
 msgid "output our own identity only"
 msgstr "chỉ xuất nhận diện mình"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:812
+#: src/peerinfo-tool/gnunet-peerinfo.c:877
 #, fuzzy
 msgid "list all known peers"
 msgstr "liệt kê mọi bộ tiếp hợp mạng"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:815
+#: src/peerinfo-tool/gnunet-peerinfo.c:880
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:818
+#: src/peerinfo-tool/gnunet-peerinfo.c:883
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:821
+#: src/peerinfo-tool/gnunet-peerinfo.c:886
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:832
+#: src/peerinfo-tool/gnunet-peerinfo.c:900
 #, fuzzy
 msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:128
+#: src/transport/gnunet-service-transport_plugins.c:127
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:133
+#: src/transport/gnunet-service-transport_plugins.c:132
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:165
+#: src/transport/gnunet-service-transport_plugins.c:164
 #, 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/peerstore/gnunet-peerstore.c:97
+#: src/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:486
+#: src/peerstore/gnunet-service-peerstore.c:343
 #, fuzzy
+msgid "Malformed iterate request.\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/peerstore/gnunet-service-peerstore.c:350
+msgid "Sub system not supplied in client iterate request.\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:399
+#, fuzzy
+msgid "Malformed store request from client\n"
+msgstr "Nhận yêu cầu định tuyến\n"
+
+#: src/peerstore/gnunet-service-peerstore.c:407
+msgid "Full key not supplied in client store request\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:427
+#, fuzzy
+msgid "Failed to store requested value, sqlite database error."
+msgstr ""
+"\n"
+"Không nhận được đáp ứng từ gnunetd.\n"
+
+#: src/peerstore/gnunet-service-peerstore.c:509
+msgid "No database backend configured\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:520
+#, fuzzy, c-format
+msgid "Could not load database backend `%s'\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#: src/peerstore/peerstore_api.c:299 src/sensor/sensor_api.c:179
+#, c-format
+msgid "Received an error notification from MQ of type: %d\n"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:370
+msgid "Iteration canceled due to reconnection."
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:635
+#, fuzzy
+msgid "Unexpected iteration response, this should not happen.\n"
+msgstr "Định dạng kết xuất không rõ, điều này không nên xảy ra.\n"
+
+#: src/peerstore/peerstore_api.c:646
+#, fuzzy
 msgid "Error communicating with `PEERSTORE' service."
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/peerstore/peerstore_api.c:503
+#: src/peerstore/peerstore_api.c:665
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:352
-#: src/psycstore/plugin_psycstore_sqlite.c:276
+#: src/peerstore/peerstore_api.c:804
+msgid ""
+"Problem receiving a watch response, no way to determine which request.\n"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:815
+msgid "Received a watch result for a non existing watch.\n"
+msgstr ""
+
+#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/psycstore/plugin_psycstore_sqlite.c:286
 #, fuzzy, c-format
 msgid ""
 "Error executing SQL query: %s\n"
 "  %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:377
-#: src/psycstore/plugin_psycstore_sqlite.c:253
+#: src/peerstore/plugin_peerstore_sqlite.c:401
+#: src/psycstore/plugin_psycstore_sqlite.c:263
 #, fuzzy, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
 "  %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
+#: src/peerstore/plugin_peerstore_sqlite.c:483
+#, fuzzy, c-format
+msgid "Unable to create indices: %s.\n"
+msgstr "Không thể tạo miền tên.\n"
+
 #: src/postgres/postgres.c:59
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
@@ -5768,84 +6125,84 @@
 msgid "Unable to initialize Postgres: %s"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:200
+#: src/psycstore/gnunet-service-psycstore.c:260
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:224
+#: src/psycstore/gnunet-service-psycstore.c:284
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:246
+#: src/psycstore/gnunet-service-psycstore.c:306
 #, fuzzy
 msgid "Failed to store fragment!\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:272
+#: src/psycstore/gnunet-service-psycstore.c:362
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:299
+#: src/psycstore/gnunet-service-psycstore.c:402
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:328
+#: src/psycstore/gnunet-service-psycstore.c:433
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:356
+#: src/psycstore/gnunet-service-psycstore.c:461
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:392
-#: src/psycstore/gnunet-service-psycstore.c:465
+#: src/psycstore/gnunet-service-psycstore.c:497
+#: src/psycstore/gnunet-service-psycstore.c:570
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:408
+#: src/psycstore/gnunet-service-psycstore.c:513
 #, fuzzy
 msgid "Failed to begin modifying state!\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:431
+#: src/psycstore/gnunet-service-psycstore.c:536
 #, fuzzy, c-format
 msgid "Unknown operator: %c\n"
 msgstr "Không rõ thao tác « %s ».\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:441
+#: src/psycstore/gnunet-service-psycstore.c:546
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:479
+#: src/psycstore/gnunet-service-psycstore.c:584
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:495
+#: src/psycstore/gnunet-service-psycstore.c:600
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:515
-#: src/psycstore/gnunet-service-psycstore.c:534
+#: src/psycstore/gnunet-service-psycstore.c:620
+#: src/psycstore/gnunet-service-psycstore.c:639
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:557
-#: src/psycstore/gnunet-service-psycstore.c:608
+#: src/psycstore/gnunet-service-psycstore.c:662
+#: src/psycstore/gnunet-service-psycstore.c:713
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:584
-#: src/psycstore/gnunet-service-psycstore.c:623
+#: src/psycstore/gnunet-service-psycstore.c:689
+#: src/psycstore/gnunet-service-psycstore.c:728
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
@@ -5855,7 +6212,7 @@
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1796
+#: src/psycstore/plugin_psycstore_sqlite.c:1933
 #, fuzzy
 msgid "SQLite database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -6117,338 +6474,347 @@
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:272
-msgid "Duplicate revocation received from peer. Ignored.\n"
-msgstr ""
-
-#: src/revocation/gnunet-service-revocation.c:434
+#: src/revocation/gnunet-service-revocation.c:433
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:486
+#: src/revocation/gnunet-service-revocation.c:483
+#: src/revocation/gnunet-service-revocation.c:730
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:812
+#: src/revocation/gnunet-service-revocation.c:822
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:224
+#: src/rps/gnunet-rps.c:67
+msgid "rps"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:222
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:231
+#: src/scalarproduct/gnunet-scalarproduct.c:229
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:238
-msgid "Please give a session key for --input_key!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:250
+#: src/scalarproduct/gnunet-scalarproduct.c:242
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:261
+#: src/scalarproduct/gnunet-scalarproduct.c:253
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:283
+#: src/scalarproduct/gnunet-scalarproduct.c:275
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:296
+#: src/scalarproduct/gnunet-scalarproduct.c:294
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:345
+#: src/scalarproduct/gnunet-scalarproduct.c:344
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:347
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:350
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:360
+#: src/scalarproduct/gnunet-scalarproduct.c:359
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:678
-#, fuzzy, c-format
-msgid "Client %p disconnected from us.\n"
-msgstr "« %.*s » được kết nối tới « %.*s ».\n"
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1418
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1529
+#, fuzzy
+msgid "Connect to CADET failed\n"
+msgstr " Không kết nối được (lỗi ?)\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:748
-#, fuzzy, c-format
-msgid "Could not send message to client (%p)!\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+msgid "dkg start delay"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:759
-#, c-format
-msgid "Sending session-end notification to client (%p) for session %s\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+msgid "dkg timeout"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:781
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1459
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+msgid "threshold"
+msgstr ""
+
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "also profile decryption"
+msgstr ""
+
+#: src/sensordashboard/gnunet-service-sensordashboard.c:353
 #, fuzzy, c-format
-msgid "Successfully created new channel to peer (%s)!\n"
-msgstr "Không đủ quyền cho « %s ».\n"
+msgid "Error trying to send a message to peer `%s'.\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:818
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1469
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1539
+#: src/sensor/gnunet-sensor.c:162
 #, fuzzy
-msgid "Transmitting service request.\n"
-msgstr "Đang nạp và khởi động dùng « %s ».\n"
+msgid "Retrieve information about all defined sensors"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:830
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
+#: src/sensor/gnunet-sensor.c:165
 #, fuzzy
-msgid "Could not send message to channel!\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+msgid "Retrieve information about a single sensor"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:891
-#: src/scalarproduct/gnunet-service-scalarproduct.c:991
-#, fuzzy
-msgid "Could not send service-response message via cadet!)\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+#: src/sensor/gnunet-sensor.c:168
+msgid "Force an anomaly on a sensor, use only for testing"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1442
-#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
+#: src/sensor/gnunet-sensor.c:175
+msgid "sensor"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1550
+#: src/sensor/gnunet-sensor-profiler.c:728
+msgid "Invalid or missing number of peers. Set at least 2 peers.\n"
+msgstr ""
+
+#: src/sensor/gnunet-sensor-profiler.c:735
 #, fuzzy
-msgid "Could not send service-request multipart message to channel!\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+msgid "Missing or invalid topology file.\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1579
-#, c-format
-msgid ""
-"Got client-responder-session with key %s and a matching service-request-"
-"session set, processing.\n"
-msgstr ""
+#: src/sensor/gnunet-sensor-profiler.c:781
+#, fuzzy
+msgid "Number of peers to run"
+msgstr "số lần lặp lại"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1601
-#, c-format
-msgid ""
-"Got client-responder-session with key %s but NO matching service-request-"
-"session set, queuing element for later use.\n"
+#: src/sensor/gnunet-sensor-profiler.c:783
+msgid "Path to topology file"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1618
-#, c-format
-msgid "Creating new channel for session with key %s.\n"
+#: src/sensor/gnunet-sensor-profiler.c:786
+msgid "Change the interval of running sensors to given value"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1777
-#, c-format
-msgid ""
-"Duplicate session information received, can not create new session with key `"
-"%s'\n"
-msgstr ""
+#: src/sensor/gnunet-sensor-profiler.c:789
+#, fuzzy
+msgid "Number of peers to simulate anomalies on"
+msgstr "số lần lặp lại"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1862
+#: src/sensor/gnunet-sensor-profiler.c:796
+#, fuzzy
+msgid "Profiler for sensor service"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:202
+#, fuzzy
+msgid "Received an invalid sensor value."
+msgstr "Nhận yêu cầu định tuyến\n"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:293
+#, fuzzy
+msgid "Analysis model not defined in configuration.\n"
+msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:302
 #, fuzzy, c-format
-msgid "New incoming channel from peer %s.\n"
-msgstr "« %.*s » được kết nối tới « %.*s ».\n"
+msgid "Could not load analysis model `%s'.\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
+#: src/sensor/gnunet-service-sensor_analysis.c:310
+#, fuzzy
+msgid "Could not connect to peerstore service.\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:233
+#, fuzzy
+msgid "Unknown value type expected by sensor, this should not happen.\n"
+msgstr "Định dạng kết xuất không rõ, điều này không nên xảy ra.\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:268
+#, fuzzy, c-format
+msgid "Received an invalid value for sensor `%s': %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/sensor/gnunet-service-sensor_monitoring.c:345
 #, c-format
-msgid "Peer disconnected, terminating session %s with peer (%s)\n"
+msgid "Sensor `%s': External process should not be a path, disabling sensor.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2270
+#: src/sensor/gnunet-service-sensor_monitoring.c:368
 #, c-format
 msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
+"Sensor `%s' process `%s' problem: binary doesn't exist or not executable\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2297
+#: src/sensor/gnunet-service-sensor_monitoring.c:416
 #, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid "Sensor `%s' execution task already set, this should not happen\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2318
+#: src/sensor/gnunet-service-sensor_reporting.c:828
+#, fuzzy
+msgid "Double creation of proof-of-work, this should not happen.\n"
+msgstr "Định dạng kết xuất không rõ, điều này không nên xảy ra.\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:834
+#, fuzzy
+msgid "Failed to create pow and signature block.\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:1044
 #, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid "PEERSTORE error: %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2565
-msgid "Shutting down, initiating cleanup.\n"
+#: src/sensor/gnunet-service-sensor_reporting.c:1149
+#: src/sensor/gnunet-service-sensor_reporting.c:1407
+#, fuzzy
+msgid "Failed to connect to CORE service.\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:1156
+msgid "Peer identity received from CORE init doesn't match ours.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2659
+#: src/sensor/gnunet-service-sensor_reporting.c:1396
 #, fuzzy
-msgid "Connect to CADET failed\n"
-msgstr " Không kết nối được (lỗi ?)\n"
+msgid "Failed to connect to peerstore service.\n"
+msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2664
+#: src/sensor/gnunet-service-sensor_reporting.c:1417
+#: src/sensor/gnunet-service-sensor_update.c:781
 #, fuzzy
-msgid "CADET initialized\n"
-msgstr "Lỗi sơ khởi lõi.\n"
+msgid "Failed to connect to CADET service.\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
-msgid "dkg start delay"
+#: src/sensor/gnunet-service-sensor_reporting.c:1424
+#, fuzzy
+msgid "Failed to load my private key.\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/sensor/gnunet-service-sensor_update.c:327
+#, c-format
+msgid "Error trying to send a message to update point `%s'.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
-msgid "dkg timeout"
+#: src/sensor/gnunet-service-sensor_update.c:418
+#, fuzzy, c-format
+msgid "Failed to connect to update point `%s'.\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/sensor/plugin_sensor_model_gaussian.c:203
+msgid "Missing `TRAINING_WINDOW' value in configuration.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
-msgid "threshold"
+#: src/sensor/plugin_sensor_model_gaussian.c:221
+msgid "Missing `CONFIDENCE_INTERVAL' value in configuration.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
-msgid "also profile decryption"
+#: src/sensor/plugin_sensor_model_gaussian.c:229
+msgid "Missing `WEIGHT_INC' value in configuration.\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor.c:148
+#: src/sensor/sensor_api.c:296
 #, fuzzy
-msgid "Retrieve information about all defined sensors"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
+msgid "Iterate request canceled due to disconnection.\n"
+msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/sensor/gnunet-sensor.c:151
-#, fuzzy
-msgid "Retrieve information about a single sensor"
-msgstr "In ra thông tin về các đồng đẳng GNUnet."
-
-#: src/sensor/gnunet-sensor.c:160
-msgid "sensor"
+#: src/sensor/sensor_api.c:307
+msgid "Force anomaly request canceled due to disconnection.\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:367
+#: src/sensor/sensor_api.c:374
 #, fuzzy
+msgid "Timeout transmitting iteration request to `SENSOR' service."
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#: src/sensor/sensor_util_lib.c:107
+#, fuzzy
 msgid "Error reading sensor version\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/sensor/gnunet-service-sensor.c:373
+#: src/sensor/sensor_util_lib.c:116
 msgid "Invalid sensor version number, format should be major.minor\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:385
+#: src/sensor/sensor_util_lib.c:131
 #, fuzzy
 msgid "Error reading sensor category\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/sensor/gnunet-service-sensor.c:413
+#: src/sensor/sensor_util_lib.c:164
 #, fuzzy
 msgid "Error reading sensor run interval\n"
 msgstr "Hoàn thành tạo khoá.\n"
 
-#: src/sensor/gnunet-service-sensor.c:419
-#, c-format
-msgid "Sensor run interval too low (%<PRIu64> < %d)\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor.c:436
+#: src/sensor/sensor_util_lib.c:191
 #, fuzzy
 msgid "Error reading sensor source\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/sensor/gnunet-service-sensor.c:445
+#: src/sensor/sensor_util_lib.c:206
 msgid "Error reading sensor gnunet-statistics source information\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:455
+#: src/sensor/sensor_util_lib.c:218
 #, fuzzy
 msgid "Error reading sensor process name\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/sensor/gnunet-service-sensor.c:464
+#: src/sensor/sensor_util_lib.c:233
 msgid "Error reading sensor expected datatype\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:470
+#: src/sensor/sensor_util_lib.c:241
 msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:498
+#: src/sensor/sensor_util_lib.c:299
 #, fuzzy, c-format
 msgid "Failed to access sensor file: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/sensor/gnunet-service-sensor.c:506
+#: src/sensor/sensor_util_lib.c:308
 #, fuzzy, c-format
 msgid "Failed to load sensor definition: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/sensor/gnunet-service-sensor.c:559
+#: src/sensor/sensor_util_lib.c:370
 #, c-format
 msgid "Sensor `%s' already exists with same or newer version\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:566
-#, c-format
-msgid "Upgrading sensor `%s' to a newer version\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor.c:571
-#, c-format
-msgid ""
-"Error adding new sensor `%s' to global hashmap, this should not happen\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor.c:595
+#: src/sensor/sensor_util_lib.c:387
 #, fuzzy, c-format
-msgid "Error loading sensor from file: %s\n"
+msgid "Error adding new sensor `%s' to global hashmap.\n"
 msgstr ""
 "\n"
 "Gặp lỗi khi tải lên tập tin: %s"
 
-#: src/sensor/gnunet-service-sensor.c:599
-#, c-format
-msgid "Sensor `%s' added to global hashmap\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor.c:635
+#: src/sensor/sensor_util_lib.c:412
 #, fuzzy, c-format
-msgid "Reloading sensor definitions from directory `%s'\n"
-msgstr "Đang tải %d tập tin xuống thư mục « %s ».\n"
-
-#: src/sensor/gnunet-service-sensor.c:640
-#, fuzzy, c-format
-msgid "Loaded %d sensors from directory `%s'\n"
-msgstr "Đang tải %d tập tin xuống thư mục « %s ».\n"
-
-#: src/sensor/sensor_api.c:345
-#, fuzzy
-msgid "Timeout transmitting iteration request to `SENSOR' service."
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-
-#: src/sensor/sensor_api.c:388
-#, fuzzy
-msgid "Failed to receive response from `SENSOR' service."
+msgid "Error loading sensor from file: %s\n"
 msgstr ""
 "\n"
-"Không nhận được đáp ứng từ gnunetd.\n"
+"Gặp lỗi khi tải lên tập tin: %s"
 
-#: src/sensor/sensor_api.c:431
+#: src/set/gnunet-service-set.c:1529
 #, fuzzy
-msgid "Received invalid message from `SENSOR' service."
-msgstr ""
-"\n"
-"Không nhận được đáp ứng từ gnunetd.\n"
-
-#: src/set/gnunet-service-set.c:1431
-#, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
@@ -6474,7 +6840,7 @@
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:295
+#: src/set/gnunet-set-profiler.c:298
 msgid "oeration to execute"
 msgstr ""
 
@@ -6596,37 +6962,37 @@
 msgid "Invalid topology: %s\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/testbed/generate-underlay-topology.c:252
+#: src/testbed/generate-underlay-topology.c:253
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:258
+#: src/testbed/generate-underlay-topology.c:259
 #, fuzzy, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/testbed/generate-underlay-topology.c:266
+#: src/testbed/generate-underlay-topology.c:267
 #, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:280
+#: src/testbed/generate-underlay-topology.c:281
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:286
+#: src/testbed/generate-underlay-topology.c:287
 #, fuzzy, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/testbed/generate-underlay-topology.c:335
+#: src/testbed/generate-underlay-topology.c:336
 #: src/testbed/gnunet-testbed-profiler.c:293
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:344
+#: src/testbed/generate-underlay-topology.c:345
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6650,7 +7016,7 @@
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:331
+#: src/testbed/gnunet-daemon-latency-logger.c:333
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
@@ -6661,7 +7027,7 @@
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:235 src/testing/list-keys.c:50
-#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
+#: src/testing/testing.c:293 src/util/gnunet-ecc.c:295
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6700,11 +7066,6 @@
 msgid "Spawning process `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:267
-#, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "tăng sổ tối đa các kết nối TCP/IP"
-
 #: src/testbed/gnunet-testbed-profiler.c:296
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
@@ -6953,71 +7314,72 @@
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:255
+#: src/topology/gnunet-daemon-topology.c:265
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:388
+#: src/topology/gnunet-daemon-topology.c:406
 #, fuzzy
 msgid "# connect requests issued to transport"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/topology/gnunet-daemon-topology.c:728
-#: src/topology/gnunet-daemon-topology.c:813
+#: src/topology/gnunet-daemon-topology.c:756
+#: src/topology/gnunet-daemon-topology.c:840
 #, fuzzy
 msgid "# friends connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/topology/gnunet-daemon-topology.c:993
+#: src/topology/gnunet-daemon-topology.c:1020
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1022
+#: src/topology/gnunet-daemon-topology.c:1049
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1029
+#: src/topology/gnunet-daemon-topology.c:1056
 #, 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:1050
+#: src/topology/gnunet-daemon-topology.c:1077
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1052
+#: src/topology/gnunet-daemon-topology.c:1079
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1057
+#: src/topology/gnunet-daemon-topology.c:1084
 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:1063
+#: src/topology/gnunet-daemon-topology.c:1090
 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:1094
+#: src/topology/gnunet-daemon-topology.c:1121
+#: src/transport/plugin_transport_wlan.c:1444
 #, 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:1151
+#: src/topology/gnunet-daemon-topology.c:1178
 #, 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:1296
+#: src/topology/gnunet-daemon-topology.c:1323
 msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
@@ -7031,8 +7393,8 @@
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:464
-#: src/transport/gnunet-service-transport_blacklist.c:745
+#: src/transport/gnunet-service-transport_blacklist.c:465
+#: src/transport/gnunet-service-transport_blacklist.c:748
 msgid "# disconnects due to blacklist"
 msgstr ""
 
@@ -7056,63 +7418,63 @@
 msgid "Could not obtain a valid network for `%s' %s (%s)\n"
 msgstr "Không thể lấy địa chỉ IP cho giao diện « %s », dùng « %s ».\n"
 
-#: src/transport/gnunet-service-transport.c:755
+#: src/transport/gnunet-service-transport.c:757
 #, c-format
 msgid ""
 "Address or session unknown: failed to update properties for peer `%s' plugin "
 "`%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1106
+#: src/transport/gnunet-service-transport.c:1094
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/transport/gnunet-service-transport_clients.c:432
+#: src/transport/gnunet-service-transport_clients.c:463
 #, 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:439
+#: src/transport/gnunet-service-transport_clients.c:470
 #, 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:596
+#: src/transport/gnunet-service-transport_clients.c:630
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:737
+#: src/transport/gnunet-service-transport_clients.c:771
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:770
+#: src/transport/gnunet-service-transport_clients.c:804
 #, fuzzy, c-format
 msgid "Blacklist refuses connection attempt to peer `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_clients.c:776
+#: src/transport/gnunet-service-transport_clients.c:810
 #, fuzzy, c-format
 msgid "Blacklist allows connection attempt to peer `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_clients.c:801
+#: src/transport/gnunet-service-transport_clients.c:836
 #, 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:815
+#: src/transport/gnunet-service-transport_clients.c:850
 #, fuzzy, c-format
 msgid "Received a request connect message for peer `%s'\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-service-transport_clients.c:826
+#: src/transport/gnunet-service-transport_clients.c:861
 #, fuzzy
 msgid "# REQUEST DISCONNECT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_clients.c:840
+#: src/transport/gnunet-service-transport_clients.c:875
 #, fuzzy, c-format
 msgid "Received a request disconnect message for peer `%s'\n"
 msgstr "Nhận yêu cầu định tuyến\n"
@@ -7197,171 +7559,171 @@
 
 #: src/transport/gnunet-service-transport_neighbours.c:1685
 #, fuzzy, c-format
-msgid ""
-"Failed to send CONNECT message to peer `%s' using address `%s' session %p\n"
+msgid "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1712
-msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
-msgstr ""
+#, fuzzy
+msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1757
 #, fuzzy
-msgid "# SESSION_CONNECT messages sent"
+msgid "# SYN messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1773
 #, fuzzy, c-format
-msgid "Failed to transmit CONNECT message via plugin to %s\n"
+msgid "Failed to transmit SYN message via plugin to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1800
-msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
-msgstr ""
+#, fuzzy
+msgid "# Failed attempts to switch addresses (failed to send SYN)"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1849
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Failed to send CONNECT_ACK message to peer `%s' using address `%s' session "
-"%p\n"
-msgstr ""
+"Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1904
 #, fuzzy
-msgid "# CONNECT_ACK messages sent"
+msgid "# SYN_ACK messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1919
 #, fuzzy, c-format
-msgid "Failed to transmit CONNECT_ACK message via plugin to %s\n"
+msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2196
+#: src/transport/gnunet-service-transport_neighbours.c:2199
 #, fuzzy, c-format
 msgid "Blacklisting disapproved to connect to peer `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2316
+#: src/transport/gnunet-service-transport_neighbours.c:2324
 #, fuzzy
-msgid "# CONNECT messages received"
-msgstr "# các thông báo PONG đã mật mã được nhận"
+msgid "# SYN messages received"
+msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2321
+#: src/transport/gnunet-service-transport_neighbours.c:2329
 #, c-format
-msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
+msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2594
+#: src/transport/gnunet-service-transport_neighbours.c:2626
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3016
+#: src/transport/gnunet-service-transport_neighbours.c:3047
 #, fuzzy
 msgid "# Failed attempts to switch addresses (no response)"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3111
+#: src/transport/gnunet-service-transport_neighbours.c:3142
 #, fuzzy
-msgid "# CONNECT_ACK messages received"
+msgid "# SYN_ACK messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3119
+#: src/transport/gnunet-service-transport_neighbours.c:3150
 #, fuzzy
-msgid "# unexpected CONNECT_ACK messages (no peer)"
+msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3133
-#: src/transport/gnunet-service-transport_neighbours.c:3168
+#: src/transport/gnunet-service-transport_neighbours.c:3164
+#: src/transport/gnunet-service-transport_neighbours.c:3199
 #, fuzzy
-msgid "# unexpected CONNECT_ACK messages (not ready)"
+msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3180
+#: src/transport/gnunet-service-transport_neighbours.c:3211
 #, fuzzy
-msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
+msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3203
+#: src/transport/gnunet-service-transport_neighbours.c:3234
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3211
+#: src/transport/gnunet-service-transport_neighbours.c:3242
 #, fuzzy
-msgid "# unexpected CONNECT_ACK messages (disconnecting)"
+msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3399
+#: src/transport/gnunet-service-transport_neighbours.c:3441
 #, fuzzy
-msgid "# SESSION_ACK messages received"
+msgid "# ACK messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3435
+#: src/transport/gnunet-service-transport_neighbours.c:3477
 #, fuzzy
-msgid "# unexpected SESSION_ACK messages"
+msgid "# unexpected ACK messages"
 msgstr "# các thông báo PONG đã mật mã được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3509
+#: src/transport/gnunet-service-transport_neighbours.c:3551
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3524
+#: src/transport/gnunet-service-transport_neighbours.c:3566
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3564
+#: src/transport/gnunet-service-transport_neighbours.c:3611
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3570
+#: src/transport/gnunet-service-transport_neighbours.c:3617
 #, fuzzy
 msgid "# DISCONNECT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3579
+#: src/transport/gnunet-service-transport_neighbours.c:3626
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3706
+#: src/transport/gnunet-service-transport_neighbours.c:3753
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/transport/gnunet-service-transport_plugins.c:120
+#: src/transport/gnunet-service-transport_plugins.c:119
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:178
-#: src/transport/gnunet-service-transport_plugins.c:186
-#: src/transport/gnunet-service-transport_plugins.c:194
-#: src/transport/gnunet-service-transport_plugins.c:202
-#: src/transport/gnunet-service-transport_plugins.c:210
-#: src/transport/gnunet-service-transport_plugins.c:218
-#: src/transport/gnunet-service-transport_plugins.c:226
-#: src/transport/gnunet-service-transport_plugins.c:234
-#: src/transport/gnunet-service-transport_plugins.c:242
-#: src/transport/gnunet-service-transport_plugins.c:250
-#: src/transport/gnunet-service-transport_plugins.c:258
+#: src/transport/gnunet-service-transport_plugins.c:177
+#: src/transport/gnunet-service-transport_plugins.c:185
+#: src/transport/gnunet-service-transport_plugins.c:193
+#: src/transport/gnunet-service-transport_plugins.c:201
+#: src/transport/gnunet-service-transport_plugins.c:209
+#: src/transport/gnunet-service-transport_plugins.c:217
+#: src/transport/gnunet-service-transport_plugins.c:225
+#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
+#: src/transport/gnunet-service-transport_plugins.c:249
+#: src/transport/gnunet-service-transport_plugins.c:257
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:265
+#: src/transport/gnunet-service-transport_plugins.c:264
 #, fuzzy, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr "Lỗi nạp phần bổ sung « %s » tại %s:%d. Đang hủy nạp phần bổ sung.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:488
+#: src/transport/gnunet-service-transport_validation.c:493
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:558
+#: src/transport/gnunet-service-transport_validation.c:563
 #, 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:616
+#: src/transport/gnunet-service-transport_validation.c:624
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# các thông báo PONG nhập thô được gửi"
@@ -7418,76 +7780,82 @@
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1356
+#: src/transport/gnunet-service-transport_validation.c:1387
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1371
+#: src/transport/gnunet-service-transport_validation.c:1402
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1493
+#: src/transport/gnunet-service-transport_validation.c:1526
 #, fuzzy, c-format
 msgid "Validation received new %s message for peer `%s' with size %u\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1500
+#: src/transport/gnunet-service-transport_validation.c:1533
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:388
+#: src/transport/gnunet-transport.c:573
 #, fuzzy, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/gnunet-transport.c:396
+#: src/transport/gnunet-transport.c:582
+#: src/transport/gnunet-transport-profiler.c:274
 #, fuzzy, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:436
+#: src/transport/gnunet-transport.c:614
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:449
+#: src/transport/gnunet-transport.c:629
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/gnunet-transport.c:459
+#: src/transport/gnunet-transport.c:641
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/transport/gnunet-transport.c:483
+#: src/transport/gnunet-transport.c:668 src/transport/gnunet-transport.c:698
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/transport/gnunet-transport.c:487
+#: src/transport/gnunet-transport.c:673
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
-#: src/transport/gnunet-transport.c:491
+#: src/transport/gnunet-transport.c:678
 #, fuzzy, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/transport/gnunet-transport.c:495
+#: src/transport/gnunet-transport.c:683
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/gnunet-transport.c:499
+#: src/transport/gnunet-transport.c:688
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:614
+#: src/transport/gnunet-transport.c:704
 #, fuzzy, c-format
+msgid "Configuration for plugin `%s' is working!\n"
+msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
+
+#: src/transport/gnunet-transport.c:823
+#, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
 "\t%s%s\n"
@@ -7495,389 +7863,443 @@
 "\t%s%s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:643
+#: src/transport/gnunet-transport.c:859
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:717 src/transport/gnunet-transport.c:1240
+#: src/transport/gnunet-transport.c:958 src/transport/gnunet-transport.c:1707
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:784
+#: src/transport/gnunet-transport.c:1026
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:798
+#: src/transport/gnunet-transport.c:1040
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:823
+#: src/transport/gnunet-transport.c:1065
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/gnunet-transport.c:866
+#: src/transport/gnunet-transport.c:1111
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/gnunet-transport.c:888
+#: src/transport/gnunet-transport.c:1134
+#: src/transport/gnunet-transport-profiler.c:406
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/transport/gnunet-transport.c:912
+#: src/transport/gnunet-transport.c:1158
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:943
+#: src/transport/gnunet-transport.c:1191
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/transport/gnunet-transport.c:966
+#: src/transport/gnunet-transport.c:1214
+#: src/transport/gnunet-transport-profiler.c:434
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:988 src/transport/gnunet-transport.c:1009
+#: src/transport/gnunet-transport.c:1239 src/transport/gnunet-transport.c:1265
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:989
+#: src/transport/gnunet-transport.c:1241
 #, fuzzy
 msgid "Connected to"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1010
+#: src/transport/gnunet-transport.c:1267
 #, fuzzy
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:1031
+#: src/transport/gnunet-transport.c:1291
+#: src/transport/gnunet-transport-profiler.c:458
 #, fuzzy, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:1061
+#: src/transport/gnunet-transport.c:1323
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1072
+#: src/transport/gnunet-transport.c:1335
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:1300 src/transport/gnunet-transport.c:1325
+#: src/transport/gnunet-transport.c:1792
+#: src/transport/gnunet-transport-profiler.c:492
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1369
+#: src/transport/gnunet-transport.c:1829
+#, fuzzy
+msgid "Failed to send disconnect request to transport service\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/transport/gnunet-transport.c:1875
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
-"%s, %s\n"
+"%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1377
+#: src/transport/gnunet-transport.c:1883
 #, c-format
 msgid ""
-"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
+"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1396 src/transport/gnunet-transport.c:1426
-#: src/transport/gnunet-transport.c:1456 src/transport/gnunet-transport.c:1479
-#: src/transport/gnunet-transport.c:1523
+#: src/transport/gnunet-transport.c:1902 src/transport/gnunet-transport.c:1932
+#: src/transport/gnunet-transport.c:1964 src/transport/gnunet-transport.c:1990
+#: src/transport/gnunet-transport.c:2046
+#: src/transport/gnunet-transport-profiler.c:578
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1405 src/transport/gnunet-transport.c:1435
-#: src/transport/gnunet-transport.c:1465
+#: src/transport/gnunet-transport.c:1911 src/transport/gnunet-transport.c:1941
+#: src/transport/gnunet-transport.c:1975
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1484
+#: src/transport/gnunet-transport.c:1995
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1569
+#: src/transport/gnunet-transport.c:2094
 #, fuzzy
-msgid "print information for all peers (instead of only connected peers )"
+msgid "print information for all peers (instead of only connected peers)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1572
+#: src/transport/gnunet-transport.c:2097
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1575
+#: src/transport/gnunet-transport.c:2100
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1578
+#: src/transport/gnunet-transport.c:2103
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1581
+#: src/transport/gnunet-transport.c:2106
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1584
+#: src/transport/gnunet-transport.c:2109
 #, fuzzy
-msgid "print information for all pending validations continously"
+msgid "print information for all pending validations continuously"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1587
+#: src/transport/gnunet-transport.c:2112
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1593
+#: src/transport/gnunet-transport.c:2118
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:1595
+#: src/transport/gnunet-transport.c:2121
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:1597
+#: src/transport/gnunet-transport.c:2124
+#: src/transport/gnunet-transport-profiler.c:638
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1599
+#: src/transport/gnunet-transport.c:2127
+msgid "monitor plugin sessions"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:2130
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1602
+#: src/transport/gnunet-transport.c:2133
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1611
+#: src/transport/gnunet-transport.c:2144
+#: src/transport/gnunet-transport-profiler.c:649
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/plugin_transport_bluetooth.c:621
-msgid "# Bluetooth ACKs sent"
+#: src/transport/gnunet-transport-profiler.c:218
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:640
-#, fuzzy
-msgid "# Bluetooth messages defragmented"
-msgstr "# các thông báo được chắp liền"
+#: src/transport/gnunet-transport-profiler.c:254
+#, c-format
+msgid "%u;%u;%llu;%llu;%.2f;%.2f"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:686
-#: src/transport/plugin_transport_bluetooth.c:737
-#: src/transport/plugin_transport_bluetooth.c:1942
-#, fuzzy
-msgid "# Bluetooth sessions allocated"
-msgstr "# các khoá phiên chạy được chấp nhận"
+#: src/transport/gnunet-transport-profiler.c:263
+#, c-format
+msgid ";%llu;%.2f"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:837
-#, fuzzy
-msgid "# Bluetooth message fragments sent"
-msgstr "# các thông báo bị tế phân"
+#: src/transport/gnunet-transport-profiler.c:280
+msgid "\n"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:861
-msgid "# Bluetooth messages pending (with fragmentation)"
+#: src/transport/gnunet-transport-profiler.c:332
+msgid "."
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:969
-#: src/transport/plugin_transport_bluetooth.c:1054
-#: src/transport/plugin_transport_bluetooth.c:1944
-#, fuzzy
-msgid "# Bluetooth MAC endpoints allocated"
-msgstr "# các yêu cầu get (lấy) dht được nhận"
+#: src/transport/gnunet-transport-profiler.c:352
+#, c-format
+msgid ""
+"\n"
+"Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
+msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1307
+#: src/transport/gnunet-transport-profiler.c:400
+#, fuzzy, c-format
+msgid "Connected to different peer `%s'\n"
+msgstr "« %s » được kết nối tới « %s ».\n"
+
+#: src/transport/gnunet-transport-profiler.c:483
+#, fuzzy, c-format
+msgid "Retrying to connect to `%s'\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/transport/gnunet-transport-profiler.c:508
+#, fuzzy, c-format
+msgid "Denying connection to `%s'\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/transport/gnunet-transport-profiler.c:537
 #, fuzzy
-msgid "# HELLO messages received via Bluetooth"
-msgstr "# các thông báo PONG đã mật mã được nhận"
+msgid "Message size too big!\n"
+msgstr "kích cỡ tin nhắn"
 
-#: src/transport/plugin_transport_bluetooth.c:1331
+#: src/transport/gnunet-transport-profiler.c:543
 #, fuzzy
-msgid "# fragments received via Bluetooth"
-msgstr "# các mảnh bị loại bỏ"
+msgid "No peer identity given\n"
+msgstr "chưa đưa ra tên"
 
-#: src/transport/plugin_transport_bluetooth.c:1341
+#: src/transport/gnunet-transport-profiler.c:558
+#, fuzzy, c-format
+msgid "Trying to send %u messages with size %u to peer `%s'\n"
+msgstr "Sử dụng %u thông báo với kích cỡ %u trong %u lần.\n"
+
+#: src/transport/gnunet-transport-profiler.c:564
+#, fuzzy, c-format
+msgid "Trying to receive messages from peer `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/transport/gnunet-transport-profiler.c:569
 #, fuzzy
-msgid "# ACKs received via Bluetooth"
-msgstr "# các byte đã nhận qua TCP"
+msgid "No operation given\n"
+msgstr "chưa đưa ra tên"
 
-#: src/transport/plugin_transport_bluetooth.c:1401
+#: src/transport/gnunet-transport-profiler.c:623
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:626
 #, fuzzy
-msgid "# Bluetooth DATA messages discarded due to CRC32 error"
-msgstr "# các thông báo được chắp liền"
+msgid "receive data from peer"
+msgstr "Yêu cầu cấp %d từ đồng đẳng %d\n"
 
-#: src/transport/plugin_transport_bluetooth.c:1512
+#: src/transport/gnunet-transport-profiler.c:629
 #, fuzzy
-msgid "# DATA messages received via Bluetooth"
-msgstr "# các thông báo PONG đã mật mã được nhận"
+msgid "iterations"
+msgstr "Tùy chọn chung"
 
-#: src/transport/plugin_transport_bluetooth.c:1547
+#: src/transport/gnunet-transport-profiler.c:632
 #, fuzzy
-msgid "# Bluetooth DATA messages processed"
-msgstr "# các thông báo PONG đã mật mã được nhận"
+msgid "number of messages to send"
+msgstr "số tin nhắn cần dùng mỗi lần lặp"
 
-#: src/transport/plugin_transport_bluetooth.c:1610
+#: src/transport/gnunet-transport-profiler.c:635
 #, fuzzy
-msgid "# HELLO beacons sent via Bluetooth"
-msgstr "# các byte đã gửi qua UDP"
+msgid "message size to use"
+msgstr "kích cỡ tin nhắn"
 
-#: src/transport/plugin_transport_bluetooth.c:1923
-#, c-format
-msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
+#: src/transport/plugin_transport_http_client.c:1491
+#: src/transport/plugin_transport_http_server.c:2271
+#: src/transport/plugin_transport_http_server.c:3436
+#: src/transport/plugin_transport_tcp.c:2826
+#: src/transport/plugin_transport_tcp.c:2833
+msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1685
+#: src/transport/plugin_transport_http_client.c:2115
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1760
-#: src/transport/plugin_transport_http_server.c:3031
+#: src/transport/plugin_transport_http_client.c:2164
+#: src/transport/plugin_transport_http_server.c:3170
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/transport/plugin_transport_http_client.c:1785
-#: src/transport/plugin_transport_http_server.c:3088
+#: src/transport/plugin_transport_http_client.c:2181
+#: src/transport/plugin_transport_http_server.c:3240
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Tải lên « %s » hoàn thành, địa chỉ URI là « %s ».\n"
 
-#: src/transport/plugin_transport_http_client.c:1819
-#: src/transport/plugin_transport_http_server.c:2931
+#: src/transport/plugin_transport_http_client.c:2215
 #, fuzzy, c-format
-msgid "Maximum number of connections is %u\n"
+msgid "Maximum number of requests is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/transport/plugin_transport_http_server.c:1423
+#: src/transport/plugin_transport_http_server.c:1761
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1687
+#: src/transport/plugin_transport_http_server.c:1992
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1695
+#: src/transport/plugin_transport_http_server.c:2000
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1982
+#: src/transport/plugin_transport_http_server.c:2150
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2006
+#: src/transport/plugin_transport_http_server.c:2173
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2429
+#: src/transport/plugin_transport_http_server.c:2297
+msgid "Could not load or create server certificate! Loading plugin failed!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2604
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/transport/plugin_transport_http_server.c:2461 src/util/service.c:700
+#: src/transport/plugin_transport_http_server.c:2638 src/util/service.c:700
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2478 src/util/service.c:719
+#: src/transport/plugin_transport_http_server.c:2656 src/util/service.c:719
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/plugin_transport_http_server.c:2589
+#: src/transport/plugin_transport_http_server.c:2769
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2661
+#: src/transport/plugin_transport_http_server.c:2847
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2754
+#: src/transport/plugin_transport_http_server.c:2946
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2768
+#: src/transport/plugin_transport_http_server.c:2961
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2775
+#: src/transport/plugin_transport_http_server.c:2967
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2786
+#: src/transport/plugin_transport_http_server.c:2978
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/transport/plugin_transport_http_server.c:2793
+#: src/transport/plugin_transport_http_server.c:2984
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Đang thử nghiệm (các) truyền tải %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2808
+#: src/transport/plugin_transport_http_server.c:2998
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/transport/plugin_transport_http_server.c:2818
+#: src/transport/plugin_transport_http_server.c:3008
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/transport/plugin_transport_http_server.c:2839
+#: src/transport/plugin_transport_http_server.c:3030
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/transport/plugin_transport_http_server.c:2849
+#: src/transport/plugin_transport_http_server.c:3040
 #, fuzzy, c-format
 msgid "Binding to 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_http_server.c:2901
+#: src/transport/plugin_transport_http_server.c:3103
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/transport/plugin_transport_http_server.c:2917
+#: src/transport/plugin_transport_http_server.c:3124
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_server.c:3141
+#, fuzzy, c-format
+msgid "Maximum number of connections is %u\n"
+msgstr "tăng sổ tối đa các kết nối TCP/IP"
+
+#: src/transport/plugin_transport_http_server.c:3448
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
@@ -7924,91 +8346,86 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:565
+#: src/transport/plugin_transport_tcp.c:648
 #, 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:787
-#: src/transport/plugin_transport_tcp.c:962
-#: src/transport/plugin_transport_tcp.c:2047
-#: src/transport/plugin_transport_tcp.c:2620
+#: src/transport/plugin_transport_tcp.c:829
+#: src/transport/plugin_transport_tcp.c:1044
+#: src/transport/plugin_transport_tcp.c:2232
+#: src/transport/plugin_transport_tcp.c:2932
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_tcp.c:823
-#: src/transport/plugin_transport_tcp.c:955
-#: src/transport/plugin_transport_tcp.c:1045
-#: src/transport/plugin_transport_tcp.c:1093
-#: src/transport/plugin_transport_tcp.c:1259
-#: src/transport/plugin_transport_tcp.c:1277
+#: src/transport/plugin_transport_tcp.c:870
+#: src/transport/plugin_transport_tcp.c:1027
+#: src/transport/plugin_transport_tcp.c:1146
+#: src/transport/plugin_transport_tcp.c:1214
+#: src/transport/plugin_transport_tcp.c:1312
+#: src/transport/plugin_transport_tcp.c:1336
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:826
+#: src/transport/plugin_transport_tcp.c:873
 #, 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:1048
+#: src/transport/plugin_transport_tcp.c:1149
 #, 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:1096
+#: src/transport/plugin_transport_tcp.c:1218
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:1233
-#, c-format
-msgid "Trying to send with invalid session %p\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1504
+#: src/transport/plugin_transport_tcp.c:1611
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1609
+#: src/transport/plugin_transport_tcp.c:1775
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2097
+#: src/transport/plugin_transport_tcp.c:2282
 #, 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:2257
+#: src/transport/plugin_transport_tcp.c:2452
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:2321
+#: src/transport/plugin_transport_tcp.c:2524
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2490 src/util/service.c:582
+#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:582
 #: src/util/service.c:588
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2504
+#: src/transport/plugin_transport_tcp.c:2776
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2607
+#: src/transport/plugin_transport_tcp.c:2919
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2611
+#: src/transport/plugin_transport_tcp.c:2923
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2615
+#: src/transport/plugin_transport_tcp.c:2927
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -8033,139 +8450,139 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1513
+#: src/transport/plugin_transport_udp.c:1655
 #, c-format
 msgid ""
 "Trying to create session for address of unexpected length %u (should be %u "
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2602
+#: src/transport/plugin_transport_udp.c:2881
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2616
+#: src/transport/plugin_transport_udp.c:2894
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2961
+#: src/transport/plugin_transport_udp.c:3247
+#, fuzzy, c-format
+msgid "Failed to bind UDP socket to %s: %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/transport/plugin_transport_udp.c:3255
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_udp.c:3056
+#: src/transport/plugin_transport_udp.c:3414
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3097
+#: src/transport/plugin_transport_udp.c:3461
 #, 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:3168
+#: src/transport/plugin_transport_udp.c:3529
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/plugin_transport_unix.c:1321
+#: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/plugin_transport_unix.c:1645
-#, fuzzy
-msgid "No UNIXPATH given in configuration!\n"
-msgstr "Lỗi lưu cấu hình."
+#: src/transport/plugin_transport_unix.c:1416
+#, fuzzy, c-format
+msgid "Cannot bind to `%s'\n"
+msgstr "Không thể tạo mẫu duy nhất đại diện cho « %s ».\n"
 
-#: src/transport/plugin_transport_unix.c:1681
+#: src/transport/plugin_transport_unix.c:1817
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_wlan.c:620
-msgid "# WLAN ACKs sent"
+#: src/transport/plugin_transport_wlan.c:725
+msgid "# ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:639
+#: src/transport/plugin_transport_wlan.c:745
 #, fuzzy
-msgid "# WLAN messages defragmented"
+msgid "# Messages defragmented"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:688
-#: src/transport/plugin_transport_wlan.c:772
-#: src/transport/plugin_transport_wlan.c:1948
+#: src/transport/plugin_transport_wlan.c:786
+#: src/transport/plugin_transport_wlan.c:873
 #, fuzzy
-msgid "# WLAN sessions allocated"
+msgid "# Sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_wlan.c:876
+#: src/transport/plugin_transport_wlan.c:989
 #, fuzzy
-msgid "# WLAN message fragments sent"
+msgid "# message fragments sent"
 msgstr "# các thông báo bị tế phân"
 
-#: src/transport/plugin_transport_wlan.c:900
-msgid "# WLAN messages pending (with fragmentation)"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:1015
+#, fuzzy
+msgid "# messages pending (with fragmentation)"
+msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:1008
-#: src/transport/plugin_transport_wlan.c:1098
-#: src/transport/plugin_transport_wlan.c:1950
+#: src/transport/plugin_transport_wlan.c:1129
+#: src/transport/plugin_transport_wlan.c:1222
+#: src/transport/plugin_transport_wlan.c:2185
 #, fuzzy
-msgid "# WLAN MAC endpoints allocated"
+msgid "# MAC endpoints allocated"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1302
+#: src/transport/plugin_transport_wlan.c:1487
 #, fuzzy
-msgid "# HELLO messages received via WLAN"
-msgstr "# các thông báo PONG đã mật mã được nhận"
-
-#: src/transport/plugin_transport_wlan.c:1326
-#, fuzzy
-msgid "# fragments received via WLAN"
-msgstr "# các mảnh bị loại bỏ"
-
-#: src/transport/plugin_transport_wlan.c:1336
-#, fuzzy
-msgid "# ACKs received via WLAN"
+msgid "# ACKs received"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_wlan.c:1396
+#: src/transport/plugin_transport_wlan.c:1555
 #, fuzzy
-msgid "# WLAN DATA messages discarded due to CRC32 error"
+msgid "# DATA messages discarded due to CRC32 error"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:1518
+#: src/transport/plugin_transport_wlan.c:1696
 #, fuzzy
-msgid "# DATA messages received via WLAN"
+msgid "# DATA messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1553
+#: src/transport/plugin_transport_wlan.c:1730
 #, fuzzy
-msgid "# WLAN DATA messages processed"
+msgid "# DATA messages processed"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1616
+#: src/transport/plugin_transport_wlan.c:1793
 #, fuzzy
-msgid "# HELLO beacons sent via WLAN"
+msgid "# HELLO beacons sent"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_wlan.c:1929
+#: src/transport/plugin_transport_wlan.c:2160
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:739
+#: src/transport/plugin_transport_wlan.c:2182
+#, fuzzy
+msgid "# sessions allocated"
+msgstr "# các khoá phiên chạy được chấp nhận"
+
+#: src/transport/transport_api.c:767
 #, 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/transport-testing.c:584
+#: src/transport/transport-testing.c:603
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -8342,12 +8759,12 @@
 "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:751 src/util/connection.c:919
+#: src/util/connection.c:751 src/util/connection.c:914
 #, 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:910
+#: src/util/connection.c:904
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Lỗi kết nối\n"
@@ -8414,12 +8831,12 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/util/disk.c:1184
+#: src/util/disk.c:1202
 #, 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:1546 src/util/service.c:1323
+#: src/util/disk.c:1564 src/util/service.c:1323
 #, 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"
@@ -8534,81 +8951,82 @@
 msgid "Manipulate GNUnet configuration files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/util/gnunet-ecc.c:75
+#: src/util/gnunet-ecc.c:81
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/util/gnunet-ecc.c:81
+#: src/util/gnunet-ecc.c:117
 #, c-format
+msgid "Generating %u keys like %s, please wait"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:130
+#, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:97
+#: src/util/gnunet-ecc.c:171
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/gnunet-ecc.c:107
+#: src/util/gnunet-ecc.c:181
 #, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:110
+#: src/util/gnunet-ecc.c:184
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:199
+#: src/util/gnunet-ecc.c:277
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/util/gnunet-ecc.c:210
+#: src/util/gnunet-ecc.c:288
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
 
-#: src/util/gnunet-ecc.c:232
+#: src/util/gnunet-ecc.c:310
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/util/gnunet-ecc.c:283
+#: src/util/gnunet-ecc.c:361
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:349
+#: src/util/gnunet-ecc.c:411
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:352
+#: src/util/gnunet-ecc.c:414
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:355
+#: src/util/gnunet-ecc.c:417
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:358
+#: src/util/gnunet-ecc.c:420
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:361
-msgid "print the hash of the public key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:364
+#: src/util/gnunet-ecc.c:423
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:375
+#: src/util/gnunet-ecc.c:434
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -8642,13 +9060,13 @@
 msgid "Manipulate GNUnet proof of work files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/util/gnunet-service-resolver.c:299
+#: src/util/gnunet-service-resolver.c:310
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/gnunet-service-resolver.c:371
-#: src/util/gnunet-service-resolver.c:412
+#: src/util/gnunet-service-resolver.c:382
+#: src/util/gnunet-service-resolver.c:423
 #, 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"
@@ -8697,7 +9115,7 @@
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1355 src/util/network.c:1480
+#: src/util/network.c:1361 src/util/network.c:1486
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8760,28 +9178,28 @@
 msgid "Malformed configuration, exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/util/resolver_api.c:198
+#: src/util/resolver_api.c:201
 #, 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:216
+#: src/util/resolver_api.c:220
 #, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:348
+#: 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:352
+#: src/util/resolver_api.c:361
 #, 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:908
+#: src/util/resolver_api.c:974
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
@@ -8810,7 +9228,7 @@
 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:892
+#: src/util/server.c:894
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8913,115 +9331,115 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:433
+#: src/util/strings.c:434
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:561
+#: src/util/strings.c:562
 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:658
+#: src/util/strings.c:659
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:662
+#: src/util/strings.c:663
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:664
+#: src/util/strings.c:665
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:670
+#: src/util/strings.c:671
 msgid "ms"
 msgstr "mg"
 
-#: src/util/strings.c:676
+#: src/util/strings.c:677
 msgid "s"
 msgstr "g"
 
-#: src/util/strings.c:682
+#: src/util/strings.c:683
 msgid "m"
 msgstr "p"
 
-#: src/util/strings.c:688
+#: src/util/strings.c:689
 msgid "h"
 msgstr "g"
 
-#: src/util/strings.c:695
+#: src/util/strings.c:696
 #, fuzzy
 msgid "day"
 msgstr " ngày"
 
-#: src/util/strings.c:697
+#: src/util/strings.c:698
 #, fuzzy
 msgid "days"
 msgstr " ngày"
 
-#: src/util/strings.c:726
+#: src/util/strings.c:727
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1159
+#: src/util/strings.c:1192
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1167
+#: src/util/strings.c:1200
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1173
+#: src/util/strings.c:1206
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1180
+#: src/util/strings.c:1213
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1189
+#: src/util/strings.c:1222
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/util/strings.c:1395 src/util/strings.c:1411
+#: src/util/strings.c:1428 src/util/strings.c:1444
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1420
+#: src/util/strings.c:1453
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/util/strings.c:1503 src/util/strings.c:1534 src/util/strings.c:1582
-#: src/util/strings.c:1603
+#: src/util/strings.c:1536 src/util/strings.c:1567 src/util/strings.c:1615
+#: src/util/strings.c:1636
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1560
+#: src/util/strings.c:1593
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
 
-#: src/util/strings.c:1612
+#: src/util/strings.c:1645
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1664
+#: src/util/strings.c:1697
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
 
-#: src/util/strings.c:1714
+#: src/util/strings.c:1747
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/strings.c:1745
+#: src/util/strings.c:1778
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Mạng có định dạng sai « %s »: %s\n"
@@ -9209,23 +9627,151 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573
-#: src/include/gnunet_common.h:581
+#: src/include/gnunet_common.h:586 src/include/gnunet_common.h:593
+#: src/include/gnunet_common.h:601
 #, 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:593
+#: src/include/gnunet_common.h:613
 #, 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:620 src/include/gnunet_common.h:629
+#: src/include/gnunet_common.h:640 src/include/gnunet_common.h:649
 #, 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"
 
 #, fuzzy
+#~ msgid "Client %p disconnected from us.\n"
+#~ msgstr "« %.*s » được kết nối tới « %.*s ».\n"
+
+#, fuzzy
+#~ msgid "Could not send message to client (%p)!\n"
+#~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#, fuzzy
+#~ msgid "Successfully created new channel to peer (%s)!\n"
+#~ msgstr "Không đủ quyền cho « %s ».\n"
+
+#, fuzzy
+#~ msgid "Transmitting service request.\n"
+#~ msgstr "Đang nạp và khởi động dùng « %s ».\n"
+
+#, fuzzy
+#~ msgid "Could not send message to channel!\n"
+#~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#, fuzzy
+#~ msgid "Could not send service-response message via cadet!)\n"
+#~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#, fuzzy
+#~ msgid "Could not send service-request multipart message to channel!\n"
+#~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#, fuzzy
+#~ msgid "New incoming channel from peer %s.\n"
+#~ msgstr "« %.*s » được kết nối tới « %.*s ».\n"
+
+#, fuzzy
+#~ msgid "CADET initialized\n"
+#~ msgstr "Lỗi sơ khởi lõi.\n"
+
+#, fuzzy
+#~ msgid "Reloading sensor definitions from directory `%s'\n"
+#~ msgstr "Đang tải %d tập tin xuống thư mục « %s ».\n"
+
+#, fuzzy
+#~ msgid "Loaded %d sensors from directory `%s'\n"
+#~ msgstr "Đang tải %d tập tin xuống thư mục « %s ».\n"
+
+#, fuzzy
+#~ msgid "Failed to receive response from `SENSOR' service."
+#~ msgstr ""
+#~ "\n"
+#~ "Không nhận được đáp ứng từ gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Received invalid message from `SENSOR' service."
+#~ msgstr ""
+#~ "\n"
+#~ "Không nhận được đáp ứng từ gnunetd.\n"
+
+#, fuzzy
+#~ msgid "# SESSION_CONNECT messages sent"
+#~ msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#, fuzzy
+#~ msgid "# CONNECT messages received"
+#~ msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#, fuzzy
+#~ msgid "# Bluetooth messages defragmented"
+#~ msgstr "# các thông báo được chắp liền"
+
+#, fuzzy
+#~ msgid "# Bluetooth sessions allocated"
+#~ msgstr "# các khoá phiên chạy được chấp nhận"
+
+#, fuzzy
+#~ msgid "# Bluetooth message fragments sent"
+#~ msgstr "# các thông báo bị tế phân"
+
+#, fuzzy
+#~ msgid "# Bluetooth MAC endpoints allocated"
+#~ msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#, fuzzy
+#~ msgid "# HELLO messages received via Bluetooth"
+#~ msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#, fuzzy
+#~ msgid "# fragments received via Bluetooth"
+#~ msgstr "# các mảnh bị loại bỏ"
+
+#, fuzzy
+#~ msgid "# ACKs received via Bluetooth"
+#~ msgstr "# các byte đã nhận qua TCP"
+
+#, fuzzy
+#~ msgid "# Bluetooth DATA messages discarded due to CRC32 error"
+#~ msgstr "# các thông báo được chắp liền"
+
+#, fuzzy
+#~ msgid "# DATA messages received via Bluetooth"
+#~ msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#, fuzzy
+#~ msgid "# Bluetooth DATA messages processed"
+#~ msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#, fuzzy
+#~ msgid "# HELLO beacons sent via Bluetooth"
+#~ msgstr "# các byte đã gửi qua UDP"
+
+#, fuzzy
+#~ msgid "No UNIXPATH given in configuration!\n"
+#~ msgstr "Lỗi lưu cấu hình."
+
+#, fuzzy
+#~ msgid "# WLAN messages defragmented"
+#~ msgstr "# các thông báo được chắp liền"
+
+#, fuzzy
+#~ msgid "# HELLO messages received via WLAN"
+#~ msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#, fuzzy
+#~ msgid "# fragments received via WLAN"
+#~ msgstr "# các mảnh bị loại bỏ"
+
+#, fuzzy
+#~ msgid "# DATA messages received via WLAN"
+#~ msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#, fuzzy
 #~ msgid "Peer `%s'\n"
 #~ msgstr "Tôi là đồng đẳng « %s ».\n"
 
@@ -9238,10 +9784,6 @@
 #~ msgstr "# các byte đã nhận qua HTTP"
 
 #, fuzzy
-#~ msgid "Failed to run `upnpc` command"
-#~ msgstr "Lỗi bắt đầu thu thập.\n"
-
-#, fuzzy
 #~ msgid "Could not convert `%s' to integer.\n"
 #~ msgstr "Không thể kết nối tới %s:%u: %s\n"
 
@@ -9291,10 +9833,6 @@
 #~ msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
 #, fuzzy
-#~ 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"
-
-#, fuzzy
 #~ msgid "Peer `%s' disconnected\n"
 #~ msgstr "# của các đồng đẳng đã kết nối"
 
@@ -9452,10 +9990,6 @@
 #~ msgstr "Tập tin cấu hình gnunetd có đường dẫn nào?"
 
 #, fuzzy
-#~ msgid "number of peers to start"
-#~ msgstr "số lần lặp lại"
-
-#, fuzzy
 #~ msgid "Failed to read or generate private key: %s\n"
 #~ msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
@@ -9501,10 +10035,6 @@
 #~ msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
 #, fuzzy
-#~ msgid "Failed to create new signature"
-#~ msgstr "Không thể tạo miền tên.\n"
-
-#, fuzzy
 #~ msgid "Failed to put new set of records in database"
 #~ msgstr ""
 #~ "\n"
@@ -9608,10 +10138,6 @@
 #~ msgstr "Thoát"
 
 #, fuzzy
-#~ msgid "Could not read blacklist file `%s'\n"
-#~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
-
-#, fuzzy
 #~ msgid "Failed to read blacklist from `%s'\n"
 #~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
@@ -9644,10 +10170,6 @@
 #~ msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
 #, fuzzy
-#~ msgid "Failed to connect to datastore service"
-#~ msgstr "Không kết nối được đến trình nền gnunetd."
-
-#, fuzzy
 #~ msgid "Failed to parse URI `%s' from KBlock!\n"
 #~ msgstr "Tập tin « %s » có URI: %s\n"
 
@@ -10085,10 +10607,6 @@
 #~ msgstr "# các kết nối bị đóng (vấn đề truyền tải)"
 
 #, fuzzy
-#~ msgid "# peers disconnected due to global disconnect"
-#~ msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
-
-#, fuzzy
 #~ msgid "# messages not sent (no such peer or not connected)"
 #~ msgstr "# các thông báo được chắp liền"
 
@@ -10907,9 +11425,6 @@
 #~ msgid "`%s' registering handlers %d %d %d\n"
 #~ msgstr "« %s » đang đăng ký các trình điều khiển %d %d %d\n"
 
-#~ msgid "Using %u messages of size %u for %u times.\n"
-#~ msgstr "Sử dụng %u thông báo với kích cỡ %u trong %u lần.\n"
-
 #~ msgid "Times: max %16llu  min %16llu  mean %12.3f  variance %12.3f\n"
 #~ msgstr "Thời gian:  đại %16llu  tiểu %16llu  t.bình %12.3f  ph.sai %12.3f\n"
 
@@ -10928,15 +11443,9 @@
 #~ msgid "output in gnuplot format"
 #~ msgstr "kết xuất theo định dạng gnuplot"
 
-#~ msgid "number of messages to use per iteration"
-#~ msgstr "số tin nhắn cần dùng mỗi lần lặp"
-
 #~ msgid "receiver host identifier (ENC file name)"
 #~ msgstr "đồ nhận diện máy nhận (tên tập tin mã hoá)"
 
-#~ msgid "message size"
-#~ msgstr "kích cỡ tin nhắn"
-
 #~ msgid "sleep for SPACE ms after each a message block"
 #~ msgstr "ngủ KHOẢNG miligiây sau mỗi khối tin nhắn"
 
@@ -10983,9 +11492,6 @@
 #~ msgid "\tvariance %8.4f\n"
 #~ msgstr "\tph.sai %8.4f\n"
 
-#~ msgid "Output format not known, this should not happen.\n"
-#~ msgstr "Định dạng kết xuất không rõ, điều này không nên xảy ra.\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Did not receive the message from gnunetd. Is gnunetd running?\n"
@@ -11487,9 +11993,6 @@
 #~ msgid "Cannot get size of file `%s'"
 #~ msgstr "Không thể lấy kích cỡ của tập tin « %s »"
 
-#~ msgid "Cannot hash `%s'.\n"
-#~ msgstr "Không thể tạo mẫu duy nhất đại diện cho « %s ».\n"
-
 #~ msgid "Initialization for indexing file `%s' failed.\n"
 #~ msgstr "Lỗi sơ khởi tập tin đánh chỉ mục « %s ».\n"
 
@@ -11770,9 +12273,6 @@
 #~ msgid "Inserting with hops %d\n"
 #~ msgstr "Đang chèn với số bước nhảy %d\n"
 
-#~ msgid "Request level %d from peer %d\n"
-#~ msgstr "Yêu cầu cấp %d từ đồng đẳng %d\n"
-
 #~ msgid "Receive table limit on peer reached %d\n"
 #~ msgstr "Giới hạn bảng nhận trên đồng đẳng đã tới %d\n"
 
@@ -13253,9 +13753,6 @@
 #~ msgid "This option is used when clients need to start gnunetd."
 #~ msgstr "Tùy chọn này dùng khi ứng dụng khách cần khởi chạy gnunetd."
 
-#~ msgid "General options"
-#~ msgstr "Tùy chọn chung"
-
 #~ msgid "Do not add metadata listing the creation time for inserted content"
 #~ msgstr ""
 #~ "Không nên thêm siêu dữ liệu mà ghi nhớ giờ tạo của nội dung được chèn vào"

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2014-12-24 15:11:43 UTC (rev 34787)
+++ gnunet/po/zh_CN.po  2014-12-24 16:59:19 UTC (rev 34788)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2014-06-04 18:25+0200\n"
+"POT-Creation-Date: 2014-12-09 00:23+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -355,149 +355,149 @@
 msgid "Received last message for %s \n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2793 src/ats/gnunet-ats-solver-eval.c:2827
-#: src/ats/gnunet-service-ats_addresses.c:1675
-#: src/ats/gnunet-service-ats_addresses.c:1719
+#: src/ats/gnunet-ats-solver-eval.c:2804 src/ats/gnunet-ats-solver-eval.c:2838
+#: src/ats/gnunet-service-ats_addresses.c:1781
+#: src/ats/gnunet-service-ats_addresses.c:1825
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2799
-#: src/ats/gnunet-service-ats_addresses.c:1682
+#: src/ats/gnunet-ats-solver-eval.c:2810
+#: src/ats/gnunet-service-ats_addresses.c:1788
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2806
-#: src/ats/gnunet-service-ats_addresses.c:1690
+#: src/ats/gnunet-ats-solver-eval.c:2817
+#: src/ats/gnunet-service-ats_addresses.c:1796
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2833
-#: src/ats/gnunet-service-ats_addresses.c:1726
+#: src/ats/gnunet-ats-solver-eval.c:2844
+#: src/ats/gnunet-service-ats_addresses.c:1832
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2840
-#: src/ats/gnunet-service-ats_addresses.c:1734
+#: src/ats/gnunet-ats-solver-eval.c:2851
+#: src/ats/gnunet-service-ats_addresses.c:1840
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3397
-#: src/ats-tests/gnunet-solver-eval.c:919
+#: src/ats/gnunet-ats-solver-eval.c:3410
+#: src/ats-tests/gnunet-solver-eval.c:918
 msgid "solver to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3400
-#: src/ats-tests/gnunet-solver-eval.c:922
-#: src/ats-tests/gnunet-solver-eval.c:925
+#: src/ats/gnunet-ats-solver-eval.c:3413
+#: src/ats-tests/gnunet-solver-eval.c:921
+#: src/ats-tests/gnunet-solver-eval.c:924
 msgid "experiment to use"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3403
+#: src/ats/gnunet-ats-solver-eval.c:3416
 msgid "be verbose"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3406
+#: src/ats/gnunet-ats-solver-eval.c:3419
 #, fuzzy
 msgid "print logging"
 msgstr "未知的命令“%s”。\n"
 
-#: src/ats/gnunet-ats-solver-eval.c:3409
+#: src/ats/gnunet-ats-solver-eval.c:3422
 msgid "save logging to disk"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:3412
+#: src/ats/gnunet-ats-solver-eval.c:3425
 msgid "disable normalization"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1912
+#: src/ats/gnunet-service-ats_addresses.c:2039
 #, c-format
 msgid "Initializing solver `%s '`%s'\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1915
+#: src/ats/gnunet-service-ats_addresses.c:2042
 #, fuzzy, c-format
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1938
+#: src/ats/gnunet-service-ats_addresses.c:2065
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/ats/plugin_ats_mlp.c:949
+#: src/ats/plugin_ats_mlp.c:1344
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1542
+#: src/ats/plugin_ats_mlp.c:1941
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:1589
+#: src/ats/plugin_ats_mlp.c:1988
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2299
+#: src/ats/plugin_ats_mlp.c:2704
 msgid ""
 "MLP solver is not optimizing for anything, changing to feasibility check\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2339 src/ats/plugin_ats_mlp.c:2356
-#: src/ats/plugin_ats_mlp.c:2388 src/ats/plugin_ats_mlp.c:2406
-#: src/ats/plugin_ats_mlp.c:2425 src/ats/plugin_ats_proportional.c:458
-#: src/ats/plugin_ats_proportional.c:475 src/ats/plugin_ats_ril.c:2220
-#: src/ats/plugin_ats_ril.c:2237 src/ats/plugin_ats_ril.c:2254
-#: src/ats/plugin_ats_ril.c:2271 src/ats/plugin_ats_ril.c:2288
-#: src/ats/plugin_ats_ril.c:2305 src/ats/plugin_ats_ril.c:2322
-#: src/ats/plugin_ats_ril.c:2339
+#: src/ats/plugin_ats_mlp.c:2744 src/ats/plugin_ats_mlp.c:2761
+#: src/ats/plugin_ats_mlp.c:2793 src/ats/plugin_ats_mlp.c:2811
+#: src/ats/plugin_ats_mlp.c:2830 src/ats/plugin_ats_proportional.c:1989
+#: src/ats/plugin_ats_proportional.c:2010 src/ats/plugin_ats_ril.c:2718
+#: src/ats/plugin_ats_ril.c:2735 src/ats/plugin_ats_ril.c:2752
+#: src/ats/plugin_ats_ril.c:2769 src/ats/plugin_ats_ril.c:2786
+#: src/ats/plugin_ats_ril.c:2803 src/ats/plugin_ats_ril.c:2820
+#: src/ats/plugin_ats_ril.c:2837
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats/plugin_ats_mlp.c:2512
+#: src/ats/plugin_ats_mlp.c:2917
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2521
+#: src/ats/plugin_ats_mlp.c:2926
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2532
+#: src/ats/plugin_ats_mlp.c:2937
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2540
+#: src/ats/plugin_ats_mlp.c:2945
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/plugin_ats_mlp.c:2551
+#: src/ats/plugin_ats_mlp.c:2956
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1819
+#: src/ats/plugin_ats_proportional.c:1847
 #, fuzzy, c-format
 msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
@@ -535,7 +535,7 @@
 msgid "Could not connect master [%u] and slave [%u]\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:673
+#: src/ats-tests/ats-testing.c:490 src/ats-tests/ats-testing.c:677
 #, fuzzy
 msgid "Initialization failed, shutdown\n"
 msgstr "插件机构初始化失败：%s！\n"
@@ -556,169 +556,187 @@
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:169
+#: src/ats-tool/gnunet-ats.c:296
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:171
+#: src/ats-tool/gnunet-ats.c:300
 #, c-format
-msgid "ATS returned results for %u addresses\n"
+msgid "ATS returned stat_results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:258
+#: src/ats-tool/gnunet-ats.c:378
+msgid "active "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:378
+msgid "inactive "
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:427
 #, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:467
+#: src/ats-tool/gnunet-ats.c:544
 #, c-format
+msgid "Removed address of peer `%s' with plugin `%s'\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:747
+#, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:487 src/namestore/gnunet-namestore.c:639
-#: src/transport/gnunet-transport.c:1349
+#: src/ats-tool/gnunet-ats.c:779 src/namestore/gnunet-namestore.c:700
+#: src/transport/gnunet-transport.c:1855
+#: src/transport/gnunet-transport-profiler.c:531
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "服务已删除。\n"
 
-#: src/ats-tool/gnunet-ats.c:499 src/transport/gnunet-transport.c:1358
+#: src/ats-tool/gnunet-ats.c:793 src/transport/gnunet-transport.c:1864
+#: src/transport/gnunet-transport-profiler.c:549
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:803
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:524 src/ats-tool/gnunet-ats.c:543
-#: src/ats-tool/gnunet-ats.c:560 src/ats-tool/gnunet-ats.c:597
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:825 src/ats-tool/gnunet-ats.c:851
+#: src/ats-tool/gnunet-ats.c:879 src/ats-tool/gnunet-ats.c:925
+#, fuzzy
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:532 src/ats-tool/gnunet-ats.c:549
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:837 src/ats-tool/gnunet-ats.c:863
+#, fuzzy
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:569
-#, fuzzy, c-format
+#: src/ats-tool/gnunet-ats.c:891
+#, fuzzy
 msgid "No preference type given!\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/ats-tool/gnunet-ats.c:574
-#, c-format
+#: src/ats-tool/gnunet-ats.c:898
 msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:590
+#: src/ats-tool/gnunet-ats.c:916
 msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:648
+#: src/ats-tool/gnunet-ats.c:984
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:650
+#: src/ats-tool/gnunet-ats.c:986
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:653
+#: src/ats-tool/gnunet-ats.c:989
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/ats-tool/gnunet-ats.c:655
+#: src/ats-tool/gnunet-ats.c:991
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:657
+#: src/ats-tool/gnunet-ats.c:993
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/ats-tool/gnunet-ats.c:659
+#: src/ats-tool/gnunet-ats.c:995
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:661
+#: src/ats-tool/gnunet-ats.c:997
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:664
+#: src/ats-tool/gnunet-ats.c:1000
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:666
+#: src/ats-tool/gnunet-ats.c:1002
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:669
+#: src/ats-tool/gnunet-ats.c:1005
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:676
+#: src/ats-tool/gnunet-ats.c:1012
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/cadet/gnunet-cadet.c:357
+#: src/cadet/gnunet-cadet.c:376
 #, fuzzy, c-format
 msgid "Invalid target `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/cadet/gnunet-cadet.c:607
+#: src/cadet/gnunet-cadet.c:626
 #, fuzzy, c-format
 msgid "Invalid peer ID `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/cadet/gnunet-cadet.c:650
+#: src/cadet/gnunet-cadet.c:669
 #, fuzzy, c-format
 msgid "Invalid tunnel owner `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/cadet/gnunet-cadet.c:716
+#: src/cadet/gnunet-cadet.c:735
 msgid "You must NOT give a TARGETwhen using 'request all' options\n"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:807
+#: src/cadet/gnunet-cadet.c:832
 #, fuzzy
 msgid "provide information about a particular connection"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/cadet/gnunet-cadet.c:810
+#: src/cadet/gnunet-cadet.c:835
 msgid "activate echo mode"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:816
+#: src/cadet/gnunet-cadet.c:838
+msgid "dump debug information to STDERR"
+msgstr ""
+
+#: src/cadet/gnunet-cadet.c:844
 msgid "port to listen to (default; 0)"
 msgstr ""
 
-#: src/cadet/gnunet-cadet.c:819
+#: src/cadet/gnunet-cadet.c:847
 #, fuzzy
 msgid "provide information about a patricular peer"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/cadet/gnunet-cadet.c:822
+#: src/cadet/gnunet-cadet.c:850
 #, fuzzy
 msgid "provide information about all peers"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/cadet/gnunet-cadet.c:825
+#: src/cadet/gnunet-cadet.c:853
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/cadet/gnunet-cadet.c:828
+#: src/cadet/gnunet-cadet.c:856
 #, fuzzy
 msgid "provide information about all tunnels"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/cadet/gnunet-service-cadet_peer.c:429
+#: src/cadet/gnunet-service-cadet_peer.c:496
 msgid "Wrong CORE service\n"
 msgstr ""
 
@@ -733,8 +751,8 @@
 msgstr ""
 
 #: src/consensus/gnunet-consensus-profiler.c:443
-#: src/set/gnunet-set-profiler.c:286 src/set/gnunet-set-profiler.c:289
-#: src/set/gnunet-set-profiler.c:292
+#: src/set/gnunet-set-profiler.c:289 src/set/gnunet-set-profiler.c:292
+#: src/set/gnunet-set-profiler.c:295
 #, fuzzy
 msgid "number of values"
 msgstr "迭代次数"
@@ -752,269 +770,270 @@
 msgid "be more verbose (print received values)"
 msgstr ""
 
-#: src/conversation/conversation_api.c:557
-#: src/conversation/conversation_api_call.c:470
+#: src/conversation/conversation_api.c:493
+#: src/conversation/conversation_api_call.c:475
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/conversation_api.c:681
+#: src/conversation/conversation_api.c:617
 #, fuzzy
 msgid "number too large"
 msgstr "迭代次数"
 
-#: src/conversation/gnunet-conversation.c:264
+#: src/conversation/gnunet-conversation.c:269
 #, c-format
 msgid "Incoming call from `%s'. Please /accept #%u or /cancel %u the call.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:286
+#: src/conversation/gnunet-conversation.c:291
 #, c-format
 msgid "Call from `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:319
+#: src/conversation/gnunet-conversation.c:323
 #, c-format
 msgid "Call from `%s' suspended by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:324
+#: src/conversation/gnunet-conversation.c:328
 #, c-format
 msgid "Call from `%s' resumed by other user\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:342
+#: src/conversation/gnunet-conversation.c:346
 #, c-format
 msgid "Ego `%s' no longer available, phone is now down.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:356
+#: src/conversation/gnunet-conversation.c:360
 #, fuzzy
 msgid "Failed to setup phone (internal error)\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:368
+#: src/conversation/gnunet-conversation.c:372
 #, c-format
 msgid ""
 "Phone active on line %u.  Type `/help' for a list of available commands\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:390
+#: src/conversation/gnunet-conversation.c:394
 #, c-format
 msgid "Resolved address of `%s'. Now ringing other party.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:397
+#: src/conversation/gnunet-conversation.c:401
 #, fuzzy, c-format
 msgid "Connection established to `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/conversation/gnunet-conversation.c:404
+#: src/conversation/gnunet-conversation.c:408
 #, fuzzy, c-format
 msgid "Failed to resolve `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/conversation/gnunet-conversation.c:411
-msgid "Call terminated\n"
+#: src/conversation/gnunet-conversation.c:416
+#, c-format
+msgid "Call to `%s' terminated\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:417
+#: src/conversation/gnunet-conversation.c:425
 #, c-format
 msgid "Connection to `%s' suspended (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:423
+#: src/conversation/gnunet-conversation.c:431
 #, c-format
 msgid "Connection to `%s' resumed (by other user)\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:428
+#: src/conversation/gnunet-conversation.c:436
 msgid "Error with the call, restarting it\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:495
+#: src/conversation/gnunet-conversation.c:504
 #, fuzzy, c-format
 msgid "Unknown command `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/conversation/gnunet-conversation.c:511
-#: src/conversation/gnunet-conversation.c:525
+#: src/conversation/gnunet-conversation.c:520
+#: src/conversation/gnunet-conversation.c:534
 #, c-format
 msgid "Ego `%s' not available\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:518
-#: src/conversation/gnunet-conversation.c:575
+#: src/conversation/gnunet-conversation.c:527
+#: src/conversation/gnunet-conversation.c:584
 msgid "You are calling someone else already, hang up first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:533
-#: src/conversation/gnunet-conversation.c:588
+#: src/conversation/gnunet-conversation.c:542
+#: src/conversation/gnunet-conversation.c:597
 #, c-format
 msgid "You are answering call from `%s', hang up or suspend that call first!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:544
+#: src/conversation/gnunet-conversation.c:552
 msgid "Call recipient missing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:599
+#: src/conversation/gnunet-conversation.c:608
 msgid "There is no incoming call to accept here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:616
+#: src/conversation/gnunet-conversation.c:625
 #, c-format
 msgid "There is no incoming call `%s' to accept right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:647
+#: src/conversation/gnunet-conversation.c:655
 msgid "We currently do not have an address.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:670
+#: src/conversation/gnunet-conversation.c:678
 #, c-format
 msgid "We are currently trying to locate the private key for the ego `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:675
+#: src/conversation/gnunet-conversation.c:683
 #, c-format
 msgid "We are listening for incoming calls for ego `%s' on line %u.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:681
-#: src/conversation/gnunet-conversation.c:705
+#: src/conversation/gnunet-conversation.c:689
+#: src/conversation/gnunet-conversation.c:713
 #, c-format
 msgid "You are having a conversation with `%s'.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:686
+#: src/conversation/gnunet-conversation.c:694
 msgid ""
 "We had an internal error setting up our phone line. You can still make "
 "calls.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:695
+#: src/conversation/gnunet-conversation.c:703
 #, fuzzy, c-format
 msgid "We are trying to find the network address to call `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/conversation/gnunet-conversation.c:700
+#: src/conversation/gnunet-conversation.c:708
 #, c-format
 msgid "We are calling `%s', his phone should be ringing.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:719
+#: src/conversation/gnunet-conversation.c:727
 msgid "Calls waiting:\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:725
+#: src/conversation/gnunet-conversation.c:733
 #, fuzzy, c-format
 msgid "#%u: `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/conversation/gnunet-conversation.c:753
-#: src/conversation/gnunet-conversation.c:768
+#: src/conversation/gnunet-conversation.c:761
+#: src/conversation/gnunet-conversation.c:776
 msgid "There is no call that could be suspended right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:801
-#: src/conversation/gnunet-conversation.c:817
+#: src/conversation/gnunet-conversation.c:809
+#: src/conversation/gnunet-conversation.c:825
 msgid "There is no call that could be resumed right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:824
+#: src/conversation/gnunet-conversation.c:832
 #, c-format
 msgid "Already talking with `%s', cannot resume a call right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:833
+#: src/conversation/gnunet-conversation.c:841
 msgid "There is no incoming call to resume here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:850
+#: src/conversation/gnunet-conversation.c:858
 #, c-format
 msgid "There is no incoming call `%s' to resume right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:885
+#: src/conversation/gnunet-conversation.c:893
 msgid "There is no call that could be cancelled right now.\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:893
+#: src/conversation/gnunet-conversation.c:901
 msgid "There is no incoming call to refuse here!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:910
+#: src/conversation/gnunet-conversation.c:918
 #, c-format
 msgid "There is no incoming call `%s' to refuse right now!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:937
+#: src/conversation/gnunet-conversation.c:944
 msgid "Use `/address' to find out which address this phone should have in GNS"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:939
+#: src/conversation/gnunet-conversation.c:946
 msgid "Use `/call USER.gnu' to call USER"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:941
+#: src/conversation/gnunet-conversation.c:948
 msgid "Use `/accept #NUM' to accept incoming call #NUM"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:943
+#: src/conversation/gnunet-conversation.c:950
 msgid "Use `/suspend' to suspend the active call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:945
+#: src/conversation/gnunet-conversation.c:952
 msgid ""
 "Use `/resume [#NUM]' to resume a call, #NUM is needed to resume incoming "
 "calls, no argument is needed to resume the current outgoing call."
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:947
+#: src/conversation/gnunet-conversation.c:954
 msgid "Use `/cancel' to reject or terminate a call"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:949
+#: src/conversation/gnunet-conversation.c:956
 msgid "Use `/status' to print status information"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:951
+#: src/conversation/gnunet-conversation.c:958
 msgid "Use `/quit' to terminate gnunet-conversation"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:953
+#: src/conversation/gnunet-conversation.c:960
 msgid "Use `/help command' to get help for a specific command"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1151
+#: src/conversation/gnunet-conversation.c:1168
 #, fuzzy, c-format
 msgid "Name of our ego changed to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/conversation/gnunet-conversation.c:1164
+#: src/conversation/gnunet-conversation.c:1181
 #, c-format
 msgid "Our ego `%s' was deleted!\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1199
+#: src/conversation/gnunet-conversation.c:1216
 #, fuzzy
 msgid "You must specify the NAME of an ego to use\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/conversation/gnunet-conversation.c:1223
+#: src/conversation/gnunet-conversation.c:1240
 #, fuzzy
 msgid "Failed to start gnunet-helper-w32-console\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/conversation/gnunet-conversation.c:1249
+#: src/conversation/gnunet-conversation.c:1266
 msgid "sets the NAME of the ego to use for the phone (and name resolution)"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1252
+#: src/conversation/gnunet-conversation.c:1269
 msgid "sets the LINE to use for the phone"
 msgstr ""
 
-#: src/conversation/gnunet-conversation.c:1276
+#: src/conversation/gnunet-conversation.c:1295
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
@@ -1042,6 +1061,7 @@
 
 #: src/conversation/gnunet-conversation-test.c:248
 #: src/multicast/gnunet-multicast.c:70 src/revocation/gnunet-revocation.c:522
+#: src/sensordashboard/gnunet-sensordashboard.c:70
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr ""
@@ -1051,59 +1071,59 @@
 msgid "pa_stream_write() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:587
+#: src/conversation/gnunet-helper-audio-playback.c:589
 msgid "gnunet-helper-audio-playback - Got signal, exiting\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:612
+#: src/conversation/gnunet-helper-audio-playback.c:614
 #: src/conversation/gnunet-helper-audio-record.c:545
 msgid "Connection established.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:617
+#: src/conversation/gnunet-helper-audio-playback.c:619
 #: src/conversation/gnunet-helper-audio-record.c:550
 #, fuzzy, c-format
 msgid "pa_stream_new() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:631
+#: src/conversation/gnunet-helper-audio-playback.c:633
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:644
+#: src/conversation/gnunet-helper-audio-playback.c:646
 #: src/conversation/gnunet-helper-audio-record.c:576
 #, fuzzy, c-format
 msgid "Connection failure: %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:665
+#: src/conversation/gnunet-helper-audio-playback.c:667
 #: src/conversation/gnunet-helper-audio-record.c:599
 msgid "Wrong Spec\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:671
+#: src/conversation/gnunet-helper-audio-playback.c:673
 #: src/conversation/gnunet-helper-audio-record.c:605
 msgid "pa_mainloop_new() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:685
+#: src/conversation/gnunet-helper-audio-playback.c:687
 #: src/conversation/gnunet-helper-audio-record.c:620
 msgid "pa_context_new() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:692
+#: src/conversation/gnunet-helper-audio-playback.c:694
 #: src/conversation/gnunet-helper-audio-record.c:626
 #, fuzzy, c-format
 msgid "pa_context_connect() failed: %s\n"
 msgstr "“%s”说：%s\n"
 
-#: src/conversation/gnunet-helper-audio-playback.c:698
+#: src/conversation/gnunet-helper-audio-playback.c:700
 #: src/conversation/gnunet-helper-audio-record.c:632
 msgid "pa_mainloop_run() failed.\n"
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback.c:768
+#: src/conversation/gnunet-helper-audio-playback.c:770
 #, c-format
 msgid "Read error from STDIN: %s\n"
 msgstr ""
@@ -1172,17 +1192,17 @@
 msgid "Failed to allocate %d bytes for second packet\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/conversation/gnunet-service-conversation.c:852
+#: src/conversation/gnunet-service-conversation.c:853
 msgid "Cadet audio channel not ready; audio data dropped\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:943
+#: src/conversation/gnunet-service-conversation.c:944
 #, c-format
 msgid ""
 "No available phone for incoming call on line %u, sending HANG_UP signal\n"
 msgstr ""
 
-#: src/conversation/gnunet-service-conversation.c:1349
+#: src/conversation/gnunet-service-conversation.c:1351
 #, fuzzy, c-format
 msgid "Received incoming Cadet channel on port %u\n"
 msgstr "“%s”已连接到“%s”。\n"
@@ -1248,7 +1268,7 @@
 msgid "%24s: %-30s %4s (timeout in %6s)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:705
+#: src/core/gnunet-core.c:146 src/peerinfo-tool/gnunet-peerinfo.c:761
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
@@ -1259,7 +1279,7 @@
 msgid "Failed to connect to CORE service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:1590
+#: src/core/gnunet-core.c:179 src/transport/gnunet-transport.c:2115
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
@@ -1290,130 +1310,130 @@
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:549
+#: src/core/gnunet-service-core_kx.c:565
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:601
+#: src/core/gnunet-service-core_kx.c:617
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:688
+#: src/core/gnunet-service-core_kx.c:703
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:732
+#: src/core/gnunet-service-core_kx.c:747
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:832
+#: src/core/gnunet-service-core_kx.c:847
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:839
+#: src/core/gnunet-service-core_kx.c:854
 msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:873
+#: src/core/gnunet-service-core_kx.c:888
 #, c-format
 msgid ""
 "Ephemeral key message from peer `%s' rejected as its validity range does not "
 "match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:884
+#: src/core/gnunet-service-core_kx.c:899
 msgid "# EPHEMERAL_KEY messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:983
+#: src/core/gnunet-service-core_kx.c:998
 #: src/transport/gnunet-service-transport_validation.c:1016
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:991
+#: src/core/gnunet-service-core_kx.c:1006
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1018
+#: src/core/gnunet-service-core_kx.c:1033
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1035
+#: src/core/gnunet-service-core_kx.c:1049
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1061
+#: src/core/gnunet-service-core_kx.c:1075
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1072
+#: src/core/gnunet-service-core_kx.c:1086
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1139
-#: src/transport/gnunet-service-transport_validation.c:1328
+#: src/core/gnunet-service-core_kx.c:1153
+#: src/transport/gnunet-service-transport_validation.c:1359
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1145
+#: src/core/gnunet-service-core_kx.c:1159
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1150
+#: src/core/gnunet-service-core_kx.c:1164
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1180
+#: src/core/gnunet-service-core_kx.c:1194
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1215
+#: src/core/gnunet-service-core_kx.c:1229
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1226
+#: src/core/gnunet-service-core_kx.c:1240
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1233
+#: src/core/gnunet-service-core_kx.c:1247
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1374
+#: src/core/gnunet-service-core_kx.c:1386
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1381
+#: src/core/gnunet-service-core_kx.c:1393
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1384
+#: src/core/gnunet-service-core_kx.c:1396
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1430
-#: src/core/gnunet-service-core_kx.c:1455
+#: src/core/gnunet-service-core_kx.c:1442
+#: src/core/gnunet-service-core_kx.c:1467
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1442
+#: src/core/gnunet-service-core_kx.c:1454
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1484
+#: src/core/gnunet-service-core_kx.c:1496
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1492
+#: src/core/gnunet-service-core_kx.c:1504
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1527
+#: src/core/gnunet-service-core_kx.c:1539
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
@@ -1439,14 +1459,13 @@
 #: src/core/gnunet-service-core_sessions.c:328
 #: src/dht/gnunet-service-dht_neighbours.c:662
 #: src/dht/gnunet-service-dht_neighbours.c:727
-#: src/dht/gnunet-service-xdht_neighbours.c:3586
-#: src/fs/gnunet-service-fs_cp.c:606 src/fs/gnunet-service-fs_cp.c:1501
-#: src/topology/gnunet-daemon-topology.c:707
-#: src/topology/gnunet-daemon-topology.c:808
+#: src/fs/gnunet-service-fs_cp.c:618 src/fs/gnunet-service-fs_cp.c:1517
+#: src/topology/gnunet-daemon-topology.c:734
+#: src/topology/gnunet-daemon-topology.c:835
 #: src/transport/gnunet-service-transport_neighbours.c:917
 #: src/transport/gnunet-service-transport_neighbours.c:1141
-#: src/transport/gnunet-service-transport_neighbours.c:3146
-#: src/transport/gnunet-service-transport_neighbours.c:3449
+#: src/transport/gnunet-service-transport_neighbours.c:3177
+#: src/transport/gnunet-service-transport_neighbours.c:3491
 msgid "# peers connected"
 msgstr ""
 
@@ -1516,7 +1535,7 @@
 msgid "Heap datacache running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/datacache/plugin_datacache_postgres.c:392
+#: src/datacache/plugin_datacache_postgres.c:391
 msgid "Postgres datacache running\n"
 msgstr ""
 
@@ -1536,24 +1555,24 @@
 #: src/testbed/gnunet-daemon-latency-logger.c:52
 #: src/testbed/gnunet-daemon-testbed-underlay.c:55
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:51
-#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:602
-#: src/include/gnunet_common.h:611 src/scalarproduct/scalarproduct.h:44
+#: src/util/crypto_mpi.c:39 src/include/gnunet_common.h:622
+#: src/include/gnunet_common.h:631 src/scalarproduct/scalarproduct.h:35
 #, 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:450
+#: src/datacache/plugin_datacache_sqlite.c:449
 msgid "Sqlite datacache running\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:484
-#: src/datastore/plugin_datastore_sqlite.c:404
-#: src/namecache/plugin_namecache_sqlite.c:295
-#: src/namestore/plugin_namestore_sqlite.c:327
+#: src/datacache/plugin_datacache_sqlite.c:483
+#: src/datastore/plugin_datastore_sqlite.c:401
+#: src/namecache/plugin_namecache_sqlite.c:292
+#: src/namestore/plugin_namestore_sqlite.c:324
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
-#: src/datacache/plugin_datacache_sqlite.c:491
+#: src/datacache/plugin_datacache_sqlite.c:490
 #, fuzzy, c-format
 msgid "Failed to close statement %p: %d\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -1840,12 +1859,12 @@
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:824
+#: src/datastore/plugin_datastore_postgres.c:832
 #, fuzzy
 msgid "Failed to drop table from database.\n"
 msgstr "发送消息失败。\n"
 
-#: src/datastore/plugin_datastore_postgres.c:860
+#: src/datastore/plugin_datastore_postgres.c:868
 #: src/namecache/plugin_namecache_postgres.c:414
 #: src/namestore/plugin_namestore_postgres.c:569
 msgid "Postgres database running\n"
@@ -1862,31 +1881,31 @@
 #: src/datastore/plugin_datastore_sqlite.c:255
 #: src/namecache/plugin_namecache_sqlite.c:193
 #: src/namestore/plugin_namestore_sqlite.c:204
-#: src/peerstore/plugin_peerstore_sqlite.c:434
-#: src/psycstore/plugin_psycstore_sqlite.c:319
+#: src/peerstore/plugin_peerstore_sqlite.c:458
+#: src/psycstore/plugin_psycstore_sqlite.c:329
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:663
+#: src/datastore/plugin_datastore_sqlite.c:661
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1156
+#: src/datastore/plugin_datastore_sqlite.c:1154
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1175
+#: src/datastore/plugin_datastore_sqlite.c:1173
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1215
-#: src/namecache/plugin_namecache_sqlite.c:583
-#: src/namestore/plugin_namestore_sqlite.c:719
+#: src/datastore/plugin_datastore_sqlite.c:1213
+#: src/namecache/plugin_namecache_sqlite.c:580
+#: src/namestore/plugin_namestore_sqlite.c:716
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
@@ -1895,7 +1914,7 @@
 msgid "Template database running\n"
 msgstr ""
 
-#: src/dht/dht_api.c:376
+#: src/dht/dht_api.c:403
 #, fuzzy
 msgid "Failed to connect to the DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -1943,7 +1962,7 @@
 
 #: src/dht/gnunet-dht-get.c:204 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:877
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:939
 #: src/fs/gnunet-search.c:301 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:873
 msgid "be verbose (print progress information)"
@@ -1961,6 +1980,53 @@
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
+#: src/dht/gnunet_dht_profiler.c:1392
+#: src/testbed/gnunet-testbed-profiler.c:267
+#, fuzzy, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "增加 TCP/IP 的最大连接数"
+
+#: src/dht/gnunet_dht_profiler.c:1417
+#, fuzzy
+msgid "number of peers to start"
+msgstr "迭代次数"
+
+#: src/dht/gnunet_dht_profiler.c:1420
+msgid ""
+"maximum number of times we try to search for successor circle formation (0 "
+"for R5N)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1423 src/nse/gnunet-nse-profiler.c:864
+#: src/testbed/gnunet-testbed-profiler.c:306
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1426
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1429
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1432
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1435
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1438
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1456
+#, fuzzy
+msgid "Measure quality and performance of the DHT service."
+msgstr "无法访问该服务"
+
 #: src/dht/gnunet-dht-put.c:118
 msgid "PUT request sent with key"
 msgstr ""
@@ -2007,108 +2073,108 @@
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:176
+#: src/dht/gnunet-service-dht.c:172 src/dht/gnunet-service-xdht.c:193
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/dht/gnunet-service-dht_clients.c:417
-#: src/dht/gnunet-service-xdht_clients.c:838
+#: src/dht/gnunet-service-xdht_clients.c:844
 msgid "# GET requests from clients injected"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:513
-#: src/dht/gnunet-service-xdht_clients.c:925
+#: src/dht/gnunet-service-xdht_clients.c:928
 msgid "# PUT requests received from clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:597
-#: src/dht/gnunet-service-xdht_clients.c:1010
+#: src/dht/gnunet-service-xdht_clients.c:993
 msgid "# GET requests received from clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:798
-#: src/dht/gnunet-service-xdht_clients.c:1211
+#: src/dht/gnunet-service-xdht_clients.c:1195
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1040
-#: src/dht/gnunet-service-xdht_clients.c:498
+#: src/dht/gnunet-service-xdht_clients.c:503
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1053
-#: src/dht/gnunet-service-xdht_clients.c:511
+#: src/dht/gnunet-service-xdht_clients.c:517
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1090
-#: src/dht/gnunet-service-xdht_clients.c:548
+#: src/dht/gnunet-service-xdht_clients.c:554
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1113
-#: src/dht/gnunet-service-xdht_clients.c:571
+#: src/dht/gnunet-service-xdht_clients.c:577
 msgid "# RESULTS queued for clients"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1167
 #: src/dht/gnunet-service-dht_clients.c:1210
-#: src/dht/gnunet-service-xdht_clients.c:625
-#: src/dht/gnunet-service-xdht_clients.c:668
+#: src/dht/gnunet-service-xdht_clients.c:631
+#: src/dht/gnunet-service-xdht_clients.c:674
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_clients.c:1177
-#: src/dht/gnunet-service-xdht_clients.c:635
+#: src/dht/gnunet-service-xdht_clients.c:641
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:68
-#: src/dht/gnunet-service-xdht_datacache.c:69
+#: src/dht/gnunet-service-xdht_datacache.c:71
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:78
-#: src/dht/gnunet-service-xdht_datacache.c:79
+#: src/dht/gnunet-service-xdht_datacache.c:82
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:165
-#: src/dht/gnunet-service-xdht_datacache.c:213
+#: src/dht/gnunet-service-xdht_datacache.c:221
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:176
-#: src/dht/gnunet-service-xdht_datacache.c:234
+#: src/dht/gnunet-service-xdht_datacache.c:244
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:182
-#: src/dht/gnunet-service-xdht_datacache.c:240
+#: src/dht/gnunet-service-xdht_datacache.c:250
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:188
-#: src/dht/gnunet-service-xdht_datacache.c:246
+#: src/dht/gnunet-service-xdht_datacache.c:256
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:200
-#: src/dht/gnunet-service-xdht_datacache.c:258
+#: src/dht/gnunet-service-xdht_datacache.c:268
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:203
-#: src/dht/gnunet-service-xdht_datacache.c:261
+#: src/dht/gnunet-service-xdht_datacache.c:271
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_datacache.c:234
-#: src/dht/gnunet-service-xdht_datacache.c:298
+#: src/dht/gnunet-service-xdht_datacache.c:309
 msgid "# GET requests given to datacache"
 msgstr ""
 
@@ -2126,16 +2192,16 @@
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:764
+#: src/dht/gnunet-service-xdht_neighbours.c:6055
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:819
-#: src/dht/gnunet-service-xdht_neighbours.c:745
+#: src/dht/gnunet-service-xdht_neighbours.c:1012
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
 #: src/dht/gnunet-service-dht_neighbours.c:857
-#: src/dht/gnunet-service-xdht_neighbours.c:786
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
@@ -2164,15 +2230,15 @@
 #: src/dht/gnunet-service-dht_neighbours.c:1328
 #: src/dht/gnunet-service-dht_neighbours.c:1452
 #: src/dht/gnunet-service-dht_neighbours.c:1557
-#: src/dht/gnunet-service-xdht_neighbours.c:843
-#: src/dht/gnunet-service-xdht_neighbours.c:910
-#: src/dht/gnunet-service-xdht_neighbours.c:980
-#: src/dht/gnunet-service-xdht_neighbours.c:1040
-#: src/dht/gnunet-service-xdht_neighbours.c:1098
-#: src/dht/gnunet-service-xdht_neighbours.c:1157
-#: src/dht/gnunet-service-xdht_neighbours.c:1218
-#: src/dht/gnunet-service-xdht_neighbours.c:1280
-#: src/dht/gnunet-service-xdht_neighbours.c:1341
+#: src/dht/gnunet-service-xdht_neighbours.c:1121
+#: src/dht/gnunet-service-xdht_neighbours.c:1190
+#: src/dht/gnunet-service-xdht_neighbours.c:1240
+#: src/dht/gnunet-service-xdht_neighbours.c:1304
+#: src/dht/gnunet-service-xdht_neighbours.c:1371
+#: src/dht/gnunet-service-xdht_neighbours.c:1433
+#: src/dht/gnunet-service-xdht_neighbours.c:1495
+#: src/dht/gnunet-service-xdht_neighbours.c:1557
+#: src/dht/gnunet-service-xdht_neighbours.c:1617
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
@@ -2264,6 +2330,109 @@
 msgid "# DHT requests combined"
 msgstr ""
 
+#: src/dht/gnunet-service-xdht_neighbours.c:1824
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail_length = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1829
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail[%d]=%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1849
+#, c-format
+msgid ""
+"\n"
+"SUPU************  FRIEND_PEERMAP of %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1859
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, friend = %s, friend->trails_count = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1880
+#, c-format
+msgid ""
+"\n"
+"SUPU************  FINGER_TABLE of %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1889
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, finger_table[%d] = %s, trails_count = %d"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1896
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail_id[%d]=%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:1902
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d,trail[%d] = %s "
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:3551
+msgid "# FINGERS_COUNT"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_neighbours.c:3692
+#: src/dht/gnunet-service-xdht_neighbours.c:3930
+#: src/dht/gnunet-service-xdht_neighbours.c:4083
+#: src/dht/gnunet-service-xdht_neighbours.c:4233
+#: src/dht/gnunet-service-xdht_neighbours.c:4414
+#: src/dht/gnunet-service-xdht_neighbours.c:4929
+#: src/dht/gnunet-service-xdht_neighbours.c:5323
+#: src/dht/gnunet-service-xdht_neighbours.c:5416
+#: src/dht/gnunet-service-xdht_neighbours.c:5505
+#: src/dht/gnunet-service-xdht_neighbours.c:5609
+#: src/dht/gnunet-service-xdht_neighbours.c:5753
+#: src/dht/gnunet-service-xdht_neighbours.c:5842
+msgid "# Bytes received from other peers"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:256
+#, c-format
+msgid ""
+"\n"
+"SUPU ***PRINTING ROUTING TABLE ***** of =%s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:264
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->trail_id = %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:267
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->next_hop = %s"
+msgstr ""
+
+#: src/dht/gnunet-service-xdht_routing.c:270
+#, c-format
+msgid ""
+"\n"
+"SUPU %s, %s, %d, trail->prev_hop = %s"
+msgstr ""
+
 #: src/dht/plugin_block_dht.c:138
 #, c-format
 msgid "Block not of type %u\n"
@@ -2278,12 +2447,12 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:257
+#: src/dns/dnsparser.c:254
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/dns/dnsparser.c:856
+#: src/dns/dnsparser.c:818
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
@@ -2313,15 +2482,15 @@
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:355
+#: src/dns/gnunet-dns-monitor.c:352
 msgid "only monitor DNS queries"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:358
+#: src/dns/gnunet-dns-monitor.c:355
 msgid "only monitor DNS replies"
 msgstr ""
 
-#: src/dns/gnunet-dns-monitor.c:369
+#: src/dns/gnunet-dns-monitor.c:366
 msgid "Monitor DNS queries."
 msgstr ""
 
@@ -2739,6 +2908,7 @@
 msgstr ""
 
 #: src/fragmentation/defragmentation.c:456
+#: src/transport/plugin_transport_wlan.c:1474
 msgid "# fragments received"
 msgstr ""
 
@@ -2782,71 +2952,71 @@
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:465
+#: src/fs/fs_api.c:474
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:474
+#: src/fs/fs_api.c:485
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/fs_api.c:480
+#: src/fs/fs_api.c:493
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1066
+#: src/fs/fs_api.c:1101
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:1571
+#: src/fs/fs_api.c:1621
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1585
+#: src/fs/fs_api.c:1635
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2242
+#: src/fs/fs_api.c:2293
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2252
+#: src/fs/fs_api.c:2303
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2619
+#: src/fs/fs_api.c:2431 src/fs/fs_api.c:2679
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:2395
+#: src/fs/fs_api.c:2449
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:2409 src/fs/fs_api.c:2428 src/fs/fs_api.c:2911
+#: src/fs/fs_api.c:2464 src/fs/fs_api.c:2483 src/fs/fs_api.c:2975
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2610
+#: src/fs/fs_api.c:2669
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2855
+#: src/fs/fs_api.c:2918
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2949
+#: src/fs/fs_api.c:3013
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2957,63 +3127,63 @@
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:415
+#: src/fs/fs_publish.c:126 src/fs/fs_publish.c:431
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:667 src/fs/fs_publish.c:684 src/fs/fs_publish.c:723
-#: src/fs/fs_publish.c:744 src/fs/fs_publish.c:768 src/fs/fs_publish.c:914
+#: src/fs/fs_publish.c:683 src/fs/fs_publish.c:700 src/fs/fs_publish.c:739
+#: src/fs/fs_publish.c:760 src/fs/fs_publish.c:784 src/fs/fs_publish.c:934
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:669
+#: src/fs/fs_publish.c:685
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:681
+#: src/fs/fs_publish.c:697
 #, fuzzy
 msgid "unknown error"
 msgstr "未知错误"
 
-#: src/fs/fs_publish.c:725
+#: src/fs/fs_publish.c:741
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:745
+#: src/fs/fs_publish.c:761
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:770
+#: src/fs/fs_publish.c:786
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:793
+#: src/fs/fs_publish.c:809
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_publish.c:862
+#: src/fs/fs_publish.c:878
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:868
+#: src/fs/fs_publish.c:884
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:915
+#: src/fs/fs_publish.c:936
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1151
+#: src/fs/fs_publish.c:1172
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1243
+#: src/fs/fs_publish.c:1263
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -3022,17 +3192,17 @@
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_publish_ublock.c:219
+#: src/fs/fs_publish_ublock.c:243
 #, fuzzy
 msgid "Internal error."
 msgstr "未知错误。\n"
 
-#: src/fs/fs_search.c:751 src/fs/fs_search.c:817
+#: src/fs/fs_search.c:778 src/fs/fs_search.c:848
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_search.c:876
+#: src/fs/fs_search.c:907
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -3109,81 +3279,81 @@
 msgid "Malformed KSK URI (quotes not balanced)"
 msgstr ""
 
-#: src/fs/fs_uri.c:379
+#: src/fs/fs_uri.c:378
 msgid "Malformed SKS URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:423
+#: src/fs/fs_uri.c:422
 msgid "Malformed CHK URI (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:438
+#: src/fs/fs_uri.c:437
 msgid "Malformed CHK URI (failed to decode CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:517
+#: src/fs/fs_uri.c:516
 msgid "LOC URI malformed (wrong syntax)"
 msgstr ""
 
-#: src/fs/fs_uri.c:532
+#: src/fs/fs_uri.c:531
 msgid "LOC URI malformed (no CHK)"
 msgstr ""
 
-#: src/fs/fs_uri.c:542
+#: src/fs/fs_uri.c:541
 msgid "LOC URI malformed (missing LOC)"
 msgstr ""
 
-#: src/fs/fs_uri.c:550
+#: src/fs/fs_uri.c:549
 msgid "LOC URI malformed (wrong syntax for public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:558
+#: src/fs/fs_uri.c:557
 msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:564
+#: src/fs/fs_uri.c:563
 msgid "LOC URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:570
+#: src/fs/fs_uri.c:569
 msgid "LOC URI malformed (wrong syntax for signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:579
+#: src/fs/fs_uri.c:578
 msgid "LOC URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:585
+#: src/fs/fs_uri.c:584
 msgid "LOC URI malformed (wrong syntax for expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:591
+#: src/fs/fs_uri.c:590
 msgid "LOC URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:603
+#: src/fs/fs_uri.c:602
 msgid "LOC URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:642
+#: src/fs/fs_uri.c:641
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:866
+#: src/fs/fs_uri.c:865
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "立即保存配置？"
 
-#: src/fs/fs_uri.c:872
+#: src/fs/fs_uri.c:871
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/fs/fs_uri.c:1057 src/fs/fs_uri.c:1084
+#: src/fs/fs_uri.c:1056 src/fs/fs_uri.c:1083
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1090
+#: src/fs/fs_uri.c:1089
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -3219,23 +3389,23 @@
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:824
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:886
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:828
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:890
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:831
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:893
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:855
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:917
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:862
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:924
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -3309,7 +3479,7 @@
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:286
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:304
 #: src/fs/gnunet-search.c:200 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
@@ -3320,7 +3490,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:665
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:712
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "运行 %s失败：%s %d\n"
@@ -3333,7 +3503,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:797
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:856
 #: src/fs/gnunet-search.c:250 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -3397,175 +3567,180 @@
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:231 src/fs/gnunet-publish.c:243
+#: src/fs/gnunet-publish.c:238 src/fs/gnunet-publish.c:250
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:250
+#: src/fs/gnunet-publish.c:257
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:260
+#: src/fs/gnunet-publish.c:268
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:264
+#: src/fs/gnunet-publish.c:273
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:283
+#: src/fs/gnunet-publish.c:281
+#, c-format
+msgid "Namespace URI is `%s'.\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:301
 msgid "Cleanup after abort complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:401
+#: src/fs/gnunet-publish.c:427
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:403
+#: src/fs/gnunet-publish.c:429
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:542
+#: src/fs/gnunet-publish.c:572
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:565
+#: src/fs/gnunet-publish.c:597
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:598
+#: src/fs/gnunet-publish.c:631
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:600
+#: src/fs/gnunet-publish.c:635
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-publish.c:605
+#: src/fs/gnunet-publish.c:641
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:610
+#: src/fs/gnunet-publish.c:648
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:614
+#: src/fs/gnunet-publish.c:653
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:618
+#: src/fs/gnunet-publish.c:660
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:625
+#: src/fs/gnunet-publish.c:669
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/gnunet-publish.c:656
+#: src/fs/gnunet-publish.c:701
 #, c-format
 msgid "Selected pseudonym `%s' unknown\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:682
+#: src/fs/gnunet-publish.c:733
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:695
+#: src/fs/gnunet-publish.c:747
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:747
+#: src/fs/gnunet-publish.c:803
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:754
+#: src/fs/gnunet-publish.c:810
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:760
+#: src/fs/gnunet-publish.c:816
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:768 src/vpn/gnunet-vpn.c:209
+#: src/fs/gnunet-publish.c:824 src/vpn/gnunet-vpn.c:209
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:778 src/fs/gnunet-publish.c:785
-#: src/transport/gnunet-transport.c:1387 src/transport/gnunet-transport.c:1417
-#: src/transport/gnunet-transport.c:1447
+#: src/fs/gnunet-publish.c:835 src/fs/gnunet-publish.c:843
+#: src/transport/gnunet-transport.c:1893 src/transport/gnunet-transport.c:1923
+#: src/transport/gnunet-transport.c:1953
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:835
+#: src/fs/gnunet-publish.c:897
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:839
+#: src/fs/gnunet-publish.c:901
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:843
+#: src/fs/gnunet-publish.c:905
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:846
+#: src/fs/gnunet-publish.c:908
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:851
+#: src/fs/gnunet-publish.c:913
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:859
+#: src/fs/gnunet-publish.c:921
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:865
+#: src/fs/gnunet-publish.c:927
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:869
+#: src/fs/gnunet-publish.c:931
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:873
+#: src/fs/gnunet-publish.c:935
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:889
+#: src/fs/gnunet-publish.c:951
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3607,22 +3782,24 @@
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:545
+#: src/fs/gnunet-service-fs.c:332 src/fs/gnunet-service-fs.c:540
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:645 src/hostlist/gnunet-daemon-hostlist.c:303
-#: src/topology/gnunet-daemon-topology.c:1260
-#: src/topology/gnunet-daemon-topology.c:1267
+#: src/fs/gnunet-service-fs.c:650 src/hostlist/gnunet-daemon-hostlist.c:303
+#: src/sensordashboard/gnunet-service-sensordashboard.c:854
+#: src/sensordashboard/gnunet-service-sensordashboard.c:862
+#: src/topology/gnunet-daemon-topology.c:1287
+#: src/topology/gnunet-daemon-topology.c:1294
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-service-fs_cadet_client.c:484
+#: src/fs/gnunet-service-fs_cadet_client.c:494
 msgid "# replies received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_client.c:498
+#: src/fs/gnunet-service-fs_cadet_client.c:508
 msgid "# replies received via cadet dropped"
 msgstr ""
 
@@ -3630,107 +3807,107 @@
 msgid "# Blocks transferred via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:352
-msgid "# queries received via cadet not answered"
+#: src/fs/gnunet-service-fs_cadet_server.c:361
+msgid "# queries received via CADET not answered"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:432
+#: src/fs/gnunet-service-fs_cadet_server.c:441
 msgid "# queries received via cadet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cadet_server.c:476
+#: src/fs/gnunet-service-fs_cadet_server.c:485
 #, fuzzy
 msgid "# cadet client connections rejected"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/fs/gnunet-service-fs_cadet_server.c:482
-#: src/fs/gnunet-service-fs_cadet_server.c:522
+#: src/fs/gnunet-service-fs_cadet_server.c:491
+#: src/fs/gnunet-service-fs_cadet_server.c:531
 #, fuzzy
 msgid "# cadet connections active"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/fs/gnunet-service-fs_cp.c:682
+#: src/fs/gnunet-service-fs_cp.c:698
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:686
+#: src/fs/gnunet-service-fs_cp.c:702
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:721
+#: src/fs/gnunet-service-fs_cp.c:737
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:727
+#: src/fs/gnunet-service-fs_cp.c:743
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:752 src/fs/gnunet-service-fs_cp.c:1301
+#: src/fs/gnunet-service-fs_cp.c:768 src/fs/gnunet-service-fs_cp.c:1317
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:845
+#: src/fs/gnunet-service-fs_cp.c:861
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:898
+#: src/fs/gnunet-service-fs_cp.c:914
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:906
+#: src/fs/gnunet-service-fs_cp.c:922
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:920
+#: src/fs/gnunet-service-fs_cp.c:936
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:958
+#: src/fs/gnunet-service-fs_cp.c:974
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1026
+#: src/fs/gnunet-service-fs_cp.c:1042
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1051
+#: src/fs/gnunet-service-fs_cp.c:1067
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1061
+#: src/fs/gnunet-service-fs_cp.c:1077
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1139
+#: src/fs/gnunet-service-fs_cp.c:1155
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1173
+#: src/fs/gnunet-service-fs_cp.c:1189
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1195
+#: src/fs/gnunet-service-fs_cp.c:1211
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1246
+#: src/fs/gnunet-service-fs_cp.c:1262
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1270
+#: src/fs/gnunet-service-fs_cp.c:1286
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1299
+#: src/fs/gnunet-service-fs_cp.c:1315
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1670
+#: src/fs/gnunet-service-fs_cp.c:1691
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3780,19 +3957,19 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:368
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:370
 msgid "# client searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:256
+#: src/fs/gnunet-service-fs_lc.c:258
 msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:327
+#: src/fs/gnunet-service-fs_lc.c:329
 msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:362
+#: src/fs/gnunet-service-fs_lc.c:364
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -3913,7 +4090,7 @@
 msgstr ""
 
 #: src/fs/gnunet-service-fs_pr.c:1409 src/fs/gnunet-service-fs_pr.c:1449
-#: src/fs/gnunet-service-fs_pr.c:1590
+#: src/fs/gnunet-service-fs_pr.c:1612
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
@@ -3925,11 +4102,11 @@
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1566
+#: src/fs/gnunet-service-fs_pr.c:1588
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1651
+#: src/fs/gnunet-service-fs_pr.c:1673
 msgid "# GAP PUT messages received"
 msgstr ""
 
@@ -3974,7 +4151,7 @@
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:695
+#: src/gns/gnunet-bcd.c:355 src/hostlist/gnunet-daemon-hostlist_server.c:696
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
@@ -4053,58 +4230,63 @@
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:227
+#: src/gns/gnunet-gns.c:215
 #, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:233
+#, c-format
 msgid "Please specify name to lookup!\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:308
+#: src/gns/gnunet-gns.c:314
 #, c-format
 msgid "Ego for `%s' not found, cannot perform lookup.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:347 src/gns/gnunet-gns-helper-service-w32.c:798
+#: src/gns/gnunet-gns.c:353 src/gns/gnunet-gns-helper-service-w32.c:798
 #, c-format
 msgid ""
 "Ego for `gns-master' not found, cannot perform lookup.  Did you run gnunet-"
 "gns-import.sh?\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:386 src/gns/gnunet-gns-helper-service-w32.c:828
+#: src/gns/gnunet-gns.c:392 src/gns/gnunet-gns-helper-service-w32.c:828
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns.c:399
+#: src/gns/gnunet-gns.c:405
 #, c-format
 msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:449
+#: src/gns/gnunet-gns.c:455
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:452
+#: src/gns/gnunet-gns.c:458
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:455
+#: src/gns/gnunet-gns.c:461
 msgid "Specify timeout for the lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:458
+#: src/gns/gnunet-gns.c:464
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:461
+#: src/gns/gnunet-gns.c:467
 msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:464
+#: src/gns/gnunet-gns.c:470
 msgid "Specify the name of the ego of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:478
+#: src/gns/gnunet-gns.c:484
 #, fuzzy
 msgid "GNUnet GNS resolver tool"
 msgstr "GNUnet 错误日志"
@@ -4135,8 +4317,8 @@
 #: src/hostlist/gnunet-daemon-hostlist_client.c:931
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1026
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1031
-#: src/transport/plugin_transport_http_client.c:1095
-#: src/transport/plugin_transport_http_client.c:1110
+#: src/transport/plugin_transport_http_client.c:595
+#: src/transport/plugin_transport_http_client.c:613
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
@@ -4206,67 +4388,67 @@
 msgid "Failed to pass client to MHD\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2504
+#: src/gns/gnunet-gns-proxy.c:2518
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2533
+#: src/gns/gnunet-gns-proxy.c:2547
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2551 src/gns/gnunet-gns-proxy.c:2580
+#: src/gns/gnunet-gns-proxy.c:2565 src/gns/gnunet-gns-proxy.c:2594
 msgid "SSL connection to plain IPv4 address requested\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2631
+#: src/gns/gnunet-gns-proxy.c:2645
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2970
+#: src/gns/gnunet-gns-proxy.c:2984
 msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3010
+#: src/gns/gnunet-gns-proxy.c:3024
 #, c-format
 msgid "No ego configured for `%s`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3072
+#: src/gns/gnunet-gns-proxy.c:3086
 #, fuzzy, c-format
 msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3113
+#: src/gns/gnunet-gns-proxy.c:3127
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3116
+#: src/gns/gnunet-gns-proxy.c:3130
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3135
+#: src/gns/gnunet-gns-proxy.c:3149
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:862
+#: src/gns/gnunet-service-gns.c:864
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns.c:870
+#: src/gns/gnunet-service-gns.c:872
 #, fuzzy
 msgid "Failed to connect to the namecache!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns.c:903
+#: src/gns/gnunet-service-gns.c:905
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/gns/gnunet-service-gns.c:919
+#: src/gns/gnunet-service-gns.c:921
 #, fuzzy
 msgid "valid public key required"
 msgstr "“%s”的参数无效。\n"
@@ -4280,189 +4462,215 @@
 msgid "Failed to connect to the DNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:832
+#: src/gns/gnunet-service-gns_resolver.c:650
+#, c-format
+msgid "Protocol `%s' unknown, skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:661
+#, c-format
+msgid "Service `%s' unknown for protocol `%s', skipping labels.\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:854
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:974
+#: src/gns/gnunet-service-gns_resolver.c:996
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1333
+#: src/gns/gnunet-service-gns_resolver.c:1356
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1831
+#: src/gns/gnunet-service-gns_resolver.c:1886
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1855
+#: src/gns/gnunet-service-gns_resolver.c:1910
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2137
+#: src/gns/gnunet-service-gns_resolver.c:2192
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2286
+#: src/gns/gnunet-service-gns_resolver.c:2341
 #, c-format
 msgid "Hostname `%s' is not well-formed, resolution fails\n"
 msgstr ""
 
-#: src/gns/plugin_gnsrecord_gns.c:151
+#: src/gns/plugin_gnsrecord_gns.c:172
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:180
+#: src/gns/plugin_gnsrecord_gns.c:201
 #, fuzzy, c-format
 msgid "Unable to parse GNS2DNS record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:201
+#: src/gns/plugin_gnsrecord_gns.c:222
 #, fuzzy, c-format
 msgid "Failed to serialize GNS2DNS record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/plugin_gnsrecord_gns.c:217
+#: src/gns/plugin_gnsrecord_gns.c:245
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:293
+#: src/gns/plugin_gnsrecord_gns.c:280
 #, fuzzy, c-format
+msgid "Unable to parse BOX record string `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:291
+#, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:314
+#: src/gnsrecord/plugin_gnsrecord_dns.c:312
 #, fuzzy, c-format
 msgid "Failed to serialize NS record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:336
+#: src/gnsrecord/plugin_gnsrecord_dns.c:334
 #, fuzzy, c-format
 msgid "Failed to serialize CNAME record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:420
+#: src/gnsrecord/plugin_gnsrecord_dns.c:418
 #, fuzzy, c-format
 msgid "Failed to serialize CERT record with %u bytes\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:452
+#: src/gnsrecord/plugin_gnsrecord_dns.c:455
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:471
+#: src/gnsrecord/plugin_gnsrecord_dns.c:474
 #, fuzzy, c-format
 msgid "Failed to serialize SOA record with mname `%s' and rname `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:494
+#: src/gnsrecord/plugin_gnsrecord_dns.c:497
 #, fuzzy, c-format
 msgid "Failed to serialize PTR record with value `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:514
+#: src/gnsrecord/plugin_gnsrecord_dns.c:520
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:529
+#: src/gnsrecord/plugin_gnsrecord_dns.c:535
 #, fuzzy, c-format
 msgid "Failed to serialize MX record with hostname `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:549
+#: src/gnsrecord/plugin_gnsrecord_dns.c:562
 #, fuzzy, c-format
+msgid "Unable to parse SRV record `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:578
+#, fuzzy, c-format
+msgid "Failed to serialize SRV record with target `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/gnsrecord/plugin_gnsrecord_dns.c:595
+#, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/gnsrecord/plugin_gnsrecord_dns.c:567
+#: src/gnsrecord/plugin_gnsrecord_dns.c:619
+#: src/gnsrecord/plugin_gnsrecord_dns.c:635
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/hello/gnunet-hello.c:123
+#: src/hello/gnunet-hello.c:126
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:129
+#: src/hello/gnunet-hello.c:132
 #, fuzzy, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/hello/gnunet-hello.c:137
+#: src/hello/gnunet-hello.c:140
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:144
+#: src/hello/gnunet-hello.c:147
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183
+#: src/hello/gnunet-hello.c:157 src/hello/gnunet-hello.c:196
 #, fuzzy, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/hello/gnunet-hello.c:170
+#: src/hello/gnunet-hello.c:173
 #, c-format
 msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:195
+#: src/hello/gnunet-hello.c:208
 #, fuzzy, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/hello/gnunet-hello.c:203
+#: src/hello/gnunet-hello.c:216
 #, c-format
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:957
+#: src/hello/hello.c:955
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:966
+#: src/hello/hello.c:964
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:976
+#: src/hello/hello.c:974
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/hello/hello.c:986
+#: src/hello/hello.c:984
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:1004
+#: src/hello/hello.c:1002
 #, c-format
 msgid "Plugin `%s' not found, skipping address\n"
 msgstr ""
 
-#: src/hello/hello.c:1012
+#: src/hello/hello.c:1010
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1031
+#: src/hello/hello.c:1025
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/hello/hello.c:1104
+#: src/hello/hello.c:1098
 #, c-format
 msgid "HELLO URI contained %u addresses, added %u addresses\n"
 msgstr ""
@@ -4625,7 +4833,7 @@
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1581
-#: src/transport/plugin_transport_http_client.c:1866
+#: src/transport/plugin_transport_http_client.c:2274
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
@@ -4649,101 +4857,111 @@
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:143
+#: src/hostlist/gnunet-daemon-hostlist_server.c:165
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:168
+#: src/hostlist/gnunet-daemon-hostlist_server.c:190
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:203
-#: src/hostlist/gnunet-daemon-hostlist_server.c:534
-#: src/peerinfo-tool/gnunet-peerinfo.c:361
-#: src/peerinfo-tool/gnunet-peerinfo.c:430
-#: src/peerinfo-tool/gnunet-peerinfo.c:501
-#: src/topology/gnunet-daemon-topology.c:925
+#: src/hostlist/gnunet-daemon-hostlist_server.c:225
+#: src/hostlist/gnunet-daemon-hostlist_server.c:535
+#: src/peerinfo-tool/gnunet-peerinfo.c:367
+#: src/peerinfo-tool/gnunet-peerinfo.c:452
+#: src/peerinfo-tool/gnunet-peerinfo.c:535
+#: src/topology/gnunet-daemon-topology.c:952
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:227
+#: src/hostlist/gnunet-daemon-hostlist_server.c:249
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:243
+#: src/hostlist/gnunet-daemon-hostlist_server.c:265
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:363
+#: src/hostlist/gnunet-daemon-hostlist_server.c:365
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:366
+#: src/hostlist/gnunet-daemon-hostlist_server.c:368
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:380
+#: src/hostlist/gnunet-daemon-hostlist_server.c:382
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:384
+#: src/hostlist/gnunet-daemon-hostlist_server.c:386
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:391
+#: src/hostlist/gnunet-daemon-hostlist_server.c:393
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:394
+#: src/hostlist/gnunet-daemon-hostlist_server.c:396
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:399
+#: src/hostlist/gnunet-daemon-hostlist_server.c:401
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:401
+#: src/hostlist/gnunet-daemon-hostlist_server.c:403
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:448
+#: src/hostlist/gnunet-daemon-hostlist_server.c:449
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:496
+#: src/hostlist/gnunet-daemon-hostlist_server.c:497
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:683
-#: src/peerinfo-tool/gnunet-peerinfo.c:650
-#: src/transport/gnunet-service-transport.c:1136
+#: src/hostlist/gnunet-daemon-hostlist_server.c:684
+#: src/peerinfo-tool/gnunet-peerinfo.c:696
+#: src/transport/gnunet-service-transport.c:1127
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:707
+#: src/hostlist/gnunet-daemon-hostlist_server.c:708
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:722
+#: src/hostlist/gnunet-daemon-hostlist_server.c:723
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:760
+#: src/hostlist/gnunet-daemon-hostlist_server.c:736
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:749
+#, fuzzy
+msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
+msgstr "“%s”不可用。\n"
+
+#: src/hostlist/gnunet-daemon-hostlist_server.c:770
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:780
+#: src/hostlist/gnunet-daemon-hostlist_server.c:790
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:820
+#: src/hostlist/gnunet-daemon-hostlist_server.c:830
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -4850,7 +5068,7 @@
 msgid "No records found for `%s'"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:402
+#: src/namecache/gnunet-namecache.c:124 src/namestore/gnunet-namestore.c:397
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
@@ -4860,7 +5078,7 @@
 msgid "You must specify which zone should be accessed\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:783
+#: src/namecache/gnunet-namecache.c:195 src/namestore/gnunet-namestore.c:844
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "“%s”的参数无效。\n"
@@ -4870,7 +5088,7 @@
 msgid "You must specify a name\n"
 msgstr "您必须指定一个接收方！\n"
 
-#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1020
+#: src/namecache/gnunet-namecache.c:234 src/namestore/gnunet-namestore.c:1084
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4878,7 +5096,7 @@
 msgid "spezifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1055
+#: src/namecache/gnunet-namecache.c:248 src/namestore/gnunet-namestore.c:1116
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
@@ -4893,224 +5111,232 @@
 msgid "Failed to create indices\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/gnunet-namestore.c:308
+#: src/namestore/gnunet-namestore.c:303
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:337
+#: src/namestore/gnunet-namestore.c:332
 #, c-format
 msgid "Deleting record failed, record does not exist%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:344
+#: src/namestore/gnunet-namestore.c:339
 #, c-format
 msgid "Deleting record failed%s%s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:567
+#: src/namestore/gnunet-namestore.c:477 src/namestore/gnunet-namestore.c:485
+#: src/namestore/gnunet-namestore.c:493
 #, c-format
+msgid "A %s record exists already under `%s', no other records can be added.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:507 src/namestore/gnunet-namestore.c:519
+#: src/namestore/gnunet-namestore.c:531
+#, c-format
+msgid "Records already exist under `%s', cannot add `%s' record.\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:628
+#, c-format
 msgid "There are no records under label `%s' that could be deleted.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:606
+#: src/namestore/gnunet-namestore.c:667
 #, c-format
 msgid ""
 "There are no records under label `%s' that match the request for deletion.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:647
+#: src/namestore/gnunet-namestore.c:708
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:658
-#: src/namestore/gnunet-namestore-fcfsd.c:970
+#: src/namestore/gnunet-namestore.c:719
+#: src/namestore/gnunet-namestore-fcfsd.c:984
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:666 src/namestore/gnunet-namestore.c:675
-#: src/namestore/gnunet-namestore.c:692 src/namestore/gnunet-namestore.c:714
-#: src/namestore/gnunet-namestore.c:754
+#: src/namestore/gnunet-namestore.c:727 src/namestore/gnunet-namestore.c:736
+#: src/namestore/gnunet-namestore.c:753 src/namestore/gnunet-namestore.c:775
+#: src/namestore/gnunet-namestore.c:815
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore.c:667 src/namestore/gnunet-namestore.c:676
-#: src/namestore/gnunet-namestore.c:693 src/namestore/gnunet-namestore.c:715
+#: src/namestore/gnunet-namestore.c:728 src/namestore/gnunet-namestore.c:737
+#: src/namestore/gnunet-namestore.c:754 src/namestore/gnunet-namestore.c:776
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:684
+#: src/namestore/gnunet-namestore.c:745
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:704
+#: src/namestore/gnunet-namestore.c:765
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:740
+#: src/namestore/gnunet-namestore.c:801
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:755
+#: src/namestore/gnunet-namestore.c:816
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:803
-#: src/peerinfo-tool/gnunet-peerinfo.c:734
+#: src/namestore/gnunet-namestore.c:868
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:838
+#: src/namestore/gnunet-namestore.c:903
 #, fuzzy, c-format
 msgid "Invalid nick `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:878
+#: src/namestore/gnunet-namestore.c:943
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:905
+#: src/namestore/gnunet-namestore.c:970
 #, c-format
 msgid "No default ego configured in identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:941
+#: src/namestore/gnunet-namestore.c:1006
 #, fuzzy, c-format
 msgid "Identity service is not running\n"
 msgstr "服务已删除。\n"
 
-#: src/namestore/gnunet-namestore.c:953
+#: src/namestore/gnunet-namestore.c:1018
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/namestore/gnunet-namestore.c:1002
+#: src/namestore/gnunet-namestore.c:1066
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1005
+#: src/namestore/gnunet-namestore.c:1069
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1008
+#: src/namestore/gnunet-namestore.c:1072
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1011
+#: src/namestore/gnunet-namestore.c:1075
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1014
+#: src/namestore/gnunet-namestore.c:1078
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/namestore/gnunet-namestore.c:1017
+#: src/namestore/gnunet-namestore.c:1081
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:1023
+#: src/namestore/gnunet-namestore.c:1087
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/namestore/gnunet-namestore.c:1026
+#: src/namestore/gnunet-namestore.c:1090
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1029
+#: src/namestore/gnunet-namestore.c:1093
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1032
+#: src/namestore/gnunet-namestore.c:1096
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1035
+#: src/namestore/gnunet-namestore.c:1099
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1038
-msgid "create record that is pending approval (and thus for now inactive)"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1041
+#: src/namestore/gnunet-namestore.c:1102
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1044
+#: src/namestore/gnunet-namestore.c:1105
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:464
+#: src/namestore/gnunet-namestore-fcfsd.c:478
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:491
+#: src/namestore/gnunet-namestore-fcfsd.c:505
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:525
+#: src/namestore/gnunet-namestore-fcfsd.c:539
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:534
+#: src/namestore/gnunet-namestore-fcfsd.c:548
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:596
+#: src/namestore/gnunet-namestore-fcfsd.c:610
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:652
+#: src/namestore/gnunet-namestore-fcfsd.c:666
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:668
+#: src/namestore/gnunet-namestore-fcfsd.c:682
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:704
+#: src/namestore/gnunet-namestore-fcfsd.c:718
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:712
+#: src/namestore/gnunet-namestore-fcfsd.c:726
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:910
+#: src/namestore/gnunet-namestore-fcfsd.c:924
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:936
+#: src/namestore/gnunet-namestore-fcfsd.c:950
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:978
+#: src/namestore/gnunet-namestore-fcfsd.c:992
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1011
+#: src/namestore/gnunet-namestore-fcfsd.c:1025
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
@@ -5132,64 +5358,56 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
-#: src/nat/nat_auto.c:175
-msgid "NAT traversal with ICMP Server timed out.\n"
-msgstr ""
-
-#: src/nat/nat_auto.c:207
+#: src/nat/nat_auto.c:179
 msgid "NAT traversal with ICMP Server succeeded.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:208
+#: src/nat/nat_auto.c:180
 msgid "NAT traversal with ICMP Server failed.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:229
+#: src/nat/nat_auto.c:201
 msgid "Testing connection reversal with ICMP server.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:284
+#: src/nat/nat_auto.c:249
 #, c-format
 msgid "Detected external IP `%s'\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:362
+#: src/nat/nat_auto.c:327
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:378
+#: src/nat/nat_auto.c:343
 #, fuzzy, c-format
 msgid "Detected internal network address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/nat/nat_auto.c:441
+#: src/nat/nat_auto.c:406
 msgid "upnpc found, enabling its use\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:442
+#: src/nat/nat_auto.c:407
 msgid "upnpc not found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:472
+#: src/nat/nat_auto.c:437
 msgid "test_icmp_server not possible, as we have no public IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:480
+#: src/nat/nat_auto.c:445 src/nat/nat_auto.c:490
 msgid "test_icmp_server not possible, as we are not behind NAT\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:488
+#: src/nat/nat_auto.c:453 src/nat/nat_auto.c:498
 msgid "No working gnunet-helper-nat-server found\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:527
-msgid "gnunet-helper-nat-client found, enabling it\n"
+#: src/nat/nat_auto.c:483
+msgid "test_icmp_client not possible, as we have no internal IPv4 address\n"
 msgstr ""
 
-#: src/nat/nat_auto.c:528
-msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
-msgstr ""
-
 #: src/nat/nat.c:867
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
@@ -5235,6 +5453,85 @@
 msgid "Running gnunet-helper-nat-client %s %s %u\n"
 msgstr ""
 
+#: src/nat/nat.c:1575
+msgid "Operation Successful"
+msgstr ""
+
+#: src/nat/nat.c:1577
+msgid "Internal Failure (IPC, ...)"
+msgstr ""
+
+#: src/nat/nat.c:1579
+msgid "Failure in network subsystem, check permissions."
+msgstr ""
+
+#: src/nat/nat.c:1581
+msgid "Encountered timeout while performing operation"
+msgstr ""
+
+#: src/nat/nat.c:1583
+msgid "detected that we are offline"
+msgstr ""
+
+#: src/nat/nat.c:1585
+msgid "`upnpc` command not found"
+msgstr ""
+
+#: src/nat/nat.c:1587
+#, fuzzy
+msgid "Failed to run `upnpc` command"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/nat/nat.c:1589
+msgid "`upnpc' command took too long, process killed"
+msgstr ""
+
+#: src/nat/nat.c:1591
+msgid "`upnpc' command failed to establish port mapping"
+msgstr ""
+
+#: src/nat/nat.c:1593
+msgid "`external-ip' command not found"
+msgstr ""
+
+#: src/nat/nat.c:1595
+#, fuzzy
+msgid "Failed to run `external-ip` command"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/nat/nat.c:1597
+msgid "`external-ip' command output invalid"
+msgstr ""
+
+#: src/nat/nat.c:1599
+msgid "no valid address was returned by `external-ip'"
+msgstr ""
+
+#: src/nat/nat.c:1601
+#, fuzzy
+msgid "Could not determine interface with internal/local network address"
+msgstr "无法确定用户界面定义文件。"
+
+#: src/nat/nat.c:1603
+msgid "No functioning gnunet-helper-nat-server installation found"
+msgstr ""
+
+#: src/nat/nat.c:1605
+msgid "NAT test could not be initialized"
+msgstr ""
+
+#: src/nat/nat.c:1607
+msgid "NAT test timeout reached"
+msgstr ""
+
+#: src/nat/nat.c:1609
+msgid "could not register NAT"
+msgstr ""
+
+#: src/nat/nat.c:1611
+msgid "No working gnunet-helper-nat-client installation found"
+msgstr ""
+
 #: src/nat/nat_mini.c:203
 msgid "`external-ip' command not found\n"
 msgstr ""
@@ -5243,16 +5540,16 @@
 msgid "`upnpc' command not found\n"
 msgstr ""
 
-#: src/nat/nat_test.c:351
+#: src/nat/nat_test.c:360
 msgid "Failed to connect to `gnunet-nat-server'\n"
 msgstr ""
 
-#: src/nat/nat_test.c:423
+#: src/nat/nat_test.c:462
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nat/nat_test.c:453
+#: src/nat/nat_test.c:497
 #, fuzzy
 msgid "NAT test failed to start NAT library\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -5278,10 +5575,6 @@
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:864 src/testbed/gnunet-testbed-profiler.c:306
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
 #: src/nse/gnunet-nse-profiler.c:867
 msgid "name of the file for writing the main results"
 msgstr ""
@@ -5300,7 +5593,7 @@
 msgstr "无法访问该服务"
 
 #: src/nse/gnunet-service-nse.c:1517
-#: src/revocation/gnunet-service-revocation.c:789 src/util/gnunet-scrypt.c:248
+#: src/revocation/gnunet-service-revocation.c:798 src/util/gnunet-scrypt.c:248
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "值不在合法范围内。"
@@ -5321,61 +5614,61 @@
 msgid "Failed to parse HELLO in file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:466
+#: src/peerinfo/gnunet-service-peerinfo.c:468
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:503
+#: src/peerinfo/gnunet-service-peerinfo.c:506
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:653
+#: src/peerinfo/gnunet-service-peerinfo.c:662
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:658
+#: src/peerinfo/gnunet-service-peerinfo.c:668
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:994
+#: src/peerinfo/gnunet-service-peerinfo.c:1037
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1287
+#: src/peerinfo/gnunet-service-peerinfo.c:1358
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1298
+#: src/peerinfo/gnunet-service-peerinfo.c:1371
 msgid "Skipping import of included HELLOs\n"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:236
+#: src/peerinfo/peerinfo_api.c:237
 msgid "aborted due to explicit disconnect request"
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:356 src/sensor/sensor_api.c:519
+#: src/peerinfo/peerinfo_api.c:363
 #, fuzzy
 msgid "failed to transmit request (service down?)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/peerinfo/peerinfo_api.c:506
+#: src/peerinfo/peerinfo_api.c:519
 msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
-#: src/peerinfo/peerinfo_api.c:547 src/peerinfo/peerinfo_api.c:566
-#: src/peerinfo/peerinfo_api.c:581 src/peerinfo/peerinfo_api.c:592
-#: src/peerinfo/peerinfo_api.c:603
+#: src/peerinfo/peerinfo_api.c:563 src/peerinfo/peerinfo_api.c:586
+#: src/peerinfo/peerinfo_api.c:603 src/peerinfo/peerinfo_api.c:616
+#: src/peerinfo/peerinfo_api.c:631
 #, fuzzy
 msgid "Received invalid message from `PEERINFO' service."
 msgstr "“%s”的参数无效。\n"
 
-#: src/peerinfo/peerinfo_api.c:678
+#: src/peerinfo/peerinfo_api.c:720
 #, fuzzy
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "初始化“%s”服务失败。\n"
@@ -5385,147 +5678,206 @@
 msgid "Could not connect to `%s' service.\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:233
+#: src/peerinfo-tool/gnunet-peerinfo.c:230
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:240
+#: src/peerinfo-tool/gnunet-peerinfo.c:237
 #, c-format
 msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:282
+#: src/peerinfo-tool/gnunet-peerinfo.c:286
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:439
+#: src/peerinfo-tool/gnunet-peerinfo.c:462
 #, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:447
+#: src/peerinfo-tool/gnunet-peerinfo.c:471
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:456
+#: src/peerinfo-tool/gnunet-peerinfo.c:483
 #, fuzzy, c-format
 msgid "Failed to write HELLO with %u bytes to file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:469
+#: src/peerinfo-tool/gnunet-peerinfo.c:502
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:533
+#: src/peerinfo-tool/gnunet-peerinfo.c:570
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:644
+#: src/peerinfo-tool/gnunet-peerinfo.c:687
 #, fuzzy, c-format
 msgid "Service `%s' is not running, please start GNUnet\n"
 msgstr "服务已删除。\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:665 src/util/gnunet-scrypt.c:224
+#: src/peerinfo-tool/gnunet-peerinfo.c:718 src/util/gnunet-scrypt.c:224
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:756
+#: src/peerinfo-tool/gnunet-peerinfo.c:816
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:800
+#: src/peerinfo-tool/gnunet-peerinfo.c:865
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:803
+#: src/peerinfo-tool/gnunet-peerinfo.c:868
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:806
+#: src/peerinfo-tool/gnunet-peerinfo.c:871
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:809
+#: src/peerinfo-tool/gnunet-peerinfo.c:874
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:812
+#: src/peerinfo-tool/gnunet-peerinfo.c:877
 #, fuzzy
 msgid "list all known peers"
 msgstr "列出所有网络适配器"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:815
+#: src/peerinfo-tool/gnunet-peerinfo.c:880
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:818
+#: src/peerinfo-tool/gnunet-peerinfo.c:883
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:821
+#: src/peerinfo-tool/gnunet-peerinfo.c:886
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:832
+#: src/peerinfo-tool/gnunet-peerinfo.c:900
 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:128
+#: src/transport/gnunet-service-transport_plugins.c:127
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:133
+#: src/transport/gnunet-service-transport_plugins.c:132
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:165
+#: src/transport/gnunet-service-transport_plugins.c:164
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerstore/gnunet-peerstore.c:97
+#: src/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
 
-#: src/peerstore/peerstore_api.c:486
+#: src/peerstore/gnunet-service-peerstore.c:343
 #, fuzzy
+msgid "Malformed iterate request.\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerstore/gnunet-service-peerstore.c:350
+msgid "Sub system not supplied in client iterate request.\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:399
+#, fuzzy
+msgid "Malformed store request from client\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/peerstore/gnunet-service-peerstore.c:407
+msgid "Full key not supplied in client store request\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:427
+msgid "Failed to store requested value, sqlite database error."
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:509
+msgid "No database backend configured\n"
+msgstr ""
+
+#: src/peerstore/gnunet-service-peerstore.c:520
+#, fuzzy, c-format
+msgid "Could not load database backend `%s'\n"
+msgstr "无法解析“%s”(%s)：%s\n"
+
+#: src/peerstore/peerstore_api.c:299 src/sensor/sensor_api.c:179
+#, c-format
+msgid "Received an error notification from MQ of type: %d\n"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:370
+msgid "Iteration canceled due to reconnection."
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:635
+#, fuzzy
+msgid "Unexpected iteration response, this should not happen.\n"
+msgstr "输出格式未知，不应出现这种情况。\n"
+
+#: src/peerstore/peerstore_api.c:646
+#, fuzzy
 msgid "Error communicating with `PEERSTORE' service."
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
-#: src/peerstore/peerstore_api.c:503
+#: src/peerstore/peerstore_api.c:665
 #, fuzzy
 msgid "Received a malformed response from service."
 msgstr "“%s”的参数无效。\n"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:352
-#: src/psycstore/plugin_psycstore_sqlite.c:276
+#: src/peerstore/peerstore_api.c:804
+msgid ""
+"Problem receiving a watch response, no way to determine which request.\n"
+msgstr ""
+
+#: src/peerstore/peerstore_api.c:815
+msgid "Received a watch result for a non existing watch.\n"
+msgstr ""
+
+#: src/peerstore/plugin_peerstore_sqlite.c:377
+#: src/psycstore/plugin_psycstore_sqlite.c:286
 #, fuzzy, c-format
 msgid ""
 "Error executing SQL query: %s\n"
 "  %s\n"
 msgstr "创建用户出错"
 
-#: src/peerstore/plugin_peerstore_sqlite.c:377
-#: src/psycstore/plugin_psycstore_sqlite.c:253
+#: src/peerstore/plugin_peerstore_sqlite.c:401
+#: src/psycstore/plugin_psycstore_sqlite.c:263
 #, fuzzy, c-format
 msgid ""
 "Error preparing SQL query: %s\n"
 "  %s\n"
 msgstr "创建用户出错"
 
+#: src/peerstore/plugin_peerstore_sqlite.c:483
+#, fuzzy, c-format
+msgid "Unable to create indices: %s.\n"
+msgstr "发送消息失败。\n"
+
 #: src/postgres/postgres.c:59
 #, fuzzy, c-format
 msgid "`%s:%s' failed at %s:%d with error: %s"
@@ -5536,84 +5888,84 @@
 msgid "Unable to initialize Postgres: %s"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:200
+#: src/psycstore/gnunet-service-psycstore.c:260
 #, fuzzy
 msgid "Failed to store membership information!\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:224
+#: src/psycstore/gnunet-service-psycstore.c:284
 #, fuzzy
 msgid "Failed to test membership!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:246
+#: src/psycstore/gnunet-service-psycstore.c:306
 #, fuzzy
 msgid "Failed to store fragment!\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:272
+#: src/psycstore/gnunet-service-psycstore.c:362
 #, fuzzy
 msgid "Failed to get fragment!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:299
+#: src/psycstore/gnunet-service-psycstore.c:402
 #, fuzzy
 msgid "Failed to get message!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:328
+#: src/psycstore/gnunet-service-psycstore.c:433
 #, fuzzy
 msgid "Failed to get message fragment!\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:356
+#: src/psycstore/gnunet-service-psycstore.c:461
 #, fuzzy
 msgid "Failed to get master counters!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:392
-#: src/psycstore/gnunet-service-psycstore.c:465
+#: src/psycstore/gnunet-service-psycstore.c:497
+#: src/psycstore/gnunet-service-psycstore.c:570
 msgid "Tried to set invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:408
+#: src/psycstore/gnunet-service-psycstore.c:513
 #, fuzzy
 msgid "Failed to begin modifying state!\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:431
+#: src/psycstore/gnunet-service-psycstore.c:536
 #, fuzzy, c-format
 msgid "Unknown operator: %c\n"
 msgstr "未知错误"
 
-#: src/psycstore/gnunet-service-psycstore.c:441
+#: src/psycstore/gnunet-service-psycstore.c:546
 #, fuzzy
 msgid "Failed to end modifying state!\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:479
+#: src/psycstore/gnunet-service-psycstore.c:584
 #, fuzzy
 msgid "Failed to begin synchronizing state!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:495
+#: src/psycstore/gnunet-service-psycstore.c:600
 #, fuzzy
 msgid "Failed to end synchronizing state!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:515
-#: src/psycstore/gnunet-service-psycstore.c:534
+#: src/psycstore/gnunet-service-psycstore.c:620
+#: src/psycstore/gnunet-service-psycstore.c:639
 #, fuzzy
 msgid "Failed to reset state!\n"
 msgstr "发送消息失败。\n"
 
-#: src/psycstore/gnunet-service-psycstore.c:557
-#: src/psycstore/gnunet-service-psycstore.c:608
+#: src/psycstore/gnunet-service-psycstore.c:662
+#: src/psycstore/gnunet-service-psycstore.c:713
 msgid "Tried to get invalid state variable name!\n"
 msgstr ""
 
-#: src/psycstore/gnunet-service-psycstore.c:584
-#: src/psycstore/gnunet-service-psycstore.c:623
+#: src/psycstore/gnunet-service-psycstore.c:689
+#: src/psycstore/gnunet-service-psycstore.c:728
 #, fuzzy
 msgid "Failed to get state variable!\n"
 msgstr "发送消息失败。\n"
@@ -5623,7 +5975,7 @@
 msgid "`%s' failed at %s:%d with error: %s (%d)\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/psycstore/plugin_psycstore_sqlite.c:1796
+#: src/psycstore/plugin_psycstore_sqlite.c:1933
 #, fuzzy
 msgid "SQLite database running\n"
 msgstr "sqlite 数据仓库"
@@ -5875,330 +6227,341 @@
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:272
-msgid "Duplicate revocation received from peer. Ignored.\n"
-msgstr ""
-
-#: src/revocation/gnunet-service-revocation.c:434
+#: src/revocation/gnunet-service-revocation.c:433
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:486
+#: src/revocation/gnunet-service-revocation.c:483
+#: src/revocation/gnunet-service-revocation.c:730
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:812
+#: src/revocation/gnunet-service-revocation.c:822
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:224
+#: src/rps/gnunet-rps.c:67
+msgid "rps"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:222
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:231
+#: src/scalarproduct/gnunet-scalarproduct.c:229
 msgid "This program needs a session identifier for comparing vectors.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:238
-msgid "Please give a session key for --input_key!\n"
-msgstr ""
-
-#: src/scalarproduct/gnunet-scalarproduct.c:250
+#: src/scalarproduct/gnunet-scalarproduct.c:242
 #, c-format
 msgid ""
 "Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
 "valid peer identifier.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:261
+#: src/scalarproduct/gnunet-scalarproduct.c:253
 msgid "Need elements to compute the vectorproduct, got none.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:283
+#: src/scalarproduct/gnunet-scalarproduct.c:275
 #, fuzzy, c-format
 msgid "Malformed input, could not parse `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:296
+#: src/scalarproduct/gnunet-scalarproduct.c:294
 #, fuzzy, c-format
 msgid "Could not convert `%s' to int64_t.\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/scalarproduct/gnunet-scalarproduct.c:345
+#: src/scalarproduct/gnunet-scalarproduct.c:344
 msgid ""
 "A comma separated list of elements to compare as vector with our remote peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:348
+#: src/scalarproduct/gnunet-scalarproduct.c:347
 msgid ""
 "[Optional] peer to calculate our scalarproduct with. If this parameter is "
 "not given, the service will wait for a remote peer to compute the request."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:351
+#: src/scalarproduct/gnunet-scalarproduct.c:350
 msgid "Transaction ID shared with peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-scalarproduct.c:360
+#: src/scalarproduct/gnunet-scalarproduct.c:359
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:678
-#, fuzzy, c-format
-msgid "Client %p disconnected from us.\n"
+#: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1418
+#: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1529
+#, fuzzy
+msgid "Connect to CADET failed\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:748
-#, fuzzy, c-format
-msgid "Could not send message to client (%p)!\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:613
+msgid "dkg start delay"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:759
-#, c-format
-msgid "Sending session-end notification to client (%p) for session %s\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:616
+msgid "dkg timeout"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:781
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1459
-#, fuzzy, c-format
-msgid "Successfully created new channel to peer (%s)!\n"
-msgstr "“%s”已连接到“%s”。\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:619
+msgid "threshold"
+msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:818
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1469
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1539
-msgid "Transmitting service request.\n"
+#: src/secretsharing/gnunet-secretsharing-profiler.c:622
+msgid "also profile decryption"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:830
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
+#: src/sensordashboard/gnunet-service-sensordashboard.c:353
+#, fuzzy, c-format
+msgid "Error trying to send a message to peer `%s'.\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/sensor/gnunet-sensor.c:162
 #, fuzzy
-msgid "Could not send message to channel!\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+msgid "Retrieve information about all defined sensors"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:891
-#: src/scalarproduct/gnunet-service-scalarproduct.c:991
+#: src/sensor/gnunet-sensor.c:165
 #, fuzzy
-msgid "Could not send service-response message via cadet!)\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+msgid "Retrieve information about a single sensor"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1442
-#, c-format
-msgid "Sent result to client (%p), this session (%s) has ended!\n"
+#: src/sensor/gnunet-sensor.c:168
+msgid "Force an anomaly on a sensor, use only for testing"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1550
-#, fuzzy
-msgid "Could not send service-request multipart message to channel!\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1579
-#, c-format
-msgid ""
-"Got client-responder-session with key %s and a matching service-request-"
-"session set, processing.\n"
+#: src/sensor/gnunet-sensor.c:175
+msgid "sensor"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1601
-#, c-format
-msgid ""
-"Got client-responder-session with key %s but NO matching service-request-"
-"session set, queuing element for later use.\n"
+#: src/sensor/gnunet-sensor-profiler.c:728
+msgid "Invalid or missing number of peers. Set at least 2 peers.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1618
-#, c-format
-msgid "Creating new channel for session with key %s.\n"
+#: src/sensor/gnunet-sensor-profiler.c:735
+#, fuzzy
+msgid "Missing or invalid topology file.\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/sensor/gnunet-sensor-profiler.c:781
+#, fuzzy
+msgid "Number of peers to run"
+msgstr "迭代次数"
+
+#: src/sensor/gnunet-sensor-profiler.c:783
+msgid "Path to topology file"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1777
-#, c-format
-msgid ""
-"Duplicate session information received, can not create new session with key `"
-"%s'\n"
+#: src/sensor/gnunet-sensor-profiler.c:786
+msgid "Change the interval of running sensors to given value"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1862
+#: src/sensor/gnunet-sensor-profiler.c:789
+#, fuzzy
+msgid "Number of peers to simulate anomalies on"
+msgstr "迭代次数"
+
+#: src/sensor/gnunet-sensor-profiler.c:796
+#, fuzzy
+msgid "Profiler for sensor service"
+msgstr "创建用户出错"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:202
+#, fuzzy
+msgid "Received an invalid sensor value."
+msgstr "“%s”的参数无效。\n"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:293
+#, fuzzy
+msgid "Analysis model not defined in configuration.\n"
+msgstr "找不到主机“%s”的 IP：%s\n"
+
+#: src/sensor/gnunet-service-sensor_analysis.c:302
 #, fuzzy, c-format
-msgid "New incoming channel from peer %s.\n"
-msgstr "“%s”已连接到“%s”。\n"
+msgid "Could not load analysis model `%s'.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:1892
+#: src/sensor/gnunet-service-sensor_analysis.c:310
+#, fuzzy
+msgid "Could not connect to peerstore service.\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:233
+#, fuzzy
+msgid "Unknown value type expected by sensor, this should not happen.\n"
+msgstr "输出格式未知，不应出现这种情况。\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:268
+#, fuzzy, c-format
+msgid "Received an invalid value for sensor `%s': %s\n"
+msgstr "配置不满足配置规范文件“%s”的约束！\n"
+
+#: src/sensor/gnunet-service-sensor_monitoring.c:345
 #, c-format
-msgid "Peer disconnected, terminating session %s with peer (%s)\n"
+msgid "Sensor `%s': External process should not be a path, disabling sensor.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2270
+#: src/sensor/gnunet-service-sensor_monitoring.c:368
 #, c-format
 msgid ""
-"Got message with duplicate session key (`%s'), ignoring service request.\n"
+"Sensor `%s' process `%s' problem: binary doesn't exist or not executable\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2297
+#: src/sensor/gnunet-service-sensor_monitoring.c:416
 #, c-format
-msgid "Got session with key %s and a matching element set, processing.\n"
+msgid "Sensor `%s' execution task already set, this should not happen\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2318
+#: src/sensor/gnunet-service-sensor_reporting.c:828
+#, fuzzy
+msgid "Double creation of proof-of-work, this should not happen.\n"
+msgstr "输出格式未知，不应出现这种情况。\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:834
+#, fuzzy
+msgid "Failed to create pow and signature block.\n"
+msgstr "发送消息失败。\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:1044
 #, c-format
-msgid "Got session with key %s without a matching element set, queueing.\n"
+msgid "PEERSTORE error: %s.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2565
-msgid "Shutting down, initiating cleanup.\n"
+#: src/sensor/gnunet-service-sensor_reporting.c:1149
+#: src/sensor/gnunet-service-sensor_reporting.c:1407
+#, fuzzy
+msgid "Failed to connect to CORE service.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:1156
+msgid "Peer identity received from CORE init doesn't match ours.\n"
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2659
+#: src/sensor/gnunet-service-sensor_reporting.c:1396
 #, fuzzy
-msgid "Connect to CADET failed\n"
-msgstr "“%s”已连接到“%s”。\n"
+msgid "Failed to connect to peerstore service.\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/scalarproduct/gnunet-service-scalarproduct.c:2664
-msgid "CADET initialized\n"
+#: src/sensor/gnunet-service-sensor_reporting.c:1417
+#: src/sensor/gnunet-service-sensor_update.c:781
+#, fuzzy
+msgid "Failed to connect to CADET service.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/sensor/gnunet-service-sensor_reporting.c:1424
+#, fuzzy
+msgid "Failed to load my private key.\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/sensor/gnunet-service-sensor_update.c:327
+#, c-format
+msgid "Error trying to send a message to update point `%s'.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:613
-msgid "dkg start delay"
+#: src/sensor/gnunet-service-sensor_update.c:418
+#, fuzzy, c-format
+msgid "Failed to connect to update point `%s'.\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/sensor/plugin_sensor_model_gaussian.c:203
+msgid "Missing `TRAINING_WINDOW' value in configuration.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:616
-msgid "dkg timeout"
+#: src/sensor/plugin_sensor_model_gaussian.c:221
+msgid "Missing `CONFIDENCE_INTERVAL' value in configuration.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:619
-msgid "threshold"
+#: src/sensor/plugin_sensor_model_gaussian.c:229
+msgid "Missing `WEIGHT_INC' value in configuration.\n"
 msgstr ""
 
-#: src/secretsharing/gnunet-secretsharing-profiler.c:622
-msgid "also profile decryption"
+#: src/sensor/sensor_api.c:296
+msgid "Iterate request canceled due to disconnection.\n"
 msgstr ""
 
-#: src/sensor/gnunet-sensor.c:148
-#, fuzzy
-msgid "Retrieve information about all defined sensors"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
+#: src/sensor/sensor_api.c:307
+msgid "Force anomaly request canceled due to disconnection.\n"
+msgstr ""
 
-#: src/sensor/gnunet-sensor.c:151
+#: src/sensor/sensor_api.c:374
 #, fuzzy
-msgid "Retrieve information about a single sensor"
-msgstr "无法获取有关用户“%s”的信息：%s\n"
+msgid "Timeout transmitting iteration request to `SENSOR' service."
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/sensor/gnunet-sensor.c:160
-msgid "sensor"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor.c:367
+#: src/sensor/sensor_util_lib.c:107
 #, fuzzy
 msgid "Error reading sensor version\n"
 msgstr "创建用户出错"
 
-#: src/sensor/gnunet-service-sensor.c:373
+#: src/sensor/sensor_util_lib.c:116
 msgid "Invalid sensor version number, format should be major.minor\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:385
+#: src/sensor/sensor_util_lib.c:131
 #, fuzzy
 msgid "Error reading sensor category\n"
 msgstr "创建用户出错"
 
-#: src/sensor/gnunet-service-sensor.c:413
+#: src/sensor/sensor_util_lib.c:164
 #, fuzzy
 msgid "Error reading sensor run interval\n"
 msgstr "创建用户出错"
 
-#: src/sensor/gnunet-service-sensor.c:419
-#, c-format
-msgid "Sensor run interval too low (%<PRIu64> < %d)\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor.c:436
+#: src/sensor/sensor_util_lib.c:191
 #, fuzzy
 msgid "Error reading sensor source\n"
 msgstr "创建用户出错"
 
-#: src/sensor/gnunet-service-sensor.c:445
+#: src/sensor/sensor_util_lib.c:206
 msgid "Error reading sensor gnunet-statistics source information\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:455
+#: src/sensor/sensor_util_lib.c:218
 #, fuzzy
 msgid "Error reading sensor process name\n"
 msgstr "创建用户出错"
 
-#: src/sensor/gnunet-service-sensor.c:464
+#: src/sensor/sensor_util_lib.c:233
 msgid "Error reading sensor expected datatype\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:470
+#: src/sensor/sensor_util_lib.c:241
 msgid "Invalid expected datatype, gnunet-statistics returns uint64 values\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:498
+#: src/sensor/sensor_util_lib.c:299
 #, fuzzy, c-format
 msgid "Failed to access sensor file: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/sensor/gnunet-service-sensor.c:506
+#: src/sensor/sensor_util_lib.c:308
 #, fuzzy, c-format
 msgid "Failed to load sensor definition: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/sensor/gnunet-service-sensor.c:559
+#: src/sensor/sensor_util_lib.c:370
 #, c-format
 msgid "Sensor `%s' already exists with same or newer version\n"
 msgstr ""
 
-#: src/sensor/gnunet-service-sensor.c:566
-#, c-format
-msgid "Upgrading sensor `%s' to a newer version\n"
-msgstr ""
+#: src/sensor/sensor_util_lib.c:387
+#, fuzzy, c-format
+msgid "Error adding new sensor `%s' to global hashmap.\n"
+msgstr "创建用户出错"
 
-#: src/sensor/gnunet-service-sensor.c:571
-#, c-format
-msgid ""
-"Error adding new sensor `%s' to global hashmap, this should not happen\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor.c:595
+#: src/sensor/sensor_util_lib.c:412
 #, fuzzy, c-format
 msgid "Error loading sensor from file: %s\n"
 msgstr "创建用户出错"
 
-#: src/sensor/gnunet-service-sensor.c:599
-#, c-format
-msgid "Sensor `%s' added to global hashmap\n"
-msgstr ""
-
-#: src/sensor/gnunet-service-sensor.c:635
-#, fuzzy, c-format
-msgid "Reloading sensor definitions from directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/sensor/gnunet-service-sensor.c:640
-#, fuzzy, c-format
-msgid "Loaded %d sensors from directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/sensor/sensor_api.c:345
+#: src/set/gnunet-service-set.c:1529
 #, fuzzy
-msgid "Timeout transmitting iteration request to `SENSOR' service."
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/sensor/sensor_api.c:388
-#, fuzzy
-msgid "Failed to receive response from `SENSOR' service."
-msgstr "“%s”的参数无效。\n"
-
-#: src/sensor/sensor_api.c:431
-#, fuzzy
-msgid "Received invalid message from `SENSOR' service."
-msgstr "“%s”的参数无效。\n"
-
-#: src/set/gnunet-service-set.c:1431
-#, fuzzy
 msgid "Could not connect to cadet service\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
@@ -6224,7 +6587,7 @@
 msgid "ibf size"
 msgstr ""
 
-#: src/set/gnunet-set-profiler.c:295
+#: src/set/gnunet-set-profiler.c:298
 msgid "oeration to execute"
 msgstr ""
 
@@ -6346,37 +6709,37 @@
 msgid "Invalid topology: %s\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/testbed/generate-underlay-topology.c:252
+#: src/testbed/generate-underlay-topology.c:253
 #, c-format
 msgid "An argument is missing for given topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:258
+#: src/testbed/generate-underlay-topology.c:259
 #, fuzzy, c-format
 msgid "Invalid argument `%s' given as topology argument\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/testbed/generate-underlay-topology.c:266
+#: src/testbed/generate-underlay-topology.c:267
 #, c-format
 msgid "Filename argument missing for topology `%s'\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:280
+#: src/testbed/generate-underlay-topology.c:281
 #, c-format
 msgid "Second argument for topology `%s' is missing\n"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:286
+#: src/testbed/generate-underlay-topology.c:287
 #, fuzzy, c-format
 msgid "Invalid argument `%s'; expecting unsigned int\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/testbed/generate-underlay-topology.c:335
+#: src/testbed/generate-underlay-topology.c:336
 #: src/testbed/gnunet-testbed-profiler.c:293
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/generate-underlay-topology.c:344
+#: src/testbed/generate-underlay-topology.c:345
 msgid ""
 "Generates SQLite3 database representing a given underlay topology.\n"
 "Usage: gnunet-underlay-topology [OPTIONS] db-filename TOPO [TOPOOPTS]\n"
@@ -6400,7 +6763,7 @@
 "content/topology-file-format\n"
 msgstr ""
 
-#: src/testbed/gnunet-daemon-latency-logger.c:331
+#: src/testbed/gnunet-daemon-latency-logger.c:333
 msgid "Daemon to log latency values of connections to neighbours"
 msgstr ""
 
@@ -6411,7 +6774,7 @@
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:235 src/testing/list-keys.c:50
-#: src/testing/testing.c:293 src/util/gnunet-ecc.c:217
+#: src/testing/testing.c:293 src/util/gnunet-ecc.c:295
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6449,11 +6812,6 @@
 msgid "Spawning process `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/testbed/gnunet-testbed-profiler.c:267
-#, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "增加 TCP/IP 的最大连接数"
-
 #: src/testbed/gnunet-testbed-profiler.c:296
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
@@ -6701,66 +7059,67 @@
 msgid "Directory for file `%s' does not seem to be writable.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:255
+#: src/topology/gnunet-daemon-topology.c:265
 msgid "# peers blacklisted"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:388
+#: src/topology/gnunet-daemon-topology.c:406
 msgid "# connect requests issued to transport"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:728
-#: src/topology/gnunet-daemon-topology.c:813
+#: src/topology/gnunet-daemon-topology.c:756
+#: src/topology/gnunet-daemon-topology.c:840
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:993
+#: src/topology/gnunet-daemon-topology.c:1020
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1022
+#: src/topology/gnunet-daemon-topology.c:1049
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1029
+#: src/topology/gnunet-daemon-topology.c:1056
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1050
+#: src/topology/gnunet-daemon-topology.c:1077
 msgid "Encountered errors parsing friends list!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1052
+#: src/topology/gnunet-daemon-topology.c:1079
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1057
+#: src/topology/gnunet-daemon-topology.c:1084
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1063
+#: src/topology/gnunet-daemon-topology.c:1090
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1094
+#: src/topology/gnunet-daemon-topology.c:1121
+#: src/transport/plugin_transport_wlan.c:1444
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1151
+#: src/topology/gnunet-daemon-topology.c:1178
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1296
+#: src/topology/gnunet-daemon-topology.c:1323
 msgid "GNUnet topology control (maintaining P2P cadet and F2F constraints)"
 msgstr ""
 
@@ -6774,8 +7133,8 @@
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:464
-#: src/transport/gnunet-service-transport_blacklist.c:745
+#: src/transport/gnunet-service-transport_blacklist.c:465
+#: src/transport/gnunet-service-transport_blacklist.c:748
 msgid "# disconnects due to blacklist"
 msgstr ""
 
@@ -6796,60 +7155,60 @@
 msgid "Could not obtain a valid network for `%s' %s (%s)\n"
 msgstr "无法利用“%2$s”获取接口“%1$s”的 IP。\n"
 
-#: src/transport/gnunet-service-transport.c:755
+#: src/transport/gnunet-service-transport.c:757
 #, c-format
 msgid ""
 "Address or session unknown: failed to update properties for peer `%s' plugin "
 "`%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1106
+#: src/transport/gnunet-service-transport.c:1094
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/transport/gnunet-service-transport_clients.c:432
+#: src/transport/gnunet-service-transport_clients.c:463
 #, 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:439
+#: src/transport/gnunet-service-transport_clients.c:470
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:596
+#: src/transport/gnunet-service-transport_clients.c:630
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:737
+#: src/transport/gnunet-service-transport_clients.c:771
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:770
+#: src/transport/gnunet-service-transport_clients.c:804
 #, fuzzy, c-format
 msgid "Blacklist refuses connection attempt to peer `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_clients.c:776
+#: src/transport/gnunet-service-transport_clients.c:810
 #, fuzzy, c-format
 msgid "Blacklist allows connection attempt to peer `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_clients.c:801
+#: src/transport/gnunet-service-transport_clients.c:836
 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:815
+#: src/transport/gnunet-service-transport_clients.c:850
 #, fuzzy, c-format
 msgid "Received a request connect message for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/gnunet-service-transport_clients.c:826
+#: src/transport/gnunet-service-transport_clients.c:861
 msgid "# REQUEST DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:840
+#: src/transport/gnunet-service-transport_clients.c:875
 #, fuzzy, c-format
 msgid "Received a request disconnect message for peer `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
@@ -6921,159 +7280,160 @@
 
 #: src/transport/gnunet-service-transport_neighbours.c:1685
 #, fuzzy, c-format
-msgid ""
-"Failed to send CONNECT message to peer `%s' using address `%s' session %p\n"
+msgid "Failed to send SYN message to peer `%s' using address `%s' session %p\n"
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1712
-msgid "# Failed attempts to switch addresses (failed to send CONNECT CONT)"
-msgstr ""
+#, fuzzy
+msgid "# Failed attempts to switch addresses (failed to send SYN CONT)"
+msgstr "打开日志文件“%s”失败：%s\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1757
-msgid "# SESSION_CONNECT messages sent"
-msgstr ""
+#, fuzzy
+msgid "# SYN messages sent"
+msgstr "消息尺寸"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1773
 #, fuzzy, c-format
-msgid "Failed to transmit CONNECT message via plugin to %s\n"
+msgid "Failed to transmit SYN message via plugin to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1800
-msgid "# Failed attempts to switch addresses (failed to send CONNECT)"
-msgstr ""
+#, fuzzy
+msgid "# Failed attempts to switch addresses (failed to send SYN)"
+msgstr "打开日志文件“%s”失败：%s\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1849
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Failed to send CONNECT_ACK message to peer `%s' using address `%s' session "
-"%p\n"
-msgstr ""
+"Failed to send SYN_ACK message to peer `%s' using address `%s' session %p\n"
+msgstr "初始化“%s”服务失败。\n"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1904
-msgid "# CONNECT_ACK messages sent"
+msgid "# SYN_ACK messages sent"
 msgstr ""
 
 #: src/transport/gnunet-service-transport_neighbours.c:1919
 #, fuzzy, c-format
-msgid "Failed to transmit CONNECT_ACK message via plugin to %s\n"
+msgid "Failed to transmit SYN_ACK message via plugin to %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2196
+#: src/transport/gnunet-service-transport_neighbours.c:2199
 #, fuzzy, c-format
 msgid "Blacklisting disapproved to connect to peer `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2316
-msgid "# CONNECT messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:2324
+msgid "# SYN messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2321
+#: src/transport/gnunet-service-transport_neighbours.c:2329
 #, c-format
-msgid "CONNECT request from peer `%s' ignored due impending shutdown\n"
+msgid "SYN request from peer `%s' ignored due impending shutdown\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2594
+#: src/transport/gnunet-service-transport_neighbours.c:2626
 msgid "# Attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3016
+#: src/transport/gnunet-service-transport_neighbours.c:3047
 #, fuzzy
 msgid "# Failed attempts to switch addresses (no response)"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3111
-msgid "# CONNECT_ACK messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:3142
+msgid "# SYN_ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3119
-msgid "# unexpected CONNECT_ACK messages (no peer)"
+#: src/transport/gnunet-service-transport_neighbours.c:3150
+msgid "# unexpected SYN_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3133
-#: src/transport/gnunet-service-transport_neighbours.c:3168
-msgid "# unexpected CONNECT_ACK messages (not ready)"
+#: src/transport/gnunet-service-transport_neighbours.c:3164
+#: src/transport/gnunet-service-transport_neighbours.c:3199
+msgid "# unexpected SYN_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3180
-msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
+#: src/transport/gnunet-service-transport_neighbours.c:3211
+msgid "# unexpected SYN_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3203
+#: src/transport/gnunet-service-transport_neighbours.c:3234
 msgid "# Successful attempts to switch addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3211
-msgid "# unexpected CONNECT_ACK messages (disconnecting)"
+#: src/transport/gnunet-service-transport_neighbours.c:3242
+msgid "# unexpected SYN_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3399
-msgid "# SESSION_ACK messages received"
+#: src/transport/gnunet-service-transport_neighbours.c:3441
+msgid "# ACK messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3435
-msgid "# unexpected SESSION_ACK messages"
+#: src/transport/gnunet-service-transport_neighbours.c:3477
+msgid "# unexpected ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3509
+#: src/transport/gnunet-service-transport_neighbours.c:3551
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3524
+#: src/transport/gnunet-service-transport_neighbours.c:3566
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3564
+#: src/transport/gnunet-service-transport_neighbours.c:3611
 msgid "# disconnect messages ignored (malformed)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3570
+#: src/transport/gnunet-service-transport_neighbours.c:3617
 msgid "# DISCONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3579
+#: src/transport/gnunet-service-transport_neighbours.c:3626
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3706
+#: src/transport/gnunet-service-transport_neighbours.c:3753
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:120
+#: src/transport/gnunet-service-transport_plugins.c:119
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:178
-#: src/transport/gnunet-service-transport_plugins.c:186
-#: src/transport/gnunet-service-transport_plugins.c:194
-#: src/transport/gnunet-service-transport_plugins.c:202
-#: src/transport/gnunet-service-transport_plugins.c:210
-#: src/transport/gnunet-service-transport_plugins.c:218
-#: src/transport/gnunet-service-transport_plugins.c:226
-#: src/transport/gnunet-service-transport_plugins.c:234
-#: src/transport/gnunet-service-transport_plugins.c:242
-#: src/transport/gnunet-service-transport_plugins.c:250
-#: src/transport/gnunet-service-transport_plugins.c:258
+#: src/transport/gnunet-service-transport_plugins.c:177
+#: src/transport/gnunet-service-transport_plugins.c:185
+#: src/transport/gnunet-service-transport_plugins.c:193
+#: src/transport/gnunet-service-transport_plugins.c:201
+#: src/transport/gnunet-service-transport_plugins.c:209
+#: src/transport/gnunet-service-transport_plugins.c:217
+#: src/transport/gnunet-service-transport_plugins.c:225
+#: src/transport/gnunet-service-transport_plugins.c:233
+#: src/transport/gnunet-service-transport_plugins.c:241
+#: src/transport/gnunet-service-transport_plugins.c:249
+#: src/transport/gnunet-service-transport_plugins.c:257
 #, fuzzy, c-format
 msgid "Missing function `%s' in transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_plugins.c:265
+#: src/transport/gnunet-service-transport_plugins.c:264
 #, c-format
 msgid "Did not load plugin `%s' due to missing functions\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:488
+#: src/transport/gnunet-service-transport_validation.c:493
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:558
+#: src/transport/gnunet-service-transport_validation.c:563
 #, 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:616
+#: src/transport/gnunet-service-transport_validation.c:624
 msgid "# PING without HELLO messages sent"
 msgstr ""
 
@@ -7128,76 +7488,82 @@
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1356
+#: src/transport/gnunet-service-transport_validation.c:1387
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1371
+#: src/transport/gnunet-service-transport_validation.c:1402
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1493
+#: src/transport/gnunet-service-transport_validation.c:1526
 #, c-format
 msgid "Validation received new %s message for peer `%s' with size %u\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1500
+#: src/transport/gnunet-service-transport_validation.c:1533
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:388
+#: src/transport/gnunet-transport.c:573
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:396
+#: src/transport/gnunet-transport.c:582
+#: src/transport/gnunet-transport-profiler.c:274
 #, c-format
 msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:436
+#: src/transport/gnunet-transport.c:614
 #, fuzzy, c-format
 msgid "Failed to connect to `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:449
+#: src/transport/gnunet-transport.c:629
 #, fuzzy, c-format
 msgid "Failed to resolve address for peer `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/gnunet-transport.c:459
+#: src/transport/gnunet-transport.c:641
 #, fuzzy
 msgid "Failed to list connections, timeout occured\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:483
+#: src/transport/gnunet-transport.c:668 src/transport/gnunet-transport.c:698
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did not work!\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/transport/gnunet-transport.c:487
+#: src/transport/gnunet-transport.c:673
 #, fuzzy, c-format
 msgid "Configuration for plugin `%s' did work!\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/transport/gnunet-transport.c:491
+#: src/transport/gnunet-transport.c:678
 #, fuzzy, c-format
 msgid "Internal NAT error while running test for plugin `%s'\n"
 msgstr "未知错误。\n"
 
-#: src/transport/gnunet-transport.c:495
+#: src/transport/gnunet-transport.c:683
 #, fuzzy, c-format
 msgid "Failed to start NAT test for plugin `%s'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:499
+#: src/transport/gnunet-transport.c:688
 #, c-format
 msgid "Timeout while waiting for result of NAT test for plugin `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:614
+#: src/transport/gnunet-transport.c:704
 #, fuzzy, c-format
+msgid "Configuration for plugin `%s' is working!\n"
+msgstr "配置文件“%s”已写入。\n"
+
+#: src/transport/gnunet-transport.c:823
+#, fuzzy, c-format
 msgid ""
 "Peer `%s' %s %s\n"
 "\t%s%s\n"
@@ -7205,375 +7571,438 @@
 "\t%s%s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:643
+#: src/transport/gnunet-transport.c:859
 #, fuzzy, c-format
 msgid "Peer `%s' %s `%s' \n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:717 src/transport/gnunet-transport.c:1240
+#: src/transport/gnunet-transport.c:958 src/transport/gnunet-transport.c:1707
 #, fuzzy
 msgid "Monitor disconnected from transport service. Reconnecting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:784
+#: src/transport/gnunet-transport.c:1026
 msgid "No transport plugins configured, peer will never communicate\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:798
+#: src/transport/gnunet-transport.c:1040
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:823
+#: src/transport/gnunet-transport.c:1065
 #, fuzzy
 msgid "Failed to start resolver!\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:866
+#: src/transport/gnunet-transport.c:1111
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:888
+#: src/transport/gnunet-transport.c:1134
+#: src/transport/gnunet-transport-profiler.c:406
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:912
+#: src/transport/gnunet-transport.c:1158
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:943
+#: src/transport/gnunet-transport.c:1191
 #, fuzzy, c-format
 msgid "Successfully disconnected from `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:966
+#: src/transport/gnunet-transport.c:1214
+#: src/transport/gnunet-transport-profiler.c:434
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:988 src/transport/gnunet-transport.c:1009
+#: src/transport/gnunet-transport.c:1239 src/transport/gnunet-transport.c:1265
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:989
+#: src/transport/gnunet-transport.c:1241
 #, fuzzy
 msgid "Connected to"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:1010
+#: src/transport/gnunet-transport.c:1267
 #, fuzzy
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:1031
+#: src/transport/gnunet-transport.c:1291
+#: src/transport/gnunet-transport-profiler.c:458
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1061
+#: src/transport/gnunet-transport.c:1323
 #, c-format
 msgid "Peer `%s': %s %s in state `%s' until %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1072
+#: src/transport/gnunet-transport.c:1335
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:1300 src/transport/gnunet-transport.c:1325
+#: src/transport/gnunet-transport.c:1792
+#: src/transport/gnunet-transport-profiler.c:492
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1369
+#: src/transport/gnunet-transport.c:1829
+#, fuzzy
+msgid "Failed to send disconnect request to transport service\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/transport/gnunet-transport.c:1875
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
-"%s, %s\n"
+"%s, %s %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1377
+#: src/transport/gnunet-transport.c:1883
 #, c-format
 msgid ""
-"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
+"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1396 src/transport/gnunet-transport.c:1426
-#: src/transport/gnunet-transport.c:1456 src/transport/gnunet-transport.c:1479
-#: src/transport/gnunet-transport.c:1523
+#: src/transport/gnunet-transport.c:1902 src/transport/gnunet-transport.c:1932
+#: src/transport/gnunet-transport.c:1964 src/transport/gnunet-transport.c:1990
+#: src/transport/gnunet-transport.c:2046
+#: src/transport/gnunet-transport-profiler.c:578
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1405 src/transport/gnunet-transport.c:1435
-#: src/transport/gnunet-transport.c:1465
+#: src/transport/gnunet-transport.c:1911 src/transport/gnunet-transport.c:1941
+#: src/transport/gnunet-transport.c:1975
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1484
+#: src/transport/gnunet-transport.c:1995
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1569
+#: src/transport/gnunet-transport.c:2094
 #, fuzzy
-msgid "print information for all peers (instead of only connected peers )"
+msgid "print information for all peers (instead of only connected peers)"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/transport/gnunet-transport.c:1572
+#: src/transport/gnunet-transport.c:2097
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1575
+#: src/transport/gnunet-transport.c:2100
 #, fuzzy
 msgid "connect to a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1578
+#: src/transport/gnunet-transport.c:2103
 #, fuzzy
 msgid "disconnect to a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1581
+#: src/transport/gnunet-transport.c:2106
 #, fuzzy
 msgid "print information for all pending validations "
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/transport/gnunet-transport.c:1584
+#: src/transport/gnunet-transport.c:2109
 #, fuzzy
-msgid "print information for all pending validations continously"
+msgid "print information for all pending validations continuously"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/transport/gnunet-transport.c:1587
+#: src/transport/gnunet-transport.c:2112
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1593
+#: src/transport/gnunet-transport.c:2118
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1595
+#: src/transport/gnunet-transport.c:2121
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1597
+#: src/transport/gnunet-transport.c:2124
+#: src/transport/gnunet-transport-profiler.c:638
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1599
+#: src/transport/gnunet-transport.c:2127
+msgid "monitor plugin sessions"
+msgstr ""
+
+#: src/transport/gnunet-transport.c:2130
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1602
+#: src/transport/gnunet-transport.c:2133
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1611
+#: src/transport/gnunet-transport.c:2144
+#: src/transport/gnunet-transport-profiler.c:649
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_bluetooth.c:621
-msgid "# Bluetooth ACKs sent"
+#: src/transport/gnunet-transport-profiler.c:218
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:640
-msgid "# Bluetooth messages defragmented"
+#: src/transport/gnunet-transport-profiler.c:254
+#, c-format
+msgid "%u;%u;%llu;%llu;%.2f;%.2f"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:686
-#: src/transport/plugin_transport_bluetooth.c:737
-#: src/transport/plugin_transport_bluetooth.c:1942
-msgid "# Bluetooth sessions allocated"
+#: src/transport/gnunet-transport-profiler.c:263
+#, c-format
+msgid ";%llu;%.2f"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:837
-msgid "# Bluetooth message fragments sent"
+#: src/transport/gnunet-transport-profiler.c:280
+msgid "\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:861
-msgid "# Bluetooth messages pending (with fragmentation)"
+#: src/transport/gnunet-transport-profiler.c:332
+msgid "."
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:969
-#: src/transport/plugin_transport_bluetooth.c:1054
-#: src/transport/plugin_transport_bluetooth.c:1944
-msgid "# Bluetooth MAC endpoints allocated"
+#: src/transport/gnunet-transport-profiler.c:352
+#, c-format
+msgid ""
+"\n"
+"Starting benchmark to `%s', starting to send %u messages in %u byte blocks\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1307
-msgid "# HELLO messages received via Bluetooth"
-msgstr ""
+#: src/transport/gnunet-transport-profiler.c:400
+#, fuzzy, c-format
+msgid "Connected to different peer `%s'\n"
+msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/plugin_transport_bluetooth.c:1331
-msgid "# fragments received via Bluetooth"
-msgstr ""
+#: src/transport/gnunet-transport-profiler.c:483
+#, fuzzy, c-format
+msgid "Retrying to connect to `%s'\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/transport/plugin_transport_bluetooth.c:1341
-msgid "# ACKs received via Bluetooth"
-msgstr ""
+#: src/transport/gnunet-transport-profiler.c:508
+#, fuzzy, c-format
+msgid "Denying connection to `%s'\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/transport/plugin_transport_bluetooth.c:1401
-msgid "# Bluetooth DATA messages discarded due to CRC32 error"
+#: src/transport/gnunet-transport-profiler.c:537
+#, fuzzy
+msgid "Message size too big!\n"
+msgstr "消息尺寸"
+
+#: src/transport/gnunet-transport-profiler.c:543
+#, fuzzy
+msgid "No peer identity given\n"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/transport/gnunet-transport-profiler.c:558
+#, c-format
+msgid "Trying to send %u messages with size %u to peer `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1512
-msgid "# DATA messages received via Bluetooth"
+#: src/transport/gnunet-transport-profiler.c:564
+#, fuzzy, c-format
+msgid "Trying to receive messages from peer `%s'\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/transport/gnunet-transport-profiler.c:569
+#, fuzzy
+msgid "No operation given\n"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/transport/gnunet-transport-profiler.c:623
+msgid "send data to peer"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1547
-msgid "# Bluetooth DATA messages processed"
+#: src/transport/gnunet-transport-profiler.c:626
+msgid "receive data from peer"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1610
-msgid "# HELLO beacons sent via Bluetooth"
+#: src/transport/gnunet-transport-profiler.c:629
+msgid "iterations"
 msgstr ""
 
-#: src/transport/plugin_transport_bluetooth.c:1923
-#, c-format
-msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
+#: src/transport/gnunet-transport-profiler.c:632
+#, fuzzy
+msgid "number of messages to send"
+msgstr "每次迭代所使用的消息数量"
+
+#: src/transport/gnunet-transport-profiler.c:635
+#, fuzzy
+msgid "message size to use"
+msgstr "消息尺寸"
+
+#: src/transport/plugin_transport_http_client.c:1491
+#: src/transport/plugin_transport_http_server.c:2271
+#: src/transport/plugin_transport_http_server.c:3436
+#: src/transport/plugin_transport_tcp.c:2826
+#: src/transport/plugin_transport_tcp.c:2833
+msgid "TCP_STEALTH not supported on this platform.\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1685
+#: src/transport/plugin_transport_http_client.c:2115
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1760
-#: src/transport/plugin_transport_http_server.c:3031
+#: src/transport/plugin_transport_http_client.c:2164
+#: src/transport/plugin_transport_http_server.c:3170
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:1785
-#: src/transport/plugin_transport_http_server.c:3088
+#: src/transport/plugin_transport_http_client.c:2181
+#: src/transport/plugin_transport_http_server.c:3240
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1819
-#: src/transport/plugin_transport_http_server.c:2931
+#: src/transport/plugin_transport_http_client.c:2215
 #, fuzzy, c-format
-msgid "Maximum number of connections is %u\n"
+msgid "Maximum number of requests is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:1423
+#: src/transport/plugin_transport_http_server.c:1761
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1687
+#: src/transport/plugin_transport_http_server.c:1992
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1695
+#: src/transport/plugin_transport_http_server.c:2000
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1982
+#: src/transport/plugin_transport_http_server.c:2150
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2006
+#: src/transport/plugin_transport_http_server.c:2173
 #, c-format
 msgid "No usable TLS certificate found and creating one at `%s/%s' failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2429
+#: src/transport/plugin_transport_http_server.c:2297
+msgid "Could not load or create server certificate! Loading plugin failed!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2604
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/transport/plugin_transport_http_server.c:2461 src/util/service.c:700
+#: src/transport/plugin_transport_http_server.c:2638 src/util/service.c:700
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_http_server.c:2478 src/util/service.c:719
+#: src/transport/plugin_transport_http_server.c:2656 src/util/service.c:719
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/plugin_transport_http_server.c:2589
+#: src/transport/plugin_transport_http_server.c:2769
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2661
+#: src/transport/plugin_transport_http_server.c:2847
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2754
+#: src/transport/plugin_transport_http_server.c:2946
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2768
+#: src/transport/plugin_transport_http_server.c:2961
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2775
+#: src/transport/plugin_transport_http_server.c:2967
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2786
+#: src/transport/plugin_transport_http_server.c:2978
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/transport/plugin_transport_http_server.c:2793
+#: src/transport/plugin_transport_http_server.c:2984
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2808
+#: src/transport/plugin_transport_http_server.c:2998
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2818
+#: src/transport/plugin_transport_http_server.c:3008
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2839
+#: src/transport/plugin_transport_http_server.c:3030
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2849
+#: src/transport/plugin_transport_http_server.c:3040
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2901
+#: src/transport/plugin_transport_http_server.c:3103
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/plugin_transport_http_server.c:2917
+#: src/transport/plugin_transport_http_server.c:3124
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:3177
+#: src/transport/plugin_transport_http_server.c:3141
+#, fuzzy, c-format
+msgid "Maximum number of connections is %u\n"
+msgstr "增加 TCP/IP 的最大连接数"
+
+#: src/transport/plugin_transport_http_server.c:3448
 #, fuzzy
 msgid "Unable to compile URL regex\n"
 msgstr "无法初始化 SQLite：%s。\n"
@@ -7620,85 +8049,80 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:565
+#: src/transport/plugin_transport_tcp.c:648
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:787
-#: src/transport/plugin_transport_tcp.c:962
-#: src/transport/plugin_transport_tcp.c:2047
-#: src/transport/plugin_transport_tcp.c:2620
+#: src/transport/plugin_transport_tcp.c:829
+#: src/transport/plugin_transport_tcp.c:1044
+#: src/transport/plugin_transport_tcp.c:2232
+#: src/transport/plugin_transport_tcp.c:2932
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:823
-#: src/transport/plugin_transport_tcp.c:955
-#: src/transport/plugin_transport_tcp.c:1045
-#: src/transport/plugin_transport_tcp.c:1093
-#: src/transport/plugin_transport_tcp.c:1259
-#: src/transport/plugin_transport_tcp.c:1277
+#: src/transport/plugin_transport_tcp.c:870
+#: src/transport/plugin_transport_tcp.c:1027
+#: src/transport/plugin_transport_tcp.c:1146
+#: src/transport/plugin_transport_tcp.c:1214
+#: src/transport/plugin_transport_tcp.c:1312
+#: src/transport/plugin_transport_tcp.c:1336
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:826
+#: src/transport/plugin_transport_tcp.c:873
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1048
+#: src/transport/plugin_transport_tcp.c:1149
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1096
+#: src/transport/plugin_transport_tcp.c:1218
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1233
-#, c-format
-msgid "Trying to send with invalid session %p\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:1504
+#: src/transport/plugin_transport_tcp.c:1611
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1609
+#: src/transport/plugin_transport_tcp.c:1775
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2097
+#: src/transport/plugin_transport_tcp.c:2282
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2257
+#: src/transport/plugin_transport_tcp.c:2452
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2321
+#: src/transport/plugin_transport_tcp.c:2524
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2490 src/util/service.c:582
+#: src/transport/plugin_transport_tcp.c:2760 src/util/service.c:582
 #: src/util/service.c:588
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2504
+#: src/transport/plugin_transport_tcp.c:2776
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2607
+#: src/transport/plugin_transport_tcp.c:2919
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2611
+#: src/transport/plugin_transport_tcp.c:2923
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2615
+#: src/transport/plugin_transport_tcp.c:2927
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -7721,128 +8145,129 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1513
+#: src/transport/plugin_transport_udp.c:1655
 #, c-format
 msgid ""
 "Trying to create session for address of unexpected length %u (should be %u "
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2602
+#: src/transport/plugin_transport_udp.c:2881
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2616
+#: src/transport/plugin_transport_udp.c:2894
 msgid ""
 "UDP could not transmit IPv6 message! Please check your network configuration "
 "and disable IPv6 if your connection does not have a global IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2961
+#: src/transport/plugin_transport_udp.c:3247
+#, fuzzy, c-format
+msgid "Failed to bind UDP socket to %s: %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/transport/plugin_transport_udp.c:3255
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_udp.c:3056
+#: src/transport/plugin_transport_udp.c:3414
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3097
+#: src/transport/plugin_transport_udp.c:3461
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_udp.c:3168
+#: src/transport/plugin_transport_udp.c:3529
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_unix.c:1321
+#: src/transport/plugin_transport_unix.c:1403
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_unix.c:1645
-#, fuzzy
-msgid "No UNIXPATH given in configuration!\n"
-msgstr "保存配置失败。"
+#: src/transport/plugin_transport_unix.c:1416
+#, fuzzy, c-format
+msgid "Cannot bind to `%s'\n"
+msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_unix.c:1681
+#: src/transport/plugin_transport_unix.c:1817
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_wlan.c:620
-msgid "# WLAN ACKs sent"
+#: src/transport/plugin_transport_wlan.c:725
+msgid "# ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:639
-msgid "# WLAN messages defragmented"
+#: src/transport/plugin_transport_wlan.c:745
+msgid "# Messages defragmented"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:688
-#: src/transport/plugin_transport_wlan.c:772
-#: src/transport/plugin_transport_wlan.c:1948
-msgid "# WLAN sessions allocated"
+#: src/transport/plugin_transport_wlan.c:786
+#: src/transport/plugin_transport_wlan.c:873
+msgid "# Sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:876
-msgid "# WLAN message fragments sent"
-msgstr ""
+#: src/transport/plugin_transport_wlan.c:989
+#, fuzzy
+msgid "# message fragments sent"
+msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_wlan.c:900
-msgid "# WLAN messages pending (with fragmentation)"
+#: src/transport/plugin_transport_wlan.c:1015
+msgid "# messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1008
-#: src/transport/plugin_transport_wlan.c:1098
-#: src/transport/plugin_transport_wlan.c:1950
-msgid "# WLAN MAC endpoints allocated"
+#: src/transport/plugin_transport_wlan.c:1129
+#: src/transport/plugin_transport_wlan.c:1222
+#: src/transport/plugin_transport_wlan.c:2185
+msgid "# MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1302
-msgid "# HELLO messages received via WLAN"
+#: src/transport/plugin_transport_wlan.c:1487
+msgid "# ACKs received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1326
-msgid "# fragments received via WLAN"
+#: src/transport/plugin_transport_wlan.c:1555
+msgid "# DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1336
-msgid "# ACKs received via WLAN"
+#: src/transport/plugin_transport_wlan.c:1696
+msgid "# DATA messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1396
-msgid "# WLAN DATA messages discarded due to CRC32 error"
+#: src/transport/plugin_transport_wlan.c:1730
+msgid "# DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1518
-msgid "# DATA messages received via WLAN"
+#: src/transport/plugin_transport_wlan.c:1793
+msgid "# HELLO beacons sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1553
-msgid "# WLAN DATA messages processed"
+#: src/transport/plugin_transport_wlan.c:2160
+#, c-format
+msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1616
-msgid "# HELLO beacons sent via WLAN"
+#: src/transport/plugin_transport_wlan.c:2182
+msgid "# sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1929
+#: src/transport/transport_api.c:767
 #, c-format
-msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
-msgstr ""
-
-#: src/transport/transport_api.c:739
-#, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/transport/transport-testing.c:584
+#: src/transport/transport-testing.c:603
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -8015,12 +8440,12 @@
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
-#: src/util/connection.c:751 src/util/connection.c:919
+#: src/util/connection.c:751 src/util/connection.c:914
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/util/connection.c:910
+#: src/util/connection.c:904
 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
@@ -8087,12 +8512,12 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/util/disk.c:1184
+#: src/util/disk.c:1202
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录！\n"
 
-#: src/util/disk.c:1546 src/util/service.c:1323
+#: src/util/disk.c:1564 src/util/service.c:1323
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
@@ -8204,81 +8629,82 @@
 msgid "Manipulate GNUnet configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-ecc.c:75
+#: src/util/gnunet-ecc.c:81
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/gnunet-ecc.c:81
+#: src/util/gnunet-ecc.c:117
 #, c-format
+msgid "Generating %u keys like %s, please wait"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:130
+#, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:97
+#: src/util/gnunet-ecc.c:171
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/util/gnunet-ecc.c:107
+#: src/util/gnunet-ecc.c:181
 #, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:110
+#: src/util/gnunet-ecc.c:184
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:199
+#: src/util/gnunet-ecc.c:277
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:210
+#: src/util/gnunet-ecc.c:288
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/gnunet-ecc.c:232
+#: src/util/gnunet-ecc.c:310
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/gnunet-ecc.c:283
+#: src/util/gnunet-ecc.c:361
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:349
+#: src/util/gnunet-ecc.c:411
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:352
+#: src/util/gnunet-ecc.c:414
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:355
+#: src/util/gnunet-ecc.c:417
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:358
+#: src/util/gnunet-ecc.c:420
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:361
-msgid "print the hash of the public key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:364
+#: src/util/gnunet-ecc.c:423
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:375
+#: src/util/gnunet-ecc.c:434
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改配置文件中的一个值"
@@ -8312,13 +8738,13 @@
 msgid "Manipulate GNUnet proof of work files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-service-resolver.c:299
+#: src/util/gnunet-service-resolver.c:310
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/gnunet-service-resolver.c:371
-#: src/util/gnunet-service-resolver.c:412
+#: src/util/gnunet-service-resolver.c:382
+#: src/util/gnunet-service-resolver.c:423
 #, c-format
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
@@ -8367,7 +8793,7 @@
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1355 src/util/network.c:1480
+#: src/util/network.c:1361 src/util/network.c:1486
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -8430,28 +8856,28 @@
 msgid "Malformed configuration, exit ...\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/resolver_api.c:198
+#: src/util/resolver_api.c:201
 #, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:216
+#: src/util/resolver_api.c:220
 #, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:348
+#: 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:352
+#: src/util/resolver_api.c:361
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:908
+#: src/util/resolver_api.c:974
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
@@ -8480,7 +8906,7 @@
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/server.c:892
+#: src/util/server.c:894
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -8583,114 +9009,114 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:433
+#: src/util/strings.c:434
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:561
+#: src/util/strings.c:562
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
 
-#: src/util/strings.c:658
+#: src/util/strings.c:659
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:662
+#: src/util/strings.c:663
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:664
+#: src/util/strings.c:665
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:670
+#: src/util/strings.c:671
 msgid "ms"
 msgstr "毫秒"
 
-#: src/util/strings.c:676
+#: src/util/strings.c:677
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:682
+#: src/util/strings.c:683
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:688
+#: src/util/strings.c:689
 msgid "h"
 msgstr "时"
 
-#: src/util/strings.c:695
+#: src/util/strings.c:696
 #, fuzzy
 msgid "day"
 msgstr " 天"
 
-#: src/util/strings.c:697
+#: src/util/strings.c:698
 #, fuzzy
 msgid "days"
 msgstr " 天"
 
-#: src/util/strings.c:726
+#: src/util/strings.c:727
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1159
+#: src/util/strings.c:1192
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1167
+#: src/util/strings.c:1200
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1173
+#: src/util/strings.c:1206
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1180
+#: src/util/strings.c:1213
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1189
+#: src/util/strings.c:1222
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/util/strings.c:1395 src/util/strings.c:1411
+#: src/util/strings.c:1428 src/util/strings.c:1444
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1420
+#: src/util/strings.c:1453
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/strings.c:1503 src/util/strings.c:1534 src/util/strings.c:1582
-#: src/util/strings.c:1603
+#: src/util/strings.c:1536 src/util/strings.c:1567 src/util/strings.c:1615
+#: src/util/strings.c:1636
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/strings.c:1560
+#: src/util/strings.c:1593
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/util/strings.c:1612
+#: src/util/strings.c:1645
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/strings.c:1664
+#: src/util/strings.c:1697
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
-#: src/util/strings.c:1714
+#: src/util/strings.c:1747
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 
-#: src/util/strings.c:1745
+#: src/util/strings.c:1778
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
@@ -8870,27 +9296,71 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:566 src/include/gnunet_common.h:573
-#: src/include/gnunet_common.h:581
+#: src/include/gnunet_common.h:586 src/include/gnunet_common.h:593
+#: src/include/gnunet_common.h:601
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:593
+#: src/include/gnunet_common.h:613
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:620 src/include/gnunet_common.h:629
+#: src/include/gnunet_common.h:640 src/include/gnunet_common.h:649
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Failed to run `upnpc` command"
-#~ msgstr "运行 %s失败：%s %d\n"
+#~ msgid "Client %p disconnected from us.\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
 
 #, fuzzy
+#~ msgid "Could not send message to client (%p)!\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Successfully created new channel to peer (%s)!\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
+
+#, fuzzy
+#~ msgid "Could not send message to channel!\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Could not send service-response message via cadet!)\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Could not send service-request multipart message to channel!\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "New incoming channel from peer %s.\n"
+#~ msgstr "“%s”已连接到“%s”。\n"
+
+#, fuzzy
+#~ msgid "Reloading sensor definitions from directory `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Loaded %d sensors from directory `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Failed to receive response from `SENSOR' service."
+#~ msgstr "“%s”的参数无效。\n"
+
+#, fuzzy
+#~ msgid "Received invalid message from `SENSOR' service."
+#~ msgstr "“%s”的参数无效。\n"
+
+#, fuzzy
+#~ msgid "No UNIXPATH given in configuration!\n"
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
 #~ msgid "Could not convert `%s' to integer.\n"
 #~ msgstr "无法连接到 %s:%u：%s\n"
 
@@ -8911,10 +9381,6 @@
 #~ msgstr "无法获取有关用户“%s”的信息：%s\n"
 
 #, fuzzy
-#~ msgid "Could not find option `%s:%s' in configuration.\n"
-#~ msgstr "找不到主机“%s”的 IP：%s\n"
-
-#, fuzzy
 #~ msgid "Peer `%s' disconnected\n"
 #~ msgstr ""
 #~ "\n"
@@ -9008,10 +9474,6 @@
 #~ msgstr "打印配置文件中的一个值到标准输出"
 
 #, fuzzy
-#~ msgid "number of peers to start"
-#~ msgstr "迭代次数"
-
-#, fuzzy
 #~ msgid "Failed to read or generate private key: %s\n"
 #~ msgstr "无法为守护程序创建用户账户。"
 
@@ -9040,10 +9502,6 @@
 #~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #, fuzzy
-#~ msgid "Failed to create new signature"
-#~ msgstr "发送消息失败。\n"
-
-#, fuzzy
 #~ msgid "Failed to remove records from database"
 #~ msgstr "发送消息失败。\n"
 
@@ -9301,10 +9759,6 @@
 #~ msgstr "未知错误。\n"
 
 #, fuzzy
-#~ msgid "Could not create namespace `%s'\n"
-#~ msgstr "无法解析“%s”(%s)：%s\n"
-
-#, fuzzy
 #~ msgid "Stored zonekey for zone `%s' in file `%s'\n"
 #~ msgstr "打开日志文件“%s”失败：%s\n"
 
@@ -9929,15 +10383,9 @@
 #~ msgid "output in gnuplot format"
 #~ msgstr "以 gnuplot 格式输出"
 
-#~ msgid "number of messages to use per iteration"
-#~ msgstr "每次迭代所使用的消息数量"
-
 #~ msgid "receiver host identifier (ENC file name)"
 #~ msgstr "接收方主机标识(ENC 文件名)"
 
-#~ msgid "message size"
-#~ msgstr "消息尺寸"
-
 #~ msgid "number of messages in a message block"
 #~ msgstr "一个消息块中的消息数量"
 
@@ -9976,9 +10424,6 @@
 #~ msgid "\tvariance %8.4f\n"
 #~ msgstr "\t波动 %8.4f\n"
 
-#~ msgid "Output format not known, this should not happen.\n"
-#~ msgstr "输出格式未知，不应出现这种情况。\n"
-
 #~ msgid ""
 #~ "\n"
 #~ "Did not receive the message from gnunetd. Is gnunetd running?\n"

Modified: gnunet/src/include/gnunet_rps_service.h
===================================================================
--- gnunet/src/include/gnunet_rps_service.h     2014-12-24 15:11:43 UTC (rev 
34787)
+++ gnunet/src/include/gnunet_rps_service.h     2014-12-24 16:59:19 UTC (rev 
34788)
@@ -56,7 +56,7 @@
  * @param num_peers the number of peers returned
  * @param peers array with num_peers PeerIDs
  */
-typedef void (* GNUNET_RPS_NotifyReadyCB) (void *cls, uint64_t num_peers, 
struct GNUNET_PeerIdentity *peers);
+typedef void (* GNUNET_RPS_NotifyReadyCB) (void *cls, uint64_t num_peers, 
const struct GNUNET_PeerIdentity *peers);
 
 /**
  * Request n random peers.

Modified: gnunet/src/rps/gnunet-service-rps.c
===================================================================
--- gnunet/src/rps/gnunet-service-rps.c 2014-12-24 15:11:43 UTC (rev 34787)
+++ gnunet/src/rps/gnunet-service-rps.c 2014-12-24 16:59:19 UTC (rev 34788)
@@ -774,7 +774,7 @@
   }
   else
   {
-    ctx = GNUNET_malloc(sizeof(struct peer_context));
+    ctx = GNUNET_new(struct peer_context);
     ctx->in_flags = 0;
     ctx->mq = NULL;
     ctx->to_channel = NULL;
@@ -924,7 +924,6 @@
 
   // TODO
   msg = (struct GNUNET_RPS_CS_RequestMessage *) message;
-  // Does not work because the compiler seems not to find it.
   cli_ctx = GNUNET_SERVER_client_get_user_context(client, struct client_ctx);
   if ( NULL == cli_ctx ) {
     cli_ctx = GNUNET_new(struct client_ctx);
@@ -932,7 +931,7 @@
     GNUNET_SERVER_client_set_user_context(client, cli_ctx);
   }
   
-  // TODO How many peers do we give back?
+  // How many peers do we give back?
   // Wait until we have enough random peers?
 
   ev = GNUNET_MQ_msg_extra(out_msg,
@@ -975,9 +974,6 @@
   struct GNUNET_PeerIdentity *peer;
 
   // TODO check the proof of work
-  // and check limit for PUSHes
-  // IF we count per peer PUSHes
-  // maybe remove from gossip/sampler list
   
   peer = (struct GNUNET_PeerIdentity *) GNUNET_CADET_channel_get_info( 
channel, GNUNET_CADET_OPTION_PEER );
   
@@ -1012,15 +1008,15 @@
   struct GNUNET_MQ_Envelope *ev;
   struct GNUNET_RPS_P2P_PullReplyMessage *out_msg;
 
-  // TODO find some way to keep one peer from spamming with pull requests
+  // find some way to keep one peer from spamming with pull requests?
   // allow only one request per time interval ?
   // otherwise remove from peerlist?
 
   peer = (struct GNUNET_PeerIdentity *) GNUNET_CADET_channel_get_info(channel, 
GNUNET_CADET_OPTION_PEER);
   LOG(GNUNET_ERROR_TYPE_DEBUG, "PULL REQUEST from peer %s received\n", 
GNUNET_i2s(peer));
 
-  mq = GNUNET_CADET_mq_create(channel); // TODO without mq?
-  //mq = get_mq(peer_map, peer);
+  //mq = GNUNET_CADET_mq_create(channel); // without mq?
+  mq = get_mq(peer_map, peer);
 
   //in_msg = (struct GNUNET_RPS_P2P_PullRequestMessage *) msg;
   // TODO how many peers do we actually send?
@@ -1034,9 +1030,6 @@
 
   GNUNET_MQ_send(mq, ev);
 
-  GNUNET_MQ_destroy(mq);
-
-
   return GNUNET_OK;
 }
 
@@ -1067,12 +1060,11 @@
 
   in_msg = (struct GNUNET_RPS_P2P_PullReplyMessage *) msg;
   peers = (struct GNUNET_PeerIdentity *) &msg[1];
-  for ( i = 0 ; i < GNUNET_ntohll(in_msg->num_peers) ; i++ ) {
+  for ( i = 0 ; i < GNUNET_ntohll(in_msg->num_peers) ; i++ )
+  {
     GNUNET_array_append(pull_list, pull_list_size, peers[i]);
   }
 
-  // TODO maybe a disconnect happens here
-  
   return GNUNET_OK;
 }
 
@@ -1232,7 +1224,8 @@
   void
 insertCB (void *cls, const struct GNUNET_PeerIdentity *id, struct 
GNUNET_HashCode hash)
 {
-  touch_mq(peer_map, id);
+  // We open a channel to be notified when this peer goes down.
+  touch_channel(peer_map, id);
 }
 
 /**
@@ -1298,8 +1291,6 @@
 }
 
 
-
-
 /**
  * Task run during shutdown.
  *
@@ -1321,13 +1312,10 @@
   GNUNET_NSE_disconnect(nse);
   GNUNET_CADET_disconnect(cadet_handle);
   GNUNET_free(own_identity);
-  //GNUNET_free(round_interval);
-  //GNUNET_free(gossip_list);
   SAMPLER_samplers_destroy(sampler_list);
   GNUNET_array_grow(gossip_list, gossip_list_size, 0);
   GNUNET_array_grow(push_list, push_list_size, 0);
   GNUNET_array_grow(pull_list, pull_list_size, 0);
-  // TODO delete global data
 }
 
 
@@ -1421,7 +1409,6 @@
   LOG(GNUNET_ERROR_TYPE_DEBUG, "Ready to receive requests from clients\n");
 
 
-
   do_round_task = GNUNET_SCHEDULER_add_now (&do_round, NULL);
   LOG(GNUNET_ERROR_TYPE_DEBUG, "Scheduled first round\n");
 
@@ -1431,7 +1418,6 @@
 }
 
 
-
 /**
  * Process statistics requests.
  *

Modified: gnunet/src/rps/test_rps.conf
===================================================================
--- gnunet/src/rps/test_rps.conf        2014-12-24 15:11:43 UTC (rev 34787)
+++ gnunet/src/rps/test_rps.conf        2014-12-24 16:59:19 UTC (rev 34788)
@@ -1,6 +1,6 @@
 [rps]
 AUTOSTART = YES
-#PREFIX = valgrind --log-file=/tmp/rps/valgrind!gnunet-service-rps!%p
+PREFIX = valgrind --log-file=/tmp/rps/valgrind!gnunet-service-rps!%p
 BINARY = gnunet-service-rps
 UNIXPATH = /tmp/gnunet-service-rps.sock
 HOME = $SERVICEHOME

Modified: gnunet/src/rps/test_rps_multipeer.c
===================================================================
--- gnunet/src/rps/test_rps_multipeer.c 2014-12-24 15:11:43 UTC (rev 34787)
+++ gnunet/src/rps/test_rps_multipeer.c 2014-12-24 16:59:19 UTC (rev 34788)
@@ -96,15 +96,7 @@
 static void
 handle_reply (void *cls, uint64_t n, struct GNUNET_PeerIdentity *peers)
 {
-  //struct RPSPeer *peer = cls;
 
-  //FPRINTF (stderr,
-  //         "Received network size estimate from peer %u. logSize: %f 
std.dev. %f (%f/%u)\n",
-  //         (unsigned int) (peer - rps_peers),
-       //   estimate, std_dev,
-  //         GNUNET_NSE_log_estimate_to_n (estimate),
-       //   NUM_PEERS);
-
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Got peer %s\n", GNUNET_i2s(peers));
   
   ok = 0;
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r34788 - in gnunet: po src/include src/rps, gnunet <=
Prev by Date: [GNUnet-SVN] r34787 - gnunet/src/rps
Next by Date: [GNUnet-SVN] r34789 - libmicrohttpd/src/microhttpd
Previous by thread: [GNUnet-SVN] r34787 - gnunet/src/rps
Next by thread: [GNUnet-SVN] r34789 - libmicrohttpd/src/microhttpd
Index(es):
- Date
- Thread