-message not needed anymore

5 files changed, 7247 insertions, 5585 deletions

diff --git a/po/de.po b/po/de.po
index ee760d67c..43ed9d8f4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-05-20 15:09+0200\n"
+"POT-Creation-Date: 2013-08-09 23:01+0200\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <durner@gnunet.org>\n"
 "Language-Team: German <de@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/arm_api.c:880
+#: src/arm/arm_api.c:335
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
@@ -26,228 +26,233 @@ msgid ""
 "Monitoring client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:159
+#: src/arm/gnunet-arm.c:164
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:169
 #, 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:962
+#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:962
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:206 src/testbed/gnunet-service-testbed_peers.c:964
+#: src/arm/gnunet-arm.c:216
 #, fuzzy
-msgid "Misconfiguration (can't connect to the ARM service)"
+msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/arm/gnunet-arm.c:208 src/testbed/gnunet-service-testbed_peers.c:966
+#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:966
 #, 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:968
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:968
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:212 src/testbed/gnunet-service-testbed_peers.c:970
-msgid "Request doesn't fit into a message"
+#: src/arm/gnunet-arm.c:222
+msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:972
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:972
 #, fuzzy
 msgid "Request timed out"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:974
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:974
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:990
+#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:990
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# bytes in der Datenbank"
 
-#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:992
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:992
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "`%s' startet\n"
 
-#: src/arm/gnunet-arm.c:236 src/testbed/gnunet-service-testbed_peers.c:994
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:994
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:238 src/testbed/gnunet-service-testbed_peers.c:996
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:996
 #, 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:998
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:998
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:1000
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1000
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1002
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1002
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1004
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1004
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1006
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1006
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1008
+#: src/arm/gnunet-arm.c:260
 #, fuzzy, c-format
-msgid "%s service can't be started because ARM is shutting down"
+msgid "%s service cannot be started because ARM is shutting down"
 msgstr "`%s' fährt herunter.\n"
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1010
+#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1010
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:271
+#: src/arm/gnunet-arm.c:295
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:291
+#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
 #, fuzzy, c-format
-msgid "Failed to send a request to kill the `%s' service: %%s\n"
+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:307
-#, fuzzy, c-format
-msgid "Failed to kill the `%s' service: %s\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/arm/gnunet-arm.c:323
+#: src/arm/gnunet-arm.c:367
 #, fuzzy, c-format
 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:345
+#: src/arm/gnunet-arm.c:377
 #, 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:361 src/arm/gnunet-arm.c:370
+#: src/arm/gnunet-arm.c:418
 #, fuzzy, c-format
-msgid "Failed to start the ARM service: %s\n"
+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:390
+#: src/arm/gnunet-arm.c:427
 #, fuzzy, c-format
-msgid "Failed to send a request to start the `%s' service: %%s\n"
+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:405
+#: src/arm/gnunet-arm.c:463
 #, fuzzy, c-format
-msgid "Failed to start the `%s' service: %s\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:423
+#: src/arm/gnunet-arm.c:474
+#, fuzzy, c-format
+msgid "Failed to kill the `%s' service: %s\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/arm/gnunet-arm.c:510
 #, 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:430
+#: src/arm/gnunet-arm.c:517
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/arm/gnunet-arm.c:433
+#: src/arm/gnunet-arm.c:521
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-arm.c:534
-msgid "Began monitoring ARM for service status changes\n"
+#: src/arm/gnunet-arm.c:603
+#, c-format
+msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:537
+#: src/arm/gnunet-arm.c:634
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:540
+#: src/arm/gnunet-arm.c:637
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-arm.c:543
+#: src/arm/gnunet-arm.c:640
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:552
+#: src/arm/gnunet-arm.c:651
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/arm/gnunet-arm.c:622
+#: src/arm/gnunet-arm.c:715
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:624
+#: src/arm/gnunet-arm.c:717
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:626
+#: src/arm/gnunet-arm.c:719
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:628
+#: src/arm/gnunet-arm.c:721
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:631
+#: src/arm/gnunet-arm.c:724
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:634
+#: src/arm/gnunet-arm.c:727
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:636
+#: src/arm/gnunet-arm.c:730
+msgid "monitor ARM activities"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:732
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:639
+#: src/arm/gnunet-arm.c:735
 #, 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:641
+#: src/arm/gnunet-arm.c:737
 #, fuzzy
 msgid "list currently running services"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-arm.c:643
+#: src/arm/gnunet-arm.c:739
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:645
+#: src/arm/gnunet-arm.c:741
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:752
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -324,17 +329,17 @@ msgstr ""
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1386
+#: src/arm/gnunet-service-arm.c:1387
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1397
+#: src/arm/gnunet-service-arm.c:1398
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1411
+#: src/arm/gnunet-service-arm.c:1412
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -353,184 +358,199 @@ msgstr "ungültige `%s' Nachricht empfangen\n"
 msgid "Received last message for %s \n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1372
-#: src/ats/gnunet-service-ats_addresses.c:1406
+#: src/ats/gnunet-service-ats_addresses.c:1529
+#: src/ats/gnunet-service-ats_addresses.c:1563
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1378
+#: src/ats/gnunet-service-ats_addresses.c:1535
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1385
+#: src/ats/gnunet-service-ats_addresses.c:1542
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1412
+#: src/ats/gnunet-service-ats_addresses.c:1569
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1419
+#: src/ats/gnunet-service-ats_addresses.c:1576
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:756
+#: src/ats/gnunet-service-ats_addresses.c:1773
+#, fuzzy
+msgid "Failed to initialize solver!\n"
+msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
+
+#: src/ats/gnunet-service-ats-solver_mlp.c:848
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1075
+#: src/ats/gnunet-service-ats-solver_mlp.c:1171
 #, 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:1258
+#: src/ats/gnunet-service-ats-solver_mlp.c:1216
 #, c-format
-msgid "Update for ATS type `%s' not implemented!\n"
+msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: 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:1761
+#: src/ats/gnunet-service-ats-solver_mlp.c:1890
 #, 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:1769
+#: src/ats/gnunet-service-ats-solver_mlp.c:1898
 #, 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:1779
+#: src/ats/gnunet-service-ats-solver_mlp.c:1908
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1787
+#: src/ats/gnunet-service-ats-solver_mlp.c:1916
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1798
+#: src/ats/gnunet-service-ats-solver_mlp.c:1927
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:141
+#: src/ats/gnunet-service-ats-solver_proportional.c:1246
+#, fuzzy, c-format
+msgid "Cannot find network of type `%u' %s\n"
+msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
+
+#: src/ats-tool/gnunet-ats.c:145
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:143
+#: src/ats-tool/gnunet-ats.c:147
 #, c-format
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:199
+#: src/ats-tool/gnunet-ats.c:204
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/ats-tool/gnunet-ats.c:320
+#: src/ats-tool/gnunet-ats.c:328
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:339 src/namestore/gnunet-namestore.c:610
-#: src/transport/gnunet-transport.c:804
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:461
+#: src/transport/gnunet-transport.c:812
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/ats-tool/gnunet-ats.c:349 src/transport/gnunet-transport.c:810
+#: src/ats-tool/gnunet-ats.c:357 src/transport/gnunet-transport.c:819
 #, 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:357
+#: src/ats-tool/gnunet-ats.c:365
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: 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
+#: src/ats-tool/gnunet-ats.c:381 src/ats-tool/gnunet-ats.c:400
+#: src/ats-tool/gnunet-ats.c:417 src/ats-tool/gnunet-ats.c:455
 #, 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:382 src/ats-tool/gnunet-ats.c:399
+#: src/ats-tool/gnunet-ats.c:390 src/ats-tool/gnunet-ats.c:407
 #, 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:427
-msgid "Type required\n"
+#: src/ats-tool/gnunet-ats.c:425
+#, fuzzy, c-format
+msgid "No preference type given!\n"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/ats-tool/gnunet-ats.c:430
+#, c-format
+msgid "No peer given!\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:448
+msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:484
+#: src/ats-tool/gnunet-ats.c:506
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:487
+#: src/ats-tool/gnunet-ats.c:509
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:490
+#: src/ats-tool/gnunet-ats.c:512
 #, 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:493
+#: src/ats-tool/gnunet-ats.c:515
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:496
+#: src/ats-tool/gnunet-ats.c:518
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats-tool/gnunet-ats.c:499
+#: src/ats-tool/gnunet-ats.c:521
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:502
+#: src/ats-tool/gnunet-ats.c:524
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:505
+#: src/ats-tool/gnunet-ats.c:527
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:530
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:511
+#: src/ats-tool/gnunet-ats.c:533
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:520
+#: src/ats-tool/gnunet-ats.c:542
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -540,56 +560,26 @@ msgstr "Informationen über andere GNUnet Knoten ausgeben."
 msgid "Loading block plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/consensus/gnunet-consensus.c:350
+#: src/consensus/gnunet-consensus.c:352
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "Anzahl an Durchläufen"
 
-#: src/consensus/gnunet-consensus.c:353
+#: src/consensus/gnunet-consensus.c:355
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus.c:356
+#: src/consensus/gnunet-consensus.c:358 src/set/gnunet-set-profiler.c:287
+#: src/set/gnunet-set-profiler.c:290 src/set/gnunet-set-profiler.c:293
 #, fuzzy
 msgid "number of values"
 msgstr "Anzahl an Durchläufen"
 
-#: src/consensus/gnunet-consensus.c:359
+#: src/consensus/gnunet-consensus.c:361
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/consensus/gnunet-consensus-ibf.c:217
-#, fuzzy
-msgid "number of element in set A-B"
-msgstr "Anzahl an Durchläufen"
-
-#: src/consensus/gnunet-consensus-ibf.c:220
-#, fuzzy
-msgid "number of element in set B-A"
-msgstr "Anzahl an Durchläufen"
-
-#: src/consensus/gnunet-consensus-ibf.c:223
-msgid "number of common elements in A and B"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-ibf.c:226
-msgid "hash num"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-ibf.c:229
-msgid "ibf size"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-start-peers.c:172
-msgid "start peers with the given template configuration"
-msgstr ""
-
-#: 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:752
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
@@ -615,13 +605,13 @@ msgstr "`%s' hat sich mit `%s' verbunden.\n"
 msgid "Disconnected from"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:176
-#: src/peerinfo-tool/gnunet-peerinfo.c:643
+#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:170
+#: src/peerinfo-tool/gnunet-peerinfo.c:653
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültige Kommandozeilen Parameter:\n"
 
-#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:996
+#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:1004
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -631,26 +621,15 @@ msgstr "Informationen über andere GNUnet Knoten ausgeben."
 msgid "Print information about connected peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/core/gnunet-service-core.c:110
-#, fuzzy, c-format
-msgid "Failed to read or generate private key: %s\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-
-#: src/core/gnunet-service-core.c:124
-#, c-format
-msgid "Core service of `%4s' ready.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:150
+#: src/core/gnunet-service-core.c:105
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/core/gnunet-service-core.c:164
-#: 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"
+#: src/core/gnunet-service-core.c:126
+#, c-format
+msgid "Core service of `%4s' ready.\n"
+msgstr ""
 
 #: src/core/gnunet-service-core_clients.c:370
 #, fuzzy
@@ -695,122 +674,122 @@ msgstr "# verschlüsselter PING Nachrichten empfangen"
 #: src/core/gnunet-service-core_kx.c:803
 #, c-format
 msgid ""
-"Ephemeral key message rejected as its validity range does not match our "
-"system time (%llu not in [%llu,%llu]).\n"
+"Ephemeral key message from peer `%s' rejected as its validity range does not "
+"match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:818
+#: src/core/gnunet-service-core_kx.c:819
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_kx.c:921
-#: src/transport/gnunet-service-transport_validation.c:915
+#: src/core/gnunet-service-core_kx.c:922
+#: src/transport/gnunet-service-transport_validation.c:935
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:929
+#: src/core/gnunet-service-core_kx.c:930
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:956
+#: src/core/gnunet-service-core_kx.c:957
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:973
+#: src/core/gnunet-service-core_kx.c:974
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:999
+#: src/core/gnunet-service-core_kx.c:1000
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1009
+#: src/core/gnunet-service-core_kx.c:1010
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1066
-#: src/transport/gnunet-service-transport_validation.c:1160
+#: src/core/gnunet-service-core_kx.c:1067
+#: src/transport/gnunet-service-transport_validation.c:1226
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1072
+#: src/core/gnunet-service-core_kx.c:1073
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1078
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/core/gnunet-service-core_kx.c:1107
+#: src/core/gnunet-service-core_kx.c:1108
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1141
+#: src/core/gnunet-service-core_kx.c:1142
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1151
+#: src/core/gnunet-service-core_kx.c:1152
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_kx.c:1158
+#: src/core/gnunet-service-core_kx.c:1159
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1298
+#: src/core/gnunet-service-core_kx.c:1299
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1305
+#: src/core/gnunet-service-core_kx.c:1306
 #, 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:1308
+#: src/core/gnunet-service-core_kx.c:1309
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1351
-#: src/core/gnunet-service-core_kx.c:1376
+#: src/core/gnunet-service-core_kx.c:1352
+#: src/core/gnunet-service-core_kx.c:1377
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1363
+#: src/core/gnunet-service-core_kx.c:1364
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1404
+#: src/core/gnunet-service-core_kx.c:1405
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1412
+#: src/core/gnunet-service-core_kx.c:1413
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1443
+#: src/core/gnunet-service-core_kx.c:1444
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
@@ -836,16 +815,16 @@ 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:644
-#: src/dht/gnunet-service-dht_neighbours.c:703
+#: src/dht/gnunet-service-dht_neighbours.c:641
+#: src/dht/gnunet-service-dht_neighbours.c:700
 #: 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:2798
-#: src/transport/gnunet-service-transport_neighbours.c:3057
+#: src/transport/gnunet-service-transport_neighbours.c:2793
+#: src/transport/gnunet-service-transport_neighbours.c:3047
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
@@ -919,14 +898,13 @@ msgstr ""
 #: 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/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/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
+#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
+#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_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:608 src/include/gnunet_common.h:615
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
+#: src/include/gnunet_common.h:616 src/include/gnunet_common.h:623
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -1057,6 +1035,28 @@ msgstr ""
 msgid "# GET requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
+#: src/datastore/gnunet-datastore.c:114
+#, fuzzy, c-format
+msgid "Failed to store item: %s, aborting\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/datastore/gnunet-datastore.c:200
+#, c-format
+msgid "Cannot use the same configuration for source and destination\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:246
+msgid ""
+"specifies the configuration to use to access an alternative datastore; will "
+"merge that datastore into our current datastore"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:255
+#, fuzzy
+msgid "Manipulate GNUnet datastore"
+msgstr ""
+"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
+
 #: src/datastore/gnunet-service-datastore.c:349
 #, fuzzy
 msgid "# bytes expired"
@@ -1067,12 +1067,12 @@ msgid "# bytes purged (low-priority)"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:480
-#: src/gns/gnunet-gns-helper-service-w32.c:159
+#: src/gns/gnunet-gns-helper-service-w32.c:155
 msgid "Transmission to client failed!\n"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:511
-#: src/gns/gnunet-gns-helper-service-w32.c:189
+#: src/gns/gnunet-gns-helper-service-w32.c:183
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
@@ -1273,7 +1273,7 @@ msgid ""
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1193
-#: src/namestore/plugin_namestore_sqlite.c:827
+#: src/namestore/plugin_namestore_sqlite.c:829
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite Datenspeicher"
@@ -1330,7 +1330,7 @@ msgstr ""
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:736
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:861
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:899
 msgid "be verbose (print progress information)"
@@ -1411,40 +1411,40 @@ msgstr "# Client Trace-Anfragen empfangen"
 msgid "# PUT requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:590
+#: src/dht/gnunet-service-dht_clients.c:592
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:796
+#: src/dht/gnunet-service-dht_clients.c:793
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1041
+#: src/dht/gnunet-service-dht_clients.c:1033
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1054
+#: src/dht/gnunet-service-dht_clients.c:1046
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1091
+#: src/dht/gnunet-service-dht_clients.c:1083
 #, 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:1114
+#: src/dht/gnunet-service-dht_clients.c:1106
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1165
-#: src/dht/gnunet-service-dht_clients.c:1207
+#: src/dht/gnunet-service-dht_clients.c:1157
+#: src/dht/gnunet-service-dht_clients.c:1199
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1175
+#: src/dht/gnunet-service-dht_clients.c:1167
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "'join' Nachricht konnte nicht an gnunetd gesendet werden.\n"
@@ -1493,30 +1493,35 @@ msgstr "# Client Trace-Anfragen empfangen"
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:504
+#: src/dht/gnunet-service-dht_neighbours.c:501
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:594
+#: src/dht/gnunet-service-dht_neighbours.c:591
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:737
+#: src/dht/gnunet-service-dht_neighbours.c:734
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/dht/gnunet-service-dht_neighbours.c:792
+#: src/dht/gnunet-service-dht_neighbours.c:789
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:830
+#: src/dht/gnunet-service-dht_neighbours.c:827
 #, fuzzy
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Client Trace-Anfragen empfangen"
 
+#: src/dht/gnunet-service-dht_neighbours.c:859
+#, fuzzy
+msgid "# requests TTL-dropped"
+msgstr "# Client Trace-Anfragen empfangen"
+
 #: src/dht/gnunet-service-dht_neighbours.c:1052
 #: src/dht/gnunet-service-dht_neighbours.c:1086
 msgid "# Peers excluded from routing due to Bloomfilter"
@@ -1565,34 +1570,49 @@ msgstr "# PING Nachrichten erstellt"
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1730
+#: src/dht/gnunet-service-dht_neighbours.c:1578
+#, fuzzy
+msgid "# P2P PUT bytes received"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1733
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1738
+#: src/dht/gnunet-service-dht_neighbours.c:1741
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1829
+#: src/dht/gnunet-service-dht_neighbours.c:1832
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1882
+#: src/dht/gnunet-service-dht_neighbours.c:1835
+#, fuzzy
+msgid "# P2P GET bytes received"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1888
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1896
+#: src/dht/gnunet-service-dht_neighbours.c:1902
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1973
+#: src/dht/gnunet-service-dht_neighbours.c:1979
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Bytes empfangen über TCP"
 
+#: src/dht/gnunet-service-dht_neighbours.c:1982
+#, fuzzy
+msgid "# P2P RESULT bytes received"
+msgstr "# Bytes empfangen über TCP"
+
 #: src/dht/gnunet-service-dht_nse.c:59
 #, fuzzy
 msgid "# Network size estimates received"
@@ -1655,28 +1675,28 @@ msgstr "Datei wurde als `%s' gespeichert.\n"
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/dns/dnsstub.c:175
+#: src/dns/dnsstub.c:176
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
-#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
-#: src/gns/gnunet-service-gns_resolver.c:1621
+#: src/dns/dnsstub.c:296 src/dns/dnsstub.c:384
+#: src/gns/gnunet-service-gns_resolver.c:1651
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
 
-#: src/dns/dnsstub.c:299
+#: src/dns/dnsstub.c:300
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dns/dnsstub.c:368
+#: src/dns/dnsstub.c:369
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:440
+#: src/dns/dnsstub.c:441
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -1743,12 +1763,12 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3351
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3359
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3407
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3415
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -1762,142 +1782,142 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/exit/gnunet-daemon-exit.c:741
+#: src/exit/gnunet-daemon-exit.c:756
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:794
+#: src/exit/gnunet-daemon-exit.c:807
 #, fuzzy
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/exit/gnunet-daemon-exit.c:911 src/exit/gnunet-daemon-exit.c:2343
-#: src/exit/gnunet-daemon-exit.c:2603 src/vpn/gnunet-service-vpn.c:1411
-#: src/vpn/gnunet-service-vpn.c:1812 src/vpn/gnunet-service-vpn.c:1975
+#: src/exit/gnunet-daemon-exit.c:924 src/exit/gnunet-daemon-exit.c:2349
+#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1453
+#: src/vpn/gnunet-service-vpn.c:1852 src/vpn/gnunet-service-vpn.c:2015
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:948 src/exit/gnunet-daemon-exit.c:2402
-#: src/exit/gnunet-daemon-exit.c:2662 src/vpn/gnunet-service-vpn.c:1467
-#: src/vpn/gnunet-service-vpn.c:1871 src/vpn/gnunet-service-vpn.c:2008
+#: src/exit/gnunet-daemon-exit.c:961 src/exit/gnunet-daemon-exit.c:2408
+#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1509
+#: src/vpn/gnunet-service-vpn.c:1911 src/vpn/gnunet-service-vpn.c:2048
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:988
+#: src/exit/gnunet-daemon-exit.c:1001
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:995
+#: src/exit/gnunet-daemon-exit.c:1008
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1072
+#: src/exit/gnunet-daemon-exit.c:1084
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1147
+#: src/exit/gnunet-daemon-exit.c:1158
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1200
+#: src/exit/gnunet-daemon-exit.c:1210
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1214
+#: src/exit/gnunet-daemon-exit.c:1224
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1240
+#: src/exit/gnunet-daemon-exit.c:1250
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1267
+#: src/exit/gnunet-daemon-exit.c:1277
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1313
+#: src/exit/gnunet-daemon-exit.c:1323
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1321
+#: src/exit/gnunet-daemon-exit.c:1331
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1703
+#: src/exit/gnunet-daemon-exit.c:1713
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1814
+#: src/exit/gnunet-daemon-exit.c:1826
 #, fuzzy
 msgid "# TCP service creation requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:1817 src/exit/gnunet-daemon-exit.c:1906
-#: src/exit/gnunet-daemon-exit.c:2026 src/exit/gnunet-daemon-exit.c:2267
-#: src/exit/gnunet-daemon-exit.c:2519 src/exit/gnunet-daemon-exit.c:2811
-#: src/exit/gnunet-daemon-exit.c:2921
+#: src/exit/gnunet-daemon-exit.c:1829 src/exit/gnunet-daemon-exit.c:1919
+#: src/exit/gnunet-daemon-exit.c:2035 src/exit/gnunet-daemon-exit.c:2273
+#: src/exit/gnunet-daemon-exit.c:2522 src/exit/gnunet-daemon-exit.c:2811
+#: src/exit/gnunet-daemon-exit.c:2918
 #, fuzzy
 msgid "# Bytes received from MESH"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1850 src/exit/gnunet-daemon-exit.c:2943
+#: src/exit/gnunet-daemon-exit.c:1861 src/exit/gnunet-daemon-exit.c:2940
 #, c-format
 msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1854
+#: src/exit/gnunet-daemon-exit.c:1865
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:1909
+#: src/exit/gnunet-daemon-exit.c:1922
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2029
+#: src/exit/gnunet-daemon-exit.c:2038
 #, fuzzy
 msgid "# TCP data requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2043
+#: src/exit/gnunet-daemon-exit.c:2052
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:2093
+#: src/exit/gnunet-daemon-exit.c:2102
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2270
+#: src/exit/gnunet-daemon-exit.c:2276
 #, fuzzy
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2522
+#: src/exit/gnunet-daemon-exit.c:2525
 #, fuzzy
 msgid "# ICMP service requests received via mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2588 src/vpn/gnunet-service-vpn.c:1401
-#: src/vpn/gnunet-service-vpn.c:1969
+#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1443
+#: src/vpn/gnunet-service-vpn.c:2009
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2647 src/vpn/gnunet-service-vpn.c:1437
-#: src/vpn/gnunet-service-vpn.c:1449 src/vpn/gnunet-service-vpn.c:1859
+#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1479
+#: src/vpn/gnunet-service-vpn.c:1491 src/vpn/gnunet-service-vpn.c:1899
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2697
+#: src/exit/gnunet-daemon-exit.c:2700
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# Bytes gesendet über UDP"
@@ -1907,67 +1927,213 @@ msgstr "# Bytes gesendet über UDP"
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2924
+#: src/exit/gnunet-daemon-exit.c:2921
 #, fuzzy
 msgid "# UDP service requests received via mesh"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/exit/gnunet-daemon-exit.c:2947
+#: src/exit/gnunet-daemon-exit.c:2944
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/exit/gnunet-daemon-exit.c:2980
+#: src/exit/gnunet-daemon-exit.c:2977
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3209
+#: src/exit/gnunet-daemon-exit.c:3216
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3223 src/exit/gnunet-daemon-exit.c:3235
+#: src/exit/gnunet-daemon-exit.c:3230 src/exit/gnunet-daemon-exit.c:3242
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3246
+#: src/exit/gnunet-daemon-exit.c:3253
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3364
+#: src/exit/gnunet-daemon-exit.c:3372
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3372
+#: src/exit/gnunet-daemon-exit.c:3380
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3379
+#: src/exit/gnunet-daemon-exit.c:3387
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3385
+#: src/exit/gnunet-daemon-exit.c:3393
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3391 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3399 src/pt/gnunet-daemon-pt.c:887
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3620
+#: src/exit/gnunet-daemon-exit.c:3647
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
+#: src/experimentation/gnunet-daemon-experimentation.c:56
+msgid "Experimentation daemon shutting down ...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation.c:78
+msgid "Experimentation daemon starting ...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation.c:84
+#, fuzzy
+msgid "Failed to create statistics!\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#: src/experimentation/gnunet-daemon-experimentation.c:121
+msgid "GNUnet experimentation daemon"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:264
+#, c-format
+msgid "Experiment `%s': Experiment signature is invalid\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:271
+#, c-format
+msgid ""
+"Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
+"sec. \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:316
+#, c-format
+msgid "Experiment `%s': Issuer missing\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:321
+#, c-format
+msgid "Experiment `%s': Issuer invalid\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:327
+#, c-format
+msgid "Experiment `%s': Issuer not accepted!\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:336
+#, c-format
+msgid "Experiment `%s': Version missing or invalid \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:344
+#, c-format
+msgid "Experiment `%s': Required capabilities missing \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:349
+#, c-format
+msgid "Experiment `%s': Required capabilities invalid \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:393
+#, fuzzy, c-format
+msgid "Failed to parse file `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:419
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:444
+msgid ""
+"No valid experiment issuers configured! Set value to peer id of issuer! "
+"Exit...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:429
+#, fuzzy, c-format
+msgid "Invalid value `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:453
+#, fuzzy, c-format
+msgid "Invalid public key `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:460
+#, fuzzy, c-format
+msgid "Found issuer for public key `%s'\n"
+msgstr "Teste Transport(e) %s\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:463
+#, fuzzy, c-format
+msgid "No issuer for public key `%s'\n"
+msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:480
+#, fuzzy, c-format
+msgid "Cannot read experiments file `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:220
+#, c-format
+msgid "Cannot send message to peer `%s' for experiment `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:290
+#, c-format
+msgid "Sending experimentation request to peer %s\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:421
+#, c-format
+msgid "Added peer `%s' as active node\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:848
+#, fuzzy, c-format
+msgid "Connected to peer %s\n"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:877
+#, fuzzy, c-format
+msgid "Disconnected from peer %s\n"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1057
+#, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:109
+#, c-format
+msgid "Peer `%s' did not respond to request for experiment `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:144
+#, fuzzy, c-format
+msgid "Starting inbound experiment `%s' with peer `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:278
+#, fuzzy, c-format
+msgid "Starting outbound experiment `%s' with peer `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:296
+#, fuzzy, c-format
+msgid "Received %s message from peer %s for experiment `%s'\n"
+msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
+
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -2043,27 +2209,22 @@ msgstr ""
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1520
-#, c-format
-msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
-msgstr ""
-
-#: src/fs/fs_api.c:1562
+#: src/fs/fs_api.c:1557
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1578
+#: src/fs/fs_api.c:1571
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2229
+#: src/fs/fs_api.c:2228
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2239
+#: src/fs/fs_api.c:2238
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -2078,7 +2239,7 @@ msgstr "Datei wurde als `%s' gespeichert.\n"
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2897
+#: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2896
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
@@ -2088,11 +2249,11 @@ msgstr ""
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2841
+#: src/fs/fs_api.c:2840
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2935
+#: src/fs/fs_api.c:2934
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2102,59 +2263,59 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/fs_download.c:321
+#: src/fs/fs_download.c:322
 #, fuzzy
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr "Rekursiver Download des Verzeichnisses `%s' bei %llu von %llu Bytes.\n"
 
-#: src/fs/fs_download.c:341
+#: src/fs/fs_download.c:342
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:507 src/fs/fs_download.c:519
+#: src/fs/fs_download.c:508 src/fs/fs_download.c:520
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:888
+#: src/fs/fs_download.c:889
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/fs/fs_download.c:970
+#: src/fs/fs_download.c:971
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:996
+#: src/fs/fs_download.c:997
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1020
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1029
+#: src/fs/fs_download.c:1030
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1038
+#: src/fs/fs_download.c:1039
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_download.c:1136
+#: src/fs/fs_download.c:1137
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/fs_download.c:1927
+#: src/fs/fs_download.c:1928
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -2186,151 +2347,115 @@ msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/fs/fs_namespace.c:104
+#: src/fs/fs_namespace.c:207
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_namespace.c:126 src/fs/fs_namespace.c:214
+#: src/fs/fs_namespace.c:229
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:240 src/fs/fs_namespace.c:284
-#: src/fs/fs_namespace.c:330
-msgid "Can't determine where namespace directory is\n"
-msgstr ""
-
-#: src/fs/fs_namespace.c:252
-#, fuzzy, c-format
-msgid "Failed to create or read private key for namespace `%s'\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-
-#: src/fs/fs_namespace.c:296
+#: src/fs/fs_namespace.c:320
 #, fuzzy, c-format
-msgid "Failed to read private key for namespace `%s'\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-
-#: src/fs/fs_namespace.c:467
-#, fuzzy, c-format
-msgid "Failed to read namespace private key file `%s', deleting it!\n"
-msgstr ""
-"Der Eintrag konnte dem Namespace `%s' nicht hinzugefügt werden (existiert "
-"er?)\n"
-
-#: src/fs/fs_namespace.c:659
-msgid "Identifiers or URI too long to create UBlock"
-msgstr ""
-
-#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:311
-#, fuzzy
-msgid "Internal error."
-msgstr "Unbekannter Fehler.\n"
+msgid "Failed to read `%s': %s\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:747
+#: src/fs/fs_namespace.c:466
 #, fuzzy
 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
+#: src/fs/fs_pseudonym.c:327 src/fs/fs_pseudonym.c:631
 #, 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
+#: src/fs/fs_pseudonym.c:463 src/fs/fs_pseudonym.c:489
+#: src/fs/fs_pseudonym.c:627
 #, fuzzy
 msgid "no-name"
 msgstr "Name anzeigen"
 
-#: src/fs/fs_pseudonym.c:1182 src/util/crypto_ecc.c:1014
-#, 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
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:399
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:622 src/fs/fs_publish.c:639 src/fs/fs_publish.c:678
-#: src/fs/fs_publish.c:698 src/fs/fs_publish.c:723 src/fs/fs_publish.c:863
+#: src/fs/fs_publish.c:624 src/fs/fs_publish.c:641 src/fs/fs_publish.c:680
+#: src/fs/fs_publish.c:700 src/fs/fs_publish.c:725 src/fs/fs_publish.c:865
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/fs/fs_publish.c:624
+#: src/fs/fs_publish.c:626
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:636
+#: src/fs/fs_publish.c:638
 #, fuzzy
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/fs_publish.c:679
+#: src/fs/fs_publish.c:681
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:699
+#: src/fs/fs_publish.c:701
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:724
+#: src/fs/fs_publish.c:726
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:747
+#: src/fs/fs_publish.c:749
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/fs_publish.c:812
+#: src/fs/fs_publish.c:814
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/fs/fs_publish.c:818
+#: src/fs/fs_publish.c:820
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:864
+#: src/fs/fs_publish.c:866
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/fs/fs_publish.c:1090
+#: src/fs/fs_publish.c:1092
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1161
+#: src/fs/fs_publish.c:1164
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:273
+#: src/fs/fs_publish_ksk.c:219
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_search.c:742
+#: src/fs/fs_search.c:815
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
 
-#: src/fs/fs_search.c:800
+#: src/fs/fs_search.c:874
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2377,99 +2502,91 @@ msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_unindex.c:566 src/fs/fs_unindex.c:633
+#: src/fs/fs_unindex.c:565 src/fs/fs_unindex.c:628
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_unindex.c:646
+#: src/fs/fs_unindex.c:641
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:680
+#: src/fs/fs_unindex.c:675
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_uri.c:221
+#: src/fs/fs_uri.c:222
 #, no-c-format
 msgid "`%' must be followed by HEX number"
 msgstr ""
 
-#: src/fs/fs_uri.c:280
+#: src/fs/fs_uri.c:281
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Ungültige URL `%s' (muss mit `%s' beginnen)\n"
 
-#: src/fs/fs_uri.c:298
+#: src/fs/fs_uri.c:299
 msgid "`++' not allowed in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:305
+#: src/fs/fs_uri.c:306
 msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:375
+#: src/fs/fs_uri.c:376
 msgid "Malformed SKS URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:418 src/fs/fs_uri.c:433
+#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:563 src/fs/fs_uri.c:578 src/fs/fs_uri.c:588
-#: src/fs/fs_uri.c:616
+#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
+#: src/fs/fs_uri.c:629
 msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:611
 msgid "SKS URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:604
+#: src/fs/fs_uri.c:617
 msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:610
+#: src/fs/fs_uri.c:623
 msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:623
+#: src/fs/fs_uri.c:636
 msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:635
+#: src/fs/fs_uri.c:648
 msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:673
+#: src/fs/fs_uri.c:686
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:898 src/util/crypto_ecc.c:941
+#: src/fs/fs_uri.c:911
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/fs/fs_uri.c:904 src/util/crypto_ecc.c:947
+#: src/fs/fs_uri.c:917
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/fs/fs_uri.c:945
-msgid "identifier is NULL!"
-msgstr ""
-
-#: src/fs/fs_uri.c:951
-msgid "identifier has zero length!"
-msgstr ""
-
-#: src/fs/fs_uri.c:1122 src/fs/fs_uri.c:1149
+#: src/fs/fs_uri.c:1099 src/fs/fs_uri.c:1126
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1155
+#: src/fs/fs_uri.c:1132
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2507,25 +2624,25 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:302
-#: src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:310
+#: src/fs/gnunet-publish.c:808
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:687
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:812
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:690
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:815
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:714
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:839
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:327
-#: src/fs/gnunet-publish.c:721
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:329
+#: src/fs/gnunet-publish.c:846
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2599,7 +2716,7 @@ msgstr "Fehler beim Download: %s\n"
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Upload abgewiesen!"
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:195
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:273
 #: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
@@ -2610,7 +2727,7 @@ msgstr ""
 msgid "You need to specify a URI argument.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:629
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:652
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
@@ -2623,7 +2740,7 @@ msgstr ""
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:607
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:781
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2688,26 +2805,21 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:178 src/statistics/gnunet-statistics.c:283
-#, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/fs/gnunet-pseudonym.c:273 src/fs/gnunet-pseudonym.c:280
-#: src/fs/gnunet-pseudonym.c:282
+#: src/fs/gnunet-pseudonym.c:227 src/fs/gnunet-pseudonym.c:229
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/fs/gnunet-pseudonym.c:305
-msgid "create or advertise namespace NAME"
-msgstr ""
+#: src/fs/gnunet-pseudonym.c:265 src/statistics/gnunet-statistics.c:305
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/fs/gnunet-pseudonym.c:308
-msgid "delete namespace NAME "
+#: src/fs/gnunet-pseudonym.c:313
+msgid "advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:311
+#: src/fs/gnunet-pseudonym.c:316
 #, fuzzy
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
@@ -2716,161 +2828,156 @@ msgstr ""
 "Ein zusätzliches Schlüsselwort für alle Dateien und Verzeichnisse hinzufügen "
 "(diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-pseudonym.c:315 src/fs/gnunet-publish.c:702
+#: src/fs/gnunet-pseudonym.c:320 src/fs/gnunet-publish.c:827
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 "Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
 "setzen"
 
-#: src/fs/gnunet-pseudonym.c:318
-#, fuzzy
-msgid "print names of local namespaces"
-msgstr "das Rating eines Namespaces setzen"
-
-#: src/fs/gnunet-pseudonym.c:321
+#: src/fs/gnunet-pseudonym.c:323
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:324
+#: src/fs/gnunet-pseudonym.c:326
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:330
+#: src/fs/gnunet-pseudonym.c:332
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/fs/gnunet-pseudonym.c:333
+#: src/fs/gnunet-pseudonym.c:335
 #, fuzzy
 msgid "change rating of namespace ID by VALUE"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/fs/gnunet-pseudonym.c:345
+#: src/fs/gnunet-pseudonym.c:347
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:152
+#: src/fs/gnunet-publish.c:230
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:159
+#: src/fs/gnunet-publish.c:237
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/fs/gnunet-publish.c:169
+#: src/fs/gnunet-publish.c:247
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:173
+#: src/fs/gnunet-publish.c:251
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/fs/gnunet-publish.c:192
+#: src/fs/gnunet-publish.c:270
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/fs/gnunet-publish.c:310
+#: src/fs/gnunet-publish.c:388
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:312
+#: src/fs/gnunet-publish.c:390
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/fs/gnunet-publish.c:363 src/fs/gnunet-publish.c:617
-#, fuzzy, c-format
-msgid "Failed to create namespace `%s' (illegal filename?)\n"
-msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
-
-#: src/fs/gnunet-publish.c:438
+#: src/fs/gnunet-publish.c:529
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-publish.c:465
+#: src/fs/gnunet-publish.c:552
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-publish.c:496
+#: src/fs/gnunet-publish.c:585
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/gnunet-publish.c:498
+#: src/fs/gnunet-publish.c:587
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/gnunet-publish.c:503
+#: src/fs/gnunet-publish.c:592
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:508
+#: src/fs/gnunet-publish.c:597
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:601
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:516
+#: src/fs/gnunet-publish.c:605
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:523
+#: src/fs/gnunet-publish.c:612
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/gnunet-publish.c:557
+#: src/fs/gnunet-publish.c:643
+#, fuzzy, c-format
+msgid "Selected pseudonym `%s' unknown\n"
+msgstr "Namespace `%s' hat das Rating %d.\n"
+
+#: src/fs/gnunet-publish.c:669
+#, fuzzy, c-format
+msgid "Failed to access `%s': %s\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/fs/gnunet-publish.c:681
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:731
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:564
+#: src/fs/gnunet-publish.c:738
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-publish.c:570
+#: src/fs/gnunet-publish.c:744
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-publish.c:578 src/vpn/gnunet-vpn.c:213
+#: src/fs/gnunet-publish.c:752 src/vpn/gnunet-vpn.c:213
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/fs/gnunet-publish.c:588 src/fs/gnunet-publish.c:595
-#: src/transport/gnunet-transport.c:834 src/transport/gnunet-transport.c:864
+#: src/fs/gnunet-publish.c:762 src/fs/gnunet-publish.c:769
+#: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/fs/gnunet-publish.c:650
-#, fuzzy, c-format
-msgid "Failed to access `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
-#: src/fs/gnunet-publish.c:662
-msgid ""
-"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
-"installed?\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:819
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2878,7 +2985,7 @@ msgstr ""
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:698
+#: src/fs/gnunet-publish.c:823
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2886,7 +2993,7 @@ msgstr ""
 "Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der "
 "obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:830
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2894,7 +3001,7 @@ msgstr ""
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-publish.c:835
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2902,32 +3009,32 @@ msgstr ""
 "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlich "
 "werden soll. (nur für das Einfügen in Namespaces)"
 
-#: src/fs/gnunet-publish.c:718
+#: src/fs/gnunet-publish.c:843
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "Die Datei unter dem Pseudonym NAME veröffentlichen (platziert die Datei in "
 "einem Namespace)"
 
-#: src/fs/gnunet-publish.c:724
+#: src/fs/gnunet-publish.c:849
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:728
+#: src/fs/gnunet-publish.c:853
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in "
 "Namespaces)"
 
-#: src/fs/gnunet-publish.c:732
+#: src/fs/gnunet-publish.c:857
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:748
+#: src/fs/gnunet-publish.c:873
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2971,12 +3078,12 @@ msgstr ""
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:538
+#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:291
+#: src/fs/gnunet-service-fs.c:640 src/hostlist/gnunet-daemon-hostlist.c:291
 #: src/topology/gnunet-daemon-topology.c:1314
 #: src/topology/gnunet-daemon-topology.c:1321
 #, fuzzy, c-format
@@ -3142,6 +3249,37 @@ msgstr "# gap Anfragen insgesamt empfangen"
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
+#: src/fs/gnunet-service-fs_mesh_client.c:475
+#, fuzzy
+msgid "# replies received via mesh"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/fs/gnunet-service-fs_mesh_client.c:489
+#, fuzzy
+msgid "# replies received via mesh dropped"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:259
+#, fuzzy
+msgid "# Blocks transferred via mesh"
+msgstr "# Bytes des Typs %d übertragen"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:412
+#, fuzzy
+msgid "# queries received via mesh"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:455
+#, fuzzy
+msgid "# mesh client connections rejected"
+msgstr "GNUnet Konfiguration"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:461
+#: src/fs/gnunet-service-fs_mesh_server.c:501
+#, fuzzy
+msgid "# mesh connections active"
+msgstr "# verbundener Knoten"
+
 #: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
 msgstr ""
@@ -3228,7 +3366,7 @@ msgstr "# Bytes empfangen über HTTP"
 
 #: src/fs/gnunet-service-fs_pr.c:1189
 #, fuzzy
-msgid "# Replies received from STREAM"
+msgid "# Replies received from MESH"
 msgstr "# Bytes empfangen über HTTP"
 
 #: src/fs/gnunet-service-fs_pr.c:1241
@@ -3295,36 +3433,6 @@ msgstr "# verschlüsselter PONG Nachrichten empfangen"
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_stream.c:777
-#, fuzzy
-msgid "# replies received via stream"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/fs/gnunet-service-fs_stream.c:791
-#, fuzzy
-msgid "# replies received via stream dropped"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/fs/gnunet-service-fs_stream.c:930
-#: src/fs/gnunet-service-fs_stream.c:1384
-#, fuzzy
-msgid "# stream connections active"
-msgstr "# verbundener Knoten"
-
-#: src/fs/gnunet-service-fs_stream.c:1166
-msgid "# Blocks transferred via stream"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_stream.c:1326
-#, fuzzy
-msgid "# queries received via stream"
-msgstr "# Bytes empfangen über TCP"
-
-#: src/fs/gnunet-service-fs_stream.c:1376
-#, fuzzy
-msgid "# stream client connections rejected"
-msgstr "GNUnet Konfiguration"
-
 #: src/fs/gnunet-unindex.c:89
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
@@ -3381,23 +3489,23 @@ msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 msgid "Received unsupported DNS request from %s\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/gns/gnunet-dns2gns.c:679
+#: src/gns/gnunet-dns2gns.c:681
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:682
+#: src/gns/gnunet-dns2gns.c:684
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:685
+#: src/gns/gnunet-dns2gns.c:687
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:688
+#: src/gns/gnunet-dns2gns.c:690
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:701
+#: src/gns/gnunet-dns2gns.c:703
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -3452,45 +3560,45 @@ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:586
+#: src/gns/gnunet-gns-fcfsd.c:587
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:648
+#: src/gns/gnunet-gns-fcfsd.c:649
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:664
+#: src/gns/gnunet-gns-fcfsd.c:665
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:700
+#: src/gns/gnunet-gns-fcfsd.c:701
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:708
+#: src/gns/gnunet-gns-fcfsd.c:709
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:912 src/namestore/gnunet-namestore.c:364
+#: src/gns/gnunet-gns-fcfsd.c:913 src/namestore/gnunet-namestore.c:492
 #, fuzzy
 msgid "Failed to read or create private zone key\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:922 src/namestore/gnunet-namestore.c:375
+#: src/gns/gnunet-gns-fcfsd.c:923 src/namestore/gnunet-namestore.c:503
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/gns/gnunet-gns-fcfsd.c:938 src/gns/gnunet-gns-proxy.c:2857
+#: src/gns/gnunet-gns-fcfsd.c:939 src/gns/gnunet-gns-proxy.c:2857
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:972
+#: src/gns/gnunet-gns-fcfsd.c:973
 msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
@@ -3516,96 +3624,101 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:486
+#: src/gns/gnunet-service-gns.c:497
 #, c-format
 msgid "Records for name `%s' in zone %s too large to fit into DHT"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1216
+#: src/gns/gnunet-service-gns.c:1225
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/gns/gnunet-service-gns.c:1277
+#: src/gns/gnunet-service-gns.c:1286
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns.c:1288
+#: src/gns/gnunet-service-gns.c:1297
 #, fuzzy
 msgid "Unable to initialize resolver!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:3439
+#: src/gns/gnunet-service-gns_resolver.c:3446
 #, c-format
 msgid "Not a GADS TLD: `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:119
+#: src/hello/gnunet-hello.c:123
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:125
+#: src/hello/gnunet-hello.c:129
 #, fuzzy, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/hello/gnunet-hello.c:133
+#: src/hello/gnunet-hello.c:137
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:140
+#: src/hello/gnunet-hello.c:144
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:150 src/hello/gnunet-hello.c:179
+#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183
 #, fuzzy, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/hello/gnunet-hello.c:166
+#: src/hello/gnunet-hello.c:170
 #, 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:191
+#: src/hello/gnunet-hello.c:195
 #, fuzzy, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/hello/hello.c:936
+#: src/hello/gnunet-hello.c:203
+#, c-format
+msgid "Modified %u addresses \n"
+msgstr ""
+
+#: src/hello/hello.c:945
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/hello/hello.c:945
+#: src/hello/hello.c:954
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/hello/hello.c:955
+#: src/hello/hello.c:964
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hello/hello.c:965
+#: src/hello/hello.c:974
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/hello/hello.c:982
+#: src/hello/hello.c:991
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:991
+#: src/hello/hello.c:1000
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1010
+#: src/hello/hello.c:1019
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
@@ -3661,8 +3774,8 @@ msgstr "# Hellos per HTTP heruntergeladen"
 #: 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:1056
-#: src/transport/plugin_transport_http_client.c:1071
+#: src/transport/plugin_transport_http_client.c:1063
+#: src/transport/plugin_transport_http_client.c:1078
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
@@ -3807,9 +3920,9 @@ msgid "expired addresses encountered"
 msgstr ""
 
 #: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
-#: src/peerinfo-tool/gnunet-peerinfo.c:348
-#: src/peerinfo-tool/gnunet-peerinfo.c:418
-#: src/peerinfo-tool/gnunet-peerinfo.c:489
+#: src/peerinfo-tool/gnunet-peerinfo.c:358
+#: src/peerinfo-tool/gnunet-peerinfo.c:428
+#: src/peerinfo-tool/gnunet-peerinfo.c:499
 #: src/topology/gnunet-daemon-topology.c:918
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
@@ -3870,8 +3983,8 @@ msgstr "# Bekanntmachungen von anderen übertragen"
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:649
-#: src/transport/gnunet-service-transport.c:661
+#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:659
+#: src/transport/gnunet-service-transport.c:785
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -3901,6 +4014,78 @@ msgstr "`%s' ist nicht verfügbar."
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
+#: src/identity/gnunet-identity.c:135
+#, fuzzy, c-format
+msgid "Failed to create ego: %s\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#: src/identity/gnunet-identity.c:237
+msgid "create ego NAME"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:240
+msgid "delete ego NAME "
+msgstr ""
+
+#: src/identity/gnunet-identity.c:243
+msgid "display all egos"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:246
+msgid "run in monitor mode egos"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:255
+msgid "Maintain egos"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:336
+msgid "no default known"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:357
+msgid "default configured, but ego unknown (internal error)"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:434
+#: src/identity/gnunet-service-identity.c:665
+#: src/identity/gnunet-service-identity.c:773
+#, fuzzy, c-format
+msgid "Failed to write subsystem default identifier map to `%s'.\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/identity/gnunet-service-identity.c:441
+msgid "Unknown ego specified for service (internal error)"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:511
+msgid "identifier already in use for another ego"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:642
+msgid "target name already exists"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:681
+#: src/identity/gnunet-service-identity.c:790
+msgid "no matching ego found"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:824
+#, fuzzy, c-format
+msgid "Failed to parse ego information in `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/identity/gnunet-service-identity.c:897
+#, fuzzy, c-format
+msgid "Failed to parse subsystem identity configuration file `%s'\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+
+#: src/identity/gnunet-service-identity.c:909
+#, fuzzy, c-format
+msgid "Failed to create directory `%s' for storing egos\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
 #: src/integration-tests/connection_watchdog.c:990
 #, fuzzy, c-format
 msgid "Transport plugin: `%s' port %llu\n"
@@ -3921,53 +4106,40 @@ msgstr ""
 msgid "help text"
 msgstr "Hilfetext für -t"
 
-#: src/mesh/gnunet-mesh.c:211
+#: src/mesh/gnunet-mesh.c:205
 #, fuzzy
 msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-mesh.c:214
+#: src/mesh/gnunet-mesh.c:208
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-mesh.c:224
+#: src/mesh/gnunet-mesh.c:218
 #, fuzzy
 msgid "Print information about mesh tunnels and peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-service-mesh.c:7966 src/mesh/gnunet-service-mesh-new.c:4649
+#: src/mesh/gnunet-service-mesh.c:5640
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8179 src/mesh/gnunet-service-mesh-new.c:4790
-#, 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: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:4860
-#: src/mesh/gnunet-service-mesh-new.c:4872
-#: src/mesh/gnunet-service-mesh-new.c:4884
-#: src/mesh/gnunet-service-mesh-new.c:4896
-#: src/mesh/gnunet-service-mesh-new.c:4908
-#: src/mesh/gnunet-service-mesh-new.c:4920 src/nse/gnunet-service-nse.c:1500
-#: src/nse/gnunet-service-nse.c:1518
-#: 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/mesh/gnunet-service-mesh.c:5780 src/mesh/gnunet-service-mesh.c:5792
+#: src/mesh/gnunet-service-mesh.c:5804 src/mesh/gnunet-service-mesh.c:5816
+#: src/mesh/gnunet-service-mesh.c:5828 src/mesh/gnunet-service-mesh.c:5840
+#: src/nse/gnunet-service-nse.c:1425 src/nse/gnunet-service-nse.c:1443
+#: src/regex/gnunet-daemon-regexprofiler.c:270
+#: src/regex/gnunet-daemon-regexprofiler.c:282
+#: src/regex/gnunet-daemon-regexprofiler.c:294
+#: src/regex/gnunet-daemon-regexprofiler.c:307
 #: 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:8347 src/mesh/gnunet-service-mesh.c:8357
-#: src/mesh/gnunet-service-mesh.c:8368 src/mesh/gnunet-service-mesh-new.c:4932
-#: src/mesh/gnunet-service-mesh-new.c:4942
-#: src/mesh/gnunet-service-mesh-new.c:4953
+#: src/mesh/gnunet-service-mesh.c:5852 src/mesh/gnunet-service-mesh.c:5862
+#: src/mesh/gnunet-service-mesh.c:5887
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -3983,255 +4155,204 @@ msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
 msgid "Could not access file `%s': %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/namestore/gnunet-namestore.c:212
+#: src/namestore/gnunet-namestore.c:250
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:243
+#: src/namestore/gnunet-namestore.c:281
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:304
+#: src/namestore/gnunet-namestore.c:342
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:320
+#: src/namestore/gnunet-namestore.c:358
 msgid "for at least"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:321
+#: src/namestore/gnunet-namestore.c:359
 msgid "until"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:356
+#: src/namestore/gnunet-namestore.c:475
+#, fuzzy, c-format
+msgid "Using default zone file `%s'\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/namestore/gnunet-namestore.c:484
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:386
-#, fuzzy, c-format
-msgid "Unsupported type `%s'\n"
-msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
-
-#: src/namestore/gnunet-namestore.c:394 src/namestore/gnunet-namestore.c:418
-#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:477
-#: src/namestore/gnunet-namestore.c:518
+#: src/namestore/gnunet-namestore.c:513 src/namestore/gnunet-namestore.c:522
+#: src/namestore/gnunet-namestore.c:539 src/namestore/gnunet-namestore.c:561
+#: src/namestore/gnunet-namestore.c:605
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/namestore/gnunet-namestore.c:395 src/namestore/gnunet-namestore.c:419
-msgid "add/del"
+#: src/namestore/gnunet-namestore.c:514 src/namestore/gnunet-namestore.c:523
+#: src/namestore/gnunet-namestore.c:540 src/namestore/gnunet-namestore.c:562
+msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:408
+#: src/namestore/gnunet-namestore.c:531
+#, fuzzy, c-format
+msgid "Unsupported type `%s'\n"
+msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
+
+#: src/namestore/gnunet-namestore.c:551
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
 
-#: src/namestore/gnunet-namestore.c:446
+#: src/namestore/gnunet-namestore.c:587
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:455
-#, c-format
-msgid ""
-"Deletion requires either absolute time, or no time at all. Got relative time "
-"`%s' instead.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
-#: src/namestore/gnunet-namestore.c:497
-msgid "add"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:496
-#, fuzzy, c-format
-msgid "No valid expiration time for operation `%s'\n"
-msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
-
-#: src/namestore/gnunet-namestore.c:519
+#: src/namestore/gnunet-namestore.c:606
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:701
+#: src/namestore/gnunet-namestore.c:649
+#: src/peerinfo-tool/gnunet-peerinfo.c:711
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:625
-#, fuzzy, c-format
-msgid "Using default zone file `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
-
-#: src/namestore/gnunet-namestore.c:677
+#: src/namestore/gnunet-namestore.c:727
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:680
+#: src/namestore/gnunet-namestore.c:730
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:683
+#: src/namestore/gnunet-namestore.c:733
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:686
+#: src/namestore/gnunet-namestore.c:736
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:689
+#: src/namestore/gnunet-namestore.c:739
+#, fuzzy
+msgid "monitor changes in the namestore"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+
+#: src/namestore/gnunet-namestore.c:742
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:692
+#: src/namestore/gnunet-namestore.c:745
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:695
+#: src/namestore/gnunet-namestore.c:748
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
+#: src/namestore/gnunet-namestore.c:751
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:701
+#: src/namestore/gnunet-namestore.c:754
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:704
+#: src/namestore/gnunet-namestore.c:757
 msgid "create or list non-authority record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:707
+#: src/namestore/gnunet-namestore.c:760
 msgid "filename with the zone key"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:718
+#: src/namestore/gnunet-namestore.c:771
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
 
-#: src/namestore/gnunet-service-namestore.c:241
-#: src/namestore/gnunet-service-namestore.c:257
+#: src/namestore/gnunet-service-namestore.c:300
+#: src/namestore/gnunet-service-namestore.c:318
 #, fuzzy, c-format
 msgid "Failed to write zone key to file `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/namestore/gnunet-service-namestore.c:243
+#: src/namestore/gnunet-service-namestore.c:302
 msgid "file exists but reading key failed"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:259
+#: src/namestore/gnunet-service-namestore.c:320
 msgid "file exists with different key"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:1557
-#, fuzzy
-msgid "Failed to find record to remove\n"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
-
-#: src/namestore/gnunet-service-namestore.c:2172
-#, fuzzy, c-format
-msgid "Could not parse zone key file `%s'\n"
-msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
-
-#: src/namestore/gnunet-service-namestore.c:2262
+#: src/namestore/gnunet-service-namestore.c:2127
 #, fuzzy
 msgid "No directory to load zonefiles specified in configuration\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
-#: src/namestore/gnunet-service-namestore.c:2272
+#: src/namestore/gnunet-service-namestore.c:2137
 #, c-format
 msgid "Creating directory `%s' for zone files failed!\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:345
+#: src/namestore/namestore_api.c:346
 msgid "Namestore failed to add record"
 msgstr ""
 
-#: src/namestore/namestore_api.c:371
+#: src/namestore/namestore_api.c:372
 msgid "Namestore failed to add record\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:415
-#, fuzzy
-msgid "Failed to create new signature"
-msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
-
-#: src/namestore/namestore_api.c:419
-#, fuzzy
-msgid "Failed to put new set of records in database"
-msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
-
-#: src/namestore/namestore_api.c:423
-#, fuzzy
-msgid "Failed to remove records from database"
-msgstr ""
-"\n"
-"Fehler beim Empfangen der Antwort von gnunetd.\n"
-
-#: src/namestore/namestore_api.c:427
-#, fuzzy
-msgid "Failed to access database"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
-#: src/namestore/namestore_api.c:431
-#, fuzzy
-msgid "unknown internal error in namestore"
-msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
-
-#: src/namestore/namestore_api.c:436
-msgid "Protocol error"
-msgstr ""
-
-#: src/namestore/namestore_common.c:532 src/namestore/namestore_common.c:672
+#: src/namestore/namestore_api_common.c:532
+#: src/namestore/namestore_api_common.c:672
 #, fuzzy, c-format
 msgid "Unsupported record type %d\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/namestore/namestore_common.c:539
+#: src/namestore/namestore_api_common.c:539
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/namestore_common.c:562
+#: src/namestore/namestore_api_common.c:562
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/namestore/namestore_common.c:585
+#: src/namestore/namestore_api_common.c:585
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/namestore/namestore_common.c:603
+#: src/namestore/namestore_api_common.c:603
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/namestore_common.c:616
+#: src/namestore/namestore_api_common.c:616
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/namestore/namestore_common.c:637
+#: src/namestore/namestore_api_common.c:637
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/namestore/namestore_common.c:663
+#: src/namestore/namestore_api_common.c:663
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -4384,20 +4505,15 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/nse/gnunet-service-nse.c:1419
-#, 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:1433
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
-msgstr ""
-
-#: src/nse/gnunet-service-nse.c:1508
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
+#: src/nse/gnunet-service-nse.c:1472
+msgid "NSE service is lacking key configuration settings.  Exiting.\n"
+msgstr ""
+
 #: src/peerinfo/gnunet-service-peerinfo.c:215
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
@@ -4408,16 +4524,16 @@ msgstr "Verfügbare(r) Transport(e): %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:370
+#: src/peerinfo/gnunet-service-peerinfo.c:372
 #, 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:445
+#: src/peerinfo/gnunet-service-peerinfo.c:450
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:481
+#: src/peerinfo/gnunet-service-peerinfo.c:486
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -4425,22 +4541,22 @@ msgstr ""
 "Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
 "Datei wurde entfernt.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:633
+#: src/peerinfo/gnunet-service-peerinfo.c:639
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:638
+#: src/peerinfo/gnunet-service-peerinfo.c:644
 #, 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:970
+#: src/peerinfo/gnunet-service-peerinfo.c:979
 #, 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:1250
+#: src/peerinfo/gnunet-service-peerinfo.c:1269
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -4476,102 +4592,107 @@ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 msgid "Could not connect to `%s' service.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:427
+#: src/peerinfo-tool/gnunet-peerinfo.c:246
+#, c-format
+msgid "\tExpires: %s \t %s\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:437
 #, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:435
+#: src/peerinfo-tool/gnunet-peerinfo.c:445
 #, fuzzy, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr "ungültige `%s' Nachricht empfangen: %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:444
+#: src/peerinfo-tool/gnunet-peerinfo.c:454
 #, 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
+#: src/peerinfo-tool/gnunet-peerinfo.c:467
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:521
+#: src/peerinfo-tool/gnunet-peerinfo.c:531
 #, fuzzy, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fehler bei %s:%d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:659
+#: src/peerinfo-tool/gnunet-peerinfo.c:669
 #, 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:665
+#: src/peerinfo-tool/gnunet-peerinfo.c:675
 #, 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:727
+#: src/peerinfo-tool/gnunet-peerinfo.c:734
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:759
+#: src/peerinfo-tool/gnunet-peerinfo.c:777
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:762
+#: src/peerinfo-tool/gnunet-peerinfo.c:780
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:765
+#: src/peerinfo-tool/gnunet-peerinfo.c:783
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:768
+#: src/peerinfo-tool/gnunet-peerinfo.c:786
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:771
+#: src/peerinfo-tool/gnunet-peerinfo.c:789
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:774
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:777
+#: src/peerinfo-tool/gnunet-peerinfo.c:795
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:780
+#: src/peerinfo-tool/gnunet-peerinfo.c:798
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:791
+#: src/peerinfo-tool/gnunet-peerinfo.c:809
 #, 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:120
+#: src/transport/gnunet-service-transport_plugins.c:123
 #, 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:124
+#: src/transport/gnunet-service-transport_plugins.c:127
 #, 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:153
+#: src/transport/gnunet-service-transport_plugins.c:157
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
@@ -4586,144 +4707,137 @@ msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 msgid "Unable to initialize Postgres: %s"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/pt/gnunet-daemon-pt.c:264
+#: src/pt/gnunet-daemon-pt.c:266
 #, fuzzy
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/pt/gnunet-daemon-pt.c:270
+#: src/pt/gnunet-daemon-pt.c:272
 #, fuzzy
 msgid "# DNS requests mapped to VPN"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/pt/gnunet-daemon-pt.c:323
+#: src/pt/gnunet-daemon-pt.c:325
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:500
+#: src/pt/gnunet-daemon-pt.c:502
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:506
+#: src/pt/gnunet-daemon-pt.c:508
 #, fuzzy
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/pt/gnunet-daemon-pt.c:602
+#: src/pt/gnunet-daemon-pt.c:604
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:632
+#: src/pt/gnunet-daemon-pt.c:634
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/pt/gnunet-daemon-pt.c:637
+#: src/pt/gnunet-daemon-pt.c:639
 #, fuzzy
 msgid "# DNS requests dropped (DNS mesh tunnel down)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:645
+#: src/pt/gnunet-daemon-pt.c:647
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:716
+#: src/pt/gnunet-daemon-pt.c:715
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/pt/gnunet-daemon-pt.c:730
+#: src/pt/gnunet-daemon-pt.c:729
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/pt/gnunet-daemon-pt.c:748 src/pt/gnunet-daemon-pt.c:760
+#: src/pt/gnunet-daemon-pt.c:747 src/pt/gnunet-daemon-pt.c:759
 msgid "# DNS requests aborted (tunnel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:898 src/pt/gnunet-daemon-pt.c:907
+#: src/pt/gnunet-daemon-pt.c:901 src/pt/gnunet-daemon-pt.c:910
 #: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/pt/gnunet-daemon-pt.c:976
+#: src/pt/gnunet-daemon-pt.c:977
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:432
+#: src/regex/gnunet-daemon-regexprofiler.c:384
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1247
+#: src/regex/gnunet-regex-profiler.c:1279
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "Konfigurationsdatei FILENAME verwenden"
 
-#: src/regex/gnunet-regex-profiler.c:1258
+#: src/regex/gnunet-regex-profiler.c:1290
 #, fuzzy
 msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1287
+#: src/regex/gnunet-regex-profiler.c:1319
 #: 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:1293
+#: src/regex/gnunet-regex-profiler.c:1325
 #: 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:1300
+#: src/regex/gnunet-regex-profiler.c:1332
 #, 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:1309
+#: src/regex/gnunet-regex-profiler.c:1341
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1319
-#, fuzzy
-msgid ""
-"Error loading search strings.Given file does not contain enough strings. "
-"Exiting.\n"
-msgstr "Fehler beim Verlassen der DHT.\n"
-
-#: src/regex/gnunet-regex-profiler.c:1327
+#: src/regex/gnunet-regex-profiler.c:1361
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fehler beim Verlassen der DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1394
+#: src/regex/gnunet-regex-profiler.c:1443
 #, 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:1397
+#: src/regex/gnunet-regex-profiler.c:1446
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1400
+#: src/regex/gnunet-regex-profiler.c:1449
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1403
+#: src/regex/gnunet-regex-profiler.c:1452
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1406
+#: src/regex/gnunet-regex-profiler.c:1455
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1418
+#: src/regex/gnunet-regex-profiler.c:1467
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4739,6 +4853,32 @@ msgstr ""
 msgid "Profiler for regex library"
 msgstr ""
 
+#: src/set/gnunet-set-ibf-profiler.c:224
+#, fuzzy
+msgid "number of element in set A-B"
+msgstr "Anzahl an Durchläufen"
+
+#: src/set/gnunet-set-ibf-profiler.c:227
+#, fuzzy
+msgid "number of element in set B-A"
+msgstr "Anzahl an Durchläufen"
+
+#: src/set/gnunet-set-ibf-profiler.c:230
+msgid "number of common elements in A and B"
+msgstr ""
+
+#: src/set/gnunet-set-ibf-profiler.c:233
+msgid "hash num"
+msgstr ""
+
+#: src/set/gnunet-set-ibf-profiler.c:236
+msgid "ibf size"
+msgstr ""
+
+#: src/set/gnunet-set-profiler.c:296
+msgid "oeration to execute"
+msgstr ""
+
 #: src/statistics/gnunet-service-statistics.c:271
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
@@ -4759,68 +4899,68 @@ msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:181
-#, fuzzy, c-format
-msgid "Trying to connect to remote host, but service `%s' is not running\n"
-msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
-
-#: src/statistics/gnunet-statistics.c:190
-#, fuzzy, c-format
-msgid "A port is required to connect to host `%s'\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/statistics/gnunet-statistics.c:196
-#, c-format
-msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:210
+#: src/statistics/gnunet-statistics.c:186
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:216
+#: src/statistics/gnunet-statistics.c:192
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:247
+#: src/statistics/gnunet-statistics.c:223
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:255
+#: src/statistics/gnunet-statistics.c:231
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/statistics/gnunet-statistics.c:310
+#: src/statistics/gnunet-statistics.c:258
+#, fuzzy, c-format
+msgid "Trying to connect to remote host, but service `%s' is not running\n"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#: src/statistics/gnunet-statistics.c:266
+#, fuzzy, c-format
+msgid "A port is required to connect to host `%s'\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/statistics/gnunet-statistics.c:273
+#, c-format
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:331
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:313
+#: src/statistics/gnunet-statistics.c:334
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:316
+#: src/statistics/gnunet-statistics.c:337
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:319
+#: src/statistics/gnunet-statistics.c:340
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:322
+#: src/statistics/gnunet-statistics.c:343
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:325
+#: src/statistics/gnunet-statistics.c:346
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:328
+#: src/statistics/gnunet-statistics.c:349
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:361
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
 
@@ -4842,12 +4982,26 @@ msgstr ""
 msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:692
+#: src/testbed/gnunet-service-testbed_cpustatus.c:727
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
+#: src/testbed/gnunet-service-testbed_peers.c:964
+#, fuzzy
+msgid "Misconfiguration (can't connect to the ARM service)"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/testbed/gnunet-service-testbed_peers.c:970
+msgid "Request doesn't fit into a message"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1008
+#, fuzzy, c-format
+msgid "%s service can't be started because ARM is shutting down"
+msgstr "`%s' fährt herunter.\n"
+
 #: src/testbed/gnunet_testbed_ll_master.c:57
 #, fuzzy, c-format
 msgid "Job command file not given. Exiting\n"
@@ -4898,51 +5052,51 @@ msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1879
+#: src/testbed/testbed_api_hosts.c:1878
 #, 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:891
+#: src/testbed/testbed_api_testbed.c:802
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1094
+#: src/testbed/testbed_api_testbed.c:944
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1175
+#: src/testbed/testbed_api_testbed.c:1009
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1320
+#: src/testbed/testbed_api_testbed.c:1111
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1324
+#: src/testbed/testbed_api_testbed.c:1115
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1365
+#: src/testbed/testbed_api_testbed.c:1153
 #, fuzzy
 msgid "Cannot start the master controller"
 msgstr "GNUnet testbed Controller starten."
 
-#: src/testbed/testbed_api_testbed.c:1383
+#: src/testbed/testbed_api_testbed.c:1171
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1443
+#: src/testbed/testbed_api_testbed.c:1231
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1455
+#: src/testbed/testbed_api_testbed.c:1243
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1479
+#: src/testbed/testbed_api_testbed.c:1267
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
@@ -4988,22 +5142,22 @@ msgstr ""
 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:133
+#: src/testing/gnunet-testing.c:130
 #, 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:210
+#: src/testing/gnunet-testing.c:199
 #, fuzzy
 msgid "create unique configuration files"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/testing/gnunet-testing.c:212
+#: src/testing/gnunet-testing.c:201
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:214
+#: src/testing/gnunet-testing.c:203
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
@@ -5011,12 +5165,12 @@ msgid ""
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/testing/gnunet-testing.c:216
+#: src/testing/gnunet-testing.c:205
 #, fuzzy
 msgid "configuration template"
 msgstr "GNUnet Konfiguration"
 
-#: src/testing/gnunet-testing.c:225
+#: src/testing/gnunet-testing.c:214
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -5045,54 +5199,54 @@ msgstr ""
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:719
+#: src/testing/testing.c:722
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
 
-#: src/testing/testing.c:730
+#: src/testing/testing.c:733
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/testing/testing.c:1175
+#: src/testing/testing.c:1177
 #, 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:1182
+#: src/testing/testing.c:1184
 #, 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:1191
+#: src/testing/testing.c:1193
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/testing/testing.c:1211
+#: src/testing/testing.c:1209
 #, 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
+#: src/testing/testing.c:1219
 #, 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:1243
+#: src/testing/testing.c:1241
 #, 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:1343
+#: src/testing/testing.c:1341
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/testing/testing.c:1709
+#: src/testing/testing.c:1707
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
@@ -5203,27 +5357,36 @@ msgstr ""
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:174
+#: src/transport/gnunet-service-transport.c:169
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport.c:239
+#: src/transport/gnunet-service-transport.c:235
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/transport/gnunet-service-transport.c:286
+#: src/transport/gnunet-service-transport.c:282
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# Bytes entschlüsselt"
 
-#: src/transport/gnunet-service-transport.c:642
+#: src/transport/gnunet-service-transport.c:432
 #, fuzzy, c-format
-msgid "Transport service could not access hostkey: %s. Exiting.\n"
-msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+msgid "Could not obtain a valid network for `%s' %s\n"
+msgstr ""
+"Es konnte keine IP für das Gerät `%s' unter Verwendung von `%s' ermittelt "
+"werden.\n"
 
-#: src/transport/gnunet-service-transport.c:741
+#: src/transport/gnunet-service-transport.c:480
+#, c-format
+msgid ""
+"Address or session unknown: failed to update properties for peer `%s' plugin "
+"`%s' address `%s' session %p\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:754
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5319,108 +5482,138 @@ msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2774
+#: src/transport/gnunet-service-transport_neighbours.c:2769
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2789
-#: src/transport/gnunet-service-transport_neighbours.c:2823
+#: src/transport/gnunet-service-transport_neighbours.c:2784
+#: src/transport/gnunet-service-transport_neighbours.c:2815
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2836
+#: src/transport/gnunet-service-transport_neighbours.c:2828
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2869
+#: src/transport/gnunet-service-transport_neighbours.c:2859
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3050
+#: src/transport/gnunet-service-transport_neighbours.c:3040
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3105
+#: src/transport/gnunet-service-transport_neighbours.c:3093
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3119
+#: src/transport/gnunet-service-transport_neighbours.c:3107
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3138
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3161
+#: src/transport/gnunet-service-transport_neighbours.c:3149
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3192
+#: src/transport/gnunet-service-transport_neighbours.c:3188
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3287
+#: 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:113
+#: src/transport/gnunet-service-transport_plugins.c:116
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:453
+#: src/transport/gnunet-service-transport_plugins.c:170
+#: src/transport/gnunet-service-transport_plugins.c:178
+#: src/transport/gnunet-service-transport_plugins.c:186
+#: src/transport/gnunet-service-transport_plugins.c:194
+#: src/transport/gnunet-service-transport_plugins.c:202
+#: src/transport/gnunet-service-transport_plugins.c:210
+#: src/transport/gnunet-service-transport_plugins.c:218
+#: src/transport/gnunet-service-transport_plugins.c:226
+#, fuzzy, c-format
+msgid "Missing function `%s' in transport plugin for `%s'\n"
+msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
+
+#: src/transport/gnunet-service-transport_plugins.c:233
+#, fuzzy, c-format
+msgid "Did not load plugin `%s' due to missing functions\n"
+msgstr "Fehler beim Laden des Plugins `%s' bei %s:%d. Plugin wird entladen.\n"
+
+#: src/transport/gnunet-service-transport_validation.c:455
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:515
+#: src/transport/gnunet-service-transport_validation.c:518
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:564
+#: src/transport/gnunet-service-transport_validation.c:575
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_validation.c:651
+#: src/transport/gnunet-service-transport_validation.c:664
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:910
+#: src/transport/gnunet-service-transport_validation.c:930
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_validation.c:955
+#: src/transport/gnunet-service-transport_validation.c:989
+msgid "# failed address checks during validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:999
+msgid "# successful address checks during validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1018
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1051
+#: src/transport/gnunet-service-transport_validation.c:1072
+#, fuzzy, c-format
+msgid "Failed to create PONG signature for peer `%s'\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#: src/transport/gnunet-service-transport_validation.c:1117
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1060
+#: src/transport/gnunet-service-transport_validation.c:1126
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1187
+#: src/transport/gnunet-service-transport_validation.c:1253
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1202
+#: src/transport/gnunet-service-transport_validation.c:1268
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1305
+#: src/transport/gnunet-service-transport_validation.c:1374
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
@@ -5506,113 +5699,189 @@ msgstr "# verbundener Knoten"
 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:819
+#: src/transport/gnunet-transport.c:828
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:825
+#: src/transport/gnunet-transport.c:834
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:845 src/transport/gnunet-transport.c:875
-#: src/transport/gnunet-transport.c:897 src/transport/gnunet-transport.c:936
+#: src/transport/gnunet-transport.c:854 src/transport/gnunet-transport.c:884
+#: src/transport/gnunet-transport.c:906 src/transport/gnunet-transport.c:945
 #, 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:852 src/transport/gnunet-transport.c:882
+#: src/transport/gnunet-transport.c:861 src/transport/gnunet-transport.c:891
 #, 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:902
+#: src/transport/gnunet-transport.c:911
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:987
+#: src/transport/gnunet-transport.c:995
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:990
+#: src/transport/gnunet-transport.c:998
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/transport/gnunet-transport.c:993
+#: src/transport/gnunet-transport.c:1001
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:999
+#: src/transport/gnunet-transport.c:1007
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:1010
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-transport.c:1005
+#: src/transport/gnunet-transport.c:1013
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1009
+#: src/transport/gnunet-transport.c:1017
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1012
+#: src/transport/gnunet-transport.c:1020
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1023
+#: src/transport/gnunet-transport.c:1031
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
+#: src/transport/plugin_transport_bluetooth.c:612
+msgid "# Bluetooth ACKs sent"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:631
+#, fuzzy
+msgid "# Bluetooth messages defragmented"
+msgstr "# defragmentierter Nachrichten"
+
+#: src/transport/plugin_transport_bluetooth.c:677
+#: src/transport/plugin_transport_bluetooth.c:727
+#: src/transport/plugin_transport_bluetooth.c:1833
+#, fuzzy
+msgid "# Bluetooth sessions allocated"
+msgstr "# Sitzungsschlüssel akzeptiert"
+
+#: src/transport/plugin_transport_bluetooth.c:802
+#, fuzzy
+msgid "# Bluetooth message fragments sent"
+msgstr "# fragmentierter Nachrichten"
+
+#: src/transport/plugin_transport_bluetooth.c:826
+msgid "# Bluetooth messages pending (with fragmentation)"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:934
+#: src/transport/plugin_transport_bluetooth.c:1019
+#: src/transport/plugin_transport_bluetooth.c:1835
+#, fuzzy
+msgid "# Bluetooth MAC endpoints allocated"
+msgstr "# Client Trace-Anfragen empfangen"
+
+#: src/transport/plugin_transport_bluetooth.c:1214
+#, fuzzy
+msgid "# HELLO messages received via Bluetooth"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/plugin_transport_bluetooth.c:1240
+#, fuzzy
+msgid "# fragments received via Bluetooth"
+msgstr "# verworfener Nachrichten"
+
+#: src/transport/plugin_transport_bluetooth.c:1250
+#, fuzzy
+msgid "# ACKs received via Bluetooth"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/transport/plugin_transport_bluetooth.c:1307
+#, fuzzy
+msgid "# Bluetooth DATA messages discarded due to CRC32 error"
+msgstr "# defragmentierter Nachrichten"
+
+#: src/transport/plugin_transport_bluetooth.c:1419
+#, fuzzy
+msgid "# DATA messages received via Bluetooth"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/plugin_transport_bluetooth.c:1454
+#, fuzzy
+msgid "# Bluetooth DATA messages processed"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/transport/plugin_transport_bluetooth.c:1517
+#, fuzzy
+msgid "# HELLO beacons sent via Bluetooth"
+msgstr "# Bytes gesendet über UDP"
+
+#: src/transport/plugin_transport_bluetooth.c:1630
+msgid "Bluetooth address with invalid size encountered\n"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:1814
+#, c-format
+msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
+msgstr ""
+
 #: src/transport/plugin_transport_http.c:815
-#: src/transport/plugin_transport_http_server.c:2566
+#: src/transport/plugin_transport_http_server.c:2585
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:864
-#: src/transport/plugin_transport_http_server.c:2334
+#: src/transport/plugin_transport_http_server.c:2353
 #, 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:896
-#: src/transport/plugin_transport_http_server.c:2366 src/util/service.c:1053
+#: src/transport/plugin_transport_http_server.c:2385 src/util/service.c:1062
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
 #: src/transport/plugin_transport_http.c:913
-#: src/transport/plugin_transport_http_server.c:2383 src/util/service.c:1070
+#: src/transport/plugin_transport_http_server.c:2402 src/util/service.c:1079
 #, 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:1018
-#: src/transport/plugin_transport_http_server.c:2494
+#: src/transport/plugin_transport_http_server.c:2513
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1131
-#: src/transport/plugin_transport_http_server.c:2673
+#: src/transport/plugin_transport_http_server.c:2693
 #, 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:1144
-#: src/transport/plugin_transport_http_server.c:2684
+#: src/transport/plugin_transport_http_server.c:2704
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
@@ -5636,7 +5905,7 @@ msgid ""
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2774
+#: src/transport/plugin_transport_http_server.c:2819
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
@@ -5645,99 +5914,99 @@ msgstr "Collection `%s' begonnen.\n"
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1535
+#: src/transport/plugin_transport_http_client.c:1582
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1666
-#: src/transport/plugin_transport_http_server.c:2898
+#: src/transport/plugin_transport_http_client.c:1713
+#: src/transport/plugin_transport_http_server.c:2943
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1691
-#: src/transport/plugin_transport_http_server.c:2957
+#: src/transport/plugin_transport_http_client.c:1738
+#: src/transport/plugin_transport_http_server.c:3003
 #, 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:1719
-#: src/transport/plugin_transport_http_server.c:2804
+#: src/transport/plugin_transport_http_client.c:1766
+#: src/transport/plugin_transport_http_server.c:2849
 #, 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:1352
+#: src/transport/plugin_transport_http_server.c:1368
 #, 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:1613
+#: src/transport/plugin_transport_http_server.c:1632
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1621
+#: src/transport/plugin_transport_http_server.c:1640
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1922
+#: src/transport/plugin_transport_http_server.c:1941
 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:1946
+#: src/transport/plugin_transport_http_server.c:1965
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2652
+#: src/transport/plugin_transport_http_server.c:2672
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2666
+#: src/transport/plugin_transport_http_server.c:2686
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2691
+#: src/transport/plugin_transport_http_server.c:2711
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2706
+#: src/transport/plugin_transport_http_server.c:2726
 #, 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:2716
+#: src/transport/plugin_transport_http_server.c:2736
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2737
+#: src/transport/plugin_transport_http_server.c:2757
 #, 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:2747
+#: src/transport/plugin_transport_http_server.c:2767
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2790
+#: src/transport/plugin_transport_http_server.c:2835
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -5792,92 +6061,92 @@ msgstr "# Bytes gesendet über TCP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:596
+#: src/transport/plugin_transport_tcp.c:627
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:772
-#: src/transport/plugin_transport_tcp.c:861
-#: src/transport/plugin_transport_tcp.c:911
-#: src/transport/plugin_transport_tcp.c:997
-#: src/transport/plugin_transport_tcp.c:1140
-#: src/transport/plugin_transport_tcp.c:1157
+#: src/transport/plugin_transport_tcp.c:836
+#: src/transport/plugin_transport_tcp.c:925
+#: src/transport/plugin_transport_tcp.c:975
+#: src/transport/plugin_transport_tcp.c:1061
+#: src/transport/plugin_transport_tcp.c:1204
+#: src/transport/plugin_transport_tcp.c:1221
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transport/plugin_transport_tcp.c:779
-#: src/transport/plugin_transport_tcp.c:968
-#: src/transport/plugin_transport_tcp.c:1827
-#: src/transport/plugin_transport_tcp.c:2460
+#: src/transport/plugin_transport_tcp.c:843
+#: src/transport/plugin_transport_tcp.c:1032
+#: src/transport/plugin_transport_tcp.c:2013
+#: src/transport/plugin_transport_tcp.c:2688
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_tcp.c:865
+#: src/transport/plugin_transport_tcp.c:929
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:914
+#: src/transport/plugin_transport_tcp.c:978
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:1001
+#: src/transport/plugin_transport_tcp.c:1065
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1114
+#: src/transport/plugin_transport_tcp.c:1178
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1350
-#, c-format
-msgid "Address of unexpected length: %u\n"
+#: src/transport/plugin_transport_tcp.c:1415
+#: src/transport/plugin_transport_udp.c:1454
+msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:1532
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1868
+#: src/transport/plugin_transport_tcp.c:2063
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:2037
+#: src/transport/plugin_transport_tcp.c:2246
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2119
+#: src/transport/plugin_transport_tcp.c:2326
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2345 src/util/service.c:948
-#: src/util/service.c:954
+#: src/transport/plugin_transport_tcp.c:2568 src/util/service.c:957
+#: src/util/service.c:963
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2359
+#: src/transport/plugin_transport_tcp.c:2582
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2448
+#: src/transport/plugin_transport_tcp.c:2675
 #, 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:2452
+#: src/transport/plugin_transport_tcp.c:2679
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2456
+#: src/transport/plugin_transport_tcp.c:2683
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5902,14 +6171,21 @@ msgstr ""
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2350
+#: src/transport/plugin_transport_udp.c:1556
+#, c-format
+msgid ""
+"Trying to create session for address of unexpected length %u (should be %u "
+"or %u)\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2587
 #, 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:2364
+#: src/transport/plugin_transport_udp.c:2601
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5917,103 +6193,103 @@ msgid ""
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2664
+#: src/transport/plugin_transport_udp.c:2901
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:2762
+#: src/transport/plugin_transport_udp.c:2999
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2805
+#: src/transport/plugin_transport_udp.c:3042
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_udp.c:2862
+#: src/transport/plugin_transport_udp.c:3101
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/transport/plugin_transport_unix.c:1427
+#: src/transport/plugin_transport_unix.c:1641
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_wlan.c:580
+#: src/transport/plugin_transport_wlan.c:610
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:599
+#: src/transport/plugin_transport_wlan.c:629
 #, fuzzy
 msgid "# WLAN messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:645
-#: src/transport/plugin_transport_wlan.c:695
-#: src/transport/plugin_transport_wlan.c:1764
+#: src/transport/plugin_transport_wlan.c:675
+#: src/transport/plugin_transport_wlan.c:742
+#: src/transport/plugin_transport_wlan.c:1874
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_wlan.c:770
+#: src/transport/plugin_transport_wlan.c:835
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:794
+#: src/transport/plugin_transport_wlan.c:859
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:902
-#: src/transport/plugin_transport_wlan.c:987
-#: src/transport/plugin_transport_wlan.c:1766
+#: src/transport/plugin_transport_wlan.c:967
+#: src/transport/plugin_transport_wlan.c:1052
+#: src/transport/plugin_transport_wlan.c:1876
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1166
+#: src/transport/plugin_transport_wlan.c:1247
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1192
+#: src/transport/plugin_transport_wlan.c:1273
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1202
+#: src/transport/plugin_transport_wlan.c:1283
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_wlan.c:1259
+#: src/transport/plugin_transport_wlan.c:1340
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1364
+#: src/transport/plugin_transport_wlan.c:1460
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1399
+#: src/transport/plugin_transport_wlan.c:1495
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1460
+#: src/transport/plugin_transport_wlan.c:1558
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transport/plugin_transport_wlan.c:1569
+#: src/transport/plugin_transport_wlan.c:1671
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1745
+#: src/transport/plugin_transport_wlan.c:1855
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
@@ -6058,43 +6334,39 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:276 src/util/client.c:753 src/util/service.c:984
+#: src/util/client.c:261 src/util/client.c:839 src/util/service.c:993
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:280 src/util/client.c:757 src/util/service.c:988
+#: src/util/client.c:265 src/util/client.c:843 src/util/service.c:997
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/util/client.c:371
+#: src/util/client.c:357
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:379
+#: src/util/client.c:365
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:698
-msgid "Failure to transmit TEST request.\n"
-msgstr ""
-
-#: src/util/client.c:898
+#: src/util/client.c:981
 #, fuzzy, c-format
-msgid "Could not connect to service `%s', must not be running.\n"
+msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/util/client.c:912
+#: src/util/client.c:993
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/util/client.c:1178
+#: src/util/client.c:1259
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -6162,7 +6434,7 @@ msgstr ""
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/configuration.c:998
+#: src/util/configuration.c:984
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -6202,61 +6474,41 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: 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: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:555 src/util/crypto_ecc.c:599
-#: src/util/crypto_rsa.c:750 src/util/crypto_rsa.c:887
+#: src/util/crypto_ecc.c:534 src/util/crypto_ecc.c:572
 #, 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:560 src/util/crypto_rsa.c:892
+#: src/util/crypto_ecc.c:539
 #, 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:603 src/util/crypto_rsa.c:754
-#: src/util/crypto_rsa.c:790
+#: src/util/crypto_ecc.c:576
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:634 src/util/crypto_rsa.c:785
+#: src/util/crypto_ecc.c:607
 #, 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:639
+#: src/util/crypto_ecc.c:612
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: 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:776 src/util/crypto_rsa.c:982
-msgid "interrupted by shutdown"
-msgstr ""
-
-#: src/util/crypto_ecc.c:787
+#: src/util/crypto_ecc.c:694
 #, fuzzy
-msgid "gnunet-ecc failed"
-msgstr "gnunet-update ausführen"
+msgid "Could not load peer's private key\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/crypto_ecc.c:1084
+#: src/util/crypto_ecc.c:756
+#, 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:836
 #, fuzzy, c-format
 msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
@@ -6272,39 +6524,17 @@ msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/crypto_rsa.c:660
-#, fuzzy, c-format
-msgid ""
-"File `%s' does not contain a valid private key (too long, %llu bytes).  "
-"Renaming it.\n"
-msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
-
-#: src/util/crypto_rsa.c:993
-#, fuzzy
-msgid "gnunet-rsa failed"
-msgstr "gnunet-update ausführen"
-
-#: src/util/crypto_rsa.c:1378
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
-
-#: src/util/disk.c:602
-#, fuzzy, c-format
-msgid "`%s' failed for drive `%S': %u\n"
-msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
-
-#: src/util/disk.c:1207
+#: src/util/disk.c:1149
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1564 src/util/service.c:1670
+#: src/util/disk.c:1506 src/util/service.c:1679
 #, 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:2007
+#: src/util/disk.c:1953
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
@@ -6419,74 +6649,70 @@ msgid "Manipulate GNUnet configuration files"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/util/gnunet-ecc.c:76
+#: src/util/gnunet-ecc.c:65
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/util/gnunet-ecc.c:82
+#: src/util/gnunet-ecc.c:71
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:100
+#: src/util/gnunet-ecc.c:87
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/gnunet-ecc.c:112
+#: src/util/gnunet-ecc.c:97
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr "Fertigstellen"
 
-#: src/util/gnunet-ecc.c:115
+#: src/util/gnunet-ecc.c:100
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:138 src/util/gnunet-rsa.c:65
+#: src/util/gnunet-ecc.c:123
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:193
+#: src/util/gnunet-ecc.c:178
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:196 src/util/gnunet-rsa.c:115
+#: src/util/gnunet-ecc.c:181
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:199 src/util/gnunet-rsa.c:118
+#: src/util/gnunet-ecc.c:184
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:202 src/util/gnunet-rsa.c:121
+#: src/util/gnunet-ecc.c:187
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:213
+#: src/util/gnunet-ecc.c:198
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:148
+#: src/util/gnunet-resolver.c:149
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:159
+#: src/util/gnunet-resolver.c:160
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:132
-msgid "Manipulate GNUnet private RSA key files"
-msgstr ""
-
 #: src/util/gnunet-service-resolver.c:288
 #, fuzzy, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
@@ -6522,17 +6748,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:322
+#: src/util/helper.c:330
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/helper.c:367
+#: src/util/helper.c:375
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/helper.c:564
+#: src/util/helper.c:572
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
@@ -6542,7 +6768,7 @@ msgstr "Fehler beim Anlegen des Benutzers"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1331
+#: src/util/network.c:1344
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -6560,12 +6786,12 @@ msgstr ""
 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
+#: src/util/os_installation.c:769
 #, 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
+#: src/util/os_installation.c:779
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -6591,7 +6817,7 @@ msgstr "`%s' fehlgeschlagen für die Bibliothek `%s'. Ort: %s:%d. Fehler: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/util/program.c:254 src/util/service.c:1792
+#: src/util/program.c:254 src/util/service.c:1801
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
@@ -6633,143 +6859,143 @@ msgstr ""
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:436
+#: src/util/server.c:476
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/server.c:445
+#: src/util/server.c:485
 #, 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:456
+#: src/util/server.c:496
 #, 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:848
+#: src/util/server.c:888
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
-#: src/util/service.c:232 src/util/service.c:239
+#: src/util/service.c:151 src/util/service.c:177 src/util/service.c:220
+#: src/util/service.c:241 src/util/service.c:248
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/service.c:195
+#: src/util/service.c:204
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ungültige Netzwerk Notation ('/%d ist nicht gültig in IPv4 CIDR)."
 
-#: src/util/service.c:288
+#: src/util/service.c:297
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ungültige Netzwerk Notation (endet nicht mit ';': `%s')\n"
 
-#: src/util/service.c:320
+#: src/util/service.c:329
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/service.c:350
+#: src/util/service.c:359
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
 
-#: src/util/service.c:707
+#: src/util/service.c:716
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:712
+#: src/util/service.c:721
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/util/service.c:719
+#: src/util/service.c:728
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:774
+#: src/util/service.c:783
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:811
+#: src/util/service.c:820
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:929
+#: src/util/service.c:938
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1007
+#: src/util/service.c:1016
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1024
+#: src/util/service.c:1033
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1258
+#: src/util/service.c:1267
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1309 src/util/service.c:1327
+#: src/util/service.c:1318 src/util/service.c:1336
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1354
+#: src/util/service.c:1363
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1526
+#: src/util/service.c:1535
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/service.c:1559
+#: src/util/service.c:1568
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/util/service.c:1608
+#: src/util/service.c:1617
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1612
+#: src/util/service.c:1621
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1616
+#: src/util/service.c:1625
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1671
+#: src/util/service.c:1680
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1684
+#: src/util/service.c:1693
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Benutzer/Gruppe kann nicht zu `%s' gewechselt werden: %s\n"
 
-#: src/util/service.c:1750
+#: src/util/service.c:1759
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6850,106 +7076,106 @@ msgstr ""
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/vpn/gnunet-service-vpn.c:512 src/vpn/gnunet-service-vpn.c:1088
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1130
 #, fuzzy
 msgid "# Active tunnels"
 msgstr "GNUnet Konfiguration"
 
-#: src/vpn/gnunet-service-vpn.c:609 src/vpn/gnunet-service-vpn.c:646
+#: src/vpn/gnunet-service-vpn.c:622 src/vpn/gnunet-service-vpn.c:661
 #, fuzzy
 msgid "# peers connected to mesh tunnels"
 msgstr "# verbundener Knoten"
 
-#: src/vpn/gnunet-service-vpn.c:699
+#: src/vpn/gnunet-service-vpn.c:712
 #, fuzzy
 msgid "# Bytes given to mesh for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/vpn/gnunet-service-vpn.c:737
+#: src/vpn/gnunet-service-vpn.c:750
 #, fuzzy
 msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/vpn/gnunet-service-vpn.c:771
+#: src/vpn/gnunet-service-vpn.c:814
 #, fuzzy
 msgid "# Mesh tunnels created"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/vpn/gnunet-service-vpn.c:794
+#: src/vpn/gnunet-service-vpn.c:839
 #, fuzzy
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/vpn/gnunet-service-vpn.c:990
+#: src/vpn/gnunet-service-vpn.c:1032
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1308
+#: src/vpn/gnunet-service-vpn.c:1350
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1329
+#: src/vpn/gnunet-service-vpn.c:1371
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1534
+#: src/vpn/gnunet-service-vpn.c:1576
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1572 src/vpn/gnunet-service-vpn.c:1613
+#: src/vpn/gnunet-service-vpn.c:1614 src/vpn/gnunet-service-vpn.c:1655
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1623
+#: src/vpn/gnunet-service-vpn.c:1665
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1637
+#: src/vpn/gnunet-service-vpn.c:1679
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1721
+#: src/vpn/gnunet-service-vpn.c:1761
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2062
+#: src/vpn/gnunet-service-vpn.c:2100
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2220
+#: src/vpn/gnunet-service-vpn.c:2255
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2371
+#: src/vpn/gnunet-service-vpn.c:2406
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2426
+#: src/vpn/gnunet-service-vpn.c:2461
 #, fuzzy
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden!\n"
 
-#: src/vpn/gnunet-service-vpn.c:2465 src/vpn/gnunet-service-vpn.c:2678
+#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2713
 #, fuzzy
 msgid "# Active destinations"
 msgstr "GNUnet Konfiguration"
 
-#: src/vpn/gnunet-service-vpn.c:2751
+#: src/vpn/gnunet-service-vpn.c:2786
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3138
+#: src/vpn/gnunet-service-vpn.c:3143
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3170
+#: src/vpn/gnunet-service-vpn.c:3175
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -7025,23 +7251,158 @@ msgstr "# Bytes empfangen über UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
-#: src/include/gnunet_common.h:591
+#: src/include/gnunet_common.h:588 src/include/gnunet_common.h:593
+#: src/include/gnunet_common.h:599
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:601
+#: src/include/gnunet_common.h:609
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:622 src/include/gnunet_common.h:629
+#: src/include/gnunet_common.h:630 src/include/gnunet_common.h:637
 #, 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 "number of peers to start"
+#~ msgstr "Anzahl an Durchläufen"
+
+#, fuzzy
+#~ msgid "Failed to read or generate private key: %s\n"
+#~ msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+
+#, fuzzy
+#~ msgid "Transport service is unable to access hostkey. Exiting.\n"
+#~ msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to create or read private key for namespace `%s'\n"
+#~ msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+
+#, fuzzy
+#~ msgid "Failed to read private key for namespace `%s'\n"
+#~ msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+
+#, fuzzy
+#~ msgid "Failed to read namespace private key file `%s', deleting it!\n"
+#~ msgstr ""
+#~ "Der Eintrag konnte dem Namespace `%s' nicht hinzugefügt werden (existiert "
+#~ "er?)\n"
+
+#, fuzzy
+#~ msgid "Internal error."
+#~ msgstr "Unbekannter Fehler.\n"
+
+#, fuzzy
+#~ msgid "ECDSA signature verification failed at %s:%d: %s\n"
+#~ msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
+
+#, fuzzy
+#~ msgid "print names of local namespaces"
+#~ msgstr "das Rating eines Namespaces setzen"
+
+#, fuzzy
+#~ msgid "Failed to create namespace `%s' (illegal filename?)\n"
+#~ msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#, fuzzy
+#~ msgid "# Replies received from STREAM"
+#~ msgstr "# Bytes empfangen über HTTP"
+
+#, fuzzy
+#~ msgid "Mesh service could not access hostkey: %s. Exiting.\n"
+#~ msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+
+#, fuzzy
+#~ msgid "No valid expiration time for operation `%s'\n"
+#~ msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
+
+#, fuzzy
+#~ msgid "Failed to find record to remove\n"
+#~ msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Could not parse zone key file `%s'\n"
+#~ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to create new signature"
+#~ msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#, fuzzy
+#~ msgid "Failed to put new set of records in database"
+#~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#, fuzzy
+#~ msgid "Failed to remove records from database"
+#~ msgstr ""
+#~ "\n"
+#~ "Fehler beim Empfangen der Antwort von gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to access database"
+#~ msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#, fuzzy
+#~ msgid "unknown internal error in namestore"
+#~ msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
+
+#, fuzzy
+#~ msgid "NSE service could not access hostkey: %s\n"
+#~ msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error loading search strings.Given file does not contain enough strings. "
+#~ "Exiting.\n"
+#~ msgstr "Fehler beim Verlassen der DHT.\n"
+
+#, fuzzy
+#~ msgid "Transport service could not access hostkey: %s. Exiting.\n"
+#~ msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+#~ msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
+
+#, fuzzy
+#~ msgid "gnunet-ecc failed"
+#~ msgstr "gnunet-update ausführen"
+
+#, fuzzy
+#~ msgid ""
+#~ "File `%s' does not contain a valid private key (too long, %llu bytes).  "
+#~ "Renaming it.\n"
+#~ msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
+
+#, fuzzy
+#~ msgid "gnunet-rsa failed"
+#~ msgstr "gnunet-update ausführen"
+
+#~ msgid "RSA signature verification failed at %s:%d: %s\n"
+#~ msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
+
+#, fuzzy
+#~ msgid "`%s' failed for drive `%S': %u\n"
+#~ msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
+
+#, fuzzy
 #~ msgid "Failed to transmit shutdown request to client.\n"
 #~ msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
@@ -7185,10 +7546,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
 #, fuzzy
-#~ msgid "Connected to %s\n"
-#~ msgstr "`%s' hat sich mit `%s' verbunden.\n"
-
-#, fuzzy
 #~ msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
 #~ msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
@@ -7365,10 +7722,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "GNUnet Konfiguration"
 
 #, fuzzy
-#~ msgid "Could not access hostkey.\n"
-#~ msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
-
-#, fuzzy
 #~ msgid "`scp' did not complete cleanly.\n"
 #~ msgstr "`%s' ist zu keinem Knoten verbunden.\n"
 
@@ -7422,10 +7775,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "`%s' ist zu keinem Knoten verbunden.\n"
 
 #, fuzzy
-#~ msgid "Starting service %s for peer `%4s'\n"
-#~ msgstr "Collection `%s' begonnen.\n"
-
-#, fuzzy
 #~ msgid "Could not start `%s' process to copy configuration directory.\n"
 #~ msgstr ""
 #~ "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP "
@@ -7632,10 +7981,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgstr "# verschlüsselter PING Nachrichten empfangen"
 
 #, fuzzy
-#~ msgid "Namespace `%s' unknown.\n"
-#~ msgstr "Namespace `%s' hat das Rating %d.\n"
-
-#, fuzzy
 #~ msgid "Failed to connect to statistics service!\n"
 #~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
@@ -8257,11 +8602,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ "Es sind keine Netzwerkgeräte in der Konfigurationsdatei in der Sektion `"
 #~ "%s' unter `%s' definiert!\n"
 
-#~ msgid "Could not obtain IP for interface `%s' using `%s'.\n"
-#~ msgstr ""
-#~ "Es konnte keine IP für das Gerät `%s' unter Verwendung von `%s' ermittelt "
-#~ "werden.\n"
-
 #, fuzzy
 #~ msgid ""
 #~ "Could not find interface `%s' using `%s', trying to find another "
@@ -9123,10 +9463,6 @@ msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 #~ msgid "Application module `%s' already initialized!\n"
 #~ msgstr "Anwendungsmodul `%s' ist bereits initialisiert!\n"
 
-#~ msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
-#~ msgstr ""
-#~ "Fehler beim Laden des Plugins `%s' bei %s:%d. Plugin wird entladen.\n"
-
 #~ msgid "Could not shutdown `%s': application not loaded\n"
 #~ msgstr ""
 #~ "`%s' kann nicht heruntergefahren werden: Anwendung ist nicht geladen\n"
diff --git a/po/es.po b/po/es.po
index fe331137a..8941b6537 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-05-20 15:09+0200\n"
+"POT-Creation-Date: 2013-08-09 23:01+0200\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <rosen644835@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/arm/arm_api.c:880
+#: src/arm/arm_api.c:335
 #, fuzzy
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
@@ -30,83 +30,83 @@ msgid ""
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/arm/gnunet-arm.c:159
+#: src/arm/gnunet-arm.c:164
 #, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:169
 #, c-format
 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:204 src/testbed/gnunet-service-testbed_peers.c:962
+#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:962
 #, 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:964
+#: src/arm/gnunet-arm.c:216
 #, fuzzy
-msgid "Misconfiguration (can't connect to the ARM service)"
+msgid "Misconfiguration (can not 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:966
+#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:966
 #, 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:968
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:968
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:212 src/testbed/gnunet-service-testbed_peers.c:970
+#: src/arm/gnunet-arm.c:222
 #, fuzzy
-msgid "Request doesn't fit into a message"
+msgid "Request does not 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:972
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:972
 #, fuzzy
 msgid "Request timed out"
 msgstr "plazo de consenso"
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:974
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:974
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Usuario desconocido «%s»\n"
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:990
+#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:990
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# elementos almacenados"
 
-#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:992
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:992
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:236 src/testbed/gnunet-service-testbed_peers.c:994
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:994
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:238 src/testbed/gnunet-service-testbed_peers.c:996
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:996
 #, 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:998
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:998
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:1000
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1000
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1002
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1002
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
@@ -114,149 +114,154 @@ 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:1004
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1004
 #, 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:1006
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1006
 #, 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:250 src/testbed/gnunet-service-testbed_peers.c:1008
+#: src/arm/gnunet-arm.c:260
 #, fuzzy, c-format
-msgid "%s service can't be started because ARM is shutting down"
+msgid "%s service cannot be started because ARM is shutting down"
 msgstr "Petición ignorada porque el ARM se está apagando.\n"
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1010
+#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1010
 #, fuzzy, c-format
 msgid "%.s Unknown result code."
 msgstr "Código de respuesta del ARM desconocido.\n"
 
-#: src/arm/gnunet-arm.c:271
+#: src/arm/gnunet-arm.c:295
 msgid "Fatal error initializing ARM API.\n"
 msgstr "Error fatal al inicializar la API del ARM.\n"
 
-#: src/arm/gnunet-arm.c:291
+#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
 #, 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:307
-#, fuzzy, c-format
-msgid "Failed to kill the `%s' service: %s\n"
-msgstr "Se produjo un fallo al escribir «%s»: %s\n"
+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:323
+#: src/arm/gnunet-arm.c:367
 #, 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
+#: src/arm/gnunet-arm.c:377
 #, 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
+#: src/arm/gnunet-arm.c:418
 #, 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
+#: src/arm/gnunet-arm.c:427
 #, 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
+#: src/arm/gnunet-arm.c:463
+#, 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:474
+#, 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:510
 #, 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
+#: src/arm/gnunet-arm.c:517
 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:433
+#: src/arm/gnunet-arm.c:521
 msgid "Running services:\n"
 msgstr "Servicios en ejecución:\n"
 
-#: src/arm/gnunet-arm.c:534
-msgid "Began monitoring ARM for service status changes\n"
+#: src/arm/gnunet-arm.c:603
+#, c-format
+msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:537
+#: src/arm/gnunet-arm.c:634
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:540
+#: src/arm/gnunet-arm.c:637
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Iniciando descarga «%s».\n"
 
-#: src/arm/gnunet-arm.c:543
+#: src/arm/gnunet-arm.c:640
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:552
+#: src/arm/gnunet-arm.c:651
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Solicitando incio del servicio «%s».\n"
 
-#: src/arm/gnunet-arm.c:622
+#: src/arm/gnunet-arm.c:715
 msgid "stop all GNUnet services"
 msgstr "detiene todos los servicios de GNUnet"
 
-#: src/arm/gnunet-arm.c:624
+#: src/arm/gnunet-arm.c:717
 msgid "start a particular service"
 msgstr "inicia un servicio particular"
 
-#: src/arm/gnunet-arm.c:626
+#: src/arm/gnunet-arm.c:719
 msgid "stop a particular service"
 msgstr "detiene un servicio particular"
 
-#: src/arm/gnunet-arm.c:628
+#: src/arm/gnunet-arm.c:721
 msgid "start all GNUnet default services"
 msgstr "inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:631
+#: src/arm/gnunet-arm.c:724
 msgid "stop and start all GNUnet default services"
 msgstr "detiene e inicia todos los servicios predeterminados de GNUnet"
 
-#: src/arm/gnunet-arm.c:634
+#: src/arm/gnunet-arm.c:727
 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:636
+#: src/arm/gnunet-arm.c:730
+msgid "monitor ARM activities"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:732
 msgid "don't print status messages"
 msgstr "no imprime mensajes de estado"
 
-#: src/arm/gnunet-arm.c:639
+#: src/arm/gnunet-arm.c:735
 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:641
+#: src/arm/gnunet-arm.c:737
 msgid "list currently running services"
 msgstr "lista de servicios actualmente en ejecución"
 
-#: src/arm/gnunet-arm.c:643
+#: src/arm/gnunet-arm.c:739
 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:645
+#: src/arm/gnunet-arm.c:741
 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:656
+#: src/arm/gnunet-arm.c:752
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 "Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)"
@@ -342,7 +347,7 @@ msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms
 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
+#: src/arm/gnunet-service-arm.c:1387
 #, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Iniciando servicios predeterminados «%s»\n"
@@ -350,13 +355,13 @@ msgstr "Iniciando servicios predeterminados «%s»\n"
 # 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:1397
+#: src/arm/gnunet-service-arm.c:1398
 #, 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:1411
+#: src/arm/gnunet-service-arm.c:1412
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -377,8 +382,8 @@ msgstr "Recibido mensaje %s\n"
 msgid "Received last message for %s \n"
 msgstr "Recibido último mensaje para %s\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1372
-#: src/ats/gnunet-service-ats_addresses.c:1406
+#: src/ats/gnunet-service-ats_addresses.c:1529
+#: src/ats/gnunet-service-ats_addresses.c:1563
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
@@ -388,12 +393,12 @@ msgstr ""
 "de banda predeterminado %llu\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/gnunet-service-ats_addresses.c:1378
+#: src/ats/gnunet-service-ats_addresses.c:1535
 #, 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:1385
+#: src/ats/gnunet-service-ats_addresses.c:1542
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
@@ -403,12 +408,12 @@ msgstr ""
 "de banda predeterminado %llu\n"
 
 # Miguel: "Inbound" lo he traducido como entrada en todo el texto.
-#: src/ats/gnunet-service-ats_addresses.c:1412
+#: src/ats/gnunet-service-ats_addresses.c:1569
 #, 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:1419
+#: src/ats/gnunet-service-ats_addresses.c:1576
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
@@ -417,26 +422,26 @@ msgstr ""
 "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:756
+#: src/ats/gnunet-service-ats_addresses.c:1773
+#, fuzzy
+msgid "Failed to initialize solver!\n"
+msgstr "¡No se puede inicializar el resolvedor!\n"
+
+#: src/ats/gnunet-service-ats-solver_mlp.c:848
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1075
+#: src/ats/gnunet-service-ats-solver_mlp.c:1171
 #, 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:1258
+#: src/ats/gnunet-service-ats-solver_mlp.c:1216
 #, c-format
-msgid "Update for ATS type `%s' not implemented!\n"
+msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: 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:1761
+#: src/ats/gnunet-service-ats-solver_mlp.c:1890
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
@@ -445,7 +450,7 @@ msgstr ""
 "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:1769
+#: src/ats/gnunet-service-ats-solver_mlp.c:1898
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
@@ -455,42 +460,47 @@ msgstr ""
 "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:1779
+#: src/ats/gnunet-service-ats-solver_mlp.c:1908
 #, 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:1787
+#: src/ats/gnunet-service-ats-solver_mlp.c:1916
 #, 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:1798
+#: src/ats/gnunet-service-ats-solver_mlp.c:1927
 #, fuzzy, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
+#: src/ats/gnunet-service-ats-solver_proportional.c:1246
+#, fuzzy, c-format
+msgid "Cannot find network of type `%u' %s\n"
+msgstr "No se encontró la IP del host «%s»: %s\n"
+
 # Miguel: ¿Como podría traducir "resolutions" y "resolve"?
 # Son difíciles de no calcar, puesto que no conozco como expresar
 # el concepto de obtener una dirección a partir de un nombre
 # en castellano sin la palabra resolver. :-)
-#: src/ats-tool/gnunet-ats.c:141
+#: src/ats-tool/gnunet-ats.c:145
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr "%u resoluciones de dirección pasaron de plazo\n"
 
-#: src/ats-tool/gnunet-ats.c:143
+#: src/ats-tool/gnunet-ats.c:147
 #, c-format
 msgid "ATS returned results for %u addresses\n"
 msgstr "El ATS devolvió resultados para %u direcciones\n"
 
 # Miguel: "Plugin" está traducido como módulo en todo el texto
 # puesto que no hay módulos fijos en contraposición a cargables.
-#: src/ats-tool/gnunet-ats.c:199
+#: src/ats-tool/gnunet-ats.c:204
 #, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
@@ -499,91 +509,102 @@ msgstr ""
 "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:320
+#: src/ats-tool/gnunet-ats.c:328
 #, 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:339 src/namestore/gnunet-namestore.c:610
-#: src/transport/gnunet-transport.c:804
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:461
+#: src/transport/gnunet-transport.c:812
 #, c-format
 msgid "Service `%s' is not running\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/ats-tool/gnunet-ats.c:349 src/transport/gnunet-transport.c:810
+#: src/ats-tool/gnunet-ats.c:357 src/transport/gnunet-transport.c:819
 #, 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:357
+#: src/ats-tool/gnunet-ats.c:365
 #, 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:373 src/ats-tool/gnunet-ats.c:392
-#: src/ats-tool/gnunet-ats.c:409 src/ats-tool/gnunet-ats.c:434
+#: src/ats-tool/gnunet-ats.c:381 src/ats-tool/gnunet-ats.c:400
+#: src/ats-tool/gnunet-ats.c:417 src/ats-tool/gnunet-ats.c:455
 #, 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:382 src/ats-tool/gnunet-ats.c:399
+#: src/ats-tool/gnunet-ats.c:390 src/ats-tool/gnunet-ats.c:407
 #, 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:427
-msgid "Type required\n"
+#: src/ats-tool/gnunet-ats.c:425
+#, fuzzy, c-format
+msgid "No preference type given!\n"
+msgstr "establece las preferencias para el par dado"
+
+#: src/ats-tool/gnunet-ats.c:430
+#, fuzzy, c-format
+msgid "No peer given!\n"
+msgstr "No se han proporcionado opciones\n"
+
+#: src/ats-tool/gnunet-ats.c:448
+#, fuzzy
+msgid "Valid type required\n"
 msgstr "Tipo requerido\n"
 
-#: src/ats-tool/gnunet-ats.c:484
+#: src/ats-tool/gnunet-ats.c:506
 msgid "get list of active addresses currently used"
 msgstr "obtiene una lista de direcciones activas usadas actualmente"
 
-#: src/ats-tool/gnunet-ats.c:487
+#: src/ats-tool/gnunet-ats.c:509
 msgid "get list of all active addresses"
 msgstr "obtiene una lista de todas las direcciones activas"
 
-#: src/ats-tool/gnunet-ats.c:490
+#: src/ats-tool/gnunet-ats.c:512
 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:493
+#: src/ats-tool/gnunet-ats.c:515
 msgid "monitor mode"
 msgstr "modo de monitorización"
 
-#: src/ats-tool/gnunet-ats.c:496
+#: src/ats-tool/gnunet-ats.c:518
 msgid "set preference for the given peer"
 msgstr "establece las preferencias para el par dado"
 
-#: src/ats-tool/gnunet-ats.c:499
+#: src/ats-tool/gnunet-ats.c:521
 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:502
+#: src/ats-tool/gnunet-ats.c:524
 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:505
+#: src/ats-tool/gnunet-ats.c:527
 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:508
+#: src/ats-tool/gnunet-ats.c:530
 msgid "preference value"
 msgstr "valor de preferencia"
 
 # Miguel: ¿Algo menos forzado que "salida prolija"?
-#: src/ats-tool/gnunet-ats.c:511
+#: src/ats-tool/gnunet-ats.c:533
 msgid "verbose output (include ATS address properties)"
 msgstr "salida prolija (incluye las propiedades de direcciones del ATS)"
 
-#: src/ats-tool/gnunet-ats.c:520
+#: src/ats-tool/gnunet-ats.c:542
 msgid "Print information about ATS state"
 msgstr "Imprime información acerca del estado del ATS"
 
@@ -592,55 +613,25 @@ msgstr "Imprime información acerca del estado del ATS"
 msgid "Loading block plugin `%s'\n"
 msgstr "Cargando el módulo de bloques «%s»\n"
 
-#: src/consensus/gnunet-consensus.c:350
+#: src/consensus/gnunet-consensus.c:352
 msgid "number of peers in consensus"
 msgstr "número de pares en consenso"
 
-#: src/consensus/gnunet-consensus.c:353
+#: src/consensus/gnunet-consensus.c:355
 msgid "how many peers receive one value?"
 msgstr "¿cuántos pares reciben un valor?"
 
-#: src/consensus/gnunet-consensus.c:356
+#: src/consensus/gnunet-consensus.c:358 src/set/gnunet-set-profiler.c:287
+#: src/set/gnunet-set-profiler.c:290 src/set/gnunet-set-profiler.c:293
 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:359
+#: src/consensus/gnunet-consensus.c:361
 msgid "consensus timeout"
 msgstr "plazo de consenso"
 
-# Miguel: Conjunto resta.
-#: src/consensus/gnunet-consensus-ibf.c:217
-msgid "number of element in set A-B"
-msgstr "número de elementos en el conjunto A-B"
-
-#: src/consensus/gnunet-consensus-ibf.c:220
-msgid "number of element in set B-A"
-msgstr "número de elementos en el conjunto B-A"
-
-# Miguel: Conjunto unión.
-#: src/consensus/gnunet-consensus-ibf.c:223
-msgid "number of common elements in A and B"
-msgstr "número de elementos comunes en A y B"
-
-# Miguel: "hash" me tiene un poco frito. ¿Existe alguna traducción buena?
-#: src/consensus/gnunet-consensus-ibf.c:226
-msgid "hash num"
-msgstr "número de hash"
-
-#: src/consensus/gnunet-consensus-ibf.c:229
-msgid "ibf size"
-msgstr "tamaño ibf"
-
-#: 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:175
-msgid "number of peers to start"
-msgstr "número de pares para empezar"
-
 #: src/core/core_api.c:752
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
@@ -665,14 +656,14 @@ msgstr "Conectado a"
 msgid "Disconnected from"
 msgstr "Desconectado de"
 
-#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:176
-#: src/peerinfo-tool/gnunet-peerinfo.c:643
+#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:170
+#: src/peerinfo-tool/gnunet-peerinfo.c:653
 #, 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:204 src/transport/gnunet-transport.c:996
+#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:1004
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
@@ -681,28 +672,16 @@ msgstr ""
 msgid "Print information about connected peers."
 msgstr "Imprime información sobre los pares conectados."
 
-#: src/core/gnunet-service-core.c:110
-#, fuzzy, c-format
-msgid "Failed to read or generate private key: %s\n"
-msgstr "Se produjo un fallo al leer o crear una clave de zona privada\n"
-
-#: src/core/gnunet-service-core.c:124
-#, c-format
-msgid "Core service of `%4s' ready.\n"
-msgstr "El servicio principal de «%4s» está listo.\n"
-
-#: src/core/gnunet-service-core.c:150
+#: src/core/gnunet-service-core.c:105
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 "Al servicio principal le falta la configuración de la clave de máquina "
 "(HOSTKEY).  Saliendo.\n"
 
-#: src/core/gnunet-service-core.c:164
-#: 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. "
-"Saliendo.\n"
+#: src/core/gnunet-service-core.c:126
+#, c-format
+msgid "Core service of `%4s' ready.\n"
+msgstr "El servicio principal de «%4s» está listo.\n"
 
 #: src/core/gnunet-service-core_clients.c:370
 msgid "# send requests dropped (disconnected)"
@@ -745,26 +724,26 @@ msgstr "# mapas de tipos recibidos"
 #: src/core/gnunet-service-core_kx.c:803
 #, c-format
 msgid ""
-"Ephemeral key message rejected as its validity range does not match our "
-"system time (%llu not in [%llu,%llu]).\n"
+"Ephemeral key message from peer `%s' rejected as its validity range does not "
+"match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:818
+#: src/core/gnunet-service-core_kx.c:819
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr "# mensajes «SET_KEY» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:921
-#: src/transport/gnunet-service-transport_validation.c:915
+#: src/core/gnunet-service-core_kx.c:922
+#: src/transport/gnunet-service-transport_validation.c:935
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/core/gnunet-service-core_kx.c:929
+#: src/core/gnunet-service-core_kx.c:930
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/core/gnunet-service-core_kx.c:956
+#: src/core/gnunet-service-core_kx.c:957
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
@@ -773,84 +752,84 @@ msgstr ""
 "Recibido PING de «%s» para una identidad diferente: Yo soy «%s», identidad "
 "del PONG: «%s»\n"
 
-#: src/core/gnunet-service-core_kx.c:973
+#: src/core/gnunet-service-core_kx.c:974
 msgid "# PONG messages created"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:999
+#: src/core/gnunet-service-core_kx.c:1000
 msgid "# sessions terminated by timeout"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1009
+#: src/core/gnunet-service-core_kx.c:1010
 msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
 
-#: src/core/gnunet-service-core_kx.c:1066
-#: src/transport/gnunet-service-transport_validation.c:1160
+#: src/core/gnunet-service-core_kx.c:1067
+#: src/transport/gnunet-service-transport_validation.c:1226
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1072
+#: src/core/gnunet-service-core_kx.c:1073
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1078
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/core/gnunet-service-core_kx.c:1107
+#: src/core/gnunet-service-core_kx.c:1108
 msgid "# PONG messages decrypted"
 msgstr "# mensajes PONG descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1141
+#: src/core/gnunet-service-core_kx.c:1142
 msgid "# session keys confirmed via PONG"
 msgstr "# claves de sesión confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1151
+#: src/core/gnunet-service-core_kx.c:1152
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/core/gnunet-service-core_kx.c:1158
+#: src/core/gnunet-service-core_kx.c:1159
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1298
+#: src/core/gnunet-service-core_kx.c:1299
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1305
+#: src/core/gnunet-service-core_kx.c:1306
 #, 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:1308
+#: src/core/gnunet-service-core_kx.c:1309
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1351
-#: src/core/gnunet-service-core_kx.c:1376
+#: src/core/gnunet-service-core_kx.c:1352
+#: src/core/gnunet-service-core_kx.c:1377
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1363
+#: src/core/gnunet-service-core_kx.c:1364
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1404
+#: src/core/gnunet-service-core_kx.c:1405
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1412
+#: src/core/gnunet-service-core_kx.c:1413
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1443
+#: src/core/gnunet-service-core_kx.c:1444
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
@@ -875,16 +854,16 @@ 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:644
-#: src/dht/gnunet-service-dht_neighbours.c:703
+#: src/dht/gnunet-service-dht_neighbours.c:641
+#: src/dht/gnunet-service-dht_neighbours.c:700
 #: 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:2798
-#: src/transport/gnunet-service-transport_neighbours.c:3057
+#: src/transport/gnunet-service-transport_neighbours.c:2793
+#: src/transport/gnunet-service-transport_neighbours.c:3047
 msgid "# peers connected"
 msgstr "# pares conectados"
 
@@ -952,14 +931,13 @@ msgstr "Caché de datos Postgres ejecutándose\n"
 #: 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/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/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
+#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
+#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_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:608 src/include/gnunet_common.h:615
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
+#: src/include/gnunet_common.h:616 src/include/gnunet_common.h:623
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» falló en %s: %d con el error: %s\n"
@@ -1078,6 +1056,27 @@ msgstr "# peticiones «GET ZERO ANONYMITY» ejecutadas"
 msgid "# GET requests executed"
 msgstr "# peticiones «GET» ejecutadas"
 
+#: src/datastore/gnunet-datastore.c:114
+#, fuzzy, c-format
+msgid "Failed to store item: %s, aborting\n"
+msgstr "Se produjo un fallo al abrir «%s» para escritura"
+
+#: src/datastore/gnunet-datastore.c:200
+#, c-format
+msgid "Cannot use the same configuration for source and destination\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:246
+msgid ""
+"specifies the configuration to use to access an alternative datastore; will "
+"merge that datastore into our current datastore"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:255
+#, fuzzy
+msgid "Manipulate GNUnet datastore"
+msgstr "Manipular ficheros de configuración de GNUnet"
+
 #: src/datastore/gnunet-service-datastore.c:349
 msgid "# bytes expired"
 msgstr "# bytes expirados"
@@ -1087,12 +1086,12 @@ msgid "# bytes purged (low-priority)"
 msgstr "# bytes purgados (baja prioridad)"
 
 #: src/datastore/gnunet-service-datastore.c:480
-#: src/gns/gnunet-gns-helper-service-w32.c:159
+#: src/gns/gnunet-gns-helper-service-w32.c:155
 msgid "Transmission to client failed!\n"
 msgstr "¡La transmisión con el cliente ha fallado!\n"
 
 #: src/datastore/gnunet-service-datastore.c:511
-#: src/gns/gnunet-gns-helper-service-w32.c:189
+#: src/gns/gnunet-gns-helper-service-w32.c:183
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr "Apagado en proceso, abortando transmisión.\n"
 
@@ -1301,7 +1300,7 @@ msgstr ""
 "páginas de %llu bytes de tamaño)\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:1193
-#: src/namestore/plugin_namestore_sqlite.c:827
+#: src/namestore/plugin_namestore_sqlite.c:829
 msgid "Sqlite database running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
 
@@ -1357,7 +1356,7 @@ msgstr "opción para usar el demultiplexado de la DHT siempre"
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-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-download.c:328 src/fs/gnunet-publish.c:861
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:899
 msgid "be verbose (print progress information)"
@@ -1436,41 +1435,41 @@ msgstr "# peticiones «GET» inyectadas de clientes"
 msgid "# PUT requests received from clients"
 msgstr "# peticiones «PUT» recibidas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:590
+#: src/dht/gnunet-service-dht_clients.c:592
 msgid "# GET requests received from clients"
 msgstr "# peticiones «GET» recibidas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:796
+#: src/dht/gnunet-service-dht_clients.c:793
 msgid "# GET STOP requests received from clients"
 msgstr "# peticiones «GET STOP» recibidas de clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:1041
+#: src/dht/gnunet-service-dht_clients.c:1033
 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:1054
+#: src/dht/gnunet-service-dht_clients.c:1046
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 "# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) omitidas"
 
-#: src/dht/gnunet-service-dht_clients.c:1091
+#: src/dht/gnunet-service-dht_clients.c:1083
 #, 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:1114
+#: src/dht/gnunet-service-dht_clients.c:1106
 msgid "# RESULTS queued for clients"
 msgstr "# Resultados (RESULTS) encolados para clientes"
 
-#: src/dht/gnunet-service-dht_clients.c:1165
-#: src/dht/gnunet-service-dht_clients.c:1207
+#: src/dht/gnunet-service-dht_clients.c:1157
+#: src/dht/gnunet-service-dht_clients.c:1199
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 "# Respuestas (REPLIES) ignoradas para clientes (CLIENTS) (sin coincidencia)"
 
-#: src/dht/gnunet-service-dht_clients.c:1175
+#: src/dht/gnunet-service-dht_clients.c:1167
 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"
@@ -1517,26 +1516,31 @@ msgstr "# Peticiones «GET» realizadas a la caché de datos"
 msgid "# HELLOs obtained from peerinfo"
 msgstr "# «HELLO» obtenidos de «peerinfo»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:504
+#: src/dht/gnunet-service-dht_neighbours.c:501
 msgid "# Preference updates given to core"
 msgstr "# Actualizaciones de preferencias dadas al servicio principal"
 
-#: src/dht/gnunet-service-dht_neighbours.c:594
+#: src/dht/gnunet-service-dht_neighbours.c:591
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes «FIND PEER» iniciados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:737
+#: src/dht/gnunet-service-dht_neighbours.c:734
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# Mensajes encolados descartados (par desconectado)"
 
-#: src/dht/gnunet-service-dht_neighbours.c:792
+#: src/dht/gnunet-service-dht_neighbours.c:789
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes transmitidos a otros pares"
 
-#: src/dht/gnunet-service-dht_neighbours.c:830
+#: src/dht/gnunet-service-dht_neighbours.c:827
 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:859
+#, fuzzy
+msgid "# requests TTL-dropped"
+msgstr "# peticiones unidas"
+
 #: src/dht/gnunet-service-dht_neighbours.c:1052
 #: src/dht/gnunet-service-dht_neighbours.c:1086
 msgid "# Peers excluded from routing due to Bloomfilter"
@@ -1577,30 +1581,45 @@ msgstr "# Mensajes «RESULT» encolados para transmisión"
 msgid "# P2P PUT requests received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1730
+#: src/dht/gnunet-service-dht_neighbours.c:1578
+#, fuzzy
+msgid "# P2P PUT bytes received"
+msgstr "# Peticiones «PUT» P2P recibidas"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1733
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1738
+#: src/dht/gnunet-service-dht_neighbours.c:1741
 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:1829
+#: src/dht/gnunet-service-dht_neighbours.c:1832
 msgid "# P2P GET requests received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1882
+#: src/dht/gnunet-service-dht_neighbours.c:1835
+#, fuzzy
+msgid "# P2P GET bytes received"
+msgstr "# Peticiones «GET» P2P recibidas"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1888
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Peticiones «FIND PEER» P2P procesadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1896
+#: src/dht/gnunet-service-dht_neighbours.c:1902
 msgid "# P2P GET requests ONLY routed"
 msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1973
+#: src/dht/gnunet-service-dht_neighbours.c:1979
 msgid "# P2P RESULTS received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
 
+#: src/dht/gnunet-service-dht_neighbours.c:1982
+#, fuzzy
+msgid "# P2P RESULT bytes received"
+msgstr "# Resultados (RESULTS) P2P recibidos"
+
 #: src/dht/gnunet-service-dht_nse.c:59
 msgid "# Network size estimates received"
 msgstr "# Estimaciones del tamaño de red recibidas"
@@ -1671,28 +1690,28 @@ msgstr ""
 "Se produjo un fallo al convertir el nombre en UTF-8 «%s» al formato DNS "
 "IDNA: %s\n"
 
-#: src/dns/dnsstub.c:175
+#: src/dns/dnsstub.c:176
 #, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "No se pudo asociar con ningún puerto: %s\n"
 
-#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
-#: src/gns/gnunet-service-gns_resolver.c:1621
+#: src/dns/dnsstub.c:296 src/dns/dnsstub.c:384
+#: src/gns/gnunet-service-gns_resolver.c:1651
 #, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/dns/dnsstub.c:299
+#: src/dns/dnsstub.c:300
 #, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Petición DNS enviada a %s\n"
 
-#: src/dns/dnsstub.c:368
+#: src/dns/dnsstub.c:369
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr "La salida DNS configurada «%s» no funciona o no es válida.\n"
 
-#: src/dns/dnsstub.c:440
+#: src/dns/dnsstub.c:441
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr "Recibida respuesta DNS demasiado pequeña (%u bytes)"
@@ -1758,12 +1777,12 @@ msgstr "# Paquetes UDP no-DNS recibidos vía interfaz TUN"
 msgid "# DNS requests received via TUN interface"
 msgstr "# Peticiones DNS recibidas vía interfaz TUN"
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3351
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3359
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr "«%s» debe ser instalado con SUID, se niega a arrancar\n"
 
-#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3407
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3415
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "se necesita una dirección IPv4 o IPv6 válida\n"
 
@@ -1776,131 +1795,131 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr "Imprime información acerca del estado del ATS"
 
-#: src/exit/gnunet-daemon-exit.c:741
+#: src/exit/gnunet-daemon-exit.c:756
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr "Hay registros de servicios duplicados para «%s:%u»\n"
 
-#: src/exit/gnunet-daemon-exit.c:794
+#: src/exit/gnunet-daemon-exit.c:807
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr "# Bytes transmitidos vía túneles MESH"
 
-#: src/exit/gnunet-daemon-exit.c:911 src/exit/gnunet-daemon-exit.c:2343
-#: src/exit/gnunet-daemon-exit.c:2603 src/vpn/gnunet-service-vpn.c:1411
-#: src/vpn/gnunet-service-vpn.c:1812 src/vpn/gnunet-service-vpn.c:1975
+#: src/exit/gnunet-daemon-exit.c:924 src/exit/gnunet-daemon-exit.c:2349
+#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1453
+#: src/vpn/gnunet-service-vpn.c:1852 src/vpn/gnunet-service-vpn.c:2015
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:948 src/exit/gnunet-daemon-exit.c:2402
-#: src/exit/gnunet-daemon-exit.c:2662 src/vpn/gnunet-service-vpn.c:1467
-#: src/vpn/gnunet-service-vpn.c:1871 src/vpn/gnunet-service-vpn.c:2008
+#: src/exit/gnunet-daemon-exit.c:961 src/exit/gnunet-daemon-exit.c:2408
+#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1509
+#: src/vpn/gnunet-service-vpn.c:1911 src/vpn/gnunet-service-vpn.c:2048
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:988
+#: src/exit/gnunet-daemon-exit.c:1001
 msgid "# ICMP packets dropped (not allowed)"
 msgstr "# Paquetes ICMP omitidos (tipo no permitido)"
 
-#: src/exit/gnunet-daemon-exit.c:995
+#: src/exit/gnunet-daemon-exit.c:1008
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr "Paquete ICMP omitido, no hay información de conexiones coincidente\n"
 
-#: src/exit/gnunet-daemon-exit.c:1072
+#: src/exit/gnunet-daemon-exit.c:1084
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr "Paquete UDP omitido, no hay información de conexiones coincidente\n"
 
-#: src/exit/gnunet-daemon-exit.c:1147
+#: src/exit/gnunet-daemon-exit.c:1158
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr "Paquete TCP omitido, no hay información de conexiones coincidente\n"
 
-#: src/exit/gnunet-daemon-exit.c:1200
+#: src/exit/gnunet-daemon-exit.c:1210
 msgid "# Packets received from TUN"
 msgstr "# Paquetes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1214
+#: src/exit/gnunet-daemon-exit.c:1224
 msgid "# Bytes received from TUN"
 msgstr "# Bytes recibidos de TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1240
+#: src/exit/gnunet-daemon-exit.c:1250
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr "Opciones de paquete IPv4 recibidas.  Ignoradas.\n"
 
-#: src/exit/gnunet-daemon-exit.c:1267
+#: src/exit/gnunet-daemon-exit.c:1277
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 "Recibido paquete IPv4 con cabecera «next» no soportada %u.  Ignorado.\n"
 
-#: src/exit/gnunet-daemon-exit.c:1313
+#: src/exit/gnunet-daemon-exit.c:1323
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 "Recibido paquete IPv6 con cabecera «next» no soportada %d.  Ignorado.\n"
 
-#: src/exit/gnunet-daemon-exit.c:1321
+#: src/exit/gnunet-daemon-exit.c:1331
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr "Recibido paquete de protocolo desconocido %u.  Ignorado.\n"
 
-#: src/exit/gnunet-daemon-exit.c:1703
+#: src/exit/gnunet-daemon-exit.c:1713
 msgid "# TCP packets sent via TUN"
 msgstr "# Paquetes TCP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:1814
+#: src/exit/gnunet-daemon-exit.c:1826
 msgid "# TCP service creation requests received via mesh"
 msgstr "# Peticiones de creaciones de servicio TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:1817 src/exit/gnunet-daemon-exit.c:1906
-#: src/exit/gnunet-daemon-exit.c:2026 src/exit/gnunet-daemon-exit.c:2267
-#: src/exit/gnunet-daemon-exit.c:2519 src/exit/gnunet-daemon-exit.c:2811
-#: src/exit/gnunet-daemon-exit.c:2921
+#: src/exit/gnunet-daemon-exit.c:1829 src/exit/gnunet-daemon-exit.c:1919
+#: src/exit/gnunet-daemon-exit.c:2035 src/exit/gnunet-daemon-exit.c:2273
+#: src/exit/gnunet-daemon-exit.c:2522 src/exit/gnunet-daemon-exit.c:2811
+#: src/exit/gnunet-daemon-exit.c:2918
 msgid "# Bytes received from MESH"
 msgstr "# Bytes recibidos de MESH"
 
-#: src/exit/gnunet-daemon-exit.c:1850 src/exit/gnunet-daemon-exit.c:2943
+#: src/exit/gnunet-daemon-exit.c:1861 src/exit/gnunet-daemon-exit.c:2940
 #, c-format
 msgid "No service found for %s on port %d!\n"
 msgstr "¡Ningún servicio encontrado para %s en el puerto %d!\n"
 
-#: src/exit/gnunet-daemon-exit.c:1854
+#: src/exit/gnunet-daemon-exit.c:1865
 msgid "# TCP requests dropped (no such service)"
 msgstr "# Peticiones TCP omitidas (no existe tal servicio)"
 
-#: src/exit/gnunet-daemon-exit.c:1909
+#: src/exit/gnunet-daemon-exit.c:1922
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# Peticiones de creación de salida IP por TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2029
+#: src/exit/gnunet-daemon-exit.c:2038
 msgid "# TCP data requests received via mesh"
 msgstr "# Peticiones de datos TCP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2043
+#: src/exit/gnunet-daemon-exit.c:2052
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# Peticiones de datos (DATA) TCP omitidas (no hay sesión)"
 
-#: src/exit/gnunet-daemon-exit.c:2093
+#: src/exit/gnunet-daemon-exit.c:2102
 msgid "# ICMP packets sent via TUN"
 msgstr "# Paquetes ICMP enviados vía TUN"
 
-#: src/exit/gnunet-daemon-exit.c:2270
+#: src/exit/gnunet-daemon-exit.c:2276
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# Peticiones de salida IP por ICMP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2522
+#: src/exit/gnunet-daemon-exit.c:2525
 msgid "# ICMP service requests received via mesh"
 msgstr "# Peticiones de servicio ICMP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2588 src/vpn/gnunet-service-vpn.c:1401
-#: src/vpn/gnunet-service-vpn.c:1969
+#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1443
+#: src/vpn/gnunet-service-vpn.c:2009
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr "# Paquetes ICMPv4 omitidos (imposible atravesar v6)"
 
-#: src/exit/gnunet-daemon-exit.c:2647 src/vpn/gnunet-service-vpn.c:1437
-#: src/vpn/gnunet-service-vpn.c:1449 src/vpn/gnunet-service-vpn.c:1859
+#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1479
+#: src/vpn/gnunet-service-vpn.c:1491 src/vpn/gnunet-service-vpn.c:1899
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr "# Paquetes ICMPv6 omitidos (imposible atravesar v4)"
 
-#: src/exit/gnunet-daemon-exit.c:2697
+#: src/exit/gnunet-daemon-exit.c:2700
 msgid "# UDP packets sent via TUN"
 msgstr "# Paquetes UDP enviados vía TUN"
 
@@ -1908,38 +1927,38 @@ msgstr "# Paquetes UDP enviados vía TUN"
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# Peticiones de salida IP por UDP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2924
+#: src/exit/gnunet-daemon-exit.c:2921
 msgid "# UDP service requests received via mesh"
 msgstr "# Peticiones de servicio UDP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2947
+#: src/exit/gnunet-daemon-exit.c:2944
 msgid "# UDP requests dropped (no such service)"
 msgstr "# Peticiones UDP omitidas (no existe tal servicio)"
 
-#: src/exit/gnunet-daemon-exit.c:2980
+#: src/exit/gnunet-daemon-exit.c:2977
 msgid "# Inbound MESH tunnels created"
 msgstr "# Túneles interiores MESH creados"
 
-#: src/exit/gnunet-daemon-exit.c:3209
+#: src/exit/gnunet-daemon-exit.c:3216
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 "¡No se encontraron direcciones para el nombre de máquina «%s» del servicio "
 "«%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3223 src/exit/gnunet-daemon-exit.c:3235
+#: src/exit/gnunet-daemon-exit.c:3230 src/exit/gnunet-daemon-exit.c:3242
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr "¡Servicio «%s» configurado para IPv4, pero IPv4 está deshabilitado!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3246
+#: src/exit/gnunet-daemon-exit.c:3253
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 "¡No se encontraron direcciones IP para el nombre de máquina «%s» del "
 "servicio «%s»!\n"
 
-#: src/exit/gnunet-daemon-exit.c:3364
+#: src/exit/gnunet-daemon-exit.c:3372
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
@@ -1947,7 +1966,7 @@ msgstr ""
 "Este sistema no soporta IPv4, se deshabilitarán las funciones IPv4 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3372
+#: src/exit/gnunet-daemon-exit.c:3380
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
@@ -1955,7 +1974,7 @@ msgstr ""
 "Este sistema no soporta IPv6, se deshabilitarán las funciones IPv6 aunque "
 "estén habilitadas en la configuración\n"
 
-#: src/exit/gnunet-daemon-exit.c:3379
+#: src/exit/gnunet-daemon-exit.c:3387
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
@@ -1963,7 +1982,7 @@ msgstr ""
 "No se puede habilitar salida IPv4 pero se deshabilita IPv4 sobre interfaz "
 "TUN, se usará ENABLE_IPv4=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3385
+#: src/exit/gnunet-daemon-exit.c:3393
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
@@ -1971,14 +1990,160 @@ msgstr ""
 "No se pudo habilitar la salida IPv6 pero se deshabilita IPv6 sobre interfaz "
 "TUN, se usará ENABLE_IPv6=YES\n"
 
-#: src/exit/gnunet-daemon-exit.c:3391 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3399 src/pt/gnunet-daemon-pt.c:887
 msgid "No useful service enabled.  Exiting.\n"
 msgstr "Ningún servicio útil habilitado.  Saliendo.\n"
 
-#: src/exit/gnunet-daemon-exit.c:3620
+#: src/exit/gnunet-daemon-exit.c:3647
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr "Demonio a ejecutar para obtener un nodo de salida IP para la VPN"
 
+#: src/experimentation/gnunet-daemon-experimentation.c:56
+msgid "Experimentation daemon shutting down ...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation.c:78
+msgid "Experimentation daemon starting ...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation.c:84
+#, fuzzy
+msgid "Failed to create statistics!\n"
+msgstr "Se produjo un fallo al crear los índices\n"
+
+#: src/experimentation/gnunet-daemon-experimentation.c:121
+msgid "GNUnet experimentation daemon"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:264
+#, c-format
+msgid "Experiment `%s': Experiment signature is invalid\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:271
+#, c-format
+msgid ""
+"Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
+"sec. \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:316
+#, c-format
+msgid "Experiment `%s': Issuer missing\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:321
+#, c-format
+msgid "Experiment `%s': Issuer invalid\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:327
+#, c-format
+msgid "Experiment `%s': Issuer not accepted!\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:336
+#, c-format
+msgid "Experiment `%s': Version missing or invalid \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:344
+#, c-format
+msgid "Experiment `%s': Required capabilities missing \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:349
+#, c-format
+msgid "Experiment `%s': Required capabilities invalid \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:393
+#, fuzzy, c-format
+msgid "Failed to parse file `%s'\n"
+msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:419
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:444
+msgid ""
+"No valid experiment issuers configured! Set value to peer id of issuer! "
+"Exit...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:429
+#, fuzzy, c-format
+msgid "Invalid value `%s'\n"
+msgstr "Parámetro no válido «%s»\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:453
+#, fuzzy, c-format
+msgid "Invalid public key `%s'\n"
+msgstr "Parámetro no válido «%s»\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:460
+#, fuzzy, c-format
+msgid "Found issuer for public key `%s'\n"
+msgstr "Encontrados %u módulos de transporte: «%s»\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:463
+#, fuzzy, c-format
+msgid "No issuer for public key `%s'\n"
+msgstr "No se han encontrado ficheros en «%s»\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:480
+#, fuzzy, c-format
+msgid "Cannot read experiments file `%s'\n"
+msgstr "No se pudo leer la lista de amigos «%s»\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:220
+#, c-format
+msgid "Cannot send message to peer `%s' for experiment `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:290
+#, c-format
+msgid "Sending experimentation request to peer %s\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:421
+#, c-format
+msgid "Added peer `%s' as active node\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:848
+#, fuzzy, c-format
+msgid "Connected to peer %s\n"
+msgstr "Conectado a %s.\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:877
+#, fuzzy, c-format
+msgid "Disconnected from peer %s\n"
+msgstr "Desconectado de %s\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1057
+#, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:109
+#, c-format
+msgid "Peer `%s' did not respond to request for experiment `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:144
+#, fuzzy, c-format
+msgid "Starting inbound experiment `%s' with peer `%s'\n"
+msgstr "Iniciando el servicio %s para el par «%4s»\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:278
+#, fuzzy, c-format
+msgid "Starting outbound experiment `%s' with peer `%s'\n"
+msgstr "Iniciando el servicio %s para el par «%4s»\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:296
+#, fuzzy, c-format
+msgid "Received %s message from peer %s for experiment `%s'\n"
+msgstr "Recibido último mensaje para %s\n"
+
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr "# reconocimientos enviados por framentos"
@@ -2048,31 +2213,24 @@ msgstr "¡Lectura corta leyendo del fichero «%s»!"
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1520
-#, c-format
-msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
-msgstr ""
-"Se produjo un fallo al recuperar el espacio de nombres «%s», no se pudo "
-"retomar la operación de publicación.\n"
-
-#: src/fs/fs_api.c:1562
+#: src/fs/fs_api.c:1557
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr "Fallo mientras se reiniciaba la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1578
+#: src/fs/fs_api.c:1571
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:2229
+#: src/fs/fs_api.c:2228
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de publicación «%s»: "
 "%s\n"
 
-#: src/fs/fs_api.c:2239
+#: src/fs/fs_api.c:2238
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de desindexado «%s»: %s\n"
@@ -2087,7 +2245,7 @@ msgstr "Se produjo un fallo al retomar la sub-descarga «%s»: %s\n"
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2897
+#: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2896
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
@@ -2100,13 +2258,13 @@ msgstr ""
 "Se produjo un fallo al retomar la sub-descarga «%s»: no se pudo abrir el "
 "fichero «%s»\n"
 
-#: src/fs/fs_api.c:2841
+#: src/fs/fs_api.c:2840
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 "No se pudo retomar la búsqueda en ejecución, se retomará como una búsqueda "
 "en pausa\n"
 
-#: src/fs/fs_api.c:2935
+#: src/fs/fs_api.c:2934
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2117,7 +2275,7 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "No hay coincidencia con «MAGIC».  Esto no es un directorio GNUnet.\n"
 
-#: src/fs/fs_download.c:321
+#: src/fs/fs_download.c:322
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
@@ -2125,24 +2283,24 @@ msgstr ""
 "Las descargas recursivas de directorios mayores de 4GB no están soportadas "
 "en sistemas de 32 bits\n"
 
-#: src/fs/fs_download.c:341
+#: src/fs/fs_download.c:342
 msgid "Directory too large for system address space\n"
 msgstr ""
 "Directorio demasiado grande para el espacio de direccionamiento del sistema\n"
 
-#: src/fs/fs_download.c:507 src/fs/fs_download.c:519
+#: src/fs/fs_download.c:508 src/fs/fs_download.c:520
 #, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Se produjo un fallo al abrir «%s» para escritura"
 
-#: src/fs/fs_download.c:888
+#: src/fs/fs_download.c:889
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 "Se produjo un fallo al crear el directorio para la descarga recursiva de "
 "«%s»\n"
 
-#: src/fs/fs_download.c:970
+#: src/fs/fs_download.c:971
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
@@ -2151,33 +2309,33 @@ msgstr ""
 "Error interno o URI de descarga defectuosa (se esperaban %u bytes a "
 "profundidad %u y desplazamiento %llu/%llu, se obtuvieron %u bytes)"
 
-#: src/fs/fs_download.c:996
+#: src/fs/fs_download.c:997
 msgid "internal error decrypting content"
 msgstr "error interno descifrando el contenido"
 
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1020
 #, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Descarga fallida: no se pudo abrir el fichero «%s»: %s"
 
-#: src/fs/fs_download.c:1029
+#: src/fs/fs_download.c:1030
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr ""
 "Se produjo un fallo al buscar en el desplazamiento %llu del fichero «%s»: %s"
 
-#: src/fs/fs_download.c:1038
+#: src/fs/fs_download.c:1039
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr ""
 "Se produjo un fallo al escribir el bloque de %u bytes en el desplazamiento "
 "%llu del fichero «%s»: %s"
 
-#: src/fs/fs_download.c:1136
+#: src/fs/fs_download.c:1137
 msgid "internal error decoding tree"
 msgstr "error interno decodificando árbol"
 
-#: src/fs/fs_download.c:1927
+#: src/fs/fs_download.c:1928
 msgid "Invalid URI"
 msgstr "URI no válida"
 
@@ -2217,150 +2375,110 @@ msgstr "Se produjo un fallo al conectar con el servicio «%s».\n"
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "No se encontró el tipo MIME «%s» en la lista de extensiones.\n"
 
-#: src/fs/fs_namespace.c:104
+#: src/fs/fs_namespace.c:207
 #, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Se produjo un fallo al abrir «%s» para escritura: %s\n"
 
-#: src/fs/fs_namespace.c:126 src/fs/fs_namespace.c:214
+#: src/fs/fs_namespace.c:229
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 
-#: src/fs/fs_namespace.c:240 src/fs/fs_namespace.c:284
-#: src/fs/fs_namespace.c:330
-msgid "Can't determine where namespace directory is\n"
-msgstr ""
-
-#: src/fs/fs_namespace.c:252
-#, c-format
-msgid "Failed to create or read private key for namespace `%s'\n"
-msgstr ""
-"Se produjo un fallo al crear o leer la clave privada para el espacio de "
-"nombres «%s»\n"
-
-#: src/fs/fs_namespace.c:296
+#: src/fs/fs_namespace.c:320
 #, fuzzy, c-format
-msgid "Failed to read private key for namespace `%s'\n"
-msgstr ""
-"Se produjo un fallo al crear o leer la clave privada para el espacio de "
-"nombres «%s»\n"
-
-#: src/fs/fs_namespace.c:467
-#, c-format
-msgid "Failed to read namespace private key file `%s', deleting it!\n"
-msgstr ""
-"Se produjo un fallo al leer el fichero de la clave privada del espacio de "
-"nombres «%s», ¡borrándolo!\n"
-
-#: src/fs/fs_namespace.c:659
-#, fuzzy
-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:311
-msgid "Internal error."
-msgstr "Error interno."
+msgid "Failed to read `%s': %s\n"
+msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 
-#: src/fs/fs_namespace.c:747
+#: src/fs/fs_namespace.c:466
 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
+#: src/fs/fs_pseudonym.c:327 src/fs/fs_pseudonym.c:631
 #, 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
+#: src/fs/fs_pseudonym.c:463 src/fs/fs_pseudonym.c:489
+#: src/fs/fs_pseudonym.c:627
 msgid "no-name"
 msgstr "sin nombre"
 
-#: src/fs/fs_pseudonym.c:1182 src/util/crypto_ecc.c:1014
-#, 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
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:399
 #, c-format
 msgid "Publishing failed: %s"
 msgstr "Publicación fallida: %s"
 
-#: src/fs/fs_publish.c:622 src/fs/fs_publish.c:639 src/fs/fs_publish.c:678
-#: src/fs/fs_publish.c:698 src/fs/fs_publish.c:723 src/fs/fs_publish.c:863
+#: src/fs/fs_publish.c:624 src/fs/fs_publish.c:641 src/fs/fs_publish.c:680
+#: src/fs/fs_publish.c:700 src/fs/fs_publish.c:725 src/fs/fs_publish.c:865
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "No se pudo indexar el fichero «%s»: %s.  Se intentará insertar.\n"
 
-#: src/fs/fs_publish.c:624
+#: src/fs/fs_publish.c:626
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 "expiración del plazo en la petición de inicio de indexado (index-start) al "
 "servicio «fs»"
 
-#: src/fs/fs_publish.c:636
+#: src/fs/fs_publish.c:638
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: src/fs/fs_publish.c:679
+#: src/fs/fs_publish.c:681
 msgid "failed to compute hash"
 msgstr "se produjo un fallo al calcular el hash"
 
-#: src/fs/fs_publish.c:699
+#: src/fs/fs_publish.c:701
 msgid "filename too long"
 msgstr "nombre de fichero demasiado largo"
 
-#: src/fs/fs_publish.c:724
+#: src/fs/fs_publish.c:726
 msgid "could not connect to `fs' service"
 msgstr "no se pudo conectar con el servicio «fs»"
 
-#: src/fs/fs_publish.c:747
+#: src/fs/fs_publish.c:749
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/fs/fs_publish.c:812
+#: src/fs/fs_publish.c:814
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "La subida recursiva falló en «%s»: %s"
 
-#: src/fs/fs_publish.c:818
+#: src/fs/fs_publish.c:820
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Subida recursiva fallida: %s"
 
-#: src/fs/fs_publish.c:864
+#: src/fs/fs_publish.c:866
 msgid "needs to be an actual file"
 msgstr "tiene que ser un fichero de verdad"
 
-#: src/fs/fs_publish.c:1090
+#: src/fs/fs_publish.c:1092
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr "Espacio insuficiente para publicar: %s"
 
-#: src/fs/fs_publish.c:1161
+#: src/fs/fs_publish.c:1164
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr "Reservando espacio para %u entradas y %llu bytes para publicación\n"
 
-#: src/fs/fs_publish_ksk.c:273
+#: src/fs/fs_publish_ksk.c:219
 msgid "Could not connect to datastore."
 msgstr "No se pudo conectar con el almacén de datos."
 
-#: src/fs/fs_search.c:742
+#: src/fs/fs_search.c:815
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Se produjo un fallo al procesar la URI: %s\n"
 
-#: src/fs/fs_search.c:800
+#: src/fs/fs_search.c:874
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2405,97 +2523,89 @@ msgstr "Error interno escaneando «%s».\n"
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Se produjo un fallo al eliminar el KBlock: %s\n"
 
-#: src/fs/fs_unindex.c:566 src/fs/fs_unindex.c:633
+#: src/fs/fs_unindex.c:565 src/fs/fs_unindex.c:628
 msgid "Failed to connect to `datastore' service."
 msgstr ""
 "Se produjo un fallo al conectar con el servicio de almacenamiento de datos "
 "(datastore)."
 
-#: src/fs/fs_unindex.c:646
+#: src/fs/fs_unindex.c:641
 msgid "Failed to open file for unindexing."
 msgstr "Se produjo un fallo al abrir el fichero para desindexado."
 
-#: src/fs/fs_unindex.c:680
+#: src/fs/fs_unindex.c:675
 msgid "Failed to compute hash of file."
 msgstr "Se produjo un fallo al calcular el hash del fichero."
 
 # Cadena erronea, corregida en SVN.
-#: src/fs/fs_uri.c:221
+#: src/fs/fs_uri.c:222
 #, no-c-format
 msgid "`%' must be followed by HEX number"
 msgstr "'%' debe ser seguido por un número hexadecimal"
 
-#: src/fs/fs_uri.c:280
+#: src/fs/fs_uri.c:281
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "URI KSK mal formada (no debe empezar ni terminar con «+»)"
 
-#: src/fs/fs_uri.c:298
+#: src/fs/fs_uri.c:299
 msgid "`++' not allowed in KSK URI"
 msgstr "«++» no permitido en URI KSK"
 
-#: src/fs/fs_uri.c:305
+#: src/fs/fs_uri.c:306
 msgid "Quotes not balanced in KSK URI"
 msgstr "Comillas no cerradas en URI KSK"
 
-#: src/fs/fs_uri.c:375
+#: src/fs/fs_uri.c:376
 msgid "Malformed SKS URI"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:418 src/fs/fs_uri.c:433
+#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
 msgid "Malformed CHK URI"
 msgstr "URI CHK mal formada"
 
-#: src/fs/fs_uri.c:563 src/fs/fs_uri.c:578 src/fs/fs_uri.c:588
-#: src/fs/fs_uri.c:616
+#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
+#: src/fs/fs_uri.c:629
 msgid "SKS URI malformed"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:611
 msgid "SKS URI malformed (could not decode public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
 
-#: src/fs/fs_uri.c:604
+#: src/fs/fs_uri.c:617
 msgid "SKS URI malformed (could not find signature)"
 msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
 
-#: src/fs/fs_uri.c:610
+#: src/fs/fs_uri.c:623
 msgid "SKS URI malformed (could not decode signature)"
 msgstr "URI SKS mal formada (no se pudo decodificar la firma)"
 
-#: src/fs/fs_uri.c:623
+#: src/fs/fs_uri.c:636
 msgid "SKS URI malformed (could not parse expiration time)"
 msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
 
-#: src/fs/fs_uri.c:635
+#: src/fs/fs_uri.c:648
 msgid "SKS URI malformed (signature failed validation)"
 msgstr "URI SKS mal formada (se produjo un fallo al validar la firma)"
 
-#: src/fs/fs_uri.c:673
+#: src/fs/fs_uri.c:686
 msgid "Unrecognized URI type"
 msgstr "Tipo de URI no reconocido"
 
-#: src/fs/fs_uri.c:898 src/util/crypto_ecc.c:941
+#: src/fs/fs_uri.c:911
 msgid "Lacking key configuration settings.\n"
 msgstr "Falta configuración sobre las opciones de claves.\n"
 
-#: src/fs/fs_uri.c:904 src/util/crypto_ecc.c:947
+#: src/fs/fs_uri.c:917
 #, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "No se pudo acceder al fichero de clave de máquina «%s».\n"
 
-#: src/fs/fs_uri.c:945
-msgid "identifier is NULL!"
-msgstr ""
-
-#: src/fs/fs_uri.c:951
-msgid "identifier has zero length!"
-msgstr ""
-
-#: src/fs/fs_uri.c:1122 src/fs/fs_uri.c:1149
+#: src/fs/fs_uri.c:1099 src/fs/fs_uri.c:1126
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/fs/fs_uri.c:1155
+#: src/fs/fs_uri.c:1132
 msgid "Number of double-quotes not balanced!\n"
 msgstr "¡Número de comillas dobles no balanceado!\n"
 
@@ -2533,26 +2643,26 @@ msgstr ""
 "Debes especificar uno y solo un nombre de directorio para publicación "
 "automática.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:302
-#: src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:310
+#: src/fs/gnunet-publish.c:808
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del emisor"
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:687
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:812
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 "deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:690
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:815
 msgid "do not use libextractor to add keywords or metadata"
 msgstr "no usar libextractor para añadir palabras clave o metadatos"
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:714
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:839
 msgid "specify the priority of the content"
 msgstr "especificar la prioridad del contenido"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:327
-#: src/fs/gnunet-publish.c:721
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:329
+#: src/fs/gnunet-publish.c:846
 msgid "set the desired replication LEVEL"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
@@ -2625,7 +2735,7 @@ msgstr "Error descargando: %s.\n"
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Finalizada descarga «%s» (%s/s).\n"
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:195
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:273
 #: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
@@ -2635,7 +2745,7 @@ msgstr "Estado inesperado: %d\n"
 msgid "You need to specify a URI argument.\n"
 msgstr "Tiene que especificar una URI como parámetro.\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:629
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:652
 #, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Se produjo un fallo al procesar la URI: %s\n"
@@ -2648,7 +2758,7 @@ msgstr "Sólo URI «CHK» o «LOC» soportadas.\n"
 msgid "Target filename must be specified.\n"
 msgstr "El nombre de fichero de destino debe ser especificado.\n"
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:607
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:781
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2718,26 +2828,22 @@ msgstr ""
 "ejecuta una batería de pruebas para medir el rendimiento de la compartición "
 "de ficheros"
 
-#: src/fs/gnunet-pseudonym.c:178 src/statistics/gnunet-statistics.c:283
-#, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Parámetro no válido «%s»\n"
-
-#: src/fs/gnunet-pseudonym.c:273 src/fs/gnunet-pseudonym.c:280
-#: src/fs/gnunet-pseudonym.c:282
+#: src/fs/gnunet-pseudonym.c:227 src/fs/gnunet-pseudonym.c:229
 #, c-format
 msgid "Option `%s' ignored\n"
 msgstr "Opción «%s» ignorada\n"
 
-#: src/fs/gnunet-pseudonym.c:305
-msgid "create or advertise namespace NAME"
-msgstr "crear o anunciar un nombre de espacio de nombres (NAME)"
+#: src/fs/gnunet-pseudonym.c:265 src/statistics/gnunet-statistics.c:305
+#, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Parámetro no válido «%s»\n"
 
-#: src/fs/gnunet-pseudonym.c:308
-msgid "delete namespace NAME "
-msgstr "borrar un nombre de espacio de nombres (NAME)"
+#: src/fs/gnunet-pseudonym.c:313
+#, fuzzy
+msgid "advertise namespace NAME"
+msgstr "crear o anunciar un nombre de espacio de nombres (NAME)"
 
-#: src/fs/gnunet-pseudonym.c:311
+#: src/fs/gnunet-pseudonym.c:316
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
 "multiple times)"
@@ -2745,155 +2851,149 @@ msgstr ""
 "añade una palabra clave adicional para el anuncio (esta opción puede ser "
 "especificada varias veces)"
 
-#: src/fs/gnunet-pseudonym.c:315 src/fs/gnunet-publish.c:702
+#: src/fs/gnunet-pseudonym.c:320 src/fs/gnunet-publish.c:827
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "establece los metadatos para el tipo TYPE dado al valor VALUE dado"
 
-#: src/fs/gnunet-pseudonym.c:318
-msgid "print names of local namespaces"
-msgstr "imprime los nombres de los espacios de nombres locales"
-
-#: src/fs/gnunet-pseudonym.c:321
+#: src/fs/gnunet-pseudonym.c:323
 msgid "use the given PRIORITY for the advertisments"
 msgstr "usa la prioridad (PRIORITY) dada para los anuncios"
 
-#: src/fs/gnunet-pseudonym.c:324
+#: src/fs/gnunet-pseudonym.c:326
 msgid "do not print names of remote namespaces"
 msgstr "no imprime los nombres de los espacios de nombres remotos"
 
-#: src/fs/gnunet-pseudonym.c:330
+#: src/fs/gnunet-pseudonym.c:332
 msgid "specify ID of the root of the namespace"
 msgstr "especifica la identificación (ID) del espacio de nombres raíz"
 
-#: src/fs/gnunet-pseudonym.c:333
+#: src/fs/gnunet-pseudonym.c:335
 msgid "change rating of namespace ID by VALUE"
 msgstr "cambia la valoración del espacio de nombres «ID» al valor «VALUE»"
 
-#: src/fs/gnunet-pseudonym.c:345
+#: src/fs/gnunet-pseudonym.c:347
 msgid "Manage GNUnet pseudonyms."
 msgstr "Gestionar seudónimos de GNUnet."
 
-#: src/fs/gnunet-publish.c:152
+#: src/fs/gnunet-publish.c:230
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr "Publicando «%s» en %llu/%llu (%s restantes)\n"
 
-#: src/fs/gnunet-publish.c:159
+#: src/fs/gnunet-publish.c:237
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Error publicando: %s.\n"
 
-#: src/fs/gnunet-publish.c:169
+#: src/fs/gnunet-publish.c:247
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr "Publicación «%s» finalizada.\n"
 
-#: src/fs/gnunet-publish.c:173
+#: src/fs/gnunet-publish.c:251
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr "La URI es «%s».\n"
 
-#: src/fs/gnunet-publish.c:192
+#: src/fs/gnunet-publish.c:270
 msgid "Cleanup after abort complete.\n"
 msgstr "Limpieza completada\n"
 
-#: src/fs/gnunet-publish.c:310
+#: src/fs/gnunet-publish.c:388
 #, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Metadatos para el fichero «%s» (%s)\n"
 
-#: src/fs/gnunet-publish.c:312
+#: src/fs/gnunet-publish.c:390
 #, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Palabras clave para el fichero «%s» (%s)\n"
 
-#: src/fs/gnunet-publish.c:363 src/fs/gnunet-publish.c:617
-#, c-format
-msgid "Failed to create namespace `%s' (illegal filename?)\n"
-msgstr ""
-"Se produjo un fallo al crear el espacio de nombres «%s» (¿nombre de fichero "
-"ilegal?).\n"
-
-#: src/fs/gnunet-publish.c:438
+#: src/fs/gnunet-publish.c:529
 msgid "Could not publish\n"
 msgstr "No se pudo publicar\n"
 
-#: src/fs/gnunet-publish.c:465
+#: src/fs/gnunet-publish.c:552
 msgid "Could not start publishing.\n"
 msgstr "No se pudo empezar a publicar.\n"
 
-#: src/fs/gnunet-publish.c:496
+#: src/fs/gnunet-publish.c:585
 #, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/fs/gnunet-publish.c:498
+#: src/fs/gnunet-publish.c:587
 #, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Escaneando fichero «%s».\n"
 
-#: src/fs/gnunet-publish.c:503
+#: src/fs/gnunet-publish.c:592
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr "Hubo un problema procesando el fichero «%s», omitiéndolo.\n"
 
-#: src/fs/gnunet-publish.c:508
+#: src/fs/gnunet-publish.c:597
 msgid "Preprocessing complete.\n"
 msgstr "Preprocesado completo.\n"
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:601
 #, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Extracción de metadatos del fichero «%s» completa.\n"
 
-#: src/fs/gnunet-publish.c:516
+#: src/fs/gnunet-publish.c:605
 msgid "Meta data extraction has finished.\n"
 msgstr "La extracción de metadatos ha finalizado.\n"
 
-#: src/fs/gnunet-publish.c:523
+#: src/fs/gnunet-publish.c:612
 msgid "Internal error scanning directory.\n"
 msgstr "Error interno escaneando directorio.\n"
 
-#: src/fs/gnunet-publish.c:557
+#: src/fs/gnunet-publish.c:643
+#, fuzzy, c-format
+msgid "Selected pseudonym `%s' unknown\n"
+msgstr "Espacio de nombres «%s» desconocido.\n"
+
+#: src/fs/gnunet-publish.c:669
+#, c-format
+msgid "Failed to access `%s': %s\n"
+msgstr "Se produjo un fallo al acceder «%s»: %s\n"
+
+#: src/fs/gnunet-publish.c:681
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
+msgstr ""
+"Se produjo un fallo al iniciar el meta-escáner de directorios.  ¿Está "
+"«gnunet-helper-publish-fs» instalado?\n"
+
+#: src/fs/gnunet-publish.c:731
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "¡No se pueden extraer metadatos de una URI!\n"
 
-#: src/fs/gnunet-publish.c:564
+#: src/fs/gnunet-publish.c:738
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Se debe especificar uno y solo un nombre de fichero para insertar.\n"
 
-#: src/fs/gnunet-publish.c:570
+#: src/fs/gnunet-publish.c:744
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "No se puede especificar una URI y un nombre de fichero.\n"
 
-#: src/fs/gnunet-publish.c:578 src/vpn/gnunet-vpn.c:213
+#: src/fs/gnunet-publish.c:752 src/vpn/gnunet-vpn.c:213
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n"
 
-#: src/fs/gnunet-publish.c:588 src/fs/gnunet-publish.c:595
-#: src/transport/gnunet-transport.c:834 src/transport/gnunet-transport.c:864
+#: src/fs/gnunet-publish.c:762 src/fs/gnunet-publish.c:769
+#: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "La opción «%s» no tiene sentido sin la opción «%s».\n"
 
-#: src/fs/gnunet-publish.c:650
-#, c-format
-msgid "Failed to access `%s': %s\n"
-msgstr "Se produjo un fallo al acceder «%s»: %s\n"
-
-#: src/fs/gnunet-publish.c:662
-msgid ""
-"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
-"installed?\n"
-msgstr ""
-"Se produjo un fallo al iniciar el meta-escáner de directorios.  ¿Está "
-"«gnunet-helper-publish-fs» instalado?\n"
-
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:819
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2901,7 +3001,7 @@ msgstr ""
 "imprimir una lista de las palabras clave extraídas que podrían ser usadas, "
 "pero sin realizar la subida"
 
-#: src/fs/gnunet-publish.c:698
+#: src/fs/gnunet-publish.c:823
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2909,7 +3009,7 @@ msgstr ""
 "añadir una palabra clave adicional para el fichero del nivel más alto o el "
 "directorio (esta opción puede ser especificada varias veces)"
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:830
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2917,7 +3017,7 @@ msgstr ""
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "cifrada en la base de datos de GNUnet)"
 
-#: src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-publish.c:835
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2925,13 +3025,13 @@ msgstr ""
 "especificar la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio de nombres únicamente)"
 
-#: src/fs/gnunet-publish.c:718
+#: src/fs/gnunet-publish.c:843
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publicar los ficheros bajo el seudónimo NAME (coloca el fichero en el "
 "espacio)"
 
-#: src/fs/gnunet-publish.c:724
+#: src/fs/gnunet-publish.c:849
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
@@ -2939,14 +3039,14 @@ msgstr ""
 "únicamente simular el proceso pero no publicar nada realmente (útil para "
 "calcular URI)"
 
-#: src/fs/gnunet-publish.c:728
+#: src/fs/gnunet-publish.c:853
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "establece la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:732
+#: src/fs/gnunet-publish.c:857
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -2954,7 +3054,7 @@ msgstr ""
 "URI a ser publicada (puede ser usado en vez de pasar un fichero para añadir "
 "claves con el fichero con la URI respectiva)"
 
-#: src/fs/gnunet-publish.c:748
+#: src/fs/gnunet-publish.c:873
 msgid "Publish a file or directory on GNUnet"
 msgstr "Publicar un fichero o un directorio en GNUnet"
 
@@ -2998,11 +3098,11 @@ msgstr "Buscar en GNUnet ficheros que han sido publicados en GNUnet"
 msgid "# running average P2P latency (ms)"
 msgstr "# latencia media de P2P en ejecución (ms)"
 
-#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:538
+#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
 msgid "# Loopback routes suppressed"
 msgstr "# Rutas en bucle local eliminadas"
 
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:291
+#: src/fs/gnunet-service-fs.c:640 src/hostlist/gnunet-daemon-hostlist.c:291
 #: src/topology/gnunet-daemon-topology.c:1314
 #: src/topology/gnunet-daemon-topology.c:1321
 #, c-format
@@ -3158,6 +3258,37 @@ msgid "# client searches updated (merged content seen list)"
 msgstr ""
 "# búsquedas de clientes actualizadas (contenido unido visto en la lista)"
 
+#: src/fs/gnunet-service-fs_mesh_client.c:475
+#, fuzzy
+msgid "# replies received via mesh"
+msgstr "# respuestas recibidas vía «stream»"
+
+#: src/fs/gnunet-service-fs_mesh_client.c:489
+#, fuzzy
+msgid "# replies received via mesh dropped"
+msgstr "# respuestas recibidas omitidas vía «stream»"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:259
+#, fuzzy
+msgid "# Blocks transferred via mesh"
+msgstr "# Bloques transferidos vía «stream»"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:412
+#, fuzzy
+msgid "# queries received via mesh"
+msgstr "# consultas recibidas vía «stream»"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:455
+#, fuzzy
+msgid "# mesh client connections rejected"
+msgstr "# conexiones de clientes «stream» rechazadas"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:461
+#: src/fs/gnunet-service-fs_mesh_server.c:501
+#, fuzzy
+msgid "# mesh connections active"
+msgstr "# conexiones «stream» activas"
+
 #: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
 msgstr "# retardo de retransmisión medio (ms)"
@@ -3234,8 +3365,9 @@ msgid "# Replies received from DHT"
 msgstr "# Respuestas recibidas de la DHT"
 
 #: src/fs/gnunet-service-fs_pr.c:1189
-msgid "# Replies received from STREAM"
-msgstr "# Respuestas recibidas de «STREAM»"
+#, fuzzy
+msgid "# Replies received from MESH"
+msgstr "# Respuestas recibidas de la DHT"
 
 #: src/fs/gnunet-service-fs_pr.c:1241
 #, c-format
@@ -3301,31 +3433,6 @@ msgstr "# Mensajes «GAP PUT» recibidos"
 msgid "time required, content pushing disabled"
 msgstr "se requiere tiempo, publicación de contenido deshabilitada"
 
-#: src/fs/gnunet-service-fs_stream.c:777
-msgid "# replies received via stream"
-msgstr "# respuestas recibidas vía «stream»"
-
-#: src/fs/gnunet-service-fs_stream.c:791
-msgid "# replies received via stream dropped"
-msgstr "# respuestas recibidas omitidas vía «stream»"
-
-#: src/fs/gnunet-service-fs_stream.c:930
-#: src/fs/gnunet-service-fs_stream.c:1384
-msgid "# stream connections active"
-msgstr "# conexiones «stream» activas"
-
-#: src/fs/gnunet-service-fs_stream.c:1166
-msgid "# Blocks transferred via stream"
-msgstr "# Bloques transferidos vía «stream»"
-
-#: src/fs/gnunet-service-fs_stream.c:1326
-msgid "# queries received via stream"
-msgstr "# consultas recibidas vía «stream»"
-
-#: src/fs/gnunet-service-fs_stream.c:1376
-msgid "# stream client connections rejected"
-msgstr "# conexiones de clientes «stream» rechazadas"
-
 #: src/fs/gnunet-unindex.c:89
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
@@ -3379,26 +3486,26 @@ msgstr "Recibida petición DNS mal formada de %s\n"
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Recibida petición DNS no soportada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:679
+#: src/gns/gnunet-dns2gns.c:681
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr "IP del resolvedor recursivo DNS a usar (requerido)"
 
-#: src/gns/gnunet-dns2gns.c:682
+#: src/gns/gnunet-dns2gns.c:684
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr "Sufijo DNS autoritativo a usar (opcional); predeterminado: zkey.eu"
 
-#: src/gns/gnunet-dns2gns.c:685
+#: src/gns/gnunet-dns2gns.c:687
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 "Sufijo FCFS autoritativo a usar (opcional); predeterminado: fcfs.zkey.eu"
 
-#: src/gns/gnunet-dns2gns.c:688
+#: src/gns/gnunet-dns2gns.c:690
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 "Puerto UDP en el que escuchar para peticiones DNS entrantes; predeterminado: "
 "53"
 
-#: src/gns/gnunet-dns2gns.c:701
+#: src/gns/gnunet-dns2gns.c:703
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)"
 
@@ -3454,42 +3561,42 @@ msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
 msgid "Found existing name `%s' for the given key\n"
 msgstr "Encontrado nombre «%s» para la clave dada\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:586
+#: src/gns/gnunet-gns-fcfsd.c:587
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr "Encontrados %u registros para el dominio «%s»\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:648
+#: src/gns/gnunet-gns-fcfsd.c:649
 #, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:664
+#: src/gns/gnunet-gns-fcfsd.c:665
 #, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:700
+#: src/gns/gnunet-gns-fcfsd.c:701
 msgid "Domain name must not contain `.'\n"
 msgstr "El nombre de dominio no puede contener «.»\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:708
+#: src/gns/gnunet-gns-fcfsd.c:709
 msgid "Domain name must not contain `+'\n"
 msgstr "El nombre de dominio no puede contener «+»\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:912 src/namestore/gnunet-namestore.c:364
+#: src/gns/gnunet-gns-fcfsd.c:913 src/namestore/gnunet-namestore.c:492
 msgid "Failed to read or create private zone key\n"
 msgstr "Se produjo un fallo al leer o crear una clave de zona privada\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:922 src/namestore/gnunet-namestore.c:375
+#: src/gns/gnunet-gns-fcfsd.c:923 src/namestore/gnunet-namestore.c:503
 msgid "Failed to connect to namestore\n"
 msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:938 src/gns/gnunet-gns-proxy.c:2857
+#: src/gns/gnunet-gns-fcfsd.c:939 src/gns/gnunet-gns-proxy.c:2857
 msgid "Failed to start HTTP server\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:972
+#: src/gns/gnunet-gns-fcfsd.c:973
 msgid "GNUnet GNS first come first serve registration service"
 msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
 
@@ -3515,97 +3622,102 @@ msgstr "fichero pem para usar como autoridad de certificación (CA)"
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
-#: src/gns/gnunet-service-gns.c:486
+#: src/gns/gnunet-service-gns.c:497
 #, c-format
 msgid "Records for name `%s' in zone %s too large to fit into DHT"
 msgstr ""
 "Los registros para el nombre «%s» en la zona %s son demasiado grandes para "
 "entrar en la DHT"
 
-#: src/gns/gnunet-service-gns.c:1216
+#: src/gns/gnunet-service-gns.c:1225
 msgid "Failed to connect to the namestore!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/gns/gnunet-service-gns.c:1277
+#: src/gns/gnunet-service-gns.c:1286
 msgid "Could not connect to DHT!\n"
 msgstr "¡No se pudo conectar a la DHT!\n"
 
-#: src/gns/gnunet-service-gns.c:1288
+#: src/gns/gnunet-service-gns.c:1297
 msgid "Unable to initialize resolver!\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:3439
+#: src/gns/gnunet-service-gns_resolver.c:3446
 #, c-format
 msgid "Not a GADS TLD: `%s'\n"
 msgstr "No es un TLD GADS: «%s»\n"
 
-#: src/hello/gnunet-hello.c:119
+#: src/hello/gnunet-hello.c:123
 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:125
+#: src/hello/gnunet-hello.c:129
 #, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr "Error accediendo al fichero «%s»: %s\n"
 
-#: src/hello/gnunet-hello.c:133
+#: src/hello/gnunet-hello.c:137
 #, 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:140
+#: src/hello/gnunet-hello.c:144
 #, 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:150 src/hello/gnunet-hello.c:179
+#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183
 #, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Error abriendo fichero «%s»: %s\n"
 
-#: src/hello/gnunet-hello.c:166
+#: src/hello/gnunet-hello.c:170
 #, 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:191
+#: src/hello/gnunet-hello.c:195
 #, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "Error escribiendo «HELLO» al fichero «%s»: %s\n"
 
-#: src/hello/hello.c:936
+#: src/hello/gnunet-hello.c:203
+#, c-format
+msgid "Modified %u addresses \n"
+msgstr ""
+
+#: src/hello/hello.c:945
 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:945
+#: src/hello/hello.c:954
 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:955
+#: src/hello/hello.c:964
 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:965
+#: src/hello/hello.c:974
 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:982
+#: src/hello/hello.c:991
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/hello/hello.c:991
+#: src/hello/hello.c:1000
 #, 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:1010
+#: src/hello/hello.c:1019
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
@@ -3665,8 +3777,8 @@ msgstr "# «HELLO» válidos descargados de servidores de listas de máquinas"
 #: 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:1056
-#: src/transport/plugin_transport_http_client.c:1071
+#: src/transport/plugin_transport_http_client.c:1063
+#: src/transport/plugin_transport_http_client.c:1078
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
@@ -3815,9 +3927,9 @@ msgid "expired addresses encountered"
 msgstr "direcciones expiradas encontradas"
 
 #: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
-#: src/peerinfo-tool/gnunet-peerinfo.c:348
-#: src/peerinfo-tool/gnunet-peerinfo.c:418
-#: src/peerinfo-tool/gnunet-peerinfo.c:489
+#: src/peerinfo-tool/gnunet-peerinfo.c:358
+#: src/peerinfo-tool/gnunet-peerinfo.c:428
+#: src/peerinfo-tool/gnunet-peerinfo.c:499
 #: src/topology/gnunet-daemon-topology.c:918
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
@@ -3878,8 +3990,8 @@ 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:560 src/peerinfo-tool/gnunet-peerinfo.c:649
-#: src/transport/gnunet-service-transport.c:661
+#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:659
+#: src/transport/gnunet-service-transport.c:785
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
@@ -3911,6 +4023,85 @@ 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/identity/gnunet-identity.c:135
+#, fuzzy, c-format
+msgid "Failed to create ego: %s\n"
+msgstr "Se produjo un fallo al crear la página para «%s»\n"
+
+#: src/identity/gnunet-identity.c:237
+msgid "create ego NAME"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:240
+#, fuzzy
+msgid "delete ego NAME "
+msgstr "borrar un nombre de espacio de nombres (NAME)"
+
+#: src/identity/gnunet-identity.c:243
+#, fuzzy
+msgid "display all egos"
+msgstr "mostrar registros"
+
+# Miguel: Aquí he dejado monitorización porque esto es
+# del servicio de traducción de direcciones.
+#: src/identity/gnunet-identity.c:246
+#, fuzzy
+msgid "run in monitor mode egos"
+msgstr "modo de monitorización"
+
+#: src/identity/gnunet-identity.c:255
+msgid "Maintain egos"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:336
+msgid "no default known"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:357
+msgid "default configured, but ego unknown (internal error)"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:434
+#: src/identity/gnunet-service-identity.c:665
+#: src/identity/gnunet-service-identity.c:773
+#, fuzzy, c-format
+msgid "Failed to write subsystem default identifier map to `%s'.\n"
+msgstr ""
+"Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
+
+#: src/identity/gnunet-service-identity.c:441
+msgid "Unknown ego specified for service (internal error)"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:511
+msgid "identifier already in use for another ego"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:642
+#, fuzzy
+msgid "target name already exists"
+msgstr "El registro ya existía en el almacén de nombres"
+
+#: src/identity/gnunet-service-identity.c:681
+#: src/identity/gnunet-service-identity.c:790
+msgid "no matching ego found"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:824
+#, fuzzy, c-format
+msgid "Failed to parse ego information in `%s'\n"
+msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
+
+#: src/identity/gnunet-service-identity.c:897
+#, fuzzy, c-format
+msgid "Failed to parse subsystem identity configuration file `%s'\n"
+msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
+
+#: src/identity/gnunet-service-identity.c:909
+#, fuzzy, c-format
+msgid "Failed to create directory `%s' for storing egos\n"
+msgstr "Se produjo un fallo al leer el directorio «%s»\n"
+
 #: src/integration-tests/connection_watchdog.c:990
 #, c-format
 msgid "Transport plugin: `%s' port %llu\n"
@@ -3931,44 +4122,32 @@ msgstr ""
 msgid "help text"
 msgstr "texto de ayuda"
 
-#: src/mesh/gnunet-mesh.c:211
+#: src/mesh/gnunet-mesh.c:205
 msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr ""
 "proveer información acerca de todos los túneles (de forma continua) SIN "
 "IMPLEMENTAR"
 
-#: src/mesh/gnunet-mesh.c:214
+#: src/mesh/gnunet-mesh.c:208
 msgid "provide information about a particular tunnel"
 msgstr "proveer información acerca de un túnel en particular"
 
-#: src/mesh/gnunet-mesh.c:224
+#: src/mesh/gnunet-mesh.c:218
 msgid "Print information about mesh tunnels and peers."
 msgstr "Imprimir información acerca de tuneles mesh y pares."
 
-#: src/mesh/gnunet-service-mesh.c:7966 src/mesh/gnunet-service-mesh-new.c:4649
+#: src/mesh/gnunet-service-mesh.c:5640
 msgid "Wrong CORE service\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
-#: src/mesh/gnunet-service-mesh.c:8179 src/mesh/gnunet-service-mesh-new.c:4790
-#, 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: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:4860
-#: src/mesh/gnunet-service-mesh-new.c:4872
-#: src/mesh/gnunet-service-mesh-new.c:4884
-#: src/mesh/gnunet-service-mesh-new.c:4896
-#: src/mesh/gnunet-service-mesh-new.c:4908
-#: src/mesh/gnunet-service-mesh-new.c:4920 src/nse/gnunet-service-nse.c:1500
-#: src/nse/gnunet-service-nse.c:1518
-#: 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/mesh/gnunet-service-mesh.c:5780 src/mesh/gnunet-service-mesh.c:5792
+#: src/mesh/gnunet-service-mesh.c:5804 src/mesh/gnunet-service-mesh.c:5816
+#: src/mesh/gnunet-service-mesh.c:5828 src/mesh/gnunet-service-mesh.c:5840
+#: src/nse/gnunet-service-nse.c:1425 src/nse/gnunet-service-nse.c:1443
+#: src/regex/gnunet-daemon-regexprofiler.c:270
+#: src/regex/gnunet-daemon-regexprofiler.c:282
+#: src/regex/gnunet-daemon-regexprofiler.c:294
+#: src/regex/gnunet-daemon-regexprofiler.c:307
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
@@ -3976,10 +4155,8 @@ msgstr ""
 "El servicio %s carece de opciones de configuración de clave (%s).  "
 "Saliendo.\n"
 
-#: 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:4932
-#: src/mesh/gnunet-service-mesh-new.c:4942
-#: src/mesh/gnunet-service-mesh-new.c:4953
+#: src/mesh/gnunet-service-mesh.c:5852 src/mesh/gnunet-service-mesh.c:5862
+#: src/mesh/gnunet-service-mesh.c:5887
 #, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -3997,252 +4174,203 @@ msgstr "Intentando usar el fichero «%s» para la configuración de MySQL.\n"
 msgid "Could not access file `%s': %s\n"
 msgstr "No se pudo acceder al fichero «%s»: %s\n"
 
-#: src/namestore/gnunet-namestore.c:212
+#: src/namestore/gnunet-namestore.c:250
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr "No se pudo añadir el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:243
+#: src/namestore/gnunet-namestore.c:281
 #, c-format
 msgid "Deleting record failed: %s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:304
+#: src/namestore/gnunet-namestore.c:342
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr "\tRegistro corrupto o no soportado del tipo %u\n"
 
-#: src/namestore/gnunet-namestore.c:320
+#: src/namestore/gnunet-namestore.c:358
 msgid "for at least"
 msgstr "al menos por"
 
-#: src/namestore/gnunet-namestore.c:321
+#: src/namestore/gnunet-namestore.c:359
 msgid "until"
 msgstr "hasta"
 
-#: src/namestore/gnunet-namestore.c:356
+#: src/namestore/gnunet-namestore.c:475
 #, c-format
-msgid "No options given\n"
-msgstr "No se han proporcionado opciones\n"
+msgid "Using default zone file `%s'\n"
+msgstr "Usando el fichero de zonas predeterminado «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:386
+#: src/namestore/gnunet-namestore.c:484
 #, c-format
-msgid "Unsupported type `%s'\n"
-msgstr "Tipo no soportado «%s»\n"
+msgid "No options given\n"
+msgstr "No se han proporcionado opciones\n"
 
-#: src/namestore/gnunet-namestore.c:394 src/namestore/gnunet-namestore.c:418
-#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:477
-#: src/namestore/gnunet-namestore.c:518
+#: src/namestore/gnunet-namestore.c:513 src/namestore/gnunet-namestore.c:522
+#: src/namestore/gnunet-namestore.c:539 src/namestore/gnunet-namestore.c:561
+#: src/namestore/gnunet-namestore.c:605
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:395 src/namestore/gnunet-namestore.c:419
-msgid "add/del"
-msgstr "añadir/borrar"
+#: src/namestore/gnunet-namestore.c:514 src/namestore/gnunet-namestore.c:523
+#: src/namestore/gnunet-namestore.c:540 src/namestore/gnunet-namestore.c:562
+msgid "add"
+msgstr "añadir"
+
+#: src/namestore/gnunet-namestore.c:531
+#, c-format
+msgid "Unsupported type `%s'\n"
+msgstr "Tipo no soportado «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:408
+#: src/namestore/gnunet-namestore.c:551
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "Valor «%s» no válido para el tipo de registro «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:446
+#: src/namestore/gnunet-namestore.c:587
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:455
-#, c-format
-msgid ""
-"Deletion requires either absolute time, or no time at all. Got relative time "
-"`%s' instead.\n"
-msgstr ""
-"El borrado requiere o tiempo absoluto, o ningún tiempo. Tomado tiempo "
-"relativo «%s» en su defecto.\n"
-
-#: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
-#: src/namestore/gnunet-namestore.c:497
-msgid "add"
-msgstr "añadir"
-
-#: src/namestore/gnunet-namestore.c:496
-#, c-format
-msgid "No valid expiration time for operation `%s'\n"
-msgstr "Tiempo de expiración no válido para la operación «%s»\n"
-
-#: src/namestore/gnunet-namestore.c:519
+#: src/namestore/gnunet-namestore.c:606
 msgid "del"
 msgstr "borrar"
 
-#: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:701
+#: src/namestore/gnunet-namestore.c:649
+#: src/peerinfo-tool/gnunet-peerinfo.c:711
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:625
-#, c-format
-msgid "Using default zone file `%s'\n"
-msgstr "Usando el fichero de zonas predeterminado «%s»\n"
-
-#: src/namestore/gnunet-namestore.c:677
+#: src/namestore/gnunet-namestore.c:727
 msgid "add record"
 msgstr "añadir registro"
 
-#: src/namestore/gnunet-namestore.c:680
+#: src/namestore/gnunet-namestore.c:730
 msgid "delete record"
 msgstr "borrar registro"
 
-#: src/namestore/gnunet-namestore.c:683
+#: src/namestore/gnunet-namestore.c:733
 msgid "display records"
 msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore.c:686
+#: src/namestore/gnunet-namestore.c:736
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 "tiempo de expiración del registro a usar (únicamente para añadir), nunca "
 "(\"never\") es posible"
 
-#: src/namestore/gnunet-namestore.c:689
+#: src/namestore/gnunet-namestore.c:739
+#, fuzzy
+msgid "monitor changes in the namestore"
+msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
+
+#: src/namestore/gnunet-namestore.c:742
 msgid "name of the record to add/delete/display"
 msgstr "nombre del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:692
+#: src/namestore/gnunet-namestore.c:745
 msgid "type of the record to add/delete/display"
 msgstr "tipo del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:695
+#: src/namestore/gnunet-namestore.c:748
 msgid "URI to import into our zone"
 msgstr "URI a importar a nuestra zona"
 
-#: src/namestore/gnunet-namestore.c:698
+#: src/namestore/gnunet-namestore.c:751
 msgid "value of the record to add/delete"
 msgstr "valor del registro a añadir/borrar"
 
-#: src/namestore/gnunet-namestore.c:701
+#: src/namestore/gnunet-namestore.c:754
 msgid "create or list public record"
 msgstr "crear o listar registros públicos"
 
-#: src/namestore/gnunet-namestore.c:704
+#: src/namestore/gnunet-namestore.c:757
 msgid "create or list non-authority record"
 msgstr "crear o listar registros sin-autoridad"
 
-#: src/namestore/gnunet-namestore.c:707
+#: src/namestore/gnunet-namestore.c:760
 msgid "filename with the zone key"
 msgstr "nombre del fichero con la clave de zona"
 
-#: src/namestore/gnunet-namestore.c:718
+#: src/namestore/gnunet-namestore.c:771
 msgid "GNUnet zone manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
 
-#: src/namestore/gnunet-service-namestore.c:241
-#: src/namestore/gnunet-service-namestore.c:257
+#: src/namestore/gnunet-service-namestore.c:300
+#: src/namestore/gnunet-service-namestore.c:318
 #, c-format
 msgid "Failed to write zone key to file `%s': %s\n"
 msgstr "Se produjo un fallo al escribir la clave de zona al fichero «%s»: %s\n"
 
-#: src/namestore/gnunet-service-namestore.c:243
+#: src/namestore/gnunet-service-namestore.c:302
 msgid "file exists but reading key failed"
 msgstr "el fichero existe, pero no se pudo leer la clave"
 
-#: src/namestore/gnunet-service-namestore.c:259
+#: src/namestore/gnunet-service-namestore.c:320
 msgid "file exists with different key"
 msgstr "el fichero existe con diferente clave"
 
-# Miguel: "Failed to find" lo he traducido por "No se pudo encontrar"
-# puesto que es mas claro que "fallar en la búsqueda".
-#: src/namestore/gnunet-service-namestore.c:1557
-msgid "Failed to find record to remove\n"
-msgstr "No se pudo encontrar el registro a borrar\n"
-
-#: src/namestore/gnunet-service-namestore.c:2172
-#, c-format
-msgid "Could not parse zone key file `%s'\n"
-msgstr "No se pudo procesar el fichero de clave de zona «%s»\n"
-
-#: src/namestore/gnunet-service-namestore.c:2262
+#: src/namestore/gnunet-service-namestore.c:2127
 msgid "No directory to load zonefiles specified in configuration\n"
 msgstr ""
 "Ningún directorio del que cargar ficheros de zona especificado en la "
 "configuración\n"
 
-#: src/namestore/gnunet-service-namestore.c:2272
+#: src/namestore/gnunet-service-namestore.c:2137
 #, c-format
 msgid "Creating directory `%s' for zone files failed!\n"
 msgstr ""
 "¡Se produjo un fallo creando el directorio «%s» para ficheros de zonas!\n"
 
-#: src/namestore/namestore_api.c:345
+#: src/namestore/namestore_api.c:346
 msgid "Namestore failed to add record"
 msgstr "El almacén de nombres no pudo añadir el registro"
 
-#: src/namestore/namestore_api.c:371
+#: src/namestore/namestore_api.c:372
 msgid "Namestore failed to add record\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/namestore/namestore_api.c:415
-msgid "Failed to create new signature"
-msgstr "Se produjo un fallo al crear una nueva firma"
-
-#: src/namestore/namestore_api.c:419
-msgid "Failed to put new set of records in database"
-msgstr ""
-"Se produjo un fallo al insertar un nuevo conjunto de registros en la base de "
-"datos"
-
-#: src/namestore/namestore_api.c:423
-msgid "Failed to remove records from database"
-msgstr "Se produjo un fallo al borrar registros de la base de datos"
-
-#: src/namestore/namestore_api.c:427
-msgid "Failed to access database"
-msgstr "Se produjo un fallo al acceder a la base de datos"
-
-#: src/namestore/namestore_api.c:431
-msgid "unknown internal error in namestore"
-msgstr "error interno desconocido en el almacén de nombres"
-
-#: src/namestore/namestore_api.c:436
-msgid "Protocol error"
-msgstr "Error de protocolo"
-
-#: src/namestore/namestore_common.c:532 src/namestore/namestore_common.c:672
+#: src/namestore/namestore_api_common.c:532
+#: src/namestore/namestore_api_common.c:672
 #, c-format
 msgid "Unsupported record type %d\n"
 msgstr "Tipo de registro %d no soportado\n"
 
-#: src/namestore/namestore_common.c:539
+#: src/namestore/namestore_api_common.c:539
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "No se pudo procesar la dirección IPv4 «%s»\n"
 
-#: src/namestore/namestore_common.c:562
+#: src/namestore/namestore_api_common.c:562
 #, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "No se pudo procesar el registro SOA «%s»\n"
 
-#: src/namestore/namestore_common.c:585
+#: src/namestore/namestore_api_common.c:585
 #, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "No se pudo procesar el registro MX «%s»\n"
 
-#: src/namestore/namestore_common.c:603
+#: src/namestore/namestore_api_common.c:603
 #, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "No se pudo procesar dirección IPv4 «%s»\n"
 
-#: src/namestore/namestore_common.c:616
+#: src/namestore/namestore_api_common.c:616
 #, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "No se pudo procesar el registro PKEY «%s»\n"
 
-#: src/namestore/namestore_common.c:637
+#: src/namestore/namestore_api_common.c:637
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
 
-#: src/namestore/namestore_common.c:663
+#: src/namestore/namestore_api_common.c:663
 #, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
@@ -4403,20 +4531,15 @@ msgstr "retraso entre rondas"
 msgid "Measure quality and performance of the NSE service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/nse/gnunet-service-nse.c:1419
-#, 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:1433
+msgid "Invalid work requirement for NSE service. Exiting.\n"
+msgstr "Requisitos de trabajo no válidos para el servicio NSE. Saliendo.\n"
+
+#: src/nse/gnunet-service-nse.c:1472
 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:1508
-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:215
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
@@ -4427,16 +4550,16 @@ msgstr "Eliminando dirección de transporte «%s»\n"
 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:370
+#: src/peerinfo/gnunet-service-peerinfo.c:372
 #, 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:445
+#: src/peerinfo/gnunet-service-peerinfo.c:450
 msgid "# peers known"
 msgstr "# pares conocidos"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:481
+#: src/peerinfo/gnunet-service-peerinfo.c:486
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -4444,22 +4567,22 @@ msgstr ""
 "El fichero «%s» en el directorio «%s» no sigue la convención de nombres. "
 "Eliminado.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:633
+#: src/peerinfo/gnunet-service-peerinfo.c:639
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:638
+#: src/peerinfo/gnunet-service-peerinfo.c:644
 #, 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:970
+#: src/peerinfo/gnunet-service-peerinfo.c:979
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1250
+#: src/peerinfo/gnunet-service-peerinfo.c:1269
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr "Importando HELLO de «%s»\n"
@@ -4498,101 +4621,106 @@ msgstr ""
 msgid "Could not connect to `%s' service.\n"
 msgstr "No se pudo conectar al servicio %s.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Par «%s»\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:427
+#: src/peerinfo-tool/gnunet-peerinfo.c:246
+#, c-format
+msgid "\tExpires: %s \t %s\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:437
 #, 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
+#: src/peerinfo-tool/gnunet-peerinfo.c:445
 #, 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
+#: src/peerinfo-tool/gnunet-peerinfo.c:454
 #, 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
+#: src/peerinfo-tool/gnunet-peerinfo.c:467
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:521
+#: src/peerinfo-tool/gnunet-peerinfo.c:531
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fallo añadiendo «HELLO»: %s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:659
+#: src/peerinfo-tool/gnunet-peerinfo.c:669
 #, 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:665
+#: src/peerinfo-tool/gnunet-peerinfo.c:675
 #, 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:727
+#: src/peerinfo-tool/gnunet-peerinfo.c:734
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par «%s».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:759
+#: src/peerinfo-tool/gnunet-peerinfo.c:777
 msgid "don't resolve host names"
 msgstr "no resolver nombres de máquina"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:762
+#: src/peerinfo-tool/gnunet-peerinfo.c:780
 msgid "output only the identity strings"
 msgstr "mostrar únicamente las cadenas de identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:765
+#: src/peerinfo-tool/gnunet-peerinfo.c:783
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:768
+#: src/peerinfo-tool/gnunet-peerinfo.c:786
 msgid "output our own identity only"
 msgstr "muestra únicamente nuestra propia identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:771
+#: src/peerinfo-tool/gnunet-peerinfo.c:789
 msgid "list all known peers"
 msgstr "mostrar todos los pares conocidos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:774
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:777
+#: src/peerinfo-tool/gnunet-peerinfo.c:795
 msgid "also output HELLO uri(s)"
 msgstr "también mostrar las URI de «HELLO»"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:780
+#: src/peerinfo-tool/gnunet-peerinfo.c:798
 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:791
+#: src/peerinfo-tool/gnunet-peerinfo.c:809
 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:120
+#: src/transport/gnunet-service-transport_plugins.c:123
 #, 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:124
+#: src/transport/gnunet-service-transport_plugins.c:127
 #, 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:153
+#: src/transport/gnunet-service-transport_plugins.c:157
 #, 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"
@@ -4607,79 +4735,79 @@ msgstr "«%s:%s» falló en %s:%d con error: %s"
 msgid "Unable to initialize Postgres: %s"
 msgstr "No se pudo inicializar Postgres: %s"
 
-#: src/pt/gnunet-daemon-pt.c:264
+#: src/pt/gnunet-daemon-pt.c:266
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Se produjo un fallo al empaquetar la petición DNS.  Omitiendo.\n"
 
-#: src/pt/gnunet-daemon-pt.c:270
+#: src/pt/gnunet-daemon-pt.c:272
 msgid "# DNS requests mapped to VPN"
 msgstr "# Peticiones DNS asociadas a la VPN"
 
-#: src/pt/gnunet-daemon-pt.c:323
+#: src/pt/gnunet-daemon-pt.c:325
 msgid "# DNS records modified"
 msgstr "# Registros DNS modificados"
 
-#: src/pt/gnunet-daemon-pt.c:500
+#: src/pt/gnunet-daemon-pt.c:502
 msgid "# DNS replies intercepted"
 msgstr "# Respuestas DNS interceptadas"
 
-#: src/pt/gnunet-daemon-pt.c:506
+#: src/pt/gnunet-daemon-pt.c:508
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/pt/gnunet-daemon-pt.c:602
+#: src/pt/gnunet-daemon-pt.c:604
 msgid "# DNS requests dropped (timeout)"
 msgstr "# Peticiones DNS omitidas (expiradas)"
 
-#: src/pt/gnunet-daemon-pt.c:632
+#: src/pt/gnunet-daemon-pt.c:634
 msgid "# DNS requests intercepted"
 msgstr "# Peticiones DNS interceptadas"
 
-#: src/pt/gnunet-daemon-pt.c:637
+#: src/pt/gnunet-daemon-pt.c:639
 msgid "# DNS requests dropped (DNS mesh tunnel down)"
 msgstr "# Peticiones DNS omitidas (túnel mesh DNS caído)"
 
-#: src/pt/gnunet-daemon-pt.c:645
+#: src/pt/gnunet-daemon-pt.c:647
 msgid "# DNS requests dropped (malformed)"
 msgstr "# Peticiones DNS omitidas (mal formadas)"
 
-#: src/pt/gnunet-daemon-pt.c:716
+#: src/pt/gnunet-daemon-pt.c:715
 msgid "# DNS replies received"
 msgstr "# Respuestas DNS recibidas"
 
-#: src/pt/gnunet-daemon-pt.c:730
+#: src/pt/gnunet-daemon-pt.c:729
 msgid "# DNS replies dropped (too late?)"
 msgstr "# Respuestas DNS (¿demasiado tarde?)"
 
-#: src/pt/gnunet-daemon-pt.c:748 src/pt/gnunet-daemon-pt.c:760
+#: src/pt/gnunet-daemon-pt.c:747 src/pt/gnunet-daemon-pt.c:759
 msgid "# DNS requests aborted (tunnel down)"
 msgstr "# Peticiones DNS abortadas (túnel caído)"
 
-#: src/pt/gnunet-daemon-pt.c:898 src/pt/gnunet-daemon-pt.c:907
+#: src/pt/gnunet-daemon-pt.c:901 src/pt/gnunet-daemon-pt.c:910
 #: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
 #, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Se produjo un fallo al conectar con el servicio %s.  Saliendo.\n"
 
-#: src/pt/gnunet-daemon-pt.c:976
+#: src/pt/gnunet-daemon-pt.c:977
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 "Demonio a ejecutar para realizar la traducción de protocolo IP a GNUnet"
 
-#: src/regex/gnunet-daemon-regexprofiler.c:432
+#: src/regex/gnunet-daemon-regexprofiler.c:384
 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:1247
+#: src/regex/gnunet-regex-profiler.c:1279
 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:1258
+#: src/regex/gnunet-regex-profiler.c:1290
 #, 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:1287
+#: src/regex/gnunet-regex-profiler.c:1319
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
@@ -4687,60 +4815,51 @@ msgstr ""
 "No se ha especificado una política de directorios en la línea de comandos. "
 "Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1293
+#: src/regex/gnunet-regex-profiler.c:1325
 #: 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:1300
+#: src/regex/gnunet-regex-profiler.c:1332
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/regex/gnunet-regex-profiler.c:1309
+#: src/regex/gnunet-regex-profiler.c:1341
 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:1319
-#, fuzzy
-msgid ""
-"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:1327
+#: src/regex/gnunet-regex-profiler.c:1361
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Error cargando cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1394
+#: src/regex/gnunet-regex-profiler.c:1443
 msgid "name of the file for writing statistics"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1397
+#: src/regex/gnunet-regex-profiler.c:1446
 #, fuzzy
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 "esperar «TIMEOUT» antes de considerar que una coincidencia de cadenas como "
 "fallida"
 
-#: src/regex/gnunet-regex-profiler.c:1400
+#: src/regex/gnunet-regex-profiler.c:1449
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1403
+#: src/regex/gnunet-regex-profiler.c:1452
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1406
+#: src/regex/gnunet-regex-profiler.c:1455
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1418
+#: src/regex/gnunet-regex-profiler.c:1467
 msgid "Profiler for regex"
 msgstr "Perfilador para expresiones regulares."
 
@@ -4757,6 +4876,33 @@ msgstr "longitud de la máxima compresión de rutas"
 msgid "Profiler for regex library"
 msgstr "Analizador de rendimiento para la biblioteca de expresiones regulares"
 
+# Miguel: Conjunto resta.
+#: src/set/gnunet-set-ibf-profiler.c:224
+msgid "number of element in set A-B"
+msgstr "número de elementos en el conjunto A-B"
+
+#: src/set/gnunet-set-ibf-profiler.c:227
+msgid "number of element in set B-A"
+msgstr "número de elementos en el conjunto B-A"
+
+# Miguel: Conjunto unión.
+#: src/set/gnunet-set-ibf-profiler.c:230
+msgid "number of common elements in A and B"
+msgstr "número de elementos comunes en A y B"
+
+# Miguel: "hash" me tiene un poco frito. ¿Existe alguna traducción buena?
+#: src/set/gnunet-set-ibf-profiler.c:233
+msgid "hash num"
+msgstr "número de hash"
+
+#: src/set/gnunet-set-ibf-profiler.c:236
+msgid "ibf size"
+msgstr "tamaño ibf"
+
+#: src/set/gnunet-set-profiler.c:296
+msgid "oeration to execute"
+msgstr ""
+
 #: src/statistics/gnunet-service-statistics.c:271
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
@@ -4777,70 +4923,70 @@ msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 "Se produjo un fallo al obtener las estadísticas de la máquina «%s:%llu»\n"
 
-#: src/statistics/gnunet-statistics.c:181
-#, c-format
-msgid "Trying to connect to remote host, but service `%s' is not running\n"
-msgstr ""
-"Intentando conectar con máquina remota, pero el servicio «%s» no se está "
-"ejecutando\n"
-
-#: src/statistics/gnunet-statistics.c:190
-#, c-format
-msgid "A port is required to connect to host `%s'\n"
-msgstr "Se necesita un puerto para conectar con la máquina «%s»\n"
-
-#: src/statistics/gnunet-statistics.c:196
-#, c-format
-msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
-msgstr "Un puerto debe estar entre 1 y 65534 para conectar a la máquina «%s»\n"
-
-#: src/statistics/gnunet-statistics.c:210
+#: src/statistics/gnunet-statistics.c:186
 msgid "Missing argument: subsystem \n"
 msgstr "Falta el parámetro: subsistema\n"
 
-#: src/statistics/gnunet-statistics.c:216
+#: src/statistics/gnunet-statistics.c:192
 msgid "Missing argument: name\n"
 msgstr "Falta el argumento: nombre\n"
 
-#: src/statistics/gnunet-statistics.c:247
+#: src/statistics/gnunet-statistics.c:223
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr "No se proporcionó un subsistema o un nombre\n"
 
-#: src/statistics/gnunet-statistics.c:255
+#: src/statistics/gnunet-statistics.c:231
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Se produjo un fallo al inicializar la rutina de visualización\n"
 
-#: src/statistics/gnunet-statistics.c:310
+#: src/statistics/gnunet-statistics.c:258
+#, c-format
+msgid "Trying to connect to remote host, but service `%s' is not running\n"
+msgstr ""
+"Intentando conectar con máquina remota, pero el servicio «%s» no se está "
+"ejecutando\n"
+
+#: src/statistics/gnunet-statistics.c:266
+#, c-format
+msgid "A port is required to connect to host `%s'\n"
+msgstr "Se necesita un puerto para conectar con la máquina «%s»\n"
+
+#: src/statistics/gnunet-statistics.c:273
+#, c-format
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgstr "Un puerto debe estar entre 1 y 65534 para conectar a la máquina «%s»\n"
+
+#: src/statistics/gnunet-statistics.c:331
 msgid "limit output to statistics for the given NAME"
 msgstr "limita la salida de estadísticas para el nombre (NAME) dado"
 
-#: src/statistics/gnunet-statistics.c:313
+#: src/statistics/gnunet-statistics.c:334
 msgid "make the value being set persistent"
 msgstr "hacer el valor persistente"
 
-#: src/statistics/gnunet-statistics.c:316
+#: src/statistics/gnunet-statistics.c:337
 msgid "limit output to the given SUBSYSTEM"
 msgstr "límite de salida para el subsistema (SUBSYSTEM) dado"
 
-#: src/statistics/gnunet-statistics.c:319
+#: src/statistics/gnunet-statistics.c:340
 msgid "just print the statistics value"
 msgstr "imprime el valor de las estadísticas"
 
-#: src/statistics/gnunet-statistics.c:322
+#: src/statistics/gnunet-statistics.c:343
 msgid "watch value continuously"
 msgstr "visualiza el valor continuamente"
 
-#: src/statistics/gnunet-statistics.c:325
+#: src/statistics/gnunet-statistics.c:346
 msgid "connect to remote host"
 msgstr "conectar a equipo remoto"
 
-#: src/statistics/gnunet-statistics.c:328
+#: src/statistics/gnunet-statistics.c:349
 msgid "port for remote host"
 msgstr "puerto del equipo remoto"
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:361
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
@@ -4863,12 +5009,28 @@ msgstr ""
 "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:692
+#: src/testbed/gnunet-service-testbed_cpustatus.c:727
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
+#: src/testbed/gnunet-service-testbed_peers.c:964
+#, fuzzy
+msgid "Misconfiguration (can't connect to the ARM service)"
+msgstr "¡Se produjo un fallo al conectar con el servicio dv!\n"
+
+#: src/testbed/gnunet-service-testbed_peers.c:970
+#, fuzzy
+msgid "Request doesn't fit into a message"
+msgstr "no imprime mensajes de estado"
+
+# Miguel: ¿Es mejor «ya que» que «porque» o «debido al apagado»?
+#: src/testbed/gnunet-service-testbed_peers.c:1008
+#, 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"
+
 #: src/testbed/gnunet_testbed_ll_master.c:57
 #, c-format
 msgid "Job command file not given. Exiting\n"
@@ -4917,51 +5079,51 @@ msgstr "El archivo de máquinas %s no puede leerse\n"
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1879
+#: src/testbed/testbed_api_hosts.c:1878
 #, 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:891
+#: src/testbed/testbed_api_testbed.c:802
 msgid "Linking controllers failed. Exiting"
 msgstr "Los controladores de enlazado fallaron. Saliendo"
 
-#: src/testbed/testbed_api_testbed.c:1094
+#: src/testbed/testbed_api_testbed.c:944
 #, 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:1175
+#: src/testbed/testbed_api_testbed.c:1009
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1320
+#: src/testbed/testbed_api_testbed.c:1111
 #, 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:1324
+#: src/testbed/testbed_api_testbed.c:1115
 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:1365
+#: src/testbed/testbed_api_testbed.c:1153
 msgid "Cannot start the master controller"
 msgstr "No se puede iniciar el controlador maestro"
 
-#: src/testbed/testbed_api_testbed.c:1383
+#: src/testbed/testbed_api_testbed.c:1171
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1443
+#: src/testbed/testbed_api_testbed.c:1231
 #, 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:1455
+#: src/testbed/testbed_api_testbed.c:1243
 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:1479
+#: src/testbed/testbed_api_testbed.c:1267
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 "La topología especificada debe estar soportada por la batería de pruebas"
@@ -5010,24 +5172,24 @@ msgstr "El fichero de topología necesita más pares que los dados\n"
 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:133
+#: src/testing/gnunet-testing.c:130
 #, 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:210
+#: src/testing/gnunet-testing.c:199
 msgid "create unique configuration files"
 msgstr "crear ficheros de configuración únicos"
 
-#: src/testing/gnunet-testing.c:212
+#: src/testing/gnunet-testing.c:201
 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:214
+#: src/testing/gnunet-testing.c:203
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
@@ -5035,11 +5197,11 @@ msgstr ""
 "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:216
+#: src/testing/gnunet-testing.c:205
 msgid "configuration template"
 msgstr "plantilla de configuración"
 
-#: src/testing/gnunet-testing.c:225
+#: src/testing/gnunet-testing.c:214
 msgid "Command line tool to access the testing library"
 msgstr ""
 "Herramienta de línea de comandos para acceder a la biblioteca de pruebas"
@@ -5067,17 +5229,17 @@ msgstr "El fichero de máquinas no fue encontrado: %s\n"
 msgid "Incorrect hostkey file format: %s\n"
 msgstr "El fichero de máquinas no tiene el formato correcto: %s\n"
 
-#: src/testing/testing.c:719
+#: src/testing/testing.c:722
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr "El número de clave %u no existe\n"
 
-#: src/testing/testing.c:730
+#: src/testing/testing.c:733
 #, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Error decodificando clave %u\n"
 
-#: src/testing/testing.c:1175
+#: src/testing/testing.c:1177
 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 "
@@ -5085,7 +5247,7 @@ msgstr ""
 
 # Miguel: "testbed" lo he traducido como batería de pruebas, pero
 # no es una traducción muy literal.
-#: src/testing/testing.c:1182
+#: src/testing/testing.c:1184
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
@@ -5094,36 +5256,36 @@ msgstr ""
 "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:1191
+#: src/testing/testing.c:1193
 #, 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:1211
+#: src/testing/testing.c:1209
 #, 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
+#: src/testing/testing.c:1219
 #, 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:1243
+#: src/testing/testing.c:1241
 #, 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:1343
+#: src/testing/testing.c:1341
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Se produjo un fallo al arrancar «%s»: %s\n"
 
-#: src/testing/testing.c:1709
+#: src/testing/testing.c:1707
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
@@ -5244,26 +5406,31 @@ msgstr ""
 msgid "# disconnects due to blacklist"
 msgstr "# desconexiones debido a la lista negra"
 
-#: src/transport/gnunet-service-transport.c:174
+#: src/transport/gnunet-service-transport.c:169
 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:239
+#: src/transport/gnunet-service-transport.c:235
 msgid "# bytes total received"
 msgstr "# total de bytes recibidos"
 
-#: src/transport/gnunet-service-transport.c:286
+#: src/transport/gnunet-service-transport.c:282
 msgid "# bytes payload received"
 msgstr "# bytes de «payload» recibidos"
 
-#: src/transport/gnunet-service-transport.c:642
+#: src/transport/gnunet-service-transport.c:432
+#, fuzzy, c-format
+msgid "Could not obtain a valid network for `%s' %s\n"
+msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
+
+#: src/transport/gnunet-service-transport.c:480
 #, c-format
-msgid "Transport service could not access hostkey: %s. Exiting.\n"
+msgid ""
+"Address or session unknown: failed to update properties for peer `%s' plugin "
+"`%s' address `%s' session %p\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:741
+#: src/transport/gnunet-service-transport.c:754
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 "El servicio de transporte carece de opciones de configuración de clave.  "
@@ -5350,60 +5517,77 @@ msgstr "# violaciones de la cuota de ancho de banda por otros pares"
 msgid "# ms throttling suggested"
 msgstr "# ms de impulso sugeridos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2774
+#: src/transport/gnunet-service-transport_neighbours.c:2769
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2789
-#: src/transport/gnunet-service-transport_neighbours.c:2823
+#: src/transport/gnunet-service-transport_neighbours.c:2784
+#: src/transport/gnunet-service-transport_neighbours.c:2815
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2836
+#: src/transport/gnunet-service-transport_neighbours.c:2828
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (esperando en el ATS)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2869
+#: src/transport/gnunet-service-transport_neighbours.c:2859
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3050
+#: src/transport/gnunet-service-transport_neighbours.c:3040
 msgid "# unexpected SESSION ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3105
+#: src/transport/gnunet-service-transport_neighbours.c:3093
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr "# Mensajes «SET QUOTA» ignorados (no existe tal par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3119
+#: src/transport/gnunet-service-transport_neighbours.c:3107
 msgid "# disconnects due to quota of 0"
 msgstr "# desconexiones debido a una cuota de 0"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3138
 msgid "# disconnect messages ignored (old format)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3161
+#: src/transport/gnunet-service-transport_neighbours.c:3149
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3192
+#: 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:3287
+#: 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:113
+#: src/transport/gnunet-service-transport_plugins.c:116
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr "El servicio de transporte carece de la opción «NEIGHBOUR_LIMIT».\n"
 
-#: src/transport/gnunet-service-transport_validation.c:453
+#: src/transport/gnunet-service-transport_plugins.c:170
+#: src/transport/gnunet-service-transport_plugins.c:178
+#: src/transport/gnunet-service-transport_plugins.c:186
+#: src/transport/gnunet-service-transport_plugins.c:194
+#: src/transport/gnunet-service-transport_plugins.c:202
+#: src/transport/gnunet-service-transport_plugins.c:210
+#: src/transport/gnunet-service-transport_plugins.c:218
+#: src/transport/gnunet-service-transport_plugins.c:226
+#, fuzzy, c-format
+msgid "Missing function `%s' in transport plugin for `%s'\n"
+msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
+
+#: src/transport/gnunet-service-transport_plugins.c:233
+#, fuzzy, c-format
+msgid "Did not load plugin `%s' due to missing functions\n"
+msgstr "Falló al cargar el plugin '%s' en %s:%d. Descargando plugin.\n"
+
+#: src/transport/gnunet-service-transport_validation.c:455
 msgid "# address records discarded"
 msgstr "# registros de direcciones descartados"
 
-#: src/transport/gnunet-service-transport_validation.c:515
+#: src/transport/gnunet-service-transport_validation.c:518
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
@@ -5412,40 +5596,53 @@ msgstr ""
 "No transmitiendo «%s» con «%s», mensaje demasiado grande (¡%u bytes!). Esto "
 "no debería suceder.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:564
+#: src/transport/gnunet-service-transport_validation.c:575
 msgid "# PING without HELLO messages sent"
 msgstr "# Mensajes PING sin HELLO mandados"
 
-#: src/transport/gnunet-service-transport_validation.c:651
+#: src/transport/gnunet-service-transport_validation.c:664
 msgid "# address revalidations started"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-service-transport_validation.c:910
+#: src/transport/gnunet-service-transport_validation.c:930
 msgid "# PING message for different peer received"
 msgstr "# Mensajes PING recibidos para un par diferente"
 
-#: src/transport/gnunet-service-transport_validation.c:955
+#: src/transport/gnunet-service-transport_validation.c:989
+msgid "# failed address checks during validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:999
+msgid "# successful address checks during validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1018
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr "Recibido un mensaje PING con un error de validación de «%s»\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1051
+#: src/transport/gnunet-service-transport_validation.c:1072
+#, fuzzy, c-format
+msgid "Failed to create PONG signature for peer `%s'\n"
+msgstr "Se produjo un fallo al crear la página para «%s»\n"
+
+#: src/transport/gnunet-service-transport_validation.c:1117
 msgid "# PONGs unicast via reliable transport"
 msgstr "# unicast de PONG vía transporte confiable"
 
-#: src/transport/gnunet-service-transport_validation.c:1060
+#: src/transport/gnunet-service-transport_validation.c:1126
 msgid "# PONGs multicast to all available addresses"
 msgstr "# multicast de PONG a todas las direcciones disponibles"
 
-#: src/transport/gnunet-service-transport_validation.c:1187
+#: src/transport/gnunet-service-transport_validation.c:1253
 msgid "# PONGs dropped, no matching pending validation"
 msgstr "# PONG omitidos, no hay una validación pendiente coincidente"
 
-#: src/transport/gnunet-service-transport_validation.c:1202
+#: src/transport/gnunet-service-transport_validation.c:1268
 msgid "# PONGs dropped, signature expired"
 msgstr "# Mensajes PONG omitidos, firma expirada"
 
-#: src/transport/gnunet-service-transport_validation.c:1305
+#: src/transport/gnunet-service-transport_validation.c:1374
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
@@ -5537,7 +5734,7 @@ msgstr ""
 "Se produjo un fallo al enviar una petición de conexión al servicio de "
 "transporte\n"
 
-#: src/transport/gnunet-transport.c:819
+#: src/transport/gnunet-transport.c:828
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
@@ -5546,7 +5743,7 @@ msgstr ""
 "Múltiples operaciones introducidas. Por favor, seleccione únicamente una "
 "operación: %s, %s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:825
+#: src/transport/gnunet-transport.c:834
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
@@ -5554,93 +5751,174 @@ msgstr ""
 "Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
 "%s, %s, %s, %s, %s\n"
 
-#: src/transport/gnunet-transport.c:845 src/transport/gnunet-transport.c:875
-#: src/transport/gnunet-transport.c:897 src/transport/gnunet-transport.c:936
+#: src/transport/gnunet-transport.c:854 src/transport/gnunet-transport.c:884
+#: src/transport/gnunet-transport.c:906 src/transport/gnunet-transport.c:945
 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:852 src/transport/gnunet-transport.c:882
+#: src/transport/gnunet-transport.c:861 src/transport/gnunet-transport.c:891
 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:902
+#: src/transport/gnunet-transport.c:911
 msgid "Starting to receive benchmark data\n"
 msgstr "Empezando a recibir datos de prueba\n"
 
-#: src/transport/gnunet-transport.c:987
+#: src/transport/gnunet-transport.c:995
 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:990
+#: src/transport/gnunet-transport.c:998
 msgid "connect to a peer"
 msgstr "conectar a un par"
 
-#: src/transport/gnunet-transport.c:993
+#: src/transport/gnunet-transport.c:1001
 msgid "provide information about all current connections (once)"
 msgstr "provee información sobre todas las conexiones actuales (una vez)"
 
-#: src/transport/gnunet-transport.c:999
+#: src/transport/gnunet-transport.c:1007
 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:1002
+#: src/transport/gnunet-transport.c:1010
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
-#: src/transport/gnunet-transport.c:1005
+#: src/transport/gnunet-transport.c:1013
 msgid "peer identity"
 msgstr "identidad del par"
 
-#: src/transport/gnunet-transport.c:1009
+#: src/transport/gnunet-transport.c:1017
 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:1012
+#: src/transport/gnunet-transport.c:1020
 msgid "test transport configuration (involves external server)"
 msgstr "probar configuración de transporte (requiere un servidor externo)"
 
-#: src/transport/gnunet-transport.c:1023
+#: src/transport/gnunet-transport.c:1031
 msgid "Direct access to transport service."
 msgstr "Acceso directo al servicio de transporte."
 
+#: src/transport/plugin_transport_bluetooth.c:612
+#, fuzzy
+msgid "# Bluetooth ACKs sent"
+msgstr "# ACK WLAN enviados"
+
+#: src/transport/plugin_transport_bluetooth.c:631
+#, fuzzy
+msgid "# Bluetooth messages defragmented"
+msgstr "# mensajes defragmentados"
+
+#: src/transport/plugin_transport_bluetooth.c:677
+#: src/transport/plugin_transport_bluetooth.c:727
+#: src/transport/plugin_transport_bluetooth.c:1833
+#, fuzzy
+msgid "# Bluetooth sessions allocated"
+msgstr "# sesiones WLAN alojadas"
+
+#: src/transport/plugin_transport_bluetooth.c:802
+#, fuzzy
+msgid "# Bluetooth message fragments sent"
+msgstr "# fragmentos de mensaje WLAN enviados"
+
+#: src/transport/plugin_transport_bluetooth.c:826
+#, fuzzy
+msgid "# Bluetooth messages pending (with fragmentation)"
+msgstr "# mensajes WLAN pendientes (con fragmentación)"
+
+#: src/transport/plugin_transport_bluetooth.c:934
+#: src/transport/plugin_transport_bluetooth.c:1019
+#: src/transport/plugin_transport_bluetooth.c:1835
+#, fuzzy
+msgid "# Bluetooth MAC endpoints allocated"
+msgstr "# MAC de destino WLAN alojadas"
+
+#: src/transport/plugin_transport_bluetooth.c:1214
+#, fuzzy
+msgid "# HELLO messages received via Bluetooth"
+msgstr "# mensajes HELLO recibidos vía WLAN"
+
+#: src/transport/plugin_transport_bluetooth.c:1240
+#, fuzzy
+msgid "# fragments received via Bluetooth"
+msgstr "# fragmentos recibidos vía WLAN"
+
+#: src/transport/plugin_transport_bluetooth.c:1250
+#, fuzzy
+msgid "# ACKs received via Bluetooth"
+msgstr "# ACK recibidos vía WLAN"
+
+#: src/transport/plugin_transport_bluetooth.c:1307
+#, fuzzy
+msgid "# Bluetooth DATA messages discarded due to CRC32 error"
+msgstr "# mensajes DATA WLAN descartados debido a un error en el CRC32"
+
+#: src/transport/plugin_transport_bluetooth.c:1419
+#, fuzzy
+msgid "# DATA messages received via Bluetooth"
+msgstr "# mensajes «DATA» recibidos vía WLAN"
+
+#: src/transport/plugin_transport_bluetooth.c:1454
+#, fuzzy
+msgid "# Bluetooth DATA messages processed"
+msgstr "# mensajes «DATA» WLAN procesados"
+
+#: src/transport/plugin_transport_bluetooth.c:1517
+#, fuzzy
+msgid "# HELLO beacons sent via Bluetooth"
+msgstr "# «beacons HELLO» enviados vía WLAN"
+
+#: src/transport/plugin_transport_bluetooth.c:1630
+#, fuzzy
+msgid "Bluetooth address with invalid size encountered\n"
+msgstr "Dirección WLAN con tamaño no válido encontrada\n"
+
+#: src/transport/plugin_transport_bluetooth.c:1814
+#, fuzzy, c-format
+msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
+msgstr ""
+"El ejecutable auxiliar «%s» no tiene activado el bit SUID, no se puede "
+"ejecutar el transporte WLAN\n"
+
 #: src/transport/plugin_transport_http.c:815
-#: src/transport/plugin_transport_http_server.c:2566
+#: src/transport/plugin_transport_http_server.c:2585
 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:864
-#: src/transport/plugin_transport_http_server.c:2334
+#: src/transport/plugin_transport_http_server.c:2353
 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:896
-#: src/transport/plugin_transport_http_server.c:2366 src/util/service.c:1053
+#: src/transport/plugin_transport_http_server.c:2385 src/util/service.c:1062
 #, 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:913
-#: src/transport/plugin_transport_http_server.c:2383 src/util/service.c:1070
+#: src/transport/plugin_transport_http_server.c:2402 src/util/service.c:1079
 #, 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:1018
-#: src/transport/plugin_transport_http_server.c:2494
+#: src/transport/plugin_transport_http_server.c:2513
 #, 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:1131
-#: src/transport/plugin_transport_http_server.c:2673
+#: src/transport/plugin_transport_http_server.c:2693
 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:1144
-#: src/transport/plugin_transport_http_server.c:2684
+#: src/transport/plugin_transport_http_server.c:2704
 msgid "Port is required! Fix in configuration\n"
 msgstr "¡El puerto es necesario! Corrija la configuración\n"
 
@@ -5667,7 +5945,7 @@ msgstr ""
 "configuración no es válida! ¡Asociándose a todas las direcciones!\n"
 
 #: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2774
+#: src/transport/plugin_transport_http_server.c:2819
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Usando nombre de máquina externo «%s»\n"
@@ -5676,32 +5954,32 @@ msgstr "Usando nombre de máquina externo «%s»\n"
 msgid "No external hostname configured\n"
 msgstr "No hay nombre de máquina externo configurado\n"
 
-#: src/transport/plugin_transport_http_client.c:1535
+#: src/transport/plugin_transport_http_client.c:1582
 #, 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:1666
-#: src/transport/plugin_transport_http_server.c:2898
+#: src/transport/plugin_transport_http_client.c:1713
+#: src/transport/plugin_transport_http_server.c:2943
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
-#: src/transport/plugin_transport_http_client.c:1691
-#: src/transport/plugin_transport_http_server.c:2957
+#: src/transport/plugin_transport_http_client.c:1738
+#: src/transport/plugin_transport_http_server.c:3003
 #, 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:1719
-#: src/transport/plugin_transport_http_server.c:2804
+#: src/transport/plugin_transport_http_client.c:1766
+#: src/transport/plugin_transport_http_server.c:2849
 #, 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:1352
+#: src/transport/plugin_transport_http_server.c:1368
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -5710,12 +5988,12 @@ msgstr ""
 "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:1613
+#: src/transport/plugin_transport_http_server.c:1632
 #, 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:1621
+#: src/transport/plugin_transport_http_server.c:1640
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
@@ -5723,7 +6001,7 @@ msgstr ""
 "El servidor ha alcanzado el número máximo de conexiones (%u), rechazando "
 "nueva conexión\n"
 
-#: src/transport/plugin_transport_http_server.c:1922
+#: src/transport/plugin_transport_http_server.c:1941
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
@@ -5731,52 +6009,52 @@ msgstr ""
 "¡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:1946
+#: src/transport/plugin_transport_http_server.c:1965
 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:2652
+#: src/transport/plugin_transport_http_server.c:2672
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "El soporte IPv4 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2666
+#: src/transport/plugin_transport_http_server.c:2686
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "El soporte IPv6 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2691
+#: src/transport/plugin_transport_http_server.c:2711
 #, c-format
 msgid "Using port %u\n"
 msgstr "Usando puerto %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2706
+#: src/transport/plugin_transport_http_server.c:2726
 #, 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:2716
+#: src/transport/plugin_transport_http_server.c:2736
 #, 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:2737
+#: src/transport/plugin_transport_http_server.c:2757
 #, 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:2747
+#: src/transport/plugin_transport_http_server.c:2767
 #, 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:2790
+#: src/transport/plugin_transport_http_server.c:2835
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Notificando al transporte sólo el nombre de máquina «%s»\n"
@@ -5826,87 +6104,87 @@ msgstr "# bytes enviados vía SMTP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por SMTP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:596
+#: src/transport/plugin_transport_tcp.c:627
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Longitud de dirección inesperada: %u bytes\n"
 
-#: src/transport/plugin_transport_tcp.c:772
-#: src/transport/plugin_transport_tcp.c:861
-#: src/transport/plugin_transport_tcp.c:911
-#: src/transport/plugin_transport_tcp.c:997
-#: src/transport/plugin_transport_tcp.c:1140
-#: src/transport/plugin_transport_tcp.c:1157
+#: src/transport/plugin_transport_tcp.c:836
+#: src/transport/plugin_transport_tcp.c:925
+#: src/transport/plugin_transport_tcp.c:975
+#: src/transport/plugin_transport_tcp.c:1061
+#: src/transport/plugin_transport_tcp.c:1204
+#: src/transport/plugin_transport_tcp.c:1221
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes actualmente en los buffer TCP"
 
-#: src/transport/plugin_transport_tcp.c:779
-#: src/transport/plugin_transport_tcp.c:968
-#: src/transport/plugin_transport_tcp.c:1827
-#: src/transport/plugin_transport_tcp.c:2460
+#: src/transport/plugin_transport_tcp.c:843
+#: src/transport/plugin_transport_tcp.c:1032
+#: src/transport/plugin_transport_tcp.c:2013
+#: src/transport/plugin_transport_tcp.c:2688
 msgid "# TCP sessions active"
 msgstr "# Sesiones TCP activas"
 
-#: src/transport/plugin_transport_tcp.c:865
+#: src/transport/plugin_transport_tcp.c:929
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (expirados)"
 
-#: src/transport/plugin_transport_tcp.c:914
+#: src/transport/plugin_transport_tcp.c:978
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:1001
+#: src/transport/plugin_transport_tcp.c:1065
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes descartados por TCP (desconectado)"
 
-#: src/transport/plugin_transport_tcp.c:1114
+#: src/transport/plugin_transport_tcp.c:1178
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr "Intentando enviar con una sesión no válida %p\n"
 
-#: src/transport/plugin_transport_tcp.c:1350
-#, c-format
-msgid "Address of unexpected length: %u\n"
-msgstr "Dirección de tamaño inesperado: %u\n"
+#: src/transport/plugin_transport_tcp.c:1415
+#: src/transport/plugin_transport_udp.c:1454
+msgid "# requests to create session with invalid address"
+msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:1532
 msgid "# transport-service disconnect requests for TCP"
 msgstr "# peticiones de desconexión del servicio de transporte por TCP"
 
-#: src/transport/plugin_transport_tcp.c:1868
+#: src/transport/plugin_transport_tcp.c:2063
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
 
-#: src/transport/plugin_transport_tcp.c:2037
+#: src/transport/plugin_transport_tcp.c:2246
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:2119
+#: src/transport/plugin_transport_tcp.c:2326
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
-#: src/transport/plugin_transport_tcp.c:2345 src/util/service.c:948
-#: src/util/service.c:954
+#: src/transport/plugin_transport_tcp.c:2568 src/util/service.c:957
+#: src/util/service.c:963
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 "¡Se requiere un número de puerto válido para el servicio «%s» en la "
 "configuración!\n"
 
-#: src/transport/plugin_transport_tcp.c:2359
+#: src/transport/plugin_transport_tcp.c:2582
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
 
-#: src/transport/plugin_transport_tcp.c:2448
+#: src/transport/plugin_transport_tcp.c:2675
 #, 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:2452
+#: src/transport/plugin_transport_tcp.c:2679
 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:2456
+#: src/transport/plugin_transport_tcp.c:2683
 #, 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"
@@ -5931,7 +6209,14 @@ 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:2350
+#: src/transport/plugin_transport_udp.c:1556
+#, c-format
+msgid ""
+"Trying to create session for address of unexpected length %u (should be %u "
+"or %u)\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2587
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
@@ -5940,7 +6225,7 @@ msgstr ""
 "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:2364
+#: src/transport/plugin_transport_udp.c:2601
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5951,91 +6236,91 @@ msgstr ""
 "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:2664
+#: src/transport/plugin_transport_udp.c:2901
 msgid "Failed to open UDP sockets\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:2762
+#: src/transport/plugin_transport_udp.c:2999
 #, 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:2805
+#: src/transport/plugin_transport_udp.c:3042
 #, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Dirección IPv6 no válida: «%s»\n"
 
-#: src/transport/plugin_transport_udp.c:2862
+#: src/transport/plugin_transport_udp.c:3101
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Se produjo un fallo al crear una nueva firma"
 
-#: src/transport/plugin_transport_unix.c:1427
+#: src/transport/plugin_transport_unix.c:1641
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UNIX\n"
 
-#: src/transport/plugin_transport_wlan.c:580
+#: src/transport/plugin_transport_wlan.c:610
 msgid "# WLAN ACKs sent"
 msgstr "# ACK WLAN enviados"
 
-#: src/transport/plugin_transport_wlan.c:599
+#: src/transport/plugin_transport_wlan.c:629
 msgid "# WLAN messages defragmented"
 msgstr "# mensajes WLAN defragmentados"
 
-#: src/transport/plugin_transport_wlan.c:645
-#: src/transport/plugin_transport_wlan.c:695
-#: src/transport/plugin_transport_wlan.c:1764
+#: src/transport/plugin_transport_wlan.c:675
+#: src/transport/plugin_transport_wlan.c:742
+#: src/transport/plugin_transport_wlan.c:1874
 msgid "# WLAN sessions allocated"
 msgstr "# sesiones WLAN alojadas"
 
-#: src/transport/plugin_transport_wlan.c:770
+#: src/transport/plugin_transport_wlan.c:835
 msgid "# WLAN message fragments sent"
 msgstr "# fragmentos de mensaje WLAN enviados"
 
-#: src/transport/plugin_transport_wlan.c:794
+#: src/transport/plugin_transport_wlan.c:859
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr "# mensajes WLAN pendientes (con fragmentación)"
 
-#: src/transport/plugin_transport_wlan.c:902
-#: src/transport/plugin_transport_wlan.c:987
-#: src/transport/plugin_transport_wlan.c:1766
+#: src/transport/plugin_transport_wlan.c:967
+#: src/transport/plugin_transport_wlan.c:1052
+#: src/transport/plugin_transport_wlan.c:1876
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# MAC de destino WLAN alojadas"
 
-#: src/transport/plugin_transport_wlan.c:1166
+#: src/transport/plugin_transport_wlan.c:1247
 msgid "# HELLO messages received via WLAN"
 msgstr "# mensajes HELLO recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1192
+#: src/transport/plugin_transport_wlan.c:1273
 msgid "# fragments received via WLAN"
 msgstr "# fragmentos recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1202
+#: src/transport/plugin_transport_wlan.c:1283
 msgid "# ACKs received via WLAN"
 msgstr "# ACK recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1259
+#: src/transport/plugin_transport_wlan.c:1340
 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:1364
+#: src/transport/plugin_transport_wlan.c:1460
 msgid "# DATA messages received via WLAN"
 msgstr "# mensajes «DATA» recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1399
+#: src/transport/plugin_transport_wlan.c:1495
 msgid "# WLAN DATA messages processed"
 msgstr "# mensajes «DATA» WLAN procesados"
 
-#: src/transport/plugin_transport_wlan.c:1460
+#: src/transport/plugin_transport_wlan.c:1558
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# «beacons HELLO» enviados vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1569
+#: src/transport/plugin_transport_wlan.c:1671
 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:1745
+#: src/transport/plugin_transport_wlan.c:1855
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
@@ -6080,18 +6365,18 @@ msgstr "Los metadatos serializados «%s» son mayores de lo permitido (%u>%u)"
 msgid "Metadata `%s' failed to deserialize"
 msgstr "Se produjo un fallo al deserializar los metadatos «%s»"
 
-#: src/util/client.c:276 src/util/client.c:753 src/util/service.c:984
+#: src/util/client.c:261 src/util/client.c:839 src/util/service.c:993
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n"
 
-#: src/util/client.c:280 src/util/client.c:757 src/util/service.c:988
+#: src/util/client.c:265 src/util/client.c:843 src/util/service.c:997
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr "Usando «%s» en su defecto\n"
 
-#: src/util/client.c:371
+#: src/util/client.c:357
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
@@ -6100,26 +6385,22 @@ msgstr ""
 "No se pudo determinar un nombre de máquina y un puerto válidos para el "
 "servicio «%s» a partir de la configuración.\n"
 
-#: src/util/client.c:379
+#: src/util/client.c:365
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr "Se necesita un nombre de máquina no vacío para el servicio «%s».\n"
 
-#: src/util/client.c:698
-msgid "Failure to transmit TEST request.\n"
-msgstr "Se produjo un fallo al transmitir la peticion «TEST».\n"
-
-#: src/util/client.c:898
-#, c-format
-msgid "Could not connect to service `%s', must not be running.\n"
+#: src/util/client.c:981
+#, fuzzy, c-format
+msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "No se pudo conectar con el servicio «%s», no debe estar corriendo.\n"
 
-#: src/util/client.c:912
+#: src/util/client.c:993
 #, c-format
 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:1178
+#: src/util/client.c:1259
 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 "
@@ -6187,7 +6468,7 @@ msgstr ""
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Error de sintaxis en la línea %u mientras se deserializaba\n"
 
-#: src/util/configuration.c:998
+#: src/util/configuration.c:984
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -6233,42 +6514,22 @@ msgstr ""
 "El tamaño del fichero en disco es incorrecto para este «Bloom "
 "filter» (esperado %llu, tiene %llu)\n"
 
-#: 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 ""
-"El fichero «%s» no contiene una clave privada válida (demasiado grande, %llu "
-"bytes).  Borrándolo.\n"
-
-#: 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 ""
-"El fichero «%s» no contiene una clave privada válida (falló al decodificar, "
-"%llu bytes).  Borrándolo.\n"
-
-#: src/util/crypto_ecc.c:555 src/util/crypto_ecc.c:599
-#: src/util/crypto_rsa.c:750 src/util/crypto_rsa.c:887
+#: src/util/crypto_ecc.c:534 src/util/crypto_ecc.c:572
 #, 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:560 src/util/crypto_rsa.c:892
+#: src/util/crypto_ecc.c:539
 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:603 src/util/crypto_rsa.c:754
-#: src/util/crypto_rsa.c:790
+#: src/util/crypto_ecc.c:576
 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:634 src/util/crypto_rsa.c:785
+#: src/util/crypto_ecc.c:607
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
@@ -6276,26 +6537,23 @@ msgstr ""
 "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:639
+#: src/util/crypto_ecc.c:612
 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: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:776 src/util/crypto_rsa.c:982
-msgid "interrupted by shutdown"
-msgstr "interrumpido por apagado"
+#: src/util/crypto_ecc.c:694
+#, fuzzy
+msgid "Could not load peer's private key\n"
+msgstr "No se pudo acceder a la clave de máquina.\n"
 
-#: src/util/crypto_ecc.c:787
-msgid "gnunet-ecc failed"
-msgstr "«gnunet-ecc» falló"
+#: src/util/crypto_ecc.c:756
+#, 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:1084
+#: src/util/crypto_ecc.c:836
 #, 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"
@@ -6310,40 +6568,17 @@ msgstr "Iniciando el proceso «%s» para generar entropía\n"
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt no tiene la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/crypto_rsa.c:660
-#, c-format
-msgid ""
-"File `%s' does not contain a valid private key (too long, %llu bytes).  "
-"Renaming it.\n"
-msgstr ""
-"El fichero «%s» no contiene una clave privada válida (demasiado grande, %llu "
-"bytes).  Renombrándolo.\n"
-
-#: src/util/crypto_rsa.c:993
-msgid "gnunet-rsa failed"
-msgstr "«gnunet-rsa» falló"
-
-#: src/util/crypto_rsa.c:1378
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
-
-#: src/util/disk.c:602
-#, c-format
-msgid "`%s' failed for drive `%S': %u\n"
-msgstr "«%s» falló para la unidad «%S»: %u\n"
-
-#: src/util/disk.c:1207
+#: src/util/disk.c:1149
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
 
-#: src/util/disk.c:1564 src/util/service.c:1670
+#: src/util/disk.c:1506 src/util/service.c:1679
 #, 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:2007
+#: src/util/disk.c:1953
 #, 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"
@@ -6457,17 +6692,17 @@ msgstr "valor a establecer"
 msgid "Manipulate GNUnet configuration files"
 msgstr "Manipular ficheros de configuración de GNUnet"
 
-#: src/util/gnunet-ecc.c:76
+#: src/util/gnunet-ecc.c:65
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Se produjo un fallo al abrir «%s»: %s\n"
 
-#: src/util/gnunet-ecc.c:82
+#: src/util/gnunet-ecc.c:71
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr "Generando %u claves, por favor, espere"
 
-#: src/util/gnunet-ecc.c:100
+#: src/util/gnunet-ecc.c:87
 #, c-format
 msgid ""
 "\n"
@@ -6476,57 +6711,53 @@ msgstr ""
 "\n"
 "Se produjo un fallo al escribir en «%s»: %s\n"
 
-#: src/util/gnunet-ecc.c:112
+#: src/util/gnunet-ecc.c:97
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr "¡Finalizado!\n"
 
-#: src/util/gnunet-ecc.c:115
+#: src/util/gnunet-ecc.c:100
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:138 src/util/gnunet-rsa.c:65
+#: src/util/gnunet-ecc.c:123
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr "No se ha especificado la clave de máquina en la línea de comandos\n"
 
-#: src/util/gnunet-ecc.c:193
+#: src/util/gnunet-ecc.c:178
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr "crea «COUNT» pares de claves pública-privada (para pruebas)"
 
-#: src/util/gnunet-ecc.c:196 src/util/gnunet-rsa.c:115
+#: src/util/gnunet-ecc.c:181
 msgid "print the public key in ASCII format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:199 src/util/gnunet-rsa.c:118
+#: src/util/gnunet-ecc.c:184
 msgid "print the hash of the public key in ASCII format"
 msgstr "imprime el hash de la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:202 src/util/gnunet-rsa.c:121
+#: src/util/gnunet-ecc.c:187
 msgid "print the short hash of the public key in ASCII format"
 msgstr "imprime el hash corto de la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:213
+#: src/util/gnunet-ecc.c:198
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
-#: src/util/gnunet-resolver.c:148
+#: src/util/gnunet-resolver.c:149
 msgid "perform a reverse lookup"
 msgstr "realizar una búsqueda inversa"
 
-#: src/util/gnunet-resolver.c:159
+#: src/util/gnunet-resolver.c:160
 msgid "Use build-in GNUnet stub resolver"
 msgstr "Utilizar el resolvedor interno para pruebas de GNUnet"
 
-#: src/util/gnunet-rsa.c:132
-msgid "Manipulate GNUnet private RSA key files"
-msgstr "Manipular los ficheros de clave privada RSA de GNUnet"
-
 #: src/util/gnunet-service-resolver.c:288
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
@@ -6562,19 +6793,19 @@ msgstr "No hay un manejador conocido para el subsistema «%s»\n"
 msgid "Perform default-actions for GNUnet URIs"
 msgstr "Realizar las acciones predeterminadas para URI de GNUnet"
 
-#: src/util/helper.c:322
+#: src/util/helper.c:330
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Error leyendo de «%s»: %s\n"
 
-#: src/util/helper.c:367
+#: src/util/helper.c:375
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr ""
 "Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
 "«%s»\n"
 
-#: src/util/helper.c:564
+#: src/util/helper.c:572
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Error escribiendo a «%s»: %s\n"
@@ -6584,7 +6815,7 @@ msgstr "Error escribiendo a «%s»: %s\n"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr "Imposible acortar la ruta unix «%s» manteniendo el nombre único\n"
 
-#: src/util/network.c:1331
+#: src/util/network.c:1344
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -6606,12 +6837,12 @@ msgstr ""
 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
+#: src/util/os_installation.c:769
 #, 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
+#: src/util/os_installation.c:779
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -6635,7 +6866,7 @@ msgstr "Falló «%s» para la biblioteca «%s» con error: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
 
-#: src/util/program.c:254 src/util/service.c:1792
+#: src/util/program.c:254 src/util/service.c:1801
 #, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "No se pudo acceder al fichero de configuración «%s»\n"
@@ -6678,22 +6909,22 @@ msgstr "Parece que estamos en espera ocupada...\n"
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr "¡Intento de cancelar la tarea muerta %llu!\n"
 
-#: src/util/server.c:436
+#: src/util/server.c:476
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "«%s» falló para el puerto %d (%s).\n"
 
-#: src/util/server.c:445
+#: src/util/server.c:485
 #, 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:456
+#: src/util/server.c:496
 #, 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:848
+#: src/util/server.c:888
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -6702,58 +6933,58 @@ msgstr ""
 "El código de procesado para el mensaje del tipo %u no llamó a "
 "«GNUNET_SERVER_receive_done» después de %s\n"
 
-#: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
-#: src/util/service.c:232 src/util/service.c:239
+#: src/util/service.c:151 src/util/service.c:177 src/util/service.c:220
+#: src/util/service.c:241 src/util/service.c:248
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: «%s»\n"
 
-#: src/util/service.c:195
+#: src/util/service.c:204
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Notación de red no válida («/%d» no es válido en IPv4 CIDR)."
 
-#: src/util/service.c:288
+#: src/util/service.c:297
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Notación de red no válida (no termina con «;»: «%s»)\n"
 
-#: src/util/service.c:320
+#: src/util/service.c:329
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Formato «%s» erroneo para máscara de red\n"
 
-#: src/util/service.c:350
+#: src/util/service.c:359
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato «%s» erroneo para red\n"
 
-#: src/util/service.c:707
+#: src/util/service.c:716
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr "Acceso denegado al UID %d / GID %d\n"
 
-#: src/util/service.c:712
+#: src/util/service.c:721
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr "Familia de direcciones %d desconocida\n"
 
-#: src/util/service.c:719
+#: src/util/service.c:728
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr "Acceso denegado desde «%s» al servicio «%s»\n"
 
-#: src/util/service.c:774
+#: src/util/service.c:783
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr "No se pudo procesar la especificación de red IPv4 «%s» para «%s:%s»\n"
 
-#: src/util/service.c:811
+#: src/util/service.c:820
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr "No se pudo procesar la especificación de red IPv6 «%s» para «%s:%s»\n"
 
-#: src/util/service.c:929
+#: src/util/service.c:938
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
@@ -6761,7 +6992,7 @@ msgstr ""
 "Deshabilitando el soporte para IPv6 para el servicio «%s», se produjo un "
 "fallo al crear un «socket» IPv6: %s\n"
 
-#: src/util/service.c:1007
+#: src/util/service.c:1016
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -6770,64 +7001,64 @@ msgstr ""
 "Deshabilitando el soporte de dominio de «sockets» UNIX para el servicio "
 "«%s», no se pudo crear un «socket» UNIX: %s\n"
 
-#: src/util/service.c:1024
+#: src/util/service.c:1033
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 "No hay ni puerto (PORT) ni ruta unix (UNIXPATH) para el servicio «%s», pero "
 "uno es necesario\n"
 
-#: src/util/service.c:1258
+#: src/util/service.c:1267
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 "No se pudo acceder a un «socket» pre-ascociado, lo intentaré asociar yo "
 "mismo\n"
 
-#: src/util/service.c:1309 src/util/service.c:1327
+#: src/util/service.c:1318 src/util/service.c:1336
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr "El valor especificado «%s» para el servicio «%s» no es válido\n"
 
-#: src/util/service.c:1354
+#: src/util/service.c:1363
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 "No se pudo acceder al «socket» pre-ascociado %u, lo intentaré asociar yo "
 "mismo\n"
 
-#: src/util/service.c:1526
+#: src/util/service.c:1535
 #, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
 
-#: src/util/service.c:1559
+#: src/util/service.c:1568
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "El servicio «%s» se ejecuta en %s\n"
 
-#: src/util/service.c:1608
+#: src/util/service.c:1617
 msgid "Service process failed to initialize\n"
 msgstr "No se pudo inicializar el proceso del servicio\n"
 
-#: src/util/service.c:1612
+#: src/util/service.c:1621
 msgid "Service process could not initialize server function\n"
 msgstr ""
 "No se pudo inicializar la función del servidor en el proceso del servicio\n"
 
-#: src/util/service.c:1616
+#: src/util/service.c:1625
 msgid "Service process failed to report status\n"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
-#: src/util/service.c:1671
+#: src/util/service.c:1680
 msgid "No such user"
 msgstr "No existe tal usuario"
 
-#: src/util/service.c:1684
+#: src/util/service.c:1693
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Imposible cambiar el usuario/grupo a «%s»: %s\n"
 
-#: src/util/service.c:1750
+#: src/util/service.c:1759
 msgid "do daemonize (detach from terminal)"
 msgstr "demonizar (desasociar del terminal)"
 
@@ -6912,96 +7143,96 @@ msgstr ""
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Dirección IPv6 «%s» no válida: %s\n"
 
-#: src/vpn/gnunet-service-vpn.c:512 src/vpn/gnunet-service-vpn.c:1088
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1130
 msgid "# Active tunnels"
 msgstr "# Túneles activos"
 
-#: src/vpn/gnunet-service-vpn.c:609 src/vpn/gnunet-service-vpn.c:646
+#: src/vpn/gnunet-service-vpn.c:622 src/vpn/gnunet-service-vpn.c:661
 msgid "# peers connected to mesh tunnels"
 msgstr "# pares conectados a túneles mesh"
 
-#: src/vpn/gnunet-service-vpn.c:699
+#: src/vpn/gnunet-service-vpn.c:712
 msgid "# Bytes given to mesh for transmission"
 msgstr "# Bytes dados para transmisión a mesh"
 
-#: src/vpn/gnunet-service-vpn.c:737
+#: src/vpn/gnunet-service-vpn.c:750
 msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr "# Bytes omitidos en la cola mesh (desbordamiento)"
 
-#: src/vpn/gnunet-service-vpn.c:771
+#: src/vpn/gnunet-service-vpn.c:814
 msgid "# Mesh tunnels created"
 msgstr "# Túneles mesh creados"
 
-#: src/vpn/gnunet-service-vpn.c:794
+#: src/vpn/gnunet-service-vpn.c:839
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
 
-#: src/vpn/gnunet-service-vpn.c:990
+#: src/vpn/gnunet-service-vpn.c:1032
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr "Protocolo %u no soportado, omitiendo\n"
 
-#: src/vpn/gnunet-service-vpn.c:1308
+#: src/vpn/gnunet-service-vpn.c:1350
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:1329
+#: src/vpn/gnunet-service-vpn.c:1371
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:1534
+#: src/vpn/gnunet-service-vpn.c:1576
 msgid "# Packets received from TUN interface"
 msgstr "# Paquetes recibidos de la interfaz TUN"
 
-#: src/vpn/gnunet-service-vpn.c:1572 src/vpn/gnunet-service-vpn.c:1613
+#: src/vpn/gnunet-service-vpn.c:1614 src/vpn/gnunet-service-vpn.c:1655
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr "Paquete recibido para el destino «%s» no mapeado (omitiéndolo)\n"
 
-#: src/vpn/gnunet-service-vpn.c:1623
+#: src/vpn/gnunet-service-vpn.c:1665
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr "Recibido paquete IPv4 con opciones (omitiéndolo)\n"
 
-#: src/vpn/gnunet-service-vpn.c:1637
+#: src/vpn/gnunet-service-vpn.c:1679
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr "Recibido paquete de protocolo %d desconocido desde TUN (omitiéndolo)\n"
 
-#: src/vpn/gnunet-service-vpn.c:1721
+#: src/vpn/gnunet-service-vpn.c:1761
 msgid "# ICMP packets received from mesh"
 msgstr "# Paquetes ICMP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2062
+#: src/vpn/gnunet-service-vpn.c:2100
 msgid "# UDP packets received from mesh"
 msgstr "# Paquetes UDP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2220
+#: src/vpn/gnunet-service-vpn.c:2255
 msgid "# TCP packets received from mesh"
 msgstr "# Paquetes TCP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2371
+#: src/vpn/gnunet-service-vpn.c:2406
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr "No se encontraron direcciones IPv4 libres en el rango de la VPN\n"
 
-#: src/vpn/gnunet-service-vpn.c:2426
+#: src/vpn/gnunet-service-vpn.c:2461
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr "No se encontraron direcciones IPv6 libres en el rango de la VPN\n"
 
-#: src/vpn/gnunet-service-vpn.c:2465 src/vpn/gnunet-service-vpn.c:2678
+#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2713
 msgid "# Active destinations"
 msgstr "# Destinos activos"
 
-#: src/vpn/gnunet-service-vpn.c:2751
+#: src/vpn/gnunet-service-vpn.c:2786
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 "Se produjo un fallo al alojar las direcciones IP para el nuevo destino\n"
 
-#: src/vpn/gnunet-service-vpn.c:3138
+#: src/vpn/gnunet-service-vpn.c:3143
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 "El soporte de IPv6 se deshabilita porque este sistema no soporta IPv6\n"
 
-#: src/vpn/gnunet-service-vpn.c:3170
+#: src/vpn/gnunet-service-vpn.c:3175
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 "El soporte de IPv4 se deshabilita porque este sistema no soporta IPv4\n"
@@ -7076,22 +7307,193 @@ msgstr "el servicio es ofrecido vía UDP"
 msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
 
-#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
-#: src/include/gnunet_common.h:591
+#: src/include/gnunet_common.h:588 src/include/gnunet_common.h:593
+#: src/include/gnunet_common.h:599
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Aserción fallida en %s:%d.\n"
 
-#: src/include/gnunet_common.h:601
+#: src/include/gnunet_common.h:609
 #, 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:622 src/include/gnunet_common.h:629
+#: src/include/gnunet_common.h:630 src/include/gnunet_common.h:637
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 
+#~ msgid "start peers with the given template configuration"
+#~ msgstr "inicia los pares con la plantilla de configuración dada"
+
+#~ msgid "number of peers to start"
+#~ msgstr "número de pares para empezar"
+
+#, fuzzy
+#~ msgid "Failed to read or generate private key: %s\n"
+#~ msgstr "Se produjo un fallo al leer o crear una clave de zona privada\n"
+
+#~ 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. Saliendo.\n"
+
+#~ msgid ""
+#~ "Failed to recover namespace `%s', cannot resume publishing operation.\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al recuperar el espacio de nombres «%s», no se pudo "
+#~ "retomar la operación de publicación.\n"
+
+#~ msgid "Failed to create or read private key for namespace `%s'\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al crear o leer la clave privada para el espacio de "
+#~ "nombres «%s»\n"
+
+#, fuzzy
+#~ msgid "Failed to read private key for namespace `%s'\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al crear o leer la clave privada para el espacio de "
+#~ "nombres «%s»\n"
+
+#~ msgid "Failed to read namespace private key file `%s', deleting it!\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al leer el fichero de la clave privada del espacio de "
+#~ "nombres «%s», ¡borrándolo!\n"
+
+#, fuzzy
+#~ msgid "Identifiers or URI too long to create UBlock"
+#~ msgstr ""
+#~ "Identificadores o URI demasiado largos para crear un bloque S (SBlock)"
+
+#~ msgid "Internal error."
+#~ msgstr "Error interno."
+
+#, fuzzy
+#~ msgid "ECDSA signature verification failed at %s:%d: %s\n"
+#~ msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
+
+#~ msgid "print names of local namespaces"
+#~ msgstr "imprime los nombres de los espacios de nombres locales"
+
+#~ msgid "Failed to create namespace `%s' (illegal filename?)\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al crear el espacio de nombres «%s» (¿nombre de "
+#~ "fichero ilegal?).\n"
+
+#~ msgid "# Replies received from STREAM"
+#~ msgstr "# Respuestas recibidas de «STREAM»"
+
+#~ 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"
+
+#~ msgid "add/del"
+#~ msgstr "añadir/borrar"
+
+#~ msgid ""
+#~ "Deletion requires either absolute time, or no time at all. Got relative "
+#~ "time `%s' instead.\n"
+#~ msgstr ""
+#~ "El borrado requiere o tiempo absoluto, o ningún tiempo. Tomado tiempo "
+#~ "relativo «%s» en su defecto.\n"
+
+#~ msgid "No valid expiration time for operation `%s'\n"
+#~ msgstr "Tiempo de expiración no válido para la operación «%s»\n"
+
+# Miguel: "Failed to find" lo he traducido por "No se pudo encontrar"
+# puesto que es mas claro que "fallar en la búsqueda".
+#~ msgid "Failed to find record to remove\n"
+#~ msgstr "No se pudo encontrar el registro a borrar\n"
+
+#~ msgid "Could not parse zone key file `%s'\n"
+#~ msgstr "No se pudo procesar el fichero de clave de zona «%s»\n"
+
+#~ msgid "Failed to create new signature"
+#~ msgstr "Se produjo un fallo al crear una nueva firma"
+
+#~ msgid "Failed to put new set of records in database"
+#~ msgstr ""
+#~ "Se produjo un fallo al insertar un nuevo conjunto de registros en la base "
+#~ "de datos"
+
+#~ msgid "Failed to remove records from database"
+#~ msgstr "Se produjo un fallo al borrar registros de la base de datos"
+
+#~ msgid "Failed to access database"
+#~ msgstr "Se produjo un fallo al acceder a la base de datos"
+
+#~ msgid "unknown internal error in namestore"
+#~ msgstr "error interno desconocido en el almacén de nombres"
+
+#~ msgid "Protocol error"
+#~ msgstr "Error de protocolo"
+
+#~ msgid "NSE service could not access hostkey: %s\n"
+#~ msgstr "El servicio NSE no puede acceder a la clave de máquina: %s\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "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"
+
+#~ 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"
+
+#~ msgid "Address of unexpected length: %u\n"
+#~ msgstr "Dirección de tamaño inesperado: %u\n"
+
+#~ msgid "Failure to transmit TEST request.\n"
+#~ msgstr "Se produjo un fallo al transmitir la peticion «TEST».\n"
+
+#~ msgid ""
+#~ "File `%s' does not contain a valid private key (too long, %llu bytes).  "
+#~ "Deleting it.\n"
+#~ msgstr ""
+#~ "El fichero «%s» no contiene una clave privada válida (demasiado grande, "
+#~ "%llu bytes).  Borrándolo.\n"
+
+#~ msgid ""
+#~ "File `%s' does not contain a valid private key (failed decode, %llu "
+#~ "bytes).  Deleting it.\n"
+#~ msgstr ""
+#~ "El fichero «%s» no contiene una clave privada válida (falló al "
+#~ "decodificar, %llu bytes).  Borrándolo.\n"
+
+#~ 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"
+
+#~ msgid "interrupted by shutdown"
+#~ msgstr "interrumpido por apagado"
+
+#~ msgid "gnunet-ecc failed"
+#~ msgstr "«gnunet-ecc» falló"
+
+#~ msgid ""
+#~ "File `%s' does not contain a valid private key (too long, %llu bytes).  "
+#~ "Renaming it.\n"
+#~ msgstr ""
+#~ "El fichero «%s» no contiene una clave privada válida (demasiado grande, "
+#~ "%llu bytes).  Renombrándolo.\n"
+
+#~ msgid "gnunet-rsa failed"
+#~ msgstr "«gnunet-rsa» falló"
+
+#~ msgid "RSA signature verification failed at %s:%d: %s\n"
+#~ msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
+
+#~ msgid "`%s' failed for drive `%S': %u\n"
+#~ msgstr "«%s» falló para la unidad «%S»: %u\n"
+
+#~ msgid "Manipulate GNUnet private RSA key files"
+#~ msgstr "Manipular los ficheros de clave privada RSA de GNUnet"
+
 #~ 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. "
@@ -7340,12 +7742,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "Blacklist file `%s' is empty.\n"
 #~ msgstr "El fichero de lista negra «%s» está vacío.\n"
 
-#~ msgid "Connected to %s\n"
-#~ msgstr "Conectado a %s.\n"
-
-#~ msgid "Disconnected from %s\n"
-#~ msgstr "Desconectado de %s\n"
-
 #~ msgid "try to connect to the given peer"
 #~ msgstr "intentar conectar al par dado"
 
@@ -7624,9 +8020,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "Failed to start daemon: %s\n"
 #~ msgstr "Se produjo un fallo al iniciar el demonio: %s\n"
 
-#~ msgid "Namespace `%s' unknown.\n"
-#~ msgstr "Espacio de nombres «%s» desconocido.\n"
-
 #~ msgid "Failed to create namespace `%s'\n"
 #~ msgstr "Se produjo un fallo al crear el espacio de nombres «%s»\n"
 
@@ -7731,9 +8124,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "Peer is lacking HOSTKEY configuration setting.\n"
 #~ msgstr "El par carece de configuración de claves de máquina (HOSTKEY).\n"
 
-#~ msgid "Could not access hostkey.\n"
-#~ msgstr "No se pudo acceder a la clave de máquina.\n"
-
 #~ msgid "`scp' does not seem to terminate (timeout copying config).\n"
 #~ msgstr ""
 #~ "Parece que «scp» no termina (expiración de plazo copiando la "
@@ -7803,9 +8193,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "`scp' does not seem to terminate.\n"
 #~ msgstr "«scp» no parece terminar.\n"
 
-#~ msgid "Starting service %s for peer `%4s'\n"
-#~ msgstr "Iniciando el servicio %s para el par «%4s»\n"
-
 #~ msgid "Could not start `%s' process to copy configuration directory.\n"
 #~ msgstr ""
 #~ "No se pudo iniciar el proceso «%s» para copiar el directorio de "
@@ -8267,9 +8654,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "Stored zonekey for zone `%s' in file `%s'\n"
 #~ msgstr "Almacenada clave de zona para la zona «%s» en el fichero «%s»\n"
 
-#~ msgid "Namestore record already existed"
-#~ msgstr "El registro ya existía en el almacén de nombres"
-
 #~ msgid "No records for entry"
 #~ msgstr "No hay registros para la entrada"
 
@@ -8905,9 +9289,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "No interface specified in section `%s' under `%s'!\n"
 #~ msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
 
-#~ msgid "Could not obtain IP for interface `%s' using `%s'.\n"
-#~ msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
-
 #, fuzzy
 #~ msgid ""
 #~ "Could not find interface `%s' using `%s', trying to find another "
@@ -9638,9 +10019,6 @@ msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 #~ msgid "Application module `%s' already initialized!\n"
 #~ msgstr "¡El módulo de la aplicación '%s' ya esta inicializado!\n"
 
-#~ msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
-#~ msgstr "Falló al cargar el plugin '%s' en %s:%d. Descargando plugin.\n"
-
 #~ msgid "Could not shutdown `%s': application not loaded\n"
 #~ msgstr "Imposible apagar '%s': aplicación no cargada\n"
 
diff --git a/po/sv.po b/po/sv.po
index 08e2d36f7..704db7b6e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-05-20 15:09+0200\n"
+"POT-Creation-Date: 2013-08-09 23:01+0200\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:880
+#: src/arm/arm_api.c:335
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
@@ -25,227 +25,232 @@ msgid ""
 "Monitoring client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:159
+#: src/arm/gnunet-arm.c:164
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:169
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:204 src/testbed/gnunet-service-testbed_peers.c:962
+#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:962
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:206 src/testbed/gnunet-service-testbed_peers.c:964
+#: src/arm/gnunet-arm.c:216
 #, fuzzy
-msgid "Misconfiguration (can't connect to the ARM service)"
+msgid "Misconfiguration (can not 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:966
+#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:966
 #, 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:968
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:968
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:212 src/testbed/gnunet-service-testbed_peers.c:970
-msgid "Request doesn't fit into a message"
+#: src/arm/gnunet-arm.c:222
+msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:972
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:972
 #, fuzzy
 msgid "Request timed out"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:974
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:974
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:990
+#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:990
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# byte krypterade"
 
-#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:992
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:992
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:236 src/testbed/gnunet-service-testbed_peers.c:994
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:994
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:238 src/testbed/gnunet-service-testbed_peers.c:996
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:996
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:240 src/testbed/gnunet-service-testbed_peers.c:998
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:998
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:1000
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1000
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1002
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1002
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1004
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1004
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1006
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1006
 #, 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:1008
+#: src/arm/gnunet-arm.c:260
 #, c-format
-msgid "%s service can't be started because ARM is shutting down"
+msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1010
+#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1010
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:271
+#: src/arm/gnunet-arm.c:295
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:291
+#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
 #, 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:307
-#, fuzzy, c-format
-msgid "Failed to kill the `%s' service: %s\n"
-msgstr "Fel vid %s:%d.\n"
+msgid "Failed to start the ARM service: %s\n"
+msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:323
+#: src/arm/gnunet-arm.c:367
 #, 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
+#: src/arm/gnunet-arm.c:377
 #, 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
+#: src/arm/gnunet-arm.c:418
 #, 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
+#: src/arm/gnunet-arm.c:427
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/arm/gnunet-arm.c:423
+#: src/arm/gnunet-arm.c:463
+#, 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:474
+#, fuzzy, c-format
+msgid "Failed to kill the `%s' service: %s\n"
+msgstr "Fel vid %s:%d.\n"
+
+#: src/arm/gnunet-arm.c:510
 #, 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
+#: src/arm/gnunet-arm.c:517
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:433
+#: src/arm/gnunet-arm.c:521
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:534
-msgid "Began monitoring ARM for service status changes\n"
+#: src/arm/gnunet-arm.c:603
+#, c-format
+msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:537
+#: src/arm/gnunet-arm.c:634
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:540
+#: src/arm/gnunet-arm.c:637
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:543
+#: src/arm/gnunet-arm.c:640
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:552
+#: src/arm/gnunet-arm.c:651
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:622
+#: src/arm/gnunet-arm.c:715
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:624
+#: src/arm/gnunet-arm.c:717
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:626
+#: src/arm/gnunet-arm.c:719
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:628
+#: src/arm/gnunet-arm.c:721
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:631
+#: src/arm/gnunet-arm.c:724
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:634
+#: src/arm/gnunet-arm.c:727
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:636
+#: src/arm/gnunet-arm.c:730
+msgid "monitor ARM activities"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:732
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:639
+#: src/arm/gnunet-arm.c:735
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:641
+#: src/arm/gnunet-arm.c:737
 #, fuzzy
 msgid "list currently running services"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:643
+#: src/arm/gnunet-arm.c:739
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:645
+#: src/arm/gnunet-arm.c:741
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:752
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -322,17 +327,17 @@ msgstr ""
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1386
+#: src/arm/gnunet-service-arm.c:1387
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1397
+#: src/arm/gnunet-service-arm.c:1398
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1411
+#: src/arm/gnunet-service-arm.c:1412
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -351,184 +356,199 @@ msgstr "mottog ogiltigt \"%s\" meddelande\n"
 msgid "Received last message for %s \n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1372
-#: src/ats/gnunet-service-ats_addresses.c:1406
+#: src/ats/gnunet-service-ats_addresses.c:1529
+#: src/ats/gnunet-service-ats_addresses.c:1563
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1378
+#: src/ats/gnunet-service-ats_addresses.c:1535
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1385
+#: src/ats/gnunet-service-ats_addresses.c:1542
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1412
+#: src/ats/gnunet-service-ats_addresses.c:1569
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1419
+#: src/ats/gnunet-service-ats_addresses.c:1576
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:756
+#: src/ats/gnunet-service-ats_addresses.c:1773
+#, fuzzy
+msgid "Failed to initialize solver!\n"
+msgstr "Kunde inte initiera SQLite.\n"
+
+#: src/ats/gnunet-service-ats-solver_mlp.c:848
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1075
+#: src/ats/gnunet-service-ats-solver_mlp.c:1171
 #, 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:1258
+#: src/ats/gnunet-service-ats-solver_mlp.c:1216
 #, c-format
-msgid "Update for ATS type `%s' not implemented!\n"
+msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: 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:1761
+#: src/ats/gnunet-service-ats-solver_mlp.c:1890
 #, 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:1769
+#: src/ats/gnunet-service-ats-solver_mlp.c:1898
 #, 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:1779
+#: src/ats/gnunet-service-ats-solver_mlp.c:1908
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1787
+#: src/ats/gnunet-service-ats-solver_mlp.c:1916
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1798
+#: src/ats/gnunet-service-ats-solver_mlp.c:1927
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:141
+#: src/ats/gnunet-service-ats-solver_proportional.c:1246
+#, fuzzy, c-format
+msgid "Cannot find network of type `%u' %s\n"
+msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
+
+#: src/ats-tool/gnunet-ats.c:145
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:143
+#: src/ats-tool/gnunet-ats.c:147
 #, c-format
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:199
+#: src/ats-tool/gnunet-ats.c:204
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/ats-tool/gnunet-ats.c:320
+#: src/ats-tool/gnunet-ats.c:328
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:339 src/namestore/gnunet-namestore.c:610
-#: src/transport/gnunet-transport.c:804
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:461
+#: src/transport/gnunet-transport.c:812
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/ats-tool/gnunet-ats.c:349 src/transport/gnunet-transport.c:810
+#: src/ats-tool/gnunet-ats.c:357 src/transport/gnunet-transport.c:819
 #, 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:357
+#: src/ats-tool/gnunet-ats.c:365
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: 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
+#: src/ats-tool/gnunet-ats.c:381 src/ats-tool/gnunet-ats.c:400
+#: src/ats-tool/gnunet-ats.c:417 src/ats-tool/gnunet-ats.c:455
 #, 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:382 src/ats-tool/gnunet-ats.c:399
+#: src/ats-tool/gnunet-ats.c:390 src/ats-tool/gnunet-ats.c:407
 #, 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:427
-msgid "Type required\n"
+#: src/ats-tool/gnunet-ats.c:425
+#, fuzzy, c-format
+msgid "No preference type given!\n"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/ats-tool/gnunet-ats.c:430
+#, c-format
+msgid "No peer given!\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:448
+msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:484
+#: src/ats-tool/gnunet-ats.c:506
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:487
+#: src/ats-tool/gnunet-ats.c:509
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:490
+#: src/ats-tool/gnunet-ats.c:512
 #, 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:493
+#: src/ats-tool/gnunet-ats.c:515
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:496
+#: src/ats-tool/gnunet-ats.c:518
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:499
+#: src/ats-tool/gnunet-ats.c:521
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:502
+#: src/ats-tool/gnunet-ats.c:524
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:505
+#: src/ats-tool/gnunet-ats.c:527
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:530
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:511
+#: src/ats-tool/gnunet-ats.c:533
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:520
+#: src/ats-tool/gnunet-ats.c:542
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -538,56 +558,26 @@ msgstr "Skriv ut information om GNUnets motparter."
 msgid "Loading block plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/consensus/gnunet-consensus.c:350
+#: src/consensus/gnunet-consensus.c:352
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "antal iterationer"
 
-#: src/consensus/gnunet-consensus.c:353
+#: src/consensus/gnunet-consensus.c:355
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus.c:356
+#: src/consensus/gnunet-consensus.c:358 src/set/gnunet-set-profiler.c:287
+#: src/set/gnunet-set-profiler.c:290 src/set/gnunet-set-profiler.c:293
 #, fuzzy
 msgid "number of values"
 msgstr "antal iterationer"
 
-#: src/consensus/gnunet-consensus.c:359
+#: src/consensus/gnunet-consensus.c:361
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/consensus/gnunet-consensus-ibf.c:217
-#, fuzzy
-msgid "number of element in set A-B"
-msgstr "antal iterationer"
-
-#: src/consensus/gnunet-consensus-ibf.c:220
-#, fuzzy
-msgid "number of element in set B-A"
-msgstr "antal iterationer"
-
-#: src/consensus/gnunet-consensus-ibf.c:223
-msgid "number of common elements in A and B"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-ibf.c:226
-msgid "hash num"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-ibf.c:229
-msgid "ibf size"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-start-peers.c:172
-msgid "start peers with the given template configuration"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-start-peers.c:175
-#, fuzzy
-msgid "number of peers to start"
-msgstr "antal iterationer"
-
 #: src/core/core_api.c:752
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
@@ -613,13 +603,13 @@ msgstr "\"%s\" ansluten till \"%s\".\n"
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:176
-#: src/peerinfo-tool/gnunet-peerinfo.c:643
+#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:170
+#: src/peerinfo-tool/gnunet-peerinfo.c:653
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
-#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:996
+#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:1004
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -629,26 +619,15 @@ msgstr "Skriv ut information om GNUnets motparter."
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-service-core.c:110
-#, fuzzy, c-format
-msgid "Failed to read or generate private key: %s\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/core/gnunet-service-core.c:124
-#, c-format
-msgid "Core service of `%4s' ready.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:150
+#: src/core/gnunet-service-core.c:105
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/core/gnunet-service-core.c:164
-#: 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"
+#: src/core/gnunet-service-core.c:126
+#, c-format
+msgid "Core service of `%4s' ready.\n"
+msgstr ""
 
 #: src/core/gnunet-service-core_clients.c:370
 msgid "# send requests dropped (disconnected)"
@@ -692,122 +671,122 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 #: src/core/gnunet-service-core_kx.c:803
 #, c-format
 msgid ""
-"Ephemeral key message rejected as its validity range does not match our "
-"system time (%llu not in [%llu,%llu]).\n"
+"Ephemeral key message from peer `%s' rejected as its validity range does not "
+"match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:818
+#: src/core/gnunet-service-core_kx.c:819
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:921
-#: src/transport/gnunet-service-transport_validation.c:915
+#: src/core/gnunet-service-core_kx.c:922
+#: src/transport/gnunet-service-transport_validation.c:935
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:929
+#: src/core/gnunet-service-core_kx.c:930
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:956
+#: src/core/gnunet-service-core_kx.c:957
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:973
+#: src/core/gnunet-service-core_kx.c:974
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:999
+#: src/core/gnunet-service-core_kx.c:1000
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1009
+#: src/core/gnunet-service-core_kx.c:1010
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1066
-#: src/transport/gnunet-service-transport_validation.c:1160
+#: src/core/gnunet-service-core_kx.c:1067
+#: src/transport/gnunet-service-transport_validation.c:1226
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1072
+#: src/core/gnunet-service-core_kx.c:1073
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1078
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1107
+#: src/core/gnunet-service-core_kx.c:1108
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1141
+#: src/core/gnunet-service-core_kx.c:1142
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1151
+#: src/core/gnunet-service-core_kx.c:1152
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
 
-#: src/core/gnunet-service-core_kx.c:1158
+#: src/core/gnunet-service-core_kx.c:1159
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1298
+#: src/core/gnunet-service-core_kx.c:1299
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1305
+#: src/core/gnunet-service-core_kx.c:1306
 #, 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:1308
+#: src/core/gnunet-service-core_kx.c:1309
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1351
-#: src/core/gnunet-service-core_kx.c:1376
+#: src/core/gnunet-service-core_kx.c:1352
+#: src/core/gnunet-service-core_kx.c:1377
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1363
+#: src/core/gnunet-service-core_kx.c:1364
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1404
+#: src/core/gnunet-service-core_kx.c:1405
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1412
+#: src/core/gnunet-service-core_kx.c:1413
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1443
+#: src/core/gnunet-service-core_kx.c:1444
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
@@ -833,16 +812,16 @@ msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:210
 #: src/core/gnunet-service-core_sessions.c:280
-#: src/dht/gnunet-service-dht_neighbours.c:644
-#: src/dht/gnunet-service-dht_neighbours.c:703
+#: src/dht/gnunet-service-dht_neighbours.c:641
+#: src/dht/gnunet-service-dht_neighbours.c:700
 #: 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:2798
-#: src/transport/gnunet-service-transport_neighbours.c:3057
+#: src/transport/gnunet-service-transport_neighbours.c:2793
+#: src/transport/gnunet-service-transport_neighbours.c:3047
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
@@ -914,14 +893,13 @@ msgstr ""
 #: 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/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/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
+#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
+#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_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:608 src/include/gnunet_common.h:615
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
+#: src/include/gnunet_common.h:616 src/include/gnunet_common.h:623
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -1043,6 +1021,27 @@ msgstr ""
 msgid "# GET requests executed"
 msgstr ""
 
+#: src/datastore/gnunet-datastore.c:114
+#, fuzzy, c-format
+msgid "Failed to store item: %s, aborting\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/datastore/gnunet-datastore.c:200
+#, c-format
+msgid "Cannot use the same configuration for source and destination\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:246
+msgid ""
+"specifies the configuration to use to access an alternative datastore; will "
+"merge that datastore into our current datastore"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:255
+#, fuzzy
+msgid "Manipulate GNUnet datastore"
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
+
 #: src/datastore/gnunet-service-datastore.c:349
 #, fuzzy
 msgid "# bytes expired"
@@ -1053,12 +1052,12 @@ msgid "# bytes purged (low-priority)"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:480
-#: src/gns/gnunet-gns-helper-service-w32.c:159
+#: src/gns/gnunet-gns-helper-service-w32.c:155
 msgid "Transmission to client failed!\n"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:511
-#: src/gns/gnunet-gns-helper-service-w32.c:189
+#: src/gns/gnunet-gns-helper-service-w32.c:183
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
@@ -1253,7 +1252,7 @@ msgid ""
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1193
-#: src/namestore/plugin_namestore_sqlite.c:827
+#: src/namestore/plugin_namestore_sqlite.c:829
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -1309,7 +1308,7 @@ msgstr ""
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:736
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:861
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:899
 msgid "be verbose (print progress information)"
@@ -1390,40 +1389,40 @@ msgstr "# byte mottogs via TCP"
 msgid "# PUT requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:590
+#: src/dht/gnunet-service-dht_clients.c:592
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:796
+#: src/dht/gnunet-service-dht_clients.c:793
 #, fuzzy
 msgid "# GET STOP requests received from clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1041
+#: src/dht/gnunet-service-dht_clients.c:1033
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1054
+#: src/dht/gnunet-service-dht_clients.c:1046
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1091
+#: src/dht/gnunet-service-dht_clients.c:1083
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1114
+#: src/dht/gnunet-service-dht_clients.c:1106
 #, fuzzy
 msgid "# RESULTS queued for clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_clients.c:1165
-#: src/dht/gnunet-service-dht_clients.c:1207
+#: src/dht/gnunet-service-dht_clients.c:1157
+#: src/dht/gnunet-service-dht_clients.c:1199
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1175
+#: src/dht/gnunet-service-dht_clients.c:1167
 #, fuzzy
 msgid "Could not pass reply to client, message too big!\n"
 msgstr "Kunde inte skicka meddelande till gnunetd\n"
@@ -1472,29 +1471,34 @@ msgstr "# byte mottogs via TCP"
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:504
+#: src/dht/gnunet-service-dht_neighbours.c:501
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:594
+#: src/dht/gnunet-service-dht_neighbours.c:591
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:737
+#: src/dht/gnunet-service-dht_neighbours.c:734
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:792
+#: src/dht/gnunet-service-dht_neighbours.c:789
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/dht/gnunet-service-dht_neighbours.c:830
+#: src/dht/gnunet-service-dht_neighbours.c:827
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
+#: src/dht/gnunet-service-dht_neighbours.c:859
+#, fuzzy
+msgid "# requests TTL-dropped"
+msgstr "# byte mottogs via TCP"
+
 #: src/dht/gnunet-service-dht_neighbours.c:1052
 #: src/dht/gnunet-service-dht_neighbours.c:1086
 msgid "# Peers excluded from routing due to Bloomfilter"
@@ -1542,34 +1546,49 @@ msgstr "# PING-meddelanden skapade"
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1730
+#: src/dht/gnunet-service-dht_neighbours.c:1578
+#, fuzzy
+msgid "# P2P PUT bytes received"
+msgstr "# byte mottogs via TCP"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1733
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1738
+#: src/dht/gnunet-service-dht_neighbours.c:1741
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1829
+#: src/dht/gnunet-service-dht_neighbours.c:1832
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1882
+#: src/dht/gnunet-service-dht_neighbours.c:1835
+#, fuzzy
+msgid "# P2P GET bytes received"
+msgstr "# byte mottogs via TCP"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1888
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1896
+#: src/dht/gnunet-service-dht_neighbours.c:1902
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1973
+#: src/dht/gnunet-service-dht_neighbours.c:1979
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
+#: src/dht/gnunet-service-dht_neighbours.c:1982
+#, fuzzy
+msgid "# P2P RESULT bytes received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
 #: src/dht/gnunet-service-dht_nse.c:59
 #, fuzzy
 msgid "# Network size estimates received"
@@ -1632,28 +1651,28 @@ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/dns/dnsstub.c:175
+#: src/dns/dnsstub.c:176
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
-#: src/gns/gnunet-service-gns_resolver.c:1621
+#: src/dns/dnsstub.c:296 src/dns/dnsstub.c:384
+#: src/gns/gnunet-service-gns_resolver.c:1651
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/dns/dnsstub.c:299
+#: src/dns/dnsstub.c:300
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/dns/dnsstub.c:368
+#: src/dns/dnsstub.c:369
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:440
+#: src/dns/dnsstub.c:441
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -1720,12 +1739,12 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3351
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3359
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3407
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3415
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
@@ -1739,141 +1758,141 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/exit/gnunet-daemon-exit.c:741
+#: src/exit/gnunet-daemon-exit.c:756
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:794
+#: src/exit/gnunet-daemon-exit.c:807
 #, fuzzy
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr "# byte skickade av typen %d"
 
-#: src/exit/gnunet-daemon-exit.c:911 src/exit/gnunet-daemon-exit.c:2343
-#: src/exit/gnunet-daemon-exit.c:2603 src/vpn/gnunet-service-vpn.c:1411
-#: src/vpn/gnunet-service-vpn.c:1812 src/vpn/gnunet-service-vpn.c:1975
+#: src/exit/gnunet-daemon-exit.c:924 src/exit/gnunet-daemon-exit.c:2349
+#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1453
+#: src/vpn/gnunet-service-vpn.c:1852 src/vpn/gnunet-service-vpn.c:2015
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:948 src/exit/gnunet-daemon-exit.c:2402
-#: src/exit/gnunet-daemon-exit.c:2662 src/vpn/gnunet-service-vpn.c:1467
-#: src/vpn/gnunet-service-vpn.c:1871 src/vpn/gnunet-service-vpn.c:2008
+#: src/exit/gnunet-daemon-exit.c:961 src/exit/gnunet-daemon-exit.c:2408
+#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1509
+#: src/vpn/gnunet-service-vpn.c:1911 src/vpn/gnunet-service-vpn.c:2048
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:988
+#: src/exit/gnunet-daemon-exit.c:1001
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:995
+#: src/exit/gnunet-daemon-exit.c:1008
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1072
+#: src/exit/gnunet-daemon-exit.c:1084
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1147
+#: src/exit/gnunet-daemon-exit.c:1158
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1200
+#: src/exit/gnunet-daemon-exit.c:1210
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1214
+#: src/exit/gnunet-daemon-exit.c:1224
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1240
+#: src/exit/gnunet-daemon-exit.c:1250
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1267
+#: src/exit/gnunet-daemon-exit.c:1277
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1313
+#: src/exit/gnunet-daemon-exit.c:1323
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1321
+#: src/exit/gnunet-daemon-exit.c:1331
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1703
+#: src/exit/gnunet-daemon-exit.c:1713
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1814
+#: src/exit/gnunet-daemon-exit.c:1826
 msgid "# TCP service creation requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1817 src/exit/gnunet-daemon-exit.c:1906
-#: src/exit/gnunet-daemon-exit.c:2026 src/exit/gnunet-daemon-exit.c:2267
-#: src/exit/gnunet-daemon-exit.c:2519 src/exit/gnunet-daemon-exit.c:2811
-#: src/exit/gnunet-daemon-exit.c:2921
+#: src/exit/gnunet-daemon-exit.c:1829 src/exit/gnunet-daemon-exit.c:1919
+#: src/exit/gnunet-daemon-exit.c:2035 src/exit/gnunet-daemon-exit.c:2273
+#: src/exit/gnunet-daemon-exit.c:2522 src/exit/gnunet-daemon-exit.c:2811
+#: src/exit/gnunet-daemon-exit.c:2918
 #, fuzzy
 msgid "# Bytes received from MESH"
 msgstr "# byte mottagna via HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1850 src/exit/gnunet-daemon-exit.c:2943
+#: src/exit/gnunet-daemon-exit.c:1861 src/exit/gnunet-daemon-exit.c:2940
 #, c-format
 msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1854
+#: src/exit/gnunet-daemon-exit.c:1865
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:1909
+#: src/exit/gnunet-daemon-exit.c:1922
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2029
+#: src/exit/gnunet-daemon-exit.c:2038
 #, fuzzy
 msgid "# TCP data requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2043
+#: src/exit/gnunet-daemon-exit.c:2052
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2093
+#: src/exit/gnunet-daemon-exit.c:2102
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# byte skickade via UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2270
+#: src/exit/gnunet-daemon-exit.c:2276
 #, fuzzy
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2522
+#: src/exit/gnunet-daemon-exit.c:2525
 #, fuzzy
 msgid "# ICMP service requests received via mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2588 src/vpn/gnunet-service-vpn.c:1401
-#: src/vpn/gnunet-service-vpn.c:1969
+#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1443
+#: src/vpn/gnunet-service-vpn.c:2009
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2647 src/vpn/gnunet-service-vpn.c:1437
-#: src/vpn/gnunet-service-vpn.c:1449 src/vpn/gnunet-service-vpn.c:1859
+#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1479
+#: src/vpn/gnunet-service-vpn.c:1491 src/vpn/gnunet-service-vpn.c:1899
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2697
+#: src/exit/gnunet-daemon-exit.c:2700
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# byte skickade via UDP"
@@ -1883,67 +1902,213 @@ msgstr "# byte skickade via UDP"
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2924
+#: src/exit/gnunet-daemon-exit.c:2921
 #, fuzzy
 msgid "# UDP service requests received via mesh"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2947
+#: src/exit/gnunet-daemon-exit.c:2944
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# byte mottogs via TCP"
 
-#: src/exit/gnunet-daemon-exit.c:2980
+#: src/exit/gnunet-daemon-exit.c:2977
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3209
+#: src/exit/gnunet-daemon-exit.c:3216
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3223 src/exit/gnunet-daemon-exit.c:3235
+#: src/exit/gnunet-daemon-exit.c:3230 src/exit/gnunet-daemon-exit.c:3242
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3246
+#: src/exit/gnunet-daemon-exit.c:3253
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3364
+#: src/exit/gnunet-daemon-exit.c:3372
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3372
+#: src/exit/gnunet-daemon-exit.c:3380
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3379
+#: src/exit/gnunet-daemon-exit.c:3387
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3385
+#: src/exit/gnunet-daemon-exit.c:3393
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3391 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3399 src/pt/gnunet-daemon-pt.c:887
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3620
+#: src/exit/gnunet-daemon-exit.c:3647
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
+#: src/experimentation/gnunet-daemon-experimentation.c:56
+msgid "Experimentation daemon shutting down ...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation.c:78
+msgid "Experimentation daemon starting ...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation.c:84
+#, fuzzy
+msgid "Failed to create statistics!\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/experimentation/gnunet-daemon-experimentation.c:121
+msgid "GNUnet experimentation daemon"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:264
+#, c-format
+msgid "Experiment `%s': Experiment signature is invalid\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:271
+#, c-format
+msgid ""
+"Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
+"sec. \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:316
+#, c-format
+msgid "Experiment `%s': Issuer missing\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:321
+#, c-format
+msgid "Experiment `%s': Issuer invalid\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:327
+#, c-format
+msgid "Experiment `%s': Issuer not accepted!\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:336
+#, c-format
+msgid "Experiment `%s': Version missing or invalid \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:344
+#, c-format
+msgid "Experiment `%s': Required capabilities missing \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:349
+#, c-format
+msgid "Experiment `%s': Required capabilities invalid \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:393
+#, fuzzy, c-format
+msgid "Failed to parse file `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:419
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:444
+msgid ""
+"No valid experiment issuers configured! Set value to peer id of issuer! "
+"Exit...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:429
+#, fuzzy, c-format
+msgid "Invalid value `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:453
+#, fuzzy, c-format
+msgid "Invalid public key `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:460
+#, fuzzy, c-format
+msgid "Found issuer for public key `%s'\n"
+msgstr "Testar transport(er) %s\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:463
+#, fuzzy, c-format
+msgid "No issuer for public key `%s'\n"
+msgstr "%d filer hittades i katalog.\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:480
+#, fuzzy, c-format
+msgid "Cannot read experiments file `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:220
+#, c-format
+msgid "Cannot send message to peer `%s' for experiment `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:290
+#, c-format
+msgid "Sending experimentation request to peer %s\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:421
+#, c-format
+msgid "Added peer `%s' as active node\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:848
+#, fuzzy, c-format
+msgid "Connected to peer %s\n"
+msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:877
+#, fuzzy, c-format
+msgid "Disconnected from peer %s\n"
+msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1057
+#, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:109
+#, c-format
+msgid "Peer `%s' did not respond to request for experiment `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:144
+#, fuzzy, c-format
+msgid "Starting inbound experiment `%s' with peer `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:278
+#, fuzzy, c-format
+msgid "Starting outbound experiment `%s' with peer `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:296
+#, fuzzy, c-format
+msgid "Received %s message from peer %s for experiment `%s'\n"
+msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
+
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -2018,27 +2183,22 @@ msgstr ""
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:1520
-#, c-format
-msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
-msgstr ""
-
-#: src/fs/fs_api.c:1562
+#: src/fs/fs_api.c:1557
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1578
+#: src/fs/fs_api.c:1571
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2229
+#: src/fs/fs_api.c:2228
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2239
+#: src/fs/fs_api.c:2238
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -2053,7 +2213,7 @@ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2897
+#: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2896
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
@@ -2063,11 +2223,11 @@ msgstr ""
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2841
+#: src/fs/fs_api.c:2840
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2935
+#: src/fs/fs_api.c:2934
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2077,58 +2237,58 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/fs_download.c:321
+#: src/fs/fs_download.c:322
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:341
+#: src/fs/fs_download.c:342
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:507 src/fs/fs_download.c:519
+#: src/fs/fs_download.c:508 src/fs/fs_download.c:520
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:888
+#: src/fs/fs_download.c:889
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_download.c:970
+#: src/fs/fs_download.c:971
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:996
+#: src/fs/fs_download.c:997
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1020
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_download.c:1029
+#: src/fs/fs_download.c:1030
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1038
+#: src/fs/fs_download.c:1039
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_download.c:1136
+#: src/fs/fs_download.c:1137
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/fs_download.c:1927
+#: src/fs/fs_download.c:1928
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Ogiltiga argument: "
@@ -2160,148 +2320,114 @@ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/fs/fs_namespace.c:104
+#: src/fs/fs_namespace.c:207
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_namespace.c:126 src/fs/fs_namespace.c:214
+#: src/fs/fs_namespace.c:229
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:240 src/fs/fs_namespace.c:284
-#: src/fs/fs_namespace.c:330
-msgid "Can't determine where namespace directory is\n"
-msgstr ""
-
-#: src/fs/fs_namespace.c:252
+#: src/fs/fs_namespace.c:320
 #, fuzzy, c-format
-msgid "Failed to create or read private key for namespace `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/fs/fs_namespace.c:296
-#, fuzzy, c-format
-msgid "Failed to read private key for namespace `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/fs/fs_namespace.c:467
-#, c-format
-msgid "Failed to read namespace private key file `%s', deleting it!\n"
-msgstr ""
-
-#: src/fs/fs_namespace.c:659
-msgid "Identifiers or URI too long to create UBlock"
-msgstr ""
-
-#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:311
-#, fuzzy
-msgid "Internal error."
-msgstr "Okänt fel.\n"
+msgid "Failed to read `%s': %s\n"
+msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:747
+#: src/fs/fs_namespace.c:466
 #, fuzzy
 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
+#: src/fs/fs_pseudonym.c:327 src/fs/fs_pseudonym.c:631
 #, 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
+#: src/fs/fs_pseudonym.c:463 src/fs/fs_pseudonym.c:489
+#: src/fs/fs_pseudonym.c:627
 #, fuzzy
 msgid "no-name"
 msgstr "Visa namn"
 
-#: src/fs/fs_pseudonym.c:1182 src/util/crypto_ecc.c:1014
-#, 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
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:399
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:622 src/fs/fs_publish.c:639 src/fs/fs_publish.c:678
-#: src/fs/fs_publish.c:698 src/fs/fs_publish.c:723 src/fs/fs_publish.c:863
+#: src/fs/fs_publish.c:624 src/fs/fs_publish.c:641 src/fs/fs_publish.c:680
+#: src/fs/fs_publish.c:700 src/fs/fs_publish.c:725 src/fs/fs_publish.c:865
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/fs/fs_publish.c:624
+#: src/fs/fs_publish.c:626
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:636
+#: src/fs/fs_publish.c:638
 #, fuzzy
 msgid "unknown error"
 msgstr "Okänt fel"
 
-#: src/fs/fs_publish.c:679
+#: src/fs/fs_publish.c:681
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:699
+#: src/fs/fs_publish.c:701
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:724
+#: src/fs/fs_publish.c:726
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:747
+#: src/fs/fs_publish.c:749
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_publish.c:812
+#: src/fs/fs_publish.c:814
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/fs/fs_publish.c:818
+#: src/fs/fs_publish.c:820
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:864
+#: src/fs/fs_publish.c:866
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1090
+#: src/fs/fs_publish.c:1092
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1161
+#: src/fs/fs_publish.c:1164
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:273
+#: src/fs/fs_publish_ksk.c:219
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_search.c:742
+#: src/fs/fs_search.c:815
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/fs_search.c:800
+#: src/fs/fs_search.c:874
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2348,99 +2474,91 @@ msgstr "=\tFel vid läsning av katalog.\n"
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_unindex.c:566 src/fs/fs_unindex.c:633
+#: src/fs/fs_unindex.c:565 src/fs/fs_unindex.c:628
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/fs_unindex.c:646
+#: src/fs/fs_unindex.c:641
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:680
+#: src/fs/fs_unindex.c:675
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_uri.c:221
+#: src/fs/fs_uri.c:222
 #, no-c-format
 msgid "`%' must be followed by HEX number"
 msgstr ""
 
-#: src/fs/fs_uri.c:280
+#: src/fs/fs_uri.c:281
 #, fuzzy
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr "Ogiltig URL \"%s\" (måste börja med \"%s\")\n"
 
-#: src/fs/fs_uri.c:298
+#: src/fs/fs_uri.c:299
 msgid "`++' not allowed in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:305
+#: src/fs/fs_uri.c:306
 msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:375
+#: src/fs/fs_uri.c:376
 msgid "Malformed SKS URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:418 src/fs/fs_uri.c:433
+#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:563 src/fs/fs_uri.c:578 src/fs/fs_uri.c:588
-#: src/fs/fs_uri.c:616
+#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
+#: src/fs/fs_uri.c:629
 msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:611
 msgid "SKS URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:604
+#: src/fs/fs_uri.c:617
 msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:610
+#: src/fs/fs_uri.c:623
 msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:623
+#: src/fs/fs_uri.c:636
 msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:635
+#: src/fs/fs_uri.c:648
 msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:673
+#: src/fs/fs_uri.c:686
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:898 src/util/crypto_ecc.c:941
+#: src/fs/fs_uri.c:911
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/fs/fs_uri.c:904 src/util/crypto_ecc.c:947
+#: src/fs/fs_uri.c:917
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/fs/fs_uri.c:945
-msgid "identifier is NULL!"
-msgstr ""
-
-#: src/fs/fs_uri.c:951
-msgid "identifier has zero length!"
-msgstr ""
-
-#: src/fs/fs_uri.c:1122 src/fs/fs_uri.c:1149
+#: src/fs/fs_uri.c:1099 src/fs/fs_uri.c:1126
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1155
+#: src/fs/fs_uri.c:1132
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2478,25 +2596,25 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:302
-#: src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:310
+#: src/fs/gnunet-publish.c:808
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:687
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:812
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:690
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:815
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:714
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:839
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:327
-#: src/fs/gnunet-publish.c:721
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:329
+#: src/fs/gnunet-publish.c:846
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2570,7 +2688,7 @@ msgstr "Fel vid nedladdning: %s\n"
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Uppladdning vägrades!"
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:195
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:273
 #: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
@@ -2581,7 +2699,7 @@ msgstr ""
 msgid "You need to specify a URI argument.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:629
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:652
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
@@ -2594,7 +2712,7 @@ msgstr ""
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:607
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:781
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2659,227 +2777,218 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:178 src/statistics/gnunet-statistics.c:283
-#, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/fs/gnunet-pseudonym.c:273 src/fs/gnunet-pseudonym.c:280
-#: src/fs/gnunet-pseudonym.c:282
+#: src/fs/gnunet-pseudonym.c:227 src/fs/gnunet-pseudonym.c:229
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/fs/gnunet-pseudonym.c:305
-msgid "create or advertise namespace NAME"
-msgstr ""
+#: src/fs/gnunet-pseudonym.c:265 src/statistics/gnunet-statistics.c:305
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/fs/gnunet-pseudonym.c:308
-msgid "delete namespace NAME "
+#: src/fs/gnunet-pseudonym.c:313
+msgid "advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:311
+#: src/fs/gnunet-pseudonym.c:316
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:315 src/fs/gnunet-publish.c:702
+#: src/fs/gnunet-pseudonym.c:320 src/fs/gnunet-publish.c:827
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:318
-msgid "print names of local namespaces"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:321
+#: src/fs/gnunet-pseudonym.c:323
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:324
+#: src/fs/gnunet-pseudonym.c:326
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:330
+#: src/fs/gnunet-pseudonym.c:332
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-pseudonym.c:333
+#: src/fs/gnunet-pseudonym.c:335
 msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:345
+#: src/fs/gnunet-pseudonym.c:347
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:152
+#: src/fs/gnunet-publish.c:230
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:159
+#: src/fs/gnunet-publish.c:237
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-publish.c:169
+#: src/fs/gnunet-publish.c:247
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:173
+#: src/fs/gnunet-publish.c:251
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:192
+#: src/fs/gnunet-publish.c:270
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "\"%s\" uppstart klar.\n"
 
-#: src/fs/gnunet-publish.c:310
+#: src/fs/gnunet-publish.c:388
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:312
+#: src/fs/gnunet-publish.c:390
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/fs/gnunet-publish.c:363 src/fs/gnunet-publish.c:617
-#, fuzzy, c-format
-msgid "Failed to create namespace `%s' (illegal filename?)\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-
-#: src/fs/gnunet-publish.c:438
+#: src/fs/gnunet-publish.c:529
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:465
+#: src/fs/gnunet-publish.c:552
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:496
+#: src/fs/gnunet-publish.c:585
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:498
+#: src/fs/gnunet-publish.c:587
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:503
+#: src/fs/gnunet-publish.c:592
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:508
+#: src/fs/gnunet-publish.c:597
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "Nedstängning klar.\n"
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:601
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:516
+#: src/fs/gnunet-publish.c:605
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:523
+#: src/fs/gnunet-publish.c:612
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/gnunet-publish.c:557
+#: src/fs/gnunet-publish.c:643
+#, fuzzy, c-format
+msgid "Selected pseudonym `%s' unknown\n"
+msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
+
+#: src/fs/gnunet-publish.c:669
+#, fuzzy, c-format
+msgid "Failed to access `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/fs/gnunet-publish.c:681
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:731
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:564
+#: src/fs/gnunet-publish.c:738
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:570
+#: src/fs/gnunet-publish.c:744
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:578 src/vpn/gnunet-vpn.c:213
+#: src/fs/gnunet-publish.c:752 src/vpn/gnunet-vpn.c:213
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/fs/gnunet-publish.c:588 src/fs/gnunet-publish.c:595
-#: src/transport/gnunet-transport.c:834 src/transport/gnunet-transport.c:864
+#: src/fs/gnunet-publish.c:762 src/fs/gnunet-publish.c:769
+#: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:650
-#, fuzzy, c-format
-msgid "Failed to access `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/fs/gnunet-publish.c:662
-msgid ""
-"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
-"installed?\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:819
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:698
+#: src/fs/gnunet-publish.c:823
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:830
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-publish.c:835
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:718
+#: src/fs/gnunet-publish.c:843
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:724
+#: src/fs/gnunet-publish.c:849
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:728
+#: src/fs/gnunet-publish.c:853
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:732
+#: src/fs/gnunet-publish.c:857
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:748
+#: src/fs/gnunet-publish.c:873
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2923,11 +3032,11 @@ msgstr ""
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:538
+#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:291
+#: src/fs/gnunet-service-fs.c:640 src/hostlist/gnunet-daemon-hostlist.c:291
 #: src/topology/gnunet-daemon-topology.c:1314
 #: src/topology/gnunet-daemon-topology.c:1321
 #, fuzzy, c-format
@@ -3087,6 +3196,37 @@ msgstr "# klartext PONG-meddelanden mottagna"
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
+#: src/fs/gnunet-service-fs_mesh_client.c:475
+#, fuzzy
+msgid "# replies received via mesh"
+msgstr "# byte mottagna av typen %d"
+
+#: src/fs/gnunet-service-fs_mesh_client.c:489
+#, fuzzy
+msgid "# replies received via mesh dropped"
+msgstr "# byte mottagna av typen %d"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:259
+#, fuzzy
+msgid "# Blocks transferred via mesh"
+msgstr "# byte skickade av typen %d"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:412
+#, fuzzy
+msgid "# queries received via mesh"
+msgstr "# byte mottogs via TCP"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:455
+#, fuzzy
+msgid "# mesh client connections rejected"
+msgstr "Nätverksanslutning"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:461
+#: src/fs/gnunet-service-fs_mesh_server.c:501
+#, fuzzy
+msgid "# mesh connections active"
+msgstr "Nätverksanslutning"
+
 #: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
 msgstr ""
@@ -3171,7 +3311,7 @@ msgstr "# byte mottagna via HTTP"
 
 #: src/fs/gnunet-service-fs_pr.c:1189
 #, fuzzy
-msgid "# Replies received from STREAM"
+msgid "# Replies received from MESH"
 msgstr "# byte mottagna via HTTP"
 
 #: src/fs/gnunet-service-fs_pr.c:1241
@@ -3238,36 +3378,6 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_stream.c:777
-#, fuzzy
-msgid "# replies received via stream"
-msgstr "# byte mottagna av typen %d"
-
-#: src/fs/gnunet-service-fs_stream.c:791
-#, fuzzy
-msgid "# replies received via stream dropped"
-msgstr "# byte mottagna av typen %d"
-
-#: src/fs/gnunet-service-fs_stream.c:930
-#: src/fs/gnunet-service-fs_stream.c:1384
-#, fuzzy
-msgid "# stream connections active"
-msgstr "Nätverksanslutning"
-
-#: src/fs/gnunet-service-fs_stream.c:1166
-msgid "# Blocks transferred via stream"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_stream.c:1326
-#, fuzzy
-msgid "# queries received via stream"
-msgstr "# byte mottogs via TCP"
-
-#: src/fs/gnunet-service-fs_stream.c:1376
-#, fuzzy
-msgid "# stream client connections rejected"
-msgstr "Nätverksanslutning"
-
 #: src/fs/gnunet-unindex.c:89
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
@@ -3324,23 +3434,23 @@ msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:679
+#: src/gns/gnunet-dns2gns.c:681
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:682
+#: src/gns/gnunet-dns2gns.c:684
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:685
+#: src/gns/gnunet-dns2gns.c:687
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:688
+#: src/gns/gnunet-dns2gns.c:690
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:701
+#: src/gns/gnunet-dns2gns.c:703
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -3395,45 +3505,45 @@ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:586
+#: src/gns/gnunet-gns-fcfsd.c:587
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:648
+#: src/gns/gnunet-gns-fcfsd.c:649
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:664
+#: src/gns/gnunet-gns-fcfsd.c:665
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:700
+#: src/gns/gnunet-gns-fcfsd.c:701
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:708
+#: src/gns/gnunet-gns-fcfsd.c:709
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:912 src/namestore/gnunet-namestore.c:364
+#: src/gns/gnunet-gns-fcfsd.c:913 src/namestore/gnunet-namestore.c:492
 #, fuzzy
 msgid "Failed to read or create private zone key\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:922 src/namestore/gnunet-namestore.c:375
+#: src/gns/gnunet-gns-fcfsd.c:923 src/namestore/gnunet-namestore.c:503
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:938 src/gns/gnunet-gns-proxy.c:2857
+#: src/gns/gnunet-gns-fcfsd.c:939 src/gns/gnunet-gns-proxy.c:2857
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:972
+#: src/gns/gnunet-gns-fcfsd.c:973
 msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
@@ -3459,96 +3569,101 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:486
+#: src/gns/gnunet-service-gns.c:497
 #, c-format
 msgid "Records for name `%s' in zone %s too large to fit into DHT"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1216
+#: src/gns/gnunet-service-gns.c:1225
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:1277
+#: src/gns/gnunet-service-gns.c:1286
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:1288
+#: src/gns/gnunet-service-gns.c:1297
 #, fuzzy
 msgid "Unable to initialize resolver!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:3439
+#: src/gns/gnunet-service-gns_resolver.c:3446
 #, c-format
 msgid "Not a GADS TLD: `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:119
+#: src/hello/gnunet-hello.c:123
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:125
+#: src/hello/gnunet-hello.c:129
 #, fuzzy, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/hello/gnunet-hello.c:133
+#: src/hello/gnunet-hello.c:137
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:140
+#: src/hello/gnunet-hello.c:144
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:150 src/hello/gnunet-hello.c:179
+#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183
 #, fuzzy, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/hello/gnunet-hello.c:166
+#: src/hello/gnunet-hello.c:170
 #, 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:191
+#: src/hello/gnunet-hello.c:195
 #, fuzzy, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/hello/hello.c:936
+#: src/hello/gnunet-hello.c:203
+#, c-format
+msgid "Modified %u addresses \n"
+msgstr ""
+
+#: src/hello/hello.c:945
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:945
+#: src/hello/hello.c:954
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:955
+#: src/hello/hello.c:964
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hello/hello.c:965
+#: src/hello/hello.c:974
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hello/hello.c:982
+#: src/hello/hello.c:991
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:991
+#: src/hello/hello.c:1000
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1010
+#: src/hello/hello.c:1019
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
@@ -3602,8 +3717,8 @@ msgstr ""
 #: 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:1056
-#: src/transport/plugin_transport_http_client.c:1071
+#: src/transport/plugin_transport_http_client.c:1063
+#: src/transport/plugin_transport_http_client.c:1078
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -3746,9 +3861,9 @@ msgid "expired addresses encountered"
 msgstr ""
 
 #: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
-#: src/peerinfo-tool/gnunet-peerinfo.c:348
-#: src/peerinfo-tool/gnunet-peerinfo.c:418
-#: src/peerinfo-tool/gnunet-peerinfo.c:489
+#: src/peerinfo-tool/gnunet-peerinfo.c:358
+#: src/peerinfo-tool/gnunet-peerinfo.c:428
+#: src/peerinfo-tool/gnunet-peerinfo.c:499
 #: src/topology/gnunet-daemon-topology.c:918
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
@@ -3804,8 +3919,8 @@ msgstr ""
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:649
-#: src/transport/gnunet-service-transport.c:661
+#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:659
+#: src/transport/gnunet-service-transport.c:785
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -3835,6 +3950,78 @@ msgstr "\"%s\" är inte tillgänglig."
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
+#: src/identity/gnunet-identity.c:135
+#, fuzzy, c-format
+msgid "Failed to create ego: %s\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/identity/gnunet-identity.c:237
+msgid "create ego NAME"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:240
+msgid "delete ego NAME "
+msgstr ""
+
+#: src/identity/gnunet-identity.c:243
+msgid "display all egos"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:246
+msgid "run in monitor mode egos"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:255
+msgid "Maintain egos"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:336
+msgid "no default known"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:357
+msgid "default configured, but ego unknown (internal error)"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:434
+#: src/identity/gnunet-service-identity.c:665
+#: src/identity/gnunet-service-identity.c:773
+#, fuzzy, c-format
+msgid "Failed to write subsystem default identifier map to `%s'.\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/identity/gnunet-service-identity.c:441
+msgid "Unknown ego specified for service (internal error)"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:511
+msgid "identifier already in use for another ego"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:642
+msgid "target name already exists"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:681
+#: src/identity/gnunet-service-identity.c:790
+msgid "no matching ego found"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:824
+#, fuzzy, c-format
+msgid "Failed to parse ego information in `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/identity/gnunet-service-identity.c:897
+#, fuzzy, c-format
+msgid "Failed to parse subsystem identity configuration file `%s'\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+
+#: src/identity/gnunet-service-identity.c:909
+#, fuzzy, c-format
+msgid "Failed to create directory `%s' for storing egos\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
 #: src/integration-tests/connection_watchdog.c:990
 #, fuzzy, c-format
 msgid "Transport plugin: `%s' port %llu\n"
@@ -3855,53 +4042,40 @@ msgstr ""
 msgid "help text"
 msgstr "hjälptext för -t"
 
-#: src/mesh/gnunet-mesh.c:211
+#: src/mesh/gnunet-mesh.c:205
 #, fuzzy
 msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-mesh.c:214
+#: src/mesh/gnunet-mesh.c:208
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-mesh.c:224
+#: src/mesh/gnunet-mesh.c:218
 #, fuzzy
 msgid "Print information about mesh tunnels and peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-service-mesh.c:7966 src/mesh/gnunet-service-mesh-new.c:4649
+#: src/mesh/gnunet-service-mesh.c:5640
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8179 src/mesh/gnunet-service-mesh-new.c:4790
-#, 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: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:4860
-#: src/mesh/gnunet-service-mesh-new.c:4872
-#: src/mesh/gnunet-service-mesh-new.c:4884
-#: src/mesh/gnunet-service-mesh-new.c:4896
-#: src/mesh/gnunet-service-mesh-new.c:4908
-#: src/mesh/gnunet-service-mesh-new.c:4920 src/nse/gnunet-service-nse.c:1500
-#: src/nse/gnunet-service-nse.c:1518
-#: 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/mesh/gnunet-service-mesh.c:5780 src/mesh/gnunet-service-mesh.c:5792
+#: src/mesh/gnunet-service-mesh.c:5804 src/mesh/gnunet-service-mesh.c:5816
+#: src/mesh/gnunet-service-mesh.c:5828 src/mesh/gnunet-service-mesh.c:5840
+#: src/nse/gnunet-service-nse.c:1425 src/nse/gnunet-service-nse.c:1443
+#: src/regex/gnunet-daemon-regexprofiler.c:270
+#: src/regex/gnunet-daemon-regexprofiler.c:282
+#: src/regex/gnunet-daemon-regexprofiler.c:294
+#: src/regex/gnunet-daemon-regexprofiler.c:307
 #: 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:8347 src/mesh/gnunet-service-mesh.c:8357
-#: src/mesh/gnunet-service-mesh.c:8368 src/mesh/gnunet-service-mesh-new.c:4932
-#: src/mesh/gnunet-service-mesh-new.c:4942
-#: src/mesh/gnunet-service-mesh-new.c:4953
+#: src/mesh/gnunet-service-mesh.c:5852 src/mesh/gnunet-service-mesh.c:5862
+#: src/mesh/gnunet-service-mesh.c:5887
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -3917,253 +4091,204 @@ msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
 msgid "Could not access file `%s': %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/namestore/gnunet-namestore.c:212
+#: src/namestore/gnunet-namestore.c:250
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:243
+#: src/namestore/gnunet-namestore.c:281
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:304
+#: src/namestore/gnunet-namestore.c:342
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:320
+#: src/namestore/gnunet-namestore.c:358
 msgid "for at least"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:321
+#: src/namestore/gnunet-namestore.c:359
 msgid "until"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:356
+#: src/namestore/gnunet-namestore.c:475
+#, fuzzy, c-format
+msgid "Using default zone file `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/namestore/gnunet-namestore.c:484
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:386
-#, fuzzy, c-format
-msgid "Unsupported type `%s'\n"
-msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
-
-#: src/namestore/gnunet-namestore.c:394 src/namestore/gnunet-namestore.c:418
-#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:477
-#: src/namestore/gnunet-namestore.c:518
+#: src/namestore/gnunet-namestore.c:513 src/namestore/gnunet-namestore.c:522
+#: src/namestore/gnunet-namestore.c:539 src/namestore/gnunet-namestore.c:561
+#: src/namestore/gnunet-namestore.c:605
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore.c:395 src/namestore/gnunet-namestore.c:419
-msgid "add/del"
+#: src/namestore/gnunet-namestore.c:514 src/namestore/gnunet-namestore.c:523
+#: src/namestore/gnunet-namestore.c:540 src/namestore/gnunet-namestore.c:562
+msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:408
+#: src/namestore/gnunet-namestore.c:531
+#, fuzzy, c-format
+msgid "Unsupported type `%s'\n"
+msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
+
+#: src/namestore/gnunet-namestore.c:551
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
 
-#: src/namestore/gnunet-namestore.c:446
+#: src/namestore/gnunet-namestore.c:587
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:455
-#, c-format
-msgid ""
-"Deletion requires either absolute time, or no time at all. Got relative time "
-"`%s' instead.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
-#: src/namestore/gnunet-namestore.c:497
-msgid "add"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:496
-#, fuzzy, c-format
-msgid "No valid expiration time for operation `%s'\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/namestore/gnunet-namestore.c:519
+#: src/namestore/gnunet-namestore.c:606
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:701
+#: src/namestore/gnunet-namestore.c:649
+#: src/peerinfo-tool/gnunet-peerinfo.c:711
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:625
-#, fuzzy, c-format
-msgid "Using default zone file `%s'\n"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/namestore/gnunet-namestore.c:677
+#: src/namestore/gnunet-namestore.c:727
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:680
+#: src/namestore/gnunet-namestore.c:730
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:683
+#: src/namestore/gnunet-namestore.c:733
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:686
+#: src/namestore/gnunet-namestore.c:736
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:689
+#: src/namestore/gnunet-namestore.c:739
+#, fuzzy
+msgid "monitor changes in the namestore"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/namestore/gnunet-namestore.c:742
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:692
+#: src/namestore/gnunet-namestore.c:745
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:695
+#: src/namestore/gnunet-namestore.c:748
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
+#: src/namestore/gnunet-namestore.c:751
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:701
+#: src/namestore/gnunet-namestore.c:754
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:704
+#: src/namestore/gnunet-namestore.c:757
 msgid "create or list non-authority record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:707
+#: src/namestore/gnunet-namestore.c:760
 msgid "filename with the zone key"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:718
+#: src/namestore/gnunet-namestore.c:771
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
 
-#: src/namestore/gnunet-service-namestore.c:241
-#: src/namestore/gnunet-service-namestore.c:257
+#: src/namestore/gnunet-service-namestore.c:300
+#: src/namestore/gnunet-service-namestore.c:318
 #, fuzzy, c-format
 msgid "Failed to write zone key to file `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/namestore/gnunet-service-namestore.c:243
+#: src/namestore/gnunet-service-namestore.c:302
 msgid "file exists but reading key failed"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:259
+#: src/namestore/gnunet-service-namestore.c:320
 msgid "file exists with different key"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:1557
-#, fuzzy
-msgid "Failed to find record to remove\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
-
-#: src/namestore/gnunet-service-namestore.c:2172
-#, fuzzy, c-format
-msgid "Could not parse zone key file `%s'\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/namestore/gnunet-service-namestore.c:2262
+#: src/namestore/gnunet-service-namestore.c:2127
 #, fuzzy
 msgid "No directory to load zonefiles specified in configuration\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/namestore/gnunet-service-namestore.c:2272
+#: src/namestore/gnunet-service-namestore.c:2137
 #, c-format
 msgid "Creating directory `%s' for zone files failed!\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:345
+#: src/namestore/namestore_api.c:346
 msgid "Namestore failed to add record"
 msgstr ""
 
-#: src/namestore/namestore_api.c:371
+#: src/namestore/namestore_api.c:372
 msgid "Namestore failed to add record\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:415
-#, fuzzy
-msgid "Failed to create new signature"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-
-#: src/namestore/namestore_api.c:419
-#, fuzzy
-msgid "Failed to put new set of records in database"
-msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
-
-#: src/namestore/namestore_api.c:423
-#, fuzzy
-msgid "Failed to remove records from database"
-msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
-
-#: src/namestore/namestore_api.c:427
-#, fuzzy
-msgid "Failed to access database"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/namestore/namestore_api.c:431
-#, fuzzy
-msgid "unknown internal error in namestore"
-msgstr "=\tFel vid läsning av katalog.\n"
-
-#: src/namestore/namestore_api.c:436
-msgid "Protocol error"
-msgstr ""
-
-#: src/namestore/namestore_common.c:532 src/namestore/namestore_common.c:672
+#: src/namestore/namestore_api_common.c:532
+#: src/namestore/namestore_api_common.c:672
 #, fuzzy, c-format
 msgid "Unsupported record type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/namestore_common.c:539
+#: src/namestore/namestore_api_common.c:539
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/namestore/namestore_common.c:562
+#: src/namestore/namestore_api_common.c:562
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/namestore_common.c:585
+#: src/namestore/namestore_api_common.c:585
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/namestore_common.c:603
+#: src/namestore/namestore_api_common.c:603
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/namestore/namestore_common.c:616
+#: src/namestore/namestore_api_common.c:616
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/namestore_common.c:637
+#: src/namestore/namestore_api_common.c:637
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/namestore_common.c:663
+#: src/namestore/namestore_api_common.c:663
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -4316,20 +4441,15 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:1419
-#, 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:1433
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
-msgstr ""
-
-#: src/nse/gnunet-service-nse.c:1508
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
+#: src/nse/gnunet-service-nse.c:1472
+msgid "NSE service is lacking key configuration settings.  Exiting.\n"
+msgstr ""
+
 #: src/peerinfo/gnunet-service-peerinfo.c:215
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
@@ -4340,37 +4460,37 @@ msgstr "Tillgängliga transport(er): %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:370
+#: src/peerinfo/gnunet-service-peerinfo.c:372
 #, 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:445
+#: src/peerinfo/gnunet-service-peerinfo.c:450
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:481
+#: src/peerinfo/gnunet-service-peerinfo.c:486
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:633
+#: src/peerinfo/gnunet-service-peerinfo.c:639
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:638
+#: src/peerinfo/gnunet-service-peerinfo.c:644
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:970
+#: src/peerinfo/gnunet-service-peerinfo.c:979
 #, 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:1250
+#: src/peerinfo/gnunet-service-peerinfo.c:1269
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -4406,102 +4526,107 @@ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 msgid "Could not connect to `%s' service.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:427
+#: src/peerinfo-tool/gnunet-peerinfo.c:246
+#, c-format
+msgid "\tExpires: %s \t %s\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:437
 #, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:435
+#: src/peerinfo-tool/gnunet-peerinfo.c:445
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:444
+#: src/peerinfo-tool/gnunet-peerinfo.c:454
 #, 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
+#: src/peerinfo-tool/gnunet-peerinfo.c:467
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:521
+#: src/peerinfo-tool/gnunet-peerinfo.c:531
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:659
+#: src/peerinfo-tool/gnunet-peerinfo.c:669
 #, 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:665
+#: src/peerinfo-tool/gnunet-peerinfo.c:675
 #, 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:727
+#: src/peerinfo-tool/gnunet-peerinfo.c:734
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:759
+#: src/peerinfo-tool/gnunet-peerinfo.c:777
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:762
+#: src/peerinfo-tool/gnunet-peerinfo.c:780
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:765
+#: src/peerinfo-tool/gnunet-peerinfo.c:783
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:768
+#: src/peerinfo-tool/gnunet-peerinfo.c:786
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:771
+#: src/peerinfo-tool/gnunet-peerinfo.c:789
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:774
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:777
+#: src/peerinfo-tool/gnunet-peerinfo.c:795
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:780
+#: src/peerinfo-tool/gnunet-peerinfo.c:798
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:791
+#: src/peerinfo-tool/gnunet-peerinfo.c:809
 #, 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:120
+#: src/transport/gnunet-service-transport_plugins.c:123
 #, 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:124
+#: src/transport/gnunet-service-transport_plugins.c:127
 #, 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:153
+#: src/transport/gnunet-service-transport_plugins.c:157
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
@@ -4516,143 +4641,136 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 msgid "Unable to initialize Postgres: %s"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/pt/gnunet-daemon-pt.c:264
+#: src/pt/gnunet-daemon-pt.c:266
 #, fuzzy
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/pt/gnunet-daemon-pt.c:270
+#: src/pt/gnunet-daemon-pt.c:272
 #, fuzzy
 msgid "# DNS requests mapped to VPN"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:323
+#: src/pt/gnunet-daemon-pt.c:325
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:500
+#: src/pt/gnunet-daemon-pt.c:502
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:506
+#: src/pt/gnunet-daemon-pt.c:508
 #, fuzzy
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/pt/gnunet-daemon-pt.c:602
+#: src/pt/gnunet-daemon-pt.c:604
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/pt/gnunet-daemon-pt.c:632
+#: src/pt/gnunet-daemon-pt.c:634
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:637
+#: src/pt/gnunet-daemon-pt.c:639
 msgid "# DNS requests dropped (DNS mesh tunnel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:645
+#: src/pt/gnunet-daemon-pt.c:647
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:716
+#: src/pt/gnunet-daemon-pt.c:715
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# byte mottogs via TCP"
 
-#: src/pt/gnunet-daemon-pt.c:730
+#: src/pt/gnunet-daemon-pt.c:729
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# byte mottagna av typen %d"
 
-#: src/pt/gnunet-daemon-pt.c:748 src/pt/gnunet-daemon-pt.c:760
+#: src/pt/gnunet-daemon-pt.c:747 src/pt/gnunet-daemon-pt.c:759
 msgid "# DNS requests aborted (tunnel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:898 src/pt/gnunet-daemon-pt.c:907
+#: src/pt/gnunet-daemon-pt.c:901 src/pt/gnunet-daemon-pt.c:910
 #: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/pt/gnunet-daemon-pt.c:976
+#: src/pt/gnunet-daemon-pt.c:977
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:432
+#: src/regex/gnunet-daemon-regexprofiler.c:384
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1247
+#: src/regex/gnunet-regex-profiler.c:1279
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/regex/gnunet-regex-profiler.c:1258
+#: src/regex/gnunet-regex-profiler.c:1290
 #, fuzzy
 msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1287
+#: src/regex/gnunet-regex-profiler.c:1319
 #: 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:1293
+#: src/regex/gnunet-regex-profiler.c:1325
 #: 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:1300
+#: src/regex/gnunet-regex-profiler.c:1332
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1309
+#: src/regex/gnunet-regex-profiler.c:1341
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1319
-#, fuzzy
-msgid ""
-"Error loading search strings.Given file does not contain enough strings. "
-"Exiting.\n"
-msgstr "Fel vid lämning av DHT.\n"
-
-#: src/regex/gnunet-regex-profiler.c:1327
+#: src/regex/gnunet-regex-profiler.c:1361
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1394
+#: src/regex/gnunet-regex-profiler.c:1443
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1397
+#: src/regex/gnunet-regex-profiler.c:1446
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1400
+#: src/regex/gnunet-regex-profiler.c:1449
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1403
+#: src/regex/gnunet-regex-profiler.c:1452
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1406
+#: src/regex/gnunet-regex-profiler.c:1455
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1418
+#: src/regex/gnunet-regex-profiler.c:1467
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4669,6 +4787,32 @@ msgstr ""
 msgid "Profiler for regex library"
 msgstr ""
 
+#: src/set/gnunet-set-ibf-profiler.c:224
+#, fuzzy
+msgid "number of element in set A-B"
+msgstr "antal iterationer"
+
+#: src/set/gnunet-set-ibf-profiler.c:227
+#, fuzzy
+msgid "number of element in set B-A"
+msgstr "antal iterationer"
+
+#: src/set/gnunet-set-ibf-profiler.c:230
+msgid "number of common elements in A and B"
+msgstr ""
+
+#: src/set/gnunet-set-ibf-profiler.c:233
+msgid "hash num"
+msgstr ""
+
+#: src/set/gnunet-set-ibf-profiler.c:236
+msgid "ibf size"
+msgstr ""
+
+#: src/set/gnunet-set-profiler.c:296
+msgid "oeration to execute"
+msgstr ""
+
 #: src/statistics/gnunet-service-statistics.c:271
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
@@ -4689,68 +4833,68 @@ msgstr "Misslyckades att binda till UDP-port %d.\n"
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:181
-#, fuzzy, c-format
-msgid "Trying to connect to remote host, but service `%s' is not running\n"
-msgstr "Kunde inte ansluta till gnunetd.\n"
-
-#: src/statistics/gnunet-statistics.c:190
-#, fuzzy, c-format
-msgid "A port is required to connect to host `%s'\n"
-msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
-
-#: src/statistics/gnunet-statistics.c:196
-#, c-format
-msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:210
+#: src/statistics/gnunet-statistics.c:186
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:216
+#: src/statistics/gnunet-statistics.c:192
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:247
+#: src/statistics/gnunet-statistics.c:223
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:255
+#: src/statistics/gnunet-statistics.c:231
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/statistics/gnunet-statistics.c:310
+#: src/statistics/gnunet-statistics.c:258
+#, fuzzy, c-format
+msgid "Trying to connect to remote host, but service `%s' is not running\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/statistics/gnunet-statistics.c:266
+#, fuzzy, c-format
+msgid "A port is required to connect to host `%s'\n"
+msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
+
+#: src/statistics/gnunet-statistics.c:273
+#, c-format
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:331
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:313
+#: src/statistics/gnunet-statistics.c:334
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:316
+#: src/statistics/gnunet-statistics.c:337
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:319
+#: src/statistics/gnunet-statistics.c:340
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:322
+#: src/statistics/gnunet-statistics.c:343
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:325
+#: src/statistics/gnunet-statistics.c:346
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:328
+#: src/statistics/gnunet-statistics.c:349
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:361
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
@@ -4770,12 +4914,26 @@ msgstr ""
 msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:692
+#: src/testbed/gnunet-service-testbed_cpustatus.c:727
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
+#: src/testbed/gnunet-service-testbed_peers.c:964
+#, fuzzy
+msgid "Misconfiguration (can't connect to the ARM service)"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/testbed/gnunet-service-testbed_peers.c:970
+msgid "Request doesn't fit into a message"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1008
+#, c-format
+msgid "%s service can't be started because ARM is shutting down"
+msgstr ""
+
 #: src/testbed/gnunet_testbed_ll_master.c:57
 #, fuzzy, c-format
 msgid "Job command file not given. Exiting\n"
@@ -4824,50 +4982,50 @@ msgstr ""
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1879
+#: src/testbed/testbed_api_hosts.c:1878
 #, 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:891
+#: src/testbed/testbed_api_testbed.c:802
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1094
+#: src/testbed/testbed_api_testbed.c:944
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1175
+#: src/testbed/testbed_api_testbed.c:1009
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1320
+#: src/testbed/testbed_api_testbed.c:1111
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1324
+#: src/testbed/testbed_api_testbed.c:1115
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1365
+#: src/testbed/testbed_api_testbed.c:1153
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1383
+#: src/testbed/testbed_api_testbed.c:1171
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1443
+#: src/testbed/testbed_api_testbed.c:1231
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1455
+#: src/testbed/testbed_api_testbed.c:1243
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1479
+#: src/testbed/testbed_api_testbed.c:1267
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
@@ -4913,33 +5071,33 @@ msgstr ""
 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:133
+#: src/testing/gnunet-testing.c:130
 #, 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:210
+#: src/testing/gnunet-testing.c:199
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/testing/gnunet-testing.c:212
+#: src/testing/gnunet-testing.c:201
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:214
+#: src/testing/gnunet-testing.c:203
 #, 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:216
+#: src/testing/gnunet-testing.c:205
 #, fuzzy
 msgid "configuration template"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/testing/gnunet-testing.c:225
+#: src/testing/gnunet-testing.c:214
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -4967,54 +5125,54 @@ msgstr ""
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:719
+#: src/testing/testing.c:722
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/testing/testing.c:730
+#: src/testing/testing.c:733
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/testing/testing.c:1175
+#: src/testing/testing.c:1177
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/testing/testing.c:1182
+#: src/testing/testing.c:1184
 #, 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:1191
+#: src/testing/testing.c:1193
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/testing/testing.c:1211
+#: src/testing/testing.c:1209
 #, fuzzy, c-format
 msgid "Cannot open hostkey file: %s\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:1221
+#: src/testing/testing.c:1219
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/testing/testing.c:1243
+#: src/testing/testing.c:1241
 #, 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:1343
+#: src/testing/testing.c:1341
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/testing/testing.c:1709
+#: src/testing/testing.c:1707
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -5124,27 +5282,34 @@ msgstr ""
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:174
+#: src/transport/gnunet-service-transport.c:169
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport.c:239
+#: src/transport/gnunet-service-transport.c:235
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# byte krypterade"
 
-#: src/transport/gnunet-service-transport.c:286
+#: src/transport/gnunet-service-transport.c:282
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
 
-#: src/transport/gnunet-service-transport.c:642
+#: src/transport/gnunet-service-transport.c:432
 #, fuzzy, c-format
-msgid "Transport service could not access hostkey: %s. Exiting.\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+msgid "Could not obtain a valid network for `%s' %s\n"
+msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport.c:741
+#: src/transport/gnunet-service-transport.c:480
+#, c-format
+msgid ""
+"Address or session unknown: failed to update properties for peer `%s' plugin "
+"`%s' address `%s' session %p\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:754
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5237,108 +5402,138 @@ msgstr ""
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2774
+#: src/transport/gnunet-service-transport_neighbours.c:2769
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2789
-#: src/transport/gnunet-service-transport_neighbours.c:2823
+#: src/transport/gnunet-service-transport_neighbours.c:2784
+#: src/transport/gnunet-service-transport_neighbours.c:2815
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2836
+#: src/transport/gnunet-service-transport_neighbours.c:2828
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2869
+#: src/transport/gnunet-service-transport_neighbours.c:2859
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3050
+#: src/transport/gnunet-service-transport_neighbours.c:3040
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3105
+#: src/transport/gnunet-service-transport_neighbours.c:3093
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3119
+#: src/transport/gnunet-service-transport_neighbours.c:3107
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3138
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3161
+#: src/transport/gnunet-service-transport_neighbours.c:3149
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3192
+#: src/transport/gnunet-service-transport_neighbours.c:3188
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3287
+#: 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:113
+#: src/transport/gnunet-service-transport_plugins.c:116
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:453
+#: src/transport/gnunet-service-transport_plugins.c:170
+#: src/transport/gnunet-service-transport_plugins.c:178
+#: src/transport/gnunet-service-transport_plugins.c:186
+#: src/transport/gnunet-service-transport_plugins.c:194
+#: src/transport/gnunet-service-transport_plugins.c:202
+#: src/transport/gnunet-service-transport_plugins.c:210
+#: src/transport/gnunet-service-transport_plugins.c:218
+#: src/transport/gnunet-service-transport_plugins.c:226
+#, fuzzy, c-format
+msgid "Missing function `%s' in transport plugin for `%s'\n"
+msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#: src/transport/gnunet-service-transport_plugins.c:233
+#, c-format
+msgid "Did not load plugin `%s' due to missing functions\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:455
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:515
+#: src/transport/gnunet-service-transport_validation.c:518
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:564
+#: src/transport/gnunet-service-transport_validation.c:575
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/transport/gnunet-service-transport_validation.c:651
+#: src/transport/gnunet-service-transport_validation.c:664
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:910
+#: src/transport/gnunet-service-transport_validation.c:930
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_validation.c:955
+#: src/transport/gnunet-service-transport_validation.c:989
+msgid "# failed address checks during validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:999
+msgid "# successful address checks during validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1018
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1051
+#: src/transport/gnunet-service-transport_validation.c:1072
+#, fuzzy, c-format
+msgid "Failed to create PONG signature for peer `%s'\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/transport/gnunet-service-transport_validation.c:1117
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1060
+#: src/transport/gnunet-service-transport_validation.c:1126
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1187
+#: src/transport/gnunet-service-transport_validation.c:1253
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1202
+#: src/transport/gnunet-service-transport_validation.c:1268
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1305
+#: src/transport/gnunet-service-transport_validation.c:1374
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
@@ -5424,112 +5619,188 @@ msgstr "# av anslutna parter"
 msgid "Failed to send connect request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:819
+#: src/transport/gnunet-transport.c:828
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:825
+#: src/transport/gnunet-transport.c:834
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:845 src/transport/gnunet-transport.c:875
-#: src/transport/gnunet-transport.c:897 src/transport/gnunet-transport.c:936
+#: src/transport/gnunet-transport.c:854 src/transport/gnunet-transport.c:884
+#: src/transport/gnunet-transport.c:906 src/transport/gnunet-transport.c:945
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:852 src/transport/gnunet-transport.c:882
+#: src/transport/gnunet-transport.c:861 src/transport/gnunet-transport.c:891
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:902
+#: src/transport/gnunet-transport.c:911
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:987
+#: src/transport/gnunet-transport.c:995
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:990
+#: src/transport/gnunet-transport.c:998
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:993
+#: src/transport/gnunet-transport.c:1001
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:999
+#: src/transport/gnunet-transport.c:1007
 #, fuzzy
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:1010
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:1005
+#: src/transport/gnunet-transport.c:1013
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1009
+#: src/transport/gnunet-transport.c:1017
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1012
+#: src/transport/gnunet-transport.c:1020
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1023
+#: src/transport/gnunet-transport.c:1031
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
+#: src/transport/plugin_transport_bluetooth.c:612
+msgid "# Bluetooth ACKs sent"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:631
+#, fuzzy
+msgid "# Bluetooth messages defragmented"
+msgstr "# PING-meddelanden skapade"
+
+#: src/transport/plugin_transport_bluetooth.c:677
+#: src/transport/plugin_transport_bluetooth.c:727
+#: src/transport/plugin_transport_bluetooth.c:1833
+#, fuzzy
+msgid "# Bluetooth sessions allocated"
+msgstr "# sessionsnycklar accepterade"
+
+#: src/transport/plugin_transport_bluetooth.c:802
+#, fuzzy
+msgid "# Bluetooth message fragments sent"
+msgstr "# byte mottogs via TCP"
+
+#: src/transport/plugin_transport_bluetooth.c:826
+msgid "# Bluetooth messages pending (with fragmentation)"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:934
+#: src/transport/plugin_transport_bluetooth.c:1019
+#: src/transport/plugin_transport_bluetooth.c:1835
+#, fuzzy
+msgid "# Bluetooth MAC endpoints allocated"
+msgstr "# byte mottogs via TCP"
+
+#: src/transport/plugin_transport_bluetooth.c:1214
+#, fuzzy
+msgid "# HELLO messages received via Bluetooth"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/plugin_transport_bluetooth.c:1240
+#, fuzzy
+msgid "# fragments received via Bluetooth"
+msgstr "# byte mottogs via TCP"
+
+#: src/transport/plugin_transport_bluetooth.c:1250
+#, fuzzy
+msgid "# ACKs received via Bluetooth"
+msgstr "# byte mottogs via TCP"
+
+#: src/transport/plugin_transport_bluetooth.c:1307
+#, fuzzy
+msgid "# Bluetooth DATA messages discarded due to CRC32 error"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/transport/plugin_transport_bluetooth.c:1419
+#, fuzzy
+msgid "# DATA messages received via Bluetooth"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/plugin_transport_bluetooth.c:1454
+#, fuzzy
+msgid "# Bluetooth DATA messages processed"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/transport/plugin_transport_bluetooth.c:1517
+#, fuzzy
+msgid "# HELLO beacons sent via Bluetooth"
+msgstr "# byte skickade via UDP"
+
+#: src/transport/plugin_transport_bluetooth.c:1630
+msgid "Bluetooth address with invalid size encountered\n"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:1814
+#, c-format
+msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
+msgstr ""
+
 #: src/transport/plugin_transport_http.c:815
-#: src/transport/plugin_transport_http_server.c:2566
+#: src/transport/plugin_transport_http_server.c:2585
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:864
-#: src/transport/plugin_transport_http_server.c:2334
+#: src/transport/plugin_transport_http_server.c:2353
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
 #: src/transport/plugin_transport_http.c:896
-#: src/transport/plugin_transport_http_server.c:2366 src/util/service.c:1053
+#: src/transport/plugin_transport_http_server.c:2385 src/util/service.c:1062
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
 #: src/transport/plugin_transport_http.c:913
-#: src/transport/plugin_transport_http_server.c:2383 src/util/service.c:1070
+#: src/transport/plugin_transport_http_server.c:2402 src/util/service.c:1079
 #, 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:1018
-#: src/transport/plugin_transport_http_server.c:2494
+#: src/transport/plugin_transport_http_server.c:2513
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1131
-#: src/transport/plugin_transport_http_server.c:2673
+#: src/transport/plugin_transport_http_server.c:2693
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1144
-#: src/transport/plugin_transport_http_server.c:2684
+#: src/transport/plugin_transport_http_server.c:2704
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
@@ -5553,7 +5824,7 @@ msgid ""
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2774
+#: src/transport/plugin_transport_http_server.c:2819
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Startade samling \"%s\".\n"
@@ -5562,98 +5833,98 @@ msgstr "Startade samling \"%s\".\n"
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1535
+#: src/transport/plugin_transport_http_client.c:1582
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1666
-#: src/transport/plugin_transport_http_server.c:2898
+#: src/transport/plugin_transport_http_client.c:1713
+#: src/transport/plugin_transport_http_server.c:2943
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1691
-#: src/transport/plugin_transport_http_server.c:2957
+#: src/transport/plugin_transport_http_client.c:1738
+#: src/transport/plugin_transport_http_server.c:3003
 #, 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:1719
-#: src/transport/plugin_transport_http_server.c:2804
+#: src/transport/plugin_transport_http_client.c:1766
+#: src/transport/plugin_transport_http_server.c:2849
 #, 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:1352
+#: src/transport/plugin_transport_http_server.c:1368
 #, 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:1613
+#: src/transport/plugin_transport_http_server.c:1632
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1621
+#: src/transport/plugin_transport_http_server.c:1640
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1922
+#: src/transport/plugin_transport_http_server.c:1941
 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:1946
+#: src/transport/plugin_transport_http_server.c:1965
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2652
+#: src/transport/plugin_transport_http_server.c:2672
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2666
+#: src/transport/plugin_transport_http_server.c:2686
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2691
+#: src/transport/plugin_transport_http_server.c:2711
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2706
+#: src/transport/plugin_transport_http_server.c:2726
 #, 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:2716
+#: src/transport/plugin_transport_http_server.c:2736
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2737
+#: src/transport/plugin_transport_http_server.c:2757
 #, 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:2747
+#: src/transport/plugin_transport_http_server.c:2767
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2790
+#: src/transport/plugin_transport_http_server.c:2835
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -5706,92 +5977,92 @@ msgstr "# byte skickades via TCP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:596
+#: src/transport/plugin_transport_tcp.c:627
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:772
-#: src/transport/plugin_transport_tcp.c:861
-#: src/transport/plugin_transport_tcp.c:911
-#: src/transport/plugin_transport_tcp.c:997
-#: src/transport/plugin_transport_tcp.c:1140
-#: src/transport/plugin_transport_tcp.c:1157
+#: src/transport/plugin_transport_tcp.c:836
+#: src/transport/plugin_transport_tcp.c:925
+#: src/transport/plugin_transport_tcp.c:975
+#: src/transport/plugin_transport_tcp.c:1061
+#: src/transport/plugin_transport_tcp.c:1204
+#: src/transport/plugin_transport_tcp.c:1221
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_tcp.c:779
-#: src/transport/plugin_transport_tcp.c:968
-#: src/transport/plugin_transport_tcp.c:1827
-#: src/transport/plugin_transport_tcp.c:2460
+#: src/transport/plugin_transport_tcp.c:843
+#: src/transport/plugin_transport_tcp.c:1032
+#: src/transport/plugin_transport_tcp.c:2013
+#: src/transport/plugin_transport_tcp.c:2688
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:865
+#: src/transport/plugin_transport_tcp.c:929
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:914
+#: src/transport/plugin_transport_tcp.c:978
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:1001
+#: src/transport/plugin_transport_tcp.c:1065
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1114
+#: src/transport/plugin_transport_tcp.c:1178
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1350
-#, c-format
-msgid "Address of unexpected length: %u\n"
+#: src/transport/plugin_transport_tcp.c:1415
+#: src/transport/plugin_transport_udp.c:1454
+msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:1532
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1868
+#: src/transport/plugin_transport_tcp.c:2063
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:2037
+#: src/transport/plugin_transport_tcp.c:2246
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2119
+#: src/transport/plugin_transport_tcp.c:2326
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2345 src/util/service.c:948
-#: src/util/service.c:954
+#: src/transport/plugin_transport_tcp.c:2568 src/util/service.c:957
+#: src/util/service.c:963
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2359
+#: src/transport/plugin_transport_tcp.c:2582
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2448
+#: src/transport/plugin_transport_tcp.c:2675
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2452
+#: src/transport/plugin_transport_tcp.c:2679
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2456
+#: src/transport/plugin_transport_tcp.c:2683
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5816,14 +6087,21 @@ msgstr ""
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2350
+#: src/transport/plugin_transport_udp.c:1556
+#, c-format
+msgid ""
+"Trying to create session for address of unexpected length %u (should be %u "
+"or %u)\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2587
 #, 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:2364
+#: src/transport/plugin_transport_udp.c:2601
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5831,103 +6109,103 @@ msgid ""
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2664
+#: src/transport/plugin_transport_udp.c:2901
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:2762
+#: src/transport/plugin_transport_udp.c:2999
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2805
+#: src/transport/plugin_transport_udp.c:3042
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_udp.c:2862
+#: src/transport/plugin_transport_udp.c:3101
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1427
+#: src/transport/plugin_transport_unix.c:1641
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_wlan.c:580
+#: src/transport/plugin_transport_wlan.c:610
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:599
+#: src/transport/plugin_transport_wlan.c:629
 #, fuzzy
 msgid "# WLAN messages defragmented"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/plugin_transport_wlan.c:645
-#: src/transport/plugin_transport_wlan.c:695
-#: src/transport/plugin_transport_wlan.c:1764
+#: src/transport/plugin_transport_wlan.c:675
+#: src/transport/plugin_transport_wlan.c:742
+#: src/transport/plugin_transport_wlan.c:1874
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_wlan.c:770
+#: src/transport/plugin_transport_wlan.c:835
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:794
+#: src/transport/plugin_transport_wlan.c:859
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:902
-#: src/transport/plugin_transport_wlan.c:987
-#: src/transport/plugin_transport_wlan.c:1766
+#: src/transport/plugin_transport_wlan.c:967
+#: src/transport/plugin_transport_wlan.c:1052
+#: src/transport/plugin_transport_wlan.c:1876
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1166
+#: src/transport/plugin_transport_wlan.c:1247
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1192
+#: src/transport/plugin_transport_wlan.c:1273
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1202
+#: src/transport/plugin_transport_wlan.c:1283
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1259
+#: src/transport/plugin_transport_wlan.c:1340
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_wlan.c:1364
+#: src/transport/plugin_transport_wlan.c:1460
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1399
+#: src/transport/plugin_transport_wlan.c:1495
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1460
+#: src/transport/plugin_transport_wlan.c:1558
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_wlan.c:1569
+#: src/transport/plugin_transport_wlan.c:1671
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1745
+#: src/transport/plugin_transport_wlan.c:1855
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
@@ -5972,43 +6250,39 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:276 src/util/client.c:753 src/util/service.c:984
+#: src/util/client.c:261 src/util/client.c:839 src/util/service.c:993
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:280 src/util/client.c:757 src/util/service.c:988
+#: src/util/client.c:265 src/util/client.c:843 src/util/service.c:997
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/util/client.c:371
+#: src/util/client.c:357
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:379
+#: src/util/client.c:365
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:698
-msgid "Failure to transmit TEST request.\n"
-msgstr ""
-
-#: src/util/client.c:898
+#: src/util/client.c:981
 #, fuzzy, c-format
-msgid "Could not connect to service `%s', must not be running.\n"
+msgid "Could not connect to service `%s', configuration broken.\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/util/client.c:912
+#: src/util/client.c:993
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/util/client.c:1178
+#: src/util/client.c:1259
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -6070,7 +6344,7 @@ msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/configuration.c:998
+#: src/util/configuration.c:984
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -6110,61 +6384,41 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: 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: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:555 src/util/crypto_ecc.c:599
-#: src/util/crypto_rsa.c:750 src/util/crypto_rsa.c:887
+#: src/util/crypto_ecc.c:534 src/util/crypto_ecc.c:572
 #, 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:560 src/util/crypto_rsa.c:892
+#: src/util/crypto_ecc.c:539
 #, 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:603 src/util/crypto_rsa.c:754
-#: src/util/crypto_rsa.c:790
+#: src/util/crypto_ecc.c:576
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:634 src/util/crypto_rsa.c:785
+#: src/util/crypto_ecc.c:607
 #, 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:639
+#: src/util/crypto_ecc.c:612
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: 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:776 src/util/crypto_rsa.c:982
-msgid "interrupted by shutdown"
-msgstr ""
-
-#: src/util/crypto_ecc.c:787
+#: src/util/crypto_ecc.c:694
 #, fuzzy
-msgid "gnunet-ecc failed"
-msgstr "gnunet-update misslyckades!"
+msgid "Could not load peer's private key\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/crypto_ecc.c:1084
+#: src/util/crypto_ecc.c:756
+#, 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:836
 #, fuzzy, c-format
 msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -6179,40 +6433,17 @@ msgstr ""
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 
-#: src/util/crypto_rsa.c:660
-#, fuzzy, c-format
-msgid ""
-"File `%s' does not contain a valid private key (too long, %llu bytes).  "
-"Renaming it.\n"
-msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
-
-#: src/util/crypto_rsa.c:993
-#, fuzzy
-msgid "gnunet-rsa failed"
-msgstr "gnunet-update misslyckades!"
-
-#: src/util/crypto_rsa.c:1378
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr ""
-
-# drive = hard drive ?
-#: src/util/disk.c:602
-#, fuzzy, c-format
-msgid "`%s' failed for drive `%S': %u\n"
-msgstr "\"%s\" misslyckades för enhet %s: %u\n"
-
-#: src/util/disk.c:1207
+#: src/util/disk.c:1149
 #, 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:1564 src/util/service.c:1670
+#: src/util/disk.c:1506 src/util/service.c:1679
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/util/disk.c:2007
+#: src/util/disk.c:1953
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
@@ -6327,75 +6558,71 @@ msgstr ""
 msgid "Manipulate GNUnet configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet-ecc.c:76
+#: src/util/gnunet-ecc.c:65
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/gnunet-ecc.c:82
+#: src/util/gnunet-ecc.c:71
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:100
+#: src/util/gnunet-ecc.c:87
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/gnunet-ecc.c:112
+#: src/util/gnunet-ecc.c:97
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr "Slutför"
 
-#: src/util/gnunet-ecc.c:115
+#: src/util/gnunet-ecc.c:100
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:138 src/util/gnunet-rsa.c:65
+#: src/util/gnunet-ecc.c:123
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:193
+#: src/util/gnunet-ecc.c:178
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:196 src/util/gnunet-rsa.c:115
+#: src/util/gnunet-ecc.c:181
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:199 src/util/gnunet-rsa.c:118
+#: src/util/gnunet-ecc.c:184
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:202 src/util/gnunet-rsa.c:121
+#: src/util/gnunet-ecc.c:187
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:213
+#: src/util/gnunet-ecc.c:198
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet-resolver.c:148
+#: src/util/gnunet-resolver.c:149
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:159
+#: src/util/gnunet-resolver.c:160
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:132
-msgid "Manipulate GNUnet private RSA key files"
-msgstr ""
-
 #: src/util/gnunet-service-resolver.c:288
 #, fuzzy, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
@@ -6431,17 +6658,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:322
+#: src/util/helper.c:330
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/helper.c:367
+#: src/util/helper.c:375
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/helper.c:564
+#: src/util/helper.c:572
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
@@ -6451,7 +6678,7 @@ msgstr "Fel vid skapandet av användare"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1331
+#: src/util/network.c:1344
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -6470,12 +6697,12 @@ 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
+#: src/util/os_installation.c:769
 #, 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
+#: src/util/os_installation.c:779
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -6500,7 +6727,7 @@ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/util/program.c:254 src/util/service.c:1792
+#: src/util/program.c:254 src/util/service.c:1801
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
@@ -6543,143 +6770,143 @@ msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/server.c:436
+#: src/util/server.c:476
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/server.c:445
+#: src/util/server.c:485
 #, 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:456
+#: src/util/server.c:496
 #, 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:848
+#: src/util/server.c:888
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
-#: src/util/service.c:232 src/util/service.c:239
+#: src/util/service.c:151 src/util/service.c:177 src/util/service.c:220
+#: src/util/service.c:241 src/util/service.c:248
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/service.c:195
+#: src/util/service.c:204
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
 
-#: src/util/service.c:288
+#: src/util/service.c:297
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/util/service.c:320
+#: src/util/service.c:329
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/util/service.c:350
+#: src/util/service.c:359
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
 
-#: src/util/service.c:707
+#: src/util/service.c:716
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:712
+#: src/util/service.c:721
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/util/service.c:719
+#: src/util/service.c:728
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:774
+#: src/util/service.c:783
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:811
+#: src/util/service.c:820
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:929
+#: src/util/service.c:938
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1007
+#: src/util/service.c:1016
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1024
+#: src/util/service.c:1033
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1258
+#: src/util/service.c:1267
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1309 src/util/service.c:1327
+#: src/util/service.c:1318 src/util/service.c:1336
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1354
+#: src/util/service.c:1363
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1526
+#: src/util/service.c:1535
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/service.c:1559
+#: src/util/service.c:1568
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/util/service.c:1608
+#: src/util/service.c:1617
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1612
+#: src/util/service.c:1621
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1616
+#: src/util/service.c:1625
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1671
+#: src/util/service.c:1680
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1684
+#: src/util/service.c:1693
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
 
-#: src/util/service.c:1750
+#: src/util/service.c:1759
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6760,105 +6987,105 @@ msgstr ""
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/vpn/gnunet-service-vpn.c:512 src/vpn/gnunet-service-vpn.c:1088
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1130
 #, fuzzy
 msgid "# Active tunnels"
 msgstr "Nätverksanslutning"
 
-#: src/vpn/gnunet-service-vpn.c:609 src/vpn/gnunet-service-vpn.c:646
+#: src/vpn/gnunet-service-vpn.c:622 src/vpn/gnunet-service-vpn.c:661
 #, fuzzy
 msgid "# peers connected to mesh tunnels"
 msgstr "# av anslutna parter"
 
-#: src/vpn/gnunet-service-vpn.c:699
+#: src/vpn/gnunet-service-vpn.c:712
 #, fuzzy
 msgid "# Bytes given to mesh for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/vpn/gnunet-service-vpn.c:737
+#: src/vpn/gnunet-service-vpn.c:750
 #, fuzzy
 msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/vpn/gnunet-service-vpn.c:771
+#: src/vpn/gnunet-service-vpn.c:814
 #, fuzzy
 msgid "# Mesh tunnels created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/vpn/gnunet-service-vpn.c:794
+#: src/vpn/gnunet-service-vpn.c:839
 #, fuzzy
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/vpn/gnunet-service-vpn.c:990
+#: src/vpn/gnunet-service-vpn.c:1032
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1308
+#: src/vpn/gnunet-service-vpn.c:1350
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1329
+#: src/vpn/gnunet-service-vpn.c:1371
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1534
+#: src/vpn/gnunet-service-vpn.c:1576
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1572 src/vpn/gnunet-service-vpn.c:1613
+#: src/vpn/gnunet-service-vpn.c:1614 src/vpn/gnunet-service-vpn.c:1655
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1623
+#: src/vpn/gnunet-service-vpn.c:1665
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1637
+#: src/vpn/gnunet-service-vpn.c:1679
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1721
+#: src/vpn/gnunet-service-vpn.c:1761
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2062
+#: src/vpn/gnunet-service-vpn.c:2100
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2220
+#: src/vpn/gnunet-service-vpn.c:2255
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2371
+#: src/vpn/gnunet-service-vpn.c:2406
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2426
+#: src/vpn/gnunet-service-vpn.c:2461
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2465 src/vpn/gnunet-service-vpn.c:2678
+#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2713
 #, fuzzy
 msgid "# Active destinations"
 msgstr "Nätverksanslutning"
 
-#: src/vpn/gnunet-service-vpn.c:2751
+#: src/vpn/gnunet-service-vpn.c:2786
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3138
+#: src/vpn/gnunet-service-vpn.c:3143
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3170
+#: src/vpn/gnunet-service-vpn.c:3175
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -6934,23 +7161,144 @@ msgstr "# byte mottagna via UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
-#: src/include/gnunet_common.h:591
+#: src/include/gnunet_common.h:588 src/include/gnunet_common.h:593
+#: src/include/gnunet_common.h:599
 #, 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:601
+#: src/include/gnunet_common.h:609
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:622 src/include/gnunet_common.h:629
+#: src/include/gnunet_common.h:630 src/include/gnunet_common.h:637
 #, 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 "number of peers to start"
+#~ msgstr "antal iterationer"
+
+#, fuzzy
+#~ msgid "Failed to read or generate private key: %s\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Transport service is unable to access hostkey. Exiting.\n"
+#~ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#, fuzzy
+#~ msgid "Failed to create or read private key for namespace `%s'\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Failed to read private key for namespace `%s'\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Internal error."
+#~ msgstr "Okänt fel.\n"
+
+#, fuzzy
+#~ msgid "ECDSA signature verification failed at %s:%d: %s\n"
+#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Failed to create namespace `%s' (illegal filename?)\n"
+#~ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#, fuzzy
+#~ msgid "# Replies received from STREAM"
+#~ msgstr "# byte mottagna via HTTP"
+
+#, fuzzy
+#~ msgid "Mesh service could not access hostkey: %s. Exiting.\n"
+#~ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#, fuzzy
+#~ msgid "No valid expiration time for operation `%s'\n"
+#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#, fuzzy
+#~ msgid "Failed to find record to remove\n"
+#~ msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Could not parse zone key file `%s'\n"
+#~ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Failed to create new signature"
+#~ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#, fuzzy
+#~ msgid "Failed to put new set of records in database"
+#~ msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#, fuzzy
+#~ msgid "Failed to remove records from database"
+#~ msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
+
+#, fuzzy
+#~ msgid "Failed to access database"
+#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#, fuzzy
+#~ msgid "unknown internal error in namestore"
+#~ msgstr "=\tFel vid läsning av katalog.\n"
+
+#, fuzzy
+#~ msgid "NSE service could not access hostkey: %s\n"
+#~ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error loading search strings.Given file does not contain enough strings. "
+#~ "Exiting.\n"
+#~ msgstr "Fel vid lämning av DHT.\n"
+
+#, fuzzy
+#~ msgid "Transport service could not access hostkey: %s. Exiting.\n"
+#~ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+#~ msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
+
+#, fuzzy
+#~ msgid "gnunet-ecc failed"
+#~ msgstr "gnunet-update misslyckades!"
+
+#, fuzzy
+#~ msgid ""
+#~ "File `%s' does not contain a valid private key (too long, %llu bytes).  "
+#~ "Renaming it.\n"
+#~ msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
+
+#, fuzzy
+#~ msgid "gnunet-rsa failed"
+#~ msgstr "gnunet-update misslyckades!"
+
+# drive = hard drive ?
+#, fuzzy
+#~ msgid "`%s' failed for drive `%S': %u\n"
+#~ msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+
+#, fuzzy
 #~ msgid "Service `%s' has been stopped.\n"
 #~ msgstr "Tjänst borttagen.\n"
 
@@ -7086,10 +7434,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "Skriv ut information om GNUnets motparter."
 
 #, fuzzy
-#~ msgid "Connected to %s\n"
-#~ msgstr "\"%s\" ansluten till \"%s\".\n"
-
-#, fuzzy
 #~ msgid "list information for all peers"
 #~ msgstr "Skriv ut information om GNUnets motparter."
 
@@ -7232,10 +7576,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "GNUnet-konfiguration"
 
 #, fuzzy
-#~ msgid "Could not access hostkey.\n"
-#~ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#, fuzzy
 #~ msgid "`scp' did not complete cleanly.\n"
 #~ msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
 
@@ -7280,10 +7620,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
 
 #, fuzzy
-#~ msgid "Starting service %s for peer `%4s'\n"
-#~ msgstr "Startade samling \"%s\".\n"
-
-#, fuzzy
 #~ msgid "Could not start `%s' process to copy configuration directory.\n"
 #~ msgstr "Kunde inte skapa värdnyckel!\n"
 
@@ -7456,10 +7792,6 @@ msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 #~ msgstr "# krypterade PONG-meddelanden mottagna"
 
 #, fuzzy
-#~ msgid "Namespace `%s' unknown.\n"
-#~ msgstr "Namnrymd \"%s\" skapad(rot: %s).\n"
-
-#, fuzzy
 #~ msgid "Failed to connect to statistics service!\n"
 #~ msgstr "Misslyckades att ansluta till gnunetd.\n"
 
diff --git a/po/vi.po b/po/vi.po
index 9b968f9bb..9f6ec25be 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-05-20 15:09+0200\n"
+"POT-Creation-Date: 2013-08-09 23:01+0200\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/arm/arm_api.c:880
+#: src/arm/arm_api.c:335
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
@@ -28,231 +28,236 @@ msgid ""
 "Monitoring client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:159
+#: src/arm/gnunet-arm.c:164
 #, 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:165
+#: src/arm/gnunet-arm.c:169
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 
-#: src/arm/gnunet-arm.c:204 src/testbed/gnunet-service-testbed_peers.c:962
+#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:962
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:206 src/testbed/gnunet-service-testbed_peers.c:964
+#: src/arm/gnunet-arm.c:216
 #, fuzzy
-msgid "Misconfiguration (can't connect to the ARM service)"
+msgid "Misconfiguration (can not 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:966
+#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:966
 #, 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:968
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:968
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:212 src/testbed/gnunet-service-testbed_peers.c:970
-msgid "Request doesn't fit into a message"
+#: src/arm/gnunet-arm.c:222
+msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:972
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:972
 #, 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:974
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:974
 #, 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:990
+#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:990
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:992
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:992
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:236 src/testbed/gnunet-service-testbed_peers.c:994
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:994
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:238 src/testbed/gnunet-service-testbed_peers.c:996
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:996
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:240 src/testbed/gnunet-service-testbed_peers.c:998
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:998
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:1000
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1000
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1002
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1002
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1004
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1004
 #, fuzzy, c-format
 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:248 src/testbed/gnunet-service-testbed_peers.c:1006
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1006
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1008
+#: src/arm/gnunet-arm.c:260
 #, fuzzy, c-format
-msgid "%s service can't be started because ARM is shutting down"
+msgid "%s service cannot be started because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1010
+#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1010
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:271
+#: src/arm/gnunet-arm.c:295
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:291
+#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
 #, 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:307
-#, fuzzy, c-format
-msgid "Failed to kill the `%s' service: %s\n"
-msgstr "Lỗi chạy %s: %s %d\n"
+msgid "Failed to start the ARM service: %s\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/arm/gnunet-arm.c:323
+#: src/arm/gnunet-arm.c:367
 #, 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
+#: src/arm/gnunet-arm.c:377
 #, 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
+#: src/arm/gnunet-arm.c:418
 #, 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
+#: src/arm/gnunet-arm.c:427
 #, 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
+#: src/arm/gnunet-arm.c:463
+#, 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:474
+#, 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:510
 #, 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
+#: src/arm/gnunet-arm.c:517
 #, 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:433
+#: src/arm/gnunet-arm.c:521
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:534
-msgid "Began monitoring ARM for service status changes\n"
+#: src/arm/gnunet-arm.c:603
+#, c-format
+msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:537
+#: src/arm/gnunet-arm.c:634
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:540
+#: src/arm/gnunet-arm.c:637
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-arm.c:543
+#: src/arm/gnunet-arm.c:640
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:552
+#: src/arm/gnunet-arm.c:651
 #, 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
+#: src/arm/gnunet-arm.c:715
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:624
+#: src/arm/gnunet-arm.c:717
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:626
+#: src/arm/gnunet-arm.c:719
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:628
+#: src/arm/gnunet-arm.c:721
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:631
+#: src/arm/gnunet-arm.c:724
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:634
+#: src/arm/gnunet-arm.c:727
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:636
+#: src/arm/gnunet-arm.c:730
+msgid "monitor ARM activities"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:732
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:639
+#: src/arm/gnunet-arm.c:735
 #, 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:641
+#: src/arm/gnunet-arm.c:737
 #, fuzzy
 msgid "list currently running services"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:643
+#: src/arm/gnunet-arm.c:739
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:645
+#: src/arm/gnunet-arm.c:741
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:752
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -328,17 +333,17 @@ msgstr ""
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1386
+#: src/arm/gnunet-service-arm.c:1387
 #, 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:1397
+#: src/arm/gnunet-service-arm.c:1398
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1411
+#: src/arm/gnunet-service-arm.c:1412
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -357,184 +362,199 @@ msgstr "Nhận yêu cầu định tuyến\n"
 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:1372
-#: src/ats/gnunet-service-ats_addresses.c:1406
+#: src/ats/gnunet-service-ats_addresses.c:1529
+#: src/ats/gnunet-service-ats_addresses.c:1563
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1378
+#: src/ats/gnunet-service-ats_addresses.c:1535
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1385
+#: src/ats/gnunet-service-ats_addresses.c:1542
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1412
+#: src/ats/gnunet-service-ats_addresses.c:1569
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1419
+#: src/ats/gnunet-service-ats_addresses.c:1576
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:756
+#: src/ats/gnunet-service-ats_addresses.c:1773
+#, fuzzy
+msgid "Failed to initialize solver!\n"
+msgstr "Không thể sơ khởi SQLite: %s.\n"
+
+#: src/ats/gnunet-service-ats-solver_mlp.c:848
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1075
+#: src/ats/gnunet-service-ats-solver_mlp.c:1171
 #, 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:1258
+#: src/ats/gnunet-service-ats-solver_mlp.c:1216
 #, c-format
-msgid "Update for ATS type `%s' not implemented!\n"
+msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: 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:1761
+#: src/ats/gnunet-service-ats-solver_mlp.c:1890
 #, 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:1769
+#: src/ats/gnunet-service-ats-solver_mlp.c:1898
 #, 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:1779
+#: src/ats/gnunet-service-ats-solver_mlp.c:1908
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1787
+#: src/ats/gnunet-service-ats-solver_mlp.c:1916
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1798
+#: src/ats/gnunet-service-ats-solver_mlp.c:1927
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:141
+#: src/ats/gnunet-service-ats-solver_proportional.c:1246
+#, fuzzy, c-format
+msgid "Cannot find network of type `%u' %s\n"
+msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
+
+#: src/ats-tool/gnunet-ats.c:145
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:143
+#: src/ats-tool/gnunet-ats.c:147
 #, c-format
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:199
+#: src/ats-tool/gnunet-ats.c:204
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr "Đồng đẳng « %s » có mức tin cậy %8u và địa chỉ « %s »\n"
 
-#: src/ats-tool/gnunet-ats.c:320
+#: src/ats-tool/gnunet-ats.c:328
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:339 src/namestore/gnunet-namestore.c:610
-#: src/transport/gnunet-transport.c:804
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:461
+#: src/transport/gnunet-transport.c:812
 #, 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:349 src/transport/gnunet-transport.c:810
+#: src/ats-tool/gnunet-ats.c:357 src/transport/gnunet-transport.c:819
 #, 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:357
+#: src/ats-tool/gnunet-ats.c:365
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: 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
+#: src/ats-tool/gnunet-ats.c:381 src/ats-tool/gnunet-ats.c:400
+#: src/ats-tool/gnunet-ats.c:417 src/ats-tool/gnunet-ats.c:455
 #, 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:382 src/ats-tool/gnunet-ats.c:399
+#: src/ats-tool/gnunet-ats.c:390 src/ats-tool/gnunet-ats.c:407
 #, 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:427
-msgid "Type required\n"
+#: src/ats-tool/gnunet-ats.c:425
+#, fuzzy, c-format
+msgid "No preference type given!\n"
+msgstr "In ra thông tin về các đồng đẳng GNUnet."
+
+#: src/ats-tool/gnunet-ats.c:430
+#, fuzzy, c-format
+msgid "No peer given!\n"
+msgstr "chưa đưa ra tên"
+
+#: src/ats-tool/gnunet-ats.c:448
+msgid "Valid type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:484
+#: src/ats-tool/gnunet-ats.c:506
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:487
+#: src/ats-tool/gnunet-ats.c:509
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:490
+#: src/ats-tool/gnunet-ats.c:512
 #, 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:493
+#: src/ats-tool/gnunet-ats.c:515
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:496
+#: src/ats-tool/gnunet-ats.c:518
 #, 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:499
+#: src/ats-tool/gnunet-ats.c:521
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:502
+#: src/ats-tool/gnunet-ats.c:524
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:505
+#: src/ats-tool/gnunet-ats.c:527
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:530
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:511
+#: src/ats-tool/gnunet-ats.c:533
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:520
+#: src/ats-tool/gnunet-ats.c:542
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -544,56 +564,26 @@ msgstr "In ra thông tin về các đồng đẳng GNUnet."
 msgid "Loading block plugin `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/consensus/gnunet-consensus.c:350
+#: src/consensus/gnunet-consensus.c:352
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "số lần lặp lại"
 
-#: src/consensus/gnunet-consensus.c:353
+#: src/consensus/gnunet-consensus.c:355
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus.c:356
+#: src/consensus/gnunet-consensus.c:358 src/set/gnunet-set-profiler.c:287
+#: src/set/gnunet-set-profiler.c:290 src/set/gnunet-set-profiler.c:293
 #, fuzzy
 msgid "number of values"
 msgstr "số lần lặp lại"
 
-#: src/consensus/gnunet-consensus.c:359
+#: src/consensus/gnunet-consensus.c:361
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/consensus/gnunet-consensus-ibf.c:217
-#, fuzzy
-msgid "number of element in set A-B"
-msgstr "số lần lặp lại"
-
-#: src/consensus/gnunet-consensus-ibf.c:220
-#, fuzzy
-msgid "number of element in set B-A"
-msgstr "số lần lặp lại"
-
-#: src/consensus/gnunet-consensus-ibf.c:223
-msgid "number of common elements in A and B"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-ibf.c:226
-msgid "hash num"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-ibf.c:229
-msgid "ibf size"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-start-peers.c:172
-msgid "start peers with the given template configuration"
-msgstr ""
-
-#: 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:752
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
@@ -619,13 +609,13 @@ msgstr "« %s » được kết nối tới « %s ».\n"
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:176
-#: src/peerinfo-tool/gnunet-peerinfo.c:643
+#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:170
+#: src/peerinfo-tool/gnunet-peerinfo.c:653
 #, 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:204 src/transport/gnunet-transport.c:996
+#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:1004
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -635,26 +625,15 @@ msgstr "In ra thông tin về các đồng đẳng GNUnet."
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/core/gnunet-service-core.c:110
-#, fuzzy, c-format
-msgid "Failed to read or generate private key: %s\n"
-msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
-
-#: src/core/gnunet-service-core.c:124
-#, c-format
-msgid "Core service of `%4s' ready.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:150
+#: src/core/gnunet-service-core.c:105
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/core/gnunet-service-core.c:164
-#: 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"
+#: src/core/gnunet-service-core.c:126
+#, c-format
+msgid "Core service of `%4s' ready.\n"
+msgstr ""
 
 #: src/core/gnunet-service-core_clients.c:370
 #, fuzzy
@@ -699,122 +678,122 @@ msgstr "# các thông báo phát hiện dht được nhận"
 #: src/core/gnunet-service-core_kx.c:803
 #, c-format
 msgid ""
-"Ephemeral key message rejected as its validity range does not match our "
-"system time (%llu not in [%llu,%llu]).\n"
+"Ephemeral key message from peer `%s' rejected as its validity range does not "
+"match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:818
+#: src/core/gnunet-service-core_kx.c:819
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_kx.c:921
-#: src/transport/gnunet-service-transport_validation.c:915
+#: src/core/gnunet-service-core_kx.c:922
+#: src/transport/gnunet-service-transport_validation.c:935
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:929
+#: src/core/gnunet-service-core_kx.c:930
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_kx.c:956
+#: src/core/gnunet-service-core_kx.c:957
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:973
+#: src/core/gnunet-service-core_kx.c:974
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:999
+#: src/core/gnunet-service-core_kx.c:1000
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1009
+#: src/core/gnunet-service-core_kx.c:1010
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# các thông báo PING nhập thô được gửi"
 
-#: src/core/gnunet-service-core_kx.c:1066
-#: src/transport/gnunet-service-transport_validation.c:1160
+#: src/core/gnunet-service-core_kx.c:1067
+#: src/transport/gnunet-service-transport_validation.c:1226
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1072
+#: src/core/gnunet-service-core_kx.c:1073
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1078
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/core/gnunet-service-core_kx.c:1107
+#: src/core/gnunet-service-core_kx.c:1108
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1141
+#: src/core/gnunet-service-core_kx.c:1142
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1151
+#: src/core/gnunet-service-core_kx.c:1152
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/core/gnunet-service-core_kx.c:1158
+#: src/core/gnunet-service-core_kx.c:1159
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1298
+#: src/core/gnunet-service-core_kx.c:1299
 #, 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:1305
+#: src/core/gnunet-service-core_kx.c:1306
 #, 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:1308
+#: src/core/gnunet-service-core_kx.c:1309
 #, 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:1351
-#: src/core/gnunet-service-core_kx.c:1376
+#: src/core/gnunet-service-core_kx.c:1352
+#: src/core/gnunet-service-core_kx.c:1377
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1363
+#: src/core/gnunet-service-core_kx.c:1364
 #, 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:1404
+#: src/core/gnunet-service-core_kx.c:1405
 #, 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:1412
+#: src/core/gnunet-service-core_kx.c:1413
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1443
+#: src/core/gnunet-service-core_kx.c:1444
 #, fuzzy
 msgid "# PAYLOAD dropped (out of order)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
@@ -840,16 +819,16 @@ msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:210
 #: src/core/gnunet-service-core_sessions.c:280
-#: src/dht/gnunet-service-dht_neighbours.c:644
-#: src/dht/gnunet-service-dht_neighbours.c:703
+#: src/dht/gnunet-service-dht_neighbours.c:641
+#: src/dht/gnunet-service-dht_neighbours.c:700
 #: 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:2798
-#: src/transport/gnunet-service-transport_neighbours.c:3057
+#: src/transport/gnunet-service-transport_neighbours.c:2793
+#: src/transport/gnunet-service-transport_neighbours.c:3047
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
@@ -923,14 +902,13 @@ msgstr ""
 #: 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/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/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
+#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
+#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_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:608 src/include/gnunet_common.h:615
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
+#: src/include/gnunet_common.h:616 src/include/gnunet_common.h:623
 #, 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"
@@ -1061,6 +1039,27 @@ msgstr ""
 msgid "# GET requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
+#: src/datastore/gnunet-datastore.c:114
+#, fuzzy, c-format
+msgid "Failed to store item: %s, aborting\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/datastore/gnunet-datastore.c:200
+#, c-format
+msgid "Cannot use the same configuration for source and destination\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:246
+msgid ""
+"specifies the configuration to use to access an alternative datastore; will "
+"merge that datastore into our current datastore"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:255
+#, fuzzy
+msgid "Manipulate GNUnet datastore"
+msgstr "cập nhật một giá trị trong tập tin cấu hình"
+
 #: src/datastore/gnunet-service-datastore.c:349
 #, fuzzy
 msgid "# bytes expired"
@@ -1071,12 +1070,12 @@ msgid "# bytes purged (low-priority)"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:480
-#: src/gns/gnunet-gns-helper-service-w32.c:159
+#: src/gns/gnunet-gns-helper-service-w32.c:155
 msgid "Transmission to client failed!\n"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:511
-#: src/gns/gnunet-gns-helper-service-w32.c:189
+#: src/gns/gnunet-gns-helper-service-w32.c:183
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
@@ -1277,7 +1276,7 @@ msgid ""
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1193
-#: src/namestore/plugin_namestore_sqlite.c:827
+#: src/namestore/plugin_namestore_sqlite.c:829
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -1334,7 +1333,7 @@ msgstr ""
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:736
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:861
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:899
 msgid "be verbose (print progress information)"
@@ -1415,39 +1414,39 @@ msgstr "# các yêu cầu get (lấy) dht được nhận"
 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:590
+#: src/dht/gnunet-service-dht_clients.c:592
 #, fuzzy
 msgid "# GET requests received from clients"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_clients.c:796
+#: src/dht/gnunet-service-dht_clients.c:793
 #, 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:1041
+#: src/dht/gnunet-service-dht_clients.c:1033
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1054
+#: src/dht/gnunet-service-dht_clients.c:1046
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1091
+#: src/dht/gnunet-service-dht_clients.c:1083
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1114
+#: src/dht/gnunet-service-dht_clients.c:1106
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1165
-#: src/dht/gnunet-service-dht_clients.c:1207
+#: src/dht/gnunet-service-dht_clients.c:1157
+#: src/dht/gnunet-service-dht_clients.c:1199
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1175
+#: src/dht/gnunet-service-dht_clients.c:1167
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -1495,30 +1494,35 @@ msgstr "# các yêu cầu get (lấy) dht được nhận"
 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:504
+#: src/dht/gnunet-service-dht_neighbours.c:501
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:594
+#: src/dht/gnunet-service-dht_neighbours.c:591
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:737
+#: src/dht/gnunet-service-dht_neighbours.c:734
 #, 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:792
+#: src/dht/gnunet-service-dht_neighbours.c:789
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/dht/gnunet-service-dht_neighbours.c:830
+#: src/dht/gnunet-service-dht_neighbours.c:827
 #, 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:859
+#, fuzzy
+msgid "# requests TTL-dropped"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
 #: src/dht/gnunet-service-dht_neighbours.c:1052
 #: src/dht/gnunet-service-dht_neighbours.c:1086
 msgid "# Peers excluded from routing due to Bloomfilter"
@@ -1567,35 +1571,50 @@ msgstr "# các thông báo PING được tạo"
 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:1730
+#: src/dht/gnunet-service-dht_neighbours.c:1578
+#, fuzzy
+msgid "# P2P PUT bytes received"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1733
 #, 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:1738
+#: src/dht/gnunet-service-dht_neighbours.c:1741
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1829
+#: src/dht/gnunet-service-dht_neighbours.c:1832
 #, 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:1882
+#: src/dht/gnunet-service-dht_neighbours.c:1835
+#, fuzzy
+msgid "# P2P GET bytes received"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#: src/dht/gnunet-service-dht_neighbours.c:1888
 #, 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:1896
+#: src/dht/gnunet-service-dht_neighbours.c:1902
 #, 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:1973
+#: src/dht/gnunet-service-dht_neighbours.c:1979
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
 
+#: src/dht/gnunet-service-dht_neighbours.c:1982
+#, fuzzy
+msgid "# P2P RESULT bytes received"
+msgstr "# Tín hiệu HTTP PUT được nhận"
+
 #: src/dht/gnunet-service-dht_nse.c:59
 #, fuzzy
 msgid "# Network size estimates received"
@@ -1658,28 +1677,28 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/dns/dnsstub.c:175
+#: src/dns/dnsstub.c:176
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
-#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
-#: src/gns/gnunet-service-gns_resolver.c:1621
+#: src/dns/dnsstub.c:296 src/dns/dnsstub.c:384
+#: src/gns/gnunet-service-gns_resolver.c:1651
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/dns/dnsstub.c:299
+#: src/dns/dnsstub.c:300
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/dns/dnsstub.c:368
+#: src/dns/dnsstub.c:369
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:440
+#: src/dns/dnsstub.c:441
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -1746,12 +1765,12 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3351
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3359
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3407
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3415
 #, fuzzy
 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"
@@ -1765,142 +1784,142 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/exit/gnunet-daemon-exit.c:741
+#: src/exit/gnunet-daemon-exit.c:756
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:794
+#: src/exit/gnunet-daemon-exit.c:807
 #, fuzzy
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr "# các byte được gửi"
 
-#: src/exit/gnunet-daemon-exit.c:911 src/exit/gnunet-daemon-exit.c:2343
-#: src/exit/gnunet-daemon-exit.c:2603 src/vpn/gnunet-service-vpn.c:1411
-#: src/vpn/gnunet-service-vpn.c:1812 src/vpn/gnunet-service-vpn.c:1975
+#: src/exit/gnunet-daemon-exit.c:924 src/exit/gnunet-daemon-exit.c:2349
+#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1453
+#: src/vpn/gnunet-service-vpn.c:1852 src/vpn/gnunet-service-vpn.c:2015
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:948 src/exit/gnunet-daemon-exit.c:2402
-#: src/exit/gnunet-daemon-exit.c:2662 src/vpn/gnunet-service-vpn.c:1467
-#: src/vpn/gnunet-service-vpn.c:1871 src/vpn/gnunet-service-vpn.c:2008
+#: src/exit/gnunet-daemon-exit.c:961 src/exit/gnunet-daemon-exit.c:2408
+#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1509
+#: src/vpn/gnunet-service-vpn.c:1911 src/vpn/gnunet-service-vpn.c:2048
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:988
+#: src/exit/gnunet-daemon-exit.c:1001
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:995
+#: src/exit/gnunet-daemon-exit.c:1008
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1072
+#: src/exit/gnunet-daemon-exit.c:1084
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1147
+#: src/exit/gnunet-daemon-exit.c:1158
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1200
+#: src/exit/gnunet-daemon-exit.c:1210
 #, fuzzy
 msgid "# Packets received from TUN"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1214
+#: src/exit/gnunet-daemon-exit.c:1224
 #, fuzzy
 msgid "# Bytes received from TUN"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1240
+#: src/exit/gnunet-daemon-exit.c:1250
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1267
+#: src/exit/gnunet-daemon-exit.c:1277
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1313
+#: src/exit/gnunet-daemon-exit.c:1323
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1321
+#: src/exit/gnunet-daemon-exit.c:1331
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1703
+#: src/exit/gnunet-daemon-exit.c:1713
 #, fuzzy
 msgid "# TCP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:1814
+#: src/exit/gnunet-daemon-exit.c:1826
 #, fuzzy
 msgid "# TCP service creation requests received via mesh"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:1817 src/exit/gnunet-daemon-exit.c:1906
-#: src/exit/gnunet-daemon-exit.c:2026 src/exit/gnunet-daemon-exit.c:2267
-#: src/exit/gnunet-daemon-exit.c:2519 src/exit/gnunet-daemon-exit.c:2811
-#: src/exit/gnunet-daemon-exit.c:2921
+#: src/exit/gnunet-daemon-exit.c:1829 src/exit/gnunet-daemon-exit.c:1919
+#: src/exit/gnunet-daemon-exit.c:2035 src/exit/gnunet-daemon-exit.c:2273
+#: src/exit/gnunet-daemon-exit.c:2522 src/exit/gnunet-daemon-exit.c:2811
+#: src/exit/gnunet-daemon-exit.c:2918
 #, fuzzy
 msgid "# Bytes received from MESH"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/exit/gnunet-daemon-exit.c:1850 src/exit/gnunet-daemon-exit.c:2943
+#: src/exit/gnunet-daemon-exit.c:1861 src/exit/gnunet-daemon-exit.c:2940
 #, c-format
 msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1854
+#: src/exit/gnunet-daemon-exit.c:1865
 #, fuzzy
 msgid "# TCP requests dropped (no such service)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:1909
+#: src/exit/gnunet-daemon-exit.c:1922
 #, fuzzy
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2029
+#: src/exit/gnunet-daemon-exit.c:2038
 #, fuzzy
 msgid "# TCP data requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2043
+#: src/exit/gnunet-daemon-exit.c:2052
 #, fuzzy
 msgid "# TCP DATA requests dropped (no session)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:2093
+#: src/exit/gnunet-daemon-exit.c:2102
 #, fuzzy
 msgid "# ICMP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/exit/gnunet-daemon-exit.c:2270
+#: src/exit/gnunet-daemon-exit.c:2276
 #, fuzzy
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2522
+#: src/exit/gnunet-daemon-exit.c:2525
 #, fuzzy
 msgid "# ICMP service requests received via mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/exit/gnunet-daemon-exit.c:2588 src/vpn/gnunet-service-vpn.c:1401
-#: src/vpn/gnunet-service-vpn.c:1969
+#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1443
+#: src/vpn/gnunet-service-vpn.c:2009
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2647 src/vpn/gnunet-service-vpn.c:1437
-#: src/vpn/gnunet-service-vpn.c:1449 src/vpn/gnunet-service-vpn.c:1859
+#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1479
+#: src/vpn/gnunet-service-vpn.c:1491 src/vpn/gnunet-service-vpn.c:1899
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2697
+#: src/exit/gnunet-daemon-exit.c:2700
 #, fuzzy
 msgid "# UDP packets sent via TUN"
 msgstr "# các byte đã gửi qua UDP"
@@ -1910,67 +1929,213 @@ msgstr "# các byte đã gửi qua UDP"
 msgid "# UDP IP-exit requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2924
+#: src/exit/gnunet-daemon-exit.c:2921
 #, fuzzy
 msgid "# UDP service requests received via mesh"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/exit/gnunet-daemon-exit.c:2947
+#: src/exit/gnunet-daemon-exit.c:2944
 #, fuzzy
 msgid "# UDP requests dropped (no such service)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/exit/gnunet-daemon-exit.c:2980
+#: src/exit/gnunet-daemon-exit.c:2977
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3209
+#: src/exit/gnunet-daemon-exit.c:3216
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3223 src/exit/gnunet-daemon-exit.c:3235
+#: src/exit/gnunet-daemon-exit.c:3230 src/exit/gnunet-daemon-exit.c:3242
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3246
+#: src/exit/gnunet-daemon-exit.c:3253
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3364
+#: src/exit/gnunet-daemon-exit.c:3372
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3372
+#: src/exit/gnunet-daemon-exit.c:3380
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3379
+#: src/exit/gnunet-daemon-exit.c:3387
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3385
+#: src/exit/gnunet-daemon-exit.c:3393
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3391 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3399 src/pt/gnunet-daemon-pt.c:887
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3620
+#: src/exit/gnunet-daemon-exit.c:3647
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
+#: src/experimentation/gnunet-daemon-experimentation.c:56
+msgid "Experimentation daemon shutting down ...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation.c:78
+msgid "Experimentation daemon starting ...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation.c:84
+#, fuzzy
+msgid "Failed to create statistics!\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/experimentation/gnunet-daemon-experimentation.c:121
+msgid "GNUnet experimentation daemon"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:264
+#, c-format
+msgid "Experiment `%s': Experiment signature is invalid\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:271
+#, c-format
+msgid ""
+"Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
+"sec. \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:316
+#, c-format
+msgid "Experiment `%s': Issuer missing\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:321
+#, c-format
+msgid "Experiment `%s': Issuer invalid\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:327
+#, c-format
+msgid "Experiment `%s': Issuer not accepted!\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:336
+#, c-format
+msgid "Experiment `%s': Version missing or invalid \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:344
+#, c-format
+msgid "Experiment `%s': Required capabilities missing \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:349
+#, c-format
+msgid "Experiment `%s': Required capabilities invalid \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:393
+#, fuzzy, c-format
+msgid "Failed to parse file `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:419
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:444
+msgid ""
+"No valid experiment issuers configured! Set value to peer id of issuer! "
+"Exit...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:429
+#, fuzzy, c-format
+msgid "Invalid value `%s'\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:453
+#, fuzzy, c-format
+msgid "Invalid public key `%s'\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:460
+#, fuzzy, c-format
+msgid "Found issuer for public key `%s'\n"
+msgstr "Đang nạp các truyền tải « %s »\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:463
+#, fuzzy, c-format
+msgid "No issuer for public key `%s'\n"
+msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:480
+#, fuzzy, c-format
+msgid "Cannot read experiments file `%s'\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:220
+#, c-format
+msgid "Cannot send message to peer `%s' for experiment `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:290
+#, c-format
+msgid "Sending experimentation request to peer %s\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:421
+#, c-format
+msgid "Added peer `%s' as active node\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:848
+#, fuzzy, c-format
+msgid "Connected to peer %s\n"
+msgstr "« %s » được kết nối tới « %s ».\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:877
+#, fuzzy, c-format
+msgid "Disconnected from peer %s\n"
+msgstr "« %.*s » được kết nối tới « %.*s ».\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1057
+#, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:109
+#, c-format
+msgid "Peer `%s' did not respond to request for experiment `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:144
+#, fuzzy, c-format
+msgid "Starting inbound experiment `%s' with peer `%s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:278
+#, fuzzy, c-format
+msgid "Starting outbound experiment `%s' with peer `%s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:296
+#, fuzzy, c-format
+msgid "Received %s message from peer %s for experiment `%s'\n"
+msgstr "Nhận yêu cầu định tuyến\n"
+
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -2046,27 +2211,22 @@ msgstr ""
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:1520
-#, c-format
-msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
-msgstr ""
-
-#: src/fs/fs_api.c:1562
+#: src/fs/fs_api.c:1557
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1578
+#: src/fs/fs_api.c:1571
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2229
+#: src/fs/fs_api.c:2228
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2239
+#: src/fs/fs_api.c:2238
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -2081,7 +2241,7 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2897
+#: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2896
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
@@ -2091,11 +2251,11 @@ msgstr ""
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2841
+#: src/fs/fs_api.c:2840
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2935
+#: src/fs/fs_api.c:2934
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2105,58 +2265,58 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "Lỗi định dạng tập tin (không phải là thư mục GNUnet ?)\n"
 
-#: src/fs/fs_download.c:321
+#: src/fs/fs_download.c:322
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:341
+#: src/fs/fs_download.c:342
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:507 src/fs/fs_download.c:519
+#: src/fs/fs_download.c:508 src/fs/fs_download.c:520
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:888
+#: src/fs/fs_download.c:889
 #, fuzzy, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/fs_download.c:970
+#: src/fs/fs_download.c:971
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:996
+#: src/fs/fs_download.c:997
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1020
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_download.c:1029
+#: src/fs/fs_download.c:1030
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:1038
+#: src/fs/fs_download.c:1039
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_download.c:1136
+#: src/fs/fs_download.c:1137
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_download.c:1927
+#: src/fs/fs_download.c:1928
 #, fuzzy
 msgid "Invalid URI"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
@@ -2190,143 +2350,109 @@ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:104
+#: src/fs/fs_namespace.c:207
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_namespace.c:126 src/fs/fs_namespace.c:214
+#: src/fs/fs_namespace.c:229
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:240 src/fs/fs_namespace.c:284
-#: src/fs/fs_namespace.c:330
-msgid "Can't determine where namespace directory is\n"
-msgstr ""
-
-#: src/fs/fs_namespace.c:252
+#: src/fs/fs_namespace.c:320
 #, fuzzy, c-format
-msgid "Failed to create or read private key for namespace `%s'\n"
-msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
-
-#: src/fs/fs_namespace.c:296
-#, fuzzy, c-format
-msgid "Failed to read private key for namespace `%s'\n"
-msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
-
-#: src/fs/fs_namespace.c:467
-#, fuzzy, c-format
-msgid "Failed to read namespace private key file `%s', deleting it!\n"
-msgstr "Lỗi thêm mục nhập vào không gian tên « %s » (có chưa ?)\n"
-
-#: src/fs/fs_namespace.c:659
-msgid "Identifiers or URI too long to create UBlock"
-msgstr ""
-
-#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:311
-#, fuzzy
-msgid "Internal error."
-msgstr "Lỗi VR."
+msgid "Failed to read `%s': %s\n"
+msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:747
+#: src/fs/fs_namespace.c:466
 #, fuzzy
 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
+#: src/fs/fs_pseudonym.c:327 src/fs/fs_pseudonym.c:631
 #, 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
+#: src/fs/fs_pseudonym.c:463 src/fs/fs_pseudonym.c:489
+#: src/fs/fs_pseudonym.c:627
 msgid "no-name"
 msgstr "không-tên"
 
-#: src/fs/fs_pseudonym.c:1182 src/util/crypto_ecc.c:1014
-#, 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
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:399
 #, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:622 src/fs/fs_publish.c:639 src/fs/fs_publish.c:678
-#: src/fs/fs_publish.c:698 src/fs/fs_publish.c:723 src/fs/fs_publish.c:863
+#: src/fs/fs_publish.c:624 src/fs/fs_publish.c:641 src/fs/fs_publish.c:680
+#: src/fs/fs_publish.c:700 src/fs/fs_publish.c:725 src/fs/fs_publish.c:865
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Lỗi đánh chỉ mục tập tin « %s ». Đề nghị: thử chèn tập tin.\n"
 
-#: src/fs/fs_publish.c:624
+#: src/fs/fs_publish.c:626
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:636
+#: src/fs/fs_publish.c:638
 #, fuzzy
 msgid "unknown error"
 msgstr "Lỗi không rõ"
 
-#: src/fs/fs_publish.c:679
+#: src/fs/fs_publish.c:681
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:699
+#: src/fs/fs_publish.c:701
 #, fuzzy
 msgid "filename too long"
 msgstr "tên tập tin"
 
-#: src/fs/fs_publish.c:724
+#: src/fs/fs_publish.c:726
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:747
+#: src/fs/fs_publish.c:749
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/fs_publish.c:812
+#: src/fs/fs_publish.c:814
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/fs/fs_publish.c:818
+#: src/fs/fs_publish.c:820
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:864
+#: src/fs/fs_publish.c:866
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1090
+#: src/fs/fs_publish.c:1092
 #, fuzzy, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr "Không đủ quyền truy cập cho « %s »: %s\n"
 
-#: src/fs/fs_publish.c:1161
+#: src/fs/fs_publish.c:1164
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:273
+#: src/fs/fs_publish_ksk.c:219
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/fs/fs_search.c:742
+#: src/fs/fs_search.c:815
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/fs/fs_search.c:800
+#: src/fs/fs_search.c:874
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2373,98 +2499,90 @@ msgstr "=\tLỗi đọc thư mục.\n"
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_unindex.c:566 src/fs/fs_unindex.c:633
+#: src/fs/fs_unindex.c:565 src/fs/fs_unindex.c:628
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/fs_unindex.c:646
+#: src/fs/fs_unindex.c:641
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_unindex.c:680
+#: src/fs/fs_unindex.c:675
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_uri.c:221
+#: src/fs/fs_uri.c:222
 #, no-c-format
 msgid "`%' must be followed by HEX number"
 msgstr ""
 
-#: src/fs/fs_uri.c:280
+#: src/fs/fs_uri.c:281
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:298
+#: src/fs/fs_uri.c:299
 msgid "`++' not allowed in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:305
+#: src/fs/fs_uri.c:306
 msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:375
+#: src/fs/fs_uri.c:376
 msgid "Malformed SKS URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:418 src/fs/fs_uri.c:433
+#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:563 src/fs/fs_uri.c:578 src/fs/fs_uri.c:588
-#: src/fs/fs_uri.c:616
+#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
+#: src/fs/fs_uri.c:629
 msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:611
 msgid "SKS URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:604
+#: src/fs/fs_uri.c:617
 msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:610
+#: src/fs/fs_uri.c:623
 msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:623
+#: src/fs/fs_uri.c:636
 msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:635
+#: src/fs/fs_uri.c:648
 msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:673
+#: src/fs/fs_uri.c:686
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:898 src/util/crypto_ecc.c:941
+#: src/fs/fs_uri.c:911
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/fs/fs_uri.c:904 src/util/crypto_ecc.c:947
+#: src/fs/fs_uri.c:917
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/fs/fs_uri.c:945
-msgid "identifier is NULL!"
-msgstr ""
-
-#: src/fs/fs_uri.c:951
-msgid "identifier has zero length!"
-msgstr ""
-
-#: src/fs/fs_uri.c:1122 src/fs/fs_uri.c:1149
+#: src/fs/fs_uri.c:1099 src/fs/fs_uri.c:1126
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1155
+#: src/fs/fs_uri.c:1132
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
@@ -2500,25 +2618,25 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:302
-#: src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:310
+#: src/fs/gnunet-publish.c:808
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:687
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:812
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên"
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:690
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:815
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:714
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:839
 msgid "specify the priority of the content"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:327
-#: src/fs/gnunet-publish.c:721
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:329
+#: src/fs/gnunet-publish.c:846
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2593,7 +2711,7 @@ msgstr "Gặp lỗi khi tải xuống: %s\n"
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:195
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:273
 #: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
@@ -2604,7 +2722,7 @@ msgstr "Gặp sự kiện bất thường: %d\n"
 msgid "You need to specify a URI argument.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:629
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:652
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
@@ -2617,7 +2735,7 @@ msgstr ""
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:607
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:781
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2685,26 +2803,21 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:178 src/statistics/gnunet-statistics.c:283
-#, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/fs/gnunet-pseudonym.c:273 src/fs/gnunet-pseudonym.c:280
-#: src/fs/gnunet-pseudonym.c:282
+#: src/fs/gnunet-pseudonym.c:227 src/fs/gnunet-pseudonym.c:229
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/fs/gnunet-pseudonym.c:305
-msgid "create or advertise namespace NAME"
-msgstr ""
+#: src/fs/gnunet-pseudonym.c:265 src/statistics/gnunet-statistics.c:305
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/fs/gnunet-pseudonym.c:308
-msgid "delete namespace NAME "
+#: src/fs/gnunet-pseudonym.c:313
+msgid "advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:311
+#: src/fs/gnunet-pseudonym.c:316
 #, fuzzy
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
@@ -2713,158 +2826,153 @@ msgstr ""
 "thêm một từ khóa bổ sung cho tất cả tập tin và thư mục (có thể chỉ ra tùy "
 "chọn này nhiều lần)"
 
-#: src/fs/gnunet-pseudonym.c:315 src/fs/gnunet-publish.c:702
+#: src/fs/gnunet-pseudonym.c:320 src/fs/gnunet-publish.c:827
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "đặt siêu dữ liệu cho KIỂU đưa ra thành GIÁ_TRỊ chỉ ra"
 
-#: src/fs/gnunet-pseudonym.c:318
-#, fuzzy
-msgid "print names of local namespaces"
-msgstr "đặt đánh giá của một không gian tên"
-
-#: src/fs/gnunet-pseudonym.c:321
+#: src/fs/gnunet-pseudonym.c:323
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:324
+#: src/fs/gnunet-pseudonym.c:326
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:330
+#: src/fs/gnunet-pseudonym.c:332
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: src/fs/gnunet-pseudonym.c:333
+#: src/fs/gnunet-pseudonym.c:335
 #, fuzzy
 msgid "change rating of namespace ID by VALUE"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: src/fs/gnunet-pseudonym.c:345
+#: src/fs/gnunet-pseudonym.c:347
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:152
+#: src/fs/gnunet-publish.c:230
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:159
+#: src/fs/gnunet-publish.c:237
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-publish.c:169
+#: src/fs/gnunet-publish.c:247
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:173
+#: src/fs/gnunet-publish.c:251
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/fs/gnunet-publish.c:192
+#: src/fs/gnunet-publish.c:270
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "Hoàn thành khởi chạy « %s ».\n"
 
-#: src/fs/gnunet-publish.c:310
+#: src/fs/gnunet-publish.c:388
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:312
+#: src/fs/gnunet-publish.c:390
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Từ khoá cho tập tin « %s »:\n"
 
-#: src/fs/gnunet-publish.c:363 src/fs/gnunet-publish.c:617
-#, fuzzy, c-format
-msgid "Failed to create namespace `%s' (illegal filename?)\n"
-msgstr "Không thể tạo miền tên.\n"
-
-#: src/fs/gnunet-publish.c:438
+#: src/fs/gnunet-publish.c:529
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:465
+#: src/fs/gnunet-publish.c:552
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/fs/gnunet-publish.c:496
+#: src/fs/gnunet-publish.c:585
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/gnunet-publish.c:498
+#: src/fs/gnunet-publish.c:587
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-publish.c:503
+#: src/fs/gnunet-publish.c:592
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:508
+#: src/fs/gnunet-publish.c:597
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:601
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:516
+#: src/fs/gnunet-publish.c:605
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:523
+#: src/fs/gnunet-publish.c:612
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/gnunet-publish.c:557
+#: src/fs/gnunet-publish.c:643
+#, fuzzy, c-format
+msgid "Selected pseudonym `%s' unknown\n"
+msgstr "Không gian tên « %s » có đánh giá %d.\n"
+
+#: src/fs/gnunet-publish.c:669
+#, fuzzy, c-format
+msgid "Failed to access `%s': %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/fs/gnunet-publish.c:681
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:731
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "Không thể trích siêu dữ liệu ra một địa chỉ URI.\n"
 
-#: src/fs/gnunet-publish.c:564
+#: src/fs/gnunet-publish.c:738
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-publish.c:570
+#: src/fs/gnunet-publish.c:744
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-publish.c:578 src/vpn/gnunet-vpn.c:213
+#: src/fs/gnunet-publish.c:752 src/vpn/gnunet-vpn.c:213
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:588 src/fs/gnunet-publish.c:595
-#: src/transport/gnunet-transport.c:834 src/transport/gnunet-transport.c:864
+#: src/fs/gnunet-publish.c:762 src/fs/gnunet-publish.c:769
+#: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:650
-#, fuzzy, c-format
-msgid "Failed to access `%s': %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#: src/fs/gnunet-publish.c:662
-msgid ""
-"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
-"installed?\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:819
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2872,7 +2980,7 @@ msgstr ""
 "in ra danh sách các từ khóa đã giải phóng cần sử dụng, nhưng không thực hiện "
 "tải lên"
 
-#: src/fs/gnunet-publish.c:698
+#: src/fs/gnunet-publish.c:823
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2880,7 +2988,7 @@ msgstr ""
 "thêm một từ khoá bổ sung cho tập tin hoặc thư mục ở cấp đầu (có thể chỉ ra "
 "tùy chọn này nhiều lần)"
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:830
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2888,7 +2996,7 @@ msgstr ""
 "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng "
 "mã hóa trong cơ sở dữ liệu GNUnet)"
 
-#: src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-publish.c:835
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2896,12 +3004,12 @@ msgstr ""
 "chỉ ra mã số của một phiên bản đã cập nhật để công bố trong tương lai (chỉ "
 "cho sự chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:718
+#: src/fs/gnunet-publish.c:843
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "công bố các tập tin dưới biệt hiệu TÊN (đặt tập tin vào không gian tên)"
 
-#: src/fs/gnunet-publish.c:724
+#: src/fs/gnunet-publish.c:849
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -2909,13 +3017,13 @@ msgid ""
 msgstr ""
 "chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
 
-#: src/fs/gnunet-publish.c:728
+#: src/fs/gnunet-publish.c:853
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "đặt mã số của phiên bản này của sự công bố (chỉ cho chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:732
+#: src/fs/gnunet-publish.c:857
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -2923,7 +3031,7 @@ msgstr ""
 "Địa chỉ URI cần công bố (có thể được dùng thay vào gửi một tập tin để thêm "
 "từ khoá vào tập tin có địa chỉ URI tương ứng)"
 
-#: src/fs/gnunet-publish.c:748
+#: src/fs/gnunet-publish.c:873
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2968,12 +3076,12 @@ msgstr "Không hiển thị kết quả tìm kiếm cho tập tin được chún
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:538
+#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
 #, 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:639 src/hostlist/gnunet-daemon-hostlist.c:291
+#: src/fs/gnunet-service-fs.c:640 src/hostlist/gnunet-daemon-hostlist.c:291
 #: src/topology/gnunet-daemon-topology.c:1314
 #: src/topology/gnunet-daemon-topology.c:1321
 #, fuzzy, c-format
@@ -3139,6 +3247,37 @@ msgstr "# các yêu cầu khách lỗ hổng được nhận"
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
+#: src/fs/gnunet-service-fs_mesh_client.c:475
+#, fuzzy
+msgid "# replies received via mesh"
+msgstr "# các byte kiểu %d được nhận"
+
+#: src/fs/gnunet-service-fs_mesh_client.c:489
+#, fuzzy
+msgid "# replies received via mesh dropped"
+msgstr "# các byte kiểu %d được nhận"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:259
+#, fuzzy
+msgid "# Blocks transferred via mesh"
+msgstr "# các byte được gửi"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:412
+#, fuzzy
+msgid "# queries received via mesh"
+msgstr "# các byte đã nhận qua TCP"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:455
+#, fuzzy
+msgid "# mesh client connections rejected"
+msgstr "# các kết nối dht"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:461
+#: src/fs/gnunet-service-fs_mesh_server.c:501
+#, fuzzy
+msgid "# mesh connections active"
+msgstr "# các kết nối dht"
+
 #: src/fs/gnunet-service-fs_pe.c:269
 #, fuzzy
 msgid "# average retransmission delay (ms)"
@@ -3227,7 +3366,7 @@ msgstr "# các byte đã nhận qua HTTP"
 
 #: src/fs/gnunet-service-fs_pr.c:1189
 #, fuzzy
-msgid "# Replies received from STREAM"
+msgid "# Replies received from MESH"
 msgstr "# các byte đã nhận qua HTTP"
 
 #: src/fs/gnunet-service-fs_pr.c:1241
@@ -3294,36 +3433,6 @@ msgstr "# các thông báo PONG đã mật mã được nhận"
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_stream.c:777
-#, fuzzy
-msgid "# replies received via stream"
-msgstr "# các byte kiểu %d được nhận"
-
-#: src/fs/gnunet-service-fs_stream.c:791
-#, fuzzy
-msgid "# replies received via stream dropped"
-msgstr "# các byte kiểu %d được nhận"
-
-#: src/fs/gnunet-service-fs_stream.c:930
-#: src/fs/gnunet-service-fs_stream.c:1384
-#, fuzzy
-msgid "# stream connections active"
-msgstr "# các kết nối dht"
-
-#: src/fs/gnunet-service-fs_stream.c:1166
-msgid "# Blocks transferred via stream"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_stream.c:1326
-#, fuzzy
-msgid "# queries received via stream"
-msgstr "# các byte đã nhận qua TCP"
-
-#: src/fs/gnunet-service-fs_stream.c:1376
-#, fuzzy
-msgid "# stream client connections rejected"
-msgstr "# các kết nối dht"
-
 #: src/fs/gnunet-unindex.c:89
 #, fuzzy, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
@@ -3382,23 +3491,23 @@ msgstr "Nhận yêu cầu định tuyến\n"
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:679
+#: src/gns/gnunet-dns2gns.c:681
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:682
+#: src/gns/gnunet-dns2gns.c:684
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:685
+#: src/gns/gnunet-dns2gns.c:687
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:688
+#: src/gns/gnunet-dns2gns.c:690
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:701
+#: src/gns/gnunet-dns2gns.c:703
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -3453,45 +3562,45 @@ msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:586
+#: src/gns/gnunet-gns-fcfsd.c:587
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:648
+#: src/gns/gnunet-gns-fcfsd.c:649
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:664
+#: src/gns/gnunet-gns-fcfsd.c:665
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:700
+#: src/gns/gnunet-gns-fcfsd.c:701
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:708
+#: src/gns/gnunet-gns-fcfsd.c:709
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:912 src/namestore/gnunet-namestore.c:364
+#: src/gns/gnunet-gns-fcfsd.c:913 src/namestore/gnunet-namestore.c:492
 #, fuzzy
 msgid "Failed to read or create private zone key\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:922 src/namestore/gnunet-namestore.c:375
+#: src/gns/gnunet-gns-fcfsd.c:923 src/namestore/gnunet-namestore.c:503
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/gns/gnunet-gns-fcfsd.c:938 src/gns/gnunet-gns-proxy.c:2857
+#: src/gns/gnunet-gns-fcfsd.c:939 src/gns/gnunet-gns-proxy.c:2857
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:972
+#: src/gns/gnunet-gns-fcfsd.c:973
 msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
@@ -3517,96 +3626,101 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:486
+#: src/gns/gnunet-service-gns.c:497
 #, c-format
 msgid "Records for name `%s' in zone %s too large to fit into DHT"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1216
+#: src/gns/gnunet-service-gns.c:1225
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/gns/gnunet-service-gns.c:1277
+#: src/gns/gnunet-service-gns.c:1286
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/gns/gnunet-service-gns.c:1288
+#: src/gns/gnunet-service-gns.c:1297
 #, fuzzy
 msgid "Unable to initialize resolver!\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:3439
+#: src/gns/gnunet-service-gns_resolver.c:3446
 #, c-format
 msgid "Not a GADS TLD: `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:119
+#: src/hello/gnunet-hello.c:123
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:125
+#: src/hello/gnunet-hello.c:129
 #, 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:133
+#: src/hello/gnunet-hello.c:137
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:140
+#: src/hello/gnunet-hello.c:144
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:150 src/hello/gnunet-hello.c:179
+#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183
 #, 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:166
+#: src/hello/gnunet-hello.c:170
 #, 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:191
+#: src/hello/gnunet-hello.c:195
 #, 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:936
+#: src/hello/gnunet-hello.c:203
+#, c-format
+msgid "Modified %u addresses \n"
+msgstr ""
+
+#: src/hello/hello.c:945
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:945
+#: src/hello/hello.c:954
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:955
+#: src/hello/hello.c:964
 #, 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:965
+#: src/hello/hello.c:974
 #, 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:982
+#: src/hello/hello.c:991
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:991
+#: src/hello/hello.c:1000
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1010
+#: src/hello/hello.c:1019
 #, 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"
@@ -3666,8 +3780,8 @@ msgstr "# các HELLO tải xuống qua HTTP"
 #: 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:1056
-#: src/transport/plugin_transport_http_client.c:1071
+#: src/transport/plugin_transport_http_client.c:1063
+#: src/transport/plugin_transport_http_client.c:1078
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
@@ -3810,9 +3924,9 @@ msgid "expired addresses encountered"
 msgstr ""
 
 #: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
-#: src/peerinfo-tool/gnunet-peerinfo.c:348
-#: src/peerinfo-tool/gnunet-peerinfo.c:418
-#: src/peerinfo-tool/gnunet-peerinfo.c:489
+#: src/peerinfo-tool/gnunet-peerinfo.c:358
+#: src/peerinfo-tool/gnunet-peerinfo.c:428
+#: src/peerinfo-tool/gnunet-peerinfo.c:499
 #: src/topology/gnunet-daemon-topology.c:918
 #, fuzzy, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
@@ -3874,8 +3988,8 @@ msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:649
-#: src/transport/gnunet-service-transport.c:661
+#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:659
+#: src/transport/gnunet-service-transport.c:785
 #, 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"
@@ -3905,6 +4019,78 @@ msgstr "« %s » không sẵn sàng.\n"
 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/identity/gnunet-identity.c:135
+#, fuzzy, c-format
+msgid "Failed to create ego: %s\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/identity/gnunet-identity.c:237
+msgid "create ego NAME"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:240
+msgid "delete ego NAME "
+msgstr ""
+
+#: src/identity/gnunet-identity.c:243
+msgid "display all egos"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:246
+msgid "run in monitor mode egos"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:255
+msgid "Maintain egos"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:336
+msgid "no default known"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:357
+msgid "default configured, but ego unknown (internal error)"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:434
+#: src/identity/gnunet-service-identity.c:665
+#: src/identity/gnunet-service-identity.c:773
+#, fuzzy, c-format
+msgid "Failed to write subsystem default identifier map to `%s'.\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/identity/gnunet-service-identity.c:441
+msgid "Unknown ego specified for service (internal error)"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:511
+msgid "identifier already in use for another ego"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:642
+msgid "target name already exists"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:681
+#: src/identity/gnunet-service-identity.c:790
+msgid "no matching ego found"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:824
+#, fuzzy, c-format
+msgid "Failed to parse ego information in `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/identity/gnunet-service-identity.c:897
+#, fuzzy, c-format
+msgid "Failed to parse subsystem identity configuration file `%s'\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
+
+#: src/identity/gnunet-service-identity.c:909
+#, fuzzy, c-format
+msgid "Failed to create directory `%s' for storing egos\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
 #: src/integration-tests/connection_watchdog.c:990
 #, fuzzy, c-format
 msgid "Transport plugin: `%s' port %llu\n"
@@ -3924,53 +4110,40 @@ msgstr ""
 msgid "help text"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:211
+#: src/mesh/gnunet-mesh.c:205
 #, fuzzy
 msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/mesh/gnunet-mesh.c:214
+#: src/mesh/gnunet-mesh.c:208
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/mesh/gnunet-mesh.c:224
+#: src/mesh/gnunet-mesh.c:218
 #, fuzzy
 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:7966 src/mesh/gnunet-service-mesh-new.c:4649
+#: src/mesh/gnunet-service-mesh.c:5640
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8179 src/mesh/gnunet-service-mesh-new.c:4790
-#, 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: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:4860
-#: src/mesh/gnunet-service-mesh-new.c:4872
-#: src/mesh/gnunet-service-mesh-new.c:4884
-#: src/mesh/gnunet-service-mesh-new.c:4896
-#: src/mesh/gnunet-service-mesh-new.c:4908
-#: src/mesh/gnunet-service-mesh-new.c:4920 src/nse/gnunet-service-nse.c:1500
-#: src/nse/gnunet-service-nse.c:1518
-#: 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/mesh/gnunet-service-mesh.c:5780 src/mesh/gnunet-service-mesh.c:5792
+#: src/mesh/gnunet-service-mesh.c:5804 src/mesh/gnunet-service-mesh.c:5816
+#: src/mesh/gnunet-service-mesh.c:5828 src/mesh/gnunet-service-mesh.c:5840
+#: src/nse/gnunet-service-nse.c:1425 src/nse/gnunet-service-nse.c:1443
+#: src/regex/gnunet-daemon-regexprofiler.c:270
+#: src/regex/gnunet-daemon-regexprofiler.c:282
+#: src/regex/gnunet-daemon-regexprofiler.c:294
+#: src/regex/gnunet-daemon-regexprofiler.c:307
 #: 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:8347 src/mesh/gnunet-service-mesh.c:8357
-#: src/mesh/gnunet-service-mesh.c:8368 src/mesh/gnunet-service-mesh-new.c:4932
-#: src/mesh/gnunet-service-mesh-new.c:4942
-#: src/mesh/gnunet-service-mesh-new.c:4953
+#: src/mesh/gnunet-service-mesh.c:5852 src/mesh/gnunet-service-mesh.c:5862
+#: src/mesh/gnunet-service-mesh.c:5887
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -3986,254 +4159,201 @@ msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 msgid "Could not access file `%s': %s\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/namestore/gnunet-namestore.c:212
+#: src/namestore/gnunet-namestore.c:250
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:243
+#: src/namestore/gnunet-namestore.c:281
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:304
+#: src/namestore/gnunet-namestore.c:342
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:320
+#: src/namestore/gnunet-namestore.c:358
 msgid "for at least"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:321
+#: src/namestore/gnunet-namestore.c:359
 msgid "until"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:356
+#: src/namestore/gnunet-namestore.c:475
 #, fuzzy, c-format
-msgid "No options given\n"
-msgstr "chưa đưa ra t��n"
+msgid "Using default zone file `%s'\n"
+msgstr "Đang bắt đầu t��i về « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:386
+#: src/namestore/gnunet-namestore.c:484
 #, fuzzy, c-format
-msgid "Unsupported type `%s'\n"
-msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
+msgid "No options given\n"
+msgstr "chưa đưa ra tên"
 
-#: src/namestore/gnunet-namestore.c:394 src/namestore/gnunet-namestore.c:418
-#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:477
-#: src/namestore/gnunet-namestore.c:518
+#: src/namestore/gnunet-namestore.c:513 src/namestore/gnunet-namestore.c:522
+#: src/namestore/gnunet-namestore.c:539 src/namestore/gnunet-namestore.c:561
+#: src/namestore/gnunet-namestore.c:605
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/namestore/gnunet-namestore.c:395 src/namestore/gnunet-namestore.c:419
-msgid "add/del"
+#: src/namestore/gnunet-namestore.c:514 src/namestore/gnunet-namestore.c:523
+#: src/namestore/gnunet-namestore.c:540 src/namestore/gnunet-namestore.c:562
+msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:408
+#: src/namestore/gnunet-namestore.c:531
+#, fuzzy, c-format
+msgid "Unsupported type `%s'\n"
+msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
+
+#: src/namestore/gnunet-namestore.c:551
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:446
+#: src/namestore/gnunet-namestore.c:587
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:455
-#, c-format
-msgid ""
-"Deletion requires either absolute time, or no time at all. Got relative time "
-"`%s' instead.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
-#: src/namestore/gnunet-namestore.c:497
-msgid "add"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:496
-#, fuzzy, c-format
-msgid "No valid expiration time for operation `%s'\n"
-msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
-
-#: src/namestore/gnunet-namestore.c:519
+#: src/namestore/gnunet-namestore.c:606
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:701
+#: src/namestore/gnunet-namestore.c:649
+#: src/peerinfo-tool/gnunet-peerinfo.c:711
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/namestore/gnunet-namestore.c:625
-#, fuzzy, c-format
-msgid "Using default zone file `%s'\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
-
-#: src/namestore/gnunet-namestore.c:677
+#: src/namestore/gnunet-namestore.c:727
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:680
+#: src/namestore/gnunet-namestore.c:730
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:683
+#: src/namestore/gnunet-namestore.c:733
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:686
+#: src/namestore/gnunet-namestore.c:736
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:689
+#: src/namestore/gnunet-namestore.c:739
+#, fuzzy
+msgid "monitor changes in the namestore"
+msgstr "Không kết nối được đến trình nền gnunetd."
+
+#: src/namestore/gnunet-namestore.c:742
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:692
+#: src/namestore/gnunet-namestore.c:745
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:695
+#: src/namestore/gnunet-namestore.c:748
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
+#: src/namestore/gnunet-namestore.c:751
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:701
+#: src/namestore/gnunet-namestore.c:754
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:704
+#: src/namestore/gnunet-namestore.c:757
 msgid "create or list non-authority record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:707
+#: src/namestore/gnunet-namestore.c:760
 #, fuzzy
 msgid "filename with the zone key"
 msgstr "tên tập tin"
 
-#: src/namestore/gnunet-namestore.c:718
+#: src/namestore/gnunet-namestore.c:771
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
 
-#: src/namestore/gnunet-service-namestore.c:241
-#: src/namestore/gnunet-service-namestore.c:257
+#: src/namestore/gnunet-service-namestore.c:300
+#: src/namestore/gnunet-service-namestore.c:318
 #, fuzzy, c-format
 msgid "Failed to write zone key to file `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/namestore/gnunet-service-namestore.c:243
+#: src/namestore/gnunet-service-namestore.c:302
 msgid "file exists but reading key failed"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:259
+#: src/namestore/gnunet-service-namestore.c:320
 #, fuzzy
 msgid "file exists with different key"
 msgstr "tên tập tin"
 
-#: src/namestore/gnunet-service-namestore.c:1557
-#, fuzzy
-msgid "Failed to find record to remove\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
-
-#: src/namestore/gnunet-service-namestore.c:2172
-#, fuzzy, c-format
-msgid "Could not parse zone key file `%s'\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#: src/namestore/gnunet-service-namestore.c:2262
+#: src/namestore/gnunet-service-namestore.c:2127
 msgid "No directory to load zonefiles specified in configuration\n"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:2272
+#: src/namestore/gnunet-service-namestore.c:2137
 #, c-format
 msgid "Creating directory `%s' for zone files failed!\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:345
+#: src/namestore/namestore_api.c:346
 msgid "Namestore failed to add record"
 msgstr ""
 
-#: src/namestore/namestore_api.c:371
+#: src/namestore/namestore_api.c:372
 msgid "Namestore failed to add record\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:415
-#, fuzzy
-msgid "Failed to create new signature"
-msgstr "Không thể tạo miền tên.\n"
-
-#: src/namestore/namestore_api.c:419
-#, fuzzy
-msgid "Failed to put new set of records in database"
-msgstr ""
-"\n"
-"Không nhận được đáp ứng từ gnunetd.\n"
-
-#: src/namestore/namestore_api.c:423
-#, fuzzy
-msgid "Failed to remove records from database"
-msgstr ""
-"\n"
-"Không nhận được đáp ứng từ gnunetd.\n"
-
-#: src/namestore/namestore_api.c:427
-#, fuzzy
-msgid "Failed to access database"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#: src/namestore/namestore_api.c:431
-#, fuzzy
-msgid "unknown internal error in namestore"
-msgstr "=\tLỗi đọc thư mục.\n"
-
-#: src/namestore/namestore_api.c:436
-msgid "Protocol error"
-msgstr ""
-
-#: src/namestore/namestore_common.c:532 src/namestore/namestore_common.c:672
+#: src/namestore/namestore_api_common.c:532
+#: src/namestore/namestore_api_common.c:672
 #, fuzzy, c-format
 msgid "Unsupported record type %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/namestore/namestore_common.c:539
+#: src/namestore/namestore_api_common.c:539
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/namestore/namestore_common.c:562
+#: src/namestore/namestore_api_common.c:562
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/namestore/namestore_common.c:585
+#: src/namestore/namestore_api_common.c:585
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/namestore/namestore_common.c:603
+#: src/namestore/namestore_api_common.c:603
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/namestore/namestore_common.c:616
+#: src/namestore/namestore_api_common.c:616
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/namestore/namestore_common.c:637
+#: src/namestore/namestore_api_common.c:637
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/namestore/namestore_common.c:663
+#: src/namestore/namestore_api_common.c:663
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -4385,17 +4505,12 @@ msgstr ""
 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:1419
-#, 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:1433
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
+msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1508
-msgid "Invalid work requirement for NSE service. Exiting.\n"
+#: src/nse/gnunet-service-nse.c:1472
+msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
 #: src/peerinfo/gnunet-service-peerinfo.c:215
@@ -4408,16 +4523,16 @@ msgstr "Đã nạp truyền tải « %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:370
+#: src/peerinfo/gnunet-service-peerinfo.c:372
 #, 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:445
+#: src/peerinfo/gnunet-service-peerinfo.c:450
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:481
+#: src/peerinfo/gnunet-service-peerinfo.c:486
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -4425,22 +4540,22 @@ msgstr ""
 "Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ "
 "bỏ.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:633
+#: src/peerinfo/gnunet-service-peerinfo.c:639
 #, 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:638
+#: src/peerinfo/gnunet-service-peerinfo.c:644
 #, 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:970
+#: src/peerinfo/gnunet-service-peerinfo.c:979
 #, 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:1250
+#: src/peerinfo/gnunet-service-peerinfo.c:1269
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -4480,103 +4595,108 @@ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 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:229
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:427
+#: src/peerinfo-tool/gnunet-peerinfo.c:246
+#, c-format
+msgid "\tExpires: %s \t %s\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:437
 #, 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
+#: src/peerinfo-tool/gnunet-peerinfo.c:445
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:444
+#: src/peerinfo-tool/gnunet-peerinfo.c:454
 #, 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
+#: src/peerinfo-tool/gnunet-peerinfo.c:467
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:521
+#: src/peerinfo-tool/gnunet-peerinfo.c:531
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:659
+#: src/peerinfo-tool/gnunet-peerinfo.c:669
 #, 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:665
+#: src/peerinfo-tool/gnunet-peerinfo.c:675
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:727
+#: src/peerinfo-tool/gnunet-peerinfo.c:734
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:759
+#: src/peerinfo-tool/gnunet-peerinfo.c:777
 msgid "don't resolve host names"
 msgstr "không quyết định các tên máy"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:762
+#: src/peerinfo-tool/gnunet-peerinfo.c:780
 msgid "output only the identity strings"
 msgstr "chỉ xuất những chuỗi nhận diện"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:765
+#: src/peerinfo-tool/gnunet-peerinfo.c:783
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:768
+#: src/peerinfo-tool/gnunet-peerinfo.c:786
 msgid "output our own identity only"
 msgstr "chỉ xuất nhận diện mình"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:771
+#: src/peerinfo-tool/gnunet-peerinfo.c:789
 #, 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:774
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:777
+#: src/peerinfo-tool/gnunet-peerinfo.c:795
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:780
+#: src/peerinfo-tool/gnunet-peerinfo.c:798
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:791
+#: src/peerinfo-tool/gnunet-peerinfo.c:809
 #, 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:120
+#: src/transport/gnunet-service-transport_plugins.c:123
 #, 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:124
+#: src/transport/gnunet-service-transport_plugins.c:127
 #, 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:153
+#: src/transport/gnunet-service-transport_plugins.c:157
 #, 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"
@@ -4591,143 +4711,136 @@ msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
 msgid "Unable to initialize Postgres: %s"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/pt/gnunet-daemon-pt.c:264
+#: src/pt/gnunet-daemon-pt.c:266
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:270
+#: src/pt/gnunet-daemon-pt.c:272
 #, fuzzy
 msgid "# DNS requests mapped to VPN"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/pt/gnunet-daemon-pt.c:323
+#: src/pt/gnunet-daemon-pt.c:325
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:500
+#: src/pt/gnunet-daemon-pt.c:502
 #, fuzzy
 msgid "# DNS replies intercepted"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/pt/gnunet-daemon-pt.c:506
+#: src/pt/gnunet-daemon-pt.c:508
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:602
+#: src/pt/gnunet-daemon-pt.c:604
 #, fuzzy
 msgid "# DNS requests dropped (timeout)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/pt/gnunet-daemon-pt.c:632
+#: src/pt/gnunet-daemon-pt.c:634
 #, fuzzy
 msgid "# DNS requests intercepted"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/pt/gnunet-daemon-pt.c:637
+#: src/pt/gnunet-daemon-pt.c:639
 #, fuzzy
 msgid "# DNS requests dropped (DNS mesh tunnel down)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/pt/gnunet-daemon-pt.c:645
+#: src/pt/gnunet-daemon-pt.c:647
 #, fuzzy
 msgid "# DNS requests dropped (malformed)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/pt/gnunet-daemon-pt.c:716
+#: src/pt/gnunet-daemon-pt.c:715
 #, fuzzy
 msgid "# DNS replies received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/pt/gnunet-daemon-pt.c:730
+#: src/pt/gnunet-daemon-pt.c:729
 #, fuzzy
 msgid "# DNS replies dropped (too late?)"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/pt/gnunet-daemon-pt.c:748 src/pt/gnunet-daemon-pt.c:760
+#: src/pt/gnunet-daemon-pt.c:747 src/pt/gnunet-daemon-pt.c:759
 msgid "# DNS requests aborted (tunnel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:898 src/pt/gnunet-daemon-pt.c:907
+#: src/pt/gnunet-daemon-pt.c:901 src/pt/gnunet-daemon-pt.c:910
 #: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/pt/gnunet-daemon-pt.c:976
+#: src/pt/gnunet-daemon-pt.c:977
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:432
+#: src/regex/gnunet-daemon-regexprofiler.c:384
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1247
+#: src/regex/gnunet-regex-profiler.c:1279
 #, 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:1258
+#: src/regex/gnunet-regex-profiler.c:1290
 #, 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:1287
+#: src/regex/gnunet-regex-profiler.c:1319
 #: 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:1293
+#: src/regex/gnunet-regex-profiler.c:1325
 #: 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:1300
+#: src/regex/gnunet-regex-profiler.c:1332
 #, 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:1309
+#: src/regex/gnunet-regex-profiler.c:1341
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1319
-#, fuzzy
-msgid ""
-"Error loading search strings.Given file does not contain enough strings. "
-"Exiting.\n"
-msgstr "Gặp lỗi khi tải xuống: %s\n"
-
-#: src/regex/gnunet-regex-profiler.c:1327
+#: src/regex/gnunet-regex-profiler.c:1361
 #, 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:1394
+#: src/regex/gnunet-regex-profiler.c:1443
 #, 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:1397
+#: src/regex/gnunet-regex-profiler.c:1446
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1400
+#: src/regex/gnunet-regex-profiler.c:1449
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1403
+#: src/regex/gnunet-regex-profiler.c:1452
 #, 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:1406
+#: src/regex/gnunet-regex-profiler.c:1455
 #, 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:1418
+#: src/regex/gnunet-regex-profiler.c:1467
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4743,6 +4856,32 @@ msgstr ""
 msgid "Profiler for regex library"
 msgstr ""
 
+#: src/set/gnunet-set-ibf-profiler.c:224
+#, fuzzy
+msgid "number of element in set A-B"
+msgstr "số lần lặp lại"
+
+#: src/set/gnunet-set-ibf-profiler.c:227
+#, fuzzy
+msgid "number of element in set B-A"
+msgstr "số lần lặp lại"
+
+#: src/set/gnunet-set-ibf-profiler.c:230
+msgid "number of common elements in A and B"
+msgstr ""
+
+#: src/set/gnunet-set-ibf-profiler.c:233
+msgid "hash num"
+msgstr ""
+
+#: src/set/gnunet-set-ibf-profiler.c:236
+msgid "ibf size"
+msgstr ""
+
+#: src/set/gnunet-set-profiler.c:296
+msgid "oeration to execute"
+msgstr ""
+
 #: src/statistics/gnunet-service-statistics.c:271
 #, fuzzy, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
@@ -4763,68 +4902,68 @@ msgstr "Lỗi lấy thông kê về truyền tải.\n"
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:181
-#, fuzzy, c-format
-msgid "Trying to connect to remote host, but service `%s' is not running\n"
-msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
-
-#: src/statistics/gnunet-statistics.c:190
-#, fuzzy, c-format
-msgid "A port is required to connect to host `%s'\n"
-msgstr "Không thể kết nối tới %s:%u: %s\n"
-
-#: src/statistics/gnunet-statistics.c:196
-#, c-format
-msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:210
+#: src/statistics/gnunet-statistics.c:186
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:216
+#: src/statistics/gnunet-statistics.c:192
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:247
+#: src/statistics/gnunet-statistics.c:223
 #, fuzzy, c-format
 msgid "No subsystem or name given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/statistics/gnunet-statistics.c:255
+#: src/statistics/gnunet-statistics.c:231
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:310
+#: src/statistics/gnunet-statistics.c:258
+#, fuzzy, c-format
+msgid "Trying to connect to remote host, but service `%s' is not running\n"
+msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
+
+#: src/statistics/gnunet-statistics.c:266
+#, fuzzy, c-format
+msgid "A port is required to connect to host `%s'\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/statistics/gnunet-statistics.c:273
+#, c-format
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:331
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:313
+#: src/statistics/gnunet-statistics.c:334
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:316
+#: src/statistics/gnunet-statistics.c:337
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:319
+#: src/statistics/gnunet-statistics.c:340
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:322
+#: src/statistics/gnunet-statistics.c:343
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:325
+#: src/statistics/gnunet-statistics.c:346
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:328
+#: src/statistics/gnunet-statistics.c:349
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:361
 msgid "Print statistics about GNUnet operations."
 msgstr "In ra thống kê về các thao tác GNUnet."
 
@@ -4844,12 +4983,26 @@ msgstr ""
 msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:692
+#: src/testbed/gnunet-service-testbed_cpustatus.c:727
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
+#: src/testbed/gnunet-service-testbed_peers.c:964
+#, fuzzy
+msgid "Misconfiguration (can't connect to the ARM service)"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/testbed/gnunet-service-testbed_peers.c:970
+msgid "Request doesn't fit into a message"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1008
+#, fuzzy, c-format
+msgid "%s service can't be started because ARM is shutting down"
+msgstr "« %s » đang tắt.\n"
+
 #: src/testbed/gnunet_testbed_ll_master.c:57
 #, fuzzy, c-format
 msgid "Job command file not given. Exiting\n"
@@ -4898,50 +5051,50 @@ msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1879
+#: src/testbed/testbed_api_hosts.c:1878
 #, 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:891
+#: src/testbed/testbed_api_testbed.c:802
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1094
+#: src/testbed/testbed_api_testbed.c:944
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1175
+#: src/testbed/testbed_api_testbed.c:1009
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1320
+#: src/testbed/testbed_api_testbed.c:1111
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1324
+#: src/testbed/testbed_api_testbed.c:1115
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1365
+#: src/testbed/testbed_api_testbed.c:1153
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1383
+#: src/testbed/testbed_api_testbed.c:1171
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1443
+#: src/testbed/testbed_api_testbed.c:1231
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1455
+#: src/testbed/testbed_api_testbed.c:1243
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1479
+#: src/testbed/testbed_api_testbed.c:1267
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
@@ -4987,33 +5140,33 @@ msgstr ""
 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:133
+#: src/testing/gnunet-testing.c:130
 #, 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:210
+#: src/testing/gnunet-testing.c:199
 #, 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:212
+#: src/testing/gnunet-testing.c:201
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:214
+#: src/testing/gnunet-testing.c:203
 #, 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:216
+#: src/testing/gnunet-testing.c:205
 #, fuzzy
 msgid "configuration template"
 msgstr "Cấu hình đã được lưu."
 
-#: src/testing/gnunet-testing.c:225
+#: src/testing/gnunet-testing.c:214
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -5041,54 +5194,54 @@ msgstr ""
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:719
+#: src/testing/testing.c:722
 #, 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:730
+#: src/testing/testing.c:733
 #, 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:1175
+#: src/testing/testing.c:1177
 #, 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:1182
+#: src/testing/testing.c:1184
 #, 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:1191
+#: src/testing/testing.c:1193
 #, 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:1211
+#: src/testing/testing.c:1209
 #, 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
+#: src/testing/testing.c:1219
 #, 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:1243
+#: src/testing/testing.c:1241
 #, 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:1343
+#: src/testing/testing.c:1341
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/testing/testing.c:1709
+#: src/testing/testing.c:1707
 #, 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 »:"
@@ -5205,27 +5358,34 @@ msgstr ""
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:174
+#: src/transport/gnunet-service-transport.c:169
 #, 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:239
+#: src/transport/gnunet-service-transport.c:235
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# tổng số nội dung lỗ hổng được nhận"
 
-#: src/transport/gnunet-service-transport.c:286
+#: src/transport/gnunet-service-transport.c:282
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# các byte đã giải mã"
 
-#: src/transport/gnunet-service-transport.c:642
+#: src/transport/gnunet-service-transport.c:432
 #, 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"
+msgid "Could not obtain a valid network for `%s' %s\n"
+msgstr "Không thể l��y đ���a ch�� IP cho giao diện « %s », d��ng « %s ».\n"
 
-#: src/transport/gnunet-service-transport.c:741
+#: src/transport/gnunet-service-transport.c:480
+#, c-format
+msgid ""
+"Address or session unknown: failed to update properties for peer `%s' plugin "
+"`%s' address `%s' session %p\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:754
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5321,108 +5481,138 @@ msgstr "theo dõi gnunetd sử dụng dải thông"
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2774
+#: src/transport/gnunet-service-transport_neighbours.c:2769
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2789
-#: src/transport/gnunet-service-transport_neighbours.c:2823
+#: src/transport/gnunet-service-transport_neighbours.c:2784
+#: src/transport/gnunet-service-transport_neighbours.c:2815
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2836
+#: src/transport/gnunet-service-transport_neighbours.c:2828
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2869
+#: src/transport/gnunet-service-transport_neighbours.c:2859
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3050
+#: src/transport/gnunet-service-transport_neighbours.c:3040
 #, 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:3105
+#: src/transport/gnunet-service-transport_neighbours.c:3093
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3119
+#: src/transport/gnunet-service-transport_neighbours.c:3107
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3138
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3161
+#: src/transport/gnunet-service-transport_neighbours.c:3149
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3192
+#: src/transport/gnunet-service-transport_neighbours.c:3188
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3287
+#: 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:113
+#: src/transport/gnunet-service-transport_plugins.c:116
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:453
+#: src/transport/gnunet-service-transport_plugins.c:170
+#: src/transport/gnunet-service-transport_plugins.c:178
+#: src/transport/gnunet-service-transport_plugins.c:186
+#: src/transport/gnunet-service-transport_plugins.c:194
+#: src/transport/gnunet-service-transport_plugins.c:202
+#: src/transport/gnunet-service-transport_plugins.c:210
+#: src/transport/gnunet-service-transport_plugins.c:218
+#: src/transport/gnunet-service-transport_plugins.c:226
+#, fuzzy, c-format
+msgid "Missing function `%s' in transport plugin for `%s'\n"
+msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
+
+#: src/transport/gnunet-service-transport_plugins.c:233
+#, fuzzy, c-format
+msgid "Did not load plugin `%s' due to missing functions\n"
+msgstr "Lỗi nạp phần bổ sung « %s » tại %s:%d. Đang hủy nạp phần bổ sung.\n"
+
+#: src/transport/gnunet-service-transport_validation.c:455
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:515
+#: src/transport/gnunet-service-transport_validation.c:518
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:564
+#: src/transport/gnunet-service-transport_validation.c:575
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# các thông báo PONG nhập thô được gửi"
 
-#: src/transport/gnunet-service-transport_validation.c:651
+#: src/transport/gnunet-service-transport_validation.c:664
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:910
+#: src/transport/gnunet-service-transport_validation.c:930
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_validation.c:955
+#: src/transport/gnunet-service-transport_validation.c:989
+msgid "# failed address checks during validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:999
+msgid "# successful address checks during validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1018
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1051
+#: src/transport/gnunet-service-transport_validation.c:1072
+#, fuzzy, c-format
+msgid "Failed to create PONG signature for peer `%s'\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/transport/gnunet-service-transport_validation.c:1117
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1060
+#: src/transport/gnunet-service-transport_validation.c:1126
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1187
+#: src/transport/gnunet-service-transport_validation.c:1253
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1202
+#: src/transport/gnunet-service-transport_validation.c:1268
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1305
+#: src/transport/gnunet-service-transport_validation.c:1374
 #, 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"
@@ -5508,112 +5698,188 @@ msgstr "# của các đồng đẳng đã kết nối"
 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:819
+#: src/transport/gnunet-transport.c:828
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:825
+#: src/transport/gnunet-transport.c:834
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:845 src/transport/gnunet-transport.c:875
-#: src/transport/gnunet-transport.c:897 src/transport/gnunet-transport.c:936
+#: src/transport/gnunet-transport.c:854 src/transport/gnunet-transport.c:884
+#: src/transport/gnunet-transport.c:906 src/transport/gnunet-transport.c:945
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:852 src/transport/gnunet-transport.c:882
+#: src/transport/gnunet-transport.c:861 src/transport/gnunet-transport.c:891
 #, 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:902
+#: src/transport/gnunet-transport.c:911
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:987
+#: src/transport/gnunet-transport.c:995
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:990
+#: src/transport/gnunet-transport.c:998
 #, fuzzy
 msgid "connect to a peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:993
+#: src/transport/gnunet-transport.c:1001
 #, 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:999
+#: src/transport/gnunet-transport.c:1007
 #, 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:1002
+#: src/transport/gnunet-transport.c:1010
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:1005
+#: src/transport/gnunet-transport.c:1013
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1009
+#: src/transport/gnunet-transport.c:1017
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1012
+#: src/transport/gnunet-transport.c:1020
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1023
+#: src/transport/gnunet-transport.c:1031
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
+#: src/transport/plugin_transport_bluetooth.c:612
+msgid "# Bluetooth ACKs sent"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:631
+#, fuzzy
+msgid "# Bluetooth messages defragmented"
+msgstr "# các thông báo được chắp liền"
+
+#: src/transport/plugin_transport_bluetooth.c:677
+#: src/transport/plugin_transport_bluetooth.c:727
+#: src/transport/plugin_transport_bluetooth.c:1833
+#, fuzzy
+msgid "# Bluetooth sessions allocated"
+msgstr "# các khoá phiên chạy được chấp nhận"
+
+#: src/transport/plugin_transport_bluetooth.c:802
+#, fuzzy
+msgid "# Bluetooth message fragments sent"
+msgstr "# các thông báo bị tế phân"
+
+#: src/transport/plugin_transport_bluetooth.c:826
+msgid "# Bluetooth messages pending (with fragmentation)"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:934
+#: src/transport/plugin_transport_bluetooth.c:1019
+#: src/transport/plugin_transport_bluetooth.c:1835
+#, fuzzy
+msgid "# Bluetooth MAC endpoints allocated"
+msgstr "# các yêu cầu get (lấy) dht được nhận"
+
+#: src/transport/plugin_transport_bluetooth.c:1214
+#, fuzzy
+msgid "# HELLO messages received via Bluetooth"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/plugin_transport_bluetooth.c:1240
+#, fuzzy
+msgid "# fragments received via Bluetooth"
+msgstr "# các mảnh bị loại bỏ"
+
+#: src/transport/plugin_transport_bluetooth.c:1250
+#, fuzzy
+msgid "# ACKs received via Bluetooth"
+msgstr "# các byte đã nhận qua TCP"
+
+#: src/transport/plugin_transport_bluetooth.c:1307
+#, fuzzy
+msgid "# Bluetooth DATA messages discarded due to CRC32 error"
+msgstr "# các thông báo được chắp liền"
+
+#: src/transport/plugin_transport_bluetooth.c:1419
+#, fuzzy
+msgid "# DATA messages received via Bluetooth"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/plugin_transport_bluetooth.c:1454
+#, fuzzy
+msgid "# Bluetooth DATA messages processed"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/transport/plugin_transport_bluetooth.c:1517
+#, fuzzy
+msgid "# HELLO beacons sent via Bluetooth"
+msgstr "# các byte đã gửi qua UDP"
+
+#: src/transport/plugin_transport_bluetooth.c:1630
+msgid "Bluetooth address with invalid size encountered\n"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:1814
+#, c-format
+msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
+msgstr ""
+
 #: src/transport/plugin_transport_http.c:815
-#: src/transport/plugin_transport_http_server.c:2566
+#: src/transport/plugin_transport_http_server.c:2585
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:864
-#: src/transport/plugin_transport_http_server.c:2334
+#: src/transport/plugin_transport_http_server.c:2353
 #, 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:896
-#: src/transport/plugin_transport_http_server.c:2366 src/util/service.c:1053
+#: src/transport/plugin_transport_http_server.c:2385 src/util/service.c:1062
 #, 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:913
-#: src/transport/plugin_transport_http_server.c:2383 src/util/service.c:1070
+#: src/transport/plugin_transport_http_server.c:2402 src/util/service.c:1079
 #, 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:1018
-#: src/transport/plugin_transport_http_server.c:2494
+#: src/transport/plugin_transport_http_server.c:2513
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1131
-#: src/transport/plugin_transport_http_server.c:2673
+#: src/transport/plugin_transport_http_server.c:2693
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1144
-#: src/transport/plugin_transport_http_server.c:2684
+#: src/transport/plugin_transport_http_server.c:2704
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
@@ -5639,7 +5905,7 @@ msgid ""
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2774
+#: src/transport/plugin_transport_http_server.c:2819
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
@@ -5648,93 +5914,93 @@ msgstr "Đang bắt đầu tài về « %s »\n"
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1535
+#: src/transport/plugin_transport_http_client.c:1582
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1666
-#: src/transport/plugin_transport_http_server.c:2898
+#: src/transport/plugin_transport_http_client.c:1713
+#: src/transport/plugin_transport_http_server.c:2943
 #, 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:1691
-#: src/transport/plugin_transport_http_server.c:2957
+#: src/transport/plugin_transport_http_client.c:1738
+#: src/transport/plugin_transport_http_server.c:3003
 #, 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:1719
-#: src/transport/plugin_transport_http_server.c:2804
+#: src/transport/plugin_transport_http_client.c:1766
+#: src/transport/plugin_transport_http_server.c:2849
 #, 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:1352
+#: src/transport/plugin_transport_http_server.c:1368
 #, 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:1613
+#: src/transport/plugin_transport_http_server.c:1632
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1621
+#: src/transport/plugin_transport_http_server.c:1640
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1922
+#: src/transport/plugin_transport_http_server.c:1941
 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:1946
+#: src/transport/plugin_transport_http_server.c:1965
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2652
+#: src/transport/plugin_transport_http_server.c:2672
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2666
+#: src/transport/plugin_transport_http_server.c:2686
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2691
+#: src/transport/plugin_transport_http_server.c:2711
 #, 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:2706
+#: src/transport/plugin_transport_http_server.c:2726
 #, 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:2716
+#: src/transport/plugin_transport_http_server.c:2736
 #, 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:2737
+#: src/transport/plugin_transport_http_server.c:2757
 #, 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:2747
+#: src/transport/plugin_transport_http_server.c:2767
 #, 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:2790
+#: src/transport/plugin_transport_http_server.c:2835
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "không quyết định các tên máy"
@@ -5781,92 +6047,92 @@ msgstr "# các byte đã gửi qua SMTP"
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:596
+#: src/transport/plugin_transport_tcp.c:627
 #, fuzzy, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/transport/plugin_transport_tcp.c:772
-#: src/transport/plugin_transport_tcp.c:861
-#: src/transport/plugin_transport_tcp.c:911
-#: src/transport/plugin_transport_tcp.c:997
-#: src/transport/plugin_transport_tcp.c:1140
-#: src/transport/plugin_transport_tcp.c:1157
+#: src/transport/plugin_transport_tcp.c:836
+#: src/transport/plugin_transport_tcp.c:925
+#: src/transport/plugin_transport_tcp.c:975
+#: src/transport/plugin_transport_tcp.c:1061
+#: src/transport/plugin_transport_tcp.c:1204
+#: src/transport/plugin_transport_tcp.c:1221
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:779
-#: src/transport/plugin_transport_tcp.c:968
-#: src/transport/plugin_transport_tcp.c:1827
-#: src/transport/plugin_transport_tcp.c:2460
+#: src/transport/plugin_transport_tcp.c:843
+#: src/transport/plugin_transport_tcp.c:1032
+#: src/transport/plugin_transport_tcp.c:2013
+#: src/transport/plugin_transport_tcp.c:2688
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_tcp.c:865
+#: src/transport/plugin_transport_tcp.c:929
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:914
+#: src/transport/plugin_transport_tcp.c:978
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:1001
+#: src/transport/plugin_transport_tcp.c:1065
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1114
+#: src/transport/plugin_transport_tcp.c:1178
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1350
-#, fuzzy, c-format
-msgid "Address of unexpected length: %u\n"
-msgstr "Gặp sự kiện bất thường: %d\n"
+#: src/transport/plugin_transport_tcp.c:1415
+#: src/transport/plugin_transport_udp.c:1454
+msgid "# requests to create session with invalid address"
+msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:1532
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1868
+#: src/transport/plugin_transport_tcp.c:2063
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_tcp.c:2037
+#: src/transport/plugin_transport_tcp.c:2246
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:2119
+#: src/transport/plugin_transport_tcp.c:2326
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2345 src/util/service.c:948
-#: src/util/service.c:954
+#: src/transport/plugin_transport_tcp.c:2568 src/util/service.c:957
+#: src/util/service.c:963
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2359
+#: src/transport/plugin_transport_tcp.c:2582
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2448
+#: src/transport/plugin_transport_tcp.c:2675
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2452
+#: src/transport/plugin_transport_tcp.c:2679
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2456
+#: src/transport/plugin_transport_tcp.c:2683
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5891,14 +6157,21 @@ msgstr ""
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2350
+#: src/transport/plugin_transport_udp.c:1556
+#, c-format
+msgid ""
+"Trying to create session for address of unexpected length %u (should be %u "
+"or %u)\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2587
 #, 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:2364
+#: src/transport/plugin_transport_udp.c:2601
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5906,103 +6179,103 @@ msgid ""
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2664
+#: src/transport/plugin_transport_udp.c:2901
 #, 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:2762
+#: src/transport/plugin_transport_udp.c:2999
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2805
+#: src/transport/plugin_transport_udp.c:3042
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/transport/plugin_transport_udp.c:2862
+#: src/transport/plugin_transport_udp.c:3101
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/plugin_transport_unix.c:1427
+#: src/transport/plugin_transport_unix.c:1641
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_wlan.c:580
+#: src/transport/plugin_transport_wlan.c:610
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:599
+#: src/transport/plugin_transport_wlan.c:629
 #, fuzzy
 msgid "# WLAN messages defragmented"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:645
-#: src/transport/plugin_transport_wlan.c:695
-#: src/transport/plugin_transport_wlan.c:1764
+#: src/transport/plugin_transport_wlan.c:675
+#: src/transport/plugin_transport_wlan.c:742
+#: src/transport/plugin_transport_wlan.c:1874
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_wlan.c:770
+#: src/transport/plugin_transport_wlan.c:835
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# các thông báo bị tế phân"
 
-#: src/transport/plugin_transport_wlan.c:794
+#: src/transport/plugin_transport_wlan.c:859
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:902
-#: src/transport/plugin_transport_wlan.c:987
-#: src/transport/plugin_transport_wlan.c:1766
+#: src/transport/plugin_transport_wlan.c:967
+#: src/transport/plugin_transport_wlan.c:1052
+#: src/transport/plugin_transport_wlan.c:1876
 #, 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:1166
+#: src/transport/plugin_transport_wlan.c:1247
 #, 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:1192
+#: src/transport/plugin_transport_wlan.c:1273
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:1202
+#: src/transport/plugin_transport_wlan.c:1283
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_wlan.c:1259
+#: src/transport/plugin_transport_wlan.c:1340
 #, 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:1364
+#: src/transport/plugin_transport_wlan.c:1460
 #, 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:1399
+#: src/transport/plugin_transport_wlan.c:1495
 #, 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:1460
+#: src/transport/plugin_transport_wlan.c:1558
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_wlan.c:1569
+#: src/transport/plugin_transport_wlan.c:1671
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1745
+#: src/transport/plugin_transport_wlan.c:1855
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
@@ -6046,43 +6319,39 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:276 src/util/client.c:753 src/util/service.c:984
+#: src/util/client.c:261 src/util/client.c:839 src/util/service.c:993
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:280 src/util/client.c:757 src/util/service.c:988
+#: src/util/client.c:265 src/util/client.c:843 src/util/service.c:997
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/util/client.c:371
+#: src/util/client.c:357
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:379
+#: src/util/client.c:365
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:698
-msgid "Failure to transmit TEST request.\n"
-msgstr ""
-
-#: src/util/client.c:898
-#, c-format
-msgid "Could not connect to service `%s', must not be running.\n"
-msgstr ""
+#: src/util/client.c:981
+#, fuzzy, c-format
+msgid "Could not connect to service `%s', configuration broken.\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/util/client.c:912
+#: src/util/client.c:993
 #, fuzzy, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/client.c:1178
+#: src/util/client.c:1259
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -6146,7 +6415,7 @@ msgstr ""
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
 
-#: src/util/configuration.c:998
+#: src/util/configuration.c:984
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -6188,60 +6457,41 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: 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: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:555 src/util/crypto_ecc.c:599
-#: src/util/crypto_rsa.c:750 src/util/crypto_rsa.c:887
+#: src/util/crypto_ecc.c:534 src/util/crypto_ecc.c:572
 #, 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:560 src/util/crypto_rsa.c:892
+#: src/util/crypto_ecc.c:539
 #, 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:603 src/util/crypto_rsa.c:754
-#: src/util/crypto_rsa.c:790
+#: src/util/crypto_ecc.c:576
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:634 src/util/crypto_rsa.c:785
+#: src/util/crypto_ecc.c:607
 #, 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:639
+#: src/util/crypto_ecc.c:612
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: 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:776 src/util/crypto_rsa.c:982
-msgid "interrupted by shutdown"
-msgstr ""
+#: src/util/crypto_ecc.c:694
+#, fuzzy
+msgid "Could not load peer's private key\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/util/crypto_ecc.c:787
-msgid "gnunet-ecc failed"
-msgstr ""
+#: src/util/crypto_ecc.c:756
+#, 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:1084
+#: src/util/crypto_ecc.c:836
 #, 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"
@@ -6256,38 +6506,17 @@ msgstr ""
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/util/crypto_rsa.c:660
-#, fuzzy, c-format
-msgid ""
-"File `%s' does not contain a valid private key (too long, %llu bytes).  "
-"Renaming it.\n"
-msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
-
-#: src/util/crypto_rsa.c:993
-msgid "gnunet-rsa failed"
-msgstr ""
-
-#: src/util/crypto_rsa.c:1378
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
-
-#: src/util/disk.c:602
-#, fuzzy, c-format
-msgid "`%s' failed for drive `%S': %u\n"
-msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
-
-#: src/util/disk.c:1207
+#: src/util/disk.c:1149
 #, 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:1564 src/util/service.c:1670
+#: src/util/disk.c:1506 src/util/service.c:1679
 #, 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:2007
+#: src/util/disk.c:1953
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
@@ -6402,75 +6631,71 @@ msgstr ""
 msgid "Manipulate GNUnet configuration files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/util/gnunet-ecc.c:76
+#: src/util/gnunet-ecc.c:65
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/util/gnunet-ecc.c:82
+#: src/util/gnunet-ecc.c:71
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:100
+#: src/util/gnunet-ecc.c:87
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/gnunet-ecc.c:112
+#: src/util/gnunet-ecc.c:97
 #, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:115
+#: src/util/gnunet-ecc.c:100
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:138 src/util/gnunet-rsa.c:65
+#: src/util/gnunet-ecc.c:123
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:193
+#: src/util/gnunet-ecc.c:178
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:196 src/util/gnunet-rsa.c:115
+#: src/util/gnunet-ecc.c:181
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:199 src/util/gnunet-rsa.c:118
+#: src/util/gnunet-ecc.c:184
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:202 src/util/gnunet-rsa.c:121
+#: src/util/gnunet-ecc.c:187
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:213
+#: src/util/gnunet-ecc.c:198
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/util/gnunet-resolver.c:148
+#: src/util/gnunet-resolver.c:149
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:159
+#: src/util/gnunet-resolver.c:160
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:132
-msgid "Manipulate GNUnet private RSA key files"
-msgstr ""
-
 #: src/util/gnunet-service-resolver.c:288
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
@@ -6506,17 +6731,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:322
+#: src/util/helper.c:330
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/helper.c:367
+#: src/util/helper.c:375
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/helper.c:564
+#: src/util/helper.c:572
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
@@ -6526,7 +6751,7 @@ msgstr "Gặp lỗi khi tạo người dùng"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1331
+#: src/util/network.c:1344
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -6544,12 +6769,12 @@ msgstr ""
 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
+#: src/util/os_installation.c:769
 #, 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
+#: src/util/os_installation.c:779
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -6574,7 +6799,7 @@ msgstr "« %s » thất bại cho thư viện « %s » với lỗi: %s\n"
 msgid "Could not determine plugin installation path.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/util/program.c:254 src/util/service.c:1792
+#: src/util/program.c:254 src/util/service.c:1801
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
@@ -6614,143 +6839,143 @@ msgstr ""
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:436
+#: src/util/server.c:476
 #, 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:445
+#: src/util/server.c:485
 #, 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:456
+#: src/util/server.c:496
 #, 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:848
+#: src/util/server.c:888
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
-#: src/util/service.c:232 src/util/service.c:239
+#: src/util/service.c:151 src/util/service.c:177 src/util/service.c:220
+#: src/util/service.c:241 src/util/service.c:248
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/util/service.c:195
+#: src/util/service.c:204
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
 
-#: src/util/service.c:288
+#: src/util/service.c:297
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
 
-#: src/util/service.c:320
+#: src/util/service.c:329
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/service.c:350
+#: src/util/service.c:359
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/service.c:707
+#: src/util/service.c:716
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:712
+#: src/util/service.c:721
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "\tKhông rõ miền tên « %s »\n"
 
-#: src/util/service.c:719
+#: src/util/service.c:728
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:774
+#: src/util/service.c:783
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:811
+#: src/util/service.c:820
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:929
+#: src/util/service.c:938
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1007
+#: src/util/service.c:1016
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1024
+#: src/util/service.c:1033
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1258
+#: src/util/service.c:1267
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1309 src/util/service.c:1327
+#: src/util/service.c:1318 src/util/service.c:1336
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1354
+#: src/util/service.c:1363
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1526
+#: src/util/service.c:1535
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/service.c:1559
+#: src/util/service.c:1568
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Đồng đẳng « %s » có mức tin cậy %8u\n"
 
-#: src/util/service.c:1608
+#: src/util/service.c:1617
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1612
+#: src/util/service.c:1621
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1616
+#: src/util/service.c:1625
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1671
+#: src/util/service.c:1680
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/util/service.c:1684
+#: src/util/service.c:1693
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Không thể thay đổi người dùng/nhóm thành « %s »: %s\n"
 
-#: src/util/service.c:1750
+#: src/util/service.c:1759
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6832,105 +7057,105 @@ msgstr ""
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/vpn/gnunet-service-vpn.c:512 src/vpn/gnunet-service-vpn.c:1088
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1130
 #, fuzzy
 msgid "# Active tunnels"
 msgstr "# các kết nối dht"
 
-#: src/vpn/gnunet-service-vpn.c:609 src/vpn/gnunet-service-vpn.c:646
+#: src/vpn/gnunet-service-vpn.c:622 src/vpn/gnunet-service-vpn.c:661
 #, fuzzy
 msgid "# peers connected to mesh tunnels"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/vpn/gnunet-service-vpn.c:699
+#: src/vpn/gnunet-service-vpn.c:712
 #, fuzzy
 msgid "# Bytes given to mesh for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/vpn/gnunet-service-vpn.c:737
+#: src/vpn/gnunet-service-vpn.c:750
 #, fuzzy
 msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/vpn/gnunet-service-vpn.c:771
+#: src/vpn/gnunet-service-vpn.c:814
 #, fuzzy
 msgid "# Mesh tunnels created"
 msgstr "# các truy vấn lỗ hổng được định tuyến"
 
-#: src/vpn/gnunet-service-vpn.c:794
+#: src/vpn/gnunet-service-vpn.c:839
 #, fuzzy
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/vpn/gnunet-service-vpn.c:990
+#: src/vpn/gnunet-service-vpn.c:1032
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1308
+#: src/vpn/gnunet-service-vpn.c:1350
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1329
+#: src/vpn/gnunet-service-vpn.c:1371
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1534
+#: src/vpn/gnunet-service-vpn.c:1576
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:1572 src/vpn/gnunet-service-vpn.c:1613
+#: src/vpn/gnunet-service-vpn.c:1614 src/vpn/gnunet-service-vpn.c:1655
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1623
+#: src/vpn/gnunet-service-vpn.c:1665
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1637
+#: src/vpn/gnunet-service-vpn.c:1679
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1721
+#: src/vpn/gnunet-service-vpn.c:1761
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2062
+#: src/vpn/gnunet-service-vpn.c:2100
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2220
+#: src/vpn/gnunet-service-vpn.c:2255
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2371
+#: src/vpn/gnunet-service-vpn.c:2406
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2426
+#: src/vpn/gnunet-service-vpn.c:2461
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2465 src/vpn/gnunet-service-vpn.c:2678
+#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2713
 #, fuzzy
 msgid "# Active destinations"
 msgstr "# các kết nối dht"
 
-#: src/vpn/gnunet-service-vpn.c:2751
+#: src/vpn/gnunet-service-vpn.c:2786
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3138
+#: src/vpn/gnunet-service-vpn.c:3143
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3170
+#: src/vpn/gnunet-service-vpn.c:3175
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -7006,23 +7231,155 @@ msgstr "# các byte đã nhận qua UDP"
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
-#: src/include/gnunet_common.h:591
+#: src/include/gnunet_common.h:588 src/include/gnunet_common.h:593
+#: src/include/gnunet_common.h:599
 #, 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:601
+#: src/include/gnunet_common.h:609
 #, 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:622 src/include/gnunet_common.h:629
+#: src/include/gnunet_common.h:630 src/include/gnunet_common.h:637
 #, 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 "number of peers to start"
+#~ msgstr "số lần lặp lại"
+
+#, fuzzy
+#~ msgid "Failed to read or generate private key: %s\n"
+#~ msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
+
+#, 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"
+
+#, fuzzy
+#~ msgid "Failed to create or read private key for namespace `%s'\n"
+#~ msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
+
+#, fuzzy
+#~ msgid "Failed to read private key for namespace `%s'\n"
+#~ msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
+
+#, fuzzy
+#~ msgid "Failed to read namespace private key file `%s', deleting it!\n"
+#~ msgstr "Lỗi thêm mục nhập vào không gian tên « %s » (có chưa ?)\n"
+
+#, fuzzy
+#~ msgid "Internal error."
+#~ msgstr "Lỗi VR."
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "print names of local namespaces"
+#~ msgstr "đặt đánh giá của một không gian tên"
+
+#, fuzzy
+#~ msgid "Failed to create namespace `%s' (illegal filename?)\n"
+#~ msgstr "Không thể tạo miền tên.\n"
+
+#, fuzzy
+#~ msgid "# Replies received from STREAM"
+#~ msgstr "# các byte đã nhận qua HTTP"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "No valid expiration time for operation `%s'\n"
+#~ msgstr ""
+#~ "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+
+#, fuzzy
+#~ msgid "Failed to find record to remove\n"
+#~ msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#, fuzzy
+#~ msgid "Could not parse zone key file `%s'\n"
+#~ msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#, fuzzy
+#~ msgid "Failed to create new signature"
+#~ msgstr "Không thể tạo miền tên.\n"
+
+#, fuzzy
+#~ msgid "Failed to put new set of records in database"
+#~ msgstr ""
+#~ "\n"
+#~ "Không nhận được đáp ứng từ gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to remove records from database"
+#~ msgstr ""
+#~ "\n"
+#~ "Không nhận được đáp ứng từ gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to access database"
+#~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#, fuzzy
+#~ msgid "unknown internal error in namestore"
+#~ msgstr "=\tLỗi đọc thư mục.\n"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error loading search strings.Given file does not contain enough strings. "
+#~ "Exiting.\n"
+#~ msgstr "Gặp lỗi khi tải xuống: %s\n"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "Address of unexpected length: %u\n"
+#~ msgstr "Gặp sự kiện bất thường: %d\n"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid ""
+#~ "File `%s' does not contain a valid private key (too long, %llu bytes).  "
+#~ "Renaming it.\n"
+#~ msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
+
+#~ msgid "RSA signature verification failed at %s:%d: %s\n"
+#~ msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
+
+#, fuzzy
+#~ msgid "`%s' failed for drive `%S': %u\n"
+#~ msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
+
+#, fuzzy
 #~ msgid "Service `%s' has been stopped.\n"
 #~ msgstr "Dịch vụ đã bị xoá.\n"
 
@@ -7155,10 +7512,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
 #, fuzzy
-#~ msgid "Connected to %s\n"
-#~ msgstr "« %s » được kết nối tới « %s ».\n"
-
-#, fuzzy
 #~ msgid "list information for all peers"
 #~ msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
@@ -7413,10 +7766,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "Lưu cấu hình ngay bây giờ không?"
 
 #, fuzzy
-#~ msgid "Could not access hostkey.\n"
-#~ msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#, fuzzy
 #~ msgid "`scp' did not complete cleanly.\n"
 #~ msgstr "« %s » không phải được kết nối tới đồng đẳng nào.\n"
 
@@ -7465,10 +7814,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "« %s » không phải được kết nối tới đồng đẳng nào.\n"
 
 #, fuzzy
-#~ msgid "Starting service %s for peer `%4s'\n"
-#~ msgstr "Đang bắt đầu tài về « %s »\n"
-
-#, fuzzy
 #~ msgid "Could not start `%s' process to copy configuration directory.\n"
 #~ msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
@@ -7683,10 +8028,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgstr "# các thông báo phát hiện dht được nhận"
 
 #, fuzzy
-#~ msgid "Namespace `%s' unknown.\n"
-#~ msgstr "Không gian tên « %s » có đánh giá %d.\n"
-
-#, fuzzy
 #~ msgid "Failed to connect to statistics service!\n"
 #~ msgstr "Lỗi kết nối đến gnunetd.\n"
 
@@ -8387,9 +8728,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ "Không có giao diện mạng được xác định trong cấu hình phần « %s » dưới « "
 #~ "%s ».\n"
 
-#~ msgid "Could not obtain IP for interface `%s' using `%s'.\n"
-#~ msgstr "Không thể lấy địa chỉ IP cho giao diện « %s », dùng « %s ».\n"
-
 #~ msgid ""
 #~ "Could not find interface `%s' using `%s', trying to find another "
 #~ "interface.\n"
@@ -9497,9 +9835,6 @@ msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s
 #~ msgid "Application module `%s' already initialized!\n"
 #~ msgstr "Mô-đun ứng dụng « %s » đã được sở khởi.\n"
 
-#~ msgid "Failed to load plugin `%s' at %s:%d.  Unloading plugin.\n"
-#~ msgstr "Lỗi nạp phần bổ sung « %s » tại %s:%d. Đang hủy nạp phần bổ sung.\n"
-
 #~ msgid "Could not shutdown `%s': application not loaded\n"
 #~ msgstr "Không thể tắt « %s »: chưa nạp ứng dụng\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1c18e6bcd..ca0e3d3f8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2013-05-20 15:09+0200\n"
+"POT-Creation-Date: 2013-08-09 23:01+0200\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/arm/arm_api.c:880
+#: src/arm/arm_api.c:335
 msgid "Client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
@@ -25,227 +25,232 @@ msgid ""
 "Monitoring client was disconnected from arm service, trying to reconnect.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:159
+#: src/arm/gnunet-arm.c:164
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:165
+#: src/arm/gnunet-arm.c:169
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:204 src/testbed/gnunet-service-testbed_peers.c:962
+#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:962
 msgid "Message was sent successfully"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:206 src/testbed/gnunet-service-testbed_peers.c:964
+#: src/arm/gnunet-arm.c:216
 #, fuzzy
-msgid "Misconfiguration (can't connect to the ARM service)"
+msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:208 src/testbed/gnunet-service-testbed_peers.c:966
+#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:966
 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:968
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:968
 msgid "ARM API is busy"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:212 src/testbed/gnunet-service-testbed_peers.c:970
-msgid "Request doesn't fit into a message"
+#: src/arm/gnunet-arm.c:222
+msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:972
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:972
 msgid "Request timed out"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:216 src/testbed/gnunet-service-testbed_peers.c:974
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:974
 #, fuzzy
 msgid "Unknown request status"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:232 src/testbed/gnunet-service-testbed_peers.c:990
+#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:990
 #, c-format
 msgid "%s is stopped"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:234 src/testbed/gnunet-service-testbed_peers.c:992
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:992
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:236 src/testbed/gnunet-service-testbed_peers.c:994
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:994
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:238 src/testbed/gnunet-service-testbed_peers.c:996
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:996
 #, c-format
 msgid "%s is starting already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:240 src/testbed/gnunet-service-testbed_peers.c:998
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:998
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:1000
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1000
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1002
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1002
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1004
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1004
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1006
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1006
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1008
+#: src/arm/gnunet-arm.c:260
 #, c-format
-msgid "%s service can't be started because ARM is shutting down"
+msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1010
+#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1010
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
 
-#: src/arm/gnunet-arm.c:271
+#: src/arm/gnunet-arm.c:295
 msgid "Fatal error initializing ARM API.\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:307
+#: src/arm/gnunet-arm.c:324 src/arm/gnunet-arm.c:333
 #, fuzzy, c-format
-msgid "Failed to kill the `%s' service: %s\n"
-msgstr "���行 %s失败：%s %d\n"
+msgid "Failed to start the ARM service: %s\n"
+msgstr "�����配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:323
+#: src/arm/gnunet-arm.c:367
 #, 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
+#: src/arm/gnunet-arm.c:377
 #, 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
+#: src/arm/gnunet-arm.c:418
 #, 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
+#: src/arm/gnunet-arm.c:427
 #, fuzzy, c-format
 msgid "Failed to start the `%s' service: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:423
+#: src/arm/gnunet-arm.c:463
+#, fuzzy, c-format
+msgid "Failed to send a request to kill the `%s' service: %%s\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/arm/gnunet-arm.c:474
+#, fuzzy, c-format
+msgid "Failed to kill the `%s' service: %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/arm/gnunet-arm.c:510
 #, fuzzy, c-format
 msgid "Failed to request a list of services: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:430
+#: src/arm/gnunet-arm.c:517
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
-#: src/arm/gnunet-arm.c:433
+#: src/arm/gnunet-arm.c:521
 msgid "Running services:\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:534
-msgid "Began monitoring ARM for service status changes\n"
+#: src/arm/gnunet-arm.c:603
+#, c-format
+msgid "Now only monitoring, press CTRL-C to stop.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:537
+#: src/arm/gnunet-arm.c:634
 #, c-format
 msgid "Stopped %s.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:540
+#: src/arm/gnunet-arm.c:637
 #, fuzzy, c-format
 msgid "Starting %s...\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/arm/gnunet-arm.c:543
+#: src/arm/gnunet-arm.c:640
 #, c-format
 msgid "Stopping %s...\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:552
+#: src/arm/gnunet-arm.c:651
 #, fuzzy, c-format
 msgid "Unknown status %u for service %s.\n"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:622
+#: src/arm/gnunet-arm.c:715
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:624
+#: src/arm/gnunet-arm.c:717
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:626
+#: src/arm/gnunet-arm.c:719
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:628
+#: src/arm/gnunet-arm.c:721
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:631
+#: src/arm/gnunet-arm.c:724
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:634
+#: src/arm/gnunet-arm.c:727
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:636
+#: src/arm/gnunet-arm.c:730
+msgid "monitor ARM activities"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:732
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:639
+#: src/arm/gnunet-arm.c:735
 #, fuzzy
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr "等待一次迭代完成的时间(毫秒)"
 
-#: src/arm/gnunet-arm.c:641
+#: src/arm/gnunet-arm.c:737
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:643
+#: src/arm/gnunet-arm.c:739
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:645
+#: src/arm/gnunet-arm.c:741
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:656
+#: src/arm/gnunet-arm.c:752
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -321,17 +326,17 @@ msgstr ""
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1386
+#: src/arm/gnunet-service-arm.c:1387
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-service-arm.c:1397
+#: src/arm/gnunet-service-arm.c:1398
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1411
+#: src/arm/gnunet-service-arm.c:1412
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -350,184 +355,199 @@ msgstr ""
 msgid "Received last message for %s \n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1372
-#: src/ats/gnunet-service-ats_addresses.c:1406
+#: src/ats/gnunet-service-ats_addresses.c:1529
+#: src/ats/gnunet-service-ats_addresses.c:1563
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1378
+#: src/ats/gnunet-service-ats_addresses.c:1535
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1385
+#: src/ats/gnunet-service-ats_addresses.c:1542
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1412
+#: src/ats/gnunet-service-ats_addresses.c:1569
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1419
+#: src/ats/gnunet-service-ats_addresses.c:1576
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:756
+#: src/ats/gnunet-service-ats_addresses.c:1773
+#, fuzzy
+msgid "Failed to initialize solver!\n"
+msgstr "无法初始化 SQLite：%s。\n"
+
+#: src/ats/gnunet-service-ats-solver_mlp.c:848
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1075
+#: src/ats/gnunet-service-ats-solver_mlp.c:1171
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1258
+#: src/ats/gnunet-service-ats-solver_mlp.c:1216
 #, c-format
-msgid "Update for ATS type `%s' not implemented!\n"
+msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: 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:1761
+#: src/ats/gnunet-service-ats-solver_mlp.c:1890
 #, 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:1769
+#: src/ats/gnunet-service-ats-solver_mlp.c:1898
 #, 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:1779
+#: src/ats/gnunet-service-ats-solver_mlp.c:1908
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1787
+#: src/ats/gnunet-service-ats-solver_mlp.c:1916
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses_mlp.c:1798
+#: src/ats/gnunet-service-ats-solver_mlp.c:1927
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:141
+#: src/ats/gnunet-service-ats-solver_proportional.c:1246
+#, fuzzy, c-format
+msgid "Cannot find network of type `%u' %s\n"
+msgstr "找不到主机“%s”的 IP：%s\n"
+
+#: src/ats-tool/gnunet-ats.c:145
 #, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:143
+#: src/ats-tool/gnunet-ats.c:147
 #, c-format
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:199
+#: src/ats-tool/gnunet-ats.c:204
 #, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
 "s, %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:320
+#: src/ats-tool/gnunet-ats.c:328
 #, c-format
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:339 src/namestore/gnunet-namestore.c:610
-#: src/transport/gnunet-transport.c:804
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:461
+#: src/transport/gnunet-transport.c:812
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "服务已删除。\n"
 
-#: src/ats-tool/gnunet-ats.c:349 src/transport/gnunet-transport.c:810
+#: src/ats-tool/gnunet-ats.c:357 src/transport/gnunet-transport.c:819
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats-tool/gnunet-ats.c:357
+#: src/ats-tool/gnunet-ats.c:365
 #, c-format
 msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: 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
+#: src/ats-tool/gnunet-ats.c:381 src/ats-tool/gnunet-ats.c:400
+#: src/ats-tool/gnunet-ats.c:417 src/ats-tool/gnunet-ats.c:455
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:382 src/ats-tool/gnunet-ats.c:399
+#: src/ats-tool/gnunet-ats.c:390 src/ats-tool/gnunet-ats.c:407
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:427
-msgid "Type required\n"
+#: src/ats-tool/gnunet-ats.c:425
+#, fuzzy, c-format
+msgid "No preference type given!\n"
+msgstr "无法获取有关用户“%s”的信息：%s\n"
+
+#: src/ats-tool/gnunet-ats.c:430
+#, c-format
+msgid "No peer given!\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:484
+#: src/ats-tool/gnunet-ats.c:448
+msgid "Valid type required\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:506
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:487
+#: src/ats-tool/gnunet-ats.c:509
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:490
+#: src/ats-tool/gnunet-ats.c:512
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/ats-tool/gnunet-ats.c:493
+#: src/ats-tool/gnunet-ats.c:515
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:496
+#: src/ats-tool/gnunet-ats.c:518
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/ats-tool/gnunet-ats.c:499
+#: src/ats-tool/gnunet-ats.c:521
 msgid "print all configured quotas"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:502
+#: src/ats-tool/gnunet-ats.c:524
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:505
+#: src/ats-tool/gnunet-ats.c:527
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:508
+#: src/ats-tool/gnunet-ats.c:530
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:511
+#: src/ats-tool/gnunet-ats.c:533
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:520
+#: src/ats-tool/gnunet-ats.c:542
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
@@ -537,55 +557,25 @@ msgstr "无法获取有关用户“%s”的信息：%s\n"
 msgid "Loading block plugin `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/consensus/gnunet-consensus.c:350
+#: src/consensus/gnunet-consensus.c:352
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus.c:353
+#: src/consensus/gnunet-consensus.c:355
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus.c:356
+#: src/consensus/gnunet-consensus.c:358 src/set/gnunet-set-profiler.c:287
+#: src/set/gnunet-set-profiler.c:290 src/set/gnunet-set-profiler.c:293
 #, fuzzy
 msgid "number of values"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus.c:359
+#: src/consensus/gnunet-consensus.c:361
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-ibf.c:217
-#, fuzzy
-msgid "number of element in set A-B"
-msgstr "迭代次数"
-
-#: src/consensus/gnunet-consensus-ibf.c:220
-#, fuzzy
-msgid "number of element in set B-A"
-msgstr "迭代次数"
-
-#: src/consensus/gnunet-consensus-ibf.c:223
-msgid "number of common elements in A and B"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-ibf.c:226
-msgid "hash num"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-ibf.c:229
-msgid "ibf size"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-start-peers.c:172
-msgid "start peers with the given template configuration"
-msgstr ""
-
-#: src/consensus/gnunet-consensus-start-peers.c:175
-#, fuzzy
-msgid "number of peers to start"
-msgstr "迭代次数"
-
 #: src/core/core_api.c:752
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
@@ -611,13 +601,13 @@ msgstr "“%s”已连接到“%s”。\n"
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:176
-#: src/peerinfo-tool/gnunet-peerinfo.c:643
+#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:170
+#: src/peerinfo-tool/gnunet-peerinfo.c:653
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:996
+#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:1004
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
@@ -625,26 +615,15 @@ msgstr ""
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:110
-#, fuzzy, c-format
-msgid "Failed to read or generate private key: %s\n"
-msgstr "无法为守护程序创建用户账户。"
-
-#: src/core/gnunet-service-core.c:124
-#, c-format
-msgid "Core service of `%4s' ready.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core.c:150
+#: src/core/gnunet-service-core.c:105
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/core/gnunet-service-core.c:164
-#: src/transport/gnunet-service-transport.c:758
-#, fuzzy
-msgid "Transport service is unable to access hostkey. Exiting.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
+#: src/core/gnunet-service-core.c:126
+#, c-format
+msgid "Core service of `%4s' ready.\n"
+msgstr ""
 
 #: src/core/gnunet-service-core_clients.c:370
 msgid "# send requests dropped (disconnected)"
@@ -686,103 +665,103 @@ msgstr ""
 #: src/core/gnunet-service-core_kx.c:803
 #, c-format
 msgid ""
-"Ephemeral key message rejected as its validity range does not match our "
-"system time (%llu not in [%llu,%llu]).\n"
+"Ephemeral key message from peer `%s' rejected as its validity range does not "
+"match our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:818
+#: src/core/gnunet-service-core_kx.c:819
 msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:921
-#: src/transport/gnunet-service-transport_validation.c:915
+#: src/core/gnunet-service-core_kx.c:922
+#: src/transport/gnunet-service-transport_validation.c:935
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:929
+#: src/core/gnunet-service-core_kx.c:930
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:956
+#: src/core/gnunet-service-core_kx.c:957
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:973
+#: src/core/gnunet-service-core_kx.c:974
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:999
+#: src/core/gnunet-service-core_kx.c:1000
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1009
+#: src/core/gnunet-service-core_kx.c:1010
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1066
-#: src/transport/gnunet-service-transport_validation.c:1160
+#: src/core/gnunet-service-core_kx.c:1067
+#: src/transport/gnunet-service-transport_validation.c:1226
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1072
+#: src/core/gnunet-service-core_kx.c:1073
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1077
+#: src/core/gnunet-service-core_kx.c:1078
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1107
+#: src/core/gnunet-service-core_kx.c:1108
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1141
+#: src/core/gnunet-service-core_kx.c:1142
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1151
+#: src/core/gnunet-service-core_kx.c:1152
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1158
+#: src/core/gnunet-service-core_kx.c:1159
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1298
+#: src/core/gnunet-service-core_kx.c:1299
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1305
+#: src/core/gnunet-service-core_kx.c:1306
 #, 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:1308
+#: src/core/gnunet-service-core_kx.c:1309
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1351
-#: src/core/gnunet-service-core_kx.c:1376
+#: src/core/gnunet-service-core_kx.c:1352
+#: src/core/gnunet-service-core_kx.c:1377
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1363
+#: src/core/gnunet-service-core_kx.c:1364
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1404
+#: src/core/gnunet-service-core_kx.c:1405
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1412
+#: src/core/gnunet-service-core_kx.c:1413
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1443
+#: src/core/gnunet-service-core_kx.c:1444
 msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
@@ -806,16 +785,16 @@ msgstr ""
 
 #: src/core/gnunet-service-core_sessions.c:210
 #: src/core/gnunet-service-core_sessions.c:280
-#: src/dht/gnunet-service-dht_neighbours.c:644
-#: src/dht/gnunet-service-dht_neighbours.c:703
+#: src/dht/gnunet-service-dht_neighbours.c:641
+#: src/dht/gnunet-service-dht_neighbours.c:700
 #: 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:2798
-#: src/transport/gnunet-service-transport_neighbours.c:3057
+#: src/transport/gnunet-service-transport_neighbours.c:2793
+#: src/transport/gnunet-service-transport_neighbours.c:3047
 msgid "# peers connected"
 msgstr ""
 
@@ -883,14 +862,13 @@ msgstr ""
 #: 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/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/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
+#: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
+#: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_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:608 src/include/gnunet_common.h:615
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
+#: src/include/gnunet_common.h:616 src/include/gnunet_common.h:623
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
@@ -1002,6 +980,27 @@ msgstr ""
 msgid "# GET requests executed"
 msgstr ""
 
+#: src/datastore/gnunet-datastore.c:114
+#, fuzzy, c-format
+msgid "Failed to store item: %s, aborting\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/datastore/gnunet-datastore.c:200
+#, c-format
+msgid "Cannot use the same configuration for source and destination\n"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:246
+msgid ""
+"specifies the configuration to use to access an alternative datastore; will "
+"merge that datastore into our current datastore"
+msgstr ""
+
+#: src/datastore/gnunet-datastore.c:255
+#, fuzzy
+msgid "Manipulate GNUnet datastore"
+msgstr "更改配置文件中的一个值"
+
 #: src/datastore/gnunet-service-datastore.c:349
 msgid "# bytes expired"
 msgstr ""
@@ -1011,12 +1010,12 @@ msgid "# bytes purged (low-priority)"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:480
-#: src/gns/gnunet-gns-helper-service-w32.c:159
+#: src/gns/gnunet-gns-helper-service-w32.c:155
 msgid "Transmission to client failed!\n"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:511
-#: src/gns/gnunet-gns-helper-service-w32.c:189
+#: src/gns/gnunet-gns-helper-service-w32.c:183
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
@@ -1209,7 +1208,7 @@ msgid ""
 msgstr ""
 
 #: src/datastore/plugin_datastore_sqlite.c:1193
-#: src/namestore/plugin_namestore_sqlite.c:827
+#: src/namestore/plugin_namestore_sqlite.c:829
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
@@ -1266,7 +1265,7 @@ msgstr ""
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:736
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:861
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:899
 msgid "be verbose (print progress information)"
@@ -1343,37 +1342,37 @@ msgstr ""
 msgid "# PUT requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:590
+#: src/dht/gnunet-service-dht_clients.c:592
 msgid "# GET requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:796
+#: src/dht/gnunet-service-dht_clients.c:793
 msgid "# GET STOP requests received from clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1041
+#: src/dht/gnunet-service-dht_clients.c:1033
 msgid "# Key match, type mismatches in REPLY to CLIENT"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1054
+#: src/dht/gnunet-service-dht_clients.c:1046
 msgid "# Duplicate REPLIES to CLIENT request dropped"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1091
+#: src/dht/gnunet-service-dht_clients.c:1083
 #, c-format
 msgid "Unsupported block type (%u) in request!\n"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1114
+#: src/dht/gnunet-service-dht_clients.c:1106
 msgid "# RESULTS queued for clients"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1165
-#: src/dht/gnunet-service-dht_clients.c:1207
+#: src/dht/gnunet-service-dht_clients.c:1157
+#: src/dht/gnunet-service-dht_clients.c:1199
 msgid "# REPLIES ignored for CLIENTS (no match)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_clients.c:1175
+#: src/dht/gnunet-service-dht_clients.c:1167
 msgid "Could not pass reply to client, message too big!\n"
 msgstr ""
 
@@ -1419,26 +1418,30 @@ msgstr ""
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:504
+#: src/dht/gnunet-service-dht_neighbours.c:501
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:594
+#: src/dht/gnunet-service-dht_neighbours.c:591
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:737
+#: src/dht/gnunet-service-dht_neighbours.c:734
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:792
+#: src/dht/gnunet-service-dht_neighbours.c:789
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:830
+#: src/dht/gnunet-service-dht_neighbours.c:827
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
+#: src/dht/gnunet-service-dht_neighbours.c:859
+msgid "# requests TTL-dropped"
+msgstr ""
+
 #: src/dht/gnunet-service-dht_neighbours.c:1052
 #: src/dht/gnunet-service-dht_neighbours.c:1086
 msgid "# Peers excluded from routing due to Bloomfilter"
@@ -1479,30 +1482,42 @@ msgstr ""
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1730
+#: src/dht/gnunet-service-dht_neighbours.c:1578
+msgid "# P2P PUT bytes received"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1733
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1738
+#: src/dht/gnunet-service-dht_neighbours.c:1741
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1829
+#: src/dht/gnunet-service-dht_neighbours.c:1832
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1882
+#: src/dht/gnunet-service-dht_neighbours.c:1835
+msgid "# P2P GET bytes received"
+msgstr ""
+
+#: src/dht/gnunet-service-dht_neighbours.c:1888
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1896
+#: src/dht/gnunet-service-dht_neighbours.c:1902
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1973
+#: src/dht/gnunet-service-dht_neighbours.c:1979
 msgid "# P2P RESULTS received"
 msgstr ""
 
+#: src/dht/gnunet-service-dht_neighbours.c:1982
+msgid "# P2P RESULT bytes received"
+msgstr ""
+
 #: src/dht/gnunet-service-dht_nse.c:59
 msgid "# Network size estimates received"
 msgstr ""
@@ -1563,28 +1578,28 @@ msgstr "打开日志文件“%s”失败：%s\n"
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/dns/dnsstub.c:175
+#: src/dns/dnsstub.c:176
 #, fuzzy, c-format
 msgid "Could not bind to any port: %s\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
-#: src/gns/gnunet-service-gns_resolver.c:1621
+#: src/dns/dnsstub.c:296 src/dns/dnsstub.c:384
+#: src/gns/gnunet-service-gns_resolver.c:1651
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/dns/dnsstub.c:299
+#: src/dns/dnsstub.c:300
 #, fuzzy, c-format
 msgid "Sent DNS request to %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/dns/dnsstub.c:368
+#: src/dns/dnsstub.c:369
 #, c-format
 msgid "Configured DNS exit `%s' is not working / valid.\n"
 msgstr ""
 
-#: src/dns/dnsstub.c:440
+#: src/dns/dnsstub.c:441
 #, c-format
 msgid "Received DNS response that is too small (%u bytes)"
 msgstr ""
@@ -1650,12 +1665,12 @@ msgstr ""
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3351
+#: src/dns/gnunet-service-dns.c:1049 src/exit/gnunet-daemon-exit.c:3359
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3407
+#: src/dns/gnunet-service-dns.c:1069 src/exit/gnunet-daemon-exit.c:3415
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"
@@ -1669,129 +1684,129 @@ msgstr ""
 msgid "Print information about DV state"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/exit/gnunet-daemon-exit.c:741
+#: src/exit/gnunet-daemon-exit.c:756
 #, c-format
 msgid "Got duplicate service records for `%s:%u'\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:794
+#: src/exit/gnunet-daemon-exit.c:807
 msgid "# Bytes transmitted via mesh tunnels"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:911 src/exit/gnunet-daemon-exit.c:2343
-#: src/exit/gnunet-daemon-exit.c:2603 src/vpn/gnunet-service-vpn.c:1411
-#: src/vpn/gnunet-service-vpn.c:1812 src/vpn/gnunet-service-vpn.c:1975
+#: src/exit/gnunet-daemon-exit.c:924 src/exit/gnunet-daemon-exit.c:2349
+#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1453
+#: src/vpn/gnunet-service-vpn.c:1852 src/vpn/gnunet-service-vpn.c:2015
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:948 src/exit/gnunet-daemon-exit.c:2402
-#: src/exit/gnunet-daemon-exit.c:2662 src/vpn/gnunet-service-vpn.c:1467
-#: src/vpn/gnunet-service-vpn.c:1871 src/vpn/gnunet-service-vpn.c:2008
+#: src/exit/gnunet-daemon-exit.c:961 src/exit/gnunet-daemon-exit.c:2408
+#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1509
+#: src/vpn/gnunet-service-vpn.c:1911 src/vpn/gnunet-service-vpn.c:2048
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:988
+#: src/exit/gnunet-daemon-exit.c:1001
 msgid "# ICMP packets dropped (not allowed)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:995
+#: src/exit/gnunet-daemon-exit.c:1008
 msgid "ICMP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1072
+#: src/exit/gnunet-daemon-exit.c:1084
 msgid "UDP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1147
+#: src/exit/gnunet-daemon-exit.c:1158
 msgid "TCP Packet dropped, have no matching connection information\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1200
+#: src/exit/gnunet-daemon-exit.c:1210
 msgid "# Packets received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1214
+#: src/exit/gnunet-daemon-exit.c:1224
 msgid "# Bytes received from TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1240
+#: src/exit/gnunet-daemon-exit.c:1250
 msgid "IPv4 packet options received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1267
+#: src/exit/gnunet-daemon-exit.c:1277
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1313
+#: src/exit/gnunet-daemon-exit.c:1323
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1321
+#: src/exit/gnunet-daemon-exit.c:1331
 #, c-format
 msgid "Packet from unknown protocol %u received.  Ignored.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1703
+#: src/exit/gnunet-daemon-exit.c:1713
 msgid "# TCP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1814
+#: src/exit/gnunet-daemon-exit.c:1826
 msgid "# TCP service creation requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1817 src/exit/gnunet-daemon-exit.c:1906
-#: src/exit/gnunet-daemon-exit.c:2026 src/exit/gnunet-daemon-exit.c:2267
-#: src/exit/gnunet-daemon-exit.c:2519 src/exit/gnunet-daemon-exit.c:2811
-#: src/exit/gnunet-daemon-exit.c:2921
+#: src/exit/gnunet-daemon-exit.c:1829 src/exit/gnunet-daemon-exit.c:1919
+#: src/exit/gnunet-daemon-exit.c:2035 src/exit/gnunet-daemon-exit.c:2273
+#: src/exit/gnunet-daemon-exit.c:2522 src/exit/gnunet-daemon-exit.c:2811
+#: src/exit/gnunet-daemon-exit.c:2918
 msgid "# Bytes received from MESH"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1850 src/exit/gnunet-daemon-exit.c:2943
+#: src/exit/gnunet-daemon-exit.c:1861 src/exit/gnunet-daemon-exit.c:2940
 #, c-format
 msgid "No service found for %s on port %d!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1854
+#: src/exit/gnunet-daemon-exit.c:1865
 msgid "# TCP requests dropped (no such service)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:1909
+#: src/exit/gnunet-daemon-exit.c:1922
 msgid "# TCP IP-exit creation requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2029
+#: src/exit/gnunet-daemon-exit.c:2038
 msgid "# TCP data requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2043
+#: src/exit/gnunet-daemon-exit.c:2052
 msgid "# TCP DATA requests dropped (no session)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2093
+#: src/exit/gnunet-daemon-exit.c:2102
 msgid "# ICMP packets sent via TUN"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2270
+#: src/exit/gnunet-daemon-exit.c:2276
 msgid "# ICMP IP-exit requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2522
+#: src/exit/gnunet-daemon-exit.c:2525
 msgid "# ICMP service requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2588 src/vpn/gnunet-service-vpn.c:1401
-#: src/vpn/gnunet-service-vpn.c:1969
+#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1443
+#: src/vpn/gnunet-service-vpn.c:2009
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2647 src/vpn/gnunet-service-vpn.c:1437
-#: src/vpn/gnunet-service-vpn.c:1449 src/vpn/gnunet-service-vpn.c:1859
+#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1479
+#: src/vpn/gnunet-service-vpn.c:1491 src/vpn/gnunet-service-vpn.c:1899
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2697
+#: src/exit/gnunet-daemon-exit.c:2700
 msgid "# UDP packets sent via TUN"
 msgstr ""
 
@@ -1799,65 +1814,211 @@ msgstr ""
 msgid "# UDP IP-exit requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2924
+#: src/exit/gnunet-daemon-exit.c:2921
 msgid "# UDP service requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2947
+#: src/exit/gnunet-daemon-exit.c:2944
 msgid "# UDP requests dropped (no such service)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2980
+#: src/exit/gnunet-daemon-exit.c:2977
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3209
+#: src/exit/gnunet-daemon-exit.c:3216
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3223 src/exit/gnunet-daemon-exit.c:3235
+#: src/exit/gnunet-daemon-exit.c:3230 src/exit/gnunet-daemon-exit.c:3242
 #, c-format
 msgid "Service `%s' configured for IPv4, but IPv4 is disabled!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3246
+#: src/exit/gnunet-daemon-exit.c:3253
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3364
+#: src/exit/gnunet-daemon-exit.c:3372
 msgid ""
 "This system does not support IPv4, will disable IPv4 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3372
+#: src/exit/gnunet-daemon-exit.c:3380
 msgid ""
 "This system does not support IPv6, will disable IPv6 functions despite them "
 "being enabled in the configuration\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3379
+#: src/exit/gnunet-daemon-exit.c:3387
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3385
+#: src/exit/gnunet-daemon-exit.c:3393
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3391 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3399 src/pt/gnunet-daemon-pt.c:887
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3620
+#: src/exit/gnunet-daemon-exit.c:3647
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
+#: src/experimentation/gnunet-daemon-experimentation.c:56
+msgid "Experimentation daemon shutting down ...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation.c:78
+msgid "Experimentation daemon starting ...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation.c:84
+#, fuzzy
+msgid "Failed to create statistics!\n"
+msgstr "发送消息失败。\n"
+
+#: src/experimentation/gnunet-daemon-experimentation.c:121
+msgid "GNUnet experimentation daemon"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:264
+#, c-format
+msgid "Experiment `%s': Experiment signature is invalid\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:271
+#, c-format
+msgid ""
+"Adding experiment `%s' running from `%s' to `%s' every %llu sec. for %llu "
+"sec. \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:316
+#, c-format
+msgid "Experiment `%s': Issuer missing\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:321
+#, c-format
+msgid "Experiment `%s': Issuer invalid\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:327
+#, c-format
+msgid "Experiment `%s': Issuer not accepted!\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:336
+#, c-format
+msgid "Experiment `%s': Version missing or invalid \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:344
+#, c-format
+msgid "Experiment `%s': Required capabilities missing \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:349
+#, c-format
+msgid "Experiment `%s': Required capabilities invalid \n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:393
+#, fuzzy, c-format
+msgid "Failed to parse file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:419
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:444
+msgid ""
+"No valid experiment issuers configured! Set value to peer id of issuer! "
+"Exit...\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:429
+#, fuzzy, c-format
+msgid "Invalid value `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:453
+#, fuzzy, c-format
+msgid "Invalid public key `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:460
+#, fuzzy, c-format
+msgid "Found issuer for public key `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:463
+#, fuzzy, c-format
+msgid "No issuer for public key `%s'\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:480
+#, fuzzy, c-format
+msgid "Cannot read experiments file `%s'\n"
+msgstr "无法解析“%s”(%s)：%s\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:220
+#, c-format
+msgid "Cannot send message to peer `%s' for experiment `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:290
+#, c-format
+msgid "Sending experimentation request to peer %s\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:421
+#, c-format
+msgid "Added peer `%s' as active node\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:848
+#, fuzzy, c-format
+msgid "Connected to peer %s\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:877
+#, fuzzy, c-format
+msgid "Disconnected from peer %s\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1057
+#, fuzzy
+msgid "Failed to connect to CORE service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:109
+#, c-format
+msgid "Peer `%s' did not respond to request for experiment `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:144
+#, c-format
+msgid "Starting inbound experiment `%s' with peer `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:278
+#, c-format
+msgid "Starting outbound experiment `%s' with peer `%s'\n"
+msgstr ""
+
+#: src/experimentation/gnunet-daemon-experimentation_scheduler.c:296
+#, c-format
+msgid "Received %s message from peer %s for experiment `%s'\n"
+msgstr ""
+
 #: src/fragmentation/defragmentation.c:270
 msgid "# acknowledgements sent for fragment"
 msgstr ""
@@ -1926,27 +2087,22 @@ msgstr ""
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:1520
-#, c-format
-msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
-msgstr ""
-
-#: src/fs/fs_api.c:1562
+#: src/fs/fs_api.c:1557
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1578
+#: src/fs/fs_api.c:1571
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2229
+#: src/fs/fs_api.c:2228
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2239
+#: src/fs/fs_api.c:2238
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -1961,7 +2117,7 @@ msgstr "打开日志文件“%s”失败：%s\n"
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2897
+#: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2896
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
@@ -1971,11 +2127,11 @@ msgstr ""
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2841
+#: src/fs/fs_api.c:2840
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2935
+#: src/fs/fs_api.c:2934
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1984,58 +2140,58 @@ msgstr ""
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr ""
 
-#: src/fs/fs_download.c:321
+#: src/fs/fs_download.c:322
 msgid ""
 "Recursive downloads of directories larger than 4 GB are not supported on 32-"
 "bit systems\n"
 msgstr ""
 
-#: src/fs/fs_download.c:341
+#: src/fs/fs_download.c:342
 msgid "Directory too large for system address space\n"
 msgstr ""
 
-#: src/fs/fs_download.c:507 src/fs/fs_download.c:519
+#: src/fs/fs_download.c:508 src/fs/fs_download.c:520
 #, fuzzy, c-format
 msgid "Failed to open file `%s' for writing"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_download.c:888
+#: src/fs/fs_download.c:889
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
 msgstr ""
 
-#: src/fs/fs_download.c:970
+#: src/fs/fs_download.c:971
 #, c-format
 msgid ""
 "Internal error or bogus download URI (expected %u bytes at depth %u and "
 "offset %llu/%llu, got %u bytes)"
 msgstr ""
 
-#: src/fs/fs_download.c:996
+#: src/fs/fs_download.c:997
 msgid "internal error decrypting content"
 msgstr ""
 
-#: src/fs/fs_download.c:1019
+#: src/fs/fs_download.c:1020
 #, fuzzy, c-format
 msgid "Download failed: could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_download.c:1029
+#: src/fs/fs_download.c:1030
 #, fuzzy, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_download.c:1038
+#: src/fs/fs_download.c:1039
 #, fuzzy, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_download.c:1136
+#: src/fs/fs_download.c:1137
 #, fuzzy
 msgid "internal error decoding tree"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_download.c:1927
+#: src/fs/fs_download.c:1928
 #, fuzzy
 msgid "Invalid URI"
 msgstr "无效条目。\n"
@@ -2067,140 +2223,106 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:104
+#: src/fs/fs_namespace.c:207
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_namespace.c:126 src/fs/fs_namespace.c:214
+#: src/fs/fs_namespace.c:229
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_namespace.c:240 src/fs/fs_namespace.c:284
-#: src/fs/fs_namespace.c:330
-msgid "Can't determine where namespace directory is\n"
-msgstr ""
-
-#: src/fs/fs_namespace.c:252
-#, c-format
-msgid "Failed to create or read private key for namespace `%s'\n"
-msgstr ""
-
-#: src/fs/fs_namespace.c:296
+#: src/fs/fs_namespace.c:320
 #, fuzzy, c-format
-msgid "Failed to read private key for namespace `%s'\n"
-msgstr "发送消息失败。\n"
-
-#: src/fs/fs_namespace.c:467
-#, c-format
-msgid "Failed to read namespace private key file `%s', deleting it!\n"
-msgstr ""
-
-#: src/fs/fs_namespace.c:659
-msgid "Identifiers or URI too long to create UBlock"
-msgstr ""
-
-#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:311
-#, fuzzy
-msgid "Internal error."
-msgstr "未知错误。\n"
+msgid "Failed to read `%s': %s\n"
+msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_namespace.c:747
+#: src/fs/fs_namespace.c:466
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_pseudonym.c:342 src/fs/fs_pseudonym.c:645
+#: src/fs/fs_pseudonym.c:327 src/fs/fs_pseudonym.c:631
 #, 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
+#: src/fs/fs_pseudonym.c:463 src/fs/fs_pseudonym.c:489
+#: src/fs/fs_pseudonym.c:627
 msgid "no-name"
 msgstr "无名称"
 
-#: src/fs/fs_pseudonym.c:1182 src/util/crypto_ecc.c:1014
-#, 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
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:399
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:622 src/fs/fs_publish.c:639 src/fs/fs_publish.c:678
-#: src/fs/fs_publish.c:698 src/fs/fs_publish.c:723 src/fs/fs_publish.c:863
+#: src/fs/fs_publish.c:624 src/fs/fs_publish.c:641 src/fs/fs_publish.c:680
+#: src/fs/fs_publish.c:700 src/fs/fs_publish.c:725 src/fs/fs_publish.c:865
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:624
+#: src/fs/fs_publish.c:626
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:636
+#: src/fs/fs_publish.c:638
 #, fuzzy
 msgid "unknown error"
 msgstr "未知错误"
 
-#: src/fs/fs_publish.c:679
+#: src/fs/fs_publish.c:681
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:699
+#: src/fs/fs_publish.c:701
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:724
+#: src/fs/fs_publish.c:726
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:747
+#: src/fs/fs_publish.c:749
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_publish.c:812
+#: src/fs/fs_publish.c:814
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:818
+#: src/fs/fs_publish.c:820
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:864
+#: src/fs/fs_publish.c:866
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1090
+#: src/fs/fs_publish.c:1092
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1161
+#: src/fs/fs_publish.c:1164
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:273
+#: src/fs/fs_publish_ksk.c:219
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_search.c:742
+#: src/fs/fs_search.c:815
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_search.c:800
+#: src/fs/fs_search.c:874
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2246,97 +2368,89 @@ msgstr "未知错误。\n"
 msgid "Failed to remove UBlock: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_unindex.c:566 src/fs/fs_unindex.c:633
+#: src/fs/fs_unindex.c:565 src/fs/fs_unindex.c:628
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_unindex.c:646
+#: src/fs/fs_unindex.c:641
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_unindex.c:680
+#: src/fs/fs_unindex.c:675
 msgid "Failed to compute hash of file."
 msgstr ""
 
-#: src/fs/fs_uri.c:221
+#: src/fs/fs_uri.c:222
 #, no-c-format
 msgid "`%' must be followed by HEX number"
 msgstr ""
 
-#: src/fs/fs_uri.c:280
+#: src/fs/fs_uri.c:281
 msgid "Malformed KSK URI (must not begin or end with `+')"
 msgstr ""
 
-#: src/fs/fs_uri.c:298
+#: src/fs/fs_uri.c:299
 msgid "`++' not allowed in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:305
+#: src/fs/fs_uri.c:306
 msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:375
+#: src/fs/fs_uri.c:376
 msgid "Malformed SKS URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:418 src/fs/fs_uri.c:433
+#: src/fs/fs_uri.c:419 src/fs/fs_uri.c:434
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:563 src/fs/fs_uri.c:578 src/fs/fs_uri.c:588
-#: src/fs/fs_uri.c:616
+#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
+#: src/fs/fs_uri.c:629
 msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:598
+#: src/fs/fs_uri.c:611
 msgid "SKS URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:604
+#: src/fs/fs_uri.c:617
 msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:610
+#: src/fs/fs_uri.c:623
 msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:623
+#: src/fs/fs_uri.c:636
 msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:635
+#: src/fs/fs_uri.c:648
 msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:673
+#: src/fs/fs_uri.c:686
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:898 src/util/crypto_ecc.c:941
+#: src/fs/fs_uri.c:911
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "立即保存配置？"
 
-#: src/fs/fs_uri.c:904 src/util/crypto_ecc.c:947
+#: src/fs/fs_uri.c:917
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/fs/fs_uri.c:945
-msgid "identifier is NULL!"
-msgstr ""
-
-#: src/fs/fs_uri.c:951
-msgid "identifier has zero length!"
-msgstr ""
-
-#: src/fs/fs_uri.c:1122 src/fs/fs_uri.c:1149
+#: src/fs/fs_uri.c:1099 src/fs/fs_uri.c:1126
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1155
+#: src/fs/fs_uri.c:1132
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2372,25 +2486,25 @@ msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:302
-#: src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:310
+#: src/fs/gnunet-publish.c:808
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:687
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:812
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:690
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:815
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:714
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:839
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:327
-#: src/fs/gnunet-publish.c:721
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:329
+#: src/fs/gnunet-publish.c:846
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2464,7 +2578,7 @@ msgstr ""
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:195
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:273
 #: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
@@ -2475,7 +2589,7 @@ msgstr ""
 msgid "You need to specify a URI argument.\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:629
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:652
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "运行 %s失败：%s %d\n"
@@ -2488,7 +2602,7 @@ msgstr ""
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:607
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:781
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2552,223 +2666,214 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:178 src/statistics/gnunet-statistics.c:283
-#, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/fs/gnunet-pseudonym.c:273 src/fs/gnunet-pseudonym.c:280
-#: src/fs/gnunet-pseudonym.c:282
+#: src/fs/gnunet-pseudonym.c:227 src/fs/gnunet-pseudonym.c:229
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/fs/gnunet-pseudonym.c:305
-msgid "create or advertise namespace NAME"
-msgstr ""
+#: src/fs/gnunet-pseudonym.c:265 src/statistics/gnunet-statistics.c:305
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "“%s”的参数无效。\n"
 
-#: src/fs/gnunet-pseudonym.c:308
-msgid "delete namespace NAME "
+#: src/fs/gnunet-pseudonym.c:313
+msgid "advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:311
+#: src/fs/gnunet-pseudonym.c:316
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:315 src/fs/gnunet-publish.c:702
+#: src/fs/gnunet-pseudonym.c:320 src/fs/gnunet-publish.c:827
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:318
-msgid "print names of local namespaces"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:321
+#: src/fs/gnunet-pseudonym.c:323
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:324
+#: src/fs/gnunet-pseudonym.c:326
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:330
+#: src/fs/gnunet-pseudonym.c:332
 msgid "specify ID of the root of the namespace"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:333
+#: src/fs/gnunet-pseudonym.c:335
 msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:345
+#: src/fs/gnunet-pseudonym.c:347
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:152
+#: src/fs/gnunet-publish.c:230
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:159
+#: src/fs/gnunet-publish.c:237
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:169
+#: src/fs/gnunet-publish.c:247
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:173
+#: src/fs/gnunet-publish.c:251
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:192
+#: src/fs/gnunet-publish.c:270
 msgid "Cleanup after abort complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:310
+#: src/fs/gnunet-publish.c:388
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:312
+#: src/fs/gnunet-publish.c:390
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:363 src/fs/gnunet-publish.c:617
-#, fuzzy, c-format
-msgid "Failed to create namespace `%s' (illegal filename?)\n"
-msgstr "发送消息失败。\n"
-
-#: src/fs/gnunet-publish.c:438
+#: src/fs/gnunet-publish.c:529
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:465
+#: src/fs/gnunet-publish.c:552
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:496
+#: src/fs/gnunet-publish.c:585
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:498
+#: src/fs/gnunet-publish.c:587
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-publish.c:503
+#: src/fs/gnunet-publish.c:592
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:508
+#: src/fs/gnunet-publish.c:597
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:601
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:516
+#: src/fs/gnunet-publish.c:605
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:523
+#: src/fs/gnunet-publish.c:612
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/gnunet-publish.c:557
+#: src/fs/gnunet-publish.c:643
+#, c-format
+msgid "Selected pseudonym `%s' unknown\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:669
+#, fuzzy, c-format
+msgid "Failed to access `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/fs/gnunet-publish.c:681
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:731
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:564
+#: src/fs/gnunet-publish.c:738
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:570
+#: src/fs/gnunet-publish.c:744
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:578 src/vpn/gnunet-vpn.c:213
+#: src/fs/gnunet-publish.c:752 src/vpn/gnunet-vpn.c:213
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:588 src/fs/gnunet-publish.c:595
-#: src/transport/gnunet-transport.c:834 src/transport/gnunet-transport.c:864
+#: src/fs/gnunet-publish.c:762 src/fs/gnunet-publish.c:769
+#: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:650
-#, fuzzy, c-format
-msgid "Failed to access `%s': %s\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/fs/gnunet-publish.c:662
-msgid ""
-"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
-"installed?\n"
-msgstr ""
-
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:819
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:698
+#: src/fs/gnunet-publish.c:823
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:705
+#: src/fs/gnunet-publish.c:830
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-publish.c:835
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:718
+#: src/fs/gnunet-publish.c:843
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:724
+#: src/fs/gnunet-publish.c:849
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:728
+#: src/fs/gnunet-publish.c:853
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:732
+#: src/fs/gnunet-publish.c:857
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:748
+#: src/fs/gnunet-publish.c:873
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2810,11 +2915,11 @@ msgstr ""
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:538
+#: src/fs/gnunet-service-fs.c:326 src/fs/gnunet-service-fs.c:539
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:291
+#: src/fs/gnunet-service-fs.c:640 src/hostlist/gnunet-daemon-hostlist.c:291
 #: src/topology/gnunet-daemon-topology.c:1314
 #: src/topology/gnunet-daemon-topology.c:1321
 #, fuzzy, c-format
@@ -2964,6 +3069,37 @@ msgstr ""
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
+#: src/fs/gnunet-service-fs_mesh_client.c:475
+msgid "# replies received via mesh"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_mesh_client.c:489
+msgid "# replies received via mesh dropped"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_mesh_server.c:259
+msgid "# Blocks transferred via mesh"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_mesh_server.c:412
+msgid "# queries received via mesh"
+msgstr ""
+
+#: src/fs/gnunet-service-fs_mesh_server.c:455
+#, fuzzy
+msgid "# mesh client connections rejected"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
+#: src/fs/gnunet-service-fs_mesh_server.c:461
+#: src/fs/gnunet-service-fs_mesh_server.c:501
+#, fuzzy
+msgid "# mesh connections active"
+msgstr ""
+"\n"
+"按任意键继续\n"
+
 #: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
 msgstr ""
@@ -3039,7 +3175,7 @@ msgid "# Replies received from DHT"
 msgstr ""
 
 #: src/fs/gnunet-service-fs_pr.c:1189
-msgid "# Replies received from STREAM"
+msgid "# Replies received from MESH"
 msgstr ""
 
 #: src/fs/gnunet-service-fs_pr.c:1241
@@ -3105,34 +3241,6 @@ msgstr ""
 msgid "time required, content pushing disabled"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_stream.c:777
-msgid "# replies received via stream"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_stream.c:791
-msgid "# replies received via stream dropped"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_stream.c:930
-#: src/fs/gnunet-service-fs_stream.c:1384
-#, fuzzy
-msgid "# stream connections active"
-msgstr ""
-"\n"
-"按任意键继续\n"
-
-#: src/fs/gnunet-service-fs_stream.c:1166
-msgid "# Blocks transferred via stream"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_stream.c:1326
-msgid "# queries received via stream"
-msgstr ""
-
-#: src/fs/gnunet-service-fs_stream.c:1376
-msgid "# stream client connections rejected"
-msgstr ""
-
 #: src/fs/gnunet-unindex.c:89
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
@@ -3185,23 +3293,23 @@ msgstr ""
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:679
+#: src/gns/gnunet-dns2gns.c:681
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:682
+#: src/gns/gnunet-dns2gns.c:684
 msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:685
+#: src/gns/gnunet-dns2gns.c:687
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:688
+#: src/gns/gnunet-dns2gns.c:690
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:701
+#: src/gns/gnunet-dns2gns.c:703
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -3255,45 +3363,45 @@ msgstr "解析配置文件“%s”失败\n"
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:586
+#: src/gns/gnunet-gns-fcfsd.c:587
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:648
+#: src/gns/gnunet-gns-fcfsd.c:649
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:664
+#: src/gns/gnunet-gns-fcfsd.c:665
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:700
+#: src/gns/gnunet-gns-fcfsd.c:701
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:708
+#: src/gns/gnunet-gns-fcfsd.c:709
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:912 src/namestore/gnunet-namestore.c:364
+#: src/gns/gnunet-gns-fcfsd.c:913 src/namestore/gnunet-namestore.c:492
 #, fuzzy
 msgid "Failed to read or create private zone key\n"
 msgstr "无法为守护程序创建用户账户。"
 
-#: src/gns/gnunet-gns-fcfsd.c:922 src/namestore/gnunet-namestore.c:375
+#: src/gns/gnunet-gns-fcfsd.c:923 src/namestore/gnunet-namestore.c:503
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:938 src/gns/gnunet-gns-proxy.c:2857
+#: src/gns/gnunet-gns-fcfsd.c:939 src/gns/gnunet-gns-proxy.c:2857
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:972
+#: src/gns/gnunet-gns-fcfsd.c:973
 msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
@@ -3319,95 +3427,100 @@ msgstr ""
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:486
+#: src/gns/gnunet-service-gns.c:497
 #, c-format
 msgid "Records for name `%s' in zone %s too large to fit into DHT"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:1216
+#: src/gns/gnunet-service-gns.c:1225
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns.c:1277
+#: src/gns/gnunet-service-gns.c:1286
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/gns/gnunet-service-gns.c:1288
+#: src/gns/gnunet-service-gns.c:1297
 #, fuzzy
 msgid "Unable to initialize resolver!\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:3439
+#: src/gns/gnunet-service-gns_resolver.c:3446
 #, c-format
 msgid "Not a GADS TLD: `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:119
+#: src/hello/gnunet-hello.c:123
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:125
+#: src/hello/gnunet-hello.c:129
 #, fuzzy, c-format
 msgid "Error accessing file `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/hello/gnunet-hello.c:133
+#: src/hello/gnunet-hello.c:137
 #, c-format
 msgid "File `%s' is too big to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:140
+#: src/hello/gnunet-hello.c:144
 #, c-format
 msgid "File `%s' is too small to be a HELLO\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:150 src/hello/gnunet-hello.c:179
+#: src/hello/gnunet-hello.c:154 src/hello/gnunet-hello.c:183
 #, fuzzy, c-format
 msgid "Error opening file `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/hello/gnunet-hello.c:166
+#: src/hello/gnunet-hello.c:170
 #, c-format
 msgid "Did not find well-formed HELLO in file `%s'\n"
 msgstr ""
 
-#: src/hello/gnunet-hello.c:191
+#: src/hello/gnunet-hello.c:195
 #, fuzzy, c-format
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/hello/hello.c:936
+#: src/hello/gnunet-hello.c:203
+#, c-format
+msgid "Modified %u addresses \n"
+msgstr ""
+
+#: src/hello/hello.c:945
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:945
+#: src/hello/hello.c:954
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:955
+#: src/hello/hello.c:964
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/hello/hello.c:965
+#: src/hello/hello.c:974
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:982
+#: src/hello/hello.c:991
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:991
+#: src/hello/hello.c:1000
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1010
+#: src/hello/hello.c:1019
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -3461,8 +3574,8 @@ msgstr ""
 #: 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:1056
-#: src/transport/plugin_transport_http_client.c:1071
+#: src/transport/plugin_transport_http_client.c:1063
+#: src/transport/plugin_transport_http_client.c:1078
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
@@ -3601,9 +3714,9 @@ msgid "expired addresses encountered"
 msgstr ""
 
 #: src/hostlist/hostlist-server.c:189 src/hostlist/hostlist-server.c:424
-#: src/peerinfo-tool/gnunet-peerinfo.c:348
-#: src/peerinfo-tool/gnunet-peerinfo.c:418
-#: src/peerinfo-tool/gnunet-peerinfo.c:489
+#: src/peerinfo-tool/gnunet-peerinfo.c:358
+#: src/peerinfo-tool/gnunet-peerinfo.c:428
+#: src/peerinfo-tool/gnunet-peerinfo.c:499
 #: src/topology/gnunet-daemon-topology.c:918
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
@@ -3659,8 +3772,8 @@ msgstr ""
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:649
-#: src/transport/gnunet-service-transport.c:661
+#: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:659
+#: src/transport/gnunet-service-transport.c:785
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -3689,6 +3802,78 @@ msgstr "“%s”不可用。\n"
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
+#: src/identity/gnunet-identity.c:135
+#, fuzzy, c-format
+msgid "Failed to create ego: %s\n"
+msgstr "发送消息失败。\n"
+
+#: src/identity/gnunet-identity.c:237
+msgid "create ego NAME"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:240
+msgid "delete ego NAME "
+msgstr ""
+
+#: src/identity/gnunet-identity.c:243
+msgid "display all egos"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:246
+msgid "run in monitor mode egos"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:255
+msgid "Maintain egos"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:336
+msgid "no default known"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:357
+msgid "default configured, but ego unknown (internal error)"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:434
+#: src/identity/gnunet-service-identity.c:665
+#: src/identity/gnunet-service-identity.c:773
+#, fuzzy, c-format
+msgid "Failed to write subsystem default identifier map to `%s'.\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/identity/gnunet-service-identity.c:441
+msgid "Unknown ego specified for service (internal error)"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:511
+msgid "identifier already in use for another ego"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:642
+msgid "target name already exists"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:681
+#: src/identity/gnunet-service-identity.c:790
+msgid "no matching ego found"
+msgstr ""
+
+#: src/identity/gnunet-service-identity.c:824
+#, fuzzy, c-format
+msgid "Failed to parse ego information in `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/identity/gnunet-service-identity.c:897
+#, fuzzy, c-format
+msgid "Failed to parse subsystem identity configuration file `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/identity/gnunet-service-identity.c:909
+#, fuzzy, c-format
+msgid "Failed to create directory `%s' for storing egos\n"
+msgstr "解析配置文件“%s”失败\n"
+
 #: src/integration-tests/connection_watchdog.c:990
 #, c-format
 msgid "Transport plugin: `%s' port %llu\n"
@@ -3708,52 +3893,39 @@ msgstr ""
 msgid "help text"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:211
+#: src/mesh/gnunet-mesh.c:205
 msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:214
+#: src/mesh/gnunet-mesh.c:208
 #, fuzzy
 msgid "provide information about a particular tunnel"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/mesh/gnunet-mesh.c:224
+#: src/mesh/gnunet-mesh.c:218
 #, fuzzy
 msgid "Print information about mesh tunnels and peers."
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/mesh/gnunet-service-mesh.c:7966 src/mesh/gnunet-service-mesh-new.c:4649
+#: src/mesh/gnunet-service-mesh.c:5640
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8179 src/mesh/gnunet-service-mesh-new.c:4790
-#, fuzzy, c-format
-msgid "Mesh service could not access hostkey: %s. Exiting.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: 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:4860
-#: src/mesh/gnunet-service-mesh-new.c:4872
-#: src/mesh/gnunet-service-mesh-new.c:4884
-#: src/mesh/gnunet-service-mesh-new.c:4896
-#: src/mesh/gnunet-service-mesh-new.c:4908
-#: src/mesh/gnunet-service-mesh-new.c:4920 src/nse/gnunet-service-nse.c:1500
-#: src/nse/gnunet-service-nse.c:1518
-#: 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/mesh/gnunet-service-mesh.c:5780 src/mesh/gnunet-service-mesh.c:5792
+#: src/mesh/gnunet-service-mesh.c:5804 src/mesh/gnunet-service-mesh.c:5816
+#: src/mesh/gnunet-service-mesh.c:5828 src/mesh/gnunet-service-mesh.c:5840
+#: src/nse/gnunet-service-nse.c:1425 src/nse/gnunet-service-nse.c:1443
+#: src/regex/gnunet-daemon-regexprofiler.c:270
+#: src/regex/gnunet-daemon-regexprofiler.c:282
+#: src/regex/gnunet-daemon-regexprofiler.c:294
+#: src/regex/gnunet-daemon-regexprofiler.c:307
 #: 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:8347 src/mesh/gnunet-service-mesh.c:8357
-#: src/mesh/gnunet-service-mesh.c:8368 src/mesh/gnunet-service-mesh-new.c:4932
-#: src/mesh/gnunet-service-mesh-new.c:4942
-#: src/mesh/gnunet-service-mesh-new.c:4953
+#: src/mesh/gnunet-service-mesh.c:5852 src/mesh/gnunet-service-mesh.c:5862
+#: src/mesh/gnunet-service-mesh.c:5887
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -3769,247 +3941,199 @@ msgstr ""
 msgid "Could not access file `%s': %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/namestore/gnunet-namestore.c:212
+#: src/namestore/gnunet-namestore.c:250
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:243
+#: src/namestore/gnunet-namestore.c:281
 #, c-format
 msgid "Deleting record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:304
+#: src/namestore/gnunet-namestore.c:342
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:320
+#: src/namestore/gnunet-namestore.c:358
 msgid "for at least"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:321
+#: src/namestore/gnunet-namestore.c:359
 msgid "until"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:356
+#: src/namestore/gnunet-namestore.c:475
+#, fuzzy, c-format
+msgid "Using default zone file `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
+#: src/namestore/gnunet-namestore.c:484
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:386
-#, fuzzy, c-format
-msgid "Unsupported type `%s'\n"
-msgstr "未知的命令“%s”。\n"
-
-#: src/namestore/gnunet-namestore.c:394 src/namestore/gnunet-namestore.c:418
-#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:477
-#: src/namestore/gnunet-namestore.c:518
+#: src/namestore/gnunet-namestore.c:513 src/namestore/gnunet-namestore.c:522
+#: src/namestore/gnunet-namestore.c:539 src/namestore/gnunet-namestore.c:561
+#: src/namestore/gnunet-namestore.c:605
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore.c:395 src/namestore/gnunet-namestore.c:419
-msgid "add/del"
+#: src/namestore/gnunet-namestore.c:514 src/namestore/gnunet-namestore.c:523
+#: src/namestore/gnunet-namestore.c:540 src/namestore/gnunet-namestore.c:562
+msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:408
+#: src/namestore/gnunet-namestore.c:531
+#, fuzzy, c-format
+msgid "Unsupported type `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/namestore/gnunet-namestore.c:551
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:446
+#: src/namestore/gnunet-namestore.c:587
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:455
-#, c-format
-msgid ""
-"Deletion requires either absolute time, or no time at all. Got relative time "
-"`%s' instead.\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
-#: src/namestore/gnunet-namestore.c:497
-msgid "add"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:496
-#, fuzzy, c-format
-msgid "No valid expiration time for operation `%s'\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/namestore/gnunet-namestore.c:519
+#: src/namestore/gnunet-namestore.c:606
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:701
+#: src/namestore/gnunet-namestore.c:649
+#: src/peerinfo-tool/gnunet-peerinfo.c:711
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:625
-#, fuzzy, c-format
-msgid "Using default zone file `%s'\n"
-msgstr "卸载 GNUnet 服务"
-
-#: src/namestore/gnunet-namestore.c:677
+#: src/namestore/gnunet-namestore.c:727
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:680
+#: src/namestore/gnunet-namestore.c:730
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:683
+#: src/namestore/gnunet-namestore.c:733
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:686
+#: src/namestore/gnunet-namestore.c:736
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:689
+#: src/namestore/gnunet-namestore.c:739
+#, fuzzy
+msgid "monitor changes in the namestore"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/namestore/gnunet-namestore.c:742
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:692
+#: src/namestore/gnunet-namestore.c:745
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:695
+#: src/namestore/gnunet-namestore.c:748
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:698
+#: src/namestore/gnunet-namestore.c:751
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:701
+#: src/namestore/gnunet-namestore.c:754
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:704
+#: src/namestore/gnunet-namestore.c:757
 msgid "create or list non-authority record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:707
+#: src/namestore/gnunet-namestore.c:760
 msgid "filename with the zone key"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:718
+#: src/namestore/gnunet-namestore.c:771
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
 
-#: src/namestore/gnunet-service-namestore.c:241
-#: src/namestore/gnunet-service-namestore.c:257
+#: src/namestore/gnunet-service-namestore.c:300
+#: src/namestore/gnunet-service-namestore.c:318
 #, fuzzy, c-format
 msgid "Failed to write zone key to file `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/namestore/gnunet-service-namestore.c:243
+#: src/namestore/gnunet-service-namestore.c:302
 msgid "file exists but reading key failed"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:259
+#: src/namestore/gnunet-service-namestore.c:320
 msgid "file exists with different key"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:1557
-#, fuzzy
-msgid "Failed to find record to remove\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/namestore/gnunet-service-namestore.c:2172
-#, fuzzy, c-format
-msgid "Could not parse zone key file `%s'\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/namestore/gnunet-service-namestore.c:2262
+#: src/namestore/gnunet-service-namestore.c:2127
 msgid "No directory to load zonefiles specified in configuration\n"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:2272
+#: src/namestore/gnunet-service-namestore.c:2137
 #, c-format
 msgid "Creating directory `%s' for zone files failed!\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:345
+#: src/namestore/namestore_api.c:346
 msgid "Namestore failed to add record"
 msgstr ""
 
-#: src/namestore/namestore_api.c:371
+#: src/namestore/namestore_api.c:372
 msgid "Namestore failed to add record\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:415
-#, fuzzy
-msgid "Failed to create new signature"
-msgstr "发送消息失败。\n"
-
-#: src/namestore/namestore_api.c:419
-msgid "Failed to put new set of records in database"
-msgstr ""
-
-#: src/namestore/namestore_api.c:423
-#, fuzzy
-msgid "Failed to remove records from database"
-msgstr "发送消息失败。\n"
-
-#: src/namestore/namestore_api.c:427
-#, fuzzy
-msgid "Failed to access database"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/namestore/namestore_api.c:431
-#, fuzzy
-msgid "unknown internal error in namestore"
-msgstr "未知错误。\n"
-
-#: src/namestore/namestore_api.c:436
-msgid "Protocol error"
-msgstr ""
-
-#: src/namestore/namestore_common.c:532 src/namestore/namestore_common.c:672
+#: src/namestore/namestore_api_common.c:532
+#: src/namestore/namestore_api_common.c:672
 #, fuzzy, c-format
 msgid "Unsupported record type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/namestore_common.c:539
+#: src/namestore/namestore_api_common.c:539
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/namestore/namestore_common.c:562
+#: src/namestore/namestore_api_common.c:562
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/namestore_common.c:585
+#: src/namestore/namestore_api_common.c:585
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/namestore_common.c:603
+#: src/namestore/namestore_api_common.c:603
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/namestore/namestore_common.c:616
+#: src/namestore/namestore_api_common.c:616
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/namestore_common.c:637
+#: src/namestore/namestore_api_common.c:637
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/namestore_common.c:663
+#: src/namestore/namestore_api_common.c:663
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -4158,17 +4282,12 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-service-nse.c:1419
-#, fuzzy, c-format
-msgid "NSE service could not access hostkey: %s\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
 #: src/nse/gnunet-service-nse.c:1433
-msgid "NSE service is lacking key configuration settings.  Exiting.\n"
+msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1508
-msgid "Invalid work requirement for NSE service. Exiting.\n"
+#: src/nse/gnunet-service-nse.c:1472
+msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
 #: src/peerinfo/gnunet-service-peerinfo.c:215
@@ -4181,37 +4300,37 @@ msgstr ""
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:370
+#: src/peerinfo/gnunet-service-peerinfo.c:372
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s %u \n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:445
+#: src/peerinfo/gnunet-service-peerinfo.c:450
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:481
+#: src/peerinfo/gnunet-service-peerinfo.c:486
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:633
+#: src/peerinfo/gnunet-service-peerinfo.c:639
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:638
+#: src/peerinfo/gnunet-service-peerinfo.c:644
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:970
+#: src/peerinfo/gnunet-service-peerinfo.c:979
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1250
+#: src/peerinfo/gnunet-service-peerinfo.c:1269
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -4246,103 +4365,108 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Could not connect to `%s' service.\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:229
+#: src/peerinfo-tool/gnunet-peerinfo.c:239
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:427
+#: src/peerinfo-tool/gnunet-peerinfo.c:246
+#, c-format
+msgid "\tExpires: %s \t %s\n"
+msgstr ""
+
+#: src/peerinfo-tool/gnunet-peerinfo.c:437
 #, fuzzy, c-format
 msgid "Failure: Did not receive %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:435
+#: src/peerinfo-tool/gnunet-peerinfo.c:445
 #, c-format
 msgid "Failure: Received invalid %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:444
+#: src/peerinfo-tool/gnunet-peerinfo.c:454
 #, 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
+#: src/peerinfo-tool/gnunet-peerinfo.c:467
 #, c-format
 msgid "Wrote %s HELLO containing %u addresses with %u bytes to file `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:521
+#: src/peerinfo-tool/gnunet-peerinfo.c:531
 #, c-format
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:659
+#: src/peerinfo-tool/gnunet-peerinfo.c:669
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:665
+#: src/peerinfo-tool/gnunet-peerinfo.c:675
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:727
+#: src/peerinfo-tool/gnunet-peerinfo.c:734
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:759
+#: src/peerinfo-tool/gnunet-peerinfo.c:777
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:762
+#: src/peerinfo-tool/gnunet-peerinfo.c:780
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:765
+#: src/peerinfo-tool/gnunet-peerinfo.c:783
 msgid "include friend-only information"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:768
+#: src/peerinfo-tool/gnunet-peerinfo.c:786
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:771
+#: src/peerinfo-tool/gnunet-peerinfo.c:789
 #, fuzzy
 msgid "list all known peers"
 msgstr "列出所有网络适配器"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:774
+#: src/peerinfo-tool/gnunet-peerinfo.c:792
 msgid "dump hello to file"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:777
+#: src/peerinfo-tool/gnunet-peerinfo.c:795
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:780
+#: src/peerinfo-tool/gnunet-peerinfo.c:798
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:791
+#: src/peerinfo-tool/gnunet-peerinfo.c:809
 #, 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:120
+#: src/transport/gnunet-service-transport_plugins.c:123
 #, c-format
 msgid "Starting transport plugins `%s'\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:109
-#: src/transport/gnunet-service-transport_plugins.c:124
+#: src/transport/gnunet-service-transport_plugins.c:127
 #, c-format
 msgid "Loading `%s' transport plugin\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo_plugins.c:129
-#: src/transport/gnunet-service-transport_plugins.c:153
+#: src/transport/gnunet-service-transport_plugins.c:157
 #, fuzzy, c-format
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -4357,134 +4481,127 @@ msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 msgid "Unable to initialize Postgres: %s"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/pt/gnunet-daemon-pt.c:264
+#: src/pt/gnunet-daemon-pt.c:266
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:270
+#: src/pt/gnunet-daemon-pt.c:272
 msgid "# DNS requests mapped to VPN"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:323
+#: src/pt/gnunet-daemon-pt.c:325
 msgid "# DNS records modified"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:500
+#: src/pt/gnunet-daemon-pt.c:502
 msgid "# DNS replies intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:506
+#: src/pt/gnunet-daemon-pt.c:508
 msgid "Failed to parse DNS request.  Dropping.\n"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:602
+#: src/pt/gnunet-daemon-pt.c:604
 msgid "# DNS requests dropped (timeout)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:632
+#: src/pt/gnunet-daemon-pt.c:634
 msgid "# DNS requests intercepted"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:637
+#: src/pt/gnunet-daemon-pt.c:639
 msgid "# DNS requests dropped (DNS mesh tunnel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:645
+#: src/pt/gnunet-daemon-pt.c:647
 msgid "# DNS requests dropped (malformed)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:716
+#: src/pt/gnunet-daemon-pt.c:715
 msgid "# DNS replies received"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:730
+#: src/pt/gnunet-daemon-pt.c:729
 msgid "# DNS replies dropped (too late?)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:748 src/pt/gnunet-daemon-pt.c:760
+#: src/pt/gnunet-daemon-pt.c:747 src/pt/gnunet-daemon-pt.c:759
 msgid "# DNS requests aborted (tunnel down)"
 msgstr ""
 
-#: src/pt/gnunet-daemon-pt.c:898 src/pt/gnunet-daemon-pt.c:907
+#: src/pt/gnunet-daemon-pt.c:901 src/pt/gnunet-daemon-pt.c:910
 #: src/pt/gnunet-daemon-pt.c:930 src/pt/gnunet-daemon-pt.c:940
 #, fuzzy, c-format
 msgid "Failed to connect to %s service.  Exiting.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/pt/gnunet-daemon-pt.c:976
+#: src/pt/gnunet-daemon-pt.c:977
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:432
+#: src/regex/gnunet-daemon-regexprofiler.c:384
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1247
+#: src/regex/gnunet-regex-profiler.c:1279
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1258
+#: src/regex/gnunet-regex-profiler.c:1290
 #, fuzzy
 msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1287
+#: src/regex/gnunet-regex-profiler.c:1319
 #: 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:1293
+#: src/regex/gnunet-regex-profiler.c:1325
 #: 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:1300
+#: src/regex/gnunet-regex-profiler.c:1332
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/regex/gnunet-regex-profiler.c:1309
+#: src/regex/gnunet-regex-profiler.c:1341
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1319
-#, fuzzy
-msgid ""
-"Error loading search strings.Given file does not contain enough strings. "
-"Exiting.\n"
-msgstr "创建用户出错"
-
-#: src/regex/gnunet-regex-profiler.c:1327
+#: src/regex/gnunet-regex-profiler.c:1361
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "创建用户出错"
 
-#: src/regex/gnunet-regex-profiler.c:1394
+#: src/regex/gnunet-regex-profiler.c:1443
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1397
+#: src/regex/gnunet-regex-profiler.c:1446
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1400
+#: src/regex/gnunet-regex-profiler.c:1449
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1403
+#: src/regex/gnunet-regex-profiler.c:1452
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1406
+#: src/regex/gnunet-regex-profiler.c:1455
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1418
+#: src/regex/gnunet-regex-profiler.c:1467
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4500,6 +4617,32 @@ msgstr ""
 msgid "Profiler for regex library"
 msgstr ""
 
+#: src/set/gnunet-set-ibf-profiler.c:224
+#, fuzzy
+msgid "number of element in set A-B"
+msgstr "迭代次数"
+
+#: src/set/gnunet-set-ibf-profiler.c:227
+#, fuzzy
+msgid "number of element in set B-A"
+msgstr "迭代次数"
+
+#: src/set/gnunet-set-ibf-profiler.c:230
+msgid "number of common elements in A and B"
+msgstr ""
+
+#: src/set/gnunet-set-ibf-profiler.c:233
+msgid "hash num"
+msgstr ""
+
+#: src/set/gnunet-set-ibf-profiler.c:236
+msgid "ibf size"
+msgstr ""
+
+#: src/set/gnunet-set-profiler.c:296
+msgid "oeration to execute"
+msgstr ""
+
 #: src/statistics/gnunet-service-statistics.c:271
 #, c-format
 msgid "Loading %llu bytes of statistics from `%s'\n"
@@ -4520,68 +4663,68 @@ msgstr "初始化“%s”服务失败。\n"
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:181
-#, fuzzy, c-format
-msgid "Trying to connect to remote host, but service `%s' is not running\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/statistics/gnunet-statistics.c:190
-#, fuzzy, c-format
-msgid "A port is required to connect to host `%s'\n"
-msgstr "无法连接到 %s:%u：%s\n"
-
-#: src/statistics/gnunet-statistics.c:196
-#, c-format
-msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
-msgstr ""
-
-#: src/statistics/gnunet-statistics.c:210
+#: src/statistics/gnunet-statistics.c:186
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:216
+#: src/statistics/gnunet-statistics.c:192
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:247
+#: src/statistics/gnunet-statistics.c:223
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:255
+#: src/statistics/gnunet-statistics.c:231
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:310
+#: src/statistics/gnunet-statistics.c:258
+#, fuzzy, c-format
+msgid "Trying to connect to remote host, but service `%s' is not running\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/statistics/gnunet-statistics.c:266
+#, fuzzy, c-format
+msgid "A port is required to connect to host `%s'\n"
+msgstr "无法连接到 %s:%u：%s\n"
+
+#: src/statistics/gnunet-statistics.c:273
+#, c-format
+msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
+msgstr ""
+
+#: src/statistics/gnunet-statistics.c:331
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:313
+#: src/statistics/gnunet-statistics.c:334
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:316
+#: src/statistics/gnunet-statistics.c:337
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:319
+#: src/statistics/gnunet-statistics.c:340
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:322
+#: src/statistics/gnunet-statistics.c:343
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:325
+#: src/statistics/gnunet-statistics.c:346
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:328
+#: src/statistics/gnunet-statistics.c:349
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:361
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
@@ -4601,12 +4744,26 @@ msgstr ""
 msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_cpustatus.c:692
+#: src/testbed/gnunet-service-testbed_cpustatus.c:727
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
+#: src/testbed/gnunet-service-testbed_peers.c:964
+#, fuzzy
+msgid "Misconfiguration (can't connect to the ARM service)"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/testbed/gnunet-service-testbed_peers.c:970
+msgid "Request doesn't fit into a message"
+msgstr ""
+
+#: src/testbed/gnunet-service-testbed_peers.c:1008
+#, c-format
+msgid "%s service can't be started because ARM is shutting down"
+msgstr ""
+
 #: src/testbed/gnunet_testbed_ll_master.c:57
 #, c-format
 msgid "Job command file not given. Exiting\n"
@@ -4654,50 +4811,50 @@ msgstr ""
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1879
+#: src/testbed/testbed_api_hosts.c:1878
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "“%s”以错误码 %d 失败：%s\n"
 
-#: src/testbed/testbed_api_testbed.c:891
+#: src/testbed/testbed_api_testbed.c:802
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1094
+#: src/testbed/testbed_api_testbed.c:944
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1175
+#: src/testbed/testbed_api_testbed.c:1009
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1320
+#: src/testbed/testbed_api_testbed.c:1111
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1324
+#: src/testbed/testbed_api_testbed.c:1115
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1365
+#: src/testbed/testbed_api_testbed.c:1153
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1383
+#: src/testbed/testbed_api_testbed.c:1171
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1443
+#: src/testbed/testbed_api_testbed.c:1231
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1455
+#: src/testbed/testbed_api_testbed.c:1243
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1479
+#: src/testbed/testbed_api_testbed.c:1267
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
@@ -4743,33 +4900,33 @@ msgstr ""
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/testing/gnunet-testing.c:133
+#: src/testing/gnunet-testing.c:130
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/gnunet-testing.c:210
+#: src/testing/gnunet-testing.c:199
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/testing/gnunet-testing.c:212
+#: src/testing/gnunet-testing.c:201
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:214
+#: src/testing/gnunet-testing.c:203
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr "打印配置文件中的一个值到标准输出"
 
-#: src/testing/gnunet-testing.c:216
+#: src/testing/gnunet-testing.c:205
 #, fuzzy
 msgid "configuration template"
 msgstr "配置已保存"
 
-#: src/testing/gnunet-testing.c:225
+#: src/testing/gnunet-testing.c:214
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -4797,54 +4954,54 @@ msgstr ""
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:719
+#: src/testing/testing.c:722
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:730
+#: src/testing/testing.c:733
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/testing/testing.c:1175
+#: src/testing/testing.c:1177
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1182
+#: src/testing/testing.c:1184
 #, 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:1191
+#: src/testing/testing.c:1193
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:1211
+#: src/testing/testing.c:1209
 #, fuzzy, c-format
 msgid "Cannot open hostkey file: %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/testing.c:1221
+#: src/testing/testing.c:1219
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:1243
+#: src/testing/testing.c:1241
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1343
+#: src/testing/testing.c:1341
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/testing/testing.c:1709
+#: src/testing/testing.c:1707
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -4955,24 +5112,31 @@ msgstr ""
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:174
+#: src/transport/gnunet-service-transport.c:169
 msgid "# bytes payload discarded due to not connected peer "
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:239
+#: src/transport/gnunet-service-transport.c:235
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:286
+#: src/transport/gnunet-service-transport.c:282
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:642
+#: src/transport/gnunet-service-transport.c:432
 #, fuzzy, c-format
-msgid "Transport service could not access hostkey: %s. Exiting.\n"
-msgstr "���不��接口“%s”的一个 IP 地址。\n"
+msgid "Could not obtain a valid network for `%s' %s\n"
+msgstr "���法��用“%2$s”获取接口“%1$s”的 IP。\n"
 
-#: src/transport/gnunet-service-transport.c:741
+#: src/transport/gnunet-service-transport.c:480
+#, c-format
+msgid ""
+"Address or session unknown: failed to update properties for peer `%s' plugin "
+"`%s' address `%s' session %p\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport.c:754
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5055,100 +5219,130 @@ msgstr ""
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2774
+#: src/transport/gnunet-service-transport_neighbours.c:2769
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2789
-#: src/transport/gnunet-service-transport_neighbours.c:2823
+#: src/transport/gnunet-service-transport_neighbours.c:2784
+#: src/transport/gnunet-service-transport_neighbours.c:2815
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2836
+#: src/transport/gnunet-service-transport_neighbours.c:2828
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2869
+#: src/transport/gnunet-service-transport_neighbours.c:2859
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3050
+#: src/transport/gnunet-service-transport_neighbours.c:3040
 msgid "# unexpected SESSION ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3105
+#: src/transport/gnunet-service-transport_neighbours.c:3093
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3119
+#: src/transport/gnunet-service-transport_neighbours.c:3107
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3150
+#: src/transport/gnunet-service-transport_neighbours.c:3138
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3161
+#: src/transport/gnunet-service-transport_neighbours.c:3149
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3192
+#: src/transport/gnunet-service-transport_neighbours.c:3188
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3287
+#: src/transport/gnunet-service-transport_neighbours.c:3283
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_plugins.c:113
+#: src/transport/gnunet-service-transport_plugins.c:116
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:453
+#: src/transport/gnunet-service-transport_plugins.c:170
+#: src/transport/gnunet-service-transport_plugins.c:178
+#: src/transport/gnunet-service-transport_plugins.c:186
+#: src/transport/gnunet-service-transport_plugins.c:194
+#: src/transport/gnunet-service-transport_plugins.c:202
+#: src/transport/gnunet-service-transport_plugins.c:210
+#: src/transport/gnunet-service-transport_plugins.c:218
+#: src/transport/gnunet-service-transport_plugins.c:226
+#, fuzzy, c-format
+msgid "Missing function `%s' in transport plugin for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/transport/gnunet-service-transport_plugins.c:233
+#, c-format
+msgid "Did not load plugin `%s' due to missing functions\n"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:455
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:515
+#: src/transport/gnunet-service-transport_validation.c:518
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:564
+#: src/transport/gnunet-service-transport_validation.c:575
 msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:651
+#: src/transport/gnunet-service-transport_validation.c:664
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:910
+#: src/transport/gnunet-service-transport_validation.c:930
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:955
+#: src/transport/gnunet-service-transport_validation.c:989
+msgid "# failed address checks during validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:999
+msgid "# successful address checks during validation"
+msgstr ""
+
+#: src/transport/gnunet-service-transport_validation.c:1018
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1051
+#: src/transport/gnunet-service-transport_validation.c:1072
+#, fuzzy, c-format
+msgid "Failed to create PONG signature for peer `%s'\n"
+msgstr "发送消息失败。\n"
+
+#: src/transport/gnunet-service-transport_validation.c:1117
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1060
+#: src/transport/gnunet-service-transport_validation.c:1126
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1187
+#: src/transport/gnunet-service-transport_validation.c:1253
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1202
+#: src/transport/gnunet-service-transport_validation.c:1268
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1305
+#: src/transport/gnunet-service-transport_validation.c:1374
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
@@ -5236,109 +5430,174 @@ msgstr ""
 msgid "Failed to send connect request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:819
+#: src/transport/gnunet-transport.c:828
 #, c-format
 msgid ""
 "Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
 "%s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:825
+#: src/transport/gnunet-transport.c:834
 #, c-format
 msgid ""
 "No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:845 src/transport/gnunet-transport.c:875
-#: src/transport/gnunet-transport.c:897 src/transport/gnunet-transport.c:936
+#: src/transport/gnunet-transport.c:854 src/transport/gnunet-transport.c:884
+#: src/transport/gnunet-transport.c:906 src/transport/gnunet-transport.c:945
 #, fuzzy
 msgid "Failed to connect to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:852 src/transport/gnunet-transport.c:882
+#: src/transport/gnunet-transport.c:861 src/transport/gnunet-transport.c:891
 #, fuzzy
 msgid "Failed to send request to transport service\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:902
+#: src/transport/gnunet-transport.c:911
 msgid "Starting to receive benchmark data\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:987
+#: src/transport/gnunet-transport.c:995
 msgid "measure how fast we are receiving data from all peers (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:990
+#: src/transport/gnunet-transport.c:998
 #, fuzzy
 msgid "connect to a peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:993
+#: src/transport/gnunet-transport.c:1001
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:999
+#: src/transport/gnunet-transport.c:1007
 msgid ""
 "provide information about all connects and disconnect events (continuously)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1002
+#: src/transport/gnunet-transport.c:1010
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1005
+#: src/transport/gnunet-transport.c:1013
 msgid "peer identity"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1009
+#: src/transport/gnunet-transport.c:1017
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1012
+#: src/transport/gnunet-transport.c:1020
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:1023
+#: src/transport/gnunet-transport.c:1031
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 
+#: src/transport/plugin_transport_bluetooth.c:612
+msgid "# Bluetooth ACKs sent"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:631
+msgid "# Bluetooth messages defragmented"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:677
+#: src/transport/plugin_transport_bluetooth.c:727
+#: src/transport/plugin_transport_bluetooth.c:1833
+msgid "# Bluetooth sessions allocated"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:802
+msgid "# Bluetooth message fragments sent"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:826
+msgid "# Bluetooth messages pending (with fragmentation)"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:934
+#: src/transport/plugin_transport_bluetooth.c:1019
+#: src/transport/plugin_transport_bluetooth.c:1835
+msgid "# Bluetooth MAC endpoints allocated"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:1214
+msgid "# HELLO messages received via Bluetooth"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:1240
+msgid "# fragments received via Bluetooth"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:1250
+msgid "# ACKs received via Bluetooth"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:1307
+msgid "# Bluetooth DATA messages discarded due to CRC32 error"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:1419
+msgid "# DATA messages received via Bluetooth"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:1454
+msgid "# Bluetooth DATA messages processed"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:1517
+msgid "# HELLO beacons sent via Bluetooth"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:1630
+msgid "Bluetooth address with invalid size encountered\n"
+msgstr ""
+
+#: src/transport/plugin_transport_bluetooth.c:1814
+#, c-format
+msgid "Helper binary `%s' not SUID, cannot run bluetooth transport\n"
+msgstr ""
+
 #: src/transport/plugin_transport_http.c:815
-#: src/transport/plugin_transport_http_server.c:2566
+#: src/transport/plugin_transport_http_server.c:2585
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:864
-#: src/transport/plugin_transport_http_server.c:2334
+#: src/transport/plugin_transport_http_server.c:2353
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
 #: src/transport/plugin_transport_http.c:896
-#: src/transport/plugin_transport_http_server.c:2366 src/util/service.c:1053
+#: src/transport/plugin_transport_http_server.c:2385 src/util/service.c:1062
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
 #: src/transport/plugin_transport_http.c:913
-#: src/transport/plugin_transport_http_server.c:2383 src/util/service.c:1070
+#: src/transport/plugin_transport_http_server.c:2402 src/util/service.c:1079
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #: src/transport/plugin_transport_http.c:1018
-#: src/transport/plugin_transport_http_server.c:2494
+#: src/transport/plugin_transport_http_server.c:2513
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1131
-#: src/transport/plugin_transport_http_server.c:2673
+#: src/transport/plugin_transport_http_server.c:2693
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1144
-#: src/transport/plugin_transport_http_server.c:2684
+#: src/transport/plugin_transport_http_server.c:2704
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
@@ -5364,7 +5623,7 @@ msgid ""
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2774
+#: src/transport/plugin_transport_http_server.c:2819
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
@@ -5373,93 +5632,93 @@ msgstr "卸载 GNUnet 服务"
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1535
+#: src/transport/plugin_transport_http_client.c:1582
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1666
-#: src/transport/plugin_transport_http_server.c:2898
+#: src/transport/plugin_transport_http_client.c:1713
+#: src/transport/plugin_transport_http_server.c:2943
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:1691
-#: src/transport/plugin_transport_http_server.c:2957
+#: src/transport/plugin_transport_http_client.c:1738
+#: src/transport/plugin_transport_http_server.c:3003
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1719
-#: src/transport/plugin_transport_http_server.c:2804
+#: src/transport/plugin_transport_http_client.c:1766
+#: src/transport/plugin_transport_http_server.c:2849
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:1352
+#: src/transport/plugin_transport_http_server.c:1368
 #, 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:1613
+#: src/transport/plugin_transport_http_server.c:1632
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1621
+#: src/transport/plugin_transport_http_server.c:1640
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1922
+#: src/transport/plugin_transport_http_server.c:1941
 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:1946
+#: src/transport/plugin_transport_http_server.c:1965
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2652
+#: src/transport/plugin_transport_http_server.c:2672
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2666
+#: src/transport/plugin_transport_http_server.c:2686
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2691
+#: src/transport/plugin_transport_http_server.c:2711
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2706
+#: src/transport/plugin_transport_http_server.c:2726
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2716
+#: src/transport/plugin_transport_http_server.c:2736
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2737
+#: src/transport/plugin_transport_http_server.c:2757
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2747
+#: src/transport/plugin_transport_http_server.c:2767
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2790
+#: src/transport/plugin_transport_http_server.c:2835
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
@@ -5506,86 +5765,86 @@ msgstr ""
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:596
+#: src/transport/plugin_transport_tcp.c:627
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:772
-#: src/transport/plugin_transport_tcp.c:861
-#: src/transport/plugin_transport_tcp.c:911
-#: src/transport/plugin_transport_tcp.c:997
-#: src/transport/plugin_transport_tcp.c:1140
-#: src/transport/plugin_transport_tcp.c:1157
+#: src/transport/plugin_transport_tcp.c:836
+#: src/transport/plugin_transport_tcp.c:925
+#: src/transport/plugin_transport_tcp.c:975
+#: src/transport/plugin_transport_tcp.c:1061
+#: src/transport/plugin_transport_tcp.c:1204
+#: src/transport/plugin_transport_tcp.c:1221
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:779
-#: src/transport/plugin_transport_tcp.c:968
-#: src/transport/plugin_transport_tcp.c:1827
-#: src/transport/plugin_transport_tcp.c:2460
+#: src/transport/plugin_transport_tcp.c:843
+#: src/transport/plugin_transport_tcp.c:1032
+#: src/transport/plugin_transport_tcp.c:2013
+#: src/transport/plugin_transport_tcp.c:2688
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:865
+#: src/transport/plugin_transport_tcp.c:929
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:914
+#: src/transport/plugin_transport_tcp.c:978
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1001
+#: src/transport/plugin_transport_tcp.c:1065
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1114
+#: src/transport/plugin_transport_tcp.c:1178
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1350
-#, c-format
-msgid "Address of unexpected length: %u\n"
+#: src/transport/plugin_transport_tcp.c:1415
+#: src/transport/plugin_transport_udp.c:1454
+msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1467
+#: src/transport/plugin_transport_tcp.c:1532
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1868
+#: src/transport/plugin_transport_tcp.c:2063
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2037
+#: src/transport/plugin_transport_tcp.c:2246
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2119
+#: src/transport/plugin_transport_tcp.c:2326
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2345 src/util/service.c:948
-#: src/util/service.c:954
+#: src/transport/plugin_transport_tcp.c:2568 src/util/service.c:957
+#: src/util/service.c:963
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2359
+#: src/transport/plugin_transport_tcp.c:2582
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2448
+#: src/transport/plugin_transport_tcp.c:2675
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2452
+#: src/transport/plugin_transport_tcp.c:2679
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2456
+#: src/transport/plugin_transport_tcp.c:2683
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5608,14 +5867,21 @@ msgstr ""
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2350
+#: src/transport/plugin_transport_udp.c:1556
+#, c-format
+msgid ""
+"Trying to create session for address of unexpected length %u (should be %u "
+"or %u)\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp.c:2587
 #, 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:2364
+#: src/transport/plugin_transport_udp.c:2601
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5623,92 +5889,92 @@ msgid ""
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2664
+#: src/transport/plugin_transport_udp.c:2901
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_udp.c:2762
+#: src/transport/plugin_transport_udp.c:2999
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2805
+#: src/transport/plugin_transport_udp.c:3042
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_udp.c:2862
+#: src/transport/plugin_transport_udp.c:3101
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_unix.c:1427
+#: src/transport/plugin_transport_unix.c:1641
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_wlan.c:580
+#: src/transport/plugin_transport_wlan.c:610
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:599
+#: src/transport/plugin_transport_wlan.c:629
 msgid "# WLAN messages defragmented"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:645
-#: src/transport/plugin_transport_wlan.c:695
-#: src/transport/plugin_transport_wlan.c:1764
+#: src/transport/plugin_transport_wlan.c:675
+#: src/transport/plugin_transport_wlan.c:742
+#: src/transport/plugin_transport_wlan.c:1874
 msgid "# WLAN sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:770
+#: src/transport/plugin_transport_wlan.c:835
 msgid "# WLAN message fragments sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:794
+#: src/transport/plugin_transport_wlan.c:859
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:902
-#: src/transport/plugin_transport_wlan.c:987
-#: src/transport/plugin_transport_wlan.c:1766
+#: src/transport/plugin_transport_wlan.c:967
+#: src/transport/plugin_transport_wlan.c:1052
+#: src/transport/plugin_transport_wlan.c:1876
 msgid "# WLAN MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1166
+#: src/transport/plugin_transport_wlan.c:1247
 msgid "# HELLO messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1192
+#: src/transport/plugin_transport_wlan.c:1273
 msgid "# fragments received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1202
+#: src/transport/plugin_transport_wlan.c:1283
 msgid "# ACKs received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1259
+#: src/transport/plugin_transport_wlan.c:1340
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1364
+#: src/transport/plugin_transport_wlan.c:1460
 msgid "# DATA messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1399
+#: src/transport/plugin_transport_wlan.c:1495
 msgid "# WLAN DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1460
+#: src/transport/plugin_transport_wlan.c:1558
 msgid "# HELLO beacons sent via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1569
+#: src/transport/plugin_transport_wlan.c:1671
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1745
+#: src/transport/plugin_transport_wlan.c:1855
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
@@ -5752,43 +6018,39 @@ msgstr ""
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:276 src/util/client.c:753 src/util/service.c:984
+#: src/util/client.c:261 src/util/client.c:839 src/util/service.c:993
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:280 src/util/client.c:757 src/util/service.c:988
+#: src/util/client.c:265 src/util/client.c:843 src/util/service.c:997
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s：选项“%s”有歧义\n"
 
-#: src/util/client.c:371
+#: src/util/client.c:357
 #, c-format
 msgid ""
 "Could not determine valid hostname and port for service `%s' from "
 "configuration.\n"
 msgstr ""
 
-#: src/util/client.c:379
+#: src/util/client.c:365
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/client.c:698
-msgid "Failure to transmit TEST request.\n"
-msgstr ""
-
-#: src/util/client.c:898
-#, c-format
-msgid "Could not connect to service `%s', must not be running.\n"
-msgstr ""
+#: src/util/client.c:981
+#, fuzzy, c-format
+msgid "Could not connect to service `%s', configuration broken.\n"
+msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/util/client.c:912
+#: src/util/client.c:993
 #, c-format
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1178
+#: src/util/client.c:1259
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -5850,7 +6112,7 @@ msgstr "配置不满足配置规范文件“%s”的约束！\n"
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/util/configuration.c:998
+#: src/util/configuration.c:984
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -5890,60 +6152,41 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: 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: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:555 src/util/crypto_ecc.c:599
-#: src/util/crypto_rsa.c:750 src/util/crypto_rsa.c:887
+#: src/util/crypto_ecc.c:534 src/util/crypto_ecc.c:572
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/crypto_ecc.c:560 src/util/crypto_rsa.c:892
+#: src/util/crypto_ecc.c:539
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_ecc.c:603 src/util/crypto_rsa.c:754
-#: src/util/crypto_rsa.c:790
+#: src/util/crypto_ecc.c:576
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:634 src/util/crypto_rsa.c:785
+#: src/util/crypto_ecc.c:607
 #, 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:639
+#: src/util/crypto_ecc.c:612
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: 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:776 src/util/crypto_rsa.c:982
-msgid "interrupted by shutdown"
-msgstr ""
+#: src/util/crypto_ecc.c:694
+#, fuzzy
+msgid "Could not load peer's private key\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/crypto_ecc.c:787
-msgid "gnunet-ecc failed"
-msgstr ""
+#: src/util/crypto_ecc.c:756
+#, 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:1084
+#: src/util/crypto_ecc.c:836
 #, c-format
 msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr ""
@@ -5958,38 +6201,17 @@ msgstr ""
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/util/crypto_rsa.c:660
-#, c-format
-msgid ""
-"File `%s' does not contain a valid private key (too long, %llu bytes).  "
-"Renaming it.\n"
-msgstr ""
-
-#: src/util/crypto_rsa.c:993
-msgid "gnunet-rsa failed"
-msgstr ""
-
-#: src/util/crypto_rsa.c:1378
-#, c-format
-msgid "RSA signature verification failed at %s:%d: %s\n"
-msgstr ""
-
-#: src/util/disk.c:602
-#, fuzzy, c-format
-msgid "`%s' failed for drive `%S': %u\n"
-msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
-
-#: src/util/disk.c:1207
+#: src/util/disk.c:1149
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录！\n"
 
-#: src/util/disk.c:1564 src/util/service.c:1670
+#: src/util/disk.c:1506 src/util/service.c:1679
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
 
-#: src/util/disk.c:2007
+#: src/util/disk.c:1953
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
@@ -6101,75 +6323,71 @@ msgstr ""
 msgid "Manipulate GNUnet configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-ecc.c:76
+#: src/util/gnunet-ecc.c:65
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/gnunet-ecc.c:82
+#: src/util/gnunet-ecc.c:71
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:100
+#: src/util/gnunet-ecc.c:87
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/util/gnunet-ecc.c:112
+#: src/util/gnunet-ecc.c:97
 #, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:115
+#: src/util/gnunet-ecc.c:100
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:138 src/util/gnunet-rsa.c:65
+#: src/util/gnunet-ecc.c:123
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:193
+#: src/util/gnunet-ecc.c:178
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:196 src/util/gnunet-rsa.c:115
+#: src/util/gnunet-ecc.c:181
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:199 src/util/gnunet-rsa.c:118
+#: src/util/gnunet-ecc.c:184
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:202 src/util/gnunet-rsa.c:121
+#: src/util/gnunet-ecc.c:187
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:213
+#: src/util/gnunet-ecc.c:198
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-resolver.c:148
+#: src/util/gnunet-resolver.c:149
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:159
+#: src/util/gnunet-resolver.c:160
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:132
-msgid "Manipulate GNUnet private RSA key files"
-msgstr ""
-
 #: src/util/gnunet-service-resolver.c:288
 #, c-format
 msgid "Could not resolve `%s' (%s): %s\n"
@@ -6205,17 +6423,17 @@ msgstr ""
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:322
+#: src/util/helper.c:330
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/helper.c:367
+#: src/util/helper.c:375
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/helper.c:564
+#: src/util/helper.c:572
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
@@ -6225,7 +6443,7 @@ msgstr "创建用户出错"
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1331
+#: src/util/network.c:1344
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -6243,12 +6461,12 @@ msgstr "无法确定安装路径。请尝试设置“%s”\n"
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/util/os_installation.c:767
+#: src/util/os_installation.c:769
 #, 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
+#: src/util/os_installation.c:779
 #, c-format
 msgid "GetExitCodeProcess failed for binary %s (%d).\n"
 msgstr ""
@@ -6273,7 +6491,7 @@ msgstr ""
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/program.c:254 src/util/service.c:1792
+#: src/util/program.c:254 src/util/service.c:1801
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -6313,143 +6531,143 @@ msgstr ""
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:436
+#: src/util/server.c:476
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/server.c:445
+#: src/util/server.c:485
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/server.c:456
+#: src/util/server.c:496
 #, 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:848
+#: src/util/server.c:888
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
-#: src/util/service.c:232 src/util/service.c:239
+#: src/util/service.c:151 src/util/service.c:177 src/util/service.c:220
+#: src/util/service.c:241 src/util/service.c:248
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/util/service.c:195
+#: src/util/service.c:204
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d” 在 IPv4 CIDR 中是非法的)。"
 
-#: src/util/service.c:288
+#: src/util/service.c:297
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
 
-#: src/util/service.c:320
+#: src/util/service.c:329
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩码的格式“%s”错误\n"
 
-#: src/util/service.c:350
+#: src/util/service.c:359
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
 
-#: src/util/service.c:707
+#: src/util/service.c:716
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:712
+#: src/util/service.c:721
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/util/service.c:719
+#: src/util/service.c:728
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:774
+#: src/util/service.c:783
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:811
+#: src/util/service.c:820
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:929
+#: src/util/service.c:938
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1007
+#: src/util/service.c:1016
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1024
+#: src/util/service.c:1033
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1258
+#: src/util/service.c:1267
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1309 src/util/service.c:1327
+#: src/util/service.c:1318 src/util/service.c:1336
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1354
+#: src/util/service.c:1363
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1526
+#: src/util/service.c:1535
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/util/service.c:1559
+#: src/util/service.c:1568
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1608
+#: src/util/service.c:1617
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1612
+#: src/util/service.c:1621
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1616
+#: src/util/service.c:1625
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1671
+#: src/util/service.c:1680
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/util/service.c:1684
+#: src/util/service.c:1693
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”：%s\n"
 
-#: src/util/service.c:1750
+#: src/util/service.c:1759
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6530,98 +6748,98 @@ msgstr ""
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/vpn/gnunet-service-vpn.c:512 src/vpn/gnunet-service-vpn.c:1088
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1130
 msgid "# Active tunnels"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:609 src/vpn/gnunet-service-vpn.c:646
+#: src/vpn/gnunet-service-vpn.c:622 src/vpn/gnunet-service-vpn.c:661
 #, fuzzy
 msgid "# peers connected to mesh tunnels"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/vpn/gnunet-service-vpn.c:699
+#: src/vpn/gnunet-service-vpn.c:712
 msgid "# Bytes given to mesh for transmission"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:737
+#: src/vpn/gnunet-service-vpn.c:750
 msgid "# Bytes dropped in mesh queue (overflow)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:771
+#: src/vpn/gnunet-service-vpn.c:814
 msgid "# Mesh tunnels created"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:794
+#: src/vpn/gnunet-service-vpn.c:839
 #, fuzzy
 msgid "Failed to setup mesh tunnel!\n"
 msgstr "发送消息失败。\n"
 
-#: src/vpn/gnunet-service-vpn.c:990
+#: src/vpn/gnunet-service-vpn.c:1032
 #, c-format
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1308
+#: src/vpn/gnunet-service-vpn.c:1350
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1329
+#: src/vpn/gnunet-service-vpn.c:1371
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1534
+#: src/vpn/gnunet-service-vpn.c:1576
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1572 src/vpn/gnunet-service-vpn.c:1613
+#: src/vpn/gnunet-service-vpn.c:1614 src/vpn/gnunet-service-vpn.c:1655
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1623
+#: src/vpn/gnunet-service-vpn.c:1665
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1637
+#: src/vpn/gnunet-service-vpn.c:1679
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1721
+#: src/vpn/gnunet-service-vpn.c:1761
 msgid "# ICMP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2062
+#: src/vpn/gnunet-service-vpn.c:2100
 msgid "# UDP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2220
+#: src/vpn/gnunet-service-vpn.c:2255
 msgid "# TCP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2371
+#: src/vpn/gnunet-service-vpn.c:2406
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2426
+#: src/vpn/gnunet-service-vpn.c:2461
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2465 src/vpn/gnunet-service-vpn.c:2678
+#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2713
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2751
+#: src/vpn/gnunet-service-vpn.c:2786
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3138
+#: src/vpn/gnunet-service-vpn.c:3143
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3170
+#: src/vpn/gnunet-service-vpn.c:3175
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -6695,23 +6913,101 @@ msgstr ""
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
-#: src/include/gnunet_common.h:591
+#: src/include/gnunet_common.h:588 src/include/gnunet_common.h:593
+#: src/include/gnunet_common.h:599
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:601
+#: src/include/gnunet_common.h:609
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:622 src/include/gnunet_common.h:629
+#: src/include/gnunet_common.h:630 src/include/gnunet_common.h:637
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "number of peers to start"
+#~ msgstr "迭代次数"
+
+#, fuzzy
+#~ msgid "Failed to read or generate private key: %s\n"
+#~ msgstr "无法为守护程序创建用户账户。"
+
+#, fuzzy
+#~ msgid "Transport service is unable to access hostkey. Exiting.\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Failed to read private key for namespace `%s'\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Internal error."
+#~ msgstr "未知错误。\n"
+
+#, fuzzy
+#~ msgid "ECDSA signature verification failed at %s:%d: %s\n"
+#~ msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+
+#, fuzzy
+#~ msgid "Failed to create namespace `%s' (illegal filename?)\n"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Mesh service could not access hostkey: %s. Exiting.\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "No valid expiration time for operation `%s'\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Failed to find record to remove\n"
+#~ msgstr "无法连接到 %s:%u：%s\n"
+
+#, fuzzy
+#~ msgid "Could not parse zone key file `%s'\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Failed to create new signature"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to remove records from database"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to access database"
+#~ msgstr "打开日志文件“%s”失败：%s\n"
+
+#, fuzzy
+#~ msgid "unknown internal error in namestore"
+#~ msgstr "未知错误。\n"
+
+#, fuzzy
+#~ msgid "NSE service could not access hostkey: %s\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error loading search strings.Given file does not contain enough strings. "
+#~ "Exiting.\n"
+#~ msgstr "创建用户出错"
+
+#, fuzzy
+#~ msgid "Transport service could not access hostkey: %s. Exiting.\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "`%s' failed for drive `%S': %u\n"
+#~ msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
+
+#, fuzzy
 #~ msgid "Service `%s' has been stopped.\n"
 #~ msgstr "服务已删除。\n"
 
@@ -6740,10 +7036,6 @@ msgstr ""
 #~ 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"
 
@@ -6797,10 +7089,6 @@ msgstr ""
 #~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #, fuzzy
-#~ msgid "Connected to %s\n"
-#~ msgstr "“%s”已连接到“%s”。\n"
-
-#, fuzzy
 #~ msgid "list information for all peers"
 #~ msgstr "无法获取有关用户“%s”的信息：%s\n"
 
@@ -6929,10 +7217,6 @@ msgstr ""
 #~ msgstr "立即保存配置？"
 
 #, fuzzy
-#~ msgid "Could not access hostkey.\n"
-#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#, fuzzy
 #~ msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
 #~ msgstr "初始化“%s”服务失败。\n"
 
@@ -7604,9 +7888,6 @@ msgstr ""
 #~ msgid "No interface specified in section `%s' under `%s'!\n"
 #~ msgstr "“%2$s”下的“%1$s”节中没有指定接口！\n"
 
-#~ msgid "Could not obtain IP for interface `%s' using `%s'.\n"
-#~ msgstr "无法利用“%2$s”获取接口“%1$s”的 IP。\n"
-
 #~ msgid ""
 #~ "Could not find interface `%s' using `%s', trying to find another "
 #~ "interface.\n"