gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r27001 - in gnunet: po src/include src/set src/util


From: gnunet
Subject: [GNUnet-SVN] r27001 - in gnunet: po src/include src/set src/util
Date: Sat, 27 Apr 2013 16:16:29 +0200

Author: dold
Date: 2013-04-27 16:16:29 +0200 (Sat, 27 Apr 2013)
New Revision: 27001

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_set_service.h
   gnunet/src/set/Makefile.am
   gnunet/src/set/gnunet-service-set.c
   gnunet/src/set/gnunet-service-set.h
   gnunet/src/set/gnunet-service-set_union.c
   gnunet/src/set/gnunet-set.c
   gnunet/src/set/mq.c
   gnunet/src/set/mq.h
   gnunet/src/set/set_api.c
   gnunet/src/util/crypto_ecc.c
Log:
work on gnunet-set, isolated bug in stream


Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2013-04-27 11:04:29 UTC (rev 27000)
+++ gnunet/po/de.po     2013-04-27 14:16:29 UTC (rev 27001)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-03-06 00:28+0100\n"
+"POT-Creation-Date: 2013-04-27 12:39+0200\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -17,314 +17,420 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/arm_api.c:162
+#: src/arm/arm_api.c:880
+msgid "Client was disconnected from arm service, trying to reconnect.\n"
+msgstr ""
+
+#: src/arm/arm_monitor_api.c:321
+msgid ""
+"Monitoring client was disconnected from arm service, trying to reconnect.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:159
+#, fuzzy, c-format
+msgid "Failed to remove configuration file %s\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/arm/gnunet-arm.c:165
+#, fuzzy, c-format
+msgid "Failed to remove servicehome directory %s\n"
+msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+
+#: src/arm/gnunet-arm.c:204 src/testbed/gnunet-service-testbed_peers.c:712
+msgid "Message was sent successfully"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:206 src/testbed/gnunet-service-testbed_peers.c:714
 #, fuzzy
-msgid "Failed to transmit shutdown request to client.\n"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+msgid "Misconfiguration (can't connect to the ARM service)"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/arm/gnunet-arm.c:166
+#: src/arm/gnunet-arm.c:208 src/testbed/gnunet-service-testbed_peers.c:716
+#, fuzzy
+msgid "We disconnected from ARM before we could send a request"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/arm/gnunet-arm.c:210 src/testbed/gnunet-service-testbed_peers.c:718
+msgid "ARM API is busy"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:212 src/testbed/gnunet-service-testbed_peers.c:720
+msgid "Request doesn't fit into a message"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:722
+#, fuzzy
+msgid "Request timed out"
+msgstr "# Sitzungsschlüssel akzeptiert"
+
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:724
+#, fuzzy
+msgid "Unknown request status"
+msgstr "Unbekannte Operation `%s'\n"
+
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:740
 #, fuzzy, c-format
-msgid "Service `%s' is unknown to ARM.\n"
+msgid "%s is stopped"
+msgstr "# bytes in der Datenbank"
+
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:742
+#, fuzzy, c-format
+msgid "%s is starting"
+msgstr "`%s' startet\n"
+
+#: src/arm/gnunet-arm.c:236 src/testbed/gnunet-service-testbed_peers.c:744
+#, c-format
+msgid "%s is stopping"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:238 src/testbed/gnunet-service-testbed_peers.c:746
+#, fuzzy, c-format
+msgid "%s is starting already"
+msgstr "`%s' startet\n"
+
+#: src/arm/gnunet-arm.c:240 src/testbed/gnunet-service-testbed_peers.c:748
+#, c-format
+msgid "%s is stopping already"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:750
+#, c-format
+msgid "%s is started already"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:752
+#, c-format
+msgid "%s is stopped already"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:754
+#, fuzzy, c-format
+msgid "%s service is not known to ARM"
 msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/arm/gnunet-arm.c:171
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:756
 #, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "Dienst gelöscht.\n"
+msgid "%s service failed to start"
+msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/arm/gnunet-arm.c:174
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:758
 #, fuzzy, c-format
-msgid "Service `%s' was already running.\n"
-msgstr "Diese Suche läuft bereits!\n"
+msgid "%s service can't be started because ARM is shutting down"
+msgstr "`%s' fährt herunter.\n"
 
-#: src/arm/gnunet-arm.c:179
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:760
+#, c-format
+msgid "%.s Unknown result code."
+msgstr ""
+
+#: src/arm/gnunet-arm.c:271
+msgid "Fatal error initializing ARM API.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:291
 #, fuzzy, c-format
-msgid "Service `%s' has been started.\n"
-msgstr "Dienst gelöscht.\n"
+msgid "Failed to send a request to kill the `%s' service: %%s\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-arm.c:182
+#: src/arm/gnunet-arm.c:307
 #, fuzzy, c-format
-msgid "Service `%s' was already being stopped.\n"
-msgstr "Dienst gelöscht.\n"
+msgid "Failed to kill the `%s' service: %s\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/arm/gnunet-arm.c:186
+#: src/arm/gnunet-arm.c:323
 #, fuzzy, c-format
-msgid "Service `%s' was already not running.\n"
-msgstr "Diese Suche läuft bereits!\n"
+msgid "Failed to send a stop request to the ARM service: %s\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-arm.c:190
-#, fuzzy
-msgid "Request ignored as ARM is shutting down.\n"
-msgstr "`%s' fährt herunter.\n"
+#: src/arm/gnunet-arm.c:345
+#, fuzzy, c-format
+msgid "Failed to stop the ARM service: %s\n"
+msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/arm/gnunet-arm.c:194
-#, fuzzy
-msgid "Error communicating with ARM service.\n"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
+#: src/arm/gnunet-arm.c:361 src/arm/gnunet-arm.c:370
+#, fuzzy, c-format
+msgid "Failed to start the ARM service: %s\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-arm.c:198
-#, fuzzy
-msgid "Timeout communicating with ARM service.\n"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
+#: src/arm/gnunet-arm.c:390
+#, fuzzy, c-format
+msgid "Failed to send a request to start the `%s' service: %%s\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-arm.c:202
-#, fuzzy
-msgid "Operation failed.\n"
-msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
+#: src/arm/gnunet-arm.c:405
+#, fuzzy, c-format
+msgid "Failed to start the `%s' service: %s\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-arm.c:206
-msgid "Unknown response code from ARM.\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:423
+#, fuzzy, c-format
+msgid "Failed to request a list of services: %s\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/arm/gnunet-arm.c:229
+#: src/arm/gnunet-arm.c:430
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/arm/gnunet-arm.c:232
+#: src/arm/gnunet-arm.c:433
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-arm.c:253
-#, fuzzy, c-format
-msgid "Failed to remove configuration file %s\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+#: src/arm/gnunet-arm.c:534
+msgid "Began monitoring ARM for service status changes\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:259
+#: src/arm/gnunet-arm.c:537
+#, c-format
+msgid "Stopped %s.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:540
 #, fuzzy, c-format
-msgid "Failed to remove servicehome directory %s\n"
-msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
+msgid "Starting %s...\n"
+msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:407 src/arm/gnunet-arm.c:424
-msgid "Fatal error initializing ARM API.\n"
+#: src/arm/gnunet-arm.c:543
+#, c-format
+msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:453
+#: src/arm/gnunet-arm.c:552
+#, fuzzy, c-format
+msgid "Unknown status %u for service %s.\n"
+msgstr "Unbekannte Operation `%s'\n"
+
+#: src/arm/gnunet-arm.c:622
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:455
+#: src/arm/gnunet-arm.c:624
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:457
+#: src/arm/gnunet-arm.c:626
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:459
+#: src/arm/gnunet-arm.c:628
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:462
+#: src/arm/gnunet-arm.c:631
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:465
+#: src/arm/gnunet-arm.c:634
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:467
+#: src/arm/gnunet-arm.c:636
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:470
+#: src/arm/gnunet-arm.c:639
 #, fuzzy
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr "Zeit, die gewartet wird, bis der Durchlauf fertiggestellt wird (in ms)"
 
-#: src/arm/gnunet-arm.c:472
+#: src/arm/gnunet-arm.c:641
 #, fuzzy
 msgid "list currently running services"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-arm.c:474
+#: src/arm/gnunet-arm.c:643
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:476
+#: src/arm/gnunet-arm.c:645
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:487
+#: src/arm/gnunet-arm.c:656
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:345
-#, fuzzy, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
-
-#: src/arm/gnunet-service-arm.c:348
-#, fuzzy, c-format
-msgid "Starting service `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
-
-#: src/arm/gnunet-service-arm.c:374
+#: src/arm/gnunet-service-arm.c:257
 #, fuzzy
 msgid "Could not send status result to client\n"
 msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:406
+#: src/arm/gnunet-service-arm.c:291
 #, fuzzy
 msgid "Could not send list result to client\n"
 msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:537
+#: src/arm/gnunet-service-arm.c:500
 #, fuzzy, c-format
+msgid "Failed to start service `%s'\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
+#: src/arm/gnunet-service-arm.c:507
+#, fuzzy, c-format
+msgid "Starting service `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/arm/gnunet-service-arm.c:602
+#, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/arm/gnunet-service-arm.c:559
+#: src/arm/gnunet-service-arm.c:624
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:573
+#: src/arm/gnunet-service-arm.c:638
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:681
+#: src/arm/gnunet-service-arm.c:771
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:892
+#: src/arm/gnunet-service-arm.c:1023
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:985
+#: src/arm/gnunet-service-arm.c:1116
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:990
+#: src/arm/gnunet-service-arm.c:1121
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:995
+#: src/arm/gnunet-service-arm.c:1126
 #, fuzzy
 msgid "unknown"
 msgstr "Unbekannter Fehler"
 
-#: src/arm/gnunet-service-arm.c:1001
+#: src/arm/gnunet-service-arm.c:1132
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-service-arm.c:1036
+#: src/arm/gnunet-service-arm.c:1154
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1228
+#: src/arm/gnunet-service-arm.c:1169
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1386
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1239
+#: src/arm/gnunet-service-arm.c:1397
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1253
+#: src/arm/gnunet-service-arm.c:1411
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:44
+#: src/arm/mockup-service.c:46
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:465
+#: src/ats/ats_api_performance.c:475
 #, fuzzy, c-format
 msgid "Received %s message\n"
 msgstr "ungültige `%s' Nachricht empfangen\n"
 
-#: src/ats/ats_api_performance.c:508
+#: src/ats/ats_api_performance.c:518
 #, fuzzy, c-format
 msgid "Received last message for %s \n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1176
-#: src/ats/gnunet-service-ats_addresses.c:1210
+#: src/ats/gnunet-service-ats_addresses.c:1372
+#: src/ats/gnunet-service-ats_addresses.c:1406
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1182
+#: src/ats/gnunet-service-ats_addresses.c:1378
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1189
+#: src/ats/gnunet-service-ats_addresses.c:1385
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1216
+#: src/ats/gnunet-service-ats_addresses.c:1412
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1223
+#: src/ats/gnunet-service-ats_addresses.c:1419
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:735
+#: src/ats/gnunet-service-ats_addresses_mlp.c:756
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1044
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1075
 #, fuzzy, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1226
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1258
 #, c-format
 msgid "Update for ATS type `%s' not implemented!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1306
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1341
 #, c-format
 msgid "Updating address for peer `%s' not added before\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1726
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1761
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1734
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1769
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1744
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1779
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1752
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1787
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1763
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1798
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
@@ -346,85 +452,85 @@
 "s, %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/ats-tool/gnunet-ats.c:326
+#: src/ats-tool/gnunet-ats.c:320
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:345 src/namestore/gnunet-namestore.c:610
-#: src/transport/gnunet-transport.c:813
+#: src/ats-tool/gnunet-ats.c:339 src/namestore/gnunet-namestore.c:610
+#: src/transport/gnunet-transport.c:804
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/ats-tool/gnunet-ats.c:355 src/transport/gnunet-transport.c:819
+#: src/ats-tool/gnunet-ats.c:349 src/transport/gnunet-transport.c:810
 #, 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:363
+#: src/ats-tool/gnunet-ats.c:357
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:379 src/ats-tool/gnunet-ats.c:398
-#: src/ats-tool/gnunet-ats.c:415 src/ats-tool/gnunet-ats.c:440
+#: src/ats-tool/gnunet-ats.c:373 src/ats-tool/gnunet-ats.c:392
+#: src/ats-tool/gnunet-ats.c:409 src/ats-tool/gnunet-ats.c:434
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/ats-tool/gnunet-ats.c:388 src/ats-tool/gnunet-ats.c:405
+#: src/ats-tool/gnunet-ats.c:382 src/ats-tool/gnunet-ats.c:399
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/ats-tool/gnunet-ats.c:433
+#: src/ats-tool/gnunet-ats.c:427
 msgid "Type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:490
+#: src/ats-tool/gnunet-ats.c:484
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:493
+#: src/ats-tool/gnunet-ats.c:487
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:496
+#: src/ats-tool/gnunet-ats.c:490
 #, 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:499
+#: src/ats-tool/gnunet-ats.c:493
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:502
+#: src/ats-tool/gnunet-ats.c:496
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats-tool/gnunet-ats.c:505
+#: src/ats-tool/gnunet-ats.c:499
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:502
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:511
+#: src/ats-tool/gnunet-ats.c:505
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:514
+#: src/ats-tool/gnunet-ats.c:508
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:517
+#: src/ats-tool/gnunet-ats.c:511
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:526
+#: src/ats-tool/gnunet-ats.c:520
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -434,21 +540,21 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/consensus/gnunet-consensus.c:317
+#: src/consensus/gnunet-consensus.c:350
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "Anzahl an Durchläufen"
 
-#: src/consensus/gnunet-consensus.c:320
+#: src/consensus/gnunet-consensus.c:353
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus.c:323
+#: src/consensus/gnunet-consensus.c:356
 #, fuzzy
 msgid "number of values"
 msgstr "Anzahl an Durchläufen"
 
-#: src/consensus/gnunet-consensus.c:326
+#: src/consensus/gnunet-consensus.c:359
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# Sitzungsschlüssel akzeptiert"
@@ -475,52 +581,52 @@
 msgid "ibf size"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-start-peers.c:158
+#: src/consensus/gnunet-consensus-start-peers.c:172
 msgid "start peers with the given template configuration"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-start-peers.c:161
+#: src/consensus/gnunet-consensus-start-peers.c:175
 #, fuzzy
 msgid "number of peers to start"
 msgstr "Anzahl an Durchläufen"
 
-#: src/core/core_api.c:755
+#: src/core/core_api.c:752
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:86 src/peerinfo-tool/gnunet-peerinfo.c:214
+#: src/core/gnunet-core.c:82
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/core/gnunet-core.c:119 src/core/gnunet-core.c:147
-#: src/transport/gnunet-transport.c:612 src/transport/gnunet-transport.c:636
+#: src/core/gnunet-core.c:112 src/core/gnunet-core.c:140
+#: src/transport/gnunet-transport.c:606 src/transport/gnunet-transport.c:630
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:121 src/transport/gnunet-transport.c:614
+#: src/core/gnunet-core.c:114 src/transport/gnunet-transport.c:608
 #, fuzzy
 msgid "Connected to"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/core/gnunet-core.c:149 src/transport/gnunet-transport.c:638
+#: src/core/gnunet-core.c:142 src/transport/gnunet-transport.c:632
 #, fuzzy
 msgid "Disconnected from"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:176
-#: src/peerinfo-tool/gnunet-peerinfo.c:541
+#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:176
+#: src/peerinfo-tool/gnunet-peerinfo.c:643
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültige Kommandozeilen Parameter:\n"
 
-#: src/core/gnunet-core.c:211 src/transport/gnunet-transport.c:1005
+#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:996
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/core/gnunet-core.c:222
+#: src/core/gnunet-core.c:215
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -541,7 +647,7 @@
 msgstr "GNUnet Konfiguration"
 
 #: src/core/gnunet-service-core.c:164
-#: src/transport/gnunet-service-transport.c:725
+#: src/transport/gnunet-service-transport.c:758
 #, fuzzy
 msgid "Transport service is unable to access hostkey. Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -667,44 +773,44 @@
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1312
+#: src/core/gnunet-service-core_kx.c:1298
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1319
+#: src/core/gnunet-service-core_kx.c:1305
 #, 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:1322
+#: src/core/gnunet-service-core_kx.c:1308
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1365
-#: src/core/gnunet-service-core_kx.c:1390
+#: src/core/gnunet-service-core_kx.c:1351
+#: src/core/gnunet-service-core_kx.c:1376
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1377
+#: src/core/gnunet-service-core_kx.c:1363
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1404
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1426
+#: src/core/gnunet-service-core_kx.c:1412
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1443
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
@@ -715,7 +821,7 @@
 msgstr "# Knotenankündigungen empfangen"
 
 #: src/core/gnunet-service-core_neighbours.c:179
-#: src/core/gnunet-service-core_neighbours.c:333
+#: src/core/gnunet-service-core_neighbours.c:328
 msgid "# neighbour entries allocated"
 msgstr ""
 
@@ -723,23 +829,23 @@
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:420
+#: src/core/gnunet-service-core_neighbours.c:411
 #, fuzzy, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
 #: src/core/gnunet-service-core_sessions.c:210
 #: src/core/gnunet-service-core_sessions.c:280
-#: src/dht/gnunet-service-dht_neighbours.c:645
-#: src/dht/gnunet-service-dht_neighbours.c:704
-#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1530
-#: src/topology/gnunet-daemon-topology.c:704
-#: src/topology/gnunet-daemon-topology.c:805
-#: src/transport/gnunet-service-transport_neighbours.c:1052
-#: src/transport/gnunet-service-transport_neighbours.c:1276
-#: src/transport/gnunet-service-transport_neighbours.c:1285
-#: src/transport/gnunet-service-transport_neighbours.c:2826
-#: src/transport/gnunet-service-transport_neighbours.c:3089
+#: src/dht/gnunet-service-dht_neighbours.c:644
+#: src/dht/gnunet-service-dht_neighbours.c:703
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
+#: src/topology/gnunet-daemon-topology.c:700
+#: src/topology/gnunet-daemon-topology.c:801
+#: src/transport/gnunet-service-transport_neighbours.c:1041
+#: src/transport/gnunet-service-transport_neighbours.c:1265
+#: src/transport/gnunet-service-transport_neighbours.c:1274
+#: src/transport/gnunet-service-transport_neighbours.c:2794
+#: src/transport/gnunet-service-transport_neighbours.c:3053
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
@@ -813,14 +919,14 @@
 #: src/datacache/plugin_datacache_sqlite.c:72
 #: src/datastore/plugin_datastore_mysql.c:803
 #: src/datastore/plugin_datastore_mysql.c:817
-#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
-#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
-#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/datastore/plugin_datastore_sqlite.c:57 src/fs/fs_pseudonym.c:46
+#: src/mysql/mysql.c:41 src/mysql/mysql.c:48 src/mysql/mysql.c:522
+#: src/mysql/mysql.c:531 src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:46
 #: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
-#: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
+#: src/include/gnunet_common.h:608 src/include/gnunet_common.h:615
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -1226,7 +1332,7 @@
 #: 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:736
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:1037
+#: src/nse/gnunet-nse-profiler.c:900
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1295,89 +1401,89 @@
 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:413
+#: src/dht/gnunet-service-dht_clients.c:414
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_clients.c:503
+#: src/dht/gnunet-service-dht_clients.c:508
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:585
+#: src/dht/gnunet-service-dht_clients.c:590
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:791
+#: src/dht/gnunet-service-dht_clients.c:796
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1035
+#: src/dht/gnunet-service-dht_clients.c:1041
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1048
+#: src/dht/gnunet-service-dht_clients.c:1054
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1085
+#: src/dht/gnunet-service-dht_clients.c:1091
 #, 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:1108
+#: src/dht/gnunet-service-dht_clients.c:1114
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1157
-#: src/dht/gnunet-service-dht_clients.c:1199
+#: src/dht/gnunet-service-dht_clients.c:1165
+#: src/dht/gnunet-service-dht_clients.c:1207
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1175
 #, 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:64
+#: src/dht/gnunet-service-dht_datacache.c:68
 #, fuzzy, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_datacache.c:74
+#: src/dht/gnunet-service-dht_datacache.c:78
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:159
+#: src/dht/gnunet-service-dht_datacache.c:165
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:170
+#: src/dht/gnunet-service-dht_datacache.c:176
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:176
+#: src/dht/gnunet-service-dht_datacache.c:182
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:182
+#: src/dht/gnunet-service-dht_datacache.c:188
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:194
+#: src/dht/gnunet-service-dht_datacache.c:200
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:197
+#: src/dht/gnunet-service-dht_datacache.c:203
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:227
+#: src/dht/gnunet-service-dht_datacache.c:234
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# Client Trace-Anfragen empfangen"
@@ -1387,102 +1493,102 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:501
+#: src/dht/gnunet-service-dht_neighbours.c:504
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:591
+#: src/dht/gnunet-service-dht_neighbours.c:594
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:738
+#: src/dht/gnunet-service-dht_neighbours.c:737
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/dht/gnunet-service-dht_neighbours.c:793
+#: src/dht/gnunet-service-dht_neighbours.c:792
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:831
+#: src/dht/gnunet-service-dht_neighbours.c:830
 #, fuzzy
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1053
-#: src/dht/gnunet-service-dht_neighbours.c:1081
+#: src/dht/gnunet-service-dht_neighbours.c:1052
+#: src/dht/gnunet-service-dht_neighbours.c:1086
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1062
-#: src/dht/gnunet-service-dht_neighbours.c:1096
+#: src/dht/gnunet-service-dht_neighbours.c:1067
+#: src/dht/gnunet-service-dht_neighbours.c:1101
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1230
+#: src/dht/gnunet-service-dht_neighbours.c:1235
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1259
+#: src/dht/gnunet-service-dht_neighbours.c:1264
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1266
-#: src/dht/gnunet-service-dht_neighbours.c:1379
-#: src/dht/gnunet-service-dht_neighbours.c:1479
+#: src/dht/gnunet-service-dht_neighbours.c:1271
+#: src/dht/gnunet-service-dht_neighbours.c:1384
+#: src/dht/gnunet-service-dht_neighbours.c:1484
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1344
+#: src/dht/gnunet-service-dht_neighbours.c:1349
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1371
+#: src/dht/gnunet-service-dht_neighbours.c:1376
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1486
+#: src/dht/gnunet-service-dht_neighbours.c:1491
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1574
+#: src/dht/gnunet-service-dht_neighbours.c:1575
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1704
+#: src/dht/gnunet-service-dht_neighbours.c:1730
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1712
+#: src/dht/gnunet-service-dht_neighbours.c:1738
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-dht_neighbours.c:1829
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1845
+#: src/dht/gnunet-service-dht_neighbours.c:1882
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1859
+#: src/dht/gnunet-service-dht_neighbours.c:1896
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1943
+#: src/dht/gnunet-service-dht_neighbours.c:1973
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Bytes empfangen über TCP"
@@ -1647,21 +1753,15 @@
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/dv/dv_api.c:189
-#, fuzzy
-msgid "Failed to connect to the dv service!\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+#: src/dv/gnunet-dv.c:165
+msgid "verbose output"
+msgstr ""
 
-#: src/dv/gnunet-service-dv.c:3003
+#: src/dv/gnunet-dv.c:174
 #, fuzzy
-msgid "Error in communication with PEERINFO service\n"
+msgid "Print information about DV state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/dv/plugin_transport_dv.c:159
-#, fuzzy, c-format
-msgid "%s Received message from %s of type %d, distance %u!\n"
-msgstr "Beschädigte Nachricht von Knoten `%s' in %s:%d empfangen.\n"
-
 #: src/exit/gnunet-daemon-exit.c:741
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
@@ -2122,7 +2222,7 @@
 msgid "Identifiers or URI too long to create UBlock"
 msgstr ""
 
-#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:307
+#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:311
 #, fuzzy
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
@@ -2132,6 +2232,27 @@
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
+#: src/fs/fs_pseudonym.c:342 src/fs/fs_pseudonym.c:645
+#, fuzzy, c-format
+msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
+
+#: src/fs/fs_pseudonym.c:477 src/fs/fs_pseudonym.c:503
+#: src/fs/fs_pseudonym.c:641
+#, fuzzy
+msgid "no-name"
+msgstr "Name anzeigen"
+
+#: src/fs/fs_pseudonym.c:1182 src/util/crypto_ecc.c:975
+#, fuzzy, c-format
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
+
+#: src/fs/fs_pseudonym.c:1505
+#, fuzzy, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
+
 #: src/fs/fs_publish.c:129 src/fs/fs_publish.c:397
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
@@ -2199,7 +2320,7 @@
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:269
+#: src/fs/fs_publish_ksk.c:273
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
@@ -2336,19 +2457,19 @@
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/fs/fs_uri.c:944
+#: src/fs/fs_uri.c:945
 msgid "identifier is NULL!"
 msgstr ""
 
-#: src/fs/fs_uri.c:949
+#: src/fs/fs_uri.c:951
 msgid "identifier has zero length!"
 msgstr ""
 
-#: src/fs/fs_uri.c:1118 src/fs/fs_uri.c:1145
+#: src/fs/fs_uri.c:1122 src/fs/fs_uri.c:1149
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1151
+#: src/fs/fs_uri.c:1155
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2551,19 +2672,19 @@
 msgid "Special file-sharing operations"
 msgstr "Alle Optionen anzeigen"
 
-#: src/fs/gnunet-fs-profiler.c:182
+#: src/fs/gnunet-fs-profiler.c:190
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:185
+#: src/fs/gnunet-fs-profiler.c:193
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:188
+#: src/fs/gnunet-fs-profiler.c:196
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:197
+#: src/fs/gnunet-fs-profiler.c:205
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
@@ -2733,7 +2854,7 @@
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
 #: src/fs/gnunet-publish.c:588 src/fs/gnunet-publish.c:595
-#: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
+#: src/transport/gnunet-transport.c:834 src/transport/gnunet-transport.c:864
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
@@ -2846,111 +2967,111 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:248
+#: src/fs/gnunet-service-fs.c:271
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:309 src/fs/gnunet-service-fs.c:521
+#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:538
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: src/fs/gnunet-service-fs.c:626 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1322
-#: src/topology/gnunet-daemon-topology.c:1329
+#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:291
+#: src/topology/gnunet-daemon-topology.c:1314
+#: src/topology/gnunet-daemon-topology.c:1321
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-service-fs_cp.c:711
+#: src/fs/gnunet-service-fs_cp.c:677
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:715
+#: src/fs/gnunet-service-fs_cp.c:681
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:751
+#: src/fs/gnunet-service-fs_cp.c:716
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/fs/gnunet-service-fs_cp.c:757
+#: src/fs/gnunet-service-fs_cp.c:722
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1331
+#: src/fs/gnunet-service-fs_cp.c:747 src/fs/gnunet-service-fs_cp.c:1296
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:875
+#: src/fs/gnunet-service-fs_cp.c:840
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:928
+#: src/fs/gnunet-service-fs_cp.c:893
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:936
+#: src/fs/gnunet-service-fs_cp.c:901
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# Bytes des Typs %d empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:950
+#: src/fs/gnunet-service-fs_cp.c:915
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:988
+#: src/fs/gnunet-service-fs_cp.c:953
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1056
+#: src/fs/gnunet-service-fs_cp.c:1021
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1081
+#: src/fs/gnunet-service-fs_cp.c:1046
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1091
+#: src/fs/gnunet-service-fs_cp.c:1056
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1169
+#: src/fs/gnunet-service-fs_cp.c:1134
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1203
+#: src/fs/gnunet-service-fs_cp.c:1168
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1226
+#: src/fs/gnunet-service-fs_cp.c:1191
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1276
+#: src/fs/gnunet-service-fs_cp.c:1241
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1300
+#: src/fs/gnunet-service-fs_cp.c:1265
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1329
+#: src/fs/gnunet-service-fs_cp.c:1294
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1699
+#: src/fs/gnunet-service-fs_cp.c:1664
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -3420,100 +3541,100 @@
 msgid "Not a GADS TLD: `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:118
+#: src/hello/gnunet-hello.c:119
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:124
+#: src/hello/gnunet-hello.c:125
 #, fuzzy, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/hello/gnunet-hello.c:132
+#: src/hello/gnunet-hello.c:133
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:139
+#: src/hello/gnunet-hello.c:140
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:149 src/hello/gnunet-hello.c:177
+#: src/hello/gnunet-hello.c:150 src/hello/gnunet-hello.c:179
 #, fuzzy, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/hello/gnunet-hello.c:165
+#: src/hello/gnunet-hello.c:166
 #, 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:189
+#: src/hello/gnunet-hello.c:191
 #, fuzzy, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/hello/hello.c:904
+#: src/hello/hello.c:936
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/hello/hello.c:913
+#: src/hello/hello.c:945
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/hello/hello.c:923
+#: src/hello/hello.c:955
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hello/hello.c:933
+#: src/hello/hello.c:965
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/hello/hello.c:950
+#: src/hello/hello.c:982
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:959
+#: src/hello/hello.c:991
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:978
+#: src/hello/hello.c:1010
 #, 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/hostlist/gnunet-daemon-hostlist.c:264
+#: src/hostlist/gnunet-daemon-hostlist.c:258
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:317
+#: src/hostlist/gnunet-daemon-hostlist.c:311
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:322
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/hostlist/gnunet-daemon-hostlist.c:319
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:329
+#: src/hostlist/gnunet-daemon-hostlist.c:323
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:344
+#: src/hostlist/gnunet-daemon-hostlist.c:338
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -3540,13 +3661,13 @@
 #: src/hostlist/hostlist-client.c:686 src/hostlist/hostlist-client.c:738
 #: src/hostlist/hostlist-client.c:747 src/hostlist/hostlist-client.c:868
 #: src/hostlist/hostlist-client.c:960 src/hostlist/hostlist-client.c:965
-#: src/transport/plugin_transport_http_client.c:1052
-#: src/transport/plugin_transport_http_client.c:1067
+#: src/transport/plugin_transport_http_client.c:1056
+#: src/transport/plugin_transport_http_client.c:1071
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1327
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1319
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -3600,7 +3721,7 @@
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1500
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1492
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -3609,69 +3730,69 @@
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
+#: src/hostlist/hostlist-client.c:1105 src/hostlist/hostlist-client.c:1121
 #, fuzzy
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/hostlist-client.c:1275
+#: src/hostlist/hostlist-client.c:1267
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:1279
+#: src/hostlist/hostlist-client.c:1271
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/hostlist/hostlist-client.c:1282
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-client.c:1323
+#: src/hostlist/hostlist-client.c:1315
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1325
+#: src/hostlist/hostlist-client.c:1317
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1370
+#: src/hostlist/hostlist-client.c:1362
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-client.c:1375
+#: src/hostlist/hostlist-client.c:1367
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:1399 src/hostlist/hostlist-client.c:1416
+#: src/hostlist/hostlist-client.c:1391 src/hostlist/hostlist-client.c:1408
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1411
+#: src/hostlist/hostlist-client.c:1403
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1465
+#: src/hostlist/hostlist-client.c:1457
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1477
+#: src/hostlist/hostlist-client.c:1469
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1489
+#: src/hostlist/hostlist-client.c:1481
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1493
+#: src/hostlist/hostlist-client.c:1485
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
@@ -3685,10 +3806,11 @@
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:425
-#: src/peerinfo-tool/gnunet-peerinfo.c:331
-#: src/peerinfo-tool/gnunet-peerinfo.c:386
-#: src/topology/gnunet-daemon-topology.c:922
+#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:421
+#: src/peerinfo-tool/gnunet-peerinfo.c:348
+#: src/peerinfo-tool/gnunet-peerinfo.c:418
+#: src/peerinfo-tool/gnunet-peerinfo.c:489
+#: src/topology/gnunet-daemon-topology.c:918
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -3744,56 +3866,56 @@
 msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/hostlist/hostlist-server.c:388
+#: src/hostlist/hostlist-server.c:384
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:552 src/peerinfo-tool/gnunet-peerinfo.c:547
-#: src/transport/gnunet-service-transport.c:632
+#: src/hostlist/hostlist-server.c:548 src/peerinfo-tool/gnunet-peerinfo.c:649
+#: src/transport/gnunet-service-transport.c:661
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/hostlist/hostlist-server.c:562
+#: src/hostlist/hostlist-server.c:558
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/hostlist/hostlist-server.c:571
+#: src/hostlist/hostlist-server.c:567
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:585
+#: src/hostlist/hostlist-server.c:581
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-server.c:625
+#: src/hostlist/hostlist-server.c:621
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/hostlist/hostlist-server.c:667
+#: src/hostlist/hostlist-server.c:663
 #, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/integration-tests/connection_watchdog.c:1001
+#: src/integration-tests/connection_watchdog.c:990
 #, fuzzy, c-format
 msgid "Transport plugin: `%s' port %llu\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/integration-tests/connection_watchdog.c:1034
+#: src/integration-tests/connection_watchdog.c:1023
 #, fuzzy, c-format
 msgid "Found %u transport plugins: `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/integration-tests/connection_watchdog.c:1093
+#: src/integration-tests/connection_watchdog.c:1082
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1102
+#: src/integration-tests/connection_watchdog.c:1091
 #: src/template/gnunet-template.c:70
 #, fuzzy
 msgid "help text"
@@ -3814,38 +3936,39 @@
 msgid "Print information about mesh tunnels and peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-service-mesh.c:8010 src/mesh/gnunet-service-mesh-new.c:8015
+#: src/mesh/gnunet-service-mesh.c:7966 src/mesh/gnunet-service-mesh-new.c:7972
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8227 src/mesh/gnunet-service-mesh-new.c:8232
+#: src/mesh/gnunet-service-mesh.c:8179 src/mesh/gnunet-service-mesh-new.c:8185
 #, fuzzy, c-format
 msgid "Mesh service could not access hostkey: %s. Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/mesh/gnunet-service-mesh.c:8309 src/mesh/gnunet-service-mesh.c:8321
-#: src/mesh/gnunet-service-mesh.c:8333 src/mesh/gnunet-service-mesh.c:8347
-#: src/mesh/gnunet-service-mesh.c:8359 src/mesh/gnunet-service-mesh.c:8371
-#: src/mesh/gnunet-service-mesh.c:8383 src/mesh/gnunet-service-mesh-new.c:8321
-#: src/mesh/gnunet-service-mesh-new.c:8333
-#: src/mesh/gnunet-service-mesh-new.c:8345
-#: src/mesh/gnunet-service-mesh-new.c:8359
-#: src/mesh/gnunet-service-mesh-new.c:8371
-#: src/mesh/gnunet-service-mesh-new.c:8383
-#: src/mesh/gnunet-service-mesh-new.c:8395 src/nse/gnunet-service-nse.c:1478
-#: src/nse/gnunet-service-nse.c:1496
-#: src/regex/gnunet-daemon-regexprofiler.c:277
-#: src/regex/gnunet-daemon-regexprofiler.c:290
-#: src/regex/gnunet-daemon-regexprofiler.c:303
+#: src/mesh/gnunet-service-mesh.c:8261 src/mesh/gnunet-service-mesh.c:8273
+#: src/mesh/gnunet-service-mesh.c:8285 src/mesh/gnunet-service-mesh.c:8299
+#: src/mesh/gnunet-service-mesh.c:8311 src/mesh/gnunet-service-mesh.c:8323
+#: src/mesh/gnunet-service-mesh.c:8335 src/mesh/gnunet-service-mesh-new.c:8274
+#: src/mesh/gnunet-service-mesh-new.c:8286
+#: src/mesh/gnunet-service-mesh-new.c:8298
+#: src/mesh/gnunet-service-mesh-new.c:8312
+#: src/mesh/gnunet-service-mesh-new.c:8324
+#: src/mesh/gnunet-service-mesh-new.c:8336
+#: src/mesh/gnunet-service-mesh-new.c:8348 src/nse/gnunet-service-nse.c:1516
+#: src/nse/gnunet-service-nse.c:1534
+#: src/regex/gnunet-daemon-regexprofiler.c:320
+#: src/regex/gnunet-daemon-regexprofiler.c:332
+#: src/regex/gnunet-daemon-regexprofiler.c:344
+#: src/regex/gnunet-daemon-regexprofiler.c:357
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:8395 src/mesh/gnunet-service-mesh.c:8405
-#: src/mesh/gnunet-service-mesh.c:8416 src/mesh/gnunet-service-mesh-new.c:8407
-#: src/mesh/gnunet-service-mesh-new.c:8417
-#: src/mesh/gnunet-service-mesh-new.c:8428
+#: src/mesh/gnunet-service-mesh.c:8347 src/mesh/gnunet-service-mesh.c:8357
+#: src/mesh/gnunet-service-mesh.c:8368 src/mesh/gnunet-service-mesh-new.c:8360
+#: src/mesh/gnunet-service-mesh-new.c:8370
+#: src/mesh/gnunet-service-mesh-new.c:8381
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -3941,7 +4064,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:599
+#: src/peerinfo-tool/gnunet-peerinfo.c:701
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -4232,77 +4355,70 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1013
+#: src/nse/gnunet-nse-profiler.c:885
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/nse/gnunet-nse-profiler.c:1016
+#: src/nse/gnunet-nse-profiler.c:888
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1019
+#: src/nse/gnunet-nse-profiler.c:891 src/testbed/gnunet-testbed-profiler.c:282
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1022
-msgid "IP address of this system as seen by the rest of the testbed"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:1025
-msgid "delay between queries to statistics during a round"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:1028
-msgid "prefix of the filenames we use for writing the topology for each round"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:1031
+#: src/nse/gnunet-nse-profiler.c:894
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1034
+#: src/nse/gnunet-nse-profiler.c:897
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1040
+#: src/nse/gnunet-nse-profiler.c:903
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1050
+#: src/nse/gnunet-nse-profiler.c:912
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/nse/gnunet-service-nse.c:1389
+#: src/nse/gnunet-service-nse.c:1405
 #, fuzzy, c-format
 msgid "NSE service could not access hostkey: %s\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/nse/gnunet-service-nse.c:1403
+#: src/nse/gnunet-service-nse.c:1419
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1486
+#: src/nse/gnunet-service-nse.c:1524
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:134
+#: src/peerinfo/gnunet-service-peerinfo.c:215
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:230
+#: src/peerinfo/gnunet-service-peerinfo.c:354
 #, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
+msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:269
+#: src/peerinfo/gnunet-service-peerinfo.c:369
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s %u \n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:444
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:297
+#: src/peerinfo/gnunet-service-peerinfo.c:480
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -4310,12 +4426,22 @@
 "Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
 "Datei wurde entfernt.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:419
+#: src/peerinfo/gnunet-service-peerinfo.c:632
 #, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:637
+#, 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:807
+#: src/peerinfo/gnunet-service-peerinfo.c:969
+#, 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:1249
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -4346,74 +4472,107 @@
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:256
+#: src/peerinfo/peerinfo_api_notify.c:269
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:419
+#: src/peerinfo-tool/gnunet-peerinfo.c:229
 #, fuzzy, c-format
+msgid "%sPeer `%s'\n"
+msgstr "Ich bin Peer `%s'.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:427
+#, fuzzy, c-format
+msgid "Failure: Did not receive %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:435
+#, fuzzy, c-format
+msgid "Failure: Received invalid %s\n"
+msgstr "ungültige `%s' Nachricht empfangen: %s.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:444
+#, 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:457
+#, c-format
+msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:521
+#, fuzzy, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fehler bei %s:%d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:557
+#: src/peerinfo-tool/gnunet-peerinfo.c:659
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:563
+#: src/peerinfo-tool/gnunet-peerinfo.c:665
 #, 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:625
+#: src/peerinfo-tool/gnunet-peerinfo.c:727
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/peerinfo-tool/gnunet-peerinfo.c:759
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654
+#: src/peerinfo-tool/gnunet-peerinfo.c:762
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:657
+#: src/peerinfo-tool/gnunet-peerinfo.c:765
+msgid "include friend-only information"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:768
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:660
+#: src/peerinfo-tool/gnunet-peerinfo.c:771
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:663
+#: src/peerinfo-tool/gnunet-peerinfo.c:774
+msgid "dump hello to file"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:777
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:666
+#: src/peerinfo-tool/gnunet-peerinfo.c:780
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:677
+#: src/peerinfo-tool/gnunet-peerinfo.c:791
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:118
+#: src/transport/gnunet-service-transport_plugins.c:120
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:122
+#: src/transport/gnunet-service-transport_plugins.c:124
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Teste Transport(e) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:150
+#: src/transport/gnunet-service-transport_plugins.c:153
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
@@ -4495,145 +4654,85 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:376
+#: src/regex/gnunet-daemon-regexprofiler.c:432
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1373
-#, c-format
-msgid "An operation has failed while starting peers: %s\n"
-msgstr ""
+#: src/regex/gnunet-regex-profiler.c:1246
+#, fuzzy
+msgid "No configuration file given. Exiting\n"
+msgstr "Konfigurationsdatei FILENAME verwenden"
 
-#: src/regex/gnunet-regex-profiler.c:1418
-#, fuzzy, c-format
-msgid "Creating a peer failed. Error: %s\n"
-msgstr ""
-"\n"
-"Fehler beim Uploaden der Datei: %s\n"
+#: src/regex/gnunet-regex-profiler.c:1257
+#, fuzzy
+msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
+msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1545
-msgid "An operation has failed while starting slaves\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1567
-#, fuzzy, c-format
-msgid "No files found in `%s'\n"
-msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
-
-#: src/regex/gnunet-regex-profiler.c:1622
-msgid "An operation has failed while linking\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1732
-#: src/testbed/testbed_api_testbed.c:799
-#, c-format
-msgid "Host registration failed for a host. Error: %s\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1813
-msgid "Unable to connect to master controller -- Check config\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1915
-#: src/testbed/testbed_api_testbed.c:964
-#, c-format
-msgid "Host %s cannot start testbed\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1918
-#: src/testbed/testbed_api_testbed.c:968
-msgid "Testbed cannot be started on localhost\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1958
-#, c-format
+#: src/regex/gnunet-regex-profiler.c:1276
 msgid "No hosts-file specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1963
+#: src/regex/gnunet-regex-profiler.c:1282
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1969
-#: src/testbed/testbed_api_testbed.c:1071
+#: src/regex/gnunet-regex-profiler.c:1288
+#: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
-msgid "No hosts loaded. Need at least one host\n"
+msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1972
-#, c-format
-msgid "Checking whether given hosts can start testbed. Please wait\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1996
+#: src/regex/gnunet-regex-profiler.c:1295
 #, fuzzy, c-format
-msgid "Exiting\n"
-msgstr ""
-"\n"
-"Abbruch.\n"
+msgid "No files found in `%s'\n"
+msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/regex/gnunet-regex-profiler.c:2002
-#, fuzzy, c-format
-msgid "No configuration file given. Exiting\n"
-msgstr "Konfigurationsdatei FILENAME verwenden"
-
-#: src/regex/gnunet-regex-profiler.c:2011
-#, fuzzy, c-format
-msgid "Configuration option (regex_prefix) missing. Exiting\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
-
-#: src/regex/gnunet-regex-profiler.c:2029
-#: src/regex/gnunet-regex-simulation-profiler.c:629
-#, c-format
-msgid "Specified policies directory does not exist. Exiting.\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:2036
-#, c-format
+#: src/regex/gnunet-regex-profiler.c:1304
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:2044
-#, c-format
+#: src/regex/gnunet-regex-profiler.c:1314
+#, fuzzy
 msgid ""
-"Error loading search strings. Given file does not contain enough strings. "
+"Error loading search strings.Given file does not contain enough strings. "
 "Exiting.\n"
-msgstr ""
+msgstr "Fehler beim Verlassen der DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:2050
-#, fuzzy, c-format
+#: src/regex/gnunet-regex-profiler.c:1322
+#, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fehler beim Verlassen der DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:2077
+#: src/regex/gnunet-regex-profiler.c:1389
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/regex/gnunet-regex-profiler.c:2080
-msgid "create COUNT number of random links between peers"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:2083
+#: src/regex/gnunet-regex-profiler.c:1392
 msgid "wait TIMEOUT before considering a string match as failed"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:2086
-msgid "wait DELAY before starting string search"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:2089
+#: src/regex/gnunet-regex-profiler.c:1395
 msgid "number of search strings to read from search strings file"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:2092
-#: src/regex/gnunet-regex-simulation-profiler.c:692
-msgid "maximum path compression length"
+#: src/regex/gnunet-regex-profiler.c:1398
+msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:2105
+#: src/regex/gnunet-regex-profiler.c:1401
+#, fuzzy
+msgid "name of file with input strings"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/regex/gnunet-regex-profiler.c:1404
+#, fuzzy
+msgid "name of file with hosts' names"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/regex/gnunet-regex-profiler.c:1416
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4641,6 +4740,10 @@
 msgid "name of the table to write DFAs"
 msgstr ""
 
+#: src/regex/gnunet-regex-simulation-profiler.c:692
+msgid "maximum path compression length"
+msgstr ""
+
 #: src/regex/gnunet-regex-simulation-profiler.c:705
 msgid "Profiler for regex library"
 msgstr ""
@@ -4730,14 +4833,14 @@
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
 
-#: src/statistics/statistics_api.c:511
+#: src/statistics/statistics_api.c:512
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr ""
 "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP in "
 "der Konfigurationsdatei an.\n"
 
-#: src/statistics/statistics_api.c:1056
+#: src/statistics/statistics_api.c:1057
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
@@ -4748,128 +4851,168 @@
 msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
 msgstr ""
 
+#: src/testbed/gnunet-service-testbed_cpustatus.c:670
+#, c-format
+msgid ""
+"Cannot open %s for writing load statistics.  Not logging load statistics\n"
+msgstr ""
+
 #: src/testbed/gnunet_testbed_ll_master.c:57
 #, fuzzy, c-format
 msgid "Job command file not given. Exiting\n"
 msgstr "Konfigurationsdatei FILENAME verwenden"
 
-#: src/testbed/gnunet-testbed-profiler.c:235
-#, c-format
-msgid "No hosts-file specified on command line\n"
+#: src/testbed/gnunet_testbed_mpi_spawn.c:135
+#, fuzzy
+msgid "Waiting for child to exit.\n"
 msgstr ""
+"Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "
+"verbleiben)...\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:267
+#: src/testbed/gnunet_testbed_mpi_spawn.c:296
+#, fuzzy, c-format
+msgid "Spawning process `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/testbed/gnunet-testbed-profiler.c:249
+#, 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:275
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:270
+#: src/testbed/gnunet-testbed-profiler.c:278
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:286
-msgid "Profiler for testbed"
-msgstr ""
-
-#: src/testbed/testbed_api_hosts.c:469
+#: src/testbed/testbed_api_hosts.c:459
 #, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
 
-#: src/testbed/testbed_api_hosts.c:477
+#: src/testbed/testbed_api_hosts.c:467
 #, fuzzy, c-format
 msgid "Hosts file %s has no data\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/testbed/testbed_api_hosts.c:484
+#: src/testbed/testbed_api_hosts.c:474
 #, fuzzy, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/testbed/testbed_api_hosts.c:593
+#: src/testbed/testbed_api_hosts.c:583
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1836
+#: src/testbed/testbed_api_hosts.c:1856
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
-#: src/testbed/testbed_api_testbed.c:638
+#: src/testbed/testbed_api_testbed.c:771
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1003
+#: src/testbed/testbed_api_testbed.c:913
+#, c-format
+msgid "Host registration failed for a host. Error: %s\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:978
+msgid "Controller crash detected. Shutting down.\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1081
+#, c-format
+msgid "Host %s cannot start testbed\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1085
+msgid "Testbed cannot be started on localhost\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1120
 #, fuzzy
 msgid "Cannot start the master controller"
 msgstr "GNUnet testbed Controller starten."
 
-#: src/testbed/testbed_api_testbed.c:1059
+#: src/testbed/testbed_api_testbed.c:1138
+msgid "Shutting down testbed due to timeout while setup.\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1197
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1095
+#: src/testbed/testbed_api_testbed.c:1209
+msgid "No hosts loaded. Need at least one host\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1233
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:668
+#: src/testbed/testbed_api_topology.c:670
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
 
-#: src/testbed/testbed_api_topology.c:674
+#: src/testbed/testbed_api_topology.c:676
 #, fuzzy, c-format
 msgid "Topology file %s has no data\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/testbed/testbed_api_topology.c:681
+#: src/testbed/testbed_api_topology.c:683
 #, fuzzy, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/testbed/testbed_api_topology.c:704
+#: src/testbed/testbed_api_topology.c:706
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/testbed/testbed_api_topology.c:713
-#: src/testbed/testbed_api_topology.c:737
+#: src/testbed/testbed_api_topology.c:715
+#: src/testbed/testbed_api_topology.c:739
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:719
-#: src/testbed/testbed_api_topology.c:743
+#: src/testbed/testbed_api_topology.c:721
+#: src/testbed/testbed_api_topology.c:745
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/testbed/testbed_api_topology.c:725
-#: src/testbed/testbed_api_topology.c:749
+#: src/testbed/testbed_api_topology.c:727
+#: src/testbed/testbed_api_topology.c:751
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:764
+#: src/testbed/testbed_api_topology.c:766
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/testing/gnunet-testing.c:132
+#: src/testing/gnunet-testing.c:133
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testing/gnunet-testing.c:209
+#: src/testing/gnunet-testing.c:210
 #, fuzzy
 msgid "create unique configuration files"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/testing/gnunet-testing.c:211
+#: src/testing/gnunet-testing.c:212
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:213
+#: src/testing/gnunet-testing.c:214
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
@@ -4877,12 +5020,12 @@
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/testing/gnunet-testing.c:215
+#: src/testing/gnunet-testing.c:216
 #, fuzzy
 msgid "configuration template"
 msgstr "GNUnet Konfiguration"
 
-#: src/testing/gnunet-testing.c:224
+#: src/testing/gnunet-testing.c:225
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -4901,59 +5044,64 @@
 msgid "name of the service to run"
 msgstr ""
 
-#: src/testing/testing.c:217
+#: src/testing/testing.c:288
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:233
+#: src/testing/testing.c:304
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:547
+#: src/testing/testing.c:719
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
 
-#: src/testing/testing.c:558
+#: src/testing/testing.c:730
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/testing/testing.c:872
+#: src/testing/testing.c:1175
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/testing/testing.c:883
+#: src/testing/testing.c:1182
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:897
+#: src/testing/testing.c:1191
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/testing/testing.c:931
+#: src/testing/testing.c:1211
 #, fuzzy, c-format
+msgid "Cannot open hostkey file: %s\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/testing/testing.c:1221
+#, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/testing/testing.c:949
+#: src/testing/testing.c:1243
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/testing/testing.c:1029
+#: src/testing/testing.c:1343
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/testing/testing.c:1235
+#: src/testing/testing.c:1691
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
@@ -4967,146 +5115,124 @@
 msgid "# connect requests issued to transport"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:725
-#: src/topology/gnunet-daemon-topology.c:810
+#: src/topology/gnunet-daemon-topology.c:721
+#: src/topology/gnunet-daemon-topology.c:806
 #, fuzzy
 msgid "# friends connected"
 msgstr "# verbundener Knoten"
 
-#: src/topology/gnunet-daemon-topology.c:991
+#: src/topology/gnunet-daemon-topology.c:987
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1034
+#: src/topology/gnunet-daemon-topology.c:1030
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1040
+#: src/topology/gnunet-daemon-topology.c:1036
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:1045
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1057
+#: src/topology/gnunet-daemon-topology.c:1053
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1077
+#: src/topology/gnunet-daemon-topology.c:1073
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1090
+#: src/topology/gnunet-daemon-topology.c:1086
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1100
+#: src/topology/gnunet-daemon-topology.c:1096
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1106
+#: src/topology/gnunet-daemon-topology.c:1102
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1116
+#: src/topology/gnunet-daemon-topology.c:1112
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1122
+#: src/topology/gnunet-daemon-topology.c:1118
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1129
+#: src/topology/gnunet-daemon-topology.c:1125
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1164
+#: src/topology/gnunet-daemon-topology.c:1156
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1219
+#: src/topology/gnunet-daemon-topology.c:1211
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/topology/gnunet-daemon-topology.c:1358
+#: src/topology/gnunet-daemon-topology.c:1350
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:246
+#: src/transport/gnunet-service-transport_blacklist.c:267
 #, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+msgid "Adding blacklisting entry for peer `%s'\n"
+msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:263
-#, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:284
-#: src/transport/gnunet-service-transport_blacklist.c:308
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:295
-#: src/transport/gnunet-service-transport_blacklist.c:331
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
-msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:345
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:359
+#: src/transport/gnunet-service-transport_blacklist.c:275
 #, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:514
-#: src/transport/gnunet-service-transport_blacklist.c:752
+#: src/transport/gnunet-service-transport_blacklist.c:453
+#: src/transport/gnunet-service-transport_blacklist.c:718
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:183
+#: src/transport/gnunet-service-transport.c:174
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport.c:258
+#: src/transport/gnunet-service-transport.c:239
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/transport/gnunet-service-transport.c:305
+#: src/transport/gnunet-service-transport.c:286
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# Bytes entschlüsselt"
 
-#: src/transport/gnunet-service-transport.c:613
+#: src/transport/gnunet-service-transport.c:642
 #, fuzzy, c-format
 msgid "Transport service could not access hostkey: %s. Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/transport/gnunet-service-transport.c:708
+#: src/transport/gnunet-service-transport.c:741
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5120,140 +5246,140 @@
 msgid "# messages dropped due to slow client"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_clients.c:546
+#: src/transport/gnunet-service-transport_clients.c:536
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:687
+#: src/transport/gnunet-service-transport_clients.c:677
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:738
+#: src/transport/gnunet-service-transport_clients.c:728
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_hello.c:175
+#: src/transport/gnunet-service-transport_hello.c:179
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1227
+#: src/transport/gnunet-service-transport_neighbours.c:1216
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1357
-#: src/transport/gnunet-service-transport_neighbours.c:1694
+#: src/transport/gnunet-service-transport_neighbours.c:1346
+#: src/transport/gnunet-service-transport_neighbours.c:1678
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1362
+#: src/transport/gnunet-service-transport_neighbours.c:1351
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1367
+#: src/transport/gnunet-service-transport_neighbours.c:1356
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1424
+#: src/transport/gnunet-service-transport_neighbours.c:1413
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1466
+#: src/transport/gnunet-service-transport_neighbours.c:1455
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1490
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1498
+#: src/transport/gnunet-service-transport_neighbours.c:1487
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1535
+#: src/transport/gnunet-service-transport_neighbours.c:1520
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1544
+#: src/transport/gnunet-service-transport_neighbours.c:1529
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1600
+#: src/transport/gnunet-service-transport_neighbours.c:1584
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1634
+#: src/transport/gnunet-service-transport_neighbours.c:1618
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1650
+#: src/transport/gnunet-service-transport_neighbours.c:1634
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2802
+#: src/transport/gnunet-service-transport_neighbours.c:2770
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2817
-#: src/transport/gnunet-service-transport_neighbours.c:2851
+#: src/transport/gnunet-service-transport_neighbours.c:2785
+#: src/transport/gnunet-service-transport_neighbours.c:2819
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2864
+#: src/transport/gnunet-service-transport_neighbours.c:2832
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2897
+#: src/transport/gnunet-service-transport_neighbours.c:2865
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3082
+#: src/transport/gnunet-service-transport_neighbours.c:3046
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3137
+#: src/transport/gnunet-service-transport_neighbours.c:3101
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3151
+#: src/transport/gnunet-service-transport_neighbours.c:3115
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3182
+#: src/transport/gnunet-service-transport_neighbours.c:3146
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3193
+#: src/transport/gnunet-service-transport_neighbours.c:3157
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3224
+#: src/transport/gnunet-service-transport_neighbours.c:3188
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3319
+#: src/transport/gnunet-service-transport_neighbours.c:3283
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/transport/gnunet-service-transport_plugins.c:111
+#: src/transport/gnunet-service-transport_plugins.c:113
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
@@ -5303,7 +5429,7 @@
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1302
+#: src/transport/gnunet-service-transport_validation.c:1305
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
@@ -5347,280 +5473,280 @@
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:531
+#: src/transport/gnunet-transport.c:528
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:553
+#: src/transport/gnunet-transport.c:550
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:588
+#: src/transport/gnunet-transport.c:585
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/transport/gnunet-transport.c:664
+#: src/transport/gnunet-transport.c:655
 #, 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:687
+#: src/transport/gnunet-transport.c:678
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/transport/gnunet-transport.c:702
+#: src/transport/gnunet-transport.c:693
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:766
+#: src/transport/gnunet-transport.c:757
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# verbundener Knoten"
 
-#: src/transport/gnunet-transport.c:794
+#: src/transport/gnunet-transport.c:785
 #, 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:828
+#: src/transport/gnunet-transport.c:819
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:825
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:854 src/transport/gnunet-transport.c:884
-#: src/transport/gnunet-transport.c:906 src/transport/gnunet-transport.c:945
+#: src/transport/gnunet-transport.c:845 src/transport/gnunet-transport.c:875
+#: src/transport/gnunet-transport.c:897 src/transport/gnunet-transport.c:936
 #, 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:861 src/transport/gnunet-transport.c:891
+#: src/transport/gnunet-transport.c:852 src/transport/gnunet-transport.c:882
 #, 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:911
+#: src/transport/gnunet-transport.c:902
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:996
+#: src/transport/gnunet-transport.c:987
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:999
+#: src/transport/gnunet-transport.c:990
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:993
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1008
+#: src/transport/gnunet-transport.c:999
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1011
+#: src/transport/gnunet-transport.c:1002
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:1014
+#: src/transport/gnunet-transport.c:1005
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1018
+#: src/transport/gnunet-transport.c:1009
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1021
+#: src/transport/gnunet-transport.c:1012
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1032
+#: src/transport/gnunet-transport.c:1023
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_http.c:817
-#: src/transport/plugin_transport_http_server.c:2556
+#: src/transport/plugin_transport_http.c:815
+#: src/transport/plugin_transport_http_server.c:2566
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:866
-#: src/transport/plugin_transport_http_server.c:2324
+#: src/transport/plugin_transport_http.c:864
+#: src/transport/plugin_transport_http_server.c:2334
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/transport/plugin_transport_http.c:898
-#: src/transport/plugin_transport_http_server.c:2356 src/util/service.c:1053
+#: src/transport/plugin_transport_http.c:896
+#: src/transport/plugin_transport_http_server.c:2366 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_http.c:915
-#: src/transport/plugin_transport_http_server.c:2373 src/util/service.c:1070
+#: src/transport/plugin_transport_http.c:913
+#: src/transport/plugin_transport_http_server.c:2383 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/transport/plugin_transport_http.c:1020
-#: src/transport/plugin_transport_http_server.c:2484
+#: src/transport/plugin_transport_http.c:1018
+#: src/transport/plugin_transport_http_server.c:2494
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1133
-#: src/transport/plugin_transport_http_server.c:2652
+#: src/transport/plugin_transport_http.c:1131
+#: src/transport/plugin_transport_http_server.c:2673
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
 
-#: src/transport/plugin_transport_http.c:1146
-#: src/transport/plugin_transport_http_server.c:2663
+#: src/transport/plugin_transport_http.c:1144
+#: src/transport/plugin_transport_http_server.c:2684
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/transport/plugin_transport_http.c:1157
+#: src/transport/plugin_transport_http.c:1155
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1177
+#: src/transport/plugin_transport_http.c:1175
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1206
+#: src/transport/plugin_transport_http.c:1204
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1223
-#: src/transport/plugin_transport_http_server.c:2745
+#: src/transport/plugin_transport_http.c:1221
+#: src/transport/plugin_transport_http_server.c:2774
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/transport/plugin_transport_http.c:1228
+#: src/transport/plugin_transport_http.c:1226
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1531
+#: src/transport/plugin_transport_http_client.c:1535
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1662
-#: src/transport/plugin_transport_http_server.c:2869
+#: src/transport/plugin_transport_http_client.c:1666
+#: src/transport/plugin_transport_http_server.c:2898
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1687
-#: src/transport/plugin_transport_http_server.c:2928
+#: src/transport/plugin_transport_http_client.c:1691
+#: src/transport/plugin_transport_http_server.c:2957
 #, 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:1715
-#: src/transport/plugin_transport_http_server.c:2775
+#: src/transport/plugin_transport_http_client.c:1719
+#: src/transport/plugin_transport_http_server.c:2804
 #, 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:1342
+#: src/transport/plugin_transport_http_server.c:1352
 #, 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:1603
+#: src/transport/plugin_transport_http_server.c:1613
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1611
+#: src/transport/plugin_transport_http_server.c:1621
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1912
+#: src/transport/plugin_transport_http_server.c:1922
 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:1936
+#: src/transport/plugin_transport_http_server.c:1946
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2631
+#: src/transport/plugin_transport_http_server.c:2652
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2645
+#: src/transport/plugin_transport_http_server.c:2666
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2670
+#: src/transport/plugin_transport_http_server.c:2691
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2685
+#: src/transport/plugin_transport_http_server.c:2706
 #, 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:2695
+#: src/transport/plugin_transport_http_server.c:2716
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2716
+#: src/transport/plugin_transport_http_server.c:2737
 #, 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:2726
+#: src/transport/plugin_transport_http_server.c:2747
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2761
+#: src/transport/plugin_transport_http_server.c:2790
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -5693,7 +5819,7 @@
 #: src/transport/plugin_transport_tcp.c:778
 #: src/transport/plugin_transport_tcp.c:967
 #: src/transport/plugin_transport_tcp.c:1826
-#: src/transport/plugin_transport_tcp.c:2462
+#: src/transport/plugin_transport_tcp.c:2456
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
@@ -5732,62 +5858,67 @@
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:2046
+#: src/transport/plugin_transport_tcp.c:2036
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2124
+#: src/transport/plugin_transport_tcp.c:2118
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2350 src/util/service.c:948
+#: src/transport/plugin_transport_tcp.c:2344 src/util/service.c:948
 #: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2364
+#: src/transport/plugin_transport_tcp.c:2358
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2450
+#: src/transport/plugin_transport_tcp.c:2444
 #, 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:2454
+#: src/transport/plugin_transport_tcp.c:2448
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2458
+#: src/transport/plugin_transport_tcp.c:2452
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:128
+#: src/transport/plugin_transport_udp_broadcasting.c:134
 #, fuzzy
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:169
+#: src/transport/plugin_transport_udp_broadcasting.c:184
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:394
+#: src/transport/plugin_transport_udp_broadcasting.c:403
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:420
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2517
+#: src/transport/plugin_transport_udp.c:2520
 #, 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:2531
+#: src/transport/plugin_transport_udp.c:2534
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5795,22 +5926,22 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2772
+#: src/transport/plugin_transport_udp.c:2775
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:2848
+#: src/transport/plugin_transport_udp.c:2851
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2891
+#: src/transport/plugin_transport_udp.c:2894
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_unix.c:1355
+#: src/transport/plugin_transport_unix.c:1353
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -5826,7 +5957,7 @@
 
 #: src/transport/plugin_transport_wlan.c:645
 #: src/transport/plugin_transport_wlan.c:695
-#: src/transport/plugin_transport_wlan.c:1758
+#: src/transport/plugin_transport_wlan.c:1764
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
@@ -5842,61 +5973,61 @@
 
 #: src/transport/plugin_transport_wlan.c:902
 #: src/transport/plugin_transport_wlan.c:987
-#: src/transport/plugin_transport_wlan.c:1760
+#: src/transport/plugin_transport_wlan.c:1766
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1169
+#: src/transport/plugin_transport_wlan.c:1166
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1190
+#: src/transport/plugin_transport_wlan.c:1192
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1200
+#: src/transport/plugin_transport_wlan.c:1202
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_wlan.c:1257
+#: src/transport/plugin_transport_wlan.c:1259
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1358
+#: src/transport/plugin_transport_wlan.c:1364
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1393
+#: src/transport/plugin_transport_wlan.c:1399
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1454
+#: src/transport/plugin_transport_wlan.c:1460
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transport/plugin_transport_wlan.c:1563
+#: src/transport/plugin_transport_wlan.c:1569
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1739
+#: src/transport/plugin_transport_wlan.c:1745
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:659
+#: src/transport/transport_api.c:651
 #, 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:586
+#: src/transport/transport-testing.c:585
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
@@ -5967,7 +6098,7 @@
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/util/client.c:1177
+#: src/util/client.c:1178
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -6010,19 +6141,19 @@
 msgid "unknown address"
 msgstr "Unbekannter Fehler"
 
-#: src/util/common_logging.c:1214
+#: src/util/common_logging.c:1215
 #, fuzzy
 msgid "invalid address"
 msgstr "Ungültige Parameter: "
 
-#: src/util/common_logging.c:1232
+#: src/util/common_logging.c:1233
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/util/common_logging.c:1253
+#: src/util/common_logging.c:1254
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -6075,74 +6206,65 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:447
+#: src/util/crypto_ecc.c:444
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (too long, %llu bytes).  "
 "Deleting it.\n"
 msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/util/crypto_ecc.c:462 src/util/crypto_rsa.c:676
+#: src/util/crypto_ecc.c:459 src/util/crypto_rsa.c:676
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
 "Deleting it.\n"
 msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/util/crypto_ecc.c:558 src/util/crypto_ecc.c:602
+#: src/util/crypto_ecc.c:555 src/util/crypto_ecc.c:599
 #: src/util/crypto_rsa.c:750 src/util/crypto_rsa.c:887
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/util/crypto_ecc.c:563 src/util/crypto_rsa.c:892
+#: src/util/crypto_ecc.c:560 src/util/crypto_rsa.c:892
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
 
-#: src/util/crypto_ecc.c:606 src/util/crypto_rsa.c:754
+#: src/util/crypto_ecc.c:603 src/util/crypto_rsa.c:754
 #: src/util/crypto_rsa.c:790
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:637 src/util/crypto_rsa.c:785
+#: src/util/crypto_ecc.c:634 src/util/crypto_rsa.c:785
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:642
+#: src/util/crypto_ecc.c:639
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:657 src/util/crypto_rsa.c:805
+#: src/util/crypto_ecc.c:654 src/util/crypto_rsa.c:805
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/util/crypto_ecc.c:779 src/util/crypto_rsa.c:982
+#: src/util/crypto_ecc.c:776 src/util/crypto_rsa.c:982
 msgid "interrupted by shutdown"
 msgstr ""
 
-#: src/util/crypto_ecc.c:790
+#: src/util/crypto_ecc.c:787
 #, fuzzy
 msgid "gnunet-ecc failed"
 msgstr "gnunet-update ausführen"
 
-#: src/util/crypto_ecc.c:978
+#: src/util/crypto_ecc.c:1045
 #, fuzzy, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
-msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
-
-#: src/util/crypto_ecc.c:1046
-#, fuzzy, c-format
 msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:1130
-msgid "To be implemented: not secure at the moment, please read README\n"
-msgstr ""
-
 #: src/util/crypto_random.c:281
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
@@ -6176,17 +6298,17 @@
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/disk.c:1206
+#: src/util/disk.c:1207
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1560 src/util/service.c:1670
+#: src/util/disk.c:1564 src/util/service.c:1670
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#: src/util/disk.c:1999
+#: src/util/disk.c:2007
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
@@ -6259,12 +6381,12 @@
 "Parameter, die für lange Optionen zwingend sind, sind auch für kurze "
 "Optionen zwingend.\n"
 
-#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:316
+#: src/util/getopt_helpers.c:270 src/util/getopt_helpers.c:328
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Sie müssen für die Option `%s' zusätzlich eine Zahl angeben.\n"
 
-#: src/util/getopt_helpers.c:288
+#: src/util/getopt_helpers.c:300
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Sie müssen eine positive Zahl zu der Option `%s' übergeben.\n"
@@ -6430,18 +6552,28 @@
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:420
+#: src/util/os_installation.c:423
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:702
+#: src/util/os_installation.c:709
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
+#: src/util/os_installation.c:767
+#, fuzzy, c-format
+msgid "CreateProcess failed for binary %s (%d).\n"
+msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
+
+#: src/util/os_installation.c:777
+#, c-format
+msgid "GetExitCodeProcess failed for binary %s (%d).\n"
+msgstr ""
+
 #: src/util/plugin.c:89
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -6468,16 +6600,6 @@
 msgid "Could not access configuration file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/pseudonym.c:329 src/util/pseudonym.c:632
-#, fuzzy, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
-
-#: src/util/pseudonym.c:464 src/util/pseudonym.c:490 src/util/pseudonym.c:628
-#, fuzzy
-msgid "no-name"
-msgstr "Name anzeigen"
-
 #: src/util/resolver_api.c:202
 #, fuzzy, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
@@ -6515,22 +6637,22 @@
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:426
+#: src/util/server.c:436
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/server.c:435
+#: src/util/server.c:445
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/util/server.c:446
+#: src/util/server.c:456
 #, fuzzy, c-format
 msgid "`%s' failed for `%.*s': address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/util/server.c:830
+#: src/util/server.c:848
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -6711,23 +6833,23 @@
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1086
+#: src/util/strings.c:1098
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1094
+#: src/util/strings.c:1106
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1100
+#: src/util/strings.c:1112
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1107
+#: src/util/strings.c:1119
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1116
+#: src/util/strings.c:1128
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -6907,23 +7029,100 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:579 src/include/gnunet_common.h:584
-#: src/include/gnunet_common.h:590
+#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
+#: src/include/gnunet_common.h:591
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:600
+#: src/include/gnunet_common.h:601
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:621 src/include/gnunet_common.h:628
+#: src/include/gnunet_common.h:622 src/include/gnunet_common.h:629
 #, 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 "Failed to transmit shutdown request to client.\n"
+#~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#, fuzzy
+#~ msgid "Service `%s' has been stopped.\n"
+#~ msgstr "Dienst gelöscht.\n"
+
+#, fuzzy
+#~ msgid "Service `%s' was already running.\n"
+#~ msgstr "Diese Suche läuft bereits!\n"
+
+#, fuzzy
+#~ msgid "Service `%s' has been started.\n"
+#~ msgstr "Dienst gelöscht.\n"
+
+#, fuzzy
+#~ msgid "Service `%s' was already being stopped.\n"
+#~ msgstr "Dienst gelöscht.\n"
+
+#, fuzzy
+#~ msgid "Service `%s' was already not running.\n"
+#~ msgstr "Diese Suche läuft bereits!\n"
+
+#, fuzzy
+#~ msgid "Error communicating with ARM service.\n"
+#~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#, fuzzy
+#~ msgid "Timeout communicating with ARM service.\n"
+#~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#, fuzzy
+#~ msgid "Operation failed.\n"
+#~ msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Error in communication with PEERINFO service\n"
+#~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#, fuzzy
+#~ msgid "%s Received message from %s of type %d, distance %u!\n"
+#~ msgstr "Beschädigte Nachricht von Knoten `%s' in %s:%d empfangen.\n"
+
+#, fuzzy
+#~ msgid "Creating a peer failed. Error: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Fehler beim Uploaden der Datei: %s\n"
+
+#, fuzzy
+#~ msgid "Exiting\n"
+#~ msgstr ""
+#~ "\n"
+#~ "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"
+
+#, fuzzy
+#~ msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+#~ msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
+
+#, fuzzy
+#~ msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+#~ msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+#~ msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
+
+#, fuzzy
 #~ msgid "Failed to read hostkey: %s\n"
 #~ msgstr "Fehler beim Starten der Collection.\n"
 
@@ -7317,10 +7516,6 @@
 #~ msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
 #, fuzzy
-#~ msgid "Starting HELPER process `%s'\n"
-#~ msgstr "Collection `%s' begonnen.\n"
-
-#, fuzzy
 #~ msgid "Could not create namespace `%s'\n"
 #~ msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
@@ -7337,10 +7532,6 @@
 #~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
 #, fuzzy
-#~ msgid "Could not open hostkeys file: %s\n"
-#~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
-
-#, fuzzy
 #~ msgid "access (%s, X_OK) failed: %s\n"
 #~ msgstr "`%s' schlug fehl: %s\n"
 
@@ -7445,10 +7636,6 @@
 #~ msgstr "# verschlüsselter PING Nachrichten empfangen"
 
 #, fuzzy
-#~ msgid "Unknown user `%s'\n"
-#~ msgstr "Unbekannte Operation `%s'\n"
-
-#, fuzzy
 #~ msgid "Namespace `%s' unknown.\n"
 #~ msgstr "Namespace `%s' hat das Rating %d.\n"
 
@@ -7490,10 +7677,6 @@
 #~ msgstr "umfangreiche Meldungen ausgeben"
 
 #, fuzzy
-#~ msgid "Failed to stop service `%s'!\n"
-#~ msgstr "Fehler beim Binden an UDP Port %d.\n"
-
-#, fuzzy
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
@@ -8873,12 +9056,6 @@
 #~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
 #, fuzzy
-#~ msgid "Waiting for peers to connect"
-#~ msgstr ""
-#~ "Warte darauf, dass sich andere Knoten verbinden (%u Iterationen "
-#~ "verbleiben)...\n"
-
-#, fuzzy
 #~ msgid "Bootstrap data obtained from `%s' is invalid.\n"
 #~ msgstr "Format des Pseudonyms `%s' ist ungültig.\n"
 
@@ -9580,9 +9757,6 @@
 #~ msgid "unloading module failed.  Notifying client.\n"
 #~ msgstr "das Entladen des Moduls schlug fehl. Client wird benachrichtigt.\n"
 
-#~ msgid "received invalid `%s' message: %s.\n"
-#~ msgstr "ungültige `%s' Nachricht empfangen: %s.\n"
-
 #~ msgid "'..' is not allowed in file name (%s).\n"
 #~ msgstr "'..' ist nicht erlaubt in einem Dateinamen (%s).\n"
 
@@ -10461,9 +10635,6 @@
 #~ msgid "Argument %d: `%s'\n"
 #~ msgstr "Parameter %d: `%s'\n"
 
-#~ msgid "`%s' starting\n"
-#~ msgstr "`%s' startet\n"
-
 #~ msgid "FATAL: Identity plugin not found!\n"
 #~ msgstr "SCHWERWIEGEND: Identity Plugin wurde nicht gefunden!\n"
 

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2013-04-27 11:04:29 UTC (rev 27000)
+++ gnunet/po/es.po     2013-04-27 14:16:29 UTC (rev 27001)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-03-06 00:28+0100\n"
+"POT-Creation-Date: 2013-04-27 12:39+0200\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -17,171 +17,279 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-# Miguel: "shutdown request" se refiere a finalizar el
-# que hace de cliente.
-#: src/arm/arm_api.c:162
-msgid "Failed to transmit shutdown request to client.\n"
+#: src/arm/arm_api.c:880
+#, fuzzy
+msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
-"Se produjo un fallo al transmitir una petición de apagado al cliente.\n"
+"El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-# Miguel: ¿Debería cambiar las siglas de ARM?
-# De momento las he mantenido con una traducción en
-# otro mensaje.
-#: src/arm/gnunet-arm.c:166
+#: src/arm/arm_monitor_api.c:321
+#, fuzzy
+msgid ""
+"Monitoring client was disconnected from arm service, trying to reconnect.\n"
+msgstr ""
+"El cliente se desconectó del servicio principal, tratando de reconectar.\n"
+
+#: src/arm/gnunet-arm.c:159
 #, c-format
-msgid "Service `%s' is unknown to ARM.\n"
-msgstr "El servicio «%s» es desconocido para el ARM.\n"
+msgid "Failed to remove configuration file %s\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-# Miguel: ¿Quizá fuese mejor «Se ha parado el servicio x»?
-# Esto también es aplicable a las siguientes traducciones.
-#: src/arm/gnunet-arm.c:171
+#: src/arm/gnunet-arm.c:165
 #, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "El servicio «%s» se ha parado.\n"
+msgid "Failed to remove servicehome directory %s\n"
+msgstr "Se produjo un fallo al eliminar el directorio «servicehome» %s.\n"
 
-#: src/arm/gnunet-arm.c:174
+#: src/arm/gnunet-arm.c:204 src/testbed/gnunet-service-testbed_peers.c:712
+#, fuzzy
+msgid "Message was sent successfully"
+msgstr "El almacén de nombres añadió el registro satisfactoriamente"
+
+#: src/arm/gnunet-arm.c:206 src/testbed/gnunet-service-testbed_peers.c:714
+#, fuzzy
+msgid "Misconfiguration (can't connect to the ARM service)"
+msgstr "¡Se produjo un fallo al conectar con el servicio dv!\n"
+
+#: src/arm/gnunet-arm.c:208 src/testbed/gnunet-service-testbed_peers.c:716
+#, fuzzy
+msgid "We disconnected from ARM before we could send a request"
+msgstr "# desconexiones del par debido a una petición explícita"
+
+#: src/arm/gnunet-arm.c:210 src/testbed/gnunet-service-testbed_peers.c:718
+msgid "ARM API is busy"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:212 src/testbed/gnunet-service-testbed_peers.c:720
+#, fuzzy
+msgid "Request doesn't fit into a message"
+msgstr "no imprime mensajes de estado"
+
+# Miguel: "timeout" lo he traducido como plazo, pero no se
+# si hay alguna palabra que lo describa mejor.
+#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:722
+#, fuzzy
+msgid "Request timed out"
+msgstr "plazo de consenso"
+
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:724
+#, fuzzy
+msgid "Unknown request status"
+msgstr "Usuario desconocido «%s»\n"
+
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:740
+#, fuzzy, c-format
+msgid "%s is stopped"
+msgstr "# elementos almacenados"
+
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:742
+#, fuzzy, c-format
+msgid "%s is starting"
+msgstr "'%s' comenzando\n"
+
+#: src/arm/gnunet-arm.c:236 src/testbed/gnunet-service-testbed_peers.c:744
 #, c-format
-msgid "Service `%s' was already running.\n"
-msgstr "El servicio «%s» aún estaba ejecutándose.\n"
+msgid "%s is stopping"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:179
+#: src/arm/gnunet-arm.c:238 src/testbed/gnunet-service-testbed_peers.c:746
+#, fuzzy, c-format
+msgid "%s is starting already"
+msgstr "'%s' comenzando\n"
+
+#: src/arm/gnunet-arm.c:240 src/testbed/gnunet-service-testbed_peers.c:748
 #, c-format
-msgid "Service `%s' has been started.\n"
-msgstr "El servicio «%s» se ha iniciado.\n"
+msgid "%s is stopping already"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:182
+#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:750
 #, c-format
-msgid "Service `%s' was already being stopped.\n"
-msgstr "El servicio «%s» estaba siendo parado con anterioridad.\n"
+msgid "%s is started already"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:186
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:752
 #, c-format
-msgid "Service `%s' was already not running.\n"
-msgstr "El servicio «%s» no se estaba ejecutando.\n"
+msgid "%s is stopped already"
+msgstr ""
 
+# Miguel: ¿Debería cambiar las siglas de ARM?
+# De momento las he mantenido con una traducción en
+# otro mensaje.
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:754
+#, fuzzy, c-format
+msgid "%s service is not known to ARM"
+msgstr "El servicio «%s» es desconocido para el ARM.\n"
+
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:756
+#, fuzzy, c-format
+msgid "%s service failed to start"
+msgstr "El proceso del servicio no devolvió un estado\n"
+
 # Miguel: ¿Es mejor «ya que» que «porque» o «debido al apagado»?
-#: src/arm/gnunet-arm.c:190
-msgid "Request ignored as ARM is shutting down.\n"
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:758
+#, fuzzy, c-format
+msgid "%s service can't be started because ARM is shutting down"
 msgstr "Petición ignorada porque el ARM se está apagando.\n"
 
-# Miguel: ¿Conectar y conexión?
-#: src/arm/gnunet-arm.c:194
-msgid "Error communicating with ARM service.\n"
-msgstr "Error al comunicar con el servicio ARM.\n"
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:760
+#, fuzzy, c-format
+msgid "%.s Unknown result code."
+msgstr "Código de respuesta del ARM desconocido.\n"
 
-#: src/arm/gnunet-arm.c:198
-msgid "Timeout communicating with ARM service.\n"
-msgstr "Fin del tiempo de espera en la comunicación con el servicio ARM.\n"
+#: src/arm/gnunet-arm.c:271
+msgid "Fatal error initializing ARM API.\n"
+msgstr "Error fatal al inicializar la API del ARM.\n"
 
-#: src/arm/gnunet-arm.c:202
-msgid "Operation failed.\n"
-msgstr "La operación ha fallado.\n"
+#: src/arm/gnunet-arm.c:291
+#, fuzzy, c-format
+msgid "Failed to send a request to kill the `%s' service: %%s\n"
+msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
 
-#: src/arm/gnunet-arm.c:206
-msgid "Unknown response code from ARM.\n"
-msgstr "Código de respuesta del ARM desconocido.\n"
+#: src/arm/gnunet-arm.c:307
+#, fuzzy, c-format
+msgid "Failed to kill the `%s' service: %s\n"
+msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 
-#: src/arm/gnunet-arm.c:229
+#: src/arm/gnunet-arm.c:323
+#, fuzzy, c-format
+msgid "Failed to send a stop request to the ARM service: %s\n"
+msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
+
+#: src/arm/gnunet-arm.c:345
+#, fuzzy, c-format
+msgid "Failed to stop the ARM service: %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/arm/gnunet-arm.c:361 src/arm/gnunet-arm.c:370
+#, fuzzy, c-format
+msgid "Failed to start the ARM service: %s\n"
+msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
+
+#: src/arm/gnunet-arm.c:390
+#, fuzzy, c-format
+msgid "Failed to send a request to start the `%s' service: %%s\n"
+msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
+
+#: src/arm/gnunet-arm.c:405
+#, fuzzy, c-format
+msgid "Failed to start the `%s' service: %s\n"
+msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
+
+#: src/arm/gnunet-arm.c:423
+#, fuzzy, c-format
+msgid "Failed to request a list of services: %s\n"
+msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
+
+#: src/arm/gnunet-arm.c:430
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Error al comunicar con el ARM. ¿Está el ARM ejecutándose?\n"
 
-#: src/arm/gnunet-arm.c:232
+#: src/arm/gnunet-arm.c:433
 msgid "Running services:\n"
 msgstr "Servicios en ejecución:\n"
 
-#: src/arm/gnunet-arm.c:253
+#: src/arm/gnunet-arm.c:534
+msgid "Began monitoring ARM for service status changes\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:537
 #, c-format
-msgid "Failed to remove configuration file %s\n"
-msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+msgid "Stopped %s.\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:259
+#: src/arm/gnunet-arm.c:540
+#, fuzzy, c-format
+msgid "Starting %s...\n"
+msgstr "Iniciando descarga «%s».\n"
+
+#: src/arm/gnunet-arm.c:543
 #, c-format
-msgid "Failed to remove servicehome directory %s\n"
-msgstr "Se produjo un fallo al eliminar el directorio «servicehome» %s.\n"
+msgid "Stopping %s...\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:407 src/arm/gnunet-arm.c:424
-msgid "Fatal error initializing ARM API.\n"
-msgstr "Error fatal al inicializar la API del ARM.\n"
+#: src/arm/gnunet-arm.c:552
+#, fuzzy, c-format
+msgid "Unknown status %u for service %s.\n"
+msgstr "Solicitando incio del servicio «%s».\n"
 
-#: src/arm/gnunet-arm.c:453
+#: src/arm/gnunet-arm.c:622
 msgid "stop all GNUnet services"
 msgstr "detiene todos los servicios de GNUnet"
 
-#: src/arm/gnunet-arm.c:455
+#: src/arm/gnunet-arm.c:624
 msgid "start a particular service"
 msgstr "inicia un servicio particular"
 
-#: src/arm/gnunet-arm.c:457
+#: src/arm/gnunet-arm.c:626
 msgid "stop a particular service"
 msgstr "detiene un servicio particular"
 
-#: src/arm/gnunet-arm.c:459
+#: src/arm/gnunet-arm.c:628
 msgid "start all GNUnet default services"
 msgstr "inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:462
+#: src/arm/gnunet-arm.c:631
 msgid "stop and start all GNUnet default services"
 msgstr "detiene e inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:465
+#: src/arm/gnunet-arm.c:634
 msgid "delete config file and directory on exit"
 msgstr "borrar el directorio y el fichero de configuración al salir"
 
-#: src/arm/gnunet-arm.c:467
+#: src/arm/gnunet-arm.c:636
 msgid "don't print status messages"
 msgstr "no imprime mensajes de estado"
 
-#: src/arm/gnunet-arm.c:470
+#: src/arm/gnunet-arm.c:639
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr "plazo en milisegundos (MSECS) para completar la operación actual"
 
-#: src/arm/gnunet-arm.c:472
+#: src/arm/gnunet-arm.c:641
 msgid "list currently running services"
 msgstr "lista de servicios actualmente en ejecución"
 
-#: src/arm/gnunet-arm.c:474
+#: src/arm/gnunet-arm.c:643
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr "no permite heredar la salida estándar a «gnunet-service-arm»"
 
-#: src/arm/gnunet-arm.c:476
+#: src/arm/gnunet-arm.c:645
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr "no permite heredar la salida de error estándar a «gnunet-service-arm»"
 
 # Miguel: ARM se mantiene en todo el texto, aquí está la traducción.
-#: src/arm/gnunet-arm.c:487
+#: src/arm/gnunet-arm.c:656
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 "Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)"
 
-#: src/arm/gnunet-service-arm.c:345
-#, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
-
-#: src/arm/gnunet-service-arm.c:348
-#, c-format
-msgid "Starting service `%s'\n"
-msgstr "Iniciando el servicio «%s»\n"
-
 # Miguel: Si no me equivoco, "status result" es un
 # resultado de tipo estado.
-#: src/arm/gnunet-service-arm.c:374
+#: src/arm/gnunet-service-arm.c:257
 msgid "Could not send status result to client\n"
 msgstr "No se pudo mandar el resultado (estado) al cliente\n"
 
 # Miguel: Si no me equivoco, "list result" es un resultado
 # de tipo lista.
-#: src/arm/gnunet-service-arm.c:406
+#: src/arm/gnunet-service-arm.c:291
 msgid "Could not send list result to client\n"
 msgstr "No se pudo mandar el resultado (lista) al cliente\n"
 
+#: src/arm/gnunet-service-arm.c:500
+#, c-format
+msgid "Failed to start service `%s'\n"
+msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
+
+#: src/arm/gnunet-service-arm.c:507
+#, c-format
+msgid "Starting service `%s'\n"
+msgstr "Iniciando el servicio «%s»\n"
+
 # Miguel: ¿Alguna idea para "socket"?
-#: src/arm/gnunet-service-arm.c:537
+#: src/arm/gnunet-service-arm.c:602
 #, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Imposible crear un «socket» para el servicio «%s»: %s\n"
 
-#: src/arm/gnunet-service-arm.c:559
+#: src/arm/gnunet-service-arm.c:624
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
@@ -192,44 +300,49 @@
 # no es exactamente lo mismo que el texto en inglés, pero
 # es fiel a la realidad puesto que el ARM reinicia
 # las conexiones cuando se caen.
-#: src/arm/gnunet-service-arm.c:573
+#: src/arm/gnunet-service-arm.c:638
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr "El ARM ahora gestiona las conexiones del servicio «%s» en «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:681
+#: src/arm/gnunet-service-arm.c:771
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Preparando para parar «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:892
+#: src/arm/gnunet-service-arm.c:1023
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Reiniciando el servicio «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:985
+#: src/arm/gnunet-service-arm.c:1116
 msgid "exit"
 msgstr "salida"
 
-#: src/arm/gnunet-service-arm.c:990
+#: src/arm/gnunet-service-arm.c:1121
 msgid "signal"
 msgstr "señal"
 
-#: src/arm/gnunet-service-arm.c:995
+#: src/arm/gnunet-service-arm.c:1126
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/arm/gnunet-service-arm.c:1001
+#: src/arm/gnunet-service-arm.c:1132
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "El servicio «%s» tardó %s en finalizar\n"
 
-#: src/arm/gnunet-service-arm.c:1036
-#, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+#: src/arm/gnunet-service-arm.c:1154
+#, fuzzy, c-format
+msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n"
 
-#: src/arm/gnunet-service-arm.c:1228
+#: src/arm/gnunet-service-arm.c:1169
+#, fuzzy, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n"
+
+#: src/arm/gnunet-service-arm.c:1386
 #, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Iniciando servicios predeterminados «%s»\n"
@@ -237,35 +350,35 @@
 # Miguel: He traducido "default" por "predeterminado", la locución
 # "por defecto" no tiene sentido en sitios como este y he tratado
 # de ser consistente.
-#: src/arm/gnunet-service-arm.c:1239
+#: src/arm/gnunet-service-arm.c:1397
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr "¡El servicio predeterminado «%s» no está configurado correctamente!\n"
 
 # Miguel: ¿No hay servicios -> no hay ningún servicio?
-#: src/arm/gnunet-service-arm.c:1253
+#: src/arm/gnunet-service-arm.c:1411
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 "No hay servicios predeterminados configurados, GNUnet no va a iniciarse "
 "realmente ahora.\n"
 
-#: src/arm/mockup-service.c:44
+#: src/arm/mockup-service.c:46
 msgid "Initiating shutdown as requested by client.\n"
 msgstr "Iniciando apagado bajo petición del cliente.\n"
 
-#: src/ats/ats_api_performance.c:465
+#: src/ats/ats_api_performance.c:475
 #, c-format
 msgid "Received %s message\n"
 msgstr "Recibido mensaje %s\n"
 
-#: src/ats/ats_api_performance.c:508
+#: src/ats/ats_api_performance.c:518
 #, c-format
 msgid "Received last message for %s \n"
 msgstr "Recibido último mensaje para %s\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1176
-#: src/ats/gnunet-service-ats_addresses.c:1210
+#: src/ats/gnunet-service-ats_addresses.c:1372
+#: src/ats/gnunet-service-ats_addresses.c:1406
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
@@ -275,12 +388,12 @@
 "de banda predeterminado %llu\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/gnunet-service-ats_addresses.c:1182
+#: src/ats/gnunet-service-ats_addresses.c:1378
 #, 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-service-ats_addresses.c:1189
+#: src/ats/gnunet-service-ats_addresses.c:1385
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
@@ -290,12 +403,12 @@
 "de banda predeterminado %llu\n"
 
 # Miguel: "Inbound" lo he traducido como entrada en todo el texto.
-#: src/ats/gnunet-service-ats_addresses.c:1216
+#: src/ats/gnunet-service-ats_addresses.c:1412
 #, 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-service-ats_addresses.c:1223
+#: src/ats/gnunet-service-ats_addresses.c:1419
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
@@ -304,26 +417,26 @@
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:735
+#: src/ats/gnunet-service-ats_addresses_mlp.c:756
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1044
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1075
 #, 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/gnunet-service-ats_addresses_mlp.c:1226
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1258
 #, c-format
 msgid "Update for ATS type `%s' not implemented!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1306
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1341
 #, c-format
 msgid "Updating address for peer `%s' not added before\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1726
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1761
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
@@ -332,7 +445,7 @@
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1734
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1769
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
@@ -342,21 +455,21 @@
 "ancho de banda predeterminado (%llu)\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1744
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1779
 #, 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/gnunet-service-ats_addresses_mlp.c:1752
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1787
 #, 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/gnunet-service-ats_addresses_mlp.c:1763
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1798
 #, 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"
@@ -386,91 +499,91 @@
 "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:326
+#: src/ats-tool/gnunet-ats.c:320
 #, 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:345 src/namestore/gnunet-namestore.c:610
-#: src/transport/gnunet-transport.c:813
+#: src/ats-tool/gnunet-ats.c:339 src/namestore/gnunet-namestore.c:610
+#: src/transport/gnunet-transport.c:804
 #, c-format
 msgid "Service `%s' is not running\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/ats-tool/gnunet-ats.c:355 src/transport/gnunet-transport.c:819
+#: src/ats-tool/gnunet-ats.c:349 src/transport/gnunet-transport.c:810
 #, 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:363
+#: src/ats-tool/gnunet-ats.c:357
 #, 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:379 src/ats-tool/gnunet-ats.c:398
-#: src/ats-tool/gnunet-ats.c:415 src/ats-tool/gnunet-ats.c:440
+#: src/ats-tool/gnunet-ats.c:373 src/ats-tool/gnunet-ats.c:392
+#: src/ats-tool/gnunet-ats.c:409 src/ats-tool/gnunet-ats.c:434
 #, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "No se puede conectar al servicio ATS, saliendo...\n"
 
-#: src/ats-tool/gnunet-ats.c:388 src/ats-tool/gnunet-ats.c:405
+#: src/ats-tool/gnunet-ats.c:382 src/ats-tool/gnunet-ats.c:399
 #, c-format
 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:433
+#: src/ats-tool/gnunet-ats.c:427
 msgid "Type required\n"
 msgstr "Tipo requerido\n"
 
-#: src/ats-tool/gnunet-ats.c:490
+#: src/ats-tool/gnunet-ats.c:484
 msgid "get list of active addresses currently used"
 msgstr "obtiene una lista de direcciones activas usadas actualmente"
 
-#: src/ats-tool/gnunet-ats.c:493
+#: src/ats-tool/gnunet-ats.c:487
 msgid "get list of all active addresses"
 msgstr "obtiene una lista de todas las direcciones activas"
 
-#: src/ats-tool/gnunet-ats.c:496
+#: src/ats-tool/gnunet-ats.c:490
 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:499
+#: src/ats-tool/gnunet-ats.c:493
 msgid "monitor mode"
 msgstr "modo de monitorización"
 
-#: src/ats-tool/gnunet-ats.c:502
+#: src/ats-tool/gnunet-ats.c:496
 msgid "set preference for the given peer"
 msgstr "establece las preferencias para el par dado"
 
-#: src/ats-tool/gnunet-ats.c:505
+#: src/ats-tool/gnunet-ats.c:499
 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:508
+#: src/ats-tool/gnunet-ats.c:502
 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:511
+#: src/ats-tool/gnunet-ats.c:505
 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:514
+#: src/ats-tool/gnunet-ats.c:508
 msgid "preference value"
 msgstr "valor de preferencia"
 
 # Miguel: ¿Algo menos forzado que "salida prolija"?
-#: src/ats-tool/gnunet-ats.c:517
+#: src/ats-tool/gnunet-ats.c:511
 msgid "verbose output (include ATS address properties)"
 msgstr "salida prolija (incluye las propiedades de direcciones del ATS)"
 
-#: src/ats-tool/gnunet-ats.c:526
+#: src/ats-tool/gnunet-ats.c:520
 msgid "Print information about ATS state"
 msgstr "Imprime información acerca del estado del ATS"
 
@@ -479,21 +592,21 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Cargando el módulo de bloques «%s»\n"
 
-#: src/consensus/gnunet-consensus.c:317
+#: src/consensus/gnunet-consensus.c:350
 msgid "number of peers in consensus"
 msgstr "número de pares en consenso"
 
-#: src/consensus/gnunet-consensus.c:320
+#: src/consensus/gnunet-consensus.c:353
 msgid "how many peers receive one value?"
 msgstr "¿cuántos pares reciben un valor?"
 
-#: src/consensus/gnunet-consensus.c:323
+#: src/consensus/gnunet-consensus.c:356
 msgid "number of values"
 msgstr "número de valores"
 
 # Miguel: "timeout" lo he traducido como plazo, pero no se
 # si hay alguna palabra que lo describa mejor.
-#: src/consensus/gnunet-consensus.c:326
+#: src/consensus/gnunet-consensus.c:359
 msgid "consensus timeout"
 msgstr "plazo de consenso"
 
@@ -520,51 +633,51 @@
 msgid "ibf size"
 msgstr "tamaño ibf"
 
-#: src/consensus/gnunet-consensus-start-peers.c:158
+#: src/consensus/gnunet-consensus-start-peers.c:172
 msgid "start peers with the given template configuration"
 msgstr "inicia los pares con la plantilla de configuración dada"
 
-#: src/consensus/gnunet-consensus-start-peers.c:161
+#: src/consensus/gnunet-consensus-start-peers.c:175
 msgid "number of peers to start"
 msgstr "número de pares para empezar"
 
-#: src/core/core_api.c:755
+#: src/core/core_api.c:752
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/core/gnunet-core.c:86 src/peerinfo-tool/gnunet-peerinfo.c:214
+#: src/core/gnunet-core.c:82
 #, c-format
 msgid "Peer `%s'\n"
 msgstr "Par «%s»\n"
 
-#: src/core/gnunet-core.c:119 src/core/gnunet-core.c:147
-#: src/transport/gnunet-transport.c:612 src/transport/gnunet-transport.c:636
+#: src/core/gnunet-core.c:112 src/core/gnunet-core.c:140
+#: src/transport/gnunet-transport.c:606 src/transport/gnunet-transport.c:630
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr "%24s: %-17s %4s   (%u conexiones en total)\n"
 
-#: src/core/gnunet-core.c:121 src/transport/gnunet-transport.c:614
+#: src/core/gnunet-core.c:114 src/transport/gnunet-transport.c:608
 msgid "Connected to"
 msgstr "Conectado a"
 
-#: src/core/gnunet-core.c:149 src/transport/gnunet-transport.c:638
+#: src/core/gnunet-core.c:142 src/transport/gnunet-transport.c:632
 msgid "Disconnected from"
 msgstr "Desconectado de"
 
-#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:176
-#: src/peerinfo-tool/gnunet-peerinfo.c:541
+#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:176
+#: src/peerinfo-tool/gnunet-peerinfo.c:643
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Parámetro no válido «%s» en la línea de comandos\n"
 
 # Miguel: ¿Quizá continuamente fuese mejor?
-#: src/core/gnunet-core.c:211 src/transport/gnunet-transport.c:1005
+#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:996
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
 
-#: src/core/gnunet-core.c:222
+#: src/core/gnunet-core.c:215
 msgid "Print information about connected peers."
 msgstr "Imprime información sobre los pares conectados."
 
@@ -585,7 +698,7 @@
 "(HOSTKEY).  Saliendo.\n"
 
 #: src/core/gnunet-service-core.c:164
-#: src/transport/gnunet-service-transport.c:725
+#: src/transport/gnunet-service-transport.c:758
 msgid "Transport service is unable to access hostkey. Exiting.\n"
 msgstr ""
 "El servicio de transporte no es capaz de acceder a la clave de la máquina. "
@@ -704,40 +817,40 @@
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1312
+#: src/core/gnunet-service-core_kx.c:1298
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1319
+#: src/core/gnunet-service-core_kx.c:1305
 #, 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:1322
+#: src/core/gnunet-service-core_kx.c:1308
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1365
-#: src/core/gnunet-service-core_kx.c:1390
+#: src/core/gnunet-service-core_kx.c:1351
+#: src/core/gnunet-service-core_kx.c:1376
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1377
+#: src/core/gnunet-service-core_kx.c:1363
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1404
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1426
+#: src/core/gnunet-service-core_kx.c:1412
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1443
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
@@ -747,7 +860,7 @@
 msgstr "# sesiones terminadas por desconexión de transporte"
 
 #: src/core/gnunet-service-core_neighbours.c:179
-#: src/core/gnunet-service-core_neighbours.c:333
+#: src/core/gnunet-service-core_neighbours.c:328
 msgid "# neighbour entries allocated"
 msgstr "# entradas de vecinos alojadas"
 
@@ -755,23 +868,23 @@
 msgid "# encrypted bytes given to transport"
 msgstr "# bytes cifrados dados al transporte"
 
-#: src/core/gnunet-service-core_neighbours.c:420
+#: src/core/gnunet-service-core_neighbours.c:411
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Mensaje no soportado del tipo %u (%u bytes) recibido del par «%s»\n"
 
 #: src/core/gnunet-service-core_sessions.c:210
 #: src/core/gnunet-service-core_sessions.c:280
-#: src/dht/gnunet-service-dht_neighbours.c:645
-#: src/dht/gnunet-service-dht_neighbours.c:704
-#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1530
-#: src/topology/gnunet-daemon-topology.c:704
-#: src/topology/gnunet-daemon-topology.c:805
-#: src/transport/gnunet-service-transport_neighbours.c:1052
-#: src/transport/gnunet-service-transport_neighbours.c:1276
-#: src/transport/gnunet-service-transport_neighbours.c:1285
-#: src/transport/gnunet-service-transport_neighbours.c:2826
-#: src/transport/gnunet-service-transport_neighbours.c:3089
+#: src/dht/gnunet-service-dht_neighbours.c:644
+#: src/dht/gnunet-service-dht_neighbours.c:703
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
+#: src/topology/gnunet-daemon-topology.c:700
+#: src/topology/gnunet-daemon-topology.c:801
+#: src/transport/gnunet-service-transport_neighbours.c:1041
+#: src/transport/gnunet-service-transport_neighbours.c:1265
+#: src/transport/gnunet-service-transport_neighbours.c:1274
+#: src/transport/gnunet-service-transport_neighbours.c:2794
+#: src/transport/gnunet-service-transport_neighbours.c:3053
 msgid "# peers connected"
 msgstr "# pares conectados"
 
@@ -839,14 +952,14 @@
 #: src/datacache/plugin_datacache_sqlite.c:72
 #: src/datastore/plugin_datastore_mysql.c:803
 #: src/datastore/plugin_datastore_mysql.c:817
-#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
-#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
-#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/datastore/plugin_datastore_sqlite.c:57 src/fs/fs_pseudonym.c:46
+#: src/mysql/mysql.c:41 src/mysql/mysql.c:48 src/mysql/mysql.c:522
+#: src/mysql/mysql.c:531 src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:46
 #: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
-#: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
+#: src/include/gnunet_common.h:608 src/include/gnunet_common.h:615
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» falló en %s: %d con el error: %s\n"
@@ -1246,7 +1359,7 @@
 #: 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:736
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:1037
+#: src/nse/gnunet-nse-profiler.c:900
 msgid "be verbose (print progress information)"
 msgstr "ser prolijo (imprime información de progreso)"
 
@@ -1315,88 +1428,88 @@
 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:413
+#: src/dht/gnunet-service-dht_clients.c:414
 msgid "# GET requests from clients injected"
 msgstr "# peticiones «GET» inyectadas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:503
+#: src/dht/gnunet-service-dht_clients.c:508
 msgid "# PUT requests received from clients"
 msgstr "# peticiones «PUT» recibidas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:585
+#: src/dht/gnunet-service-dht_clients.c:590
 msgid "# GET requests received from clients"
 msgstr "# peticiones «GET» recibidas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:791
+#: src/dht/gnunet-service-dht_clients.c:796
 msgid "# GET STOP requests received from clients"
 msgstr "# peticiones «GET STOP» recibidas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:1035
+#: src/dht/gnunet-service-dht_clients.c:1041
 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:1048
+#: src/dht/gnunet-service-dht_clients.c:1054
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 "# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) omitidas"
 
-#: src/dht/gnunet-service-dht_clients.c:1085
+#: src/dht/gnunet-service-dht_clients.c:1091
 #, 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:1108
+#: src/dht/gnunet-service-dht_clients.c:1114
 msgid "# RESULTS queued for clients"
 msgstr "# Resultados (RESULTS) encolados para clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:1157
-#: src/dht/gnunet-service-dht_clients.c:1199
+#: src/dht/gnunet-service-dht_clients.c:1165
+#: src/dht/gnunet-service-dht_clients.c:1207
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 "# Respuestas (REPLIES) ignoradas para clientes (CLIENTS) (sin coincidencia)"
 
-#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1175
 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:64
+#: src/dht/gnunet-service-dht_datacache.c:68
 #, 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:74
+#: src/dht/gnunet-service-dht_datacache.c:78
 msgid "# ITEMS stored in datacache"
 msgstr "# Elementos (ITEMS) almacenados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:159
+#: src/dht/gnunet-service-dht_datacache.c:165
 msgid "# Good RESULTS found in datacache"
 msgstr "# Buenos resultados (RESULTS) encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:170
+#: src/dht/gnunet-service-dht_datacache.c:176
 msgid "# Duplicate RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) duplicados encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:176
+#: src/dht/gnunet-service-dht_datacache.c:182
 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:182
+#: src/dht/gnunet-service-dht_datacache.c:188
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) irrelevantes encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:194
+#: src/dht/gnunet-service-dht_datacache.c:200
 msgid "# Unsupported RESULTS found in datacache"
 msgstr "# Resultados (RESULTS) no soportados encontrados en la caché de datos"
 
-#: src/dht/gnunet-service-dht_datacache.c:197
+#: src/dht/gnunet-service-dht_datacache.c:203
 #, 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:227
+#: src/dht/gnunet-service-dht_datacache.c:234
 msgid "# GET requests given to datacache"
 msgstr "# Peticiones «GET» realizadas a la caché de datos"
 
@@ -1404,87 +1517,87 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "# «HELLO» obtenidos de «peerinfo»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:501
+#: src/dht/gnunet-service-dht_neighbours.c:504
 msgid "# Preference updates given to core"
 msgstr "# Actualizaciones de preferencias dadas al servicio principal"
 
-#: src/dht/gnunet-service-dht_neighbours.c:591
+#: src/dht/gnunet-service-dht_neighbours.c:594
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes «FIND PEER» iniciados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:738
+#: src/dht/gnunet-service-dht_neighbours.c:737
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# Mensajes encolados descartados (par desconectado)"
 
-#: src/dht/gnunet-service-dht_neighbours.c:793
+#: src/dht/gnunet-service-dht_neighbours.c:792
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes transmitidos a otros pares"
 
-#: src/dht/gnunet-service-dht_neighbours.c:831
+#: src/dht/gnunet-service-dht_neighbours.c:830
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Bytes de ancho de banda solicitados por el servicio principal"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1053
-#: src/dht/gnunet-service-dht_neighbours.c:1081
+#: src/dht/gnunet-service-dht_neighbours.c:1052
+#: src/dht/gnunet-service-dht_neighbours.c:1086
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr "# Pares excluidos del encaminado debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1062
-#: src/dht/gnunet-service-dht_neighbours.c:1096
+#: src/dht/gnunet-service-dht_neighbours.c:1067
+#: src/dht/gnunet-service-dht_neighbours.c:1101
 msgid "# Peer selection failed"
 msgstr "# Selecciones de pares fallidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1230
+#: src/dht/gnunet-service-dht_neighbours.c:1235
 msgid "# PUT requests routed"
 msgstr "# Peticiones «PUT» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1259
+#: src/dht/gnunet-service-dht_neighbours.c:1264
 msgid "# PUT messages queued for transmission"
 msgstr "# mensajes «PUT» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1266
-#: src/dht/gnunet-service-dht_neighbours.c:1379
-#: src/dht/gnunet-service-dht_neighbours.c:1479
+#: src/dht/gnunet-service-dht_neighbours.c:1271
+#: src/dht/gnunet-service-dht_neighbours.c:1384
+#: src/dht/gnunet-service-dht_neighbours.c:1484
 msgid "# P2P messages dropped due to full queue"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1344
+#: src/dht/gnunet-service-dht_neighbours.c:1349
 msgid "# GET requests routed"
 msgstr "# Peticiones «GET» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1371
+#: src/dht/gnunet-service-dht_neighbours.c:1376
 msgid "# GET messages queued for transmission"
 msgstr "# Mensajes «GET» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1486
+#: src/dht/gnunet-service-dht_neighbours.c:1491
 msgid "# RESULT messages queued for transmission"
 msgstr "# Mensajes «RESULT» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1574
+#: src/dht/gnunet-service-dht_neighbours.c:1575
 msgid "# P2P PUT requests received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1704
+#: src/dht/gnunet-service-dht_neighbours.c:1730
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1712
+#: src/dht/gnunet-service-dht_neighbours.c:1738
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a falta de «HELLO»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-dht_neighbours.c:1829
 msgid "# P2P GET requests received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1845
+#: src/dht/gnunet-service-dht_neighbours.c:1882
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Peticiones «FIND PEER» P2P procesadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1859
+#: src/dht/gnunet-service-dht_neighbours.c:1896
 msgid "# P2P GET requests ONLY routed"
 msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1943
+#: src/dht/gnunet-service-dht_neighbours.c:1973
 msgid "# P2P RESULTS received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
 
@@ -1654,19 +1767,14 @@
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "se necesita una dirección IPv4 o IPv6 válida\n"
 
-#: src/dv/dv_api.c:189
-msgid "Failed to connect to the dv service!\n"
-msgstr "¡Se produjo un fallo al conectar con el servicio dv!\n"
-
-#: src/dv/gnunet-service-dv.c:3003
-msgid "Error in communication with PEERINFO service\n"
+#: src/dv/gnunet-dv.c:165
+msgid "verbose output"
 msgstr ""
-"Error en la comunicación con el servicio de información de pares (PEERINFO)\n"
 
-#: src/dv/plugin_transport_dv.c:159
-#, c-format
-msgid "%s Received message from %s of type %d, distance %u!\n"
-msgstr "%s Recibido mensaje de %s del tipo %d, distancia %u!\n"
+#: src/dv/gnunet-dv.c:174
+#, fuzzy
+msgid "Print information about DV state"
+msgstr "Imprime información acerca del estado del ATS"
 
 #: src/exit/gnunet-daemon-exit.c:741
 #, c-format
@@ -2150,7 +2258,7 @@
 msgid "Identifiers or URI too long to create UBlock"
 msgstr "Identificadores o URI demasiado largos para crear un bloque S (SBlock)"
 
-#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:307
+#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:311
 msgid "Internal error."
 msgstr "Error interno."
 
@@ -2158,6 +2266,28 @@
 msgid "Failed to connect to datastore."
 msgstr "Se produjo un fallo al conectar con el almacén de datos."
 
+#: src/fs/fs_pseudonym.c:342 src/fs/fs_pseudonym.c:645
+#, c-format
+msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+msgstr ""
+"Se produjo un fallo al procesar los metadatos del fichero «%s» acerca del "
+"seudónimo: %s\n"
+
+#: src/fs/fs_pseudonym.c:477 src/fs/fs_pseudonym.c:503
+#: src/fs/fs_pseudonym.c:641
+msgid "no-name"
+msgstr "sin nombre"
+
+#: src/fs/fs_pseudonym.c:1182 src/util/crypto_ecc.c:975
+#, c-format
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "El firmado ECC falló en %s:%d: %s\n"
+
+#: src/fs/fs_pseudonym.c:1505
+#, fuzzy, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
+
 #: src/fs/fs_publish.c:129 src/fs/fs_publish.c:397
 #, c-format
 msgid "Publishing failed: %s"
@@ -2221,7 +2351,7 @@
 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"
 
-#: src/fs/fs_publish_ksk.c:269
+#: src/fs/fs_publish_ksk.c:273
 msgid "Could not connect to datastore."
 msgstr "No se pudo conectar con el almacén de datos."
 
@@ -2353,19 +2483,19 @@
 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:944
+#: src/fs/fs_uri.c:945
 msgid "identifier is NULL!"
 msgstr ""
 
-#: src/fs/fs_uri.c:949
+#: src/fs/fs_uri.c:951
 msgid "identifier has zero length!"
 msgstr ""
 
-#: src/fs/fs_uri.c:1118 src/fs/fs_uri.c:1145
+#: src/fs/fs_uri.c:1122 src/fs/fs_uri.c:1149
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/fs/fs_uri.c:1151
+#: src/fs/fs_uri.c:1155
 msgid "Number of double-quotes not balanced!\n"
 msgstr "¡Número de comillas dobles no balanceado!\n"
 
@@ -2568,21 +2698,21 @@
 msgid "Special file-sharing operations"
 msgstr "Operaciones especiales de compartición de ficheros"
 
-#: src/fs/gnunet-fs-profiler.c:182
+#: src/fs/gnunet-fs-profiler.c:190
 msgid "run the experiment with COUNT peers"
 msgstr "ejecuta el experimento con «COUNT» pares"
 
-#: src/fs/gnunet-fs-profiler.c:185
+#: src/fs/gnunet-fs-profiler.c:193
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 "especifica el nombre de un fichero con las máquinas (HOSTS) que la batería "
 "de pruebas debería usar"
 
-#: src/fs/gnunet-fs-profiler.c:188
+#: src/fs/gnunet-fs-profiler.c:196
 msgid "automatically terminate experiment after DELAY"
 msgstr "termina el experimento automáticamente despues de «DELAY»"
 
-#: src/fs/gnunet-fs-profiler.c:197
+#: src/fs/gnunet-fs-profiler.c:205
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 "ejecuta una batería de pruebas para medir el rendimiento de la compartición "
@@ -2745,7 +2875,7 @@
 msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n"
 
 #: src/fs/gnunet-publish.c:588 src/fs/gnunet-publish.c:595
-#: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
+#: src/transport/gnunet-transport.c:834 src/transport/gnunet-transport.c:864
 #, 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"
@@ -2864,99 +2994,99 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr "Buscar en GNUnet ficheros que han sido publicados en GNUnet"
 
-#: src/fs/gnunet-service-fs.c:248
+#: src/fs/gnunet-service-fs.c:271
 msgid "# running average P2P latency (ms)"
 msgstr "# latencia media de P2P en ejecución (ms)"
 
-#: src/fs/gnunet-service-fs.c:309 src/fs/gnunet-service-fs.c:521
+#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:538
 msgid "# Loopback routes suppressed"
 msgstr "# Rutas en bucle local eliminadas"
 
-#: src/fs/gnunet-service-fs.c:626 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1322
-#: src/topology/gnunet-daemon-topology.c:1329
+#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:291
+#: src/topology/gnunet-daemon-topology.c:1314
+#: src/topology/gnunet-daemon-topology.c:1321
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Se produjo un fallo al conectar con el servicio «%s».\n"
 
-#: src/fs/gnunet-service-fs_cp.c:711
+#: src/fs/gnunet-service-fs_cp.c:677
 msgid "# migration stop messages received"
 msgstr "# mensajes de detención de migración recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:715
+#: src/fs/gnunet-service-fs_cp.c:681
 #, 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:751
+#: src/fs/gnunet-service-fs_cp.c:716
 msgid "# replies transmitted to other peers"
 msgstr "# respuestas transmitidas a otros pares"
 
-#: src/fs/gnunet-service-fs_cp.c:757
+#: src/fs/gnunet-service-fs_cp.c:722
 msgid "# replies dropped"
 msgstr "# respuestas omitidas"
 
-#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1331
+#: src/fs/gnunet-service-fs_cp.c:747 src/fs/gnunet-service-fs_cp.c:1296
 msgid "# P2P searches active"
 msgstr "# busquedas P2P activas"
 
-#: src/fs/gnunet-service-fs_cp.c:875
+#: src/fs/gnunet-service-fs_cp.c:840
 msgid "# artificial delays introduced (ms)"
 msgstr "# retardos artificiales introducidos (ms)"
 
-#: src/fs/gnunet-service-fs_cp.c:928
+#: src/fs/gnunet-service-fs_cp.c:893
 msgid "# replies dropped due to type mismatch"
 msgstr "# respuestas omitidas debido a incompatibilidad de tipos"
 
-#: src/fs/gnunet-service-fs_cp.c:936
+#: src/fs/gnunet-service-fs_cp.c:901
 msgid "# replies received for other peers"
 msgstr "# respuestas recibidas de otros pares"
 
-#: src/fs/gnunet-service-fs_cp.c:950
+#: src/fs/gnunet-service-fs_cp.c:915
 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:988
+#: src/fs/gnunet-service-fs_cp.c:953
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr "# búsquedas P2P destruidas debido a respuesta definitiva"
 
-#: src/fs/gnunet-service-fs_cp.c:1056
+#: src/fs/gnunet-service-fs_cp.c:1021
 msgid "# requests done for free (low load)"
 msgstr "# peticiones realizadas gratuitamente (baja carga)"
 
-#: src/fs/gnunet-service-fs_cp.c:1081
+#: src/fs/gnunet-service-fs_cp.c:1046
 msgid "# request dropped, priority insufficient"
 msgstr "# peticiones omitidas, prioridad insuficiente"
 
-#: src/fs/gnunet-service-fs_cp.c:1091
+#: src/fs/gnunet-service-fs_cp.c:1056
 msgid "# requests done for a price (normal load)"
 msgstr "# peticiones realizadas por un precio (carga normal)"
 
-#: src/fs/gnunet-service-fs_cp.c:1169
+#: src/fs/gnunet-service-fs_cp.c:1134
 msgid "# GET requests received (from other peers)"
 msgstr "# peticiones «GET» recibidas (de otros pares)"
 
-#: src/fs/gnunet-service-fs_cp.c:1203
+#: src/fs/gnunet-service-fs_cp.c:1168
 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:1226
+#: src/fs/gnunet-service-fs_cp.c:1191
 msgid "# requests dropped due to missing reverse route"
 msgstr "# peticiones omitidas debido a falta de ruta inversa"
 
-#: src/fs/gnunet-service-fs_cp.c:1276
+#: src/fs/gnunet-service-fs_cp.c:1241
 msgid "# requests dropped due TTL underflow"
 msgstr "# peticiones omitidas debido a expiración del TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1300
+#: src/fs/gnunet-service-fs_cp.c:1265
 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:1329
+#: src/fs/gnunet-service-fs_cp.c:1294
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes de búsqueda P2P recibidos y procesados"
 
-#: src/fs/gnunet-service-fs_cp.c:1699
+#: src/fs/gnunet-service-fs_cp.c:1664
 msgid "# migration stop messages sent"
 msgstr "# mensajes de detención de migración enviados"
 
@@ -3409,79 +3539,79 @@
 msgid "Not a GADS TLD: `%s'\n"
 msgstr "No es un TLD GADS: «%s»\n"
 
-#: src/hello/gnunet-hello.c:118
+#: src/hello/gnunet-hello.c:119
 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:124
+#: src/hello/gnunet-hello.c:125
 #, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr "Error accediendo al fichero «%s»: %s\n"
 
-#: src/hello/gnunet-hello.c:132
+#: src/hello/gnunet-hello.c:133
 #, 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:139
+#: src/hello/gnunet-hello.c:140
 #, 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:149 src/hello/gnunet-hello.c:177
+#: src/hello/gnunet-hello.c:150 src/hello/gnunet-hello.c:179
 #, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Error abriendo fichero «%s»: %s\n"
 
-#: src/hello/gnunet-hello.c:165
+#: src/hello/gnunet-hello.c:166
 #, 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:189
+#: src/hello/gnunet-hello.c:191
 #, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "Error escribiendo «HELLO» al fichero «%s»: %s\n"
 
-#: src/hello/hello.c:904
+#: src/hello/hello.c:936
 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:913
+#: src/hello/hello.c:945
 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:923
+#: src/hello/hello.c:955
 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:933
+#: src/hello/hello.c:965
 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:950
+#: src/hello/hello.c:982
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/hello/hello.c:959
+#: src/hello/hello.c:991
 #, 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:978
+#: src/hello/hello.c:1010
 #, 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/hostlist/gnunet-daemon-hostlist.c:264
+#: src/hostlist/gnunet-daemon-hostlist.c:258
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
@@ -3489,11 +3619,11 @@
 "Ninguna de las funciones para el demonio de listas de máquinas fue "
 "activada.  ¡No tengo razón para ejecutarme!\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:317
+#: src/hostlist/gnunet-daemon-hostlist.c:311
 msgid "advertise our hostlist to other peers"
 msgstr "anuncia nuestra lista de máquinas a otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:322
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
@@ -3501,16 +3631,16 @@
 "realizar inicialización usando listas de máquinas (es altamente recomendable "
 "que siempre se use esta opción)"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/hostlist/gnunet-daemon-hostlist.c:319
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 "habilitar aprendizaje de servidores de listas de máquinas de otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:329
+#: src/hostlist/gnunet-daemon-hostlist.c:323
 msgid "provide a hostlist server"
 msgstr "proveer un servidor de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:344
+#: src/hostlist/gnunet-daemon-hostlist.c:338
 msgid "GNUnet hostlist server and client"
 msgstr "Servidor y cliente GNUnet de listas de máquinas"
 
@@ -3535,13 +3665,13 @@
 #: src/hostlist/hostlist-client.c:686 src/hostlist/hostlist-client.c:738
 #: src/hostlist/hostlist-client.c:747 src/hostlist/hostlist-client.c:868
 #: src/hostlist/hostlist-client.c:960 src/hostlist/hostlist-client.c:965
-#: src/transport/plugin_transport_http_client.c:1052
-#: src/transport/plugin_transport_http_client.c:1067
+#: src/transport/plugin_transport_http_client.c:1056
+#: src/transport/plugin_transport_http_client.c:1071
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
 
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1327
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1319
 msgid "# advertised hostlist URIs"
 msgstr "# URI de listas de máquinas anunciadas"
 
@@ -3594,7 +3724,7 @@
 msgid "# hostlist downloads initiated"
 msgstr "# descargas de listas de máquinas iniciadas"
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1500
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1492
 msgid "# milliseconds between hostlist downloads"
 msgstr "# milisegundos entre descargas de listas de máquinas"
 
@@ -3604,66 +3734,66 @@
 msgstr ""
 "Hay %u/%u conexiones.  Se considerará descargar una lista de máquinas en %s\n"
 
-#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
+#: src/hostlist/hostlist-client.c:1105 src/hostlist/hostlist-client.c:1121
 msgid "# active connections"
 msgstr "# conexiones activas"
 
-#: src/hostlist/hostlist-client.c:1275
+#: src/hostlist/hostlist-client.c:1267
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Cargando entradas guardadas de listas de máquinas del fichero «%s»\n"
 
-#: src/hostlist/hostlist-client.c:1279
+#: src/hostlist/hostlist-client.c:1271
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "El fichero de listas de máquinas «%s» no existe\n"
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/hostlist/hostlist-client.c:1282
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo lectura para cargar las listas de "
 "máquinas: %s\n"
 
-#: src/hostlist/hostlist-client.c:1323
+#: src/hostlist/hostlist-client.c:1315
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr "%u URI de listas de máquinas cargadas del fichero\n"
 
-#: src/hostlist/hostlist-client.c:1325
+#: src/hostlist/hostlist-client.c:1317
 msgid "# hostlist URIs read from file"
 msgstr "# URI de listas de máquinas leídas de fichero"
 
-#: src/hostlist/hostlist-client.c:1370
+#: src/hostlist/hostlist-client.c:1362
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo escritura para almacenar las listas "
 "de máquinas: %s\n"
 
-#: src/hostlist/hostlist-client.c:1375
+#: src/hostlist/hostlist-client.c:1367
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Escribiendo %u URI de listas de máquinas a «%s»\n"
 
-#: src/hostlist/hostlist-client.c:1399 src/hostlist/hostlist-client.c:1416
+#: src/hostlist/hostlist-client.c:1391 src/hostlist/hostlist-client.c:1408
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Error escribiendo URI de listas de máquinas al fichero «%s»\n"
 
-#: src/hostlist/hostlist-client.c:1411
+#: src/hostlist/hostlist-client.c:1403
 msgid "# hostlist URIs written to file"
 msgstr "# URI de listas de máquinas escritas a fichero"
 
-#: src/hostlist/hostlist-client.c:1465
+#: src/hostlist/hostlist-client.c:1457
 msgid "Learning is enabled on this peer\n"
 msgstr "El aprendizaje está habilitado en este par\n"
 
-#: src/hostlist/hostlist-client.c:1477
+#: src/hostlist/hostlist-client.c:1469
 msgid "Learning is not enabled on this peer\n"
 msgstr "El aprendizaje no está habilitado en este par\n"
 
-#: src/hostlist/hostlist-client.c:1489
+#: src/hostlist/hostlist-client.c:1481
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -3671,7 +3801,7 @@
 "La lista de máquinas «%s» fue eliminada puesto que el aprendizaje no está "
 "habilitado en este par\n"
 
-#: src/hostlist/hostlist-client.c:1493
+#: src/hostlist/hostlist-client.c:1485
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "El fichero de listas de máquinas «%s» no pudo ser eliminado\n"
@@ -3684,10 +3814,11 @@
 msgid "expired addresses encountered"
 msgstr "direcciones expiradas encontradas"
 
-#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:425
-#: src/peerinfo-tool/gnunet-peerinfo.c:331
-#: src/peerinfo-tool/gnunet-peerinfo.c:386
-#: src/topology/gnunet-daemon-topology.c:922
+#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:421
+#: src/peerinfo-tool/gnunet-peerinfo.c:348
+#: src/peerinfo-tool/gnunet-peerinfo.c:418
+#: src/peerinfo-tool/gnunet-peerinfo.c:489
+#: src/topology/gnunet-daemon-topology.c:918
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
@@ -3742,60 +3873,60 @@
 msgid "# hostlist advertisements send"
 msgstr "# anuncios de listas de máquinas enviados"
 
-#: src/hostlist/hostlist-server.c:388
+#: src/hostlist/hostlist-server.c:384
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 "Los mensajes de anuncio no pudieron encolarse por el servicio principal\n"
 
-#: src/hostlist/hostlist-server.c:552 src/peerinfo-tool/gnunet-peerinfo.c:547
-#: src/transport/gnunet-service-transport.c:632
+#: src/hostlist/hostlist-server.c:548 src/peerinfo-tool/gnunet-peerinfo.c:649
+#: src/transport/gnunet-service-transport.c:661
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
 "Saliendo.\n"
 
-#: src/hostlist/hostlist-server.c:562
+#: src/hostlist/hostlist-server.c:558
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Número de puerto %llu no válido.  Saliendo.\n"
 
-#: src/hostlist/hostlist-server.c:571
+#: src/hostlist/hostlist-server.c:567
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr "Servicio de listas de máquinas arranca en %s:%llu\n"
 
-#: src/hostlist/hostlist-server.c:585
+#: src/hostlist/hostlist-server.c:581
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Dirección para obtener la lista de máquinas: «%s»\n"
 
-#: src/hostlist/hostlist-server.c:625
+#: src/hostlist/hostlist-server.c:621
 #, c-format
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/hostlist-server.c:667
+#: src/hostlist/hostlist-server.c:663
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 "No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n"
 
-#: src/integration-tests/connection_watchdog.c:1001
+#: src/integration-tests/connection_watchdog.c:990
 #, c-format
 msgid "Transport plugin: `%s' port %llu\n"
 msgstr "Módulo de transporte: «%s» puerto %llu\n"
 
-#: src/integration-tests/connection_watchdog.c:1034
+#: src/integration-tests/connection_watchdog.c:1023
 #, c-format
 msgid "Found %u transport plugins: `%s'\n"
 msgstr "Encontrados %u módulos de transporte: «%s»\n"
 
-#: src/integration-tests/connection_watchdog.c:1093
+#: src/integration-tests/connection_watchdog.c:1082
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 "Enviar mensajes «ping» para probar la conectividad (predeterminado: NO)"
 
-#: src/integration-tests/connection_watchdog.c:1102
+#: src/integration-tests/connection_watchdog.c:1091
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr "texto de ayuda"
@@ -3814,30 +3945,31 @@
 msgid "Print information about mesh tunnels and peers."
 msgstr "Imprimir información acerca de tuneles mesh y pares."
 
-#: src/mesh/gnunet-service-mesh.c:8010 src/mesh/gnunet-service-mesh-new.c:8015
+#: src/mesh/gnunet-service-mesh.c:7966 src/mesh/gnunet-service-mesh-new.c:7972
 msgid "Wrong CORE service\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
-#: src/mesh/gnunet-service-mesh.c:8227 src/mesh/gnunet-service-mesh-new.c:8232
+#: src/mesh/gnunet-service-mesh.c:8179 src/mesh/gnunet-service-mesh-new.c:8185
 #, c-format
 msgid "Mesh service could not access hostkey: %s. Exiting.\n"
 msgstr ""
 "El servicio mesh no puede acceder a la clave de la máquina: %s. Saliendo.\n"
 
-#: src/mesh/gnunet-service-mesh.c:8309 src/mesh/gnunet-service-mesh.c:8321
-#: src/mesh/gnunet-service-mesh.c:8333 src/mesh/gnunet-service-mesh.c:8347
-#: src/mesh/gnunet-service-mesh.c:8359 src/mesh/gnunet-service-mesh.c:8371
-#: src/mesh/gnunet-service-mesh.c:8383 src/mesh/gnunet-service-mesh-new.c:8321
-#: src/mesh/gnunet-service-mesh-new.c:8333
-#: src/mesh/gnunet-service-mesh-new.c:8345
-#: src/mesh/gnunet-service-mesh-new.c:8359
-#: src/mesh/gnunet-service-mesh-new.c:8371
-#: src/mesh/gnunet-service-mesh-new.c:8383
-#: src/mesh/gnunet-service-mesh-new.c:8395 src/nse/gnunet-service-nse.c:1478
-#: src/nse/gnunet-service-nse.c:1496
-#: src/regex/gnunet-daemon-regexprofiler.c:277
-#: src/regex/gnunet-daemon-regexprofiler.c:290
-#: src/regex/gnunet-daemon-regexprofiler.c:303
+#: src/mesh/gnunet-service-mesh.c:8261 src/mesh/gnunet-service-mesh.c:8273
+#: src/mesh/gnunet-service-mesh.c:8285 src/mesh/gnunet-service-mesh.c:8299
+#: src/mesh/gnunet-service-mesh.c:8311 src/mesh/gnunet-service-mesh.c:8323
+#: src/mesh/gnunet-service-mesh.c:8335 src/mesh/gnunet-service-mesh-new.c:8274
+#: src/mesh/gnunet-service-mesh-new.c:8286
+#: src/mesh/gnunet-service-mesh-new.c:8298
+#: src/mesh/gnunet-service-mesh-new.c:8312
+#: src/mesh/gnunet-service-mesh-new.c:8324
+#: src/mesh/gnunet-service-mesh-new.c:8336
+#: src/mesh/gnunet-service-mesh-new.c:8348 src/nse/gnunet-service-nse.c:1516
+#: src/nse/gnunet-service-nse.c:1534
+#: src/regex/gnunet-daemon-regexprofiler.c:320
+#: src/regex/gnunet-daemon-regexprofiler.c:332
+#: src/regex/gnunet-daemon-regexprofiler.c:344
+#: src/regex/gnunet-daemon-regexprofiler.c:357
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
@@ -3845,10 +3977,10 @@
 "El servicio %s carece de opciones de configuración de clave (%s).  "
 "Saliendo.\n"
 
-#: src/mesh/gnunet-service-mesh.c:8395 src/mesh/gnunet-service-mesh.c:8405
-#: src/mesh/gnunet-service-mesh.c:8416 src/mesh/gnunet-service-mesh-new.c:8407
-#: src/mesh/gnunet-service-mesh-new.c:8417
-#: src/mesh/gnunet-service-mesh-new.c:8428
+#: src/mesh/gnunet-service-mesh.c:8347 src/mesh/gnunet-service-mesh.c:8357
+#: src/mesh/gnunet-service-mesh.c:8368 src/mesh/gnunet-service-mesh-new.c:8360
+#: src/mesh/gnunet-service-mesh-new.c:8370
+#: src/mesh/gnunet-service-mesh-new.c:8381
 #, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -3944,7 +4076,7 @@
 msgstr "borrar"
 
 #: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:599
+#: src/peerinfo-tool/gnunet-peerinfo.c:701
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
@@ -4241,81 +4373,71 @@
 "Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para "
 "pruebas NAT: %s\n"
 
-#: src/nse/gnunet-nse-profiler.c:1013
+#: src/nse/gnunet-nse-profiler.c:885
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "límite al número de conexiones a servicios NSE, 0 para ilimitadas"
 
-#: src/nse/gnunet-nse-profiler.c:1016
+#: src/nse/gnunet-nse-profiler.c:888
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 "nombre del fichero para escribir información y estadísticas de la conexión"
 
-#: src/nse/gnunet-nse-profiler.c:1019
+#: src/nse/gnunet-nse-profiler.c:891 src/testbed/gnunet-testbed-profiler.c:282
 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:1022
-msgid "IP address of this system as seen by the rest of the testbed"
-msgstr ""
-"Dirección IP de este sistema como visto desde el resto de equipos de prueba"
-
-#: src/nse/gnunet-nse-profiler.c:1025
-msgid "delay between queries to statistics during a round"
-msgstr "retardo entre consultas a las estadísticas durante una ronda"
-
-#: src/nse/gnunet-nse-profiler.c:1028
-msgid "prefix of the filenames we use for writing the topology for each round"
-msgstr ""
-"prefijo de los nombres de fichero usados para escribir la topología de cada "
-"ronda"
-
-#: src/nse/gnunet-nse-profiler.c:1031
+#: src/nse/gnunet-nse-profiler.c:894
 msgid "name of the file for writing the main results"
 msgstr "nombre del fichero en el que escribir los resultados principales"
 
-#: src/nse/gnunet-nse-profiler.c:1034
+#: src/nse/gnunet-nse-profiler.c:897
 msgid "Number of peers to run in each round, separated by commas"
 msgstr "Número de pares a ejecutar en cada ronda, separados por comas"
 
-#: src/nse/gnunet-nse-profiler.c:1040
+#: src/nse/gnunet-nse-profiler.c:903
 msgid "delay between rounds"
 msgstr "retraso entre rondas"
 
-#: src/nse/gnunet-nse-profiler.c:1050
+#: src/nse/gnunet-nse-profiler.c:912
 msgid "Measure quality and performance of the NSE service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/nse/gnunet-service-nse.c:1389
+#: src/nse/gnunet-service-nse.c:1405
 #, c-format
 msgid "NSE service could not access hostkey: %s\n"
 msgstr "El servicio NSE no puede acceder a la clave de máquina: %s\n"
 
-#: src/nse/gnunet-service-nse.c:1403
+#: src/nse/gnunet-service-nse.c:1419
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 "El servicio NSE carece de opciones de configuración de clave.  Saliendo.\n"
 
-#: src/nse/gnunet-service-nse.c:1486
+#: src/nse/gnunet-service-nse.c:1524
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Requisitos de trabajo no válidos para el servicio NSE. Saliendo.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:134
+#: src/peerinfo/gnunet-service-peerinfo.c:215
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Eliminando dirección de transporte «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:230
-#, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:354
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:269
+#: src/peerinfo/gnunet-service-peerinfo.c:369
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s %u \n"
+msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:444
 msgid "# peers known"
 msgstr "# pares conocidos"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:297
+#: src/peerinfo/gnunet-service-peerinfo.c:480
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -4323,12 +4445,22 @@
 "El fichero «%s» en el directorio «%s» no sigue la convención de nombres. "
 "Eliminado.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:419
+#: src/peerinfo/gnunet-service-peerinfo.c:632
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "Escaneando directorio «%s».\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:637
 #, 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:807
+#: src/peerinfo/gnunet-service-peerinfo.c:969
+#, fuzzy, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "Escaneando directorio «%s».\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1249
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr "Importando HELLO de «%s»\n"
@@ -4362,73 +4494,106 @@
 "Petición de transmisión de iteración de expiración al servicio de "
 "información de pares (PEERINFO)."
 
-#: src/peerinfo/peerinfo_api_notify.c:256
+#: src/peerinfo/peerinfo_api_notify.c:269
 #, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "No se pudo conectar al servicio %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:419
+#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#, fuzzy, c-format
+msgid "%sPeer `%s'\n"
+msgstr "Par «%s»\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:427
+#, 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:435
+#, fuzzy, c-format
+msgid "Failure: Received invalid %s\n"
+msgstr "recibido mensaje '%s' no válido: %s.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:444
+#, 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:457
 #, c-format
+msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:521
+#, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fallo añadiendo «HELLO»: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:557
+#: src/peerinfo-tool/gnunet-peerinfo.c:659
 #, c-format
 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"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:563
+#: src/peerinfo-tool/gnunet-peerinfo.c:665
 #, 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:625
+#: src/peerinfo-tool/gnunet-peerinfo.c:727
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par «%s».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/peerinfo-tool/gnunet-peerinfo.c:759
 msgid "don't resolve host names"
 msgstr "no resolver nombres de máquina"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654
+#: src/peerinfo-tool/gnunet-peerinfo.c:762
 msgid "output only the identity strings"
 msgstr "mostrar únicamente las cadenas de identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:657
+#: src/peerinfo-tool/gnunet-peerinfo.c:765
+msgid "include friend-only information"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:768
 msgid "output our own identity only"
 msgstr "muestra únicamente nuestra propia identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:660
+#: src/peerinfo-tool/gnunet-peerinfo.c:771
 msgid "list all known peers"
 msgstr "mostrar todos los pares conocidos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:663
+#: src/peerinfo-tool/gnunet-peerinfo.c:774
+msgid "dump hello to file"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:777
 msgid "also output HELLO uri(s)"
 msgstr "también mostrar las URI de «HELLO»"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:666
+#: src/peerinfo-tool/gnunet-peerinfo.c:780
 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:677
+#: src/peerinfo-tool/gnunet-peerinfo.c:791
 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:118
+#: src/transport/gnunet-service-transport_plugins.c:120
 #, 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:122
+#: src/transport/gnunet-service-transport_plugins.c:124
 #, 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:150
+#: src/transport/gnunet-service-transport_plugins.c:153
 #, 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"
@@ -4502,63 +4667,26 @@
 msgstr ""
 "Demonio a ejecutar para realizar la traducción de protocolo IP a GNUnet"
 
-#: src/regex/gnunet-daemon-regexprofiler.c:376
+#: src/regex/gnunet-daemon-regexprofiler.c:432
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr "Demonio para anunciar expresiones regulares para el par usando mesh."
 
-#: src/regex/gnunet-regex-profiler.c:1373
-#, fuzzy, c-format
-msgid "An operation has failed while starting peers: %s\n"
-msgstr "Una operación ha fallado mientras se iniciaban los pares\n"
+#: src/regex/gnunet-regex-profiler.c:1246
+msgid "No configuration file given. Exiting\n"
+msgstr "No se ha introducido ningún fichero de configuración. Saliendo\n"
 
-#: src/regex/gnunet-regex-profiler.c:1418
-#, c-format
-msgid "Creating a peer failed. Error: %s\n"
-msgstr "No se pudo crear un par. Error: %s\n"
+#: src/regex/gnunet-regex-profiler.c:1257
+#, fuzzy
+msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
+msgstr "Falta una opción de configuración (regex_prefix). Saliendo\n"
 
-#: src/regex/gnunet-regex-profiler.c:1545
-msgid "An operation has failed while starting slaves\n"
-msgstr "Una operación ha fallado mientras se arrancaban los esclavos\n"
-
-#: src/regex/gnunet-regex-profiler.c:1567
-#, c-format
-msgid "No files found in `%s'\n"
-msgstr "No se han encontrado ficheros en «%s»\n"
-
-#: src/regex/gnunet-regex-profiler.c:1622
-msgid "An operation has failed while linking\n"
-msgstr "Una operación ha fallado mientras se enlazaba\n"
-
-#: src/regex/gnunet-regex-profiler.c:1732
-#: src/testbed/testbed_api_testbed.c:799
-#, c-format
-msgid "Host registration failed for a host. Error: %s\n"
-msgstr "El registro de máquinas falló para una máquina. Error: %s\n"
-
-#: src/regex/gnunet-regex-profiler.c:1813
-msgid "Unable to connect to master controller -- Check config\n"
-msgstr ""
-"No se puede conectar al controlador principal -- Compruebe la configuración\n"
-
-#: src/regex/gnunet-regex-profiler.c:1915
-#: src/testbed/testbed_api_testbed.c:964
-#, c-format
-msgid "Host %s cannot start testbed\n"
-msgstr "La máquina %s no puede comenzar la batería de pruebas\n"
-
-#: src/regex/gnunet-regex-profiler.c:1918
-#: src/testbed/testbed_api_testbed.c:968
-msgid "Testbed cannot be started on localhost\n"
-msgstr "La batería de pruebas no se puede iniciar en localhost\n"
-
-#: src/regex/gnunet-regex-profiler.c:1958
-#, c-format
+#: src/regex/gnunet-regex-profiler.c:1276
 msgid "No hosts-file specified on command line. Exiting.\n"
 msgstr ""
 "No se ha especificado el fichero de máquinas en la línea de comandos. "
 "Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1963
+#: src/regex/gnunet-regex-profiler.c:1282
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
@@ -4566,89 +4694,64 @@
 "No se ha especificado una política de directorios en la línea de comandos. "
 "Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1969
-#: src/testbed/testbed_api_testbed.c:1071
-#, c-format
-msgid "No hosts loaded. Need at least one host\n"
-msgstr "No se han cargado máquinas. Se necesita al menos una máquina.\n"
-
-#: src/regex/gnunet-regex-profiler.c:1972
-#, c-format
-msgid "Checking whether given hosts can start testbed. Please wait\n"
-msgstr ""
-"Comprobando si las máquinas dadas pueden iniciar la batería de pruebas. Por "
-"favor, espere\n"
-
-#: src/regex/gnunet-regex-profiler.c:1996
-#, c-format
-msgid "Exiting\n"
-msgstr "Saliendo\n"
-
-#: src/regex/gnunet-regex-profiler.c:2002
-#, c-format
-msgid "No configuration file given. Exiting\n"
-msgstr "No se ha introducido ningún fichero de configuración. Saliendo\n"
-
-#: src/regex/gnunet-regex-profiler.c:2011
-#, c-format
-msgid "Configuration option (regex_prefix) missing. Exiting\n"
-msgstr "Falta una opción de configuración (regex_prefix). Saliendo\n"
-
-#: src/regex/gnunet-regex-profiler.c:2029
+#: src/regex/gnunet-regex-profiler.c:1288
 #: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr "Las políticas de directorio especificadas no existen. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:2036
+#: src/regex/gnunet-regex-profiler.c:1295
 #, c-format
+msgid "No files found in `%s'\n"
+msgstr "No se han encontrado ficheros en «%s»\n"
+
+#: src/regex/gnunet-regex-profiler.c:1304
 msgid "No search strings file given. Exiting.\n"
 msgstr "No se ha proporcionado un fichero de cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:2044
-#, c-format
+#: src/regex/gnunet-regex-profiler.c:1314
+#, fuzzy
 msgid ""
-"Error loading search strings. Given file does not contain enough strings. "
+"Error loading search strings.Given file does not contain enough strings. "
 "Exiting.\n"
 msgstr ""
 "Error cargando cadenas de búsqueda. El fichero proporcionado no contiene "
 "cadenas suficientes. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:2050
-#, c-format
+#: src/regex/gnunet-regex-profiler.c:1322
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Error cargando cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:2077
+#: src/regex/gnunet-regex-profiler.c:1389
 msgid "name of the file for writing statistics"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:2080
-msgid "create COUNT number of random links between peers"
-msgstr "crear un número «COUNT» de enlaces aleatorios entre pares"
-
-#: src/regex/gnunet-regex-profiler.c:2083
+#: src/regex/gnunet-regex-profiler.c:1392
 msgid "wait TIMEOUT before considering a string match as failed"
 msgstr ""
 "esperar «TIMEOUT» antes de considerar que una coincidencia de cadenas como "
 "fallida"
 
-#: src/regex/gnunet-regex-profiler.c:2086
-msgid "wait DELAY before starting string search"
-msgstr "esperar «DELAY» antes de empezar la búsqueda de cadenas"
-
-#: src/regex/gnunet-regex-profiler.c:2089
+#: src/regex/gnunet-regex-profiler.c:1395
 msgid "number of search strings to read from search strings file"
 msgstr ""
 "número de cadenas de búsqueda a leer del fichero de cadenas de búsqueda"
 
-# WTF???
-#: src/regex/gnunet-regex-profiler.c:2092
-#: src/regex/gnunet-regex-simulation-profiler.c:692
-msgid "maximum path compression length"
-msgstr "longitud de la máxima compresión de rutas"
+#: src/regex/gnunet-regex-profiler.c:1398
+msgid "directory with policy files"
+msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:2105
+#: src/regex/gnunet-regex-profiler.c:1401
+#, fuzzy
+msgid "name of file with input strings"
+msgstr "nombre del fichero para escribir las estadísticas"
+
+#: src/regex/gnunet-regex-profiler.c:1404
+#, fuzzy
+msgid "name of file with hosts' names"
+msgstr "nombre del fichero para escribir las estadísticas"
+
+#: src/regex/gnunet-regex-profiler.c:1416
 msgid "Profiler for regex"
 msgstr "Perfilador para expresiones regulares."
 
@@ -4656,6 +4759,11 @@
 msgid "name of the table to write DFAs"
 msgstr "nombre de la tabla para escribir los DFA"
 
+# WTF???
+#: src/regex/gnunet-regex-simulation-profiler.c:692
+msgid "maximum path compression length"
+msgstr "longitud de la máxima compresión de rutas"
+
 #: src/regex/gnunet-regex-simulation-profiler.c:705
 msgid "Profiler for regex library"
 msgstr "Analizador de rendimiento para la biblioteca de expresiones regulares"
@@ -4747,11 +4855,11 @@
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
-#: src/statistics/statistics_api.c:511
+#: src/statistics/statistics_api.c:512
 msgid "Could not save some persistent statistics\n"
 msgstr "No se pudieron guardar algunas estadísticas persistentes\n"
 
-#: src/statistics/statistics_api.c:1056
+#: src/statistics/statistics_api.c:1057
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
@@ -4766,134 +4874,171 @@
 "No se pudo determinar el intervalo de ejecución para «%s», estableciéndolo a "
 "los 60 segundos predeterminados.\n"
 
+#: src/testbed/gnunet-service-testbed_cpustatus.c:670
+#, c-format
+msgid ""
+"Cannot open %s for writing load statistics.  Not logging load statistics\n"
+msgstr ""
+
 #: src/testbed/gnunet_testbed_ll_master.c:57
 #, c-format
 msgid "Job command file not given. Exiting\n"
 msgstr "Fichero de configuración de trabajos no proporcionado. Saliendo\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:235
-#, c-format
-msgid "No hosts-file specified on command line\n"
-msgstr ""
-"No se ha especificado el fichero de máquinas en la línea de comandos.\n"
+#: src/testbed/gnunet_testbed_mpi_spawn.c:135
+#, fuzzy
+msgid "Waiting for child to exit.\n"
+msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:267
+#: src/testbed/gnunet_testbed_mpi_spawn.c:296
+#, fuzzy, c-format
+msgid "Spawning process `%s'\n"
+msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
+
+#: src/testbed/gnunet-testbed-profiler.c:249
+#, 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:275
 msgid "create COUNT number of peers"
 msgstr "crea «COUNT» número de pares"
 
-#: src/testbed/gnunet-testbed-profiler.c:270
+#: src/testbed/gnunet-testbed-profiler.c:278
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr "tolerar un número «COUNT» de continuas expiraciones de plazo"
 
-#: src/testbed/gnunet-testbed-profiler.c:286
-msgid "Profiler for testbed"
-msgstr "Analizador de rendimiento para la batería de pruebas"
-
-#: src/testbed/testbed_api_hosts.c:469
+#: src/testbed/testbed_api_hosts.c:459
 #, c-format
 msgid "Hosts file %s not found\n"
 msgstr "El fichero de máquinas %s no fue encontrado\n"
 
-#: src/testbed/testbed_api_hosts.c:477
+#: src/testbed/testbed_api_hosts.c:467
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr "El archivo de máquinas %s no tiene datos\n"
 
-#: src/testbed/testbed_api_hosts.c:484
+#: src/testbed/testbed_api_hosts.c:474
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr "El archivo de máquinas %s no puede leerse\n"
 
-#: src/testbed/testbed_api_hosts.c:593
+#: src/testbed/testbed_api_hosts.c:583
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1836
+#: src/testbed/testbed_api_hosts.c:1856
 #, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "No se pudo añadir la máquina %u por el error: %s\n"
 
-#: src/testbed/testbed_api_testbed.c:638
+#: src/testbed/testbed_api_testbed.c:771
 msgid "Linking controllers failed. Exiting"
 msgstr "Los controladores de enlazado fallaron. Saliendo"
 
-#: src/testbed/testbed_api_testbed.c:1003
+#: src/testbed/testbed_api_testbed.c:913
+#, c-format
+msgid "Host registration failed for a host. Error: %s\n"
+msgstr "El registro de máquinas falló para una máquina. Error: %s\n"
+
+#: src/testbed/testbed_api_testbed.c:978
+msgid "Controller crash detected. Shutting down.\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1081
+#, c-format
+msgid "Host %s cannot start testbed\n"
+msgstr "La máquina %s no puede comenzar la batería de pruebas\n"
+
+#: src/testbed/testbed_api_testbed.c:1085
+msgid "Testbed cannot be started on localhost\n"
+msgstr "La batería de pruebas no se puede iniciar en localhost\n"
+
+#: src/testbed/testbed_api_testbed.c:1120
 msgid "Cannot start the master controller"
 msgstr "No se puede iniciar el controlador maestro"
 
-#: src/testbed/testbed_api_testbed.c:1059
+#: src/testbed/testbed_api_testbed.c:1138
+msgid "Shutting down testbed due to timeout while setup.\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1197
 #, fuzzy
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr "No se han cargado máquinas. Se necesita al menos una máquina.\n"
 
-#: src/testbed/testbed_api_testbed.c:1095
+#: src/testbed/testbed_api_testbed.c:1209
+msgid "No hosts loaded. Need at least one host\n"
+msgstr "No se han cargado máquinas. Se necesita al menos una máquina.\n"
+
+#: src/testbed/testbed_api_testbed.c:1233
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 "La topología especificada debe estar soportada por la batería de pruebas"
 
-#: src/testbed/testbed_api_topology.c:668
+#: src/testbed/testbed_api_topology.c:670
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr "El fichero de topología %s no fue encontrado\n"
 
-#: src/testbed/testbed_api_topology.c:674
+#: src/testbed/testbed_api_topology.c:676
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr "El fichero de topología %s no tiene datos\n"
 
-#: src/testbed/testbed_api_topology.c:681
+#: src/testbed/testbed_api_topology.c:683
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "El fichero de topología %s no puede ser leido\n"
 
-#: src/testbed/testbed_api_topology.c:704
+#: src/testbed/testbed_api_topology.c:706
 #, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr ""
 "Se produjo un fallo al leer el índice de pares del archivo de topología: %s"
 
-#: src/testbed/testbed_api_topology.c:713
-#: src/testbed/testbed_api_topology.c:737
+#: src/testbed/testbed_api_topology.c:715
+#: src/testbed/testbed_api_topology.c:739
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr "Valor en el fichero de topología dato: %s está fuera de rango\n"
 
-#: src/testbed/testbed_api_topology.c:719
-#: src/testbed/testbed_api_topology.c:743
+#: src/testbed/testbed_api_topology.c:721
+#: src/testbed/testbed_api_topology.c:745
 #, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr ""
 "Se produjo un fallo al leer índice de pares del fichero de topología: %s"
 
-#: src/testbed/testbed_api_topology.c:725
-#: src/testbed/testbed_api_topology.c:749
+#: src/testbed/testbed_api_topology.c:727
+#: src/testbed/testbed_api_topology.c:751
 msgid "Topology file needs more peers than given ones\n"
 msgstr "El fichero de topología necesita más pares que los dados\n"
 
-#: src/testbed/testbed_api_topology.c:764
+#: src/testbed/testbed_api_topology.c:766
 #, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "Ignorando conexión del par %u al par %u\n"
 
-#: src/testing/gnunet-testing.c:132
+#: src/testing/gnunet-testing.c:133
 #, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr ""
 "No se pudo extraer la clave de máquina %u (¿desplazamiento demasiado "
 "grande?)\n"
 
-#: src/testing/gnunet-testing.c:209
+#: src/testing/gnunet-testing.c:210
 msgid "create unique configuration files"
 msgstr "crear ficheros de configuración únicos"
 
-#: src/testing/gnunet-testing.c:211
+#: src/testing/gnunet-testing.c:212
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 "extraer los ficheros de claves de máquinas de una lista pre-computada de "
 "claves de máquinas"
 
-#: src/testing/gnunet-testing.c:213
+#: src/testing/gnunet-testing.c:214
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
@@ -4901,11 +5046,11 @@
 "número de ficheros de configuración únicos o claves de máquina a crear, o el "
 "número de claves de máquina a extraer"
 
-#: src/testing/gnunet-testing.c:215
+#: src/testing/gnunet-testing.c:216
 msgid "configuration template"
 msgstr "plantilla de configuración"
 
-#: src/testing/gnunet-testing.c:224
+#: src/testing/gnunet-testing.c:225
 msgid "Command line tool to access the testing library"
 msgstr ""
 "Herramienta de línea de comandos para acceder a la biblioteca de pruebas"
@@ -4923,27 +5068,27 @@
 msgid "name of the service to run"
 msgstr "nombre del servicio a ejecutar"
 
-#: src/testing/testing.c:217
+#: src/testing/testing.c:288
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr "El fichero de máquinas no fue encontrado: %s\n"
 
-#: src/testing/testing.c:233
+#: src/testing/testing.c:304
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr "El fichero de máquinas no tiene el formato correcto: %s\n"
 
-#: src/testing/testing.c:547
+#: src/testing/testing.c:719
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr "El número de clave %u no existe\n"
 
-#: src/testing/testing.c:558
+#: src/testing/testing.c:730
 #, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Error decodificando clave %u\n"
 
-#: src/testing/testing.c:872
+#: src/testing/testing.c:1175
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr ""
 "Se produjo un fallo al crear la configuración para el par (¿no hay "
@@ -4951,7 +5096,7 @@
 
 # Miguel: "testbed" lo he traducido como batería de pruebas, pero
 # no es una traducción muy literal.
-#: src/testing/testing.c:883
+#: src/testing/testing.c:1182
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
@@ -4960,31 +5105,36 @@
 "Se ha intentado crear una batería de pruebas con más de %u máquinas.  Por "
 "favor, pre-compute más claves de máquinas primero.\n"
 
-#: src/testing/testing.c:897
+#: src/testing/testing.c:1191
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 "Se produjo un fallo al inicializar la clave de la máquina desde el par %u\n"
 
-#: src/testing/testing.c:931
+#: src/testing/testing.c:1211
+#, fuzzy, c-format
+msgid "Cannot open hostkey file: %s\n"
+msgstr "No se pudo abrir el fichero de claves de máquina: %s\n"
+
+#: src/testing/testing.c:1221
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 "Se produjo un fallo al escribir la clave de la máquina para el par %u: %s\n"
 
-#: src/testing/testing.c:949
+#: src/testing/testing.c:1243
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
 "Se produjo un fallo al escribir el fichero de configuración «%s» para el par "
 "%u: %s\n"
 
-#: src/testing/testing.c:1029
+#: src/testing/testing.c:1343
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Se produjo un fallo al arrancar «%s»: %s\n"
 
-#: src/testing/testing.c:1235
+#: src/testing/testing.c:1691
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
@@ -4997,40 +5147,40 @@
 msgid "# connect requests issued to transport"
 msgstr "# peticiones de conexión requeridas al servicio de transporte"
 
-#: src/topology/gnunet-daemon-topology.c:725
-#: src/topology/gnunet-daemon-topology.c:810
+#: src/topology/gnunet-daemon-topology.c:721
+#: src/topology/gnunet-daemon-topology.c:806
 msgid "# friends connected"
 msgstr "# amigos conectados"
 
-#: src/topology/gnunet-daemon-topology.c:991
+#: src/topology/gnunet-daemon-topology.c:987
 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:1034
+#: src/topology/gnunet-daemon-topology.c:1030
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "No se pudo leer la lista de amigos «%s»\n"
 
-#: src/topology/gnunet-daemon-topology.c:1040
+#: src/topology/gnunet-daemon-topology.c:1036
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr "El archivo de amigos «%s» está vacío.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:1045
 #, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr ""
 "Se produjo un fallo al leer la lista de amigos de «%s»: no hay memoria "
 "disponible\n"
 
-#: src/topology/gnunet-daemon-topology.c:1057
+#: src/topology/gnunet-daemon-topology.c:1053
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/topology/gnunet-daemon-topology.c:1077
+#: src/topology/gnunet-daemon-topology.c:1073
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
@@ -5038,7 +5188,7 @@
 "Error de sintaxis en la especificación de topología en el desplazamiento "
 "%llu, omitiendo bytes.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1090
+#: src/topology/gnunet-daemon-topology.c:1086
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
@@ -5046,21 +5196,21 @@
 "Error de sintaxis en la especificación de topología en el desplazamiento "
 "%llu, omitiendo bytes «%s».\n"
 
-#: src/topology/gnunet-daemon-topology.c:1100
+#: src/topology/gnunet-daemon-topology.c:1096
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr "Encontrado amigo «%s» en la configuración\n"
 
-#: src/topology/gnunet-daemon-topology.c:1106
+#: src/topology/gnunet-daemon-topology.c:1102
 #, 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:1116
+#: src/topology/gnunet-daemon-topology.c:1112
 msgid "# friends in configuration"
 msgstr "# amigos en configuración"
 
-#: src/topology/gnunet-daemon-topology.c:1122
+#: src/topology/gnunet-daemon-topology.c:1118
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
@@ -5068,91 +5218,63 @@
 "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:1129
+#: src/topology/gnunet-daemon-topology.c:1125
 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:1164
+#: src/topology/gnunet-daemon-topology.c:1156
 msgid "# HELLO messages received"
 msgstr "# mensajes «HELLO» recibidos"
 
 # gossiped??
-#: src/topology/gnunet-daemon-topology.c:1219
+#: src/topology/gnunet-daemon-topology.c:1211
 msgid "# HELLO messages gossipped"
 msgstr "# Mensajes «HELLO» rumoreados"
 
-#: src/topology/gnunet-daemon-topology.c:1358
+#: src/topology/gnunet-daemon-topology.c:1350
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 "Control de topología de GNUnet (manteniendo las restricciones del mesh de "
 "P2P y de F2F)"
 
-#: src/transport/gnunet-service-transport_blacklist.c:246
-#, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "No se pudo leer el fichero de la lista negra «%s»\n"
+#: src/transport/gnunet-service-transport_blacklist.c:267
+#, fuzzy, c-format
+msgid "Adding blacklisting entry for peer `%s'\n"
+msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:263
+#: src/transport/gnunet-service-transport_blacklist.c:275
 #, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "Se produjo un fallo al leer la lista negra de «%s»\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:284
-#: src/transport/gnunet-service-transport_blacklist.c:308
-#, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
-"¡Error de sintaxis en el fichero de la lista negra en el desplazamiento "
-"%llu, rindiendose!\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:295
-#: src/transport/gnunet-service-transport_blacklist.c:331
-#, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
-msgstr ""
-"Error de sintaxis en el fichero de la lista negra en el desplazamiento %llu, "
-"omitiendo bytes.\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:345
-#, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-msgstr ""
-"Error de sintaxis en el fichero de la lista negra en el desplazamiento %llu, "
-"omitiendo bytes «%s».\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:359
-#, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
-msgstr "Me he encontrado «%s» en mi lista negra (inútil, ignorado)\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:514
-#: src/transport/gnunet-service-transport_blacklist.c:752
+#: src/transport/gnunet-service-transport_blacklist.c:453
+#: src/transport/gnunet-service-transport_blacklist.c:718
 msgid "# disconnects due to blacklist"
 msgstr "# desconexiones debido a la lista negra"
 
-#: src/transport/gnunet-service-transport.c:183
+#: src/transport/gnunet-service-transport.c:174
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# bytes de «payload» descartados debido a par no conectado"
 
-#: src/transport/gnunet-service-transport.c:258
+#: src/transport/gnunet-service-transport.c:239
 msgid "# bytes total received"
 msgstr "# total de bytes recibidos"
 
-#: src/transport/gnunet-service-transport.c:305
+#: src/transport/gnunet-service-transport.c:286
 msgid "# bytes payload received"
 msgstr "# bytes de «payload» recibidos"
 
-#: src/transport/gnunet-service-transport.c:613
+#: src/transport/gnunet-service-transport.c:642
 #, c-format
 msgid "Transport service could not access hostkey: %s. Exiting.\n"
 msgstr ""
 "El servicio de transporte no puede acceder a la clave de la máquina: %s. "
 "Saliendo.\n"
 
-#: src/transport/gnunet-service-transport.c:708
+#: src/transport/gnunet-service-transport.c:741
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 "El servicio de transporte carece de opciones de configuración de clave.  "
@@ -5168,123 +5290,123 @@
 msgid "# messages dropped due to slow client"
 msgstr "# mensajes omitidos debido a un cliente lento"
 
-#: src/transport/gnunet-service-transport_clients.c:546
+#: src/transport/gnunet-service-transport_clients.c:536
 #, 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:687
+#: src/transport/gnunet-service-transport_clients.c:677
 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:738
+#: src/transport/gnunet-service-transport_clients.c:728
 msgid "# REQUEST CONNECT messages received"
 msgstr "# mensajes «REQUEST CONNECT» recibidos"
 
-#: src/transport/gnunet-service-transport_hello.c:175
+#: src/transport/gnunet-service-transport_hello.c:179
 msgid "# refreshed my HELLO"
 msgstr "# refrescos de mi «HELLO»"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1227
+#: src/transport/gnunet-service-transport_neighbours.c:1216
 msgid "# DISCONNECT messages sent"
 msgstr "# Mensajes «DISCONNECT» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1357
-#: src/transport/gnunet-service-transport_neighbours.c:1694
+#: src/transport/gnunet-service-transport_neighbours.c:1346
+#: src/transport/gnunet-service-transport_neighbours.c:1678
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes en la cola de mensajes para otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1362
+#: src/transport/gnunet-service-transport_neighbours.c:1351
 msgid "# messages transmitted to other peers"
 msgstr "# mensajes transmitidos a otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1367
+#: src/transport/gnunet-service-transport_neighbours.c:1356
 msgid "# transmission failures for messages to other peers"
 msgstr "# fallos de transmisión en mensajes a otros pares"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1424
+#: src/transport/gnunet-service-transport_neighbours.c:1413
 msgid "# messages timed out while in transport queue"
 msgstr "# mensajes expirados mientras estaban en la cola de transporte"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1466
+#: src/transport/gnunet-service-transport_neighbours.c:1455
 msgid "# keepalives sent"
 msgstr "# «keepalives» enviados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1490
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# Mensajes «KEEPALIVE» descartados (par desconocido)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1498
+#: src/transport/gnunet-service-transport_neighbours.c:1487
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes «KEEPALIVE» descartados (no hay sesión)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1535
+#: src/transport/gnunet-service-transport_neighbours.c:1520
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# mensajes «KEEPALIVE_RESPONSE» descartados (no conectado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1544
+#: src/transport/gnunet-service-transport_neighbours.c:1529
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# Mensajes «KEEPALIVE_RESPONSE» descartados (no esperado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1600
+#: src/transport/gnunet-service-transport_neighbours.c:1584
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# mensajes descartados debido a la falta de registro vecinal"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1634
+#: src/transport/gnunet-service-transport_neighbours.c:1618
 msgid "# bandwidth quota violations by other peers"
 msgstr "# violaciones de la cuota de ancho de banda por otros pares"
 
 # throttling?
-#: src/transport/gnunet-service-transport_neighbours.c:1650
+#: src/transport/gnunet-service-transport_neighbours.c:1634
 msgid "# ms throttling suggested"
 msgstr "# ms de impulso sugeridos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2802
+#: src/transport/gnunet-service-transport_neighbours.c:2770
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2817
-#: src/transport/gnunet-service-transport_neighbours.c:2851
+#: src/transport/gnunet-service-transport_neighbours.c:2785
+#: src/transport/gnunet-service-transport_neighbours.c:2819
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2864
+#: src/transport/gnunet-service-transport_neighbours.c:2832
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (esperando en el ATS)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2897
+#: src/transport/gnunet-service-transport_neighbours.c:2865
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3082
+#: src/transport/gnunet-service-transport_neighbours.c:3046
 msgid "# unexpected SESSION ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3137
+#: src/transport/gnunet-service-transport_neighbours.c:3101
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr "# Mensajes «SET QUOTA» ignorados (no existe tal par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3151
+#: src/transport/gnunet-service-transport_neighbours.c:3115
 msgid "# disconnects due to quota of 0"
 msgstr "# desconexiones debido a una cuota de 0"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3182
+#: src/transport/gnunet-service-transport_neighbours.c:3146
 msgid "# disconnect messages ignored (old format)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3193
+#: src/transport/gnunet-service-transport_neighbours.c:3157
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3224
+#: src/transport/gnunet-service-transport_neighbours.c:3188
 msgid "# other peer asked to disconnect from us"
 msgstr "# peticiones de otro par para desconectarse de nosotros"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3319
+#: src/transport/gnunet-service-transport_neighbours.c:3283
 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:111
+#: src/transport/gnunet-service-transport_plugins.c:113
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr "El servicio de transporte carece de la opción «NEIGHBOUR_LIMIT».\n"
 
@@ -5334,7 +5456,7 @@
 msgid "# PONGs dropped, signature expired"
 msgstr "# Mensajes PONG omitidos, firma expirada"
 
-#: src/transport/gnunet-service-transport_validation.c:1302
+#: src/transport/gnunet-service-transport_validation.c:1305
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
@@ -5381,12 +5503,12 @@
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Transmitiendo %u bytes a %s\n"
 
-#: src/transport/gnunet-transport.c:531
+#: src/transport/gnunet-transport.c:528
 #, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Conectado satisfactoriamente a «%s»\n"
 
-#: src/transport/gnunet-transport.c:553
+#: src/transport/gnunet-transport.c:550
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
@@ -5395,38 +5517,38 @@
 "Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
 "bloques de %u Kb\n"
 
-#: src/transport/gnunet-transport.c:588
+#: src/transport/gnunet-transport.c:585
 #, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "Desconectado del par «%s» mientras probaba\n"
 
-#: src/transport/gnunet-transport.c:664
+#: src/transport/gnunet-transport.c:655
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Recibidos %u bytes de %s\n"
 
-#: src/transport/gnunet-transport.c:687
+#: src/transport/gnunet-transport.c:678
 #, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Par «%s»: %s %s\n"
 
-#: src/transport/gnunet-transport.c:702
+#: src/transport/gnunet-transport.c:693
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr "Par «%s»: %s <no se puede resolver la dirección>\n"
 
-#: src/transport/gnunet-transport.c:766
+#: src/transport/gnunet-transport.c:757
 #, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "Par «%s» desconectado\n"
 
-#: src/transport/gnunet-transport.c:794
+#: src/transport/gnunet-transport.c:785
 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:828
+#: src/transport/gnunet-transport.c:819
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -5435,7 +5557,7 @@
 "Múltiples operaciones introducidas. Por favor, seleccione únicamente una "
 "operación: %s, %s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:825
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
@@ -5443,101 +5565,101 @@
 "Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
 "%s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:854 src/transport/gnunet-transport.c:884
-#: src/transport/gnunet-transport.c:906 src/transport/gnunet-transport.c:945
+#: src/transport/gnunet-transport.c:845 src/transport/gnunet-transport.c:875
+#: src/transport/gnunet-transport.c:897 src/transport/gnunet-transport.c:936
 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:861 src/transport/gnunet-transport.c:891
+#: src/transport/gnunet-transport.c:852 src/transport/gnunet-transport.c:882
 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:911
+#: src/transport/gnunet-transport.c:902
 msgid "Starting to receive benchmark data\n"
 msgstr "Empezando a recibir datos de prueba\n"
 
-#: src/transport/gnunet-transport.c:996
+#: src/transport/gnunet-transport.c:987
 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:999
+#: src/transport/gnunet-transport.c:990
 msgid "connect to a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:993
 msgid "provide information about all current connections (once)"
 msgstr "provee información sobre todas las conexiones actuales (una vez)"
 
-#: src/transport/gnunet-transport.c:1008
+#: src/transport/gnunet-transport.c:999
 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:1011
+#: src/transport/gnunet-transport.c:1002
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
-#: src/transport/gnunet-transport.c:1014
+#: src/transport/gnunet-transport.c:1005
 msgid "peer identity"
 msgstr "identidad del par"
 
-#: src/transport/gnunet-transport.c:1018
+#: src/transport/gnunet-transport.c:1009
 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:1021
+#: src/transport/gnunet-transport.c:1012
 msgid "test transport configuration (involves external server)"
 msgstr "probar configuración de transporte (requiere un servidor externo)"
 
-#: src/transport/gnunet-transport.c:1032
+#: src/transport/gnunet-transport.c:1023
 msgid "Direct access to transport service."
 msgstr "Acceso directo al servicio de transporte."
 
-#: src/transport/plugin_transport_http.c:817
-#: src/transport/plugin_transport_http_server.c:2556
+#: src/transport/plugin_transport_http.c:815
+#: src/transport/plugin_transport_http_server.c:2566
 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.c:866
-#: src/transport/plugin_transport_http_server.c:2324
+#: src/transport/plugin_transport_http.c:864
+#: src/transport/plugin_transport_http_server.c:2334
 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.c:898
-#: src/transport/plugin_transport_http_server.c:2356 src/util/service.c:1053
+#: src/transport/plugin_transport_http.c:896
+#: src/transport/plugin_transport_http_server.c:2366 src/util/service.c:1053
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 
-#: src/transport/plugin_transport_http.c:915
-#: src/transport/plugin_transport_http_server.c:2373 src/util/service.c:1070
+#: src/transport/plugin_transport_http.c:913
+#: src/transport/plugin_transport_http_server.c:2383 src/util/service.c:1070
 #, 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.c:1020
-#: src/transport/plugin_transport_http_server.c:2484
+#: src/transport/plugin_transport_http.c:1018
+#: src/transport/plugin_transport_http_server.c:2494
 #, 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.c:1133
-#: src/transport/plugin_transport_http_server.c:2652
+#: src/transport/plugin_transport_http.c:1131
+#: src/transport/plugin_transport_http_server.c:2673
 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.c:1146
-#: src/transport/plugin_transport_http_server.c:2663
+#: src/transport/plugin_transport_http.c:1144
+#: src/transport/plugin_transport_http_server.c:2684
 msgid "Port is required! Fix in configuration\n"
 msgstr "¡El puerto es necesario! Corrija la configuración\n"
 
-#: src/transport/plugin_transport_http.c:1157
+#: src/transport/plugin_transport_http.c:1155
 msgid "Port 0, client only mode\n"
 msgstr "Puerto 0, modo únicamente cliente\n"
 
-#: src/transport/plugin_transport_http.c:1177
+#: src/transport/plugin_transport_http.c:1175
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
@@ -5546,7 +5668,7 @@
 "¡La dirección IPV4 «%s» especificada para el módulo %s en el fichero de "
 "configuración no es válida! ¡Asociándose a todas las direcciones!\n"
 
-#: src/transport/plugin_transport_http.c:1206
+#: src/transport/plugin_transport_http.c:1204
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
@@ -5555,42 +5677,42 @@
 "¡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"
 
-#: src/transport/plugin_transport_http.c:1223
-#: src/transport/plugin_transport_http_server.c:2745
+#: src/transport/plugin_transport_http.c:1221
+#: src/transport/plugin_transport_http_server.c:2774
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Usando nombre de máquina externo «%s»\n"
 
-#: src/transport/plugin_transport_http.c:1228
+#: src/transport/plugin_transport_http.c:1226
 msgid "No external hostname configured\n"
 msgstr "No hay nombre de máquina externo configurado\n"
 
-#: src/transport/plugin_transport_http_client.c:1531
+#: src/transport/plugin_transport_http_client.c:1535
 #, 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:1662
-#: src/transport/plugin_transport_http_server.c:2869
+#: src/transport/plugin_transport_http_client.c:1666
+#: src/transport/plugin_transport_http_server.c:2898
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
-#: src/transport/plugin_transport_http_client.c:1687
-#: src/transport/plugin_transport_http_server.c:2928
+#: src/transport/plugin_transport_http_client.c:1691
+#: src/transport/plugin_transport_http_server.c:2957
 #, 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:1715
-#: src/transport/plugin_transport_http_server.c:2775
+#: src/transport/plugin_transport_http_client.c:1719
+#: src/transport/plugin_transport_http_server.c:2804
 #, 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:1342
+#: src/transport/plugin_transport_http_server.c:1352
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -5599,12 +5721,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:1603
+#: src/transport/plugin_transport_http_server.c:1613
 #, 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:1611
+#: src/transport/plugin_transport_http_server.c:1621
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
@@ -5612,7 +5734,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:1912
+#: src/transport/plugin_transport_http_server.c:1922
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
@@ -5620,52 +5742,52 @@
 "¡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:1936
+#: src/transport/plugin_transport_http_server.c:1946
 msgid "No usable TLS certificate found and creating one 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:2631
+#: src/transport/plugin_transport_http_server.c:2652
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "El soporte IPv4 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2645
+#: src/transport/plugin_transport_http_server.c:2666
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "El soporte IPv6 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2670
+#: src/transport/plugin_transport_http_server.c:2691
 #, c-format
 msgid "Using port %u\n"
 msgstr "Usando puerto %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2685
+#: src/transport/plugin_transport_http_server.c:2706
 #, 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:2695
+#: src/transport/plugin_transport_http_server.c:2716
 #, 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:2716
+#: src/transport/plugin_transport_http_server.c:2737
 #, 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:2726
+#: src/transport/plugin_transport_http_server.c:2747
 #, 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:2761
+#: src/transport/plugin_transport_http_server.c:2790
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Notificando al transporte sólo el nombre de máquina «%s»\n"
@@ -5732,7 +5854,7 @@
 #: src/transport/plugin_transport_tcp.c:778
 #: src/transport/plugin_transport_tcp.c:967
 #: src/transport/plugin_transport_tcp.c:1826
-#: src/transport/plugin_transport_tcp.c:2462
+#: src/transport/plugin_transport_tcp.c:2456
 msgid "# TCP sessions active"
 msgstr "# Sesiones TCP activas"
 
@@ -5766,15 +5888,15 @@
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
 
-#: src/transport/plugin_transport_tcp.c:2046
+#: src/transport/plugin_transport_tcp.c:2036
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:2124
+#: src/transport/plugin_transport_tcp.c:2118
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
-#: src/transport/plugin_transport_tcp.c:2350 src/util/service.c:948
+#: src/transport/plugin_transport_tcp.c:2344 src/util/service.c:948
 #: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
@@ -5782,40 +5904,45 @@
 "¡Se requiere un número de puerto válido para el servicio «%s» en la "
 "configuración!\n"
 
-#: src/transport/plugin_transport_tcp.c:2364
+#: src/transport/plugin_transport_tcp.c:2358
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
 
-#: src/transport/plugin_transport_tcp.c:2450
+#: src/transport/plugin_transport_tcp.c:2444
 #, 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:2454
+#: src/transport/plugin_transport_tcp.c:2448
 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:2458
+#: src/transport/plugin_transport_tcp.c:2452
 #, 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"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:128
+#: src/transport/plugin_transport_udp_broadcasting.c:134
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:169
+#: src/transport/plugin_transport_udp_broadcasting.c:184
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# beacons HELLO broadcast IPv4 recibidos vía UDP"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:394
+#: src/transport/plugin_transport_udp_broadcasting.c:403
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:420
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 "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:2517
+#: src/transport/plugin_transport_udp.c:2520
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
@@ -5824,7 +5951,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:2531
+#: src/transport/plugin_transport_udp.c:2534
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5835,21 +5962,21 @@
 "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:2772
+#: src/transport/plugin_transport_udp.c:2775
 msgid "Failed to open UDP sockets\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:2848
+#: src/transport/plugin_transport_udp.c:2851
 #, 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:2891
+#: src/transport/plugin_transport_udp.c:2894
 #, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Dirección IPv6 no válida: «%s»\n"
 
-#: src/transport/plugin_transport_unix.c:1355
+#: src/transport/plugin_transport_unix.c:1353
 msgid "Failed to open UNIX sockets\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UNIX\n"
 
@@ -5863,7 +5990,7 @@
 
 #: src/transport/plugin_transport_wlan.c:645
 #: src/transport/plugin_transport_wlan.c:695
-#: src/transport/plugin_transport_wlan.c:1758
+#: src/transport/plugin_transport_wlan.c:1764
 msgid "# WLAN sessions allocated"
 msgstr "# sesiones WLAN alojadas"
 
@@ -5877,55 +6004,55 @@
 
 #: src/transport/plugin_transport_wlan.c:902
 #: src/transport/plugin_transport_wlan.c:987
-#: src/transport/plugin_transport_wlan.c:1760
+#: src/transport/plugin_transport_wlan.c:1766
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# MAC de destino WLAN alojadas"
 
-#: src/transport/plugin_transport_wlan.c:1169
+#: src/transport/plugin_transport_wlan.c:1166
 msgid "# HELLO messages received via WLAN"
 msgstr "# mensajes HELLO recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1190
+#: src/transport/plugin_transport_wlan.c:1192
 msgid "# fragments received via WLAN"
 msgstr "# fragmentos recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1200
+#: src/transport/plugin_transport_wlan.c:1202
 msgid "# ACKs received via WLAN"
 msgstr "# ACK recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1257
+#: src/transport/plugin_transport_wlan.c:1259
 msgid "# WLAN 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:1358
+#: src/transport/plugin_transport_wlan.c:1364
 msgid "# DATA messages received via WLAN"
 msgstr "# mensajes «DATA» recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1393
+#: src/transport/plugin_transport_wlan.c:1399
 msgid "# WLAN DATA messages processed"
 msgstr "# mensajes «DATA» WLAN procesados"
 
-#: src/transport/plugin_transport_wlan.c:1454
+#: src/transport/plugin_transport_wlan.c:1460
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# «beacons HELLO» enviados vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1563
+#: src/transport/plugin_transport_wlan.c:1569
 msgid "WLAN address with invalid size encountered\n"
 msgstr "Dirección WLAN con tamaño no válido encontrada\n"
 
-#: src/transport/plugin_transport_wlan.c:1739
+#: src/transport/plugin_transport_wlan.c:1745
 #, 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:659
+#: src/transport/transport_api.c:651
 #, 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:586
+#: src/transport/transport-testing.c:585
 msgid "Failed to initialize testing library!\n"
 msgstr "¡Se produjo un fallo al inicializar la biblioteca de pruebas!\n"
 
@@ -5997,7 +6124,7 @@
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Se produjo un fallo al transmitir la petición al servicio «%s»\n"
 
-#: src/util/client.c:1177
+#: src/util/client.c:1178
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 "No se pudo enviar correctamente la petición, no se espera recibir una "
@@ -6043,16 +6170,16 @@
 msgid "unknown address"
 msgstr "dirección desconocida"
 
-#: src/util/common_logging.c:1214
+#: src/util/common_logging.c:1215
 msgid "invalid address"
 msgstr "dirección no válida"
 
-#: src/util/common_logging.c:1232
+#: src/util/common_logging.c:1233
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "¡La configuración no especifica la opción «%s» en la sección «%s»!\n"
 
-#: src/util/common_logging.c:1253
+#: src/util/common_logging.c:1254
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -6111,7 +6238,7 @@
 "El tamaño del fichero en disco es incorrecto para este «Bloom "
 "filter» (esperado %llu, tiene %llu)\n"
 
-#: src/util/crypto_ecc.c:447
+#: src/util/crypto_ecc.c:444
 #, c-format
 msgid ""
 "File `%s' does not contain a valid private key (too long, %llu bytes).  "
@@ -6120,7 +6247,7 @@
 "El fichero «%s» no contiene una clave privada válida (demasiado grande, %llu "
 "bytes).  Borrándolo.\n"
 
-#: src/util/crypto_ecc.c:462 src/util/crypto_rsa.c:676
+#: src/util/crypto_ecc.c:459 src/util/crypto_rsa.c:676
 #, c-format
 msgid ""
 "File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
@@ -6129,24 +6256,24 @@
 "El fichero «%s» no contiene una clave privada válida (falló al decodificar, "
 "%llu bytes).  Borrándolo.\n"
 
-#: src/util/crypto_ecc.c:558 src/util/crypto_ecc.c:602
+#: src/util/crypto_ecc.c:555 src/util/crypto_ecc.c:599
 #: src/util/crypto_rsa.c:750 src/util/crypto_rsa.c:887
 #, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "No se pudo bloquear el fichero «%s»: %s...\n"
 
-#: src/util/crypto_ecc.c:563 src/util/crypto_rsa.c:892
+#: src/util/crypto_ecc.c:560 src/util/crypto_rsa.c:892
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Generando una clave privada nueva.  Esto puede tomar un tiempo.\n"
 
-#: src/util/crypto_ecc.c:606 src/util/crypto_rsa.c:754
+#: src/util/crypto_ecc.c:603 src/util/crypto_rsa.c:754
 #: src/util/crypto_rsa.c:790
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 "Esto puede estar bien si alguien está actualmente generando una clave "
 "privada.\n"
 
-#: src/util/crypto_ecc.c:637 src/util/crypto_rsa.c:785
+#: src/util/crypto_ecc.c:634 src/util/crypto_rsa.c:785
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
@@ -6154,39 +6281,30 @@
 "Cuando se intentaba leer el fichero de claves «%s» se encontraron %u bytes "
 "pero al menos %u son necesarios.\n"
 
-#: src/util/crypto_ecc.c:642
+#: src/util/crypto_ecc.c:639
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 "Esto puede ser correcto si alguien está actualmente generando una clave de "
 "máquina.\n"
 
-#: src/util/crypto_ecc.c:657 src/util/crypto_rsa.c:805
+#: src/util/crypto_ecc.c:654 src/util/crypto_rsa.c:805
 #, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "El fichero «%s» no contiene una clave privada válida.  Borrándolo.\n"
 
-#: src/util/crypto_ecc.c:779 src/util/crypto_rsa.c:982
+#: src/util/crypto_ecc.c:776 src/util/crypto_rsa.c:982
 msgid "interrupted by shutdown"
 msgstr "interrumpido por apagado"
 
-#: src/util/crypto_ecc.c:790
+#: src/util/crypto_ecc.c:787
 msgid "gnunet-ecc failed"
 msgstr "«gnunet-ecc» falló"
 
-#: src/util/crypto_ecc.c:978
+#: src/util/crypto_ecc.c:1045
 #, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
-msgstr "El firmado ECC falló en %s:%d: %s\n"
-
-#: src/util/crypto_ecc.c:1046
-#, c-format
 msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de firma ECC falló en %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:1130
-msgid "To be implemented: not secure at the moment, please read README\n"
-msgstr ""
-
 #: src/util/crypto_random.c:281
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
@@ -6220,17 +6338,17 @@
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "«%s» falló para la unidad «%S»: %u\n"
 
-#: src/util/disk.c:1206
+#: src/util/disk.c:1207
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
 
-#: src/util/disk.c:1560 src/util/service.c:1670
+#: src/util/disk.c:1564 src/util/service.c:1670
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n"
 
-#: src/util/disk.c:1999
+#: src/util/disk.c:2007
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "Ningún «%s» especificado para el servicio «%s» en la configuración.\n"
@@ -6303,12 +6421,12 @@
 "Los parámetros obligatorios para las opciones largas también lo son para sus "
 "versiones cortas.\n"
 
-#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:316
+#: src/util/getopt_helpers.c:270 src/util/getopt_helpers.c:328
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Tienes que introducir un número en la opción «%s».\n"
 
-#: src/util/getopt_helpers.c:288
+#: src/util/getopt_helpers.c:300
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
@@ -6479,7 +6597,7 @@
 "¡Error lógico interno fatal, el proceso está colgado en «%s» (abortar con "
 "CTRL-C)!\n"
 
-#: src/util/os_installation.c:420
+#: src/util/os_installation.c:423
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
@@ -6488,11 +6606,21 @@
 "No se pudo determinar la ruta de instalación de %s.  Establezca la variable "
 "de entorno «%s».\n"
 
-#: src/util/os_installation.c:702
+#: src/util/os_installation.c:709
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "¡No se pudo encontrar el programa llamado «%s» en PATH!\n"
 
+#: src/util/os_installation.c:767
+#, fuzzy, c-format
+msgid "CreateProcess failed for binary %s (%d).\n"
+msgstr "«%s» falló para el puerto %d (%s).\n"
+
+#: src/util/os_installation.c:777
+#, c-format
+msgid "GetExitCodeProcess failed for binary %s (%d).\n"
+msgstr ""
+
 #: src/util/plugin.c:89
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -6517,17 +6645,6 @@
 msgid "Could not access configuration file `%s'\n"
 msgstr "No se pudo acceder al fichero de configuración «%s»\n"
 
-#: src/util/pseudonym.c:329 src/util/pseudonym.c:632
-#, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr ""
-"Se produjo un fallo al procesar los metadatos del fichero «%s» acerca del "
-"seudónimo: %s\n"
-
-#: src/util/pseudonym.c:464 src/util/pseudonym.c:490 src/util/pseudonym.c:628
-msgid "no-name"
-msgstr "sin nombre"
-
 #: src/util/resolver_api.c:202
 #, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
@@ -6566,22 +6683,22 @@
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr "¡Intento de cancelar la tarea muerta %llu!\n"
 
-#: src/util/server.c:426
+#: src/util/server.c:436
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "«%s» falló para el puerto %d (%s).\n"
 
-#: src/util/server.c:435
+#: src/util/server.c:445
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "«%s» falló para el puerto %d (%s): dirección en uso actualmente\n"
 
-#: src/util/server.c:446
+#: src/util/server.c:456
 #, c-format
 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:830
+#: src/util/server.c:848
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -6775,27 +6892,27 @@
 msgid "end of time"
 msgstr "fin del plazo"
 
-#: src/util/strings.c:1086
+#: src/util/strings.c:1098
 msgid "IPv6 address did not start with `['\n"
 msgstr "La dirección IPv6 no empezaba con «[»\n"
 
-#: src/util/strings.c:1094
+#: src/util/strings.c:1106
 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:1100
+#: src/util/strings.c:1112
 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:1107
+#: src/util/strings.c:1119
 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:1116
+#: src/util/strings.c:1128
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Dirección IPv6 «%s» no válida: %s\n"
@@ -6964,22 +7081,141 @@
 msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
 
-#: src/include/gnunet_common.h:579 src/include/gnunet_common.h:584
-#: src/include/gnunet_common.h:590
+#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
+#: src/include/gnunet_common.h:591
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Aserción fallida en %s:%d.\n"
 
-#: src/include/gnunet_common.h:600
+#: src/include/gnunet_common.h:601
 #, 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:621 src/include/gnunet_common.h:628
+#: src/include/gnunet_common.h:622 src/include/gnunet_common.h:629
 #, 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"
 
+# 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"
+
+# Miguel: ¿Quizá fuese mejor «Se ha parado el servicio x»?
+# Esto también es aplicable a las siguientes traducciones.
+#~ msgid "Service `%s' has been stopped.\n"
+#~ msgstr "El servicio «%s» se ha parado.\n"
+
+#~ msgid "Service `%s' was already running.\n"
+#~ msgstr "El servicio «%s» aún estaba ejecutándose.\n"
+
+#~ msgid "Service `%s' has been started.\n"
+#~ msgstr "El servicio «%s» se ha iniciado.\n"
+
+#~ msgid "Service `%s' was already being stopped.\n"
+#~ msgstr "El servicio «%s» estaba siendo parado con anterioridad.\n"
+
+#~ msgid "Service `%s' was already not running.\n"
+#~ msgstr "El servicio «%s» no se estaba ejecutando.\n"
+
+# Miguel: ¿Conectar y conexión?
+#~ msgid "Error communicating with ARM service.\n"
+#~ msgstr "Error al comunicar con el servicio ARM.\n"
+
+#~ msgid "Timeout communicating with ARM service.\n"
+#~ msgstr "Fin del tiempo de espera en la comunicación con el servicio ARM.\n"
+
+#~ msgid "Operation failed.\n"
+#~ msgstr "La operación ha fallado.\n"
+
+#~ msgid "Error in communication with PEERINFO service\n"
+#~ msgstr ""
+#~ "Error en la comunicación con el servicio de información de pares "
+#~ "(PEERINFO)\n"
+
+#~ msgid "%s Received message from %s of type %d, distance %u!\n"
+#~ msgstr "%s Recibido mensaje de %s del tipo %d, distancia %u!\n"
+
+#~ msgid "IP address of this system as seen by the rest of the testbed"
+#~ msgstr ""
+#~ "Dirección IP de este sistema como visto desde el resto de equipos de "
+#~ "prueba"
+
+#~ msgid "delay between queries to statistics during a round"
+#~ msgstr "retardo entre consultas a las estadísticas durante una ronda"
+
+#~ msgid ""
+#~ "prefix of the filenames we use for writing the topology for each round"
+#~ msgstr ""
+#~ "prefijo de los nombres de fichero usados para escribir la topología de "
+#~ "cada ronda"
+
+#, fuzzy
+#~ msgid "An operation has failed while starting peers: %s\n"
+#~ msgstr "Una operación ha fallado mientras se iniciaban los pares\n"
+
+#~ msgid "Creating a peer failed. Error: %s\n"
+#~ msgstr "No se pudo crear un par. Error: %s\n"
+
+#~ msgid "An operation has failed while starting slaves\n"
+#~ msgstr "Una operación ha fallado mientras se arrancaban los esclavos\n"
+
+#~ msgid "An operation has failed while linking\n"
+#~ msgstr "Una operación ha fallado mientras se enlazaba\n"
+
+#~ msgid "Unable to connect to master controller -- Check config\n"
+#~ msgstr ""
+#~ "No se puede conectar al controlador principal -- Compruebe la "
+#~ "configuración\n"
+
+#~ msgid "Checking whether given hosts can start testbed. Please wait\n"
+#~ msgstr ""
+#~ "Comprobando si las máquinas dadas pueden iniciar la batería de pruebas. "
+#~ "Por favor, espere\n"
+
+#~ msgid "Exiting\n"
+#~ msgstr "Saliendo\n"
+
+#~ msgid "create COUNT number of random links between peers"
+#~ msgstr "crear un número «COUNT» de enlaces aleatorios entre pares"
+
+#~ msgid "wait DELAY before starting string search"
+#~ msgstr "esperar «DELAY» antes de empezar la búsqueda de cadenas"
+
+#~ msgid "No hosts-file specified on command line\n"
+#~ msgstr ""
+#~ "No se ha especificado el fichero de máquinas en la línea de comandos.\n"
+
+#~ 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"
+
+#~ msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+#~ msgstr ""
+#~ "¡Error de sintaxis en el fichero de la lista negra en el desplazamiento "
+#~ "%llu, rindiendose!\n"
+
+#~ msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+#~ msgstr ""
+#~ "Error de sintaxis en el fichero de la lista negra en el desplazamiento "
+#~ "%llu, omitiendo bytes.\n"
+
+#~ msgid ""
+#~ "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+#~ msgstr ""
+#~ "Error de sintaxis en el fichero de la lista negra en el desplazamiento "
+#~ "%llu, omitiendo bytes «%s».\n"
+
+#~ msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+#~ msgstr "Me he encontrado «%s» en mi lista negra (inútil, ignorado)\n"
+
 #~ msgid "Failed to read hostkey: %s\n"
 #~ msgstr "Se produjo un fallo al leer la clave de máquina: %s\n"
 
@@ -7118,9 +7354,6 @@
 #~ "Error recibiendo respuesta a la petición «%s» del ARM para el servicio "
 #~ "«%s»\n"
 
-#~ msgid "Requesting start of service `%s'.\n"
-#~ msgstr "Solicitando incio del servicio «%s».\n"
-
 #~ msgid "Requesting termination of service `%s'.\n"
 #~ msgstr "Solicitando finalización del servicio «%s».\n"
 
@@ -7258,9 +7491,6 @@
 #~ msgid "Syntax: /msg USERNAME MESSAGE"
 #~ msgstr "Sintáxis: /msg USUARIO MENSAJE"
 
-#~ msgid "Unknown user `%s'\n"
-#~ msgstr "Usuario desconocido «%s»\n"
-
 #~ msgid "User `%s' is currently not in the room!\n"
 #~ msgstr "¡El usuario «%s» no está actualmente en la sala!\n"
 
@@ -7464,9 +7694,6 @@
 #~ "El servicio mesh carece de opciones de configuración de clave.  "
 #~ "Saliendo.\n"
 
-#~ msgid "Namestore added record successfully"
-#~ msgstr "El almacén de nombres añadió el registro satisfactoriamente"
-
 #~ msgid "Malformed %s `%s' given in configuration!\n"
 #~ msgstr "¡%s mal formada «%s» dada en la configuración!\n"
 
@@ -8045,18 +8272,12 @@
 #~ msgid "tmppath cannot be NULL\n"
 #~ msgstr "tmppath no puede ser NULL\n"
 
-#~ msgid "Could not open hostkeys file: %s\n"
-#~ msgstr "No se pudo abrir el fichero de claves de máquina: %s\n"
-
 #~ msgid "Invalid configuration option `%s' in section `%s'\n"
 #~ msgstr "Opción de configuración «%s» en la sección «%s» no válida\n"
 
 #~ msgid "Missing configuration option `%s' in section `%s'\n"
 #~ msgstr "Falta la opción de configuración «%s» en la sección «%s»\n"
 
-#~ msgid "Starting HELPER process `%s'\n"
-#~ msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
-
 #, fuzzy
 #~ msgid ""
 #~ "provide inthe 'struct GNUNET_TRANSPORT_PeerIterateContextformation about "
@@ -8110,10 +8331,6 @@
 #~ msgstr "imprime el número de versión"
 
 #, fuzzy
-#~ msgid "Failed to stop service `%s'!\n"
-#~ msgstr "Fichero almacenado en '%s'.\n"
-
-#, fuzzy
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "Falló al comenzar la recolección.\n"
 
@@ -9348,10 +9565,6 @@
 #~ msgstr "Fallo al conectar a gnunetd.\n"
 
 #, fuzzy
-#~ msgid "Waiting for peers to connect"
-#~ msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
-
-#, fuzzy
 #~ msgid "Bootstrap data obtained from `%s' is invalid.\n"
 #~ msgstr "Formato del pseudónimo '%s' no es válido.\n"
 
@@ -10202,9 +10415,6 @@
 #~ msgstr ""
 #~ "se produjo un fallo al descargar el módulo.  Notificando al cliente.\n"
 
-#~ msgid "received invalid `%s' message: %s.\n"
-#~ msgstr "recibido mensaje '%s' no válido: %s.\n"
-
 #~ msgid "'..' is not allowed in file name (%s).\n"
 #~ msgstr "'..' no esta permitido en el nombre del fichero(%s).\n"
 
@@ -10662,9 +10872,6 @@
 #~ msgid "Argument %d: `%s'\n"
 #~ msgstr "Argumento %d: '%s'\n"
 
-#~ msgid "`%s' starting\n"
-#~ msgstr "'%s' comenzando\n"
-
 #~ msgid "FATAL: Identity plugin not found!\n"
 #~ msgstr "FATAL: ¡Plugin de identidad no encontrado!\n"
 

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2013-04-27 11:04:29 UTC (rev 27000)
+++ gnunet/po/sv.po     2013-04-27 14:16:29 UTC (rev 27001)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-03-06 00:28+0100\n"
+"POT-Creation-Date: 2013-04-27 12:39+0200\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -16,311 +16,419 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:162
-msgid "Failed to transmit shutdown request to client.\n"
+#: src/arm/arm_api.c:880
+msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:166
+#: src/arm/arm_monitor_api.c:321
+msgid ""
+"Monitoring client was disconnected from arm service, trying to reconnect.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:159
 #, fuzzy, c-format
-msgid "Service `%s' is unknown to ARM.\n"
-msgstr "\"%s\" är inte en fil.\n"
+msgid "Failed to remove configuration file %s\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/arm/gnunet-arm.c:171
+#: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "Tjänst borttagen.\n"
+msgid "Failed to remove servicehome directory %s\n"
+msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:174
+#: src/arm/gnunet-arm.c:204 src/testbed/gnunet-service-testbed_peers.c:712
+msgid "Message was sent successfully"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:206 src/testbed/gnunet-service-testbed_peers.c:714
+#, fuzzy
+msgid "Misconfiguration (can't connect to the ARM service)"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/arm/gnunet-arm.c:208 src/testbed/gnunet-service-testbed_peers.c:716
+#, fuzzy
+msgid "We disconnected from ARM before we could send a request"
+msgstr "# av anslutna parter"
+
+#: src/arm/gnunet-arm.c:210 src/testbed/gnunet-service-testbed_peers.c:718
+msgid "ARM API is busy"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:212 src/testbed/gnunet-service-testbed_peers.c:720
+msgid "Request doesn't fit into a message"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:722
+#, fuzzy
+msgid "Request timed out"
+msgstr "# sessionsnycklar accepterade"
+
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:724
+#, fuzzy
+msgid "Unknown request status"
+msgstr "Okänd operation \"%s\"\n"
+
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:740
 #, fuzzy, c-format
-msgid "Service `%s' was already running.\n"
-msgstr "\"%s\" är inte en fil.\n"
+msgid "%s is stopped"
+msgstr "# byte krypterade"
 
-#: src/arm/gnunet-arm.c:179
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:742
 #, fuzzy, c-format
-msgid "Service `%s' has been started.\n"
-msgstr "Tjänst borttagen.\n"
+msgid "%s is starting"
+msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:182
+#: src/arm/gnunet-arm.c:236 src/testbed/gnunet-service-testbed_peers.c:744
+#, c-format
+msgid "%s is stopping"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:238 src/testbed/gnunet-service-testbed_peers.c:746
 #, fuzzy, c-format
-msgid "Service `%s' was already being stopped.\n"
-msgstr "Tjänst borttagen.\n"
+msgid "%s is starting already"
+msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:186
+#: src/arm/gnunet-arm.c:240 src/testbed/gnunet-service-testbed_peers.c:748
+#, c-format
+msgid "%s is stopping already"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:750
+#, c-format
+msgid "%s is started already"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:752
+#, c-format
+msgid "%s is stopped already"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:754
 #, fuzzy, c-format
-msgid "Service `%s' was already not running.\n"
+msgid "%s service is not known to ARM"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:190
-msgid "Request ignored as ARM is shutting down.\n"
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:756
+#, fuzzy, c-format
+msgid "%s service failed to start"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:758
+#, c-format
+msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:194
-#, fuzzy
-msgid "Error communicating with ARM service.\n"
-msgstr "Skriv ut information om GNUnets motparter."
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:760
+#, c-format
+msgid "%.s Unknown result code."
+msgstr ""
 
-#: src/arm/gnunet-arm.c:198
-#, fuzzy
-msgid "Timeout communicating with ARM service.\n"
-msgstr "Skriv ut information om GNUnets motparter."
+#: src/arm/gnunet-arm.c:271
+msgid "Fatal error initializing ARM API.\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:202
-#, fuzzy
-msgid "Operation failed.\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+#: src/arm/gnunet-arm.c:291
+#, fuzzy, c-format
+msgid "Failed to send a request to kill the `%s' service: %%s\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:206
-msgid "Unknown response code from ARM.\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:307
+#, fuzzy, c-format
+msgid "Failed to kill the `%s' service: %s\n"
+msgstr "Fel vid %s:%d.\n"
 
-#: src/arm/gnunet-arm.c:229
+#: src/arm/gnunet-arm.c:323
+#, fuzzy, c-format
+msgid "Failed to send a stop request to the ARM service: %s\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/arm/gnunet-arm.c:345
+#, fuzzy, c-format
+msgid "Failed to stop the ARM service: %s\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/arm/gnunet-arm.c:361 src/arm/gnunet-arm.c:370
+#, fuzzy, c-format
+msgid "Failed to start the ARM service: %s\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/arm/gnunet-arm.c:390
+#, fuzzy, c-format
+msgid "Failed to send a request to start the `%s' service: %%s\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/arm/gnunet-arm.c:405
+#, fuzzy, c-format
+msgid "Failed to start the `%s' service: %s\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/arm/gnunet-arm.c:423
+#, fuzzy, c-format
+msgid "Failed to request a list of services: %s\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/arm/gnunet-arm.c:430
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:232
+#: src/arm/gnunet-arm.c:433
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:253
-#, fuzzy, c-format
-msgid "Failed to remove configuration file %s\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+#: src/arm/gnunet-arm.c:534
+msgid "Began monitoring ARM for service status changes\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:259
+#: src/arm/gnunet-arm.c:537
+#, c-format
+msgid "Stopped %s.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:540
 #, fuzzy, c-format
-msgid "Failed to remove servicehome directory %s\n"
-msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+msgid "Starting %s...\n"
+msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:407 src/arm/gnunet-arm.c:424
-msgid "Fatal error initializing ARM API.\n"
+#: src/arm/gnunet-arm.c:543
+#, c-format
+msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:453
+#: src/arm/gnunet-arm.c:552
+#, fuzzy, c-format
+msgid "Unknown status %u for service %s.\n"
+msgstr "Okänd operation \"%s\"\n"
+
+#: src/arm/gnunet-arm.c:622
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:455
+#: src/arm/gnunet-arm.c:624
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:457
+#: src/arm/gnunet-arm.c:626
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:459
+#: src/arm/gnunet-arm.c:628
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:462
+#: src/arm/gnunet-arm.c:631
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:465
+#: src/arm/gnunet-arm.c:634
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:467
+#: src/arm/gnunet-arm.c:636
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:470
+#: src/arm/gnunet-arm.c:639
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:472
+#: src/arm/gnunet-arm.c:641
 #, fuzzy
 msgid "list currently running services"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:474
+#: src/arm/gnunet-arm.c:643
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:476
+#: src/arm/gnunet-arm.c:645
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:487
+#: src/arm/gnunet-arm.c:656
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:345
-#, fuzzy, c-format
-msgid "Failed to start service `%s'\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/arm/gnunet-service-arm.c:348
-#, fuzzy, c-format
-msgid "Starting service `%s'\n"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/arm/gnunet-service-arm.c:374
+#: src/arm/gnunet-service-arm.c:257
 #, fuzzy
 msgid "Could not send status result to client\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/arm/gnunet-service-arm.c:406
+#: src/arm/gnunet-service-arm.c:291
 #, fuzzy
 msgid "Could not send list result to client\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/arm/gnunet-service-arm.c:537
+#: src/arm/gnunet-service-arm.c:500
 #, fuzzy, c-format
+msgid "Failed to start service `%s'\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/arm/gnunet-service-arm.c:507
+#, fuzzy, c-format
+msgid "Starting service `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/arm/gnunet-service-arm.c:602
+#, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/arm/gnunet-service-arm.c:559
+#: src/arm/gnunet-service-arm.c:624
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:573
+#: src/arm/gnunet-service-arm.c:638
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:681
+#: src/arm/gnunet-service-arm.c:771
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:892
+#: src/arm/gnunet-service-arm.c:1023
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:985
+#: src/arm/gnunet-service-arm.c:1116
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:990
+#: src/arm/gnunet-service-arm.c:1121
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:995
+#: src/arm/gnunet-service-arm.c:1126
 #, fuzzy
 msgid "unknown"
 msgstr "Okänt fel"
 
-#: src/arm/gnunet-service-arm.c:1001
+#: src/arm/gnunet-service-arm.c:1132
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-service-arm.c:1036
+#: src/arm/gnunet-service-arm.c:1154
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1228
+#: src/arm/gnunet-service-arm.c:1169
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1386
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1239
+#: src/arm/gnunet-service-arm.c:1397
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1253
+#: src/arm/gnunet-service-arm.c:1411
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:44
+#: src/arm/mockup-service.c:46
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:465
+#: src/ats/ats_api_performance.c:475
 #, fuzzy, c-format
 msgid "Received %s message\n"
 msgstr "mottog ogiltigt \"%s\" meddelande\n"
 
-#: src/ats/ats_api_performance.c:508
+#: src/ats/ats_api_performance.c:518
 #, fuzzy, c-format
 msgid "Received last message for %s \n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1176
-#: src/ats/gnunet-service-ats_addresses.c:1210
+#: src/ats/gnunet-service-ats_addresses.c:1372
+#: src/ats/gnunet-service-ats_addresses.c:1406
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1182
+#: src/ats/gnunet-service-ats_addresses.c:1378
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1189
+#: src/ats/gnunet-service-ats_addresses.c:1385
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1216
+#: src/ats/gnunet-service-ats_addresses.c:1412
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1223
+#: src/ats/gnunet-service-ats_addresses.c:1419
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:735
+#: src/ats/gnunet-service-ats_addresses_mlp.c:756
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1044
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1075
 #, 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/gnunet-service-ats_addresses_mlp.c:1226
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1258
 #, c-format
 msgid "Update for ATS type `%s' not implemented!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1306
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1341
 #, c-format
 msgid "Updating address for peer `%s' not added before\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1726
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1761
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1734
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1769
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1744
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1779
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1752
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1787
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1763
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1798
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
@@ -342,85 +450,85 @@
 "s, %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/ats-tool/gnunet-ats.c:326
+#: src/ats-tool/gnunet-ats.c:320
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:345 src/namestore/gnunet-namestore.c:610
-#: src/transport/gnunet-transport.c:813
+#: src/ats-tool/gnunet-ats.c:339 src/namestore/gnunet-namestore.c:610
+#: src/transport/gnunet-transport.c:804
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/ats-tool/gnunet-ats.c:355 src/transport/gnunet-transport.c:819
+#: src/ats-tool/gnunet-ats.c:349 src/transport/gnunet-transport.c:810
 #, 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:363
+#: src/ats-tool/gnunet-ats.c:357
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:379 src/ats-tool/gnunet-ats.c:398
-#: src/ats-tool/gnunet-ats.c:415 src/ats-tool/gnunet-ats.c:440
+#: src/ats-tool/gnunet-ats.c:373 src/ats-tool/gnunet-ats.c:392
+#: src/ats-tool/gnunet-ats.c:409 src/ats-tool/gnunet-ats.c:434
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:388 src/ats-tool/gnunet-ats.c:405
+#: src/ats-tool/gnunet-ats.c:382 src/ats-tool/gnunet-ats.c:399
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:433
+#: src/ats-tool/gnunet-ats.c:427
 msgid "Type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:490
+#: src/ats-tool/gnunet-ats.c:484
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:493
+#: src/ats-tool/gnunet-ats.c:487
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:496
+#: src/ats-tool/gnunet-ats.c:490
 #, 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:499
+#: src/ats-tool/gnunet-ats.c:493
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:502
+#: src/ats-tool/gnunet-ats.c:496
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:505
+#: src/ats-tool/gnunet-ats.c:499
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:502
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:511
+#: src/ats-tool/gnunet-ats.c:505
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:514
+#: src/ats-tool/gnunet-ats.c:508
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:517
+#: src/ats-tool/gnunet-ats.c:511
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:526
+#: src/ats-tool/gnunet-ats.c:520
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -430,21 +538,21 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/consensus/gnunet-consensus.c:317
+#: src/consensus/gnunet-consensus.c:350
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "antal iterationer"
 
-#: src/consensus/gnunet-consensus.c:320
+#: src/consensus/gnunet-consensus.c:353
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus.c:323
+#: src/consensus/gnunet-consensus.c:356
 #, fuzzy
 msgid "number of values"
 msgstr "antal iterationer"
 
-#: src/consensus/gnunet-consensus.c:326
+#: src/consensus/gnunet-consensus.c:359
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# sessionsnycklar accepterade"
@@ -471,52 +579,52 @@
 msgid "ibf size"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-start-peers.c:158
+#: src/consensus/gnunet-consensus-start-peers.c:172
 msgid "start peers with the given template configuration"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-start-peers.c:161
+#: src/consensus/gnunet-consensus-start-peers.c:175
 #, fuzzy
 msgid "number of peers to start"
 msgstr "antal iterationer"
 
-#: src/core/core_api.c:755
+#: src/core/core_api.c:752
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:86 src/peerinfo-tool/gnunet-peerinfo.c:214
+#: src/core/gnunet-core.c:82
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/core/gnunet-core.c:119 src/core/gnunet-core.c:147
-#: src/transport/gnunet-transport.c:612 src/transport/gnunet-transport.c:636
+#: src/core/gnunet-core.c:112 src/core/gnunet-core.c:140
+#: src/transport/gnunet-transport.c:606 src/transport/gnunet-transport.c:630
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:121 src/transport/gnunet-transport.c:614
+#: src/core/gnunet-core.c:114 src/transport/gnunet-transport.c:608
 #, fuzzy
 msgid "Connected to"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:149 src/transport/gnunet-transport.c:638
+#: src/core/gnunet-core.c:142 src/transport/gnunet-transport.c:632
 #, fuzzy
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:176
-#: src/peerinfo-tool/gnunet-peerinfo.c:541
+#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:176
+#: src/peerinfo-tool/gnunet-peerinfo.c:643
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
-#: src/core/gnunet-core.c:211 src/transport/gnunet-transport.c:1005
+#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:996
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-core.c:222
+#: src/core/gnunet-core.c:215
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -537,7 +645,7 @@
 msgstr "GNUnet-konfiguration"
 
 #: src/core/gnunet-service-core.c:164
-#: src/transport/gnunet-service-transport.c:725
+#: src/transport/gnunet-service-transport.c:758
 #, fuzzy
 msgid "Transport service is unable to access hostkey. Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -662,44 +770,44 @@
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1312
+#: src/core/gnunet-service-core_kx.c:1298
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1319
+#: src/core/gnunet-service-core_kx.c:1305
 #, 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:1322
+#: src/core/gnunet-service-core_kx.c:1308
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1365
-#: src/core/gnunet-service-core_kx.c:1390
+#: src/core/gnunet-service-core_kx.c:1351
+#: src/core/gnunet-service-core_kx.c:1376
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1377
+#: src/core/gnunet-service-core_kx.c:1363
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1404
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1426
+#: src/core/gnunet-service-core_kx.c:1412
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1443
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
@@ -710,7 +818,7 @@
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
 #: src/core/gnunet-service-core_neighbours.c:179
-#: src/core/gnunet-service-core_neighbours.c:333
+#: src/core/gnunet-service-core_neighbours.c:328
 msgid "# neighbour entries allocated"
 msgstr ""
 
@@ -718,23 +826,23 @@
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:420
+#: src/core/gnunet-service-core_neighbours.c:411
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:210
 #: src/core/gnunet-service-core_sessions.c:280
-#: src/dht/gnunet-service-dht_neighbours.c:645
-#: src/dht/gnunet-service-dht_neighbours.c:704
-#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1530
-#: src/topology/gnunet-daemon-topology.c:704
-#: src/topology/gnunet-daemon-topology.c:805
-#: src/transport/gnunet-service-transport_neighbours.c:1052
-#: src/transport/gnunet-service-transport_neighbours.c:1276
-#: src/transport/gnunet-service-transport_neighbours.c:1285
-#: src/transport/gnunet-service-transport_neighbours.c:2826
-#: src/transport/gnunet-service-transport_neighbours.c:3089
+#: src/dht/gnunet-service-dht_neighbours.c:644
+#: src/dht/gnunet-service-dht_neighbours.c:703
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
+#: src/topology/gnunet-daemon-topology.c:700
+#: src/topology/gnunet-daemon-topology.c:801
+#: src/transport/gnunet-service-transport_neighbours.c:1041
+#: src/transport/gnunet-service-transport_neighbours.c:1265
+#: src/transport/gnunet-service-transport_neighbours.c:1274
+#: src/transport/gnunet-service-transport_neighbours.c:2794
+#: src/transport/gnunet-service-transport_neighbours.c:3053
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
@@ -806,14 +914,14 @@
 #: src/datacache/plugin_datacache_sqlite.c:72
 #: src/datastore/plugin_datastore_mysql.c:803
 #: src/datastore/plugin_datastore_mysql.c:817
-#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
-#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
-#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/datastore/plugin_datastore_sqlite.c:57 src/fs/fs_pseudonym.c:46
+#: src/mysql/mysql.c:41 src/mysql/mysql.c:48 src/mysql/mysql.c:522
+#: src/mysql/mysql.c:531 src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:46
 #: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
-#: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
+#: src/include/gnunet_common.h:608 src/include/gnunet_common.h:615
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -1203,7 +1311,7 @@
 #: 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:736
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:1037
+#: src/nse/gnunet-nse-profiler.c:900
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1272,89 +1380,89 @@
 msgid "Failed to connect to transport service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:413
+#: src/dht/gnunet-service-dht_clients.c:414
 #, fuzzy
 msgid "# GET requests from clients injected"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_clients.c:503
+#: src/dht/gnunet-service-dht_clients.c:508
 #, fuzzy
 msgid "# PUT requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:585
+#: src/dht/gnunet-service-dht_clients.c:590
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:791
+#: src/dht/gnunet-service-dht_clients.c:796
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1035
+#: src/dht/gnunet-service-dht_clients.c:1041
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1048
+#: src/dht/gnunet-service-dht_clients.c:1054
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1085
+#: src/dht/gnunet-service-dht_clients.c:1091
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1108
+#: src/dht/gnunet-service-dht_clients.c:1114
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1157
-#: src/dht/gnunet-service-dht_clients.c:1199
+#: src/dht/gnunet-service-dht_clients.c:1165
+#: src/dht/gnunet-service-dht_clients.c:1207
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1175
 #, 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:64
+#: src/dht/gnunet-service-dht_datacache.c:68
 #, 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:74
+#: src/dht/gnunet-service-dht_datacache.c:78
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:159
+#: src/dht/gnunet-service-dht_datacache.c:165
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:170
+#: src/dht/gnunet-service-dht_datacache.c:176
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:176
+#: src/dht/gnunet-service-dht_datacache.c:182
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:182
+#: src/dht/gnunet-service-dht_datacache.c:188
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:194
+#: src/dht/gnunet-service-dht_datacache.c:200
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:197
+#: src/dht/gnunet-service-dht_datacache.c:203
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:227
+#: src/dht/gnunet-service-dht_datacache.c:234
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# byte mottogs via TCP"
@@ -1364,100 +1472,100 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:501
+#: src/dht/gnunet-service-dht_neighbours.c:504
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:591
+#: src/dht/gnunet-service-dht_neighbours.c:594
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:738
+#: src/dht/gnunet-service-dht_neighbours.c:737
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:793
+#: src/dht/gnunet-service-dht_neighbours.c:792
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/dht/gnunet-service-dht_neighbours.c:831
+#: src/dht/gnunet-service-dht_neighbours.c:830
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1053
-#: src/dht/gnunet-service-dht_neighbours.c:1081
+#: src/dht/gnunet-service-dht_neighbours.c:1052
+#: src/dht/gnunet-service-dht_neighbours.c:1086
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1062
-#: src/dht/gnunet-service-dht_neighbours.c:1096
+#: src/dht/gnunet-service-dht_neighbours.c:1067
+#: src/dht/gnunet-service-dht_neighbours.c:1101
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1230
+#: src/dht/gnunet-service-dht_neighbours.c:1235
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1259
+#: src/dht/gnunet-service-dht_neighbours.c:1264
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1266
-#: src/dht/gnunet-service-dht_neighbours.c:1379
-#: src/dht/gnunet-service-dht_neighbours.c:1479
+#: src/dht/gnunet-service-dht_neighbours.c:1271
+#: src/dht/gnunet-service-dht_neighbours.c:1384
+#: src/dht/gnunet-service-dht_neighbours.c:1484
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1344
+#: src/dht/gnunet-service-dht_neighbours.c:1349
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1371
+#: src/dht/gnunet-service-dht_neighbours.c:1376
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1486
+#: src/dht/gnunet-service-dht_neighbours.c:1491
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1574
+#: src/dht/gnunet-service-dht_neighbours.c:1575
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1704
+#: src/dht/gnunet-service-dht_neighbours.c:1730
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1712
+#: src/dht/gnunet-service-dht_neighbours.c:1738
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-dht_neighbours.c:1829
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1845
+#: src/dht/gnunet-service-dht_neighbours.c:1882
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1859
+#: src/dht/gnunet-service-dht_neighbours.c:1896
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1943
+#: src/dht/gnunet-service-dht_neighbours.c:1973
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -1622,21 +1730,15 @@
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/dv/dv_api.c:189
-#, fuzzy
-msgid "Failed to connect to the dv service!\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
+#: src/dv/gnunet-dv.c:165
+msgid "verbose output"
+msgstr ""
 
-#: src/dv/gnunet-service-dv.c:3003
+#: src/dv/gnunet-dv.c:174
 #, fuzzy
-msgid "Error in communication with PEERINFO service\n"
+msgid "Print information about DV state"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/dv/plugin_transport_dv.c:159
-#, fuzzy, c-format
-msgid "%s Received message from %s of type %d, distance %u!\n"
-msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
-
 #: src/exit/gnunet-daemon-exit.c:741
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
@@ -2092,7 +2194,7 @@
 msgid "Identifiers or URI too long to create UBlock"
 msgstr ""
 
-#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:307
+#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:311
 #, fuzzy
 msgid "Internal error."
 msgstr "Okänt fel.\n"
@@ -2102,6 +2204,27 @@
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
+#: src/fs/fs_pseudonym.c:342 src/fs/fs_pseudonym.c:645
+#, fuzzy, c-format
+msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/fs/fs_pseudonym.c:477 src/fs/fs_pseudonym.c:503
+#: src/fs/fs_pseudonym.c:641
+#, fuzzy
+msgid "no-name"
+msgstr "Visa namn"
+
+#: src/fs/fs_pseudonym.c:1182 src/util/crypto_ecc.c:975
+#, fuzzy, c-format
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#: src/fs/fs_pseudonym.c:1505
+#, fuzzy, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
 #: src/fs/fs_publish.c:129 src/fs/fs_publish.c:397
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
@@ -2168,7 +2291,7 @@
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:269
+#: src/fs/fs_publish_ksk.c:273
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -2305,19 +2428,19 @@
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/fs/fs_uri.c:944
+#: src/fs/fs_uri.c:945
 msgid "identifier is NULL!"
 msgstr ""
 
-#: src/fs/fs_uri.c:949
+#: src/fs/fs_uri.c:951
 msgid "identifier has zero length!"
 msgstr ""
 
-#: src/fs/fs_uri.c:1118 src/fs/fs_uri.c:1145
+#: src/fs/fs_uri.c:1122 src/fs/fs_uri.c:1149
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1151
+#: src/fs/fs_uri.c:1155
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2520,19 +2643,19 @@
 msgid "Special file-sharing operations"
 msgstr "Visa alla alternativ"
 
-#: src/fs/gnunet-fs-profiler.c:182
+#: src/fs/gnunet-fs-profiler.c:190
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:185
+#: src/fs/gnunet-fs-profiler.c:193
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:188
+#: src/fs/gnunet-fs-profiler.c:196
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:197
+#: src/fs/gnunet-fs-profiler.c:205
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
@@ -2695,7 +2818,7 @@
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
 #: src/fs/gnunet-publish.c:588 src/fs/gnunet-publish.c:595
-#: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
+#: src/transport/gnunet-transport.c:834 src/transport/gnunet-transport.c:864
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -2796,104 +2919,104 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:248
+#: src/fs/gnunet-service-fs.c:271
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:309 src/fs/gnunet-service-fs.c:521
+#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:538
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:626 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1322
-#: src/topology/gnunet-daemon-topology.c:1329
+#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:291
+#: src/topology/gnunet-daemon-topology.c:1314
+#: src/topology/gnunet-daemon-topology.c:1321
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-service-fs_cp.c:711
+#: src/fs/gnunet-service-fs_cp.c:677
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:715
+#: src/fs/gnunet-service-fs_cp.c:681
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:751
+#: src/fs/gnunet-service-fs_cp.c:716
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:757
+#: src/fs/gnunet-service-fs_cp.c:722
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1331
+#: src/fs/gnunet-service-fs_cp.c:747 src/fs/gnunet-service-fs_cp.c:1296
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:875
+#: src/fs/gnunet-service-fs_cp.c:840
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:928
+#: src/fs/gnunet-service-fs_cp.c:893
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:936
+#: src/fs/gnunet-service-fs_cp.c:901
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:950
+#: src/fs/gnunet-service-fs_cp.c:915
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:988
+#: src/fs/gnunet-service-fs_cp.c:953
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1056
+#: src/fs/gnunet-service-fs_cp.c:1021
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1081
+#: src/fs/gnunet-service-fs_cp.c:1046
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1091
+#: src/fs/gnunet-service-fs_cp.c:1056
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1169
+#: src/fs/gnunet-service-fs_cp.c:1134
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1203
+#: src/fs/gnunet-service-fs_cp.c:1168
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1226
+#: src/fs/gnunet-service-fs_cp.c:1191
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1276
+#: src/fs/gnunet-service-fs_cp.c:1241
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1300
+#: src/fs/gnunet-service-fs_cp.c:1265
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1329
+#: src/fs/gnunet-service-fs_cp.c:1294
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1699
+#: src/fs/gnunet-service-fs_cp.c:1664
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -3361,100 +3484,100 @@
 msgid "Not a GADS TLD: `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:118
+#: src/hello/gnunet-hello.c:119
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:124
+#: src/hello/gnunet-hello.c:125
 #, fuzzy, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/hello/gnunet-hello.c:132
+#: src/hello/gnunet-hello.c:133
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:139
+#: src/hello/gnunet-hello.c:140
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:149 src/hello/gnunet-hello.c:177
+#: src/hello/gnunet-hello.c:150 src/hello/gnunet-hello.c:179
 #, fuzzy, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/hello/gnunet-hello.c:165
+#: src/hello/gnunet-hello.c:166
 #, 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:189
+#: src/hello/gnunet-hello.c:191
 #, fuzzy, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/hello/hello.c:904
+#: src/hello/hello.c:936
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:913
+#: src/hello/hello.c:945
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:923
+#: src/hello/hello.c:955
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hello/hello.c:933
+#: src/hello/hello.c:965
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hello/hello.c:950
+#: src/hello/hello.c:982
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:959
+#: src/hello/hello.c:991
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:978
+#: src/hello/hello.c:1010
 #, 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/hostlist/gnunet-daemon-hostlist.c:264
+#: src/hostlist/gnunet-daemon-hostlist.c:258
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:317
+#: src/hostlist/gnunet-daemon-hostlist.c:311
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:322
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/hostlist/gnunet-daemon-hostlist.c:319
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:329
+#: src/hostlist/gnunet-daemon-hostlist.c:323
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:344
+#: src/hostlist/gnunet-daemon-hostlist.c:338
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -3479,13 +3602,13 @@
 #: src/hostlist/hostlist-client.c:686 src/hostlist/hostlist-client.c:738
 #: src/hostlist/hostlist-client.c:747 src/hostlist/hostlist-client.c:868
 #: src/hostlist/hostlist-client.c:960 src/hostlist/hostlist-client.c:965
-#: src/transport/plugin_transport_http_client.c:1052
-#: src/transport/plugin_transport_http_client.c:1067
+#: src/transport/plugin_transport_http_client.c:1056
+#: src/transport/plugin_transport_http_client.c:1071
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1327
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1319
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -3537,7 +3660,7 @@
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1500
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1492
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -3546,69 +3669,69 @@
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
+#: src/hostlist/hostlist-client.c:1105 src/hostlist/hostlist-client.c:1121
 #, fuzzy
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: src/hostlist/hostlist-client.c:1275
+#: src/hostlist/hostlist-client.c:1267
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:1279
+#: src/hostlist/hostlist-client.c:1271
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/hostlist/hostlist-client.c:1282
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/hostlist-client.c:1323
+#: src/hostlist/hostlist-client.c:1315
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1325
+#: src/hostlist/hostlist-client.c:1317
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1370
+#: src/hostlist/hostlist-client.c:1362
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/hostlist-client.c:1375
+#: src/hostlist/hostlist-client.c:1367
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:1399 src/hostlist/hostlist-client.c:1416
+#: src/hostlist/hostlist-client.c:1391 src/hostlist/hostlist-client.c:1408
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1411
+#: src/hostlist/hostlist-client.c:1403
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1465
+#: src/hostlist/hostlist-client.c:1457
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1477
+#: src/hostlist/hostlist-client.c:1469
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1489
+#: src/hostlist/hostlist-client.c:1481
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1493
+#: src/hostlist/hostlist-client.c:1485
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
@@ -3622,10 +3745,11 @@
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:425
-#: src/peerinfo-tool/gnunet-peerinfo.c:331
-#: src/peerinfo-tool/gnunet-peerinfo.c:386
-#: src/topology/gnunet-daemon-topology.c:922
+#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:421
+#: src/peerinfo-tool/gnunet-peerinfo.c:348
+#: src/peerinfo-tool/gnunet-peerinfo.c:418
+#: src/peerinfo-tool/gnunet-peerinfo.c:489
+#: src/topology/gnunet-daemon-topology.c:918
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -3676,56 +3800,56 @@
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:388
+#: src/hostlist/hostlist-server.c:384
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:552 src/peerinfo-tool/gnunet-peerinfo.c:547
-#: src/transport/gnunet-service-transport.c:632
+#: src/hostlist/hostlist-server.c:548 src/peerinfo-tool/gnunet-peerinfo.c:649
+#: src/transport/gnunet-service-transport.c:661
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/hostlist/hostlist-server.c:562
+#: src/hostlist/hostlist-server.c:558
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/hostlist/hostlist-server.c:571
+#: src/hostlist/hostlist-server.c:567
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:585
+#: src/hostlist/hostlist-server.c:581
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-server.c:625
+#: src/hostlist/hostlist-server.c:621
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/hostlist-server.c:667
+#: src/hostlist/hostlist-server.c:663
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1001
+#: src/integration-tests/connection_watchdog.c:990
 #, fuzzy, c-format
 msgid "Transport plugin: `%s' port %llu\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/integration-tests/connection_watchdog.c:1034
+#: src/integration-tests/connection_watchdog.c:1023
 #, fuzzy, c-format
 msgid "Found %u transport plugins: `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/integration-tests/connection_watchdog.c:1093
+#: src/integration-tests/connection_watchdog.c:1082
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1102
+#: src/integration-tests/connection_watchdog.c:1091
 #: src/template/gnunet-template.c:70
 #, fuzzy
 msgid "help text"
@@ -3746,38 +3870,39 @@
 msgid "Print information about mesh tunnels and peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-service-mesh.c:8010 src/mesh/gnunet-service-mesh-new.c:8015
+#: src/mesh/gnunet-service-mesh.c:7966 src/mesh/gnunet-service-mesh-new.c:7972
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8227 src/mesh/gnunet-service-mesh-new.c:8232
+#: src/mesh/gnunet-service-mesh.c:8179 src/mesh/gnunet-service-mesh-new.c:8185
 #, fuzzy, c-format
 msgid "Mesh service could not access hostkey: %s. Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/mesh/gnunet-service-mesh.c:8309 src/mesh/gnunet-service-mesh.c:8321
-#: src/mesh/gnunet-service-mesh.c:8333 src/mesh/gnunet-service-mesh.c:8347
-#: src/mesh/gnunet-service-mesh.c:8359 src/mesh/gnunet-service-mesh.c:8371
-#: src/mesh/gnunet-service-mesh.c:8383 src/mesh/gnunet-service-mesh-new.c:8321
-#: src/mesh/gnunet-service-mesh-new.c:8333
-#: src/mesh/gnunet-service-mesh-new.c:8345
-#: src/mesh/gnunet-service-mesh-new.c:8359
-#: src/mesh/gnunet-service-mesh-new.c:8371
-#: src/mesh/gnunet-service-mesh-new.c:8383
-#: src/mesh/gnunet-service-mesh-new.c:8395 src/nse/gnunet-service-nse.c:1478
-#: src/nse/gnunet-service-nse.c:1496
-#: src/regex/gnunet-daemon-regexprofiler.c:277
-#: src/regex/gnunet-daemon-regexprofiler.c:290
-#: src/regex/gnunet-daemon-regexprofiler.c:303
+#: src/mesh/gnunet-service-mesh.c:8261 src/mesh/gnunet-service-mesh.c:8273
+#: src/mesh/gnunet-service-mesh.c:8285 src/mesh/gnunet-service-mesh.c:8299
+#: src/mesh/gnunet-service-mesh.c:8311 src/mesh/gnunet-service-mesh.c:8323
+#: src/mesh/gnunet-service-mesh.c:8335 src/mesh/gnunet-service-mesh-new.c:8274
+#: src/mesh/gnunet-service-mesh-new.c:8286
+#: src/mesh/gnunet-service-mesh-new.c:8298
+#: src/mesh/gnunet-service-mesh-new.c:8312
+#: src/mesh/gnunet-service-mesh-new.c:8324
+#: src/mesh/gnunet-service-mesh-new.c:8336
+#: src/mesh/gnunet-service-mesh-new.c:8348 src/nse/gnunet-service-nse.c:1516
+#: src/nse/gnunet-service-nse.c:1534
+#: src/regex/gnunet-daemon-regexprofiler.c:320
+#: src/regex/gnunet-daemon-regexprofiler.c:332
+#: src/regex/gnunet-daemon-regexprofiler.c:344
+#: src/regex/gnunet-daemon-regexprofiler.c:357
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:8395 src/mesh/gnunet-service-mesh.c:8405
-#: src/mesh/gnunet-service-mesh.c:8416 src/mesh/gnunet-service-mesh-new.c:8407
-#: src/mesh/gnunet-service-mesh-new.c:8417
-#: src/mesh/gnunet-service-mesh-new.c:8428
+#: src/mesh/gnunet-service-mesh.c:8347 src/mesh/gnunet-service-mesh.c:8357
+#: src/mesh/gnunet-service-mesh.c:8368 src/mesh/gnunet-service-mesh-new.c:8360
+#: src/mesh/gnunet-service-mesh-new.c:8370
+#: src/mesh/gnunet-service-mesh-new.c:8381
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -3873,7 +3998,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:599
+#: src/peerinfo-tool/gnunet-peerinfo.c:701
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
@@ -4162,88 +4287,91 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1013
+#: src/nse/gnunet-nse-profiler.c:885
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/nse/gnunet-nse-profiler.c:1016
+#: src/nse/gnunet-nse-profiler.c:888
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1019
+#: src/nse/gnunet-nse-profiler.c:891 src/testbed/gnunet-testbed-profiler.c:282
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1022
-msgid "IP address of this system as seen by the rest of the testbed"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:1025
-msgid "delay between queries to statistics during a round"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:1028
-msgid "prefix of the filenames we use for writing the topology for each round"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:1031
+#: src/nse/gnunet-nse-profiler.c:894
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1034
+#: src/nse/gnunet-nse-profiler.c:897
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1040
+#: src/nse/gnunet-nse-profiler.c:903
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1050
+#: src/nse/gnunet-nse-profiler.c:912
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:1389
+#: src/nse/gnunet-service-nse.c:1405
 #, fuzzy, c-format
 msgid "NSE service could not access hostkey: %s\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/nse/gnunet-service-nse.c:1403
+#: src/nse/gnunet-service-nse.c:1419
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1486
+#: src/nse/gnunet-service-nse.c:1524
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:134
+#: src/peerinfo/gnunet-service-peerinfo.c:215
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:230
+#: src/peerinfo/gnunet-service-peerinfo.c:354
 #, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
+msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:269
+#: src/peerinfo/gnunet-service-peerinfo.c:369
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s %u \n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:444
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:297
+#: src/peerinfo/gnunet-service-peerinfo.c:480
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:419
+#: src/peerinfo/gnunet-service-peerinfo.c:632
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:637
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:807
+#: src/peerinfo/gnunet-service-peerinfo.c:969
+#, 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:1249
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -4274,74 +4402,107 @@
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:256
+#: src/peerinfo/peerinfo_api_notify.c:269
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:419
+#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#, fuzzy, c-format
+msgid "%sPeer `%s'\n"
+msgstr "Jag är ändpunkt \"%s\".\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:427
+#, fuzzy, c-format
+msgid "Failure: Did not receive %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:435
 #, c-format
+msgid "Failure: Received invalid %s\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:444
+#, 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:457
+#, c-format
+msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:521
+#, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:557
+#: src/peerinfo-tool/gnunet-peerinfo.c:659
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:563
+#: src/peerinfo-tool/gnunet-peerinfo.c:665
 #, 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:625
+#: src/peerinfo-tool/gnunet-peerinfo.c:727
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/peerinfo-tool/gnunet-peerinfo.c:759
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654
+#: src/peerinfo-tool/gnunet-peerinfo.c:762
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:657
+#: src/peerinfo-tool/gnunet-peerinfo.c:765
+msgid "include friend-only information"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:768
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:660
+#: src/peerinfo-tool/gnunet-peerinfo.c:771
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:663
+#: src/peerinfo-tool/gnunet-peerinfo.c:774
+msgid "dump hello to file"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:777
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:666
+#: src/peerinfo-tool/gnunet-peerinfo.c:780
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:677
+#: src/peerinfo-tool/gnunet-peerinfo.c:791
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:118
+#: src/transport/gnunet-service-transport_plugins.c:120
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:122
+#: src/transport/gnunet-service-transport_plugins.c:124
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Testar transport(er) %s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:150
+#: src/transport/gnunet-service-transport_plugins.c:153
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
@@ -4422,145 +4583,85 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:376
+#: src/regex/gnunet-daemon-regexprofiler.c:432
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1373
-#, c-format
-msgid "An operation has failed while starting peers: %s\n"
-msgstr ""
+#: src/regex/gnunet-regex-profiler.c:1246
+#, fuzzy
+msgid "No configuration file given. Exiting\n"
+msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/regex/gnunet-regex-profiler.c:1418
-#, fuzzy, c-format
-msgid "Creating a peer failed. Error: %s\n"
-msgstr ""
-"\n"
-"Fel vid uppladdning av fil: %s\n"
+#: src/regex/gnunet-regex-profiler.c:1257
+#, fuzzy
+msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1545
-msgid "An operation has failed while starting slaves\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1567
-#, fuzzy, c-format
-msgid "No files found in `%s'\n"
-msgstr "%d filer hittades i katalog.\n"
-
-#: src/regex/gnunet-regex-profiler.c:1622
-msgid "An operation has failed while linking\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1732
-#: src/testbed/testbed_api_testbed.c:799
-#, c-format
-msgid "Host registration failed for a host. Error: %s\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1813
-msgid "Unable to connect to master controller -- Check config\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1915
-#: src/testbed/testbed_api_testbed.c:964
-#, c-format
-msgid "Host %s cannot start testbed\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1918
-#: src/testbed/testbed_api_testbed.c:968
-msgid "Testbed cannot be started on localhost\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1958
-#, c-format
+#: src/regex/gnunet-regex-profiler.c:1276
 msgid "No hosts-file specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1963
+#: src/regex/gnunet-regex-profiler.c:1282
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1969
-#: src/testbed/testbed_api_testbed.c:1071
+#: src/regex/gnunet-regex-profiler.c:1288
+#: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
-msgid "No hosts loaded. Need at least one host\n"
+msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1972
-#, c-format
-msgid "Checking whether given hosts can start testbed. Please wait\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1996
+#: src/regex/gnunet-regex-profiler.c:1295
 #, fuzzy, c-format
-msgid "Exiting\n"
-msgstr ""
-"\n"
-"Avslutar.\n"
+msgid "No files found in `%s'\n"
+msgstr "%d filer hittades i katalog.\n"
 
-#: src/regex/gnunet-regex-profiler.c:2002
-#, fuzzy, c-format
-msgid "No configuration file given. Exiting\n"
-msgstr "använd konfigurationsfil FILNAMN"
-
-#: src/regex/gnunet-regex-profiler.c:2011
-#, fuzzy, c-format
-msgid "Configuration option (regex_prefix) missing. Exiting\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/regex/gnunet-regex-profiler.c:2029
-#: src/regex/gnunet-regex-simulation-profiler.c:629
-#, c-format
-msgid "Specified policies directory does not exist. Exiting.\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:2036
-#, c-format
+#: src/regex/gnunet-regex-profiler.c:1304
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:2044
-#, c-format
+#: src/regex/gnunet-regex-profiler.c:1314
+#, fuzzy
 msgid ""
-"Error loading search strings. Given file does not contain enough strings. "
+"Error loading search strings.Given file does not contain enough strings. "
 "Exiting.\n"
-msgstr ""
+msgstr "Fel vid lämning av DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:2050
-#, fuzzy, c-format
+#: src/regex/gnunet-regex-profiler.c:1322
+#, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:2077
+#: src/regex/gnunet-regex-profiler.c:1389
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:2080
-msgid "create COUNT number of random links between peers"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:2083
+#: src/regex/gnunet-regex-profiler.c:1392
 msgid "wait TIMEOUT before considering a string match as failed"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:2086
-msgid "wait DELAY before starting string search"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:2089
+#: src/regex/gnunet-regex-profiler.c:1395
 msgid "number of search strings to read from search strings file"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:2092
-#: src/regex/gnunet-regex-simulation-profiler.c:692
-msgid "maximum path compression length"
+#: src/regex/gnunet-regex-profiler.c:1398
+msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:2105
+#: src/regex/gnunet-regex-profiler.c:1401
+#, fuzzy
+msgid "name of file with input strings"
+msgstr "Visa värde av alternativet"
+
+#: src/regex/gnunet-regex-profiler.c:1404
+#, fuzzy
+msgid "name of file with hosts' names"
+msgstr "Visa värde av alternativet"
+
+#: src/regex/gnunet-regex-profiler.c:1416
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4569,6 +4670,10 @@
 msgid "name of the table to write DFAs"
 msgstr "Visa värde av alternativet"
 
+#: src/regex/gnunet-regex-simulation-profiler.c:692
+msgid "maximum path compression length"
+msgstr ""
+
 #: src/regex/gnunet-regex-simulation-profiler.c:705
 msgid "Profiler for regex library"
 msgstr ""
@@ -4658,12 +4763,12 @@
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
-#: src/statistics/statistics_api.c:511
+#: src/statistics/statistics_api.c:512
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/statistics/statistics_api.c:1056
+#: src/statistics/statistics_api.c:1057
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
@@ -4674,138 +4779,176 @@
 msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
 msgstr ""
 
+#: src/testbed/gnunet-service-testbed_cpustatus.c:670
+#, c-format
+msgid ""
+"Cannot open %s for writing load statistics.  Not logging load statistics\n"
+msgstr ""
+
 #: src/testbed/gnunet_testbed_ll_master.c:57
 #, fuzzy, c-format
 msgid "Job command file not given. Exiting\n"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/testbed/gnunet-testbed-profiler.c:235
-#, c-format
-msgid "No hosts-file specified on command line\n"
-msgstr ""
+#: src/testbed/gnunet_testbed_mpi_spawn.c:135
+#, fuzzy
+msgid "Waiting for child to exit.\n"
+msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:267
+#: src/testbed/gnunet_testbed_mpi_spawn.c:296
+#, fuzzy, c-format
+msgid "Spawning process `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/testbed/gnunet-testbed-profiler.c:249
+#, 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:275
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:270
+#: src/testbed/gnunet-testbed-profiler.c:278
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:286
-msgid "Profiler for testbed"
-msgstr ""
-
-#: src/testbed/testbed_api_hosts.c:469
+#: src/testbed/testbed_api_hosts.c:459
 #, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/testbed/testbed_api_hosts.c:477
+#: src/testbed/testbed_api_hosts.c:467
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:484
+#: src/testbed/testbed_api_hosts.c:474
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:593
+#: src/testbed/testbed_api_hosts.c:583
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1836
+#: src/testbed/testbed_api_hosts.c:1856
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/testbed/testbed_api_testbed.c:638
+#: src/testbed/testbed_api_testbed.c:771
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1003
+#: src/testbed/testbed_api_testbed.c:913
+#, c-format
+msgid "Host registration failed for a host. Error: %s\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:978
+msgid "Controller crash detected. Shutting down.\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1081
+#, c-format
+msgid "Host %s cannot start testbed\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1085
+msgid "Testbed cannot be started on localhost\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1120
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1059
+#: src/testbed/testbed_api_testbed.c:1138
+msgid "Shutting down testbed due to timeout while setup.\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1197
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1095
+#: src/testbed/testbed_api_testbed.c:1209
+msgid "No hosts loaded. Need at least one host\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1233
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:668
+#: src/testbed/testbed_api_topology.c:670
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/testbed/testbed_api_topology.c:674
+#: src/testbed/testbed_api_topology.c:676
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:681
+#: src/testbed/testbed_api_topology.c:683
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:704
+#: src/testbed/testbed_api_topology.c:706
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/testbed/testbed_api_topology.c:713
-#: src/testbed/testbed_api_topology.c:737
+#: src/testbed/testbed_api_topology.c:715
+#: src/testbed/testbed_api_topology.c:739
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:719
-#: src/testbed/testbed_api_topology.c:743
+#: src/testbed/testbed_api_topology.c:721
+#: src/testbed/testbed_api_topology.c:745
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/testbed/testbed_api_topology.c:725
-#: src/testbed/testbed_api_topology.c:749
+#: src/testbed/testbed_api_topology.c:727
+#: src/testbed/testbed_api_topology.c:751
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:764
+#: src/testbed/testbed_api_topology.c:766
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/testing/gnunet-testing.c:132
+#: src/testing/gnunet-testing.c:133
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/gnunet-testing.c:209
+#: src/testing/gnunet-testing.c:210
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/testing/gnunet-testing.c:211
+#: src/testing/gnunet-testing.c:212
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:213
+#: src/testing/gnunet-testing.c:214
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/testing/gnunet-testing.c:215
+#: src/testing/gnunet-testing.c:216
 #, fuzzy
 msgid "configuration template"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/testing/gnunet-testing.c:224
+#: src/testing/gnunet-testing.c:225
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -4823,59 +4966,64 @@
 msgid "name of the service to run"
 msgstr ""
 
-#: src/testing/testing.c:217
+#: src/testing/testing.c:288
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:233
+#: src/testing/testing.c:304
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:547
+#: src/testing/testing.c:719
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/testing/testing.c:558
+#: src/testing/testing.c:730
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/testing/testing.c:872
+#: src/testing/testing.c:1175
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/testing/testing.c:883
+#: src/testing/testing.c:1182
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:897
+#: src/testing/testing.c:1191
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/testing/testing.c:931
+#: src/testing/testing.c:1211
 #, fuzzy, c-format
+msgid "Cannot open hostkey file: %s\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/testing/testing.c:1221
+#, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/testing/testing.c:949
+#: src/testing/testing.c:1243
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/testing/testing.c:1029
+#: src/testing/testing.c:1343
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/testing/testing.c:1235
+#: src/testing/testing.c:1691
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -4889,145 +5037,123 @@
 msgid "# connect requests issued to transport"
 msgstr "# byte mottogs via TCP"
 
-#: src/topology/gnunet-daemon-topology.c:725
-#: src/topology/gnunet-daemon-topology.c:810
+#: src/topology/gnunet-daemon-topology.c:721
+#: src/topology/gnunet-daemon-topology.c:806
 #, fuzzy
 msgid "# friends connected"
 msgstr "# av anslutna parter"
 
-#: src/topology/gnunet-daemon-topology.c:991
+#: src/topology/gnunet-daemon-topology.c:987
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1034
+#: src/topology/gnunet-daemon-topology.c:1030
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1040
+#: src/topology/gnunet-daemon-topology.c:1036
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:1045
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1057
+#: src/topology/gnunet-daemon-topology.c:1053
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1077
+#: src/topology/gnunet-daemon-topology.c:1073
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1090
+#: src/topology/gnunet-daemon-topology.c:1086
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1100
+#: src/topology/gnunet-daemon-topology.c:1096
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1106
+#: src/topology/gnunet-daemon-topology.c:1102
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1116
+#: src/topology/gnunet-daemon-topology.c:1112
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1122
+#: src/topology/gnunet-daemon-topology.c:1118
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1129
+#: src/topology/gnunet-daemon-topology.c:1125
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1164
+#: src/topology/gnunet-daemon-topology.c:1156
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/topology/gnunet-daemon-topology.c:1219
+#: src/topology/gnunet-daemon-topology.c:1211
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1358
+#: src/topology/gnunet-daemon-topology.c:1350
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:246
+#: src/transport/gnunet-service-transport_blacklist.c:267
 #, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "Adding blacklisting entry for peer `%s'\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:263
-#, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:284
-#: src/transport/gnunet-service-transport_blacklist.c:308
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:295
-#: src/transport/gnunet-service-transport_blacklist.c:331
+#: src/transport/gnunet-service-transport_blacklist.c:275
 #, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:345
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:359
-#, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_blacklist.c:514
-#: src/transport/gnunet-service-transport_blacklist.c:752
+#: src/transport/gnunet-service-transport_blacklist.c:453
+#: src/transport/gnunet-service-transport_blacklist.c:718
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:183
+#: src/transport/gnunet-service-transport.c:174
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport.c:258
+#: src/transport/gnunet-service-transport.c:239
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# byte krypterade"
 
-#: src/transport/gnunet-service-transport.c:305
+#: src/transport/gnunet-service-transport.c:286
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
 
-#: src/transport/gnunet-service-transport.c:613
+#: src/transport/gnunet-service-transport.c:642
 #, fuzzy, c-format
 msgid "Transport service could not access hostkey: %s. Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/transport/gnunet-service-transport.c:708
+#: src/transport/gnunet-service-transport.c:741
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5040,138 +5166,138 @@
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:546
+#: src/transport/gnunet-service-transport_clients.c:536
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:687
+#: src/transport/gnunet-service-transport_clients.c:677
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:738
+#: src/transport/gnunet-service-transport_clients.c:728
 #, fuzzy
 msgid "# REQUEST CONNECT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_hello.c:175
+#: src/transport/gnunet-service-transport_hello.c:179
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1227
+#: src/transport/gnunet-service-transport_neighbours.c:1216
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1357
-#: src/transport/gnunet-service-transport_neighbours.c:1694
+#: src/transport/gnunet-service-transport_neighbours.c:1346
+#: src/transport/gnunet-service-transport_neighbours.c:1678
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1362
+#: src/transport/gnunet-service-transport_neighbours.c:1351
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1367
+#: src/transport/gnunet-service-transport_neighbours.c:1356
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1424
+#: src/transport/gnunet-service-transport_neighbours.c:1413
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1466
+#: src/transport/gnunet-service-transport_neighbours.c:1455
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1490
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1498
+#: src/transport/gnunet-service-transport_neighbours.c:1487
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1535
+#: src/transport/gnunet-service-transport_neighbours.c:1520
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1544
+#: src/transport/gnunet-service-transport_neighbours.c:1529
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1600
+#: src/transport/gnunet-service-transport_neighbours.c:1584
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1634
+#: src/transport/gnunet-service-transport_neighbours.c:1618
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1650
+#: src/transport/gnunet-service-transport_neighbours.c:1634
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2802
+#: src/transport/gnunet-service-transport_neighbours.c:2770
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2817
-#: src/transport/gnunet-service-transport_neighbours.c:2851
+#: src/transport/gnunet-service-transport_neighbours.c:2785
+#: src/transport/gnunet-service-transport_neighbours.c:2819
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2864
+#: src/transport/gnunet-service-transport_neighbours.c:2832
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2897
+#: src/transport/gnunet-service-transport_neighbours.c:2865
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3082
+#: src/transport/gnunet-service-transport_neighbours.c:3046
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3137
+#: src/transport/gnunet-service-transport_neighbours.c:3101
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3151
+#: src/transport/gnunet-service-transport_neighbours.c:3115
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3182
+#: src/transport/gnunet-service-transport_neighbours.c:3146
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3193
+#: src/transport/gnunet-service-transport_neighbours.c:3157
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3224
+#: src/transport/gnunet-service-transport_neighbours.c:3188
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3319
+#: src/transport/gnunet-service-transport_neighbours.c:3283
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-service-transport_plugins.c:111
+#: src/transport/gnunet-service-transport_plugins.c:113
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
@@ -5221,7 +5347,7 @@
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1302
+#: src/transport/gnunet-service-transport_validation.c:1305
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
@@ -5265,278 +5391,278 @@
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:531
+#: src/transport/gnunet-transport.c:528
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/transport/gnunet-transport.c:553
+#: src/transport/gnunet-transport.c:550
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:588
+#: src/transport/gnunet-transport.c:585
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:664
+#: src/transport/gnunet-transport.c:655
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:687
+#: src/transport/gnunet-transport.c:678
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:702
+#: src/transport/gnunet-transport.c:693
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:766
+#: src/transport/gnunet-transport.c:757
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-transport.c:794
+#: src/transport/gnunet-transport.c:785
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:828
+#: src/transport/gnunet-transport.c:819
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:825
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:854 src/transport/gnunet-transport.c:884
-#: src/transport/gnunet-transport.c:906 src/transport/gnunet-transport.c:945
+#: src/transport/gnunet-transport.c:845 src/transport/gnunet-transport.c:875
+#: src/transport/gnunet-transport.c:897 src/transport/gnunet-transport.c:936
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:861 src/transport/gnunet-transport.c:891
+#: src/transport/gnunet-transport.c:852 src/transport/gnunet-transport.c:882
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:911
+#: src/transport/gnunet-transport.c:902
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:996
+#: src/transport/gnunet-transport.c:987
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:999
+#: src/transport/gnunet-transport.c:990
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:993
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1008
+#: src/transport/gnunet-transport.c:999
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1011
+#: src/transport/gnunet-transport.c:1002
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:1014
+#: src/transport/gnunet-transport.c:1005
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1018
+#: src/transport/gnunet-transport.c:1009
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1021
+#: src/transport/gnunet-transport.c:1012
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1032
+#: src/transport/gnunet-transport.c:1023
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/plugin_transport_http.c:817
-#: src/transport/plugin_transport_http_server.c:2556
+#: src/transport/plugin_transport_http.c:815
+#: src/transport/plugin_transport_http_server.c:2566
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:866
-#: src/transport/plugin_transport_http_server.c:2324
+#: src/transport/plugin_transport_http.c:864
+#: src/transport/plugin_transport_http_server.c:2334
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/transport/plugin_transport_http.c:898
-#: src/transport/plugin_transport_http_server.c:2356 src/util/service.c:1053
+#: src/transport/plugin_transport_http.c:896
+#: src/transport/plugin_transport_http_server.c:2366 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_http.c:915
-#: src/transport/plugin_transport_http_server.c:2373 src/util/service.c:1070
+#: src/transport/plugin_transport_http.c:913
+#: src/transport/plugin_transport_http_server.c:2383 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/plugin_transport_http.c:1020
-#: src/transport/plugin_transport_http_server.c:2484
+#: src/transport/plugin_transport_http.c:1018
+#: src/transport/plugin_transport_http_server.c:2494
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1133
-#: src/transport/plugin_transport_http_server.c:2652
+#: src/transport/plugin_transport_http.c:1131
+#: src/transport/plugin_transport_http_server.c:2673
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1146
-#: src/transport/plugin_transport_http_server.c:2663
+#: src/transport/plugin_transport_http.c:1144
+#: src/transport/plugin_transport_http_server.c:2684
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/plugin_transport_http.c:1157
+#: src/transport/plugin_transport_http.c:1155
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1177
+#: src/transport/plugin_transport_http.c:1175
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1206
+#: src/transport/plugin_transport_http.c:1204
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1223
-#: src/transport/plugin_transport_http_server.c:2745
+#: src/transport/plugin_transport_http.c:1221
+#: src/transport/plugin_transport_http_server.c:2774
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/transport/plugin_transport_http.c:1228
+#: src/transport/plugin_transport_http.c:1226
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1531
+#: src/transport/plugin_transport_http_client.c:1535
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1662
-#: src/transport/plugin_transport_http_server.c:2869
+#: src/transport/plugin_transport_http_client.c:1666
+#: src/transport/plugin_transport_http_server.c:2898
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1687
-#: src/transport/plugin_transport_http_server.c:2928
+#: src/transport/plugin_transport_http_client.c:1691
+#: src/transport/plugin_transport_http_server.c:2957
 #, 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:1715
-#: src/transport/plugin_transport_http_server.c:2775
+#: src/transport/plugin_transport_http_client.c:1719
+#: src/transport/plugin_transport_http_server.c:2804
 #, 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:1342
+#: src/transport/plugin_transport_http_server.c:1352
 #, 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:1603
+#: src/transport/plugin_transport_http_server.c:1613
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1611
+#: src/transport/plugin_transport_http_server.c:1621
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1912
+#: src/transport/plugin_transport_http_server.c:1922
 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:1936
+#: src/transport/plugin_transport_http_server.c:1946
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2631
+#: src/transport/plugin_transport_http_server.c:2652
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2645
+#: src/transport/plugin_transport_http_server.c:2666
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2670
+#: src/transport/plugin_transport_http_server.c:2691
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2685
+#: src/transport/plugin_transport_http_server.c:2706
 #, 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:2695
+#: src/transport/plugin_transport_http_server.c:2716
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2716
+#: src/transport/plugin_transport_http_server.c:2737
 #, 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:2726
+#: src/transport/plugin_transport_http_server.c:2747
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2761
+#: src/transport/plugin_transport_http_server.c:2790
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -5607,7 +5733,7 @@
 #: src/transport/plugin_transport_tcp.c:778
 #: src/transport/plugin_transport_tcp.c:967
 #: src/transport/plugin_transport_tcp.c:1826
-#: src/transport/plugin_transport_tcp.c:2462
+#: src/transport/plugin_transport_tcp.c:2456
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
@@ -5646,62 +5772,67 @@
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:2046
+#: src/transport/plugin_transport_tcp.c:2036
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2124
+#: src/transport/plugin_transport_tcp.c:2118
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2350 src/util/service.c:948
+#: src/transport/plugin_transport_tcp.c:2344 src/util/service.c:948
 #: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2364
+#: src/transport/plugin_transport_tcp.c:2358
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2450
+#: src/transport/plugin_transport_tcp.c:2444
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2454
+#: src/transport/plugin_transport_tcp.c:2448
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2458
+#: src/transport/plugin_transport_tcp.c:2452
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:128
+#: src/transport/plugin_transport_udp_broadcasting.c:134
 #, fuzzy
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:169
+#: src/transport/plugin_transport_udp_broadcasting.c:184
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:394
+#: src/transport/plugin_transport_udp_broadcasting.c:403
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:420
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2517
+#: src/transport/plugin_transport_udp.c:2520
 #, 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:2531
+#: src/transport/plugin_transport_udp.c:2534
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5709,22 +5840,22 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2772
+#: src/transport/plugin_transport_udp.c:2775
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:2848
+#: src/transport/plugin_transport_udp.c:2851
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2891
+#: src/transport/plugin_transport_udp.c:2894
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_unix.c:1355
+#: src/transport/plugin_transport_unix.c:1353
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -5740,7 +5871,7 @@
 
 #: src/transport/plugin_transport_wlan.c:645
 #: src/transport/plugin_transport_wlan.c:695
-#: src/transport/plugin_transport_wlan.c:1758
+#: src/transport/plugin_transport_wlan.c:1764
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# sessionsnycklar accepterade"
@@ -5756,61 +5887,61 @@
 
 #: src/transport/plugin_transport_wlan.c:902
 #: src/transport/plugin_transport_wlan.c:987
-#: src/transport/plugin_transport_wlan.c:1760
+#: src/transport/plugin_transport_wlan.c:1766
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1169
+#: src/transport/plugin_transport_wlan.c:1166
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1190
+#: src/transport/plugin_transport_wlan.c:1192
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1200
+#: src/transport/plugin_transport_wlan.c:1202
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1257
+#: src/transport/plugin_transport_wlan.c:1259
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_wlan.c:1358
+#: src/transport/plugin_transport_wlan.c:1364
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1393
+#: src/transport/plugin_transport_wlan.c:1399
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1454
+#: src/transport/plugin_transport_wlan.c:1460
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_wlan.c:1563
+#: src/transport/plugin_transport_wlan.c:1569
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1739
+#: src/transport/plugin_transport_wlan.c:1745
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:659
+#: src/transport/transport_api.c:651
 #, 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:586
+#: src/transport/transport-testing.c:585
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -5881,7 +6012,7 @@
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/util/client.c:1177
+#: src/util/client.c:1178
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -5923,16 +6054,16 @@
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1214
+#: src/util/common_logging.c:1215
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1232
+#: src/util/common_logging.c:1233
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/common_logging.c:1253
+#: src/util/common_logging.c:1254
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -5983,74 +6114,65 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:447
+#: src/util/crypto_ecc.c:444
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (too long, %llu bytes).  "
 "Deleting it.\n"
 msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
-#: src/util/crypto_ecc.c:462 src/util/crypto_rsa.c:676
+#: src/util/crypto_ecc.c:459 src/util/crypto_rsa.c:676
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
 "Deleting it.\n"
 msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
-#: src/util/crypto_ecc.c:558 src/util/crypto_ecc.c:602
+#: src/util/crypto_ecc.c:555 src/util/crypto_ecc.c:599
 #: src/util/crypto_rsa.c:750 src/util/crypto_rsa.c:887
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/crypto_ecc.c:563 src/util/crypto_rsa.c:892
+#: src/util/crypto_ecc.c:560 src/util/crypto_rsa.c:892
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
 
-#: src/util/crypto_ecc.c:606 src/util/crypto_rsa.c:754
+#: src/util/crypto_ecc.c:603 src/util/crypto_rsa.c:754
 #: src/util/crypto_rsa.c:790
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:637 src/util/crypto_rsa.c:785
+#: src/util/crypto_ecc.c:634 src/util/crypto_rsa.c:785
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:642
+#: src/util/crypto_ecc.c:639
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:657 src/util/crypto_rsa.c:805
+#: src/util/crypto_ecc.c:654 src/util/crypto_rsa.c:805
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
-#: src/util/crypto_ecc.c:779 src/util/crypto_rsa.c:982
+#: src/util/crypto_ecc.c:776 src/util/crypto_rsa.c:982
 msgid "interrupted by shutdown"
 msgstr ""
 
-#: src/util/crypto_ecc.c:790
+#: src/util/crypto_ecc.c:787
 #, fuzzy
 msgid "gnunet-ecc failed"
 msgstr "gnunet-update misslyckades!"
 
-#: src/util/crypto_ecc.c:978
+#: src/util/crypto_ecc.c:1045
 #, fuzzy, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
-
-#: src/util/crypto_ecc.c:1046
-#, fuzzy, c-format
 msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:1130
-msgid "To be implemented: not secure at the moment, please read README\n"
-msgstr ""
-
 #: src/util/crypto_random.c:281
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
@@ -6084,17 +6206,17 @@
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/disk.c:1206
+#: src/util/disk.c:1207
 #, 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:1560 src/util/service.c:1670
+#: src/util/disk.c:1564 src/util/service.c:1670
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/util/disk.c:1999
+#: src/util/disk.c:2007
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
@@ -6167,12 +6289,12 @@
 "Argument som är obligatoriska för långa flaggor är också obligatoriska för "
 "korta flaggor.\n"
 
-#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:316
+#: src/util/getopt_helpers.c:270 src/util/getopt_helpers.c:328
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/getopt_helpers.c:288
+#: src/util/getopt_helpers.c:300
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
@@ -6339,18 +6461,29 @@
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:420
+#: src/util/os_installation.c:423
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:702
+#: src/util/os_installation.c:709
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
+# drive = hard drive ?
+#: src/util/os_installation.c:767
+#, fuzzy, c-format
+msgid "CreateProcess failed for binary %s (%d).\n"
+msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+
+#: src/util/os_installation.c:777
+#, c-format
+msgid "GetExitCodeProcess failed for binary %s (%d).\n"
+msgstr ""
+
 #: src/util/plugin.c:89
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -6376,16 +6509,6 @@
 msgid "Could not access configuration file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/pseudonym.c:329 src/util/pseudonym.c:632
-#, fuzzy, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/util/pseudonym.c:464 src/util/pseudonym.c:490 src/util/pseudonym.c:628
-#, fuzzy
-msgid "no-name"
-msgstr "Visa namn"
-
 #: src/util/resolver_api.c:202
 #, fuzzy, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
@@ -6424,22 +6547,22 @@
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/server.c:426
+#: src/util/server.c:436
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/server.c:435
+#: src/util/server.c:445
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/util/server.c:446
+#: src/util/server.c:456
 #, fuzzy, c-format
 msgid "`%s' failed for `%.*s': address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/util/server.c:830
+#: src/util/server.c:848
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -6620,23 +6743,23 @@
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1086
+#: src/util/strings.c:1098
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1094
+#: src/util/strings.c:1106
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1100
+#: src/util/strings.c:1112
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1107
+#: src/util/strings.c:1119
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1116
+#: src/util/strings.c:1128
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
@@ -6815,23 +6938,92 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:579 src/include/gnunet_common.h:584
-#: src/include/gnunet_common.h:590
+#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
+#: src/include/gnunet_common.h:591
 #, 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:600
+#: src/include/gnunet_common.h:601
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:621 src/include/gnunet_common.h:628
+#: src/include/gnunet_common.h:622 src/include/gnunet_common.h:629
 #, 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 "Service `%s' has been stopped.\n"
+#~ msgstr "Tjänst borttagen.\n"
+
+#, fuzzy
+#~ msgid "Service `%s' was already running.\n"
+#~ msgstr "\"%s\" är inte en fil.\n"
+
+#, fuzzy
+#~ msgid "Service `%s' has been started.\n"
+#~ msgstr "Tjänst borttagen.\n"
+
+#, fuzzy
+#~ msgid "Service `%s' was already being stopped.\n"
+#~ msgstr "Tjänst borttagen.\n"
+
+#, fuzzy
+#~ msgid "Service `%s' was already not running.\n"
+#~ msgstr "\"%s\" är inte en fil.\n"
+
+#, fuzzy
+#~ msgid "Error communicating with ARM service.\n"
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid "Timeout communicating with ARM service.\n"
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid "Operation failed.\n"
+#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Error in communication with PEERINFO service\n"
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
+#~ msgid "%s Received message from %s of type %d, distance %u!\n"
+#~ msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Creating a peer failed. Error: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Fel vid uppladdning av fil: %s\n"
+
+#, fuzzy
+#~ msgid "Exiting\n"
+#~ msgstr ""
+#~ "\n"
+#~ "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"
+
+#, fuzzy
+#~ msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+#~ msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+#~ msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
+
+#, fuzzy
 #~ msgid "Failed to read hostkey: %s\n"
 #~ msgstr "Misslyckades att starta samling.\n"
 
@@ -6914,10 +7106,6 @@
 #~ msgstr "Anrop till \"%s\" med nyckel \"%s\".\n"
 
 #, fuzzy
-#~ msgid "Starting HELPER process `%s'\n"
-#~ msgstr "Startade samling \"%s\".\n"
-
-#, fuzzy
 #~ msgid "Asked to start service `%s' within %llu ms\n"
 #~ msgstr "\"%s\": Mottog inte meddelande inom %llu ms.\n"
 
@@ -7172,10 +7360,6 @@
 #~ msgstr "Kunde inte skapa värdnyckel!\n"
 
 #, fuzzy
-#~ msgid "Could not open hostkeys file: %s\n"
-#~ msgstr "Kunde inte skapa värdnyckel!\n"
-
-#, fuzzy
 #~ msgid "access (%s, X_OK) failed: %s\n"
 #~ msgstr "\"%s\" %s misslyckades: %s\n"
 
@@ -7276,10 +7460,6 @@
 #~ msgstr "# krypterade PONG-meddelanden mottagna"
 
 #, fuzzy
-#~ msgid "Unknown user `%s'\n"
-#~ msgstr "Okänd operation \"%s\"\n"
-
-#, fuzzy
 #~ msgid "Namespace `%s' unknown.\n"
 #~ msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
 
@@ -7322,10 +7502,6 @@
 #~ msgstr "var informativ"
 
 #, fuzzy
-#~ msgid "Failed to stop service `%s'!\n"
-#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#, fuzzy
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "Misslyckades att starta samling.\n"
 
@@ -8048,10 +8224,6 @@
 #~ msgstr "Fel vid %s:%d.\n"
 
 #, fuzzy
-#~ msgid "Waiting for peers to connect"
-#~ msgstr "Väntar på att motparter ska ansluta (%u iterationer kvar)...\n"
-
-#, fuzzy
 #~ msgid "Bootstrap data obtained from `%s' is invalid.\n"
 #~ msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
 
@@ -8592,9 +8764,6 @@
 #~ msgid "Updated data for %d applications.\n"
 #~ msgstr "Uppdaterade data för %d program.\n"
 
-#~ msgid "`%s' starting\n"
-#~ msgstr "\"%s\" startar\n"
-
 #~ msgid "Argument %d: `%s'\n"
 #~ msgstr "Argument %d: \"%s\"\n"
 

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2013-04-27 11:04:29 UTC (rev 27000)
+++ gnunet/po/vi.po     2013-04-27 14:16:29 UTC (rev 27001)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-03-06 00:28+0100\n"
+"POT-Creation-Date: 2013-04-27 12:39+0200\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -19,315 +19,422 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/arm/arm_api.c:162
-msgid "Failed to transmit shutdown request to client.\n"
+#: src/arm/arm_api.c:880
+msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:166
+#: src/arm/arm_monitor_api.c:321
+msgid ""
+"Monitoring client was disconnected from arm service, trying to reconnect.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:159
 #, fuzzy, c-format
-msgid "Service `%s' is unknown to ARM.\n"
-msgstr "Không gian tên « %s » có đánh giá %d.\n"
+msgid "Failed to remove configuration file %s\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/arm/gnunet-arm.c:171
+#: src/arm/gnunet-arm.c:165
 #, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "Dịch vụ đã bị xoá.\n"
+msgid "Failed to remove servicehome directory %s\n"
+msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 
-#: src/arm/gnunet-arm.c:174
+#: src/arm/gnunet-arm.c:204 src/testbed/gnunet-service-testbed_peers.c:712
+msgid "Message was sent successfully"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:206 src/testbed/gnunet-service-testbed_peers.c:714
+#, fuzzy
+msgid "Misconfiguration (can't connect to the ARM service)"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/arm/gnunet-arm.c:208 src/testbed/gnunet-service-testbed_peers.c:716
+#, fuzzy
+msgid "We disconnected from ARM before we could send a request"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#: src/arm/gnunet-arm.c:210 src/testbed/gnunet-service-testbed_peers.c:718
+msgid "ARM API is busy"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:212 src/testbed/gnunet-service-testbed_peers.c:720
+msgid "Request doesn't fit into a message"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:722
+#, fuzzy
+msgid "Request timed out"
+msgstr "# các khoá phiên chạy được chấp nhận"
+
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:724
+#, fuzzy
+msgid "Unknown request status"
+msgstr "Không rõ người dùng « %s »\n"
+
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:740
 #, fuzzy, c-format
-msgid "Service `%s' was already running.\n"
-msgstr "Không gian tên « %s » có đánh giá %d.\n"
+msgid "%s is stopped"
+msgstr "# các byte trong kho dữ liệu"
 
-#: src/arm/gnunet-arm.c:179
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:742
+#, c-format
+msgid "%s is starting"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:236 src/testbed/gnunet-service-testbed_peers.c:744
+#, c-format
+msgid "%s is stopping"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:238 src/testbed/gnunet-service-testbed_peers.c:746
 #, fuzzy, c-format
-msgid "Service `%s' has been started.\n"
-msgstr "Dịch vụ đã bị xoá.\n"
+msgid "%s is starting already"
+msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:182
+#: src/arm/gnunet-arm.c:240 src/testbed/gnunet-service-testbed_peers.c:748
+#, c-format
+msgid "%s is stopping already"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:750
+#, c-format
+msgid "%s is started already"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:752
+#, c-format
+msgid "%s is stopped already"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:754
 #, fuzzy, c-format
-msgid "Service `%s' was already being stopped.\n"
-msgstr "Dịch vụ đã bị xoá.\n"
+msgid "%s service is not known to ARM"
+msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/arm/gnunet-arm.c:186
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:756
 #, fuzzy, c-format
-msgid "Service `%s' was already not running.\n"
-msgstr "« %s » không phải là một tập tin.\n"
+msgid "%s service failed to start"
+msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:190
-#, fuzzy
-msgid "Request ignored as ARM is shutting down.\n"
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:758
+#, fuzzy, c-format
+msgid "%s service can't be started because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
 
-#: src/arm/gnunet-arm.c:194
-#, fuzzy
-msgid "Error communicating with ARM service.\n"
-msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:760
+#, c-format
+msgid "%.s Unknown result code."
+msgstr ""
 
-#: src/arm/gnunet-arm.c:198
-#, fuzzy
-msgid "Timeout communicating with ARM service.\n"
-msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+#: src/arm/gnunet-arm.c:271
+msgid "Fatal error initializing ARM API.\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:202
-#, fuzzy
-msgid "Operation failed.\n"
-msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
+#: src/arm/gnunet-arm.c:291
+#, fuzzy, c-format
+msgid "Failed to send a request to kill the `%s' service: %%s\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:206
-msgid "Unknown response code from ARM.\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:307
+#, fuzzy, c-format
+msgid "Failed to kill the `%s' service: %s\n"
+msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/arm/gnunet-arm.c:229
+#: src/arm/gnunet-arm.c:323
+#, fuzzy, c-format
+msgid "Failed to send a stop request to the ARM service: %s\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/arm/gnunet-arm.c:345
+#, fuzzy, c-format
+msgid "Failed to stop the ARM service: %s\n"
+msgstr "Lỗi vào phòng « %s »\n"
+
+#: src/arm/gnunet-arm.c:361 src/arm/gnunet-arm.c:370
+#, fuzzy, c-format
+msgid "Failed to start the ARM service: %s\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/arm/gnunet-arm.c:390
+#, fuzzy, c-format
+msgid "Failed to send a request to start the `%s' service: %%s\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/arm/gnunet-arm.c:405
+#, fuzzy, c-format
+msgid "Failed to start the `%s' service: %s\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/arm/gnunet-arm.c:423
+#, fuzzy, c-format
+msgid "Failed to request a list of services: %s\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/arm/gnunet-arm.c:430
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/arm/gnunet-arm.c:232
+#: src/arm/gnunet-arm.c:433
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:253
-#, fuzzy, c-format
-msgid "Failed to remove configuration file %s\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
+#: src/arm/gnunet-arm.c:534
+msgid "Began monitoring ARM for service status changes\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:259
+#: src/arm/gnunet-arm.c:537
+#, c-format
+msgid "Stopped %s.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:540
 #, fuzzy, c-format
-msgid "Failed to remove servicehome directory %s\n"
-msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
+msgid "Starting %s...\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:407 src/arm/gnunet-arm.c:424
-msgid "Fatal error initializing ARM API.\n"
+#: src/arm/gnunet-arm.c:543
+#, c-format
+msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:453
+#: src/arm/gnunet-arm.c:552
+#, fuzzy, c-format
+msgid "Unknown status %u for service %s.\n"
+msgstr "Không rõ người dùng « %s »\n"
+
+#: src/arm/gnunet-arm.c:622
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:455
+#: src/arm/gnunet-arm.c:624
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:457
+#: src/arm/gnunet-arm.c:626
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:459
+#: src/arm/gnunet-arm.c:628
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:462
+#: src/arm/gnunet-arm.c:631
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:465
+#: src/arm/gnunet-arm.c:634
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:467
+#: src/arm/gnunet-arm.c:636
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:470
+#: src/arm/gnunet-arm.c:639
 #, fuzzy
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr "thời gian chờ sự hoàn thành của một lần lặp (theo miligiây)"
 
-#: src/arm/gnunet-arm.c:472
+#: src/arm/gnunet-arm.c:641
 #, fuzzy
 msgid "list currently running services"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:474
+#: src/arm/gnunet-arm.c:643
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:476
+#: src/arm/gnunet-arm.c:645
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:487
+#: src/arm/gnunet-arm.c:656
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:345
+#: src/arm/gnunet-service-arm.c:257
+msgid "Could not send status result to client\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:291
+#, fuzzy
+msgid "Could not send list result to client\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#: src/arm/gnunet-service-arm.c:500
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-service-arm.c:348
+#: src/arm/gnunet-service-arm.c:507
 #, fuzzy, c-format
 msgid "Starting service `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:374
-msgid "Could not send status result to client\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:406
-#, fuzzy
-msgid "Could not send list result to client\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
-
-#: src/arm/gnunet-service-arm.c:537
+#: src/arm/gnunet-service-arm.c:602
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/arm/gnunet-service-arm.c:559
+#: src/arm/gnunet-service-arm.c:624
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:573
+#: src/arm/gnunet-service-arm.c:638
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:681
+#: src/arm/gnunet-service-arm.c:771
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:892
+#: src/arm/gnunet-service-arm.c:1023
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:985
+#: src/arm/gnunet-service-arm.c:1116
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:990
+#: src/arm/gnunet-service-arm.c:1121
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:995
+#: src/arm/gnunet-service-arm.c:1126
 #, fuzzy
 msgid "unknown"
 msgstr "Lỗi không rõ"
 
-#: src/arm/gnunet-service-arm.c:1001
+#: src/arm/gnunet-service-arm.c:1132
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-service-arm.c:1036
+#: src/arm/gnunet-service-arm.c:1154
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1228
+#: src/arm/gnunet-service-arm.c:1169
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1386
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:1239
+#: src/arm/gnunet-service-arm.c:1397
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1253
+#: src/arm/gnunet-service-arm.c:1411
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:44
+#: src/arm/mockup-service.c:46
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:465
+#: src/ats/ats_api_performance.c:475
 #, fuzzy, c-format
 msgid "Received %s message\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/ats/ats_api_performance.c:508
+#: src/ats/ats_api_performance.c:518
 #, fuzzy, c-format
 msgid "Received last message for %s \n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1176
-#: src/ats/gnunet-service-ats_addresses.c:1210
+#: src/ats/gnunet-service-ats_addresses.c:1372
+#: src/ats/gnunet-service-ats_addresses.c:1406
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1182
+#: src/ats/gnunet-service-ats_addresses.c:1378
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1189
+#: src/ats/gnunet-service-ats_addresses.c:1385
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1216
+#: src/ats/gnunet-service-ats_addresses.c:1412
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1223
+#: src/ats/gnunet-service-ats_addresses.c:1419
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:735
+#: src/ats/gnunet-service-ats_addresses_mlp.c:756
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1044
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1075
 #, 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/gnunet-service-ats_addresses_mlp.c:1226
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1258
 #, c-format
 msgid "Update for ATS type `%s' not implemented!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1306
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1341
 #, c-format
 msgid "Updating address for peer `%s' not added before\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1726
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1761
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1734
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1769
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1744
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1779
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1752
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1787
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1763
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1798
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
@@ -349,85 +456,85 @@
 "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:326
+#: src/ats-tool/gnunet-ats.c:320
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:345 src/namestore/gnunet-namestore.c:610
-#: src/transport/gnunet-transport.c:813
+#: src/ats-tool/gnunet-ats.c:339 src/namestore/gnunet-namestore.c:610
+#: src/transport/gnunet-transport.c:804
 #, 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:355 src/transport/gnunet-transport.c:819
+#: src/ats-tool/gnunet-ats.c:349 src/transport/gnunet-transport.c:810
 #, 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:363
+#: src/ats-tool/gnunet-ats.c:357
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:379 src/ats-tool/gnunet-ats.c:398
-#: src/ats-tool/gnunet-ats.c:415 src/ats-tool/gnunet-ats.c:440
+#: src/ats-tool/gnunet-ats.c:373 src/ats-tool/gnunet-ats.c:392
+#: src/ats-tool/gnunet-ats.c:409 src/ats-tool/gnunet-ats.c:434
 #, fuzzy, c-format
 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:388 src/ats-tool/gnunet-ats.c:405
+#: src/ats-tool/gnunet-ats.c:382 src/ats-tool/gnunet-ats.c:399
 #, fuzzy, c-format
 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:433
+#: src/ats-tool/gnunet-ats.c:427
 msgid "Type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:490
+#: src/ats-tool/gnunet-ats.c:484
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:493
+#: src/ats-tool/gnunet-ats.c:487
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:496
+#: src/ats-tool/gnunet-ats.c:490
 #, 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:499
+#: src/ats-tool/gnunet-ats.c:493
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:502
+#: src/ats-tool/gnunet-ats.c:496
 #, 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:505
+#: src/ats-tool/gnunet-ats.c:499
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:502
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:511
+#: src/ats-tool/gnunet-ats.c:505
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:514
+#: src/ats-tool/gnunet-ats.c:508
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:517
+#: src/ats-tool/gnunet-ats.c:511
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:526
+#: src/ats-tool/gnunet-ats.c:520
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -437,21 +544,21 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/consensus/gnunet-consensus.c:317
+#: src/consensus/gnunet-consensus.c:350
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "số lần lặp lại"
 
-#: src/consensus/gnunet-consensus.c:320
+#: src/consensus/gnunet-consensus.c:353
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus.c:323
+#: src/consensus/gnunet-consensus.c:356
 #, fuzzy
 msgid "number of values"
 msgstr "số lần lặp lại"
 
-#: src/consensus/gnunet-consensus.c:326
+#: src/consensus/gnunet-consensus.c:359
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# các khoá phiên chạy được chấp nhận"
@@ -478,52 +585,52 @@
 msgid "ibf size"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-start-peers.c:158
+#: src/consensus/gnunet-consensus-start-peers.c:172
 msgid "start peers with the given template configuration"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-start-peers.c:161
+#: src/consensus/gnunet-consensus-start-peers.c:175
 #, fuzzy
 msgid "number of peers to start"
 msgstr "số lần lặp lại"
 
-#: src/core/core_api.c:755
+#: src/core/core_api.c:752
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:86 src/peerinfo-tool/gnunet-peerinfo.c:214
+#: src/core/gnunet-core.c:82
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/core/gnunet-core.c:119 src/core/gnunet-core.c:147
-#: src/transport/gnunet-transport.c:612 src/transport/gnunet-transport.c:636
+#: src/core/gnunet-core.c:112 src/core/gnunet-core.c:140
+#: src/transport/gnunet-transport.c:606 src/transport/gnunet-transport.c:630
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:121 src/transport/gnunet-transport.c:614
+#: src/core/gnunet-core.c:114 src/transport/gnunet-transport.c:608
 #, fuzzy
 msgid "Connected to"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/core/gnunet-core.c:149 src/transport/gnunet-transport.c:638
+#: src/core/gnunet-core.c:142 src/transport/gnunet-transport.c:632
 #, fuzzy
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:176
-#: src/peerinfo-tool/gnunet-peerinfo.c:541
+#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:176
+#: src/peerinfo-tool/gnunet-peerinfo.c:643
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/core/gnunet-core.c:211 src/transport/gnunet-transport.c:1005
+#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:996
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/core/gnunet-core.c:222
+#: src/core/gnunet-core.c:215
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -544,7 +651,7 @@
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
 #: src/core/gnunet-service-core.c:164
-#: src/transport/gnunet-service-transport.c:725
+#: src/transport/gnunet-service-transport.c:758
 #, fuzzy
 msgid "Transport service is unable to access hostkey. Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
@@ -670,44 +777,44 @@
 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:1312
+#: src/core/gnunet-service-core_kx.c:1298
 #, 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:1319
+#: src/core/gnunet-service-core_kx.c:1305
 #, 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:1322
+#: src/core/gnunet-service-core_kx.c:1308
 #, 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:1365
-#: src/core/gnunet-service-core_kx.c:1390
+#: src/core/gnunet-service-core_kx.c:1351
+#: src/core/gnunet-service-core_kx.c:1376
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1377
+#: src/core/gnunet-service-core_kx.c:1363
 #, 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:1418
+#: src/core/gnunet-service-core_kx.c:1404
 #, 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:1426
+#: src/core/gnunet-service-core_kx.c:1412
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1443
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
@@ -718,7 +825,7 @@
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
 #: src/core/gnunet-service-core_neighbours.c:179
-#: src/core/gnunet-service-core_neighbours.c:333
+#: src/core/gnunet-service-core_neighbours.c:328
 msgid "# neighbour entries allocated"
 msgstr ""
 
@@ -726,23 +833,23 @@
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:420
+#: src/core/gnunet-service-core_neighbours.c:411
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:210
 #: src/core/gnunet-service-core_sessions.c:280
-#: src/dht/gnunet-service-dht_neighbours.c:645
-#: src/dht/gnunet-service-dht_neighbours.c:704
-#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1530
-#: src/topology/gnunet-daemon-topology.c:704
-#: src/topology/gnunet-daemon-topology.c:805
-#: src/transport/gnunet-service-transport_neighbours.c:1052
-#: src/transport/gnunet-service-transport_neighbours.c:1276
-#: src/transport/gnunet-service-transport_neighbours.c:1285
-#: src/transport/gnunet-service-transport_neighbours.c:2826
-#: src/transport/gnunet-service-transport_neighbours.c:3089
+#: src/dht/gnunet-service-dht_neighbours.c:644
+#: src/dht/gnunet-service-dht_neighbours.c:703
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
+#: src/topology/gnunet-daemon-topology.c:700
+#: src/topology/gnunet-daemon-topology.c:801
+#: src/transport/gnunet-service-transport_neighbours.c:1041
+#: src/transport/gnunet-service-transport_neighbours.c:1265
+#: src/transport/gnunet-service-transport_neighbours.c:1274
+#: src/transport/gnunet-service-transport_neighbours.c:2794
+#: src/transport/gnunet-service-transport_neighbours.c:3053
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
@@ -816,14 +923,14 @@
 #: src/datacache/plugin_datacache_sqlite.c:72
 #: src/datastore/plugin_datastore_mysql.c:803
 #: src/datastore/plugin_datastore_mysql.c:817
-#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
-#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
-#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/datastore/plugin_datastore_sqlite.c:57 src/fs/fs_pseudonym.c:46
+#: src/mysql/mysql.c:41 src/mysql/mysql.c:48 src/mysql/mysql.c:522
+#: src/mysql/mysql.c:531 src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:46
 #: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
-#: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
+#: src/include/gnunet_common.h:608 src/include/gnunet_common.h:615
 #, 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"
@@ -1229,7 +1336,7 @@
 #: 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:736
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:1037
+#: src/nse/gnunet-nse-profiler.c:900
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1298,87 +1405,87 @@
 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:413
+#: src/dht/gnunet-service-dht_clients.c:414
 #, 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:503
+#: src/dht/gnunet-service-dht_clients.c:508
 #, 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:585
+#: src/dht/gnunet-service-dht_clients.c:590
 #, 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:791
+#: src/dht/gnunet-service-dht_clients.c:796
 #, 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:1035
+#: src/dht/gnunet-service-dht_clients.c:1041
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1048
+#: src/dht/gnunet-service-dht_clients.c:1054
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1085
+#: src/dht/gnunet-service-dht_clients.c:1091
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1108
+#: src/dht/gnunet-service-dht_clients.c:1114
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1157
-#: src/dht/gnunet-service-dht_clients.c:1199
+#: src/dht/gnunet-service-dht_clients.c:1165
+#: src/dht/gnunet-service-dht_clients.c:1207
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1175
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:64
+#: src/dht/gnunet-service-dht_datacache.c:68
 #, 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:74
+#: src/dht/gnunet-service-dht_datacache.c:78
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:159
+#: src/dht/gnunet-service-dht_datacache.c:165
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:170
+#: src/dht/gnunet-service-dht_datacache.c:176
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:176
+#: src/dht/gnunet-service-dht_datacache.c:182
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:182
+#: src/dht/gnunet-service-dht_datacache.c:188
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:194
+#: src/dht/gnunet-service-dht_datacache.c:200
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:197
+#: src/dht/gnunet-service-dht_datacache.c:203
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:227
+#: src/dht/gnunet-service-dht_datacache.c:234
 #, fuzzy
 msgid "# GET requests given to datacache"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
@@ -1388,103 +1495,103 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:501
+#: src/dht/gnunet-service-dht_neighbours.c:504
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:591
+#: src/dht/gnunet-service-dht_neighbours.c:594
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:738
+#: src/dht/gnunet-service-dht_neighbours.c:737
 #, 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:793
+#: src/dht/gnunet-service-dht_neighbours.c:792
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/dht/gnunet-service-dht_neighbours.c:831
+#: src/dht/gnunet-service-dht_neighbours.c:830
 #, fuzzy
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1053
-#: src/dht/gnunet-service-dht_neighbours.c:1081
+#: src/dht/gnunet-service-dht_neighbours.c:1052
+#: src/dht/gnunet-service-dht_neighbours.c:1086
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1062
-#: src/dht/gnunet-service-dht_neighbours.c:1096
+#: src/dht/gnunet-service-dht_neighbours.c:1067
+#: src/dht/gnunet-service-dht_neighbours.c:1101
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr "# các cuộc gọi HTTP select (lựa chọn)"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1230
+#: src/dht/gnunet-service-dht_neighbours.c:1235
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1259
+#: src/dht/gnunet-service-dht_neighbours.c:1264
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1266
-#: src/dht/gnunet-service-dht_neighbours.c:1379
-#: src/dht/gnunet-service-dht_neighbours.c:1479
+#: src/dht/gnunet-service-dht_neighbours.c:1271
+#: src/dht/gnunet-service-dht_neighbours.c:1384
+#: src/dht/gnunet-service-dht_neighbours.c:1484
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1344
+#: src/dht/gnunet-service-dht_neighbours.c:1349
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1371
+#: src/dht/gnunet-service-dht_neighbours.c:1376
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1486
+#: src/dht/gnunet-service-dht_neighbours.c:1491
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1574
+#: src/dht/gnunet-service-dht_neighbours.c:1575
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1704
+#: src/dht/gnunet-service-dht_neighbours.c:1730
 #, fuzzy
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1712
+#: src/dht/gnunet-service-dht_neighbours.c:1738
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-dht_neighbours.c:1829
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1845
+#: src/dht/gnunet-service-dht_neighbours.c:1882
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1859
+#: src/dht/gnunet-service-dht_neighbours.c:1896
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1943
+#: src/dht/gnunet-service-dht_neighbours.c:1973
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -1649,21 +1756,15 @@
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/dv/dv_api.c:189
-#, fuzzy
-msgid "Failed to connect to the dv service!\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
+#: src/dv/gnunet-dv.c:165
+msgid "verbose output"
+msgstr ""
 
-#: src/dv/gnunet-service-dv.c:3003
+#: src/dv/gnunet-dv.c:174
 #, fuzzy
-msgid "Error in communication with PEERINFO service\n"
-msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+msgid "Print information about DV state"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/dv/plugin_transport_dv.c:159
-#, fuzzy, c-format
-msgid "%s Received message from %s of type %d, distance %u!\n"
-msgstr "Nhận được thông báo bị hỏng từ đồng đẳng « %s » trong %s:%d.\n"
-
 #: src/exit/gnunet-daemon-exit.c:741
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
@@ -2123,7 +2224,7 @@
 msgid "Identifiers or URI too long to create UBlock"
 msgstr ""
 
-#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:307
+#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:311
 #, fuzzy
 msgid "Internal error."
 msgstr "Lỗi VR."
@@ -2133,6 +2234,26 @@
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
+#: src/fs/fs_pseudonym.c:342 src/fs/fs_pseudonym.c:645
+#, fuzzy, c-format
+msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+msgstr "Lỗi phân tích dữ liệu giao diện từ « %s ».\n"
+
+#: src/fs/fs_pseudonym.c:477 src/fs/fs_pseudonym.c:503
+#: src/fs/fs_pseudonym.c:641
+msgid "no-name"
+msgstr "không-tên"
+
+#: src/fs/fs_pseudonym.c:1182 src/util/crypto_ecc.c:975
+#, fuzzy, c-format
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "%s bị lỗi tại %s:%d: « %s »\n"
+
+#: src/fs/fs_pseudonym.c:1505
+#, fuzzy, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
+
 #: src/fs/fs_publish.c:129 src/fs/fs_publish.c:397
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
@@ -2195,7 +2316,7 @@
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:269
+#: src/fs/fs_publish_ksk.c:273
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "« %s »: Không thể kết nối.\n"
@@ -2331,19 +2452,19 @@
 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:944
+#: src/fs/fs_uri.c:945
 msgid "identifier is NULL!"
 msgstr ""
 
-#: src/fs/fs_uri.c:949
+#: src/fs/fs_uri.c:951
 msgid "identifier has zero length!"
 msgstr ""
 
-#: src/fs/fs_uri.c:1118 src/fs/fs_uri.c:1145
+#: src/fs/fs_uri.c:1122 src/fs/fs_uri.c:1149
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1151
+#: src/fs/fs_uri.c:1155
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
@@ -2548,19 +2669,19 @@
 msgid "Special file-sharing operations"
 msgstr "Tùy chọn chia sẻ tập tin"
 
-#: src/fs/gnunet-fs-profiler.c:182
+#: src/fs/gnunet-fs-profiler.c:190
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:185
+#: src/fs/gnunet-fs-profiler.c:193
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:188
+#: src/fs/gnunet-fs-profiler.c:196
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:197
+#: src/fs/gnunet-fs-profiler.c:205
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
@@ -2727,7 +2848,7 @@
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
 #: src/fs/gnunet-publish.c:588 src/fs/gnunet-publish.c:595
-#: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
+#: src/transport/gnunet-transport.c:834 src/transport/gnunet-transport.c:864
 #, 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"
@@ -2843,112 +2964,112 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr "Không hiển thị kết quả tìm kiếm cho tập tin được chúng ta tải lên"
 
-#: src/fs/gnunet-service-fs.c:248
+#: src/fs/gnunet-service-fs.c:271
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:309 src/fs/gnunet-service-fs.c:521
+#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:538
 #, 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:626 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1322
-#: src/topology/gnunet-daemon-topology.c:1329
+#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:291
+#: src/topology/gnunet-daemon-topology.c:1314
+#: src/topology/gnunet-daemon-topology.c:1321
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-service-fs_cp.c:711
+#: src/fs/gnunet-service-fs_cp.c:677
 #, 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:715
+#: src/fs/gnunet-service-fs_cp.c:681
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:751
+#: src/fs/gnunet-service-fs_cp.c:716
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/fs/gnunet-service-fs_cp.c:757
+#: src/fs/gnunet-service-fs_cp.c:722
 #, fuzzy
 msgid "# replies dropped"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1331
+#: src/fs/gnunet-service-fs_cp.c:747 src/fs/gnunet-service-fs_cp.c:1296
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:875
+#: src/fs/gnunet-service-fs_cp.c:840
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:928
+#: src/fs/gnunet-service-fs_cp.c:893
 #, 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:936
+#: src/fs/gnunet-service-fs_cp.c:901
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:950
+#: src/fs/gnunet-service-fs_cp.c:915
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:988
+#: src/fs/gnunet-service-fs_cp.c:953
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1056
+#: src/fs/gnunet-service-fs_cp.c:1021
 #, 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:1081
+#: src/fs/gnunet-service-fs_cp.c:1046
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1091
+#: src/fs/gnunet-service-fs_cp.c:1056
 #, 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:1169
+#: src/fs/gnunet-service-fs_cp.c:1134
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1203
+#: src/fs/gnunet-service-fs_cp.c:1168
 #, 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:1226
+#: src/fs/gnunet-service-fs_cp.c:1191
 #, 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:1276
+#: src/fs/gnunet-service-fs_cp.c:1241
 #, 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:1300
+#: src/fs/gnunet-service-fs_cp.c:1265
 #, 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:1329
+#: src/fs/gnunet-service-fs_cp.c:1294
 #, 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:1699
+#: src/fs/gnunet-service-fs_cp.c:1664
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
@@ -3421,103 +3542,103 @@
 msgid "Not a GADS TLD: `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:118
+#: src/hello/gnunet-hello.c:119
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:124
+#: src/hello/gnunet-hello.c:125
 #, 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:132
+#: src/hello/gnunet-hello.c:133
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:139
+#: src/hello/gnunet-hello.c:140
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:149 src/hello/gnunet-hello.c:177
+#: src/hello/gnunet-hello.c:150 src/hello/gnunet-hello.c:179
 #, 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:165
+#: src/hello/gnunet-hello.c:166
 #, 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:189
+#: src/hello/gnunet-hello.c:191
 #, 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/hello.c:904
+#: src/hello/hello.c:936
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:913
+#: src/hello/hello.c:945
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:923
+#: src/hello/hello.c:955
 #, 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:933
+#: src/hello/hello.c:965
 #, 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:950
+#: src/hello/hello.c:982
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:959
+#: src/hello/hello.c:991
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:978
+#: src/hello/hello.c:1010
 #, 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/hostlist/gnunet-daemon-hostlist.c:264
+#: src/hostlist/gnunet-daemon-hostlist.c:258
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:317
+#: src/hostlist/gnunet-daemon-hostlist.c:311
 #, fuzzy
 msgid "advertise our hostlist to other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:322
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/hostlist/gnunet-daemon-hostlist.c:319
 #, fuzzy
 msgid "enable learning about hostlist servers from other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:329
+#: src/hostlist/gnunet-daemon-hostlist.c:323
 #, fuzzy
 msgid "provide a hostlist server"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:344
+#: src/hostlist/gnunet-daemon-hostlist.c:338
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -3545,13 +3666,13 @@
 #: src/hostlist/hostlist-client.c:686 src/hostlist/hostlist-client.c:738
 #: src/hostlist/hostlist-client.c:747 src/hostlist/hostlist-client.c:868
 #: src/hostlist/hostlist-client.c:960 src/hostlist/hostlist-client.c:965
-#: src/transport/plugin_transport_http_client.c:1052
-#: src/transport/plugin_transport_http_client.c:1067
+#: src/transport/plugin_transport_http_client.c:1056
+#: src/transport/plugin_transport_http_client.c:1071
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1327
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1319
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -3601,7 +3722,7 @@
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1500
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1492
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -3610,71 +3731,71 @@
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
+#: src/hostlist/hostlist-client.c:1105 src/hostlist/hostlist-client.c:1121
 #, fuzzy
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: src/hostlist/hostlist-client.c:1275
+#: src/hostlist/hostlist-client.c:1267
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-client.c:1279
+#: src/hostlist/hostlist-client.c:1271
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/hostlist/hostlist-client.c:1282
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/hostlist-client.c:1323
+#: src/hostlist/hostlist-client.c:1315
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1325
+#: src/hostlist/hostlist-client.c:1317
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/hostlist-client.c:1370
+#: src/hostlist/hostlist-client.c:1362
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/hostlist-client.c:1375
+#: src/hostlist/hostlist-client.c:1367
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-client.c:1399 src/hostlist/hostlist-client.c:1416
+#: src/hostlist/hostlist-client.c:1391 src/hostlist/hostlist-client.c:1408
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1411
+#: src/hostlist/hostlist-client.c:1403
 #, fuzzy
 msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/hostlist-client.c:1465
+#: src/hostlist/hostlist-client.c:1457
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1477
+#: src/hostlist/hostlist-client.c:1469
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1489
+#: src/hostlist/hostlist-client.c:1481
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1493
+#: src/hostlist/hostlist-client.c:1485
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
@@ -3688,10 +3809,11 @@
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:425
-#: src/peerinfo-tool/gnunet-peerinfo.c:331
-#: src/peerinfo-tool/gnunet-peerinfo.c:386
-#: src/topology/gnunet-daemon-topology.c:922
+#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:421
+#: src/peerinfo-tool/gnunet-peerinfo.c:348
+#: src/peerinfo-tool/gnunet-peerinfo.c:418
+#: src/peerinfo-tool/gnunet-peerinfo.c:489
+#: src/topology/gnunet-daemon-topology.c:918
 #, 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"
@@ -3748,56 +3870,56 @@
 msgid "# hostlist advertisements send"
 msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
-#: src/hostlist/hostlist-server.c:388
+#: src/hostlist/hostlist-server.c:384
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:552 src/peerinfo-tool/gnunet-peerinfo.c:547
-#: src/transport/gnunet-service-transport.c:632
+#: src/hostlist/hostlist-server.c:548 src/peerinfo-tool/gnunet-peerinfo.c:649
+#: src/transport/gnunet-service-transport.c:661
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/hostlist/hostlist-server.c:562
+#: src/hostlist/hostlist-server.c:558
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:571
+#: src/hostlist/hostlist-server.c:567
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:585
+#: src/hostlist/hostlist-server.c:581
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-server.c:625
+#: src/hostlist/hostlist-server.c:621
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/hostlist-server.c:667
+#: src/hostlist/hostlist-server.c:663
 #, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
 
-#: src/integration-tests/connection_watchdog.c:1001
+#: src/integration-tests/connection_watchdog.c:990
 #, fuzzy, c-format
 msgid "Transport plugin: `%s' port %llu\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/integration-tests/connection_watchdog.c:1034
+#: src/integration-tests/connection_watchdog.c:1023
 #, fuzzy, c-format
 msgid "Found %u transport plugins: `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/integration-tests/connection_watchdog.c:1093
+#: src/integration-tests/connection_watchdog.c:1082
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1102
+#: src/integration-tests/connection_watchdog.c:1091
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr ""
@@ -3817,38 +3939,39 @@
 msgid "Print information about mesh tunnels and peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/mesh/gnunet-service-mesh.c:8010 src/mesh/gnunet-service-mesh-new.c:8015
+#: src/mesh/gnunet-service-mesh.c:7966 src/mesh/gnunet-service-mesh-new.c:7972
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8227 src/mesh/gnunet-service-mesh-new.c:8232
+#: src/mesh/gnunet-service-mesh.c:8179 src/mesh/gnunet-service-mesh-new.c:8185
 #, fuzzy, c-format
 msgid "Mesh service could not access hostkey: %s. Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/mesh/gnunet-service-mesh.c:8309 src/mesh/gnunet-service-mesh.c:8321
-#: src/mesh/gnunet-service-mesh.c:8333 src/mesh/gnunet-service-mesh.c:8347
-#: src/mesh/gnunet-service-mesh.c:8359 src/mesh/gnunet-service-mesh.c:8371
-#: src/mesh/gnunet-service-mesh.c:8383 src/mesh/gnunet-service-mesh-new.c:8321
-#: src/mesh/gnunet-service-mesh-new.c:8333
-#: src/mesh/gnunet-service-mesh-new.c:8345
-#: src/mesh/gnunet-service-mesh-new.c:8359
-#: src/mesh/gnunet-service-mesh-new.c:8371
-#: src/mesh/gnunet-service-mesh-new.c:8383
-#: src/mesh/gnunet-service-mesh-new.c:8395 src/nse/gnunet-service-nse.c:1478
-#: src/nse/gnunet-service-nse.c:1496
-#: src/regex/gnunet-daemon-regexprofiler.c:277
-#: src/regex/gnunet-daemon-regexprofiler.c:290
-#: src/regex/gnunet-daemon-regexprofiler.c:303
+#: src/mesh/gnunet-service-mesh.c:8261 src/mesh/gnunet-service-mesh.c:8273
+#: src/mesh/gnunet-service-mesh.c:8285 src/mesh/gnunet-service-mesh.c:8299
+#: src/mesh/gnunet-service-mesh.c:8311 src/mesh/gnunet-service-mesh.c:8323
+#: src/mesh/gnunet-service-mesh.c:8335 src/mesh/gnunet-service-mesh-new.c:8274
+#: src/mesh/gnunet-service-mesh-new.c:8286
+#: src/mesh/gnunet-service-mesh-new.c:8298
+#: src/mesh/gnunet-service-mesh-new.c:8312
+#: src/mesh/gnunet-service-mesh-new.c:8324
+#: src/mesh/gnunet-service-mesh-new.c:8336
+#: src/mesh/gnunet-service-mesh-new.c:8348 src/nse/gnunet-service-nse.c:1516
+#: src/nse/gnunet-service-nse.c:1534
+#: src/regex/gnunet-daemon-regexprofiler.c:320
+#: src/regex/gnunet-daemon-regexprofiler.c:332
+#: src/regex/gnunet-daemon-regexprofiler.c:344
+#: src/regex/gnunet-daemon-regexprofiler.c:357
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/mesh/gnunet-service-mesh.c:8395 src/mesh/gnunet-service-mesh.c:8405
-#: src/mesh/gnunet-service-mesh.c:8416 src/mesh/gnunet-service-mesh-new.c:8407
-#: src/mesh/gnunet-service-mesh-new.c:8417
-#: src/mesh/gnunet-service-mesh-new.c:8428
+#: src/mesh/gnunet-service-mesh.c:8347 src/mesh/gnunet-service-mesh.c:8357
+#: src/mesh/gnunet-service-mesh.c:8368 src/mesh/gnunet-service-mesh-new.c:8360
+#: src/mesh/gnunet-service-mesh-new.c:8370
+#: src/mesh/gnunet-service-mesh-new.c:8381
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -3940,7 +4063,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:599
+#: src/peerinfo-tool/gnunet-peerinfo.c:701
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
@@ -4233,76 +4356,69 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1013
+#: src/nse/gnunet-nse-profiler.c:885
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/nse/gnunet-nse-profiler.c:1016
+#: src/nse/gnunet-nse-profiler.c:888
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1019
+#: src/nse/gnunet-nse-profiler.c:891 src/testbed/gnunet-testbed-profiler.c:282
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1022
-msgid "IP address of this system as seen by the rest of the testbed"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:1025
-msgid "delay between queries to statistics during a round"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:1028
-msgid "prefix of the filenames we use for writing the topology for each round"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:1031
+#: src/nse/gnunet-nse-profiler.c:894
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1034
+#: src/nse/gnunet-nse-profiler.c:897
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1040
+#: src/nse/gnunet-nse-profiler.c:903
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1050
+#: src/nse/gnunet-nse-profiler.c:912
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/nse/gnunet-service-nse.c:1389
+#: src/nse/gnunet-service-nse.c:1405
 #, fuzzy, c-format
 msgid "NSE service could not access hostkey: %s\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/nse/gnunet-service-nse.c:1403
+#: src/nse/gnunet-service-nse.c:1419
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1486
+#: src/nse/gnunet-service-nse.c:1524
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:134
+#: src/peerinfo/gnunet-service-peerinfo.c:215
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Đã nạp truyền tải « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:230
+#: src/peerinfo/gnunet-service-peerinfo.c:354
 #, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
+msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:269
+#: src/peerinfo/gnunet-service-peerinfo.c:369
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s %u \n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:444
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:297
+#: src/peerinfo/gnunet-service-peerinfo.c:480
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -4310,12 +4426,22 @@
 "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:419
+#: src/peerinfo/gnunet-service-peerinfo.c:632
+#, 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:637
 #, 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:807
+#: src/peerinfo/gnunet-service-peerinfo.c:969
+#, 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:1249
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -4350,75 +4476,108 @@
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:256
+#: src/peerinfo/peerinfo_api_notify.c:269
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:419
+#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#, fuzzy, c-format
+msgid "%sPeer `%s'\n"
+msgstr "Tôi là đồng đẳng « %s ».\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:427
+#, 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:435
 #, c-format
+msgid "Failure: Received invalid %s\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:444
+#, 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:457
+#, c-format
+msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:521
+#, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:557
+#: src/peerinfo-tool/gnunet-peerinfo.c:659
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:563
+#: src/peerinfo-tool/gnunet-peerinfo.c:665
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:625
+#: src/peerinfo-tool/gnunet-peerinfo.c:727
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/peerinfo-tool/gnunet-peerinfo.c:759
 msgid "don't resolve host names"
 msgstr "không quyết định các tên máy"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654
+#: src/peerinfo-tool/gnunet-peerinfo.c:762
 msgid "output only the identity strings"
 msgstr "chỉ xuất những chuỗi nhận diện"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:657
+#: src/peerinfo-tool/gnunet-peerinfo.c:765
+msgid "include friend-only information"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:768
 msgid "output our own identity only"
 msgstr "chỉ xuất nhận diện mình"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:660
+#: src/peerinfo-tool/gnunet-peerinfo.c:771
 #, 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:663
+#: src/peerinfo-tool/gnunet-peerinfo.c:774
+msgid "dump hello to file"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:777
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:666
+#: src/peerinfo-tool/gnunet-peerinfo.c:780
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:677
+#: src/peerinfo-tool/gnunet-peerinfo.c:791
 #, fuzzy
 msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:118
+#: src/transport/gnunet-service-transport_plugins.c:120
 #, fuzzy, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:122
+#: src/transport/gnunet-service-transport_plugins.c:124
 #, fuzzy, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:150
+#: src/transport/gnunet-service-transport_plugins.c:153
 #, 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"
@@ -4499,141 +4658,85 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:376
+#: src/regex/gnunet-daemon-regexprofiler.c:432
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1373
-#, c-format
-msgid "An operation has failed while starting peers: %s\n"
-msgstr ""
+#: src/regex/gnunet-regex-profiler.c:1246
+#, fuzzy
+msgid "No configuration file given. Exiting\n"
+msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
 
-#: src/regex/gnunet-regex-profiler.c:1418
-#, fuzzy, c-format
-msgid "Creating a peer failed. Error: %s\n"
-msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
+#: src/regex/gnunet-regex-profiler.c:1257
+#, fuzzy
+msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
+msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/regex/gnunet-regex-profiler.c:1545
-msgid "An operation has failed while starting slaves\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1567
-#, fuzzy, c-format
-msgid "No files found in `%s'\n"
-msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
-
-#: src/regex/gnunet-regex-profiler.c:1622
-msgid "An operation has failed while linking\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1732
-#: src/testbed/testbed_api_testbed.c:799
-#, c-format
-msgid "Host registration failed for a host. Error: %s\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1813
-msgid "Unable to connect to master controller -- Check config\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1915
-#: src/testbed/testbed_api_testbed.c:964
-#, c-format
-msgid "Host %s cannot start testbed\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1918
-#: src/testbed/testbed_api_testbed.c:968
-msgid "Testbed cannot be started on localhost\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1958
-#, c-format
+#: src/regex/gnunet-regex-profiler.c:1276
 msgid "No hosts-file specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1963
+#: src/regex/gnunet-regex-profiler.c:1282
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1969
-#: src/testbed/testbed_api_testbed.c:1071
+#: src/regex/gnunet-regex-profiler.c:1288
+#: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
-msgid "No hosts loaded. Need at least one host\n"
+msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1972
-#, c-format
-msgid "Checking whether given hosts can start testbed. Please wait\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1996
+#: src/regex/gnunet-regex-profiler.c:1295
 #, fuzzy, c-format
-msgid "Exiting\n"
-msgstr "Thoát"
+msgid "No files found in `%s'\n"
+msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/regex/gnunet-regex-profiler.c:2002
-#, fuzzy, c-format
-msgid "No configuration file given. Exiting\n"
-msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
-
-#: src/regex/gnunet-regex-profiler.c:2011
-#, fuzzy, c-format
-msgid "Configuration option (regex_prefix) missing. Exiting\n"
-msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
-
-#: src/regex/gnunet-regex-profiler.c:2029
-#: src/regex/gnunet-regex-simulation-profiler.c:629
-#, c-format
-msgid "Specified policies directory does not exist. Exiting.\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:2036
-#, c-format
+#: src/regex/gnunet-regex-profiler.c:1304
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:2044
-#, c-format
+#: src/regex/gnunet-regex-profiler.c:1314
+#, fuzzy
 msgid ""
-"Error loading search strings. Given file does not contain enough strings. "
+"Error loading search strings.Given file does not contain enough strings. "
 "Exiting.\n"
-msgstr ""
+msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/regex/gnunet-regex-profiler.c:2050
-#, fuzzy, c-format
+#: src/regex/gnunet-regex-profiler.c:1322
+#, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/regex/gnunet-regex-profiler.c:2077
+#: src/regex/gnunet-regex-profiler.c:1389
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:2080
-msgid "create COUNT number of random links between peers"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:2083
+#: src/regex/gnunet-regex-profiler.c:1392
 msgid "wait TIMEOUT before considering a string match as failed"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:2086
-msgid "wait DELAY before starting string search"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:2089
+#: src/regex/gnunet-regex-profiler.c:1395
 msgid "number of search strings to read from search strings file"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:2092
-#: src/regex/gnunet-regex-simulation-profiler.c:692
-msgid "maximum path compression length"
+#: src/regex/gnunet-regex-profiler.c:1398
+msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:2105
+#: src/regex/gnunet-regex-profiler.c:1401
+#, fuzzy
+msgid "name of file with input strings"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/regex/gnunet-regex-profiler.c:1404
+#, fuzzy
+msgid "name of file with hosts' names"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/regex/gnunet-regex-profiler.c:1416
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4641,6 +4744,10 @@
 msgid "name of the table to write DFAs"
 msgstr ""
 
+#: src/regex/gnunet-regex-simulation-profiler.c:692
+msgid "maximum path compression length"
+msgstr ""
+
 #: src/regex/gnunet-regex-simulation-profiler.c:705
 msgid "Profiler for regex library"
 msgstr ""
@@ -4730,12 +4837,12 @@
 msgid "Print statistics about GNUnet operations."
 msgstr "In ra thống kê về các thao tác GNUnet."
 
-#: src/statistics/statistics_api.c:511
+#: src/statistics/statistics_api.c:512
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/statistics/statistics_api.c:1056
+#: src/statistics/statistics_api.c:1057
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
@@ -4746,138 +4853,176 @@
 msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
 msgstr ""
 
+#: src/testbed/gnunet-service-testbed_cpustatus.c:670
+#, c-format
+msgid ""
+"Cannot open %s for writing load statistics.  Not logging load statistics\n"
+msgstr ""
+
 #: src/testbed/gnunet_testbed_ll_master.c:57
 #, fuzzy, c-format
 msgid "Job command file not given. Exiting\n"
 msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
 
-#: src/testbed/gnunet-testbed-profiler.c:235
-#, c-format
-msgid "No hosts-file specified on command line\n"
-msgstr ""
+#: src/testbed/gnunet_testbed_mpi_spawn.c:135
+#, fuzzy
+msgid "Waiting for child to exit.\n"
+msgstr "Đang đợi các đồng đẳng kết nối"
 
-#: src/testbed/gnunet-testbed-profiler.c:267
+#: src/testbed/gnunet_testbed_mpi_spawn.c:296
+#, fuzzy, c-format
+msgid "Spawning process `%s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/testbed/gnunet-testbed-profiler.c:249
+#, 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:275
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:270
+#: src/testbed/gnunet-testbed-profiler.c:278
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:286
-msgid "Profiler for testbed"
-msgstr ""
-
-#: src/testbed/testbed_api_hosts.c:469
+#: src/testbed/testbed_api_hosts.c:459
 #, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_hosts.c:477
+#: src/testbed/testbed_api_hosts.c:467
 #, fuzzy, c-format
 msgid "Hosts file %s has no data\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_hosts.c:484
+#: src/testbed/testbed_api_hosts.c:474
 #, fuzzy, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_hosts.c:593
+#: src/testbed/testbed_api_hosts.c:583
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1836
+#: src/testbed/testbed_api_hosts.c:1856
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "« %s » thất bại với mã lỗi %d: %s\n"
 
-#: src/testbed/testbed_api_testbed.c:638
+#: src/testbed/testbed_api_testbed.c:771
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1003
+#: src/testbed/testbed_api_testbed.c:913
+#, c-format
+msgid "Host registration failed for a host. Error: %s\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:978
+msgid "Controller crash detected. Shutting down.\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1081
+#, c-format
+msgid "Host %s cannot start testbed\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1085
+msgid "Testbed cannot be started on localhost\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1120
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1059
+#: src/testbed/testbed_api_testbed.c:1138
+msgid "Shutting down testbed due to timeout while setup.\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1197
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1095
+#: src/testbed/testbed_api_testbed.c:1209
+msgid "No hosts loaded. Need at least one host\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1233
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:668
+#: src/testbed/testbed_api_topology.c:670
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:674
+#: src/testbed/testbed_api_topology.c:676
 #, fuzzy, c-format
 msgid "Topology file %s has no data\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:681
+#: src/testbed/testbed_api_topology.c:683
 #, fuzzy, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:704
+#: src/testbed/testbed_api_topology.c:706
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/testbed/testbed_api_topology.c:713
-#: src/testbed/testbed_api_topology.c:737
+#: src/testbed/testbed_api_topology.c:715
+#: src/testbed/testbed_api_topology.c:739
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:719
-#: src/testbed/testbed_api_topology.c:743
+#: src/testbed/testbed_api_topology.c:721
+#: src/testbed/testbed_api_topology.c:745
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/testbed/testbed_api_topology.c:725
-#: src/testbed/testbed_api_topology.c:749
+#: src/testbed/testbed_api_topology.c:727
+#: src/testbed/testbed_api_topology.c:751
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:764
+#: src/testbed/testbed_api_topology.c:766
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
 
-#: src/testing/gnunet-testing.c:132
+#: src/testing/gnunet-testing.c:133
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/testing/gnunet-testing.c:209
+#: src/testing/gnunet-testing.c:210
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/testing/gnunet-testing.c:211
+#: src/testing/gnunet-testing.c:212
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:213
+#: src/testing/gnunet-testing.c:214
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr "in ra đầu ra tiêu chuẩn một giá trị từ tập tin cấu hình"
 
-#: src/testing/gnunet-testing.c:215
+#: src/testing/gnunet-testing.c:216
 #, fuzzy
 msgid "configuration template"
 msgstr "Cấu hình đã được lưu."
 
-#: src/testing/gnunet-testing.c:224
+#: src/testing/gnunet-testing.c:225
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -4895,59 +5040,64 @@
 msgid "name of the service to run"
 msgstr ""
 
-#: src/testing/testing.c:217
+#: src/testing/testing.c:288
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:233
+#: src/testing/testing.c:304
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:547
+#: src/testing/testing.c:719
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "đặt số trình nền cần khởi chạy"
 
-#: src/testing/testing.c:558
+#: src/testing/testing.c:730
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/testing/testing.c:872
+#: src/testing/testing.c:1175
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/testing/testing.c:883
+#: src/testing/testing.c:1182
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:897
+#: src/testing/testing.c:1191
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/testing/testing.c:931
+#: src/testing/testing.c:1211
 #, fuzzy, c-format
+msgid "Cannot open hostkey file: %s\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#: src/testing/testing.c:1221
+#, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Lỗi tạo thư mục tạm thời."
 
-#: src/testing/testing.c:949
+#: src/testing/testing.c:1243
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/testing/testing.c:1029
+#: src/testing/testing.c:1343
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/testing/testing.c:1235
+#: src/testing/testing.c:1691
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
@@ -4961,153 +5111,130 @@
 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:725
-#: src/topology/gnunet-daemon-topology.c:810
+#: src/topology/gnunet-daemon-topology.c:721
+#: src/topology/gnunet-daemon-topology.c:806
 #, fuzzy
 msgid "# friends connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/topology/gnunet-daemon-topology.c:991
+#: src/topology/gnunet-daemon-topology.c:987
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1034
+#: src/topology/gnunet-daemon-topology.c:1030
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1040
+#: src/topology/gnunet-daemon-topology.c:1036
 #, fuzzy, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:1045
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1057
+#: src/topology/gnunet-daemon-topology.c:1053
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1077
+#: src/topology/gnunet-daemon-topology.c:1073
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1090
+#: src/topology/gnunet-daemon-topology.c:1086
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
 
-#: src/topology/gnunet-daemon-topology.c:1100
+#: src/topology/gnunet-daemon-topology.c:1096
 #, 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:1106
+#: src/topology/gnunet-daemon-topology.c:1102
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1116
+#: src/topology/gnunet-daemon-topology.c:1112
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1122
+#: src/topology/gnunet-daemon-topology.c:1118
 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:1129
+#: src/topology/gnunet-daemon-topology.c:1125
 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:1164
+#: src/topology/gnunet-daemon-topology.c:1156
 #, 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:1219
+#: src/topology/gnunet-daemon-topology.c:1211
 #, 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:1358
+#: src/topology/gnunet-daemon-topology.c:1350
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:246
+#: src/transport/gnunet-service-transport_blacklist.c:267
 #, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+msgid "Adding blacklisting entry for peer `%s'\n"
+msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:263
-#, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:284
-#: src/transport/gnunet-service-transport_blacklist.c:308
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:295
-#: src/transport/gnunet-service-transport_blacklist.c:331
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
-msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:345
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-msgstr ""
-"Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:359
+#: src/transport/gnunet-service-transport_blacklist.c:275
 #, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
+msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:514
-#: src/transport/gnunet-service-transport_blacklist.c:752
+#: src/transport/gnunet-service-transport_blacklist.c:453
+#: src/transport/gnunet-service-transport_blacklist.c:718
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:183
+#: src/transport/gnunet-service-transport.c:174
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/transport/gnunet-service-transport.c:258
+#: src/transport/gnunet-service-transport.c:239
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# tổng số nội dung lỗ hổng được nhận"
 
-#: src/transport/gnunet-service-transport.c:305
+#: src/transport/gnunet-service-transport.c:286
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# các byte đã giải mã"
 
-#: src/transport/gnunet-service-transport.c:613
+#: src/transport/gnunet-service-transport.c:642
 #, fuzzy, c-format
 msgid "Transport service could not access hostkey: %s. Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/transport/gnunet-service-transport.c:708
+#: src/transport/gnunet-service-transport.c:741
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5121,140 +5248,140 @@
 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:546
+#: src/transport/gnunet-service-transport_clients.c:536
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:687
+#: src/transport/gnunet-service-transport_clients.c:677
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:738
+#: src/transport/gnunet-service-transport_clients.c:728
 #, 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_hello.c:175
+#: src/transport/gnunet-service-transport_hello.c:179
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1227
+#: src/transport/gnunet-service-transport_neighbours.c:1216
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1357
-#: src/transport/gnunet-service-transport_neighbours.c:1694
+#: src/transport/gnunet-service-transport_neighbours.c:1346
+#: src/transport/gnunet-service-transport_neighbours.c:1678
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1362
+#: src/transport/gnunet-service-transport_neighbours.c:1351
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/transport/gnunet-service-transport_neighbours.c:1367
+#: src/transport/gnunet-service-transport_neighbours.c:1356
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1424
+#: src/transport/gnunet-service-transport_neighbours.c:1413
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1466
+#: src/transport/gnunet-service-transport_neighbours.c:1455
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# các khoá phiên chạy được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1490
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1498
+#: src/transport/gnunet-service-transport_neighbours.c:1487
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1535
+#: src/transport/gnunet-service-transport_neighbours.c:1520
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1544
+#: src/transport/gnunet-service-transport_neighbours.c:1529
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1600
+#: src/transport/gnunet-service-transport_neighbours.c:1584
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1634
+#: src/transport/gnunet-service-transport_neighbours.c:1618
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "theo dõi gnunetd sử dụng dải thông"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1650
+#: src/transport/gnunet-service-transport_neighbours.c:1634
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2802
+#: src/transport/gnunet-service-transport_neighbours.c:2770
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2817
-#: src/transport/gnunet-service-transport_neighbours.c:2851
+#: src/transport/gnunet-service-transport_neighbours.c:2785
+#: src/transport/gnunet-service-transport_neighbours.c:2819
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2864
+#: src/transport/gnunet-service-transport_neighbours.c:2832
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2897
+#: src/transport/gnunet-service-transport_neighbours.c:2865
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3082
+#: src/transport/gnunet-service-transport_neighbours.c:3046
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# các thông báo PONG đã mật mã được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3137
+#: src/transport/gnunet-service-transport_neighbours.c:3101
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3151
+#: src/transport/gnunet-service-transport_neighbours.c:3115
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3182
+#: src/transport/gnunet-service-transport_neighbours.c:3146
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3193
+#: src/transport/gnunet-service-transport_neighbours.c:3157
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3224
+#: src/transport/gnunet-service-transport_neighbours.c:3188
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3319
+#: src/transport/gnunet-service-transport_neighbours.c:3283
 #, 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:111
+#: src/transport/gnunet-service-transport_plugins.c:113
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
@@ -5304,7 +5431,7 @@
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1302
+#: src/transport/gnunet-service-transport_validation.c:1305
 #, 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"
@@ -5348,275 +5475,275 @@
 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:531
+#: src/transport/gnunet-transport.c:528
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/transport/gnunet-transport.c:553
+#: src/transport/gnunet-transport.c:550
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:588
+#: src/transport/gnunet-transport.c:585
 #, 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:664
+#: src/transport/gnunet-transport.c:655
 #, 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:687
+#: src/transport/gnunet-transport.c:678
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:702
+#: src/transport/gnunet-transport.c:693
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:766
+#: src/transport/gnunet-transport.c:757
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/transport/gnunet-transport.c:794
+#: src/transport/gnunet-transport.c:785
 #, 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:828
+#: src/transport/gnunet-transport.c:819
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:825
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:854 src/transport/gnunet-transport.c:884
-#: src/transport/gnunet-transport.c:906 src/transport/gnunet-transport.c:945
+#: src/transport/gnunet-transport.c:845 src/transport/gnunet-transport.c:875
+#: src/transport/gnunet-transport.c:897 src/transport/gnunet-transport.c:936
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:861 src/transport/gnunet-transport.c:891
+#: src/transport/gnunet-transport.c:852 src/transport/gnunet-transport.c:882
 #, 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:911
+#: src/transport/gnunet-transport.c:902
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:996
+#: src/transport/gnunet-transport.c:987
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:999
+#: src/transport/gnunet-transport.c:990
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:993
 #, 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:1008
+#: src/transport/gnunet-transport.c:999
 #, 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:1011
+#: src/transport/gnunet-transport.c:1002
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:1014
+#: src/transport/gnunet-transport.c:1005
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1018
+#: src/transport/gnunet-transport.c:1009
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1021
+#: src/transport/gnunet-transport.c:1012
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1032
+#: src/transport/gnunet-transport.c:1023
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/plugin_transport_http.c:817
-#: src/transport/plugin_transport_http_server.c:2556
+#: src/transport/plugin_transport_http.c:815
+#: src/transport/plugin_transport_http_server.c:2566
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:866
-#: src/transport/plugin_transport_http_server.c:2324
+#: src/transport/plugin_transport_http.c:864
+#: src/transport/plugin_transport_http_server.c:2334
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/transport/plugin_transport_http.c:898
-#: src/transport/plugin_transport_http_server.c:2356 src/util/service.c:1053
+#: src/transport/plugin_transport_http.c:896
+#: src/transport/plugin_transport_http_server.c:2366 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_http.c:915
-#: src/transport/plugin_transport_http_server.c:2373 src/util/service.c:1070
+#: src/transport/plugin_transport_http.c:913
+#: src/transport/plugin_transport_http_server.c:2383 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/plugin_transport_http.c:1020
-#: src/transport/plugin_transport_http_server.c:2484
+#: src/transport/plugin_transport_http.c:1018
+#: src/transport/plugin_transport_http_server.c:2494
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1133
-#: src/transport/plugin_transport_http_server.c:2652
+#: src/transport/plugin_transport_http.c:1131
+#: src/transport/plugin_transport_http_server.c:2673
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1146
-#: src/transport/plugin_transport_http_server.c:2663
+#: src/transport/plugin_transport_http.c:1144
+#: src/transport/plugin_transport_http_server.c:2684
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/transport/plugin_transport_http.c:1157
+#: src/transport/plugin_transport_http.c:1155
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1177
+#: src/transport/plugin_transport_http.c:1175
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1206
+#: src/transport/plugin_transport_http.c:1204
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1223
-#: src/transport/plugin_transport_http_server.c:2745
+#: src/transport/plugin_transport_http.c:1221
+#: src/transport/plugin_transport_http_server.c:2774
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/transport/plugin_transport_http.c:1228
+#: src/transport/plugin_transport_http.c:1226
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1531
+#: src/transport/plugin_transport_http_client.c:1535
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1662
-#: src/transport/plugin_transport_http_server.c:2869
+#: src/transport/plugin_transport_http_client.c:1666
+#: src/transport/plugin_transport_http_server.c:2898
 #, 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:1687
-#: src/transport/plugin_transport_http_server.c:2928
+#: src/transport/plugin_transport_http_client.c:1691
+#: src/transport/plugin_transport_http_server.c:2957
 #, 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:1715
-#: src/transport/plugin_transport_http_server.c:2775
+#: src/transport/plugin_transport_http_client.c:1719
+#: src/transport/plugin_transport_http_server.c:2804
 #, 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:1342
+#: src/transport/plugin_transport_http_server.c:1352
 #, 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:1603
+#: src/transport/plugin_transport_http_server.c:1613
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1611
+#: src/transport/plugin_transport_http_server.c:1621
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1912
+#: src/transport/plugin_transport_http_server.c:1922
 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:1936
+#: src/transport/plugin_transport_http_server.c:1946
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2631
+#: src/transport/plugin_transport_http_server.c:2652
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2645
+#: src/transport/plugin_transport_http_server.c:2666
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2670
+#: src/transport/plugin_transport_http_server.c:2691
 #, 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:2685
+#: src/transport/plugin_transport_http_server.c:2706
 #, 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:2695
+#: src/transport/plugin_transport_http_server.c:2716
 #, 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:2716
+#: src/transport/plugin_transport_http_server.c:2737
 #, 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:2726
+#: src/transport/plugin_transport_http_server.c:2747
 #, 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:2761
+#: src/transport/plugin_transport_http_server.c:2790
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "không quyết định các tên máy"
@@ -5681,7 +5808,7 @@
 #: src/transport/plugin_transport_tcp.c:778
 #: src/transport/plugin_transport_tcp.c:967
 #: src/transport/plugin_transport_tcp.c:1826
-#: src/transport/plugin_transport_tcp.c:2462
+#: src/transport/plugin_transport_tcp.c:2456
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
@@ -5720,62 +5847,67 @@
 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:2046
+#: src/transport/plugin_transport_tcp.c:2036
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:2124
+#: src/transport/plugin_transport_tcp.c:2118
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2350 src/util/service.c:948
+#: src/transport/plugin_transport_tcp.c:2344 src/util/service.c:948
 #: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2364
+#: src/transport/plugin_transport_tcp.c:2358
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2450
+#: src/transport/plugin_transport_tcp.c:2444
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2454
+#: src/transport/plugin_transport_tcp.c:2448
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2458
+#: src/transport/plugin_transport_tcp.c:2452
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:128
+#: src/transport/plugin_transport_udp_broadcasting.c:134
 #, fuzzy
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:169
+#: src/transport/plugin_transport_udp_broadcasting.c:184
 #, fuzzy
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:394
+#: src/transport/plugin_transport_udp_broadcasting.c:403
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:420
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2517
+#: src/transport/plugin_transport_udp.c:2520
 #, 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:2531
+#: src/transport/plugin_transport_udp.c:2534
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5783,22 +5915,22 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2772
+#: src/transport/plugin_transport_udp.c:2775
 #, 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:2848
+#: src/transport/plugin_transport_udp.c:2851
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2891
+#: src/transport/plugin_transport_udp.c:2894
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/transport/plugin_transport_unix.c:1355
+#: src/transport/plugin_transport_unix.c:1353
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -5814,7 +5946,7 @@
 
 #: src/transport/plugin_transport_wlan.c:645
 #: src/transport/plugin_transport_wlan.c:695
-#: src/transport/plugin_transport_wlan.c:1758
+#: src/transport/plugin_transport_wlan.c:1764
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
@@ -5830,61 +5962,61 @@
 
 #: src/transport/plugin_transport_wlan.c:902
 #: src/transport/plugin_transport_wlan.c:987
-#: src/transport/plugin_transport_wlan.c:1760
+#: src/transport/plugin_transport_wlan.c:1766
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1169
+#: src/transport/plugin_transport_wlan.c:1166
 #, 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:1190
+#: src/transport/plugin_transport_wlan.c:1192
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:1200
+#: src/transport/plugin_transport_wlan.c:1202
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_wlan.c:1257
+#: src/transport/plugin_transport_wlan.c:1259
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:1358
+#: src/transport/plugin_transport_wlan.c:1364
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1393
+#: src/transport/plugin_transport_wlan.c:1399
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1454
+#: src/transport/plugin_transport_wlan.c:1460
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_wlan.c:1563
+#: src/transport/plugin_transport_wlan.c:1569
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1739
+#: src/transport/plugin_transport_wlan.c:1745
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:659
+#: src/transport/transport_api.c:651
 #, 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:586
+#: src/transport/transport-testing.c:585
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -5954,7 +6086,7 @@
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/client.c:1177
+#: src/util/client.c:1178
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -5996,17 +6128,17 @@
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1214
+#: src/util/common_logging.c:1215
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1232
+#: src/util/common_logging.c:1233
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/util/common_logging.c:1253
+#: src/util/common_logging.c:1254
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -6060,73 +6192,64 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:447
+#: src/util/crypto_ecc.c:444
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (too long, %llu bytes).  "
 "Deleting it.\n"
 msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
 
-#: src/util/crypto_ecc.c:462 src/util/crypto_rsa.c:676
+#: src/util/crypto_ecc.c:459 src/util/crypto_rsa.c:676
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
 "Deleting it.\n"
 msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
 
-#: src/util/crypto_ecc.c:558 src/util/crypto_ecc.c:602
+#: src/util/crypto_ecc.c:555 src/util/crypto_ecc.c:599
 #: src/util/crypto_rsa.c:750 src/util/crypto_rsa.c:887
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/util/crypto_ecc.c:563 src/util/crypto_rsa.c:892
+#: src/util/crypto_ecc.c:560 src/util/crypto_rsa.c:892
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
 
-#: src/util/crypto_ecc.c:606 src/util/crypto_rsa.c:754
+#: src/util/crypto_ecc.c:603 src/util/crypto_rsa.c:754
 #: src/util/crypto_rsa.c:790
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:637 src/util/crypto_rsa.c:785
+#: src/util/crypto_ecc.c:634 src/util/crypto_rsa.c:785
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:642
+#: src/util/crypto_ecc.c:639
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:657 src/util/crypto_rsa.c:805
+#: src/util/crypto_ecc.c:654 src/util/crypto_rsa.c:805
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
 
-#: src/util/crypto_ecc.c:779 src/util/crypto_rsa.c:982
+#: src/util/crypto_ecc.c:776 src/util/crypto_rsa.c:982
 msgid "interrupted by shutdown"
 msgstr ""
 
-#: src/util/crypto_ecc.c:790
+#: src/util/crypto_ecc.c:787
 msgid "gnunet-ecc failed"
 msgstr ""
 
-#: src/util/crypto_ecc.c:978
+#: src/util/crypto_ecc.c:1045
 #, fuzzy, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
-msgstr "%s bị lỗi tại %s:%d: « %s »\n"
-
-#: src/util/crypto_ecc.c:1046
-#, fuzzy, c-format
 msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:1130
-msgid "To be implemented: not secure at the moment, please read README\n"
-msgstr ""
-
 #: src/util/crypto_random.c:281
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
@@ -6158,17 +6281,17 @@
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/disk.c:1206
+#: src/util/disk.c:1207
 #, 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:1560 src/util/service.c:1670
+#: src/util/disk.c:1564 src/util/service.c:1670
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Không thể lấy thông tin về người dùng « %s »: %s\n"
 
-#: src/util/disk.c:1999
+#: src/util/disk.c:2007
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
@@ -6242,12 +6365,12 @@
 "Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn "
 "ngắn.\n"
 
-#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:316
+#: src/util/getopt_helpers.c:270 src/util/getopt_helpers.c:328
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 
-#: src/util/getopt_helpers.c:288
+#: src/util/getopt_helpers.c:300
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
@@ -6413,18 +6536,28 @@
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:420
+#: src/util/os_installation.c:423
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:702
+#: src/util/os_installation.c:709
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
+#: src/util/os_installation.c:767
+#, fuzzy, c-format
+msgid "CreateProcess failed for binary %s (%d).\n"
+msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
+
+#: src/util/os_installation.c:777
+#, c-format
+msgid "GetExitCodeProcess failed for binary %s (%d).\n"
+msgstr ""
+
 #: src/util/plugin.c:89
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -6450,15 +6583,6 @@
 msgid "Could not access configuration file `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/util/pseudonym.c:329 src/util/pseudonym.c:632
-#, fuzzy, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr "Lỗi phân tích dữ liệu giao diện từ « %s ».\n"
-
-#: src/util/pseudonym.c:464 src/util/pseudonym.c:490 src/util/pseudonym.c:628
-msgid "no-name"
-msgstr "không-tên"
-
 #: src/util/resolver_api.c:202
 #, fuzzy, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
@@ -6494,22 +6618,22 @@
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:426
+#: src/util/server.c:436
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/server.c:435
+#: src/util/server.c:445
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/util/server.c:446
+#: src/util/server.c:456
 #, fuzzy, c-format
 msgid "`%s' failed for `%.*s': address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/util/server.c:830
+#: src/util/server.c:848
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -6691,23 +6815,23 @@
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1086
+#: src/util/strings.c:1098
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1094
+#: src/util/strings.c:1106
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1100
+#: src/util/strings.c:1112
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1107
+#: src/util/strings.c:1119
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1116
+#: src/util/strings.c:1128
 #, 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"
@@ -6886,23 +7010,93 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:579 src/include/gnunet_common.h:584
-#: src/include/gnunet_common.h:590
+#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
+#: src/include/gnunet_common.h:591
 #, 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:600
+#: src/include/gnunet_common.h:601
 #, 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:621 src/include/gnunet_common.h:628
+#: src/include/gnunet_common.h:622 src/include/gnunet_common.h:629
 #, 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 "Service `%s' has been stopped.\n"
+#~ msgstr "Dịch vụ đã bị xoá.\n"
+
+#, fuzzy
+#~ msgid "Service `%s' was already running.\n"
+#~ msgstr "Không gian tên « %s » có đánh giá %d.\n"
+
+#, fuzzy
+#~ msgid "Service `%s' has been started.\n"
+#~ msgstr "Dịch vụ đã bị xoá.\n"
+
+#, fuzzy
+#~ msgid "Service `%s' was already being stopped.\n"
+#~ msgstr "Dịch vụ đã bị xoá.\n"
+
+#, fuzzy
+#~ msgid "Service `%s' was already not running.\n"
+#~ msgstr "« %s » không phải là một tập tin.\n"
+
+#, fuzzy
+#~ msgid "Error communicating with ARM service.\n"
+#~ msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+
+#, fuzzy
+#~ msgid "Timeout communicating with ARM service.\n"
+#~ msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+
+#, fuzzy
+#~ msgid "Operation failed.\n"
+#~ msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Error in communication with PEERINFO service\n"
+#~ msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+
+#, fuzzy
+#~ msgid "%s Received message from %s of type %d, distance %u!\n"
+#~ msgstr "Nhận được thông báo bị hỏng từ đồng đẳng « %s » trong %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Creating a peer failed. Error: %s\n"
+#~ msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
+
+#, fuzzy
+#~ msgid "Exiting\n"
+#~ 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"
+
+#, fuzzy
+#~ msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+#~ msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
+
+#, fuzzy
+#~ msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+#~ msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+#~ msgstr ""
+#~ "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
+
+#, fuzzy
 #~ msgid "Failed to read hostkey: %s\n"
 #~ msgstr "Lỗi bắt đầu thu thập.\n"
 
@@ -7002,10 +7196,6 @@
 #~ msgstr "Nhận yêu cầu định tuyến\n"
 
 #, fuzzy
-#~ msgid "Starting HELPER process `%s'\n"
-#~ msgstr "Đang bắt đầu tài về « %s »\n"
-
-#, fuzzy
 #~ msgid "Asked to start service `%s' within %llu ms\n"
 #~ msgstr "« %s »: Chưa nhận thông báo sau %llu miligiây.\n"
 
@@ -7384,10 +7574,6 @@
 #~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
 #, fuzzy
-#~ msgid "Could not open hostkeys file: %s\n"
-#~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
-
-#, fuzzy
 #~ msgid "access (%s, X_OK) failed: %s\n"
 #~ msgstr "SMTP: « %s » bị lỗi: %s\n"
 
@@ -7500,9 +7686,6 @@
 #~ msgid "# wlan messages inside WLAN_HELPER_DATA received"
 #~ msgstr "# các thông báo phát hiện dht được nhận"
 
-#~ msgid "Unknown user `%s'\n"
-#~ msgstr "Không rõ người dùng « %s »\n"
-
 #, fuzzy
 #~ msgid "Namespace `%s' unknown.\n"
 #~ msgstr "Không gian tên « %s » có đánh giá %d.\n"
@@ -7548,10 +7731,6 @@
 #~ msgstr "xuất chi tiết"
 
 #, fuzzy
-#~ msgid "Failed to stop service `%s'!\n"
-#~ msgstr "Lỗi vào phòng « %s »\n"
-
-#, fuzzy
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "Lỗi bắt đầu thu thập.\n"
 
@@ -8494,9 +8673,6 @@
 #~ msgstr ""
 #~ "đảm bảo là đồng đẳng này được biết bởi và phát hiện các đồng đẳng khác"
 
-#~ msgid "`%s' registering handler %d\n"
-#~ msgstr "« %s » đang đăng ký trình điều khiển %d\n"
-
 #~ msgid "maintains GNUnet default mesh topology"
 #~ msgstr "bảo quản định hình mắc lưới mặc định của GNUnet"
 
@@ -9059,9 +9235,6 @@
 #~ msgid "Set up multiple gnunetd daemons across multiple hosts."
 #~ msgstr "Thiết lập nhiều trình nền gnunetd qua nhiều máy khác nhau."
 
-#~ msgid "Waiting for peers to connect"
-#~ msgstr "Đang đợi các đồng đẳng kết nối"
-
 #~ msgid "Bootstrap data obtained from `%s' is invalid.\n"
 #~ msgstr "Sai dữ liệu nạp và khởi động được lấy từ « %s ».\n"
 

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2013-04-27 11:04:29 UTC (rev 27000)
+++ gnunet/po/zh_CN.po  2013-04-27 14:16:29 UTC (rev 27001)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-03-06 00:28+0100\n"
+"POT-Creation-Date: 2013-04-27 12:39+0200\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -16,309 +16,418 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:162
-msgid "Failed to transmit shutdown request to client.\n"
+#: src/arm/arm_api.c:880
+msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:166
-#, fuzzy, c-format
-msgid "Service `%s' is unknown to ARM.\n"
-msgstr "服务已删除。\n"
+#: src/arm/arm_monitor_api.c:321
+msgid ""
+"Monitoring client was disconnected from arm service, trying to reconnect.\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:171
+#: src/arm/gnunet-arm.c:159
 #, fuzzy, c-format
-msgid "Service `%s' has been stopped.\n"
-msgstr "服务已删除。\n"
+msgid "Failed to remove configuration file %s\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:174
-#, fuzzy, c-format
-msgid "Service `%s' was already running.\n"
-msgstr "服务已删除。\n"
+#: src/arm/gnunet-arm.c:165
+#, c-format
+msgid "Failed to remove servicehome directory %s\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:179
-#, fuzzy, c-format
-msgid "Service `%s' has been started.\n"
-msgstr "服务已删除。\n"
+#: src/arm/gnunet-arm.c:204 src/testbed/gnunet-service-testbed_peers.c:712
+msgid "Message was sent successfully"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:182
+#: src/arm/gnunet-arm.c:206 src/testbed/gnunet-service-testbed_peers.c:714
+#, fuzzy
+msgid "Misconfiguration (can't connect to the ARM service)"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/arm/gnunet-arm.c:208 src/testbed/gnunet-service-testbed_peers.c:716
+msgid "We disconnected from ARM before we could send a request"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:210 src/testbed/gnunet-service-testbed_peers.c:718
+msgid "ARM API is busy"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:212 src/testbed/gnunet-service-testbed_peers.c:720
+msgid "Request doesn't fit into a message"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:722
+msgid "Request timed out"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:724
+#, fuzzy
+msgid "Unknown request status"
+msgstr "未知的用户“%s”\n"
+
+#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:740
+#, c-format
+msgid "%s is stopped"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:742
+#, c-format
+msgid "%s is starting"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:236 src/testbed/gnunet-service-testbed_peers.c:744
+#, c-format
+msgid "%s is stopping"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:238 src/testbed/gnunet-service-testbed_peers.c:746
+#, c-format
+msgid "%s is starting already"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:240 src/testbed/gnunet-service-testbed_peers.c:748
+#, c-format
+msgid "%s is stopping already"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:750
+#, c-format
+msgid "%s is started already"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:752
+#, c-format
+msgid "%s is stopped already"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:754
 #, fuzzy, c-format
-msgid "Service `%s' was already being stopped.\n"
+msgid "%s service is not known to ARM"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:186
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:756
 #, fuzzy, c-format
-msgid "Service `%s' was already not running.\n"
-msgstr "服务已删除。\n"
+msgid "%s service failed to start"
+msgstr "运行 %s失败:%s %d\n"
 
-#: src/arm/gnunet-arm.c:190
-msgid "Request ignored as ARM is shutting down.\n"
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:758
+#, c-format
+msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:194
-msgid "Error communicating with ARM service.\n"
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:760
+#, c-format
+msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:198
-msgid "Timeout communicating with ARM service.\n"
+#: src/arm/gnunet-arm.c:271
+msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:202
-msgid "Operation failed.\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:291
+#, fuzzy, c-format
+msgid "Failed to send a request to kill the `%s' service: %%s\n"
+msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:206
-msgid "Unknown response code from ARM.\n"
-msgstr ""
+#: src/arm/gnunet-arm.c:307
+#, fuzzy, c-format
+msgid "Failed to kill the `%s' service: %s\n"
+msgstr "运行 %s失败:%s %d\n"
 
-#: src/arm/gnunet-arm.c:229
+#: src/arm/gnunet-arm.c:323
+#, fuzzy, c-format
+msgid "Failed to send a stop request to the ARM service: %s\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/arm/gnunet-arm.c:345
+#, fuzzy, c-format
+msgid "Failed to stop the ARM service: %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/arm/gnunet-arm.c:361 src/arm/gnunet-arm.c:370
+#, fuzzy, c-format
+msgid "Failed to start the ARM service: %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/arm/gnunet-arm.c:390
+#, fuzzy, c-format
+msgid "Failed to send a request to start the `%s' service: %%s\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/arm/gnunet-arm.c:405
+#, fuzzy, c-format
+msgid "Failed to start the `%s' service: %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/arm/gnunet-arm.c:423
+#, fuzzy, c-format
+msgid "Failed to request a list of services: %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/arm/gnunet-arm.c:430
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
 
-#: src/arm/gnunet-arm.c:232
+#: src/arm/gnunet-arm.c:433
 msgid "Running services:\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:253
-#, fuzzy, c-format
-msgid "Failed to remove configuration file %s\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/arm/gnunet-arm.c:534
+msgid "Began monitoring ARM for service status changes\n"
+msgstr ""
 
-#: src/arm/gnunet-arm.c:259
+#: src/arm/gnunet-arm.c:537
 #, c-format
-msgid "Failed to remove servicehome directory %s\n"
+msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:322 src/arm/gnunet-arm.c:407 src/arm/gnunet-arm.c:424
-msgid "Fatal error initializing ARM API.\n"
+#: src/arm/gnunet-arm.c:540
+#, fuzzy, c-format
+msgid "Starting %s...\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/arm/gnunet-arm.c:543
+#, c-format
+msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:453
+#: src/arm/gnunet-arm.c:552
+#, fuzzy, c-format
+msgid "Unknown status %u for service %s.\n"
+msgstr "未知的用户“%s”\n"
+
+#: src/arm/gnunet-arm.c:622
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:455
+#: src/arm/gnunet-arm.c:624
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:457
+#: src/arm/gnunet-arm.c:626
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:459
+#: src/arm/gnunet-arm.c:628
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:462
+#: src/arm/gnunet-arm.c:631
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:465
+#: src/arm/gnunet-arm.c:634
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:467
+#: src/arm/gnunet-arm.c:636
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:470
+#: src/arm/gnunet-arm.c:639
 #, fuzzy
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr "等待一次迭代完成的时间(毫秒)"
 
-#: src/arm/gnunet-arm.c:472
+#: src/arm/gnunet-arm.c:641
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:474
+#: src/arm/gnunet-arm.c:643
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:476
+#: src/arm/gnunet-arm.c:645
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:487
+#: src/arm/gnunet-arm.c:656
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:345
+#: src/arm/gnunet-service-arm.c:257
+msgid "Could not send status result to client\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:291
+#, fuzzy
+msgid "Could not send list result to client\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/arm/gnunet-service-arm.c:500
 #, fuzzy, c-format
 msgid "Failed to start service `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-service-arm.c:348
+#: src/arm/gnunet-service-arm.c:507
 #, c-format
 msgid "Starting service `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:374
-msgid "Could not send status result to client\n"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:406
-#, fuzzy
-msgid "Could not send list result to client\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/arm/gnunet-service-arm.c:537
+#: src/arm/gnunet-service-arm.c:602
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户:"
 
-#: src/arm/gnunet-service-arm.c:559
+#: src/arm/gnunet-service-arm.c:624
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:573
+#: src/arm/gnunet-service-arm.c:638
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:681
+#: src/arm/gnunet-service-arm.c:771
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:892
+#: src/arm/gnunet-service-arm.c:1023
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:985
+#: src/arm/gnunet-service-arm.c:1116
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:990
+#: src/arm/gnunet-service-arm.c:1121
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:995
+#: src/arm/gnunet-service-arm.c:1126
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:1001
+#: src/arm/gnunet-service-arm.c:1132
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-service-arm.c:1036
+#: src/arm/gnunet-service-arm.c:1154
 #, c-format
-msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
+msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1228
+#: src/arm/gnunet-service-arm.c:1169
+#, c-format
+msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
+msgstr ""
+
+#: src/arm/gnunet-service-arm.c:1386
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-service-arm.c:1239
+#: src/arm/gnunet-service-arm.c:1397
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1253
+#: src/arm/gnunet-service-arm.c:1411
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
 
-#: src/arm/mockup-service.c:44
+#: src/arm/mockup-service.c:46
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:465
+#: src/ats/ats_api_performance.c:475
 #, c-format
 msgid "Received %s message\n"
 msgstr ""
 
-#: src/ats/ats_api_performance.c:508
+#: src/ats/ats_api_performance.c:518
 #, c-format
 msgid "Received last message for %s \n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1176
-#: src/ats/gnunet-service-ats_addresses.c:1210
+#: src/ats/gnunet-service-ats_addresses.c:1372
+#: src/ats/gnunet-service-ats_addresses.c:1406
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1182
+#: src/ats/gnunet-service-ats_addresses.c:1378
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1189
+#: src/ats/gnunet-service-ats_addresses.c:1385
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1216
+#: src/ats/gnunet-service-ats_addresses.c:1412
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1223
+#: src/ats/gnunet-service-ats_addresses.c:1419
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:735
+#: src/ats/gnunet-service-ats_addresses_mlp.c:756
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1044
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1075
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1226
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1258
 #, c-format
 msgid "Update for ATS type `%s' not implemented!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1306
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1341
 #, c-format
 msgid "Updating address for peer `%s' not added before\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1726
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1761
 #, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
 "%llu must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1734
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1769
 #, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
 "must be at least %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1744
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1779
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1752
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1787
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1763
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1798
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
@@ -340,85 +449,85 @@
 "s, %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:326
+#: src/ats-tool/gnunet-ats.c:320
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:345 src/namestore/gnunet-namestore.c:610
-#: src/transport/gnunet-transport.c:813
+#: src/ats-tool/gnunet-ats.c:339 src/namestore/gnunet-namestore.c:610
+#: src/transport/gnunet-transport.c:804
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "服务已删除。\n"
 
-#: src/ats-tool/gnunet-ats.c:355 src/transport/gnunet-transport.c:819
+#: src/ats-tool/gnunet-ats.c:349 src/transport/gnunet-transport.c:810
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats-tool/gnunet-ats.c:363
+#: src/ats-tool/gnunet-ats.c:357
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:379 src/ats-tool/gnunet-ats.c:398
-#: src/ats-tool/gnunet-ats.c:415 src/ats-tool/gnunet-ats.c:440
+#: src/ats-tool/gnunet-ats.c:373 src/ats-tool/gnunet-ats.c:392
+#: src/ats-tool/gnunet-ats.c:409 src/ats-tool/gnunet-ats.c:434
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:388 src/ats-tool/gnunet-ats.c:405
+#: src/ats-tool/gnunet-ats.c:382 src/ats-tool/gnunet-ats.c:399
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:433
+#: src/ats-tool/gnunet-ats.c:427
 msgid "Type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:490
+#: src/ats-tool/gnunet-ats.c:484
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:493
+#: src/ats-tool/gnunet-ats.c:487
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:496
+#: src/ats-tool/gnunet-ats.c:490
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/ats-tool/gnunet-ats.c:499
+#: src/ats-tool/gnunet-ats.c:493
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:502
+#: src/ats-tool/gnunet-ats.c:496
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/ats-tool/gnunet-ats.c:505
+#: src/ats-tool/gnunet-ats.c:499
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:502
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:511
+#: src/ats-tool/gnunet-ats.c:505
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:514
+#: src/ats-tool/gnunet-ats.c:508
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:517
+#: src/ats-tool/gnunet-ats.c:511
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:526
+#: src/ats-tool/gnunet-ats.c:520
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -428,21 +537,21 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/consensus/gnunet-consensus.c:317
+#: src/consensus/gnunet-consensus.c:350
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus.c:320
+#: src/consensus/gnunet-consensus.c:353
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus.c:323
+#: src/consensus/gnunet-consensus.c:356
 #, fuzzy
 msgid "number of values"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus.c:326
+#: src/consensus/gnunet-consensus.c:359
 msgid "consensus timeout"
 msgstr ""
 
@@ -468,51 +577,51 @@
 msgid "ibf size"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-start-peers.c:158
+#: src/consensus/gnunet-consensus-start-peers.c:172
 msgid "start peers with the given template configuration"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-start-peers.c:161
+#: src/consensus/gnunet-consensus-start-peers.c:175
 #, fuzzy
 msgid "number of peers to start"
 msgstr "迭代次数"
 
-#: src/core/core_api.c:755
+#: src/core/core_api.c:752
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:86 src/peerinfo-tool/gnunet-peerinfo.c:214
+#: src/core/gnunet-core.c:82
 #, c-format
 msgid "Peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:119 src/core/gnunet-core.c:147
-#: src/transport/gnunet-transport.c:612 src/transport/gnunet-transport.c:636
+#: src/core/gnunet-core.c:112 src/core/gnunet-core.c:140
+#: src/transport/gnunet-transport.c:606 src/transport/gnunet-transport.c:630
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:121 src/transport/gnunet-transport.c:614
+#: src/core/gnunet-core.c:114 src/transport/gnunet-transport.c:608
 #, fuzzy
 msgid "Connected to"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:149 src/transport/gnunet-transport.c:638
+#: src/core/gnunet-core.c:142 src/transport/gnunet-transport.c:632
 #, fuzzy
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:176
-#: src/peerinfo-tool/gnunet-peerinfo.c:541
+#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:176
+#: src/peerinfo-tool/gnunet-peerinfo.c:643
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/core/gnunet-core.c:211 src/transport/gnunet-transport.c:1005
+#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:996
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core.c:222
+#: src/core/gnunet-core.c:215
 msgid "Print information about connected peers."
 msgstr ""
 
@@ -532,7 +641,7 @@
 msgstr "立即保存配置?"
 
 #: src/core/gnunet-service-core.c:164
-#: src/transport/gnunet-service-transport.c:725
+#: src/transport/gnunet-service-transport.c:758
 #, fuzzy
 msgid "Transport service is unable to access hostkey. Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -642,38 +751,38 @@
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1312
+#: src/core/gnunet-service-core_kx.c:1298
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1319
+#: src/core/gnunet-service-core_kx.c:1305
 #, 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:1322
+#: src/core/gnunet-service-core_kx.c:1308
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1365
-#: src/core/gnunet-service-core_kx.c:1390
+#: src/core/gnunet-service-core_kx.c:1351
+#: src/core/gnunet-service-core_kx.c:1376
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1377
+#: src/core/gnunet-service-core_kx.c:1363
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1418
+#: src/core/gnunet-service-core_kx.c:1404
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1426
+#: src/core/gnunet-service-core_kx.c:1412
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1459
+#: src/core/gnunet-service-core_kx.c:1443
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
@@ -682,7 +791,7 @@
 msgstr ""
 
 #: src/core/gnunet-service-core_neighbours.c:179
-#: src/core/gnunet-service-core_neighbours.c:333
+#: src/core/gnunet-service-core_neighbours.c:328
 msgid "# neighbour entries allocated"
 msgstr ""
 
@@ -690,23 +799,23 @@
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:420
+#: src/core/gnunet-service-core_neighbours.c:411
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:210
 #: src/core/gnunet-service-core_sessions.c:280
-#: src/dht/gnunet-service-dht_neighbours.c:645
-#: src/dht/gnunet-service-dht_neighbours.c:704
-#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1530
-#: src/topology/gnunet-daemon-topology.c:704
-#: src/topology/gnunet-daemon-topology.c:805
-#: src/transport/gnunet-service-transport_neighbours.c:1052
-#: src/transport/gnunet-service-transport_neighbours.c:1276
-#: src/transport/gnunet-service-transport_neighbours.c:1285
-#: src/transport/gnunet-service-transport_neighbours.c:2826
-#: src/transport/gnunet-service-transport_neighbours.c:3089
+#: src/dht/gnunet-service-dht_neighbours.c:644
+#: src/dht/gnunet-service-dht_neighbours.c:703
+#: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
+#: src/topology/gnunet-daemon-topology.c:700
+#: src/topology/gnunet-daemon-topology.c:801
+#: src/transport/gnunet-service-transport_neighbours.c:1041
+#: src/transport/gnunet-service-transport_neighbours.c:1265
+#: src/transport/gnunet-service-transport_neighbours.c:1274
+#: src/transport/gnunet-service-transport_neighbours.c:2794
+#: src/transport/gnunet-service-transport_neighbours.c:3053
 msgid "# peers connected"
 msgstr ""
 
@@ -774,14 +883,14 @@
 #: src/datacache/plugin_datacache_sqlite.c:72
 #: src/datastore/plugin_datastore_mysql.c:803
 #: src/datastore/plugin_datastore_mysql.c:817
-#: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
-#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
-#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
+#: src/datastore/plugin_datastore_sqlite.c:57 src/fs/fs_pseudonym.c:46
+#: src/mysql/mysql.c:41 src/mysql/mysql.c:48 src/mysql/mysql.c:522
+#: src/mysql/mysql.c:531 src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51
 #: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:46
 #: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
-#: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
+#: src/include/gnunet_common.h:608 src/include/gnunet_common.h:615
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
@@ -1159,7 +1268,7 @@
 #: 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:736
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:1037
+#: src/nse/gnunet-nse-profiler.c:900
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1226,83 +1335,83 @@
 msgid "Failed to connect to transport service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-service-dht_clients.c:413
+#: src/dht/gnunet-service-dht_clients.c:414
 msgid "# GET requests from clients injected"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:503
+#: src/dht/gnunet-service-dht_clients.c:508
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:585
+#: src/dht/gnunet-service-dht_clients.c:590
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:791
+#: src/dht/gnunet-service-dht_clients.c:796
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1035
+#: src/dht/gnunet-service-dht_clients.c:1041
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1048
+#: src/dht/gnunet-service-dht_clients.c:1054
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1085
+#: src/dht/gnunet-service-dht_clients.c:1091
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1108
+#: src/dht/gnunet-service-dht_clients.c:1114
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1157
-#: src/dht/gnunet-service-dht_clients.c:1199
+#: src/dht/gnunet-service-dht_clients.c:1165
+#: src/dht/gnunet-service-dht_clients.c:1207
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1167
+#: src/dht/gnunet-service-dht_clients.c:1175
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:64
+#: src/dht/gnunet-service-dht_datacache.c:68
 #, c-format
 msgid "%s request received, but have no datacache!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:74
+#: src/dht/gnunet-service-dht_datacache.c:78
 msgid "# ITEMS stored in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:159
+#: src/dht/gnunet-service-dht_datacache.c:165
 msgid "# Good RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:170
+#: src/dht/gnunet-service-dht_datacache.c:176
 msgid "# Duplicate RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:176
+#: src/dht/gnunet-service-dht_datacache.c:182
 msgid "# Invalid RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:182
+#: src/dht/gnunet-service-dht_datacache.c:188
 msgid "# Irrelevant RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:194
+#: src/dht/gnunet-service-dht_datacache.c:200
 msgid "# Unsupported RESULTS found in datacache"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:197
+#: src/dht/gnunet-service-dht_datacache.c:203
 #, c-format
 msgid "Unsupported block type (%u) in local response!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_datacache.c:227
+#: src/dht/gnunet-service-dht_datacache.c:234
 msgid "# GET requests given to datacache"
 msgstr ""
 
@@ -1310,87 +1419,87 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:501
+#: src/dht/gnunet-service-dht_neighbours.c:504
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:591
+#: src/dht/gnunet-service-dht_neighbours.c:594
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:738
+#: src/dht/gnunet-service-dht_neighbours.c:737
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:793
+#: src/dht/gnunet-service-dht_neighbours.c:792
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:831
+#: src/dht/gnunet-service-dht_neighbours.c:830
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1053
-#: src/dht/gnunet-service-dht_neighbours.c:1081
+#: src/dht/gnunet-service-dht_neighbours.c:1052
+#: src/dht/gnunet-service-dht_neighbours.c:1086
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1062
-#: src/dht/gnunet-service-dht_neighbours.c:1096
+#: src/dht/gnunet-service-dht_neighbours.c:1067
+#: src/dht/gnunet-service-dht_neighbours.c:1101
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1230
+#: src/dht/gnunet-service-dht_neighbours.c:1235
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1259
+#: src/dht/gnunet-service-dht_neighbours.c:1264
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1266
-#: src/dht/gnunet-service-dht_neighbours.c:1379
-#: src/dht/gnunet-service-dht_neighbours.c:1479
+#: src/dht/gnunet-service-dht_neighbours.c:1271
+#: src/dht/gnunet-service-dht_neighbours.c:1384
+#: src/dht/gnunet-service-dht_neighbours.c:1484
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1344
+#: src/dht/gnunet-service-dht_neighbours.c:1349
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1371
+#: src/dht/gnunet-service-dht_neighbours.c:1376
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1486
+#: src/dht/gnunet-service-dht_neighbours.c:1491
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1574
+#: src/dht/gnunet-service-dht_neighbours.c:1575
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1704
+#: src/dht/gnunet-service-dht_neighbours.c:1730
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1712
+#: src/dht/gnunet-service-dht_neighbours.c:1738
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1803
+#: src/dht/gnunet-service-dht_neighbours.c:1829
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1845
+#: src/dht/gnunet-service-dht_neighbours.c:1882
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1859
+#: src/dht/gnunet-service-dht_neighbours.c:1896
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1943
+#: src/dht/gnunet-service-dht_neighbours.c:1973
 msgid "# P2P RESULTS received"
 msgstr ""
 
@@ -1551,19 +1660,14 @@
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/dv/dv_api.c:189
-#, fuzzy
-msgid "Failed to connect to the dv service!\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/dv/gnunet-service-dv.c:3003
-msgid "Error in communication with PEERINFO service\n"
+#: src/dv/gnunet-dv.c:165
+msgid "verbose output"
 msgstr ""
 
-#: src/dv/plugin_transport_dv.c:159
-#, c-format
-msgid "%s Received message from %s of type %d, distance %u!\n"
-msgstr ""
+#: src/dv/gnunet-dv.c:174
+#, fuzzy
+msgid "Print information about DV state"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
 
 #: src/exit/gnunet-daemon-exit.c:741
 #, c-format
@@ -1997,7 +2101,7 @@
 msgid "Identifiers or URI too long to create UBlock"
 msgstr ""
 
-#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:307
+#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:311
 #, fuzzy
 msgid "Internal error."
 msgstr "未知错误。\n"
@@ -2006,6 +2110,26 @@
 msgid "Failed to connect to datastore."
 msgstr ""
 
+#: src/fs/fs_pseudonym.c:342 src/fs/fs_pseudonym.c:645
+#, fuzzy, c-format
+msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/fs/fs_pseudonym.c:477 src/fs/fs_pseudonym.c:503
+#: src/fs/fs_pseudonym.c:641
+msgid "no-name"
+msgstr "无名称"
+
+#: src/fs/fs_pseudonym.c:1182 src/util/crypto_ecc.c:975
+#, fuzzy, c-format
+msgid "ECC signing failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
+
+#: src/fs/fs_pseudonym.c:1505
+#, fuzzy, c-format
+msgid "ECDSA signature verification failed at %s:%d: %s\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
+
 #: src/fs/fs_publish.c:129 src/fs/fs_publish.c:397
 #, c-format
 msgid "Publishing failed: %s"
@@ -2067,7 +2191,7 @@
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:269
+#: src/fs/fs_publish_ksk.c:273
 msgid "Could not connect to datastore."
 msgstr ""
 
@@ -2200,19 +2324,19 @@
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/fs/fs_uri.c:944
+#: src/fs/fs_uri.c:945
 msgid "identifier is NULL!"
 msgstr ""
 
-#: src/fs/fs_uri.c:949
+#: src/fs/fs_uri.c:951
 msgid "identifier has zero length!"
 msgstr ""
 
-#: src/fs/fs_uri.c:1118 src/fs/fs_uri.c:1145
+#: src/fs/fs_uri.c:1122 src/fs/fs_uri.c:1149
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1151
+#: src/fs/fs_uri.c:1155
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2412,19 +2536,19 @@
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:182
+#: src/fs/gnunet-fs-profiler.c:190
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:185
+#: src/fs/gnunet-fs-profiler.c:193
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:188
+#: src/fs/gnunet-fs-profiler.c:196
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:197
+#: src/fs/gnunet-fs-profiler.c:205
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
@@ -2583,7 +2707,7 @@
 msgstr ""
 
 #: src/fs/gnunet-publish.c:588 src/fs/gnunet-publish.c:595
-#: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
+#: src/transport/gnunet-transport.c:834 src/transport/gnunet-transport.c:864
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
@@ -2682,99 +2806,99 @@
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:248
+#: src/fs/gnunet-service-fs.c:271
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:309 src/fs/gnunet-service-fs.c:521
+#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:538
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:626 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1322
-#: src/topology/gnunet-daemon-topology.c:1329
+#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:291
+#: src/topology/gnunet-daemon-topology.c:1314
+#: src/topology/gnunet-daemon-topology.c:1321
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-service-fs_cp.c:711
+#: src/fs/gnunet-service-fs_cp.c:677
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:715
+#: src/fs/gnunet-service-fs_cp.c:681
 #, c-format
 msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:751
+#: src/fs/gnunet-service-fs_cp.c:716
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:757
+#: src/fs/gnunet-service-fs_cp.c:722
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1331
+#: src/fs/gnunet-service-fs_cp.c:747 src/fs/gnunet-service-fs_cp.c:1296
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:875
+#: src/fs/gnunet-service-fs_cp.c:840
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:928
+#: src/fs/gnunet-service-fs_cp.c:893
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:936
+#: src/fs/gnunet-service-fs_cp.c:901
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:950
+#: src/fs/gnunet-service-fs_cp.c:915
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:988
+#: src/fs/gnunet-service-fs_cp.c:953
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1056
+#: src/fs/gnunet-service-fs_cp.c:1021
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1081
+#: src/fs/gnunet-service-fs_cp.c:1046
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1091
+#: src/fs/gnunet-service-fs_cp.c:1056
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1169
+#: src/fs/gnunet-service-fs_cp.c:1134
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1203
+#: src/fs/gnunet-service-fs_cp.c:1168
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1226
+#: src/fs/gnunet-service-fs_cp.c:1191
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1276
+#: src/fs/gnunet-service-fs_cp.c:1241
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1300
+#: src/fs/gnunet-service-fs_cp.c:1265
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1329
+#: src/fs/gnunet-service-fs_cp.c:1294
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1699
+#: src/fs/gnunet-service-fs_cp.c:1664
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -3220,99 +3344,99 @@
 msgid "Not a GADS TLD: `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:118
+#: src/hello/gnunet-hello.c:119
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:124
+#: src/hello/gnunet-hello.c:125
 #, fuzzy, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/hello/gnunet-hello.c:132
+#: src/hello/gnunet-hello.c:133
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:139
+#: src/hello/gnunet-hello.c:140
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:149 src/hello/gnunet-hello.c:177
+#: src/hello/gnunet-hello.c:150 src/hello/gnunet-hello.c:179
 #, fuzzy, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/hello/gnunet-hello.c:165
+#: src/hello/gnunet-hello.c:166
 #, c-format
 msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:189
+#: src/hello/gnunet-hello.c:191
 #, fuzzy, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/hello/hello.c:904
+#: src/hello/hello.c:936
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:913
+#: src/hello/hello.c:945
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:923
+#: src/hello/hello.c:955
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/hello/hello.c:933
+#: src/hello/hello.c:965
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:950
+#: src/hello/hello.c:982
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:959
+#: src/hello/hello.c:991
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:978
+#: src/hello/hello.c:1010
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:264
+#: src/hostlist/gnunet-daemon-hostlist.c:258
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:317
+#: src/hostlist/gnunet-daemon-hostlist.c:311
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:322
+#: src/hostlist/gnunet-daemon-hostlist.c:316
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:325
+#: src/hostlist/gnunet-daemon-hostlist.c:319
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:329
+#: src/hostlist/gnunet-daemon-hostlist.c:323
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:344
+#: src/hostlist/gnunet-daemon-hostlist.c:338
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -3337,13 +3461,13 @@
 #: src/hostlist/hostlist-client.c:686 src/hostlist/hostlist-client.c:738
 #: src/hostlist/hostlist-client.c:747 src/hostlist/hostlist-client.c:868
 #: src/hostlist/hostlist-client.c:960 src/hostlist/hostlist-client.c:965
-#: src/transport/plugin_transport_http_client.c:1052
-#: src/transport/plugin_transport_http_client.c:1067
+#: src/transport/plugin_transport_http_client.c:1056
+#: src/transport/plugin_transport_http_client.c:1071
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1327
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1319
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -3393,7 +3517,7 @@
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1500
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1492
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -3402,68 +3526,68 @@
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
+#: src/hostlist/hostlist-client.c:1105 src/hostlist/hostlist-client.c:1121
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1275
+#: src/hostlist/hostlist-client.c:1267
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1279
+#: src/hostlist/hostlist-client.c:1271
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1290
+#: src/hostlist/hostlist-client.c:1282
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/hostlist-client.c:1323
+#: src/hostlist/hostlist-client.c:1315
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1325
+#: src/hostlist/hostlist-client.c:1317
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1370
+#: src/hostlist/hostlist-client.c:1362
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/hostlist-client.c:1375
+#: src/hostlist/hostlist-client.c:1367
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1399 src/hostlist/hostlist-client.c:1416
+#: src/hostlist/hostlist-client.c:1391 src/hostlist/hostlist-client.c:1408
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1411
+#: src/hostlist/hostlist-client.c:1403
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1465
+#: src/hostlist/hostlist-client.c:1457
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1477
+#: src/hostlist/hostlist-client.c:1469
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1489
+#: src/hostlist/hostlist-client.c:1481
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1493
+#: src/hostlist/hostlist-client.c:1485
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
@@ -3476,10 +3600,11 @@
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:425
-#: src/peerinfo-tool/gnunet-peerinfo.c:331
-#: src/peerinfo-tool/gnunet-peerinfo.c:386
-#: src/topology/gnunet-daemon-topology.c:922
+#: src/hostlist/hostlist-server.c:184 src/hostlist/hostlist-server.c:421
+#: src/peerinfo-tool/gnunet-peerinfo.c:348
+#: src/peerinfo-tool/gnunet-peerinfo.c:418
+#: src/peerinfo-tool/gnunet-peerinfo.c:489
+#: src/topology/gnunet-daemon-topology.c:918
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
@@ -3530,55 +3655,55 @@
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:388
+#: src/hostlist/hostlist-server.c:384
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:552 src/peerinfo-tool/gnunet-peerinfo.c:547
-#: src/transport/gnunet-service-transport.c:632
+#: src/hostlist/hostlist-server.c:548 src/peerinfo-tool/gnunet-peerinfo.c:649
+#: src/transport/gnunet-service-transport.c:661
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:562
+#: src/hostlist/hostlist-server.c:558
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:571
+#: src/hostlist/hostlist-server.c:567
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:585
+#: src/hostlist/hostlist-server.c:581
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:625
+#: src/hostlist/hostlist-server.c:621
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/hostlist-server.c:667
+#: src/hostlist/hostlist-server.c:663
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1001
+#: src/integration-tests/connection_watchdog.c:990
 #, c-format
 msgid "Transport plugin: `%s' port %llu\n"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1034
+#: src/integration-tests/connection_watchdog.c:1023
 #, fuzzy, c-format
 msgid "Found %u transport plugins: `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/integration-tests/connection_watchdog.c:1093
+#: src/integration-tests/connection_watchdog.c:1082
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1102
+#: src/integration-tests/connection_watchdog.c:1091
 #: src/template/gnunet-template.c:70
 msgid "help text"
 msgstr ""
@@ -3597,38 +3722,39 @@
 msgid "Print information about mesh tunnels and peers."
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/mesh/gnunet-service-mesh.c:8010 src/mesh/gnunet-service-mesh-new.c:8015
+#: src/mesh/gnunet-service-mesh.c:7966 src/mesh/gnunet-service-mesh-new.c:7972
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8227 src/mesh/gnunet-service-mesh-new.c:8232
+#: src/mesh/gnunet-service-mesh.c:8179 src/mesh/gnunet-service-mesh-new.c:8185
 #, fuzzy, c-format
 msgid "Mesh service could not access hostkey: %s. Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/mesh/gnunet-service-mesh.c:8309 src/mesh/gnunet-service-mesh.c:8321
-#: src/mesh/gnunet-service-mesh.c:8333 src/mesh/gnunet-service-mesh.c:8347
-#: src/mesh/gnunet-service-mesh.c:8359 src/mesh/gnunet-service-mesh.c:8371
-#: src/mesh/gnunet-service-mesh.c:8383 src/mesh/gnunet-service-mesh-new.c:8321
-#: src/mesh/gnunet-service-mesh-new.c:8333
-#: src/mesh/gnunet-service-mesh-new.c:8345
-#: src/mesh/gnunet-service-mesh-new.c:8359
-#: src/mesh/gnunet-service-mesh-new.c:8371
-#: src/mesh/gnunet-service-mesh-new.c:8383
-#: src/mesh/gnunet-service-mesh-new.c:8395 src/nse/gnunet-service-nse.c:1478
-#: src/nse/gnunet-service-nse.c:1496
-#: src/regex/gnunet-daemon-regexprofiler.c:277
-#: src/regex/gnunet-daemon-regexprofiler.c:290
-#: src/regex/gnunet-daemon-regexprofiler.c:303
+#: src/mesh/gnunet-service-mesh.c:8261 src/mesh/gnunet-service-mesh.c:8273
+#: src/mesh/gnunet-service-mesh.c:8285 src/mesh/gnunet-service-mesh.c:8299
+#: src/mesh/gnunet-service-mesh.c:8311 src/mesh/gnunet-service-mesh.c:8323
+#: src/mesh/gnunet-service-mesh.c:8335 src/mesh/gnunet-service-mesh-new.c:8274
+#: src/mesh/gnunet-service-mesh-new.c:8286
+#: src/mesh/gnunet-service-mesh-new.c:8298
+#: src/mesh/gnunet-service-mesh-new.c:8312
+#: src/mesh/gnunet-service-mesh-new.c:8324
+#: src/mesh/gnunet-service-mesh-new.c:8336
+#: src/mesh/gnunet-service-mesh-new.c:8348 src/nse/gnunet-service-nse.c:1516
+#: src/nse/gnunet-service-nse.c:1534
+#: src/regex/gnunet-daemon-regexprofiler.c:320
+#: src/regex/gnunet-daemon-regexprofiler.c:332
+#: src/regex/gnunet-daemon-regexprofiler.c:344
+#: src/regex/gnunet-daemon-regexprofiler.c:357
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/mesh/gnunet-service-mesh.c:8395 src/mesh/gnunet-service-mesh.c:8405
-#: src/mesh/gnunet-service-mesh.c:8416 src/mesh/gnunet-service-mesh-new.c:8407
-#: src/mesh/gnunet-service-mesh-new.c:8417
-#: src/mesh/gnunet-service-mesh-new.c:8428
+#: src/mesh/gnunet-service-mesh.c:8347 src/mesh/gnunet-service-mesh.c:8357
+#: src/mesh/gnunet-service-mesh.c:8368 src/mesh/gnunet-service-mesh-new.c:8360
+#: src/mesh/gnunet-service-mesh-new.c:8370
+#: src/mesh/gnunet-service-mesh-new.c:8381
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -3720,7 +3846,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:599
+#: src/peerinfo-tool/gnunet-peerinfo.c:701
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
@@ -4004,86 +4130,89 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1013
+#: src/nse/gnunet-nse-profiler.c:885
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1016
+#: src/nse/gnunet-nse-profiler.c:888
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1019
+#: src/nse/gnunet-nse-profiler.c:891 src/testbed/gnunet-testbed-profiler.c:282
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1022
-msgid "IP address of this system as seen by the rest of the testbed"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:1025
-msgid "delay between queries to statistics during a round"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:1028
-msgid "prefix of the filenames we use for writing the topology for each round"
-msgstr ""
-
-#: src/nse/gnunet-nse-profiler.c:1031
+#: src/nse/gnunet-nse-profiler.c:894
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1034
+#: src/nse/gnunet-nse-profiler.c:897
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1040
+#: src/nse/gnunet-nse-profiler.c:903
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1050
+#: src/nse/gnunet-nse-profiler.c:912
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-service-nse.c:1389
+#: src/nse/gnunet-service-nse.c:1405
 #, fuzzy, c-format
 msgid "NSE service could not access hostkey: %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/nse/gnunet-service-nse.c:1403
+#: src/nse/gnunet-service-nse.c:1419
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1486
+#: src/nse/gnunet-service-nse.c:1524
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:134
+#: src/peerinfo/gnunet-service-peerinfo.c:215
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:230
+#: src/peerinfo/gnunet-service-peerinfo.c:354
 #, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
+msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:269
+#: src/peerinfo/gnunet-service-peerinfo.c:369
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s %u \n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:444
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:297
+#: src/peerinfo/gnunet-service-peerinfo.c:480
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:419
+#: src/peerinfo/gnunet-service-peerinfo.c:632
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:637
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:807
+#: src/peerinfo/gnunet-service-peerinfo.c:969
+#, fuzzy, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1249
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -4113,75 +4242,108 @@
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/peerinfo/peerinfo_api_notify.c:256
+#: src/peerinfo/peerinfo_api_notify.c:269
 #, fuzzy, c-format
 msgid "Could not connect to `%s' service.\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:419
+#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#, fuzzy, c-format
+msgid "%sPeer `%s'\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:427
+#, fuzzy, c-format
+msgid "Failure: Did not receive %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:435
 #, c-format
+msgid "Failure: Received invalid %s\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:444
+#, fuzzy, c-format
+msgid "Failed to write HELLO with %u bytes to file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:457
+#, c-format
+msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:521
+#, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:557
+#: src/peerinfo-tool/gnunet-peerinfo.c:659
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:563
+#: src/peerinfo-tool/gnunet-peerinfo.c:665
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:625
+#: src/peerinfo-tool/gnunet-peerinfo.c:727
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/peerinfo-tool/gnunet-peerinfo.c:759
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654
+#: src/peerinfo-tool/gnunet-peerinfo.c:762
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:657
+#: src/peerinfo-tool/gnunet-peerinfo.c:765
+msgid "include friend-only information"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:768
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:660
+#: src/peerinfo-tool/gnunet-peerinfo.c:771
 #, fuzzy
 msgid "list all known peers"
 msgstr "列出所有网络适配器"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:663
+#: src/peerinfo-tool/gnunet-peerinfo.c:774
+msgid "dump hello to file"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:777
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:666
+#: src/peerinfo-tool/gnunet-peerinfo.c:780
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:677
+#: src/peerinfo-tool/gnunet-peerinfo.c:791
 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:105
-#: src/transport/gnunet-service-transport_plugins.c:118
+#: src/transport/gnunet-service-transport_plugins.c:120
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:122
+#: src/transport/gnunet-service-transport_plugins.c:124
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:150
+#: src/transport/gnunet-service-transport_plugins.c:153
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -4254,141 +4416,84 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:376
+#: src/regex/gnunet-daemon-regexprofiler.c:432
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1373
-#, c-format
-msgid "An operation has failed while starting peers: %s\n"
+#: src/regex/gnunet-regex-profiler.c:1246
+msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1418
-#, fuzzy, c-format
-msgid "Creating a peer failed. Error: %s\n"
-msgstr "“%s”以错误码 %d 失败:%s\n"
+#: src/regex/gnunet-regex-profiler.c:1257
+#, fuzzy
+msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
+msgstr "配置文件“%s”已写入。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1545
-msgid "An operation has failed while starting slaves\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1567
-#, fuzzy, c-format
-msgid "No files found in `%s'\n"
-msgstr "运行 %s失败:%s %d\n"
-
-#: src/regex/gnunet-regex-profiler.c:1622
-msgid "An operation has failed while linking\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1732
-#: src/testbed/testbed_api_testbed.c:799
-#, c-format
-msgid "Host registration failed for a host. Error: %s\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1813
-msgid "Unable to connect to master controller -- Check config\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1915
-#: src/testbed/testbed_api_testbed.c:964
-#, c-format
-msgid "Host %s cannot start testbed\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1918
-#: src/testbed/testbed_api_testbed.c:968
-msgid "Testbed cannot be started on localhost\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1958
-#, c-format
+#: src/regex/gnunet-regex-profiler.c:1276
 msgid "No hosts-file specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1963
+#: src/regex/gnunet-regex-profiler.c:1282
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1969
-#: src/testbed/testbed_api_testbed.c:1071
+#: src/regex/gnunet-regex-profiler.c:1288
+#: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
-msgid "No hosts loaded. Need at least one host\n"
+msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1972
-#, c-format
-msgid "Checking whether given hosts can start testbed. Please wait\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1996
+#: src/regex/gnunet-regex-profiler.c:1295
 #, fuzzy, c-format
-msgid "Exiting\n"
-msgstr "退出"
+msgid "No files found in `%s'\n"
+msgstr "运行 %s失败:%s %d\n"
 
-#: src/regex/gnunet-regex-profiler.c:2002
-#, c-format
-msgid "No configuration file given. Exiting\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:2011
-#, fuzzy, c-format
-msgid "Configuration option (regex_prefix) missing. Exiting\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/regex/gnunet-regex-profiler.c:2029
-#: src/regex/gnunet-regex-simulation-profiler.c:629
-#, c-format
-msgid "Specified policies directory does not exist. Exiting.\n"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:2036
-#, c-format
+#: src/regex/gnunet-regex-profiler.c:1304
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:2044
-#, c-format
+#: src/regex/gnunet-regex-profiler.c:1314
+#, fuzzy
 msgid ""
-"Error loading search strings. Given file does not contain enough strings. "
+"Error loading search strings.Given file does not contain enough strings. "
 "Exiting.\n"
-msgstr ""
+msgstr "创建用户出错"
 
-#: src/regex/gnunet-regex-profiler.c:2050
-#, fuzzy, c-format
+#: src/regex/gnunet-regex-profiler.c:1322
+#, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "创建用户出错"
 
-#: src/regex/gnunet-regex-profiler.c:2077
+#: src/regex/gnunet-regex-profiler.c:1389
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:2080
-msgid "create COUNT number of random links between peers"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:2083
+#: src/regex/gnunet-regex-profiler.c:1392
 msgid "wait TIMEOUT before considering a string match as failed"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:2086
-msgid "wait DELAY before starting string search"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:2089
+#: src/regex/gnunet-regex-profiler.c:1395
 msgid "number of search strings to read from search strings file"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:2092
-#: src/regex/gnunet-regex-simulation-profiler.c:692
-msgid "maximum path compression length"
+#: src/regex/gnunet-regex-profiler.c:1398
+msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:2105
+#: src/regex/gnunet-regex-profiler.c:1401
+#, fuzzy
+msgid "name of file with input strings"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/regex/gnunet-regex-profiler.c:1404
+#, fuzzy
+msgid "name of file with hosts' names"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/regex/gnunet-regex-profiler.c:1416
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4396,6 +4501,10 @@
 msgid "name of the table to write DFAs"
 msgstr ""
 
+#: src/regex/gnunet-regex-simulation-profiler.c:692
+msgid "maximum path compression length"
+msgstr ""
+
 #: src/regex/gnunet-regex-simulation-profiler.c:705
 msgid "Profiler for regex library"
 msgstr ""
@@ -4485,12 +4594,12 @@
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
-#: src/statistics/statistics_api.c:511
+#: src/statistics/statistics_api.c:512
 #, fuzzy
 msgid "Could not save some persistent statistics\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/statistics_api.c:1056
+#: src/statistics/statistics_api.c:1057
 msgid ""
 "Failed to receive acknowledgement from statistics service, some statistics "
 "might have been lost!\n"
@@ -4501,138 +4610,175 @@
 msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
 msgstr ""
 
+#: src/testbed/gnunet-service-testbed_cpustatus.c:670
+#, c-format
+msgid ""
+"Cannot open %s for writing load statistics.  Not logging load statistics\n"
+msgstr ""
+
 #: src/testbed/gnunet_testbed_ll_master.c:57
 #, c-format
 msgid "Job command file not given. Exiting\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:235
-#, c-format
-msgid "No hosts-file specified on command line\n"
+#: src/testbed/gnunet_testbed_mpi_spawn.c:135
+msgid "Waiting for child to exit.\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:267
+#: src/testbed/gnunet_testbed_mpi_spawn.c:296
+#, fuzzy, c-format
+msgid "Spawning process `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
+#: src/testbed/gnunet-testbed-profiler.c:249
+#, fuzzy, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "增加 TCP/IP 的最大连接数"
+
+#: src/testbed/gnunet-testbed-profiler.c:275
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:270
+#: src/testbed/gnunet-testbed-profiler.c:278
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:286
-msgid "Profiler for testbed"
-msgstr ""
-
-#: src/testbed/testbed_api_hosts.c:469
+#: src/testbed/testbed_api_hosts.c:459
 #, c-format
 msgid "Hosts file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:477
+#: src/testbed/testbed_api_hosts.c:467
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:484
+#: src/testbed/testbed_api_hosts.c:474
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:593
+#: src/testbed/testbed_api_hosts.c:583
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1836
+#: src/testbed/testbed_api_hosts.c:1856
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "“%s”以错误码 %d 失败:%s\n"
 
-#: src/testbed/testbed_api_testbed.c:638
+#: src/testbed/testbed_api_testbed.c:771
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1003
+#: src/testbed/testbed_api_testbed.c:913
+#, c-format
+msgid "Host registration failed for a host. Error: %s\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:978
+msgid "Controller crash detected. Shutting down.\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1081
+#, c-format
+msgid "Host %s cannot start testbed\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1085
+msgid "Testbed cannot be started on localhost\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1120
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1059
+#: src/testbed/testbed_api_testbed.c:1138
+msgid "Shutting down testbed due to timeout while setup.\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1197
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1095
+#: src/testbed/testbed_api_testbed.c:1209
+msgid "No hosts loaded. Need at least one host\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1233
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:668
+#: src/testbed/testbed_api_topology.c:670
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:674
+#: src/testbed/testbed_api_topology.c:676
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:681
+#: src/testbed/testbed_api_topology.c:683
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:704
+#: src/testbed/testbed_api_topology.c:706
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testbed/testbed_api_topology.c:713
-#: src/testbed/testbed_api_topology.c:737
+#: src/testbed/testbed_api_topology.c:715
+#: src/testbed/testbed_api_topology.c:739
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:719
-#: src/testbed/testbed_api_topology.c:743
+#: src/testbed/testbed_api_topology.c:721
+#: src/testbed/testbed_api_topology.c:745
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testbed/testbed_api_topology.c:725
-#: src/testbed/testbed_api_topology.c:749
+#: src/testbed/testbed_api_topology.c:727
+#: src/testbed/testbed_api_topology.c:751
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:764
+#: src/testbed/testbed_api_topology.c:766
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/testing/gnunet-testing.c:132
+#: src/testing/gnunet-testing.c:133
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/gnunet-testing.c:209
+#: src/testing/gnunet-testing.c:210
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/testing/gnunet-testing.c:211
+#: src/testing/gnunet-testing.c:212
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:213
+#: src/testing/gnunet-testing.c:214
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr "打印配置文件中的一个值到标准输出"
 
-#: src/testing/gnunet-testing.c:215
+#: src/testing/gnunet-testing.c:216
 #, fuzzy
 msgid "configuration template"
 msgstr "配置已保存"
 
-#: src/testing/gnunet-testing.c:224
+#: src/testing/gnunet-testing.c:225
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -4650,59 +4796,64 @@
 msgid "name of the service to run"
 msgstr ""
 
-#: src/testing/testing.c:217
+#: src/testing/testing.c:288
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:233
+#: src/testing/testing.c:304
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:547
+#: src/testing/testing.c:719
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:558
+#: src/testing/testing.c:730
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/testing/testing.c:872
+#: src/testing/testing.c:1175
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:883
+#: src/testing/testing.c:1182
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
 "precompute more hostkeys first.\n"
 msgstr ""
 
-#: src/testing/testing.c:897
+#: src/testing/testing.c:1191
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:931
+#: src/testing/testing.c:1211
 #, fuzzy, c-format
+msgid "Cannot open hostkey file: %s\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/testing/testing.c:1221
+#, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:949
+#: src/testing/testing.c:1243
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1029
+#: src/testing/testing.c:1343
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/testing/testing.c:1235
+#: src/testing/testing.c:1691
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -4715,144 +4866,122 @@
 msgid "# connect requests issued to transport"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:725
-#: src/topology/gnunet-daemon-topology.c:810
+#: src/topology/gnunet-daemon-topology.c:721
+#: src/topology/gnunet-daemon-topology.c:806
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:991
+#: src/topology/gnunet-daemon-topology.c:987
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1034
+#: src/topology/gnunet-daemon-topology.c:1030
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1040
+#: src/topology/gnunet-daemon-topology.c:1036
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1049
+#: src/topology/gnunet-daemon-topology.c:1045
 #, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1057
+#: src/topology/gnunet-daemon-topology.c:1053
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1077
+#: src/topology/gnunet-daemon-topology.c:1073
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1090
+#: src/topology/gnunet-daemon-topology.c:1086
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1100
+#: src/topology/gnunet-daemon-topology.c:1096
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1106
+#: src/topology/gnunet-daemon-topology.c:1102
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1116
+#: src/topology/gnunet-daemon-topology.c:1112
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1122
+#: src/topology/gnunet-daemon-topology.c:1118
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1129
+#: src/topology/gnunet-daemon-topology.c:1125
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1164
+#: src/topology/gnunet-daemon-topology.c:1156
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1219
+#: src/topology/gnunet-daemon-topology.c:1211
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1358
+#: src/topology/gnunet-daemon-topology.c:1350
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:246
+#: src/transport/gnunet-service-transport_blacklist.c:267
 #, fuzzy, c-format
-msgid "Could not read blacklist file `%s'\n"
-msgstr "无法解析“%s”(%s):%s\n"
+msgid "Adding blacklisting entry for peer `%s'\n"
+msgstr "卸载 GNUnet 服务"
 
-#: src/transport/gnunet-service-transport_blacklist.c:263
-#, fuzzy, c-format
-msgid "Failed to read blacklist from `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:284
-#: src/transport/gnunet-service-transport_blacklist.c:308
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr "配置文件“%s”第 %d 行有语法错误。\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:295
-#: src/transport/gnunet-service-transport_blacklist.c:331
+#: src/transport/gnunet-service-transport_blacklist.c:275
 #, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
+msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:345
-#, fuzzy, c-format
-msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-msgstr "配置文件“%s”第 %d 行有语法错误。\n"
-
-#: src/transport/gnunet-service-transport_blacklist.c:359
-#, c-format
-msgid "Found myself `%s' in blacklist (useless, ignored)\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_blacklist.c:514
-#: src/transport/gnunet-service-transport_blacklist.c:752
+#: src/transport/gnunet-service-transport_blacklist.c:453
+#: src/transport/gnunet-service-transport_blacklist.c:718
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:183
+#: src/transport/gnunet-service-transport.c:174
 msgid "# bytes payload discarded due to not connected peer "
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:258
+#: src/transport/gnunet-service-transport.c:239
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:305
+#: src/transport/gnunet-service-transport.c:286
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:613
+#: src/transport/gnunet-service-transport.c:642
 #, fuzzy, c-format
 msgid "Transport service could not access hostkey: %s. Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/gnunet-service-transport.c:708
+#: src/transport/gnunet-service-transport.c:741
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -4865,122 +4994,122 @@
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:546
+#: src/transport/gnunet-service-transport_clients.c:536
 #, c-format
 msgid "Rejecting control connection from peer `%s', which is not me!\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:687
+#: src/transport/gnunet-service-transport_clients.c:677
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_clients.c:738
+#: src/transport/gnunet-service-transport_clients.c:728
 msgid "# REQUEST CONNECT messages received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_hello.c:175
+#: src/transport/gnunet-service-transport_hello.c:179
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1227
+#: src/transport/gnunet-service-transport_neighbours.c:1216
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1357
-#: src/transport/gnunet-service-transport_neighbours.c:1694
+#: src/transport/gnunet-service-transport_neighbours.c:1346
+#: src/transport/gnunet-service-transport_neighbours.c:1678
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1362
+#: src/transport/gnunet-service-transport_neighbours.c:1351
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1367
+#: src/transport/gnunet-service-transport_neighbours.c:1356
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1424
+#: src/transport/gnunet-service-transport_neighbours.c:1413
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1466
+#: src/transport/gnunet-service-transport_neighbours.c:1455
 msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1490
+#: src/transport/gnunet-service-transport_neighbours.c:1479
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1498
+#: src/transport/gnunet-service-transport_neighbours.c:1487
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1535
+#: src/transport/gnunet-service-transport_neighbours.c:1520
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1544
+#: src/transport/gnunet-service-transport_neighbours.c:1529
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1600
+#: src/transport/gnunet-service-transport_neighbours.c:1584
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1634
+#: src/transport/gnunet-service-transport_neighbours.c:1618
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1650
+#: src/transport/gnunet-service-transport_neighbours.c:1634
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2802
+#: src/transport/gnunet-service-transport_neighbours.c:2770
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2817
-#: src/transport/gnunet-service-transport_neighbours.c:2851
+#: src/transport/gnunet-service-transport_neighbours.c:2785
+#: src/transport/gnunet-service-transport_neighbours.c:2819
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2864
+#: src/transport/gnunet-service-transport_neighbours.c:2832
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2897
+#: src/transport/gnunet-service-transport_neighbours.c:2865
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3082
+#: src/transport/gnunet-service-transport_neighbours.c:3046
 msgid "# unexpected SESSION ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3137
+#: src/transport/gnunet-service-transport_neighbours.c:3101
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3151
+#: src/transport/gnunet-service-transport_neighbours.c:3115
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3182
+#: src/transport/gnunet-service-transport_neighbours.c:3146
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3193
+#: src/transport/gnunet-service-transport_neighbours.c:3157
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3224
+#: src/transport/gnunet-service-transport_neighbours.c:3188
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3319
+#: src/transport/gnunet-service-transport_neighbours.c:3283
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:111
+#: src/transport/gnunet-service-transport_plugins.c:113
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
@@ -5028,7 +5157,7 @@
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1302
+#: src/transport/gnunet-service-transport_validation.c:1305
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
@@ -5072,274 +5201,274 @@
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:531
+#: src/transport/gnunet-transport.c:528
 #, fuzzy, c-format
 msgid "Successfully connected to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:553
+#: src/transport/gnunet-transport.c:550
 #, c-format
 msgid ""
 "Successfully connected to `%s', starting to send benchmark data in %u Kb "
 "blocks\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:588
+#: src/transport/gnunet-transport.c:585
 #, fuzzy, c-format
 msgid "Disconnected from peer `%s' while benchmarking\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:664
+#: src/transport/gnunet-transport.c:655
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:687
+#: src/transport/gnunet-transport.c:678
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/transport/gnunet-transport.c:702
+#: src/transport/gnunet-transport.c:693
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:766
+#: src/transport/gnunet-transport.c:757
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/transport/gnunet-transport.c:794
+#: src/transport/gnunet-transport.c:785
 #, fuzzy
 msgid "Failed to send connect request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:828
+#: src/transport/gnunet-transport.c:819
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:834
+#: src/transport/gnunet-transport.c:825
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:854 src/transport/gnunet-transport.c:884
-#: src/transport/gnunet-transport.c:906 src/transport/gnunet-transport.c:945
+#: src/transport/gnunet-transport.c:845 src/transport/gnunet-transport.c:875
+#: src/transport/gnunet-transport.c:897 src/transport/gnunet-transport.c:936
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:861 src/transport/gnunet-transport.c:891
+#: src/transport/gnunet-transport.c:852 src/transport/gnunet-transport.c:882
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:911
+#: src/transport/gnunet-transport.c:902
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:996
+#: src/transport/gnunet-transport.c:987
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:999
+#: src/transport/gnunet-transport.c:990
 #, fuzzy
 msgid "connect to a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:993
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1008
+#: src/transport/gnunet-transport.c:999
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1011
+#: src/transport/gnunet-transport.c:1002
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1014
+#: src/transport/gnunet-transport.c:1005
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1018
+#: src/transport/gnunet-transport.c:1009
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1021
+#: src/transport/gnunet-transport.c:1012
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1032
+#: src/transport/gnunet-transport.c:1023
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_http.c:817
-#: src/transport/plugin_transport_http_server.c:2556
+#: src/transport/plugin_transport_http.c:815
+#: src/transport/plugin_transport_http_server.c:2566
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:866
-#: src/transport/plugin_transport_http_server.c:2324
+#: src/transport/plugin_transport_http.c:864
+#: src/transport/plugin_transport_http_server.c:2334
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/transport/plugin_transport_http.c:898
-#: src/transport/plugin_transport_http_server.c:2356 src/util/service.c:1053
+#: src/transport/plugin_transport_http.c:896
+#: src/transport/plugin_transport_http_server.c:2366 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_http.c:915
-#: src/transport/plugin_transport_http_server.c:2373 src/util/service.c:1070
+#: src/transport/plugin_transport_http.c:913
+#: src/transport/plugin_transport_http_server.c:2383 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/plugin_transport_http.c:1020
-#: src/transport/plugin_transport_http_server.c:2484
+#: src/transport/plugin_transport_http.c:1018
+#: src/transport/plugin_transport_http_server.c:2494
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1133
-#: src/transport/plugin_transport_http_server.c:2652
+#: src/transport/plugin_transport_http.c:1131
+#: src/transport/plugin_transport_http_server.c:2673
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1146
-#: src/transport/plugin_transport_http_server.c:2663
+#: src/transport/plugin_transport_http.c:1144
+#: src/transport/plugin_transport_http_server.c:2684
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/transport/plugin_transport_http.c:1157
+#: src/transport/plugin_transport_http.c:1155
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1177
+#: src/transport/plugin_transport_http.c:1175
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1206
+#: src/transport/plugin_transport_http.c:1204
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1223
-#: src/transport/plugin_transport_http_server.c:2745
+#: src/transport/plugin_transport_http.c:1221
+#: src/transport/plugin_transport_http_server.c:2774
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/transport/plugin_transport_http.c:1228
+#: src/transport/plugin_transport_http.c:1226
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1531
+#: src/transport/plugin_transport_http_client.c:1535
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1662
-#: src/transport/plugin_transport_http_server.c:2869
+#: src/transport/plugin_transport_http_client.c:1666
+#: src/transport/plugin_transport_http_server.c:2898
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:1687
-#: src/transport/plugin_transport_http_server.c:2928
+#: src/transport/plugin_transport_http_client.c:1691
+#: src/transport/plugin_transport_http_server.c:2957
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1715
-#: src/transport/plugin_transport_http_server.c:2775
+#: src/transport/plugin_transport_http_client.c:1719
+#: src/transport/plugin_transport_http_server.c:2804
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:1342
+#: src/transport/plugin_transport_http_server.c:1352
 #, 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:1603
+#: src/transport/plugin_transport_http_server.c:1613
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1611
+#: src/transport/plugin_transport_http_server.c:1621
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1912
+#: src/transport/plugin_transport_http_server.c:1922
 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:1936
+#: src/transport/plugin_transport_http_server.c:1946
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2631
+#: src/transport/plugin_transport_http_server.c:2652
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2645
+#: src/transport/plugin_transport_http_server.c:2666
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2670
+#: src/transport/plugin_transport_http_server.c:2691
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2685
+#: src/transport/plugin_transport_http_server.c:2706
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2695
+#: src/transport/plugin_transport_http_server.c:2716
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2716
+#: src/transport/plugin_transport_http_server.c:2737
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2726
+#: src/transport/plugin_transport_http_server.c:2747
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2761
+#: src/transport/plugin_transport_http_server.c:2790
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
@@ -5403,7 +5532,7 @@
 #: src/transport/plugin_transport_tcp.c:778
 #: src/transport/plugin_transport_tcp.c:967
 #: src/transport/plugin_transport_tcp.c:1826
-#: src/transport/plugin_transport_tcp.c:2462
+#: src/transport/plugin_transport_tcp.c:2456
 msgid "# TCP sessions active"
 msgstr ""
 
@@ -5437,60 +5566,65 @@
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2046
+#: src/transport/plugin_transport_tcp.c:2036
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2124
+#: src/transport/plugin_transport_tcp.c:2118
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2350 src/util/service.c:948
+#: src/transport/plugin_transport_tcp.c:2344 src/util/service.c:948
 #: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2364
+#: src/transport/plugin_transport_tcp.c:2358
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2450
+#: src/transport/plugin_transport_tcp.c:2444
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2454
+#: src/transport/plugin_transport_tcp.c:2448
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2458
+#: src/transport/plugin_transport_tcp.c:2452
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:128
+#: src/transport/plugin_transport_udp_broadcasting.c:134
 msgid "# IPv6 multicast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:169
+#: src/transport/plugin_transport_udp_broadcasting.c:184
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:394
+#: src/transport/plugin_transport_udp_broadcasting.c:403
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:420
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2517
+#: src/transport/plugin_transport_udp.c:2520
 #, 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:2531
+#: src/transport/plugin_transport_udp.c:2534
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5498,22 +5632,22 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2772
+#: src/transport/plugin_transport_udp.c:2775
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_udp.c:2848
+#: src/transport/plugin_transport_udp.c:2851
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2891
+#: src/transport/plugin_transport_udp.c:2894
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_unix.c:1355
+#: src/transport/plugin_transport_unix.c:1353
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -5528,7 +5662,7 @@
 
 #: src/transport/plugin_transport_wlan.c:645
 #: src/transport/plugin_transport_wlan.c:695
-#: src/transport/plugin_transport_wlan.c:1758
+#: src/transport/plugin_transport_wlan.c:1764
 msgid "# WLAN sessions allocated"
 msgstr ""
 
@@ -5542,53 +5676,53 @@
 
 #: src/transport/plugin_transport_wlan.c:902
 #: src/transport/plugin_transport_wlan.c:987
-#: src/transport/plugin_transport_wlan.c:1760
+#: src/transport/plugin_transport_wlan.c:1766
 msgid "# WLAN MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1169
+#: src/transport/plugin_transport_wlan.c:1166
 msgid "# HELLO messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1190
+#: src/transport/plugin_transport_wlan.c:1192
 msgid "# fragments received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1200
+#: src/transport/plugin_transport_wlan.c:1202
 msgid "# ACKs received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1257
+#: src/transport/plugin_transport_wlan.c:1259
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1358
+#: src/transport/plugin_transport_wlan.c:1364
 msgid "# DATA messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1393
+#: src/transport/plugin_transport_wlan.c:1399
 msgid "# WLAN DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1454
+#: src/transport/plugin_transport_wlan.c:1460
 msgid "# HELLO beacons sent via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1563
+#: src/transport/plugin_transport_wlan.c:1569
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1739
+#: src/transport/plugin_transport_wlan.c:1745
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/transport_api.c:659
+#: src/transport/transport_api.c:651
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/transport/transport-testing.c:586
+#: src/transport/transport-testing.c:585
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -5658,7 +5792,7 @@
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1177
+#: src/util/client.c:1178
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -5700,16 +5834,16 @@
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1214
+#: src/util/common_logging.c:1215
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1232
+#: src/util/common_logging.c:1233
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/util/common_logging.c:1253
+#: src/util/common_logging.c:1254
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -5760,73 +5894,64 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:447
+#: src/util/crypto_ecc.c:444
 #, c-format
 msgid ""
 "File `%s' does not contain a valid private key (too long, %llu bytes).  "
 "Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:462 src/util/crypto_rsa.c:676
+#: src/util/crypto_ecc.c:459 src/util/crypto_rsa.c:676
 #, c-format
 msgid ""
 "File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
 "Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:558 src/util/crypto_ecc.c:602
+#: src/util/crypto_ecc.c:555 src/util/crypto_ecc.c:599
 #: src/util/crypto_rsa.c:750 src/util/crypto_rsa.c:887
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/crypto_ecc.c:563 src/util/crypto_rsa.c:892
+#: src/util/crypto_ecc.c:560 src/util/crypto_rsa.c:892
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_ecc.c:606 src/util/crypto_rsa.c:754
+#: src/util/crypto_ecc.c:603 src/util/crypto_rsa.c:754
 #: src/util/crypto_rsa.c:790
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:637 src/util/crypto_rsa.c:785
+#: src/util/crypto_ecc.c:634 src/util/crypto_rsa.c:785
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:642
+#: src/util/crypto_ecc.c:639
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:657 src/util/crypto_rsa.c:805
+#: src/util/crypto_ecc.c:654 src/util/crypto_rsa.c:805
 #, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:779 src/util/crypto_rsa.c:982
+#: src/util/crypto_ecc.c:776 src/util/crypto_rsa.c:982
 msgid "interrupted by shutdown"
 msgstr ""
 
-#: src/util/crypto_ecc.c:790
+#: src/util/crypto_ecc.c:787
 msgid "gnunet-ecc failed"
 msgstr ""
 
-#: src/util/crypto_ecc.c:978
-#, fuzzy, c-format
-msgid "ECC signing failed at %s:%d: %s\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
-
-#: src/util/crypto_ecc.c:1046
+#: src/util/crypto_ecc.c:1045
 #, c-format
 msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:1130
-msgid "To be implemented: not secure at the moment, please read README\n"
-msgstr ""
-
 #: src/util/crypto_random.c:281
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
@@ -5858,17 +5983,17 @@
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/disk.c:1206
+#: src/util/disk.c:1207
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录!\n"
 
-#: src/util/disk.c:1560 src/util/service.c:1670
+#: src/util/disk.c:1564 src/util/service.c:1670
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/util/disk.c:1999
+#: src/util/disk.c:2007
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
@@ -5939,12 +6064,12 @@
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "长选项的必选参数对短选项也是必选的。\n"
 
-#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:316
+#: src/util/getopt_helpers.c:270 src/util/getopt_helpers.c:328
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:288
+#: src/util/getopt_helpers.c:300
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
@@ -6110,18 +6235,28 @@
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:420
+#: src/util/os_installation.c:423
 #, fuzzy, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:702
+#: src/util/os_installation.c:709
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
+#: src/util/os_installation.c:767
+#, fuzzy, c-format
+msgid "CreateProcess failed for binary %s (%d).\n"
+msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
+
+#: src/util/os_installation.c:777
+#, c-format
+msgid "GetExitCodeProcess failed for binary %s (%d).\n"
+msgstr ""
+
 #: src/util/plugin.c:89
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -6147,15 +6282,6 @@
 msgid "Could not access configuration file `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/pseudonym.c:329 src/util/pseudonym.c:632
-#, fuzzy, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
-#: src/util/pseudonym.c:464 src/util/pseudonym.c:490 src/util/pseudonym.c:628
-msgid "no-name"
-msgstr "无名称"
-
 #: src/util/resolver_api.c:202
 #, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
@@ -6191,22 +6317,22 @@
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:426
+#: src/util/server.c:436
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/server.c:435
+#: src/util/server.c:445
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/server.c:446
+#: src/util/server.c:456
 #, fuzzy, c-format
 msgid "`%s' failed for `%.*s': address already in use\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/server.c:830
+#: src/util/server.c:848
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -6387,23 +6513,23 @@
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1086
+#: src/util/strings.c:1098
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1094
+#: src/util/strings.c:1106
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1100
+#: src/util/strings.c:1112
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1107
+#: src/util/strings.c:1119
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1116
+#: src/util/strings.c:1128
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
@@ -6573,23 +6699,68 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:579 src/include/gnunet_common.h:584
-#: src/include/gnunet_common.h:590
+#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
+#: src/include/gnunet_common.h:591
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:600
+#: src/include/gnunet_common.h:601
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:621 src/include/gnunet_common.h:628
+#: src/include/gnunet_common.h:622 src/include/gnunet_common.h:629
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Service `%s' has been stopped.\n"
+#~ msgstr "服务已删除。\n"
+
+#, fuzzy
+#~ msgid "Service `%s' was already running.\n"
+#~ msgstr "服务已删除。\n"
+
+#, fuzzy
+#~ msgid "Service `%s' has been started.\n"
+#~ msgstr "服务已删除。\n"
+
+#, fuzzy
+#~ msgid "Service `%s' was already being stopped.\n"
+#~ msgstr "服务已删除。\n"
+
+#, fuzzy
+#~ msgid "Service `%s' was already not running.\n"
+#~ msgstr "服务已删除。\n"
+
+#, fuzzy
+#~ msgid "Creating a peer failed. Error: %s\n"
+#~ msgstr "“%s”以错误码 %d 失败:%s\n"
+
+#, fuzzy
+#~ msgid "Exiting\n"
+#~ msgstr "退出"
+
+#, fuzzy
+#~ msgid "Could not read blacklist file `%s'\n"
+#~ msgstr "无法解析“%s”(%s):%s\n"
+
+#, fuzzy
+#~ msgid "Failed to read blacklist from `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
+#~ msgstr "配置文件“%s”第 %d 行有语法错误。\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
+#~ msgstr "配置文件“%s”第 %d 行有语法错误。\n"
+
+#, fuzzy
 #~ msgid "Failed to read hostkey: %s\n"
 #~ msgstr "运行 %s失败:%s %d\n"
 
@@ -6642,10 +6813,6 @@
 #~ msgstr "保存配置失败。"
 
 #, fuzzy
-#~ msgid "Starting HELPER process `%s'\n"
-#~ msgstr "卸载 GNUnet 服务"
-
-#, fuzzy
 #~ msgid "Configuration file `%s' for service `%s' not valid: %s\n"
 #~ msgstr "配置文件“%s”已写入。\n"
 
@@ -6802,10 +6969,6 @@
 #~ msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
-#~ msgid "Starting service %s for peer `%4s'\n"
-#~ msgstr "卸载 GNUnet 服务"
-
-#, fuzzy
 #~ msgid "Could not start `%s' process to copy configuration directory.\n"
 #~ msgstr "找不到主机“%s”的 IP:%s\n"
 
@@ -6880,10 +7043,6 @@
 #~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #, fuzzy
-#~ msgid "Could not open hostkeys file: %s\n"
-#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#, fuzzy
 #~ msgid "access (%s, X_OK) failed: %s\n"
 #~ msgstr "“%s”说:%s\n"
 
@@ -6917,9 +7076,6 @@
 #~ msgid "Failed during blacklist file copying!\n"
 #~ msgstr "解析配置文件“%s”失败\n"
 
-#~ msgid "Unknown user `%s'\n"
-#~ msgstr "未知的用户“%s”\n"
-
 #, fuzzy
 #~ msgid "Failed to connect to statistics service!\n"
 #~ msgstr "初始化“%s”服务失败。\n"
@@ -6933,10 +7089,6 @@
 #~ msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
 #, fuzzy
-#~ msgid "Failed to stop service `%s'!\n"
-#~ msgstr "打开日志文件“%s”失败:%s\n"
-
-#, fuzzy
 #~ msgid "Failed to start service `%s'!\n"
 #~ msgstr "解析配置文件“%s”失败\n"
 

Modified: gnunet/src/include/gnunet_set_service.h
===================================================================
--- gnunet/src/include/gnunet_set_service.h     2013-04-27 11:04:29 UTC (rev 
27000)
+++ gnunet/src/include/gnunet_set_service.h     2013-04-27 14:16:29 UTC (rev 
27001)
@@ -253,6 +253,11 @@
  * @param other_peer peer with the other set
  * @param app_id hash for the application using the set
  * @param context_msg additional information for the request
+ * @param salt salt used for the set operation; sometimes set operations
+ *        fail due to hash collisions, using a different salt for each 
operation
+ *        makes it harder for an attacker to exploit this
+ * @param timeout result_cb will be called with GNUNET_SET_STATUS_TIMEOUT
+ *        if the operation is not done after the specified time
  * @param result_cb called on error or success
  * @param result_cls closure for result_cb
  * @return a handle to cancel the operation
@@ -262,6 +267,7 @@
                      const struct GNUNET_PeerIdentity *other_peer,
                      const struct GNUNET_HashCode *app_id,
                      const struct GNUNET_MessageHeader *context_msg,
+                     uint16_t salt,
                      struct GNUNET_TIME_Relative timeout,
                      enum GNUNET_SET_ResultMode result_mode,
                      GNUNET_SET_ResultIterator result_cb,

Modified: gnunet/src/set/Makefile.am
===================================================================
--- gnunet/src/set/Makefile.am  2013-04-27 11:04:29 UTC (rev 27000)
+++ gnunet/src/set/Makefile.am  2013-04-27 14:16:29 UTC (rev 27001)
@@ -16,7 +16,7 @@
 endif
 
 bin_PROGRAMS = \
- gnunet-set
+ gnunet-set gnunet-set-bug
 
 libexec_PROGRAMS = \
  gnunet-service-set
@@ -35,6 +35,17 @@
 gnunet_set_DEPENDENCIES = \
   libgnunetset.la
 
+gnunet_set_bug_SOURCES = \
+ gnunet-set-bug.c \
+ mq.c
+gnunet_set_bug_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/stream/libgnunetstream.la \
+  $(GN_LIBINTL)
+# hack for mq.c, see automake Objects ‘created with both libtool and without’
+# remove once GNUNET_MQ is in util/
+gnunet_set_bug_CFLAGS = $(AM_CFLAGS)
+
 gnunet_service_set_SOURCES = \
  gnunet-service-set.c \
  gnunet-service-set_union.c \

Modified: gnunet/src/set/gnunet-service-set.c
===================================================================
--- gnunet/src/set/gnunet-service-set.c 2013-04-27 11:04:29 UTC (rev 27000)
+++ gnunet/src/set/gnunet-service-set.c 2013-04-27 14:16:29 UTC (rev 27001)
@@ -84,7 +84,7 @@
  * @param client the client to disconnect
  */
 void
-client_disconnect (struct GNUNET_SERVER_Client *client)
+_GSS_client_disconnect (struct GNUNET_SERVER_Client *client)
 {
   /* FIXME: clean up any data structures belonging to the client */
   GNUNET_SERVER_client_disconnect (client);
@@ -170,6 +170,7 @@
  * @param cls the incoming socket
  * @param mh the message
  */
+
 static void
 handle_p2p_operation_request (void *cls, const struct GNUNET_MessageHeader *mh)
 {
@@ -180,6 +181,8 @@
   struct Listener *listener;
   const struct GNUNET_MessageHeader *context_msg;
 
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "got operation request\n");
+
   if (ntohs (mh->size) < sizeof *msg)
   {
     GNUNET_break (0);
@@ -201,18 +204,28 @@
       return;
     }
   }
-
-  for (listener = listeners_head; listener != NULL; listener = listener->next)
+  /* find the appropriate listener */
+  for (listener = listeners_head;
+       listener != NULL;
+       listener = listener->next)
   {
     if ( (0 != GNUNET_CRYPTO_hash_cmp (&msg->app_id, &listener->app_id)) ||
          (htons (msg->operation) != listener->operation) )
       continue;
-    mqm = GNUNET_MQ_msg_concat (cmsg, context_msg, 
GNUNET_MESSAGE_TYPE_SET_REQUEST);
+    mqm = GNUNET_MQ_msg (cmsg, GNUNET_MESSAGE_TYPE_SET_REQUEST);
+    if (GNUNET_OK !=
+        GNUNET_MQ_nest (mqm, context_msg))
+    {
+      /* FIXME: disconnect the peer */
+      GNUNET_MQ_discard (mqm);
+      GNUNET_break (0);
+    }
     incoming->request_id = request_id++;
     cmsg->request_id = htonl (incoming->request_id);
     GNUNET_MQ_send (listener->client_mq, mqm);
     return;
   }
+  /* FIXME: send a reject message */
 }
 
 
@@ -249,7 +262,7 @@
       GNUNET_assert (0);
       break;
     case GNUNET_SET_OPERATION_UNION:
-      set = union_set_create ();
+      set = _GSS_union_set_create ();
       break;
     default:
       GNUNET_free (set);
@@ -261,7 +274,7 @@
   set->client = client;
   set->client_mq = GNUNET_MQ_queue_for_server_client (client);
   GNUNET_CONTAINER_DLL_insert (sets_head, sets_tail, set);
-
+  
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
@@ -292,6 +305,8 @@
   listener->app_id = msg->app_id;
   listener->operation = msg->operation;
   GNUNET_CONTAINER_DLL_insert_tail (listeners_head, listeners_tail, listener);
+
+  GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
 
@@ -313,14 +328,13 @@
   if (NULL == set)
   {
     GNUNET_break (0);
-    client_disconnect (client);
+    _GSS_client_disconnect (client);
     return;
   }
   switch (set->operation)
   {
     case GNUNET_SET_OPERATION_UNION:
-      union_add (set, (struct ElementMessage *) m);
-      break;
+      _GSS_union_add ((struct ElementMessage *) m, set);
     case GNUNET_SET_OPERATION_INTERSECTION:
       /* FIXME: cfuchs */
       break;
@@ -328,6 +342,8 @@
       GNUNET_assert (0);
       break;
   }
+
+  GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
 
@@ -344,24 +360,15 @@
                         const struct GNUNET_MessageHeader *m)
 {
   struct Set *set;
-  struct EvaluateMessage *msg = (struct EvaluateMessage *) m;
-  struct EvaluateOperation *eo;
 
   set = get_set (client);
-
   if (NULL == set)
   {
     GNUNET_break (0);
-    client_disconnect (client);
+    _GSS_client_disconnect (client);
     return;
   }
 
-  eo = GNUNET_new (struct EvaluateOperation);
-  eo->peer = msg->peer;
-  eo->app_id = msg->app_id;
-  eo->request_id = msg->request_id;
-  eo->context_msg = GNUNET_copy_message (&msg[1].header);
-  eo->set = set;
 
   switch (set->operation)
   {
@@ -369,12 +376,14 @@
       /* FIXME: cfuchs */
       break;
     case GNUNET_SET_OPERATION_UNION:
-      union_evaluate (eo);
+      _GSS_union_evaluate ((struct EvaluateMessage *) m, set);
       break;
     default:
       GNUNET_assert (0);
       break;
   }
+
+  GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
 
@@ -391,6 +400,7 @@
                       const struct GNUNET_MessageHeader *m)
 {
   /* FIXME: implement */
+  GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
 
@@ -407,6 +417,7 @@
                    const struct GNUNET_MessageHeader *m)
 {
   /* FIXME: implement */
+  GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
 
@@ -421,19 +432,18 @@
 static void
 handle_client_accept (void *cls,
                       struct GNUNET_SERVER_Client *client,
-                      const struct GNUNET_MessageHeader *m)
+                      const struct GNUNET_MessageHeader *mh)
 {
-  struct AcceptMessage *msg = (struct AcceptMessage *) m;
   struct Set *set;
   struct Incoming *incoming;
-  struct EvaluateOperation *eo;
+  struct AcceptMessage *msg = (struct AcceptMessage *) mh;
 
   set = get_set (client);
 
   if (NULL == set)
   {
     GNUNET_break (0);
-    client_disconnect (client);
+    _GSS_client_disconnect (client);
     return;
   }
 
@@ -443,16 +453,10 @@
        (incoming->operation != set->operation) )
   {
     GNUNET_break (0);
-    client_disconnect (client);
+    _GSS_client_disconnect (client);
     return;
   }
 
-  eo = GNUNET_new (struct EvaluateOperation);
-  eo->peer = incoming->peer;
-  eo->app_id = incoming->app_id;
-  eo->request_id = msg->request_id;
-  eo->set = set;
-
   switch (set->operation)
   {
     case GNUNET_SET_OPERATION_INTERSECTION:
@@ -460,12 +464,15 @@
       GNUNET_assert (0);
       break;
     case GNUNET_SET_OPERATION_UNION:
-      union_accept (eo, incoming);
+      _GSS_union_accept (msg, set, incoming);
       break;
     default:
       GNUNET_assert (0);
       break;
   }
+  /* FIXME: destroy incoming */
+
+  GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 
 
@@ -522,7 +529,7 @@
   {
     GNUNET_STREAM_listen_close (stream_listen_socket);
     stream_listen_socket = NULL;
-  } 
+  }
 
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "handled shutdown request\n");
 }
@@ -575,4 +582,3 @@
   return (GNUNET_OK == ret) ? 0 : 1;
 }
 
-

Modified: gnunet/src/set/gnunet-service-set.h
===================================================================
--- gnunet/src/set/gnunet-service-set.h 2013-04-27 11:04:29 UTC (rev 27000)
+++ gnunet/src/set/gnunet-service-set.h 2013-04-27 14:16:29 UTC (rev 27001)
@@ -86,86 +86,10 @@
   union {
     struct IntersectionState *i;
     struct UnionState *u;
-  } extra;
+  } state;
 };
 
 
-/**
- * State for an evaluate operation for a set that
- * supports set union.
- */
-struct UnionEvaluateOperation;
-
-
-/* FIXME: cfuchs */
-struct IntersectionEvaluateOperation
-{
-  /* FIXME: cfuchs */
-};
-
-
-/**
- * State of evaluation a set operation with
- * another peer
- */
-struct EvaluateOperation
-{
-  /**
-   * Local set the operation is evaluated on
-   */
-  struct Set *set;
-
-  /**
-   * Peer with the remote set
-   */
-  struct GNUNET_PeerIdentity peer;
-
-  /**
-   * Application-specific identifier
-   */
-  struct GNUNET_HashCode app_id;
-
-  /**
-   * Context message, given to us
-   * by the client, may be NULL.
-   */
-  struct GNUNET_MessageHeader *context_msg;
-
-  /**
-   * Stream socket connected to the other peer
-   */
-  struct GNUNET_STREAM_Socket *socket;
-
-  /**
-   * Message queue for the peer on the other
-   * end
-   */
-  struct GNUNET_MQ_MessageQueue *mq;
-
-  /**
-   * Type of this operation
-   */
-  enum GNUNET_SET_OperationType operation;
-
-  /**
-   * GNUNET_YES if we started the operation,
-   * GNUNET_NO if the other peer started it.
-   */
-  int is_outgoing;
-
-  /**
-   * Request id, so we can use one client handle
-   * for multiple operations
-   */
-  uint32_t request_id;
-
-  union {
-    struct UnionEvaluateOperation *u;
-    struct IntersectionEvaluateOperation *i;
-  } extra;
-};
-
-
 struct Listener
 {
   /**
@@ -246,6 +170,12 @@
   struct GNUNET_MessageHeader *context_msg;
 
   /**
+   * Salt the peer has requested to use for the
+   * operation
+   */
+  uint16_t salt;
+
+  /**
    * Operation the other peer wants to do
    */
   enum GNUNET_SET_OperationType operation;
@@ -271,23 +201,24 @@
  * @param client the client to disconnect
  */
 void
-client_disconnect (struct GNUNET_SERVER_Client *client);
+_GSS_client_disconnect (struct GNUNET_SERVER_Client *client);
 
 
 struct Set *
-union_set_create (void);
+_GSS_union_set_create (void);
 
 
 void
-union_evaluate (struct EvaluateOperation *eo);
+_GSS_union_evaluate (struct EvaluateMessage *m, struct Set *set);
 
 
 void
-union_add (struct Set *set, struct ElementMessage *m);
+_GSS_union_add (struct ElementMessage *m, struct Set *set);
 
 
 void
-union_accept (struct EvaluateOperation *eo, struct Incoming *incoming);
+_GSS_union_accept (struct AcceptMessage *m, struct Set *set,
+                   struct Incoming *incoming);
 
 
 #endif

Modified: gnunet/src/set/gnunet-service-set_union.c
===================================================================
--- gnunet/src/set/gnunet-service-set_union.c   2013-04-27 11:04:29 UTC (rev 
27000)
+++ gnunet/src/set/gnunet-service-set_union.c   2013-04-27 14:16:29 UTC (rev 
27001)
@@ -26,9 +26,12 @@
 
 
 #include "gnunet-service-set.h"
-#include "set_protocol.h"
+#include "gnunet_container_lib.h"
+#include "gnunet_crypto_lib.h"
 #include "ibf.h"
 #include "strata_estimator.h"
+#include "set_protocol.h"
+#include <gcrypt.h>
 
 
 /**
@@ -49,7 +52,6 @@
  */
 #define MAX_BUCKETS_PER_MESSAGE ((1<<15) / IBF_BUCKET_SIZE)
 
-
 /**
  * The maximum size of an ibf we use is 2^(MAX_IBF_ORDER).
  * Choose this value so that computing the IBF is still cheaper
@@ -76,6 +78,55 @@
  */
 struct UnionEvaluateOperation
 {
+  /**
+   * Local set the operation is evaluated on
+   */
+  struct Set *set;
+
+  /**
+   * Peer with the remote set
+   */
+  struct GNUNET_PeerIdentity peer;
+
+  /**
+   * Application-specific identifier
+   */
+  struct GNUNET_HashCode app_id;
+
+  /**
+   * Context message, given to us
+   * by the client, may be NULL.
+   */
+  struct GNUNET_MessageHeader *context_msg;
+
+  /**
+   * Stream socket connected to the other peer
+   */
+  struct GNUNET_STREAM_Socket *socket;
+
+  /**
+   * Message queue for the peer on the other
+   * end
+   */
+  struct GNUNET_MQ_MessageQueue *mq;
+
+  /**
+   * Type of this operation
+   */
+  enum GNUNET_SET_OperationType operation;
+
+  /**
+   * GNUNET_YES if we started the operation,
+   * GNUNET_NO if the other peer started it.
+   */
+  int is_outgoing;
+
+  /**
+   * Request id, so we can use one client handle
+   * for multiple operations
+   */
+  uint32_t request_id;
+
   /* last difference estimate */
   unsigned int diff;
 
@@ -95,99 +146,182 @@
    */
   unsigned int ibf_order;
 
+  struct StrataEstimator *se;
+
   /**
    * The ibf we currently receive
    */
-  struct InvertibleBloomFilter *ibf_received;
+  struct InvertibleBloomFilter *remote_ibf;
 
-  struct StrataEstimator *se;
+  /**
+   * Array of IBFs, some of them pre-allocated
+   */
+  struct InvertibleBloomFilter *local_ibf;
 
   /**
+   * Elements we received from the other peer.
+   */
+  struct GNUNET_CONTAINER_MultiHashMap *received_elements;
+
+  /**
+   * Maps IBF-Keys (specific to the current salt) to elements.
+   */
+  struct GNUNET_CONTAINER_MultiHashMap32 *key_to_element;
+
+  /**
    * Current state of the operation
    */
   enum UnionOperationState state;
+  
+  /**
+   * Evaluate operations are held in
+   * a linked list.
+   */
+  struct UnionEvaluateOperation *next;
+  
+   /**
+   * Evaluate operations are held in
+   * a linked list.
+   */
+  struct UnionEvaluateOperation *prev;
 };
 
-
 /**
- * Element entry, stored in the hash maps from
- * partial IBF keys to elements.
+ * Information about the element in a set.
+ * All elements are stored in a hash-table
+ * from their hash-code to their 'struct Element',
+ * so that the remove and add operations are reasonably
+ * fast.
  */
 struct ElementEntry
 {
   /**
-   * The actual element
+   * The actual element. The data for the element
+   * should be allocated at the end of this struct.
    */
-  struct GNUNET_SET_Element *element;
+  struct GNUNET_SET_Element element;
 
   /**
-   * Actual ibf key of the element entry
+   * Hash of the element.
+   * Will be used to derive the different IBF keys
+   * for different salts.
    */
-  struct IBF_Key ibf_key;
+  struct GNUNET_HashCode element_hash;
 
   /**
-   * Linked list, note that the next element
-   * has to have an ibf_key that is lexicographically
-   * equal or larger.
+   * Generation the element was added.
+   * Operations of earlier generations will not consider the element.
    */
-  struct ElementEntry *next;
+  int generation_add;
 
   /**
-   * GNUNET_YES if the element was received from
-   * the remote peer, and the local peer did not previously
-   * have it
+   * Generation this element was removed.
+   * Operations of later generations will not consider the element.
    */
+  int generation_remove;
+
+  /**
+   * GNUNET_YES if we received the element from a remote peer, and not
+   * from the local peer.  Note that if the local client inserts an
+   * element *after* we got it from a remote peer, the element is
+   * considered local.
+   */
   int remote;
 };
 
+/**
+ * Information about the element used for 
+ * a specific union operation.
+ */
+struct KeyEntry
+{
+  struct IBF_Key ibf_key;
 
+  /**
+   * The actual element associated with the key
+   */
+  struct ElementEntry *element;
+
+  /**
+   * Element that collides with this element
+   * on the ibf key
+   */
+  struct KeyEntry *next_colliding;
+};
+
+
 /**
  * Extra state required for efficient set union.
  */
 struct UnionState
 {
   /**
-   * Strate estimator of the set we currently have,
-   * used for estimation of the symmetric difference
+   * The strata estimator is only generated once for
+   * each set.
    */
   struct StrataEstimator *se;
 
   /**
-   * Array of IBFs, some of them pre-allocated
+   * Maps 'struct GNUNET_HashCode' to 'struct ElementEntry'.
    */
-  struct InvertibleBloomFilter **ibfs;
+  struct GNUNET_CONTAINER_MultiHashMap *elements;
 
   /**
-   * Maps the first 32 bits of the ibf-key to
-   * elements.
+   * Evaluate operations are held in
+   * a linked list.
    */
-  struct GNUNET_CONTAINER_MultiHashMap32 *elements;
+  struct UnionEvaluateOperation *ops_head;
+
+  /**
+   * Evaluate operations are held in
+   * a linked list.
+   */
+  struct UnionEvaluateOperation *ops_tail;
 };
 
 
+static struct IBF_Key
+get_ibf_key (struct GNUNET_HashCode *src, uint16_t salt)
+{
+   
+  struct IBF_Key key;
+  GNUNET_CRYPTO_hkdf (&key, sizeof (key),
+                     GCRY_MD_SHA512, GCRY_MD_SHA256,
+                      src, sizeof *src,
+                     &salt, sizeof (salt),
+                     NULL, 0);
+  return key;
+}
+
+
 static void
-send_operation_request (struct EvaluateOperation *eo)
+send_operation_request (struct UnionEvaluateOperation *eo)
 {
   struct GNUNET_MQ_Message *mqm;
   struct OperationRequestMessage *msg;
+  int ret;
 
-  mqm = GNUNET_MQ_msg_concat (msg, eo->context_msg,
-                              GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST);
-  if (NULL == mqm)
+  mqm = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_SET_P2P_OPERATION_REQUEST);
+  ret = GNUNET_MQ_nest (mqm, eo->context_msg);
+  if (GNUNET_OK != ret)
   {
     /* the context message is too large */
-    client_disconnect (eo->set->client);
+    _GSS_client_disconnect (eo->set->client);
+    GNUNET_MQ_discard (mqm);
     GNUNET_break (0);
     return;
   }
   msg->operation = eo->operation;
   msg->app_id = eo->app_id;
   GNUNET_MQ_send (eo->mq, mqm);
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "sent op request\n");
 }
 
 
 /**
- * Iterator to insert values into an ibf.
+ * Iterator to create the mapping between ibf keys
+ * and element entries.
  *
  * @param cls closure
  * @param key current key code
@@ -197,54 +331,93 @@
  *         GNUNET_NO if not.
  */
 static int
-ibf_insert_iterator (void *cls,
-                     uint32_t key,
-                     void *value)
+insert_element_iterator (void *cls,
+                         uint32_t key,
+                         void *value)
 {
-  struct InvertibleBloomFilter *ibf = cls;
-  struct ElementEntry *e = value;
-  struct IBF_Key ibf_key;
+  struct KeyEntry *const new_k = cls;
+  struct KeyEntry *old_k = value;
 
-  GNUNET_assert (NULL != e);
-  ibf_key = e->ibf_key;
-  ibf_insert (ibf, ibf_key);
-  e = e->next;
-
-  while (NULL != e)
+  GNUNET_assert (NULL != old_k);
+  do
   {
-    /* only insert keys we haven't seen yet */
-    if (0 != memcmp (&e->ibf_key, &ibf_key, sizeof ibf_key))
+    if (old_k->ibf_key.key_val == new_k->ibf_key.key_val)
     {
-      ibf_key = e->ibf_key;
-      ibf_insert (ibf, ibf_key);
+      new_k->next_colliding = old_k;
+      old_k->next_colliding = new_k;
+      return GNUNET_NO;
     }
-    e = e->next; 
+    old_k = old_k->next_colliding;
+  } while (NULL != old_k);
+  return GNUNET_YES;
+}
+
+
+static void
+insert_element (struct UnionEvaluateOperation *eo, struct ElementEntry *ee)
+{
+  int ret;
+  struct IBF_Key ibf_key;
+  struct KeyEntry *k;
+
+  ibf_key = get_ibf_key (&ee->element_hash, eo->salt);
+  k = GNUNET_new (struct KeyEntry);
+  k->element = ee;
+  k->ibf_key = ibf_key;
+  ret = GNUNET_CONTAINER_multihashmap32_get_multiple (eo->key_to_element, 
(uint32_t) ibf_key.key_val,
+                                                    insert_element_iterator, 
k);
+  /* was the element inserted into a colliding bucket? */
+  if (GNUNET_SYSERR == ret)
+  {
+    GNUNET_assert (NULL != k->next_colliding);
+    return;
   }
+  GNUNET_CONTAINER_multihashmap32_put (eo->key_to_element, (uint32_t) 
ibf_key.key_val, k,
+                                       
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+  if (NULL != eo->local_ibf)
+    ibf_insert (eo->local_ibf, ibf_key);
+}
 
+
+static int
+prepare_ibf_iterator (void *cls,
+                     uint32_t key,
+                     void *value)
+{
+  struct InvertibleBloomFilter *ibf = cls;
+  struct KeyEntry *ke = value;
+
+  ibf_insert (ibf, ke->ibf_key);
   return GNUNET_YES;
 }
 
+static int
+init_key_to_element_iterator (void *cls,
+                              const struct GNUNET_HashCode *key,
+                              void *value)
+{
+  struct UnionEvaluateOperation *eo = cls;
+  struct ElementEntry *e = value;
 
-/**
- * Create and populate an IBF for the specified peer,
- * if it does not already exist.
- *
- * @param cpi peer to create the ibf for
- */
-static struct InvertibleBloomFilter *
-prepare_ibf (struct EvaluateOperation *eo, uint16_t order)
+  insert_element (eo, e);
+  return GNUNET_YES;
+}
+
+static void
+prepare_ibf (struct UnionEvaluateOperation *eo, uint16_t size)
 {
-  struct UnionState *us = eo->set->extra.u;
-
-  GNUNET_assert (order <= MAX_IBF_ORDER);
-  if (NULL == us->ibfs)
-    us->ibfs = GNUNET_malloc (MAX_IBF_ORDER * sizeof (struct 
InvertibleBloomFilter *));
-  if (NULL == us->ibfs[order])
+  if (NULL == eo->key_to_element)
   {
-    us->ibfs[order] = ibf_create (1 << order, SE_IBF_HASH_NUM);
-    GNUNET_CONTAINER_multihashmap32_iterate (us->elements, 
ibf_insert_iterator, us->ibfs[order]);
+    unsigned int len;
+    len = GNUNET_CONTAINER_multihashmap_size (eo->set->state.u->elements);
+    eo->key_to_element = GNUNET_CONTAINER_multihashmap32_create (len);
+    GNUNET_CONTAINER_multihashmap_iterate (eo->set->state.u->elements,
+                                             init_key_to_element_iterator, eo);
   }
-  return us->ibfs[order];
+  if (NULL != eo->local_ibf)
+    ibf_destroy (eo->local_ibf);
+  eo->local_ibf = ibf_create (size, SE_IBF_HASH_NUM);
+  GNUNET_CONTAINER_multihashmap32_iterate (eo->key_to_element, 
prepare_ibf_iterator, eo->local_ibf);
 }
 
 
@@ -254,13 +427,15 @@
  * @param cpi the peer
  */
 static void
-send_ibf (struct EvaluateOperation *eo, uint16_t ibf_order)
+send_ibf (struct UnionEvaluateOperation *eo, uint16_t ibf_order)
 {
   unsigned int buckets_sent = 0;
   struct InvertibleBloomFilter *ibf;
 
-  ibf = prepare_ibf (eo, ibf_order);
+  prepare_ibf (eo, ibf_order);
 
+  ibf = eo->local_ibf;
+
   while (buckets_sent < (1 << ibf_order))
   {
     unsigned int buckets_in_message;
@@ -282,7 +457,7 @@
     GNUNET_MQ_send (eo->mq, mqm);
   }
 
-  eo->extra.u->state = STATE_EXPECT_ELEMENTS_AND_REQUESTS;
+  eo->state = STATE_EXPECT_ELEMENTS_AND_REQUESTS;
 }
 
 
@@ -292,7 +467,7 @@
  * @param cpi the peer
  */
 static void
-send_strata_estimator (struct EvaluateOperation *eo)
+send_strata_estimator (struct UnionEvaluateOperation *eo)
 {
   struct GNUNET_MQ_Message *mqm;
   struct GNUNET_MessageHeader *strata_msg;
@@ -300,31 +475,36 @@
   mqm = GNUNET_MQ_msg_header_extra (strata_msg,
                                     SE_STRATA_COUNT * IBF_BUCKET_SIZE * 
SE_IBF_SIZE,
                                     GNUNET_MESSAGE_TYPE_SET_P2P_SE);
-  strata_estimator_write (eo->set->extra.u->se, &strata_msg[1]);
+  strata_estimator_write (eo->set->state.u->se, &strata_msg[1]);
   GNUNET_MQ_send (eo->mq, mqm);
-
-  eo->extra.u->state = STATE_EXPECT_IBF;
+  eo->state = STATE_EXPECT_IBF;
 }
 
 
 static void
 handle_p2p_strata_estimator (void *cls, const struct GNUNET_MessageHeader *mh)
 {
-  struct EvaluateOperation *eo = cls;
+  struct UnionEvaluateOperation *eo = cls;
+  struct StrataEstimator *remote_se;
   int ibf_order;
   int diff;
 
-  if (eo->extra.u->state != STATE_EXPECT_SE)
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "got se\n");
+
+  if (eo->state != STATE_EXPECT_SE)
   {
     /* FIXME: handle */
     GNUNET_break (0);
     return;
   }
-  GNUNET_assert (NULL == eo->extra.u->se);
-  eo->extra.u->se = strata_estimator_create (SE_STRATA_COUNT, SE_IBF_SIZE, 
SE_IBF_HASH_NUM);
-  strata_estimator_read (&mh[1], eo->extra.u->se);
-  GNUNET_assert (NULL != eo->set->extra.u->se);
-  diff = strata_estimator_difference (eo->set->extra.u->se, eo->extra.u->se);
+  remote_se = strata_estimator_create (SE_STRATA_COUNT, SE_IBF_SIZE,
+                                       SE_IBF_HASH_NUM);
+  strata_estimator_read (&mh[1], remote_se);
+  GNUNET_assert (NULL != eo->se);
+  diff = strata_estimator_difference (remote_se, eo->se);
+  strata_estimator_destroy (remote_se);
+  strata_estimator_destroy (eo->se);
+  eo->se = NULL;
   /* minimum order */
   ibf_order = 2;
   while ((1<<ibf_order) < (2 * diff))
@@ -341,16 +521,17 @@
  * @param
  */
 static void
-decode (struct EvaluateOperation *eo)
+decode (struct UnionEvaluateOperation *eo)
 {
   struct IBF_Key key;
   int side;
   struct InvertibleBloomFilter *diff_ibf;
 
-  GNUNET_assert (STATE_EXPECT_ELEMENTS == eo->extra.u->state);
+  GNUNET_assert (STATE_EXPECT_ELEMENTS == eo->state);
 
-  diff_ibf = ibf_dup (prepare_ibf (eo, eo->extra.u->ibf_order));
-  ibf_subtract (diff_ibf, eo->extra.u->ibf_received);
+  prepare_ibf (eo, eo->ibf_order);
+  diff_ibf = ibf_dup (eo->local_ibf);
+  ibf_subtract (diff_ibf, eo->remote_ibf);
 
   while (1)
   {
@@ -359,7 +540,8 @@
     res = ibf_decode (diff_ibf, &side, &key);
     if (GNUNET_SYSERR == res)
     {
-      /* decoding failed, we tell the other peer by sending our ibf with a 
larger order */
+      /* decoding failed, we tell the other peer by sending our ibf
+       * with a larger order */
       GNUNET_assert (0);
       return;
     }
@@ -373,20 +555,11 @@
     }
     if (1 == side)
     {
-      struct ElementEntry *e;
+      //struct ElementEntry *e;
       /* we have the element(s), send it to the other peer */
-      e = GNUNET_CONTAINER_multihashmap32_get (eo->set->extra.u->elements, 
(uint32_t) key.key_val);
-      if (NULL == e)
-      {
-        /* FIXME */
-        GNUNET_assert (0);
-        return;
-      }
-      while (NULL != e)
-      {
-        /* FIXME: send element */
-        e = e->next;
-      }
+      //GNUNET_CONTAINER_multihashmap32_get_multiple 
(eo->set->state.u->elements,
+      //                                              (uint32_t) key.key_val);
+      /* FIXME */
     }
     else
     {
@@ -403,37 +576,35 @@
 }
 
 
-
 static void
 handle_p2p_ibf (void *cls, const struct GNUNET_MessageHeader *mh)
 {
-  struct EvaluateOperation *eo = cls;
-  struct UnionEvaluateOperation *ueo = eo->extra.u;
+  struct UnionEvaluateOperation *eo = cls;
   struct IBFMessage *msg = (struct IBFMessage *) mh;
   unsigned int buckets_in_message;
 
-  if (ueo->state == STATE_EXPECT_ELEMENTS_AND_REQUESTS)
+  if (eo->state == STATE_EXPECT_ELEMENTS_AND_REQUESTS)
   {
     /* check that the ibf is a new one / first part */
     /* clear outgoing messages */
     GNUNET_assert (0);
   }
-  else if (ueo->state == STATE_EXPECT_IBF)
+  else if (eo->state == STATE_EXPECT_IBF)
   {
-    ueo->state = STATE_EXPECT_IBF_CONT;
-    ueo->ibf_order = msg->order;
-    GNUNET_assert (NULL == ueo->ibf_received);
-    ueo->ibf_received = ibf_create (1<<msg->order, SE_IBF_HASH_NUM);
+    eo->state = STATE_EXPECT_IBF_CONT;
+    eo->ibf_order = msg->order;
+    GNUNET_assert (NULL == eo->remote_ibf);
+    eo->remote_ibf = ibf_create (1<<msg->order, SE_IBF_HASH_NUM);
     if (ntohs (msg->offset) != 0)
     {
       /* FIXME: handle */
       GNUNET_assert (0);
     }
   }
-  else if (ueo->state == STATE_EXPECT_IBF_CONT)
+  else if (eo->state == STATE_EXPECT_IBF_CONT)
   {
-    if ( (ntohs (msg->offset) != ueo->ibf_buckets_received) ||
-         (msg->order != ueo->ibf_order) )
+    if ( (ntohs (msg->offset) != eo->ibf_buckets_received) ||
+         (msg->order != eo->ibf_order) )
     {
       /* FIXME: handle */
       GNUNET_assert (0);
@@ -448,12 +619,12 @@
     GNUNET_assert (0);
   }
 
-  ibf_read_slice (&msg[1], ueo->ibf_buckets_received, buckets_in_message, 
ueo->ibf_received);
-  ueo->ibf_buckets_received += buckets_in_message;
+  ibf_read_slice (&msg[1], eo->ibf_buckets_received, buckets_in_message, 
eo->remote_ibf);
+  eo->ibf_buckets_received += buckets_in_message;
 
-  if (ueo->ibf_buckets_received == (1<<ueo->ibf_order))
+  if (eo->ibf_buckets_received == (1<<eo->ibf_order))
   {
-    ueo->state = STATE_EXPECT_ELEMENTS;
+    eo->state = STATE_EXPECT_ELEMENTS;
     decode (eo);
   }
 }
@@ -462,10 +633,10 @@
 static void
 handle_p2p_elements (void *cls, const struct GNUNET_MessageHeader *mh)
 {
-  struct EvaluateOperation *eo = cls;
+  struct UnionEvaluateOperation *eo = cls;
 
-  if ( (eo->extra.u->state != STATE_EXPECT_ELEMENTS) &&
-       (eo->extra.u->state != STATE_EXPECT_ELEMENTS_AND_REQUESTS) )
+  if ( (eo->state != STATE_EXPECT_ELEMENTS) &&
+       (eo->state != STATE_EXPECT_ELEMENTS_AND_REQUESTS) )
   {
     /* FIXME: handle */
     GNUNET_break (0);
@@ -477,10 +648,10 @@
 static void
 handle_p2p_element_requests (void *cls, const struct GNUNET_MessageHeader *mh)
 {
-  struct EvaluateOperation *eo = cls;
+  struct UnionEvaluateOperation *eo = cls;
 
   /* look up elements and send them */
-  if (eo->extra.u->state != STATE_EXPECT_ELEMENTS_AND_REQUESTS)
+  if (eo->state != STATE_EXPECT_ELEMENTS_AND_REQUESTS)
   {
     /* FIXME: handle */
     GNUNET_break (0);
@@ -508,141 +679,107 @@
 
 /**
  * Functions of this type will be called when a stream is established
- *
+ * 
  * @param cls the closure from GNUNET_STREAM_open
- * @param socket socket to use to communicate with the other side (read/write)
+ * @param socket socket to use to communicate with the
+ *        other side (read/write)
  */
 static void
 stream_open_cb (void *cls,
                 struct GNUNET_STREAM_Socket *socket)
 {
-  struct EvaluateOperation *eo = cls;
+  struct UnionEvaluateOperation *eo = cls;
 
   GNUNET_assert (NULL == eo->mq);
   GNUNET_assert (socket == eo->socket);
 
-  eo->mq = GNUNET_MQ_queue_for_stream_socket (eo->socket, union_handlers, eo);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "open cb successful\n");
+
+  eo->mq = GNUNET_MQ_queue_for_stream_socket (eo->socket,
+                                              union_handlers, eo);
+  /* we started the operation, thus we have to send the operation request */
   send_operation_request (eo);
+  eo->state = STATE_EXPECT_SE;
 }
        
 
 void
-union_evaluate (struct EvaluateOperation *eo)
+_GSS_union_evaluate (struct EvaluateMessage *m, struct Set *set)
 {
-  GNUNET_assert (GNUNET_SET_OPERATION_UNION == eo->set->operation);
+  struct UnionEvaluateOperation *eo;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "evaluating union operation\n");
+
+  eo = GNUNET_new (struct UnionEvaluateOperation);
+  eo->peer = m->peer;
+  eo->set = set;
   eo->socket = 
       GNUNET_STREAM_open (configuration, &eo->peer, 
GNUNET_APPLICATION_TYPE_SET,
-                          stream_open_cb, GNUNET_STREAM_OPTION_END);
+                          stream_open_cb, eo,
+                          GNUNET_STREAM_OPTION_END);
 }
 
 
-static void
-insert_ibf_key_unchecked (struct UnionState *us, struct IBF_Key ibf_key)
+void
+_GSS_union_accept (struct AcceptMessage *m, struct Set *set,
+                   struct Incoming *incoming)
 {
-  int i;
+  struct UnionEvaluateOperation *eo;
 
-  strata_estimator_insert (us->se, ibf_key);
-  for (i = 0; i <= MAX_IBF_ORDER; i++)
-  {
-    if (NULL == us->ibfs)
-      break;
-    if (NULL == us->ibfs[i])
-      continue;
-    ibf_insert (us->ibfs[i], ibf_key);
-  }
-}
-
-
-/**
- * Insert an element into the consensus set of the specified session.
- * The element will not be copied, and freed when destroying the session.
- *
- * @param session session for new element
- * @param element element to insert
- */
-static void
-insert_element (struct Set *set, struct GNUNET_SET_Element *element)
-{
-  struct UnionState *us = set->extra.u;
-  struct GNUNET_HashCode hash;
-  struct ElementEntry *e;
-  struct ElementEntry *e_old;
-
-  e = GNUNET_new (struct ElementEntry);
-  e->element = element;
-  GNUNET_CRYPTO_hash (e->element->data, e->element->size, &hash);
-  e->ibf_key = ibf_key_from_hashcode (&hash);
-
-  e_old = GNUNET_CONTAINER_multihashmap32_get (us->elements, (uint32_t) 
e->ibf_key.key_val);
-  if (NULL == e_old)
-  {
-    GNUNET_CONTAINER_multihashmap32_put (us->elements, (uint32_t) 
e->ibf_key.key_val, e,
-                                         
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
-    return;
-  }
-
-  while (NULL != e_old)
-  {
-    int cmp = memcmp (&e->ibf_key, &e_old->ibf_key, sizeof (struct IBF_Key));
-    if (cmp < 0)
-    {
-      if (NULL == e_old->next)
-      {
-        e_old->next = e;
-        insert_ibf_key_unchecked (us, e->ibf_key);
-        return;
-      }
-      e_old = e_old->next;
-    }
-    else if (cmp == 0)
-    {
-      e->next = e_old->next;
-      e_old->next = e;
-      return;
-    }
-    else
-    {
-      e->next = e_old;
-      insert_ibf_key_unchecked (us, e->ibf_key);
-      return;
-    }
-  } 
-}
-
-
-void
-union_accept (struct EvaluateOperation *eo, struct Incoming *incoming)
-{
-  GNUNET_assert (NULL != incoming->mq); 
+  eo = GNUNET_new (struct UnionEvaluateOperation);
+  eo->set = set;
+  eo->peer = incoming->peer;
+  eo->app_id = incoming->app_id;
+  eo->salt = ntohs (incoming->salt);
+  eo->request_id = m->request_id;
+  eo->set = set;
   eo->mq = incoming->mq;
+  /* the peer's socket is now ours, we'll receive all messages */
   GNUNET_MQ_replace_handlers (eo->mq, union_handlers, eo);
-
+  /* kick of the operation */
   send_strata_estimator (eo);
 }
 
 
 struct Set *
-union_set_create ()
+_GSS_union_set_create (void)
 {
   struct Set *set;
+
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "set created\n");
+  
   set = GNUNET_malloc (sizeof (struct Set) + sizeof (struct UnionState));
-  set->extra.u = (struct UnionState *) &set[1];
+  set->state.u = (struct UnionState *) &set[1];
   set->operation = GNUNET_SET_OPERATION_UNION;
-  set->extra.u->se = strata_estimator_create (SE_STRATA_COUNT, SE_IBF_SIZE, 
SE_IBF_HASH_NUM);
+  set->state.u->se = strata_estimator_create (SE_STRATA_COUNT,
+                                              SE_IBF_SIZE, SE_IBF_HASH_NUM);  
   return set;
 }
 
 
+
 void
-union_add (struct Set *set, struct ElementMessage *m)
+_GSS_union_add (struct ElementMessage *m, struct Set *set)
 {
-  struct GNUNET_SET_Element *element;
+  struct ElementEntry *ee;
+  struct ElementEntry *ee_dup;
   uint16_t element_size;
+  
   element_size = ntohs (m->header.size) - sizeof *m;
-  element = GNUNET_malloc (sizeof *element + element_size);
-  element->size = element_size;
-  element->data = &element[1];
-  memcpy (element->data, &m[1], element_size);
-  insert_element (set, element);
+  ee = GNUNET_malloc (element_size + sizeof *ee);
+  ee->element.size = element_size;
+  ee->element.data = &ee[1];
+  memcpy (ee->element.data, &m[1], element_size);
+  GNUNET_CRYPTO_hash (ee->element.data, element_size, &ee->element_hash);
+  ee_dup = GNUNET_CONTAINER_multihashmap_get (set->state.u->elements, 
&ee->element_hash);
+  if (NULL != ee_dup)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "element inserted twice, ignoring\n");
+    GNUNET_free (ee);
+    return;
+  }
+  GNUNET_CONTAINER_multihashmap_put (set->state.u->elements, 
&ee->element_hash, ee,
+                                     
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY);
+  strata_estimator_insert (set->state.u->se, get_ibf_key (&ee->element_hash, 
0));
 }
 

Modified: gnunet/src/set/gnunet-set.c
===================================================================
--- gnunet/src/set/gnunet-set.c 2013-04-27 11:04:29 UTC (rev 27000)
+++ gnunet/src/set/gnunet-set.c 2013-04-27 14:16:29 UTC (rev 27001)
@@ -30,6 +30,8 @@
 #include "gnunet_set_service.h"
 
 
+static struct GNUNET_PeerIdentity local_id;
+
 static struct GNUNET_HashCode app_id;
 static struct GNUNET_SET_Handle *set1;
 static struct GNUNET_SET_Handle *set2;
@@ -45,7 +47,14 @@
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "listen cb called\n");
 }
 
+static void
+result_cb (void *cls, struct GNUNET_SET_Element *element,
+           enum GNUNET_SET_Status status)
+{
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "got result\n");
+}
 
+
 /**
  * Main function that will be run.
  *
@@ -60,12 +69,19 @@
      const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   static const char* app_str = "gnunet-set";
+  
   GNUNET_CRYPTO_hash (app_str, strlen (app_str), &app_id);
 
+  GNUNET_CRYPTO_get_host_identity (cfg, &local_id);
+
   set1 = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_UNION);
   set2 = GNUNET_SET_create (cfg, GNUNET_SET_OPERATION_UNION);
-  listen_handle = GNUNET_SET_listen (cfg, GNUNET_SET_OPERATION_UNION, &app_id,
-                                     listen_cb, NULL);
+  listen_handle = GNUNET_SET_listen (cfg, GNUNET_SET_OPERATION_UNION,
+                                     &app_id, listen_cb, NULL);
+
+  GNUNET_SET_evaluate (set1, &local_id, &app_id, NULL, 42,
+                       GNUNET_TIME_UNIT_FOREVER_REL, GNUNET_SET_RESULT_ADDED,
+                       result_cb, NULL);
 }
 
 

Modified: gnunet/src/set/mq.c
===================================================================
--- gnunet/src/set/mq.c 2013-04-27 11:04:29 UTC (rev 27000)
+++ gnunet/src/set/mq.c 2013-04-27 14:16:29 UTC (rev 27001)
@@ -215,21 +215,25 @@
 }
 
 
-struct GNUNET_MQ_Message *
-GNUNET_MQ_msg_concat_ (struct GNUNET_MessageHeader **mhp, uint16_t base_size, 
struct GNUNET_MessageHeader *m, uint16_t type)
+int
+GNUNET_MQ_nest_ (struct GNUNET_MQ_Message **mqmp,
+                 const struct GNUNET_MessageHeader *m)
 {
-  struct GNUNET_MQ_Message *mq;
+  size_t new_size;
+  size_t old_size;
 
-  GNUNET_assert (NULL != mhp);
   if (NULL == m)
-    return GNUNET_MQ_msg_ (mhp, base_size, type);
-  GNUNET_assert (ntohs (m->size >= sizeof (struct GNUNET_MessageHeader)));
-  /* check for overflow */
-  if (base_size + ntohs (m->size) <= base_size)
-    return NULL; 
-  mq = GNUNET_MQ_msg_ (mhp, base_size + ntohs (m->size), type);
-  memcpy (((void *) *mhp) + base_size, m, ntohs (m->size));
-  return mq;
+    return GNUNET_OK;
+  GNUNET_assert (NULL != mqmp);
+  old_size = ntohs ((*mqmp)->mh->size);
+  /* message too large to concatenate? */
+  if (ntohs ((*mqmp)->mh->size) + ntohs (m->size) < ntohs (m->size))
+    return GNUNET_SYSERR;
+  new_size = old_size + ntohs (m->size);
+  *mqmp = GNUNET_realloc (mqmp, sizeof (struct GNUNET_MQ_Message) + new_size);
+  memcpy ((*mqmp)->mh + old_size, m, new_size - old_size);
+  (*mqmp)->mh->size = htons (new_size);
+  return GNUNET_OK;
 }
 
 
@@ -274,20 +278,26 @@
     return;
   GNUNET_CONTAINER_DLL_remove (mq->msg_head, mq->msg_tail, mqm);
   mss->wh = GNUNET_STREAM_write (mss->socket, mqm->mh, ntohs (mqm->mh->size),
-                                 GNUNET_TIME_UNIT_FOREVER_REL, 
stream_write_queued, cls);
+                                 GNUNET_TIME_UNIT_FOREVER_REL,
+                                 stream_write_queued, mq);
   GNUNET_assert (NULL != mss->wh);
 }
 
 
 static void
-stream_socket_send_impl (struct GNUNET_MQ_MessageQueue *mq, struct 
GNUNET_MQ_Message *mqm)
+stream_socket_send_impl (struct GNUNET_MQ_MessageQueue *mq,
+                         struct GNUNET_MQ_Message *mqm)
 {
+  struct MessageStreamState *mss = (struct MessageStreamState *) 
mq->impl_state;
   if (NULL != mq->current_msg)
   {
     GNUNET_CONTAINER_DLL_insert_tail (mq->msg_head, mq->msg_tail, mqm);
     return;
   }
-  stream_write_queued (mq, GNUNET_STREAM_OK, 0);
+  mq->current_msg = mqm;
+  mss->wh = GNUNET_STREAM_write (mss->socket, mqm->mh, ntohs (mqm->mh->size),
+                                 GNUNET_TIME_UNIT_FOREVER_REL,
+                                 stream_write_queued, mq);
 }
 
 
@@ -304,7 +314,8 @@
  * @return GNUNET_OK on success, GNUNET_SYSERR to stop further processing
  */
 static int
-stream_mst_callback (void *cls, void *client, const struct 
GNUNET_MessageHeader *message)
+stream_mst_callback (void *cls, void *client,
+                     const struct GNUNET_MessageHeader *message)
 {
   struct GNUNET_MQ_MessageQueue *mq = cls;
 
@@ -334,12 +345,14 @@
   struct GNUNET_MQ_MessageQueue *mq = cls;
   struct MessageStreamState *mss;
   int ret;
+  
   mss = (struct MessageStreamState *) mq->impl_state;
-
   GNUNET_assert (GNUNET_STREAM_OK == status);
   ret = GNUNET_SERVER_mst_receive (mss->mst, NULL, data, size, GNUNET_NO, 
GNUNET_NO);
   GNUNET_assert (GNUNET_OK == ret);
   /* we always read all data */
+    mss->rh = GNUNET_STREAM_read (mss->socket, GNUNET_TIME_UNIT_FOREVER_REL, 
+                                  stream_data_processor, mq);
   return size;
 }
 
@@ -369,8 +382,7 @@
 }
 
 
-/**
- * Transmit a queued message to the session's client.
+/*** Transmit a queued message to the session's client.
  *
  * @param cls consensus session
  * @param size number of bytes available in buf
@@ -474,7 +486,7 @@
     mq->current_msg = mq->msg_head;
     GNUNET_CONTAINER_DLL_remove (mq->msg_head, mq->msg_tail, mq->current_msg);
     state->th = 
-        GNUNET_CLIENT_notify_transmit_ready (state->connection, msg_size, 
+      GNUNET_CLIENT_notify_transmit_ready (state->connection, htons 
(mq->current_msg->mh->size), 
                                              GNUNET_TIME_UNIT_FOREVER_REL, 
GNUNET_NO,
                                              
&connection_client_transmit_queued, mq);
   }
@@ -483,7 +495,8 @@
 
 
 static void
-connection_client_send_impl (struct GNUNET_MQ_MessageQueue *mq, struct 
GNUNET_MQ_Message *mqm)
+connection_client_send_impl (struct GNUNET_MQ_MessageQueue *mq,
+                             struct GNUNET_MQ_Message *mqm)
 {
   struct ClientConnectionState *state = mq->impl_state;
   int msize;
@@ -519,7 +532,6 @@
   struct GNUNET_MQ_MessageQueue *mq = cls;
 
   GNUNET_assert (NULL != msg);
-
   dispatch_message (mq, msg);
 }
 

Modified: gnunet/src/set/mq.h
===================================================================
--- gnunet/src/set/mq.h 2013-04-27 11:04:29 UTC (rev 27000)
+++ gnunet/src/set/mq.h 2013-04-27 14:16:29 UTC (rev 27001)
@@ -58,21 +58,8 @@
  */
 #define GNUNET_MQ_msg(mvar, type) GNUNET_MQ_msg_extra(mvar, 0, type)
 
-/**
- * Allocate a GNUNET_MQ_Message, and concatenate another message
- * after the space needed by the message struct.
- * // nest?
- *
- * @param mvar variable to store the allocated message in;
- *             must have a header field
- * @param mc message to concatenate, can be NULL
- * @param type type of the message
- * @return the MQ message, NULL if mc is to large to be concatenated
- */
-#define GNUNET_MQ_msg_concat(mvar, mc, t) GNUNET_MQ_msg_concat_(((void) 
mvar->header, (struct GNUNET_MessageHeader **) &(mvar)), \
-      sizeof *mvar, (struct GNUNET_MessageHeader *) mc, t)
+#define GNUNET_MQ_nest(mqm, mh) GNUNET_MQ_nest_ (&mqm, mh)
 
-
 /**
  * Allocate a GNUNET_MQ_Message, where the message only consists of a header.
  * The allocated message will already have the type and size field set.
@@ -157,14 +144,9 @@
 GNUNET_MQ_msg_ (struct GNUNET_MessageHeader **mhp, uint16_t size, uint16_t 
type);
 
 
-/**
- * Create a new message for MQ, by concatenating another message
- * after a message of the specified type.
- *
- * @retrn the allocated MQ message
- */
-struct GNUNET_MQ_Message *
-GNUNET_MQ_msg_concat_ (struct GNUNET_MessageHeader **mhp, uint16_t base_size, 
struct GNUNET_MessageHeader *m, uint16_t type);
+int
+GNUNET_MQ_nest_ (struct GNUNET_MQ_Message **mqmp,
+                 const struct GNUNET_MessageHeader *m);
 
 
 /**

Modified: gnunet/src/set/set_api.c
===================================================================
--- gnunet/src/set/set_api.c    2013-04-27 11:04:29 UTC (rev 27000)
+++ gnunet/src/set/set_api.c    2013-04-27 14:16:29 UTC (rev 27001)
@@ -288,6 +288,7 @@
                      const struct GNUNET_PeerIdentity *other_peer,
                      const struct GNUNET_HashCode *app_id,
                      const struct GNUNET_MessageHeader *context_msg,
+                     uint16_t salt,
                      struct GNUNET_TIME_Relative timeout,
                      enum GNUNET_SET_ResultMode result_mode,
                      GNUNET_SET_ResultIterator result_cb,
@@ -302,11 +303,14 @@
   oh->result_cls = result_cls;
   oh->set = set;
 
-  mqm = GNUNET_MQ_msg_extra (msg, htons(context_msg->size), 
GNUNET_MESSAGE_TYPE_SET_EVALUATE);
+  mqm = GNUNET_MQ_msg (msg, GNUNET_MESSAGE_TYPE_SET_EVALUATE);
   msg->request_id = htonl (GNUNET_MQ_assoc_add (set->mq, mqm, oh));
   msg->peer = *other_peer;
   msg->app_id = *app_id;
-  memcpy (&msg[1], context_msg, htons (context_msg->size));
+
+  if (GNUNET_OK != GNUNET_MQ_nest (mqm, context_msg))
+    GNUNET_assert (0);
+  
   oh->timeout_task = GNUNET_SCHEDULER_add_delayed (timeout, 
operation_timeout_task, oh);
   GNUNET_MQ_send (set->mq, mqm);
 

Modified: gnunet/src/util/crypto_ecc.c
===================================================================
--- gnunet/src/util/crypto_ecc.c        2013-04-27 11:04:29 UTC (rev 27000)
+++ gnunet/src/util/crypto_ecc.c        2013-04-27 14:16:29 UTC (rev 27001)
@@ -932,7 +932,7 @@
   struct GNUNET_CRYPTO_EccPrivateKey *my_private_key;
   struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded my_public_key;
   char *keyfile;
-  
+
   if (GNUNET_OK !=
       GNUNET_CONFIGURATION_get_value_filename (cfg, "PEER", "PRIVATE_KEY",
                                                &keyfile))




reply via email to

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