gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r25635 - gnunet/po


From: gnunet
Subject: [GNUnet-SVN] r25635 - gnunet/po
Date: Fri, 21 Dec 2012 17:48:59 +0100

Author: grothoff
Date: 2012-12-21 17:48:59 +0100 (Fri, 21 Dec 2012)
New Revision: 25635

Modified:
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
Log:
releasing GNUnet 0.9.5

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2012-12-21 16:29:06 UTC (rev 25634)
+++ gnunet/po/de.po     2012-12-21 16:48:59 UTC (rev 25635)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-11-26 14:59+0100\n"
+"POT-Creation-Date: 2012-12-21 16:05+0100\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -76,77 +76,77 @@
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:230
+#: src/arm/gnunet-arm.c:229
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/arm/gnunet-arm.c:233
+#: src/arm/gnunet-arm.c:232
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-arm.c:263 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:385
-msgid "Fatal error initializing ARM API.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:287
+#: src/arm/gnunet-arm.c:253
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/arm/gnunet-arm.c:293
+#: src/arm/gnunet-arm.c:259
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-arm.c:416
+#: src/arm/gnunet-arm.c:306 src/arm/gnunet-arm.c:389 src/arm/gnunet-arm.c:406
+msgid "Fatal error initializing ARM API.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:435
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:418
+#: src/arm/gnunet-arm.c:437
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:420
+#: src/arm/gnunet-arm.c:439
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:422
+#: src/arm/gnunet-arm.c:441
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:425
+#: src/arm/gnunet-arm.c:444
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:428
+#: src/arm/gnunet-arm.c:447
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:430
+#: src/arm/gnunet-arm.c:449
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:433
+#: src/arm/gnunet-arm.c:452
 #, 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:435
+#: src/arm/gnunet-arm.c:454
 #, fuzzy
 msgid "list currently running services"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-arm.c:437
+#: src/arm/gnunet-arm.c:456
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:439
+#: src/arm/gnunet-arm.c:458
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:450
+#: src/arm/gnunet-arm.c:469
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -170,65 +170,65 @@
 msgid "Could not send list result to client\n"
 msgstr "Anfrage konnte nicht an gnunetd gesendet werden.\n"
 
-#: src/arm/gnunet-service-arm.c:536
+#: src/arm/gnunet-service-arm.c:537
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/arm/gnunet-service-arm.c:558
+#: src/arm/gnunet-service-arm.c:559
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:572
+#: src/arm/gnunet-service-arm.c:573
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:680
+#: src/arm/gnunet-service-arm.c:681
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:891
+#: src/arm/gnunet-service-arm.c:892
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:984
+#: src/arm/gnunet-service-arm.c:985
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:989
+#: src/arm/gnunet-service-arm.c:990
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:994
+#: src/arm/gnunet-service-arm.c:995
 #, fuzzy
 msgid "unknown"
 msgstr "Unbekannter Fehler"
 
-#: src/arm/gnunet-service-arm.c:1000
+#: src/arm/gnunet-service-arm.c:1001
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-service-arm.c:1035
+#: src/arm/gnunet-service-arm.c:1036
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1227
+#: src/arm/gnunet-service-arm.c:1228
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1238
+#: src/arm/gnunet-service-arm.c:1239
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1252
+#: src/arm/gnunet-service-arm.c:1253
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -247,93 +247,134 @@
 msgid "Received last message for %s \n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/ats-tool/gnunet-ats.c:134
+#: src/ats/gnunet-service-ats_addresses.c:983
 #, c-format
+msgid "Outbound quota configure for network `%s' is unlimited (%llu)\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:989
+#: src/ats/gnunet-service-ats_addresses.c:1014
+#, c-format
+msgid ""
+"Could not convert quota configure for network `%s':  `%s', assigning default "
+"bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:997
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1007
+#, c-format
+msgid "Inbound quota configure for network `%s' is unlimited (%llu)\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1022
+#, c-format
+msgid ""
+"No inbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:141
+#, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:136
+#: src/ats-tool/gnunet-ats.c:143
 #, c-format
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:190
+#: src/ats-tool/gnunet-ats.c:198
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%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:274 src/namestore/gnunet-namestore.c:610
+#: src/ats-tool/gnunet-ats.c:324
+#, c-format
+msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:343 src/namestore/gnunet-namestore.c:610
 #: src/transport/gnunet-transport.c:744
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "`%s' ist keine Datei.\n"
 
-#: src/ats-tool/gnunet-ats.c:284 src/transport/gnunet-transport.c:750
+#: src/ats-tool/gnunet-ats.c:353 src/transport/gnunet-transport.c:750
 #, 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:292
+#: src/ats-tool/gnunet-ats.c:361
 #, c-format
-msgid "Please select one operation : %s or %s or %s or %s\n"
+msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:305 src/ats-tool/gnunet-ats.c:324
-#: src/ats-tool/gnunet-ats.c:341 src/ats-tool/gnunet-ats.c:366
+#: src/ats-tool/gnunet-ats.c:377 src/ats-tool/gnunet-ats.c:396
+#: src/ats-tool/gnunet-ats.c:413 src/ats-tool/gnunet-ats.c:438
 #, 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:314 src/ats-tool/gnunet-ats.c:331
+#: src/ats-tool/gnunet-ats.c:386 src/ats-tool/gnunet-ats.c:403
 #, 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:359
+#: src/ats-tool/gnunet-ats.c:431
 msgid "Type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:416
+#: src/ats-tool/gnunet-ats.c:488
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:419
+#: src/ats-tool/gnunet-ats.c:491
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:422
+#: src/ats-tool/gnunet-ats.c:494
 #, 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:425
+#: src/ats-tool/gnunet-ats.c:497
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:428
+#: src/ats-tool/gnunet-ats.c:500
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/ats-tool/gnunet-ats.c:431
+#: src/ats-tool/gnunet-ats.c:503
+msgid "print all configured quotas"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:506
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:434
+#: src/ats-tool/gnunet-ats.c:509
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:437
+#: src/ats-tool/gnunet-ats.c:512
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:440
+#: src/ats-tool/gnunet-ats.c:515
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:449
+#: src/ats-tool/gnunet-ats.c:524
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -343,6 +384,42 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
+#: src/consensus/gnunet-consensus.c:230
+#, fuzzy
+msgid "session identifier"
+msgstr "# Sitzungen aufgebaut"
+
+#: src/consensus/gnunet-consensus-ibf.c:176
+#, fuzzy
+msgid "number of element in set A-B"
+msgstr "Anzahl an Durchläufen"
+
+#: src/consensus/gnunet-consensus-ibf.c:179
+#, fuzzy
+msgid "number of element in set B-A"
+msgstr "Anzahl an Durchläufen"
+
+#: src/consensus/gnunet-consensus-ibf.c:182
+msgid "number of common elements in A and B"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-ibf.c:185
+msgid "hash num"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-ibf.c:188
+msgid "ibf size"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-start-peers.c:158
+msgid "start peers with the given template configuration"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-start-peers.c:161
+#, fuzzy
+msgid "number of peers to start"
+msgstr "Anzahl an Durchläufen"
+
 #: src/core/core_api.c:755
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
@@ -368,7 +445,7 @@
 msgid "Disconnected from"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:131
+#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:176
 #: src/peerinfo-tool/gnunet-peerinfo.c:541
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
@@ -582,11 +659,11 @@
 #: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1544
 #: src/topology/gnunet-daemon-topology.c:704
 #: src/topology/gnunet-daemon-topology.c:805
-#: src/transport/gnunet-service-transport_neighbours.c:874
-#: src/transport/gnunet-service-transport_neighbours.c:1091
-#: src/transport/gnunet-service-transport_neighbours.c:1100
-#: src/transport/gnunet-service-transport_neighbours.c:2637
-#: src/transport/gnunet-service-transport_neighbours.c:2899
+#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1267
+#: src/transport/gnunet-service-transport_neighbours.c:1276
+#: src/transport/gnunet-service-transport_neighbours.c:2815
+#: src/transport/gnunet-service-transport_neighbours.c:3078
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
@@ -954,6 +1031,11 @@
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
+#: src/datastore/plugin_datastore_heap.c:820
+#, fuzzy
+msgid "Heap database running\n"
+msgstr "sqlite Datenspeicher"
+
 #: src/datastore/plugin_datastore_mysql.c:780
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
@@ -1013,7 +1095,7 @@
 msgid "Sqlite database running\n"
 msgstr "sqlite Datenspeicher"
 
-#: src/datastore/plugin_datastore_template.c:241
+#: src/datastore/plugin_datastore_template.c:257
 msgid "Template database running\n"
 msgstr ""
 
@@ -1065,7 +1147,7 @@
 
 #: 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:733
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:736
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:1033
 msgid "be verbose (print progress information)"
@@ -1380,12 +1462,12 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:110
+#: src/dns/dnsparser.c:152
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/dns/dnsparser.c:584
+#: src/dns/dnsparser.c:626
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -1396,7 +1478,7 @@
 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:1620
+#: src/gns/gnunet-service-gns_resolver.c:1621
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
@@ -1482,12 +1564,12 @@
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1281 src/exit/gnunet-daemon-exit.c:3025
+#: src/dns/gnunet-service-dns.c:1283 src/exit/gnunet-daemon-exit.c:3026
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1302
+#: src/dns/gnunet-service-dns.c:1305
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -1672,35 +1754,35 @@
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3042
+#: src/exit/gnunet-daemon-exit.c:3043
 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:3050
+#: src/exit/gnunet-daemon-exit.c:3051
 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:3057
+#: src/exit/gnunet-daemon-exit.c:3058
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3063
+#: src/exit/gnunet-daemon-exit.c:3064
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3069 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3070 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3255
+#: src/exit/gnunet-daemon-exit.c:3274
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1759,76 +1841,76 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/fs/fs_api.c:450
+#: src/fs/fs_api.c:465
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:459
+#: src/fs/fs_api.c:474
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:465
+#: src/fs/fs_api.c:480
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1046
+#: src/fs/fs_api.c:1061
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1505
+#: 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:1547
+#: src/fs/fs_api.c:1562
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1563
+#: src/fs/fs_api.c:1578
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2213
+#: src/fs/fs_api.c:2228
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2223
+#: 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"
 
-#: src/fs/fs_api.c:2348 src/fs/fs_api.c:2588
+#: src/fs/fs_api.c:2363 src/fs/fs_api.c:2603
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2365
+#: src/fs/fs_api.c:2380
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2397 src/fs/fs_api.c:2881
+#: src/fs/fs_api.c:2393 src/fs/fs_api.c:2412 src/fs/fs_api.c:2896
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2579
+#: src/fs/fs_api.c:2594
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2825
+#: src/fs/fs_api.c:2840
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2919
+#: src/fs/fs_api.c:2934
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2041,7 +2123,7 @@
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_search.c:830
+#: src/fs/fs_search.c:892
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2216,24 +2298,24 @@
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
 #: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:279
-#: src/fs/gnunet-publish.c:680
+#: src/fs/gnunet-publish.c:683
 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:684
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:687
 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:687
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:690
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:711
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:714
 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:304
-#: src/fs/gnunet-publish.c:718
+#: src/fs/gnunet-publish.c:721
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2241,6 +2323,10 @@
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
+#: src/fs/gnunet-daemon-fsprofiler.c:656
+msgid "Daemon to use file-sharing to measure its performance."
+msgstr ""
+
 #: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
@@ -2303,7 +2389,7 @@
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Upload abgewiesen!"
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:192
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:195
 #: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
@@ -2314,7 +2400,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:626
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:629
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Datei `%s' hat URI: %s\n"
@@ -2327,7 +2413,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:604
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:607
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2376,6 +2462,22 @@
 msgid "Special file-sharing operations"
 msgstr "Alle Optionen anzeigen"
 
+#: src/fs/gnunet-fs-profiler.c:182
+msgid "run the experiment with COUNT peers"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:185
+msgid "specifies name of a file with the HOSTS the testbed should use"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:188
+msgid "automatically terminate experiment after DELAY"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:197
+msgid "run a testbed to measure file-sharing performance"
+msgstr ""
+
 #: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:283
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
@@ -2404,7 +2506,7 @@
 "Ein zusätzliches Schlüsselwort für alle Dateien und Verzeichnisse hinzufügen "
 "(diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:699
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:702
 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 "
@@ -2437,128 +2539,128 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:149
+#: src/fs/gnunet-publish.c:152
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:156
+#: src/fs/gnunet-publish.c:159
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/fs/gnunet-publish.c:166
+#: src/fs/gnunet-publish.c:169
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:170
+#: src/fs/gnunet-publish.c:173
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/fs/gnunet-publish.c:189
+#: src/fs/gnunet-publish.c:192
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "`%s' Startvorgang abgeschlossen.\n"
 
-#: src/fs/gnunet-publish.c:307
+#: src/fs/gnunet-publish.c:310
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Daten des Moduls `%s' werden aktualisiert\n"
 
-#: src/fs/gnunet-publish.c:309
+#: src/fs/gnunet-publish.c:312
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Schlüsselwörter für Datei `%s':\n"
 
-#: src/fs/gnunet-publish.c:360 src/fs/gnunet-publish.c:614
+#: 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:435
+#: src/fs/gnunet-publish.c:438
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-publish.c:462
+#: src/fs/gnunet-publish.c:465
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/fs/gnunet-publish.c:493
+#: src/fs/gnunet-publish.c:496
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/gnunet-publish.c:495
+#: src/fs/gnunet-publish.c:498
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/fs/gnunet-publish.c:500
+#: src/fs/gnunet-publish.c:503
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:505
+#: src/fs/gnunet-publish.c:508
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "GNUnet wurde erfolgreich heruntergefahren.\n"
 
-#: src/fs/gnunet-publish.c:509
+#: src/fs/gnunet-publish.c:512
 #, 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:513
+#: src/fs/gnunet-publish.c:516
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:520
+#: src/fs/gnunet-publish.c:523
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/gnunet-publish.c:554
+#: src/fs/gnunet-publish.c:557
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:561
+#: src/fs/gnunet-publish.c:564
 #, 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:567
+#: src/fs/gnunet-publish.c:570
 #, 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:575 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:578 src/vpn/gnunet-vpn.c:214
 #, 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:585 src/fs/gnunet-publish.c:592
+#: src/fs/gnunet-publish.c:588 src/fs/gnunet-publish.c:595
 #: src/transport/gnunet-transport.c:774 src/transport/gnunet-transport.c:804
 #, 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:647
+#: 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:659
+#: 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:691
+#: src/fs/gnunet-publish.c:694
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2566,7 +2668,7 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:695
+#: src/fs/gnunet-publish.c:698
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2574,7 +2676,7 @@
 "Ein zusätzliches Schlüsselwort für die Datei oder das Verzeichnis auf der "
 "obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)"
 
-#: src/fs/gnunet-publish.c:702
+#: src/fs/gnunet-publish.c:705
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2582,7 +2684,7 @@
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/fs/gnunet-publish.c:707
+#: src/fs/gnunet-publish.c:710
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2590,32 +2692,32 @@
 "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlich "
 "werden soll. (nur für das Einfügen in Namespaces)"
 
-#: src/fs/gnunet-publish.c:715
+#: src/fs/gnunet-publish.c:718
 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:721
+#: src/fs/gnunet-publish.c:724
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:725
+#: src/fs/gnunet-publish.c:728
 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:729
+#: src/fs/gnunet-publish.c:732
 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:745
+#: src/fs/gnunet-publish.c:748
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2665,8 +2767,8 @@
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
 #: src/fs/gnunet-service-fs.c:628 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1321
-#: src/topology/gnunet-daemon-topology.c:1328
+#: src/topology/gnunet-daemon-topology.c:1322
+#: src/topology/gnunet-daemon-topology.c:1329
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
@@ -2811,8 +2913,7 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indizierung der Daten schlug an Position %i fehl.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:364
-#: src/fs/gnunet-service-fs_lc.c:490
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:369
 #, fuzzy
 msgid "# client searches active"
 msgstr "# gap Anfragen insgesamt empfangen"
@@ -2822,12 +2923,12 @@
 msgid "# replies received for local clients"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:323
+#: src/fs/gnunet-service-fs_lc.c:328
 #, fuzzy
 msgid "# client searches received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/fs/gnunet-service-fs_lc.c:358
+#: src/fs/gnunet-service-fs_lc.c:363
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -2835,147 +2936,147 @@
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:397
+#: src/fs/gnunet-service-fs_pe.c:400
 #, fuzzy
 msgid "# transmission failed (core has no bandwidth)"
 msgstr "Kein Transport des Typs %d bekannt.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:426
+#: src/fs/gnunet-service-fs_pe.c:433
 #, fuzzy
 msgid "# query messages sent to other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/fs/gnunet-service-fs_pe.c:475
+#: src/fs/gnunet-service-fs_pe.c:482
 msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:483
+#: src/fs/gnunet-service-fs_pe.c:490
 #, fuzzy
 msgid "# query plans executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/gnunet-service-fs_pe.c:543
+#: src/fs/gnunet-service-fs_pe.c:550
 #, fuzzy
 msgid "# requests merged"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pe.c:551
+#: src/fs/gnunet-service-fs_pe.c:558
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pe.c:605 src/fs/gnunet-service-fs_pe.c:689
-#: src/fs/gnunet-service-fs_pe.c:760
+#: src/fs/gnunet-service-fs_pe.c:612 src/fs/gnunet-service-fs_pe.c:696
+#: src/fs/gnunet-service-fs_pe.c:767
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:299
+#: src/fs/gnunet-service-fs_pr.c:312
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:391 src/fs/gnunet-service-fs_pr.c:654
+#: src/fs/gnunet-service-fs_pr.c:404 src/fs/gnunet-service-fs_pr.c:667
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:822
+#: src/fs/gnunet-service-fs_pr.c:835
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:855
+#: src/fs/gnunet-service-fs_pr.c:868
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:864
+#: src/fs/gnunet-service-fs_pr.c:877
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:878
+#: src/fs/gnunet-service-fs_pr.c:891
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:891
+#: src/fs/gnunet-service-fs_pr.c:904
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1012
+#: src/fs/gnunet-service-fs_pr.c:1025
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1039
+#: src/fs/gnunet-service-fs_pr.c:1052
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_pr.c:1074
+#: src/fs/gnunet-service-fs_pr.c:1087
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1203
+#: src/fs/gnunet-service-fs_pr.c:1221
 #, fuzzy
 msgid "# Replies received from STREAM"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1255
+#: src/fs/gnunet-service-fs_pr.c:1273
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1275
+#: src/fs/gnunet-service-fs_pr.c:1293
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1322
+#: src/fs/gnunet-service-fs_pr.c:1340
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1337
+#: src/fs/gnunet-service-fs_pr.c:1355
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1346
+#: src/fs/gnunet-service-fs_pr.c:1364
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1361
+#: src/fs/gnunet-service-fs_pr.c:1379
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1375
+#: src/fs/gnunet-service-fs_pr.c:1393
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1388
+#: src/fs/gnunet-service-fs_pr.c:1406
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1393
+#: src/fs/gnunet-service-fs_pr.c:1411
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1420 src/fs/gnunet-service-fs_pr.c:1460
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1438 src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1619
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1496
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1489
+#: src/fs/gnunet-service-fs_pr.c:1507
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1577
+#: src/fs/gnunet-service-fs_pr.c:1595
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1662
+#: src/fs/gnunet-service-fs_pr.c:1680
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -2984,6 +3085,36 @@
 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"
@@ -3191,6 +3322,11 @@
 msgid "Unable to initialize resolver!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
+#: src/gns/gnunet-service-gns_resolver.c:3439
+#, c-format
+msgid "Not a GADS TLD: `%s'\n"
+msgstr ""
+
 #: src/hello/gnunet-hello.c:118
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3225,37 +3361,37 @@
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/hello/hello.c:905
+#: src/hello/hello.c:904
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/hello/hello.c:914
+#: src/hello/hello.c:913
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/hello/hello.c:924
+#: src/hello/hello.c:923
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hello/hello.c:934
+#: src/hello/hello.c:933
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/hello/hello.c:951
+#: src/hello/hello.c:950
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:960
+#: src/hello/hello.c:959
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:979
+#: src/hello/hello.c:978
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
@@ -3567,10 +3703,10 @@
 #: src/mesh/gnunet-daemon-regexprofiler.c:209
 #: src/mesh/gnunet-daemon-regexprofiler.c:222
 #: src/mesh/gnunet-daemon-regexprofiler.c:235
-#: src/mesh/gnunet-service-mesh.c:8692 src/mesh/gnunet-service-mesh.c:8704
-#: src/mesh/gnunet-service-mesh.c:8716 src/mesh/gnunet-service-mesh.c:8730
-#: src/mesh/gnunet-service-mesh.c:8742 src/mesh/gnunet-service-mesh.c:8754
-#: src/mesh/gnunet-service-mesh.c:8766 src/mesh/gnunet-service-mesh-new.c:8292
+#: src/mesh/gnunet-service-mesh.c:8931 src/mesh/gnunet-service-mesh.c:8943
+#: src/mesh/gnunet-service-mesh.c:8955 src/mesh/gnunet-service-mesh.c:8969
+#: src/mesh/gnunet-service-mesh.c:8981 src/mesh/gnunet-service-mesh.c:8993
+#: src/mesh/gnunet-service-mesh.c:9005 src/mesh/gnunet-service-mesh-new.c:8292
 #: src/mesh/gnunet-service-mesh-new.c:8304
 #: src/mesh/gnunet-service-mesh-new.c:8316
 #: src/mesh/gnunet-service-mesh-new.c:8329
@@ -3586,173 +3722,195 @@
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:162
+#: src/mesh/gnunet-mesh.c:211
 #, fuzzy
-msgid ""
-"provide inthe 'struct GNUNET_TRANSPORT_PeerIterateContextformation about all "
-"tunnels (continuously)"
+msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-mesh.c:173
+#: src/mesh/gnunet-mesh.c:214
 #, fuzzy
+msgid "provide information about a particular tunnel"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/mesh/gnunet-mesh.c:224
+#, fuzzy
 msgid "Print information about mesh tunnels and peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-regex-profiler.c:1147
-#: src/testbed/gnunet-testbed-profiler.c:320
+#: src/mesh/gnunet-regex-profiler.c:1162
+#: src/testbed/gnunet-testbed-profiler.c:333
 msgid "An operation has failed while starting peers\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1193
-#: src/testbed/gnunet-testbed-profiler.c:389
+#: src/mesh/gnunet-regex-profiler.c:1208
+#: src/testbed/gnunet-testbed-profiler.c:402
 #, fuzzy, c-format
 msgid "Creating a peer failed. Error: %s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1320
-#: src/testbed/gnunet-testbed-profiler.c:494
+#: src/mesh/gnunet-regex-profiler.c:1335
+#: src/testbed/gnunet-testbed-profiler.c:507
 msgid "An operation has failed while starting slaves\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1342
+#: src/mesh/gnunet-regex-profiler.c:1357
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1397
+#: src/mesh/gnunet-regex-profiler.c:1412
 msgid "An operation has failed while linking\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1508
-#: src/testbed/gnunet-testbed-profiler.c:598
+#: src/mesh/gnunet-regex-profiler.c:1523
+#: src/testbed/gnunet-testbed-profiler.c:611
+#: src/testbed/testbed_api_testbed.c:735
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1588
-#: src/testbed/gnunet-testbed-profiler.c:677
+#: src/mesh/gnunet-regex-profiler.c:1604
+#: src/testbed/gnunet-testbed-profiler.c:690
 msgid "Unable to connect to master controller -- Check config\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1687
+#: src/mesh/gnunet-regex-profiler.c:1706
+#: src/testbed/gnunet-testbed-profiler.c:723
+#: src/testbed/testbed_api_testbed.c:858
 #, c-format
+msgid "Host %s cannot start testbed\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1709
+#: src/testbed/gnunet-testbed-profiler.c:726
+#: src/testbed/testbed_api_testbed.c:861
+msgid "Testbed cannot be started on localhost\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1749
+#, c-format
 msgid "No hosts-file specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1692
+#: src/mesh/gnunet-regex-profiler.c:1754
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1698
-#: src/testbed/gnunet-testbed-profiler.c:717
+#: src/mesh/gnunet-regex-profiler.c:1760
+#: src/testbed/gnunet-testbed-profiler.c:776
+#: src/testbed/testbed_api_testbed.c:942
 #, c-format
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1705
-#: src/testbed/gnunet-testbed-profiler.c:724
-#: src/testbed/testbed_api_testbed.c:759
+#: src/mesh/gnunet-regex-profiler.c:1763
+#: src/testbed/gnunet-testbed-profiler.c:779
 #, c-format
-msgid "Host %s cannot start testbed\n"
+msgid "Checking whether given hosts can start testbed. Please wait\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1712
-#: src/testbed/gnunet-testbed-profiler.c:731
+#: src/mesh/gnunet-regex-profiler.c:1784
+#: src/testbed/gnunet-testbed-profiler.c:800
 #, fuzzy, c-format
 msgid "Exiting\n"
 msgstr ""
 "\n"
 "Abbruch.\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1718
+#: src/mesh/gnunet-regex-profiler.c:1790
 #, fuzzy, c-format
 msgid "No configuration file given. Exiting\n"
 msgstr "Konfigurationsdatei FILENAME verwenden"
 
-#: src/mesh/gnunet-regex-profiler.c:1727
+#: src/mesh/gnunet-regex-profiler.c:1799
 #, fuzzy, c-format
 msgid "Configuration option (regex_prefix) missing. Exiting\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1745
+#: src/mesh/gnunet-regex-profiler.c:1817
 #: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1752
+#: src/mesh/gnunet-regex-profiler.c:1824
 #, c-format
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1760
+#: src/mesh/gnunet-regex-profiler.c:1832
 #, c-format
 msgid ""
 "Error loading search strings. Given file does not contain enough strings. "
 "Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1766
+#: src/mesh/gnunet-regex-profiler.c:1838
 #, fuzzy, c-format
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fehler beim Verlassen der DHT.\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1800
+#: src/mesh/gnunet-regex-profiler.c:1865
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1803
+#: src/mesh/gnunet-regex-profiler.c:1868
 msgid "create COUNT number of random links between peers"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1806
+#: src/mesh/gnunet-regex-profiler.c:1871
 msgid "wait TIMEOUT before considering a string match as failed"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1809
+#: src/mesh/gnunet-regex-profiler.c:1874
 msgid "wait DELAY before starting string search"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1812
+#: src/mesh/gnunet-regex-profiler.c:1877
 msgid "number of search strings to read from search strings file"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1815
+#: src/mesh/gnunet-regex-profiler.c:1880
 #: src/regex/gnunet-regex-simulation-profiler.c:692
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1818
+#: src/mesh/gnunet-regex-profiler.c:1883
 msgid ""
 "if this option is set, only one peer is responsible for searching all strings"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1830
+#: src/mesh/gnunet-regex-profiler.c:1895
 msgid "Profiler for regex/mesh"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8398 src/mesh/gnunet-service-mesh-new.c:7998
+#: src/mesh/gnunet-service-mesh.c:8625 src/mesh/gnunet-service-mesh-new.c:7998
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8603 src/mesh/gnunet-service-mesh-new.c:8203
-#, fuzzy
-msgid "Mesh service could not access hostkey.  Exiting.\n"
+#: src/mesh/gnunet-service-mesh.c:8842
+#, 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:8778 src/mesh/gnunet-service-mesh.c:8789
-#: src/mesh/gnunet-service-mesh-new.c:8380
+#: src/mesh/gnunet-service-mesh.c:9017 src/mesh/gnunet-service-mesh.c:9027
+#: src/mesh/gnunet-service-mesh.c:9038 src/mesh/gnunet-service-mesh-new.c:8380
 #: src/mesh/gnunet-service-mesh-new.c:8391
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
 msgstr "GNUnet Konfiguration"
 
+#: src/mesh/gnunet-service-mesh-new.c:8203
+#, fuzzy
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -3976,42 +4134,42 @@
 msgid "Protocol error"
 msgstr ""
 
-#: src/namestore/namestore_common.c:509 src/namestore/namestore_common.c:649
+#: src/namestore/namestore_common.c:530 src/namestore/namestore_common.c:670
 #, 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:516
+#: src/namestore/namestore_common.c:537
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/namestore_common.c:539
+#: src/namestore/namestore_common.c:560
 #, 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:562
+#: src/namestore/namestore_common.c:583
 #, 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:580
+#: src/namestore/namestore_common.c:601
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/namestore_common.c:593
+#: src/namestore/namestore_common.c:614
 #, 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:614
+#: src/namestore/namestore_common.c:635
 #, 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:640
+#: src/namestore/namestore_common.c:661
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -4030,6 +4188,62 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
+#: src/nat/nat_auto.c:169
+msgid "NAT traversal with ICMP Server timed out.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:199
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:200
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:219
+#, fuzzy
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#: src/nat/nat_auto.c:265
+#, fuzzy, c-format
+msgid "Detected external IP `%s'\n"
+msgstr "Ungültiger RPC `%s' empfangen.\n"
+
+#: src/nat/nat_auto.c:331
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:347
+#, fuzzy, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
+
+#: src/nat/nat_auto.c:400
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:401
+#, fuzzy
+msgid "upnpc not found\n"
+msgstr "Kommando `%s' wurde nicht gefunden!\n"
+
+#: src/nat/nat_auto.c:434
+msgid "gnunet-helper-nat-server found, testing it\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:435
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:469
+msgid "gnunet-helper-nat-client found, enabling it\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:470
+msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+msgstr ""
+
 #: src/nat/nat.c:795
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
@@ -4120,11 +4334,6 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/nse/gnunet-service-nse.c:938
-#, c-format
-msgid "Proof of work invalid: %llu!\n"
-msgstr ""
-
 #: src/nse/gnunet-service-nse.c:1389
 #, fuzzy, c-format
 msgid "NSE service could not access hostkey: %s\n"
@@ -4453,115 +4662,155 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:706
+#: src/sysmon/gnunet-service-sysmon.c:381
 #, c-format
+msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:732
+#, c-format
+msgid "\rChecked %u hosts"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:736
+#, c-format
+msgid ""
+"\n"
+"All hosts can start testbed. Creating peers\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:765
+#, c-format
 msgid "No hosts-file specified on command line\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:780
+#: src/testbed/gnunet-testbed-profiler.c:842
 msgid "Only `CLIQUE' and `RANDOM' are permitted.\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:795
+#: src/testbed/gnunet-testbed-profiler.c:857
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:798
+#: src/testbed/gnunet-testbed-profiler.c:860
 msgid "create COUNT number of random links"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:801
+#: src/testbed/gnunet-testbed-profiler.c:863
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:804
+#: src/testbed/gnunet-testbed-profiler.c:866
 msgid ""
 "Try to acheive TOPOLOGY. This options takes either CLIQUE or RANDOM. For "
 "CLIQUE the parameter -n is ignored. The default is to acheive a random graph "
 "topology."
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:819
+#: src/testbed/gnunet-testbed-profiler.c:881
 msgid "Profiler for testbed"
 msgstr ""
 
+#: src/testbed/ll_master.c:57
+#, fuzzy, c-format
+msgid "Job command file not given. Exiting\n"
+msgstr "Konfigurationsdatei FILENAME verwenden"
+
 #: src/testbed/testbed_api.c:320
 #, 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_hosts.c:326
+#: src/testbed/testbed_api_hosts.c:313
 #, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
 
-#: src/testbed/testbed_api_hosts.c:334
+#: src/testbed/testbed_api_hosts.c:321
 #, fuzzy, c-format
 msgid "Hosts file %s has no data\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/testbed/testbed_api_hosts.c:341
+#: src/testbed/testbed_api_hosts.c:328
 #, fuzzy, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/testbed/testbed_api_testbed.c:320
+#: src/testbed/testbed_api_testbed.c:354
 msgid "Some operations are still pending. Cancelling them\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:580
+#: src/testbed/testbed_api_testbed.c:557
+msgid "Linking controllers failed. Exiting"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:886
+#, fuzzy
+msgid "Cannot start the master controller"
+msgstr "GNUnet testbed Controller starten."
+
+#: src/testbed/testbed_api_testbed.c:966
+msgid "Specified topology must be supported by testbed"
+msgstr ""
+
+#: src/testbed/testbed_api_topology.c:582
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
 
-#: src/testbed/testbed_api_topology.c:586
+#: src/testbed/testbed_api_topology.c:588
 #, fuzzy, c-format
 msgid "Topology file %s has no data\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/testbed/testbed_api_topology.c:592
+#: src/testbed/testbed_api_topology.c:594
 #, fuzzy, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/testbed/testbed_api_topology.c:614
+#: src/testbed/testbed_api_topology.c:617
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/testbed/testbed_api_topology.c:623
-#: src/testbed/testbed_api_topology.c:648
+#: src/testbed/testbed_api_topology.c:626
+#: src/testbed/testbed_api_topology.c:651
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:629
-#: src/testbed/testbed_api_topology.c:654
+#: src/testbed/testbed_api_topology.c:632
+#: src/testbed/testbed_api_topology.c:657
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/testbed/testbed_api_topology.c:635
-#: src/testbed/testbed_api_topology.c:660
-msgid "Topology file need more peers than the given ones\n"
+#: src/testbed/testbed_api_topology.c:638
+#: src/testbed/testbed_api_topology.c:663
+msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:131
+#: src/testbed/testbed_api_topology.c:679
 #, fuzzy, c-format
+msgid "Ignoring to connect peer %u to peer %u\n"
+msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
+
+#: src/testing/gnunet-testing.c:132
+#, 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:202
+#: src/testing/gnunet-testing.c:203
 #, fuzzy
 msgid "create unique configuration files"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/testing/gnunet-testing.c:204
+#: src/testing/gnunet-testing.c:205
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:206
+#: src/testing/gnunet-testing.c:207
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
@@ -4569,12 +4818,12 @@
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/testing/gnunet-testing.c:208
+#: src/testing/gnunet-testing.c:209
 #, fuzzy
 msgid "configuration template"
 msgstr "GNUnet Konfiguration"
 
-#: src/testing/gnunet-testing.c:217
+#: src/testing/gnunet-testing.c:218
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -4593,59 +4842,59 @@
 msgid "name of the service to run"
 msgstr ""
 
-#: src/testing/testing.c:199
+#: src/testing/testing.c:211
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:215
+#: src/testing/testing.c:227
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:526
+#: src/testing/testing.c:541
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
 
-#: src/testing/testing.c:536
+#: src/testing/testing.c:551
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/testing/testing.c:850
+#: src/testing/testing.c:865
 #, 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:861
+#: src/testing/testing.c:876
 #, 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:875
+#: src/testing/testing.c:890
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/testing/testing.c:908
+#: src/testing/testing.c:923
 #, 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:926
+#: src/testing/testing.c:941
 #, 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:997
+#: src/testing/testing.c:1014
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/testing/testing.c:1202
+#: src/testing/testing.c:1219
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
@@ -4669,117 +4918,112 @@
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1033
+#: src/topology/gnunet-daemon-topology.c:1034
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1040
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1048
+#: src/topology/gnunet-daemon-topology.c:1049
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1056
+#: src/topology/gnunet-daemon-topology.c:1057
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1076
+#: src/topology/gnunet-daemon-topology.c:1077
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1089
+#: src/topology/gnunet-daemon-topology.c:1090
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1099
+#: src/topology/gnunet-daemon-topology.c:1100
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1105
+#: src/topology/gnunet-daemon-topology.c:1106
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1115
+#: src/topology/gnunet-daemon-topology.c:1116
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1121
+#: src/topology/gnunet-daemon-topology.c:1122
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1128
+#: src/topology/gnunet-daemon-topology.c:1129
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1163
+#: src/topology/gnunet-daemon-topology.c:1164
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1218
+#: src/topology/gnunet-daemon-topology.c:1219
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/topology/gnunet-daemon-topology.c:1357
+#: src/topology/gnunet-daemon-topology.c:1358
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:245
+#: src/transport/gnunet-service-transport_blacklist.c:246
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:251
-#, c-format
-msgid "Blacklist file `%s' is empty.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_blacklist.c:262
+#: src/transport/gnunet-service-transport_blacklist.c:263
 #, fuzzy, c-format
 msgid "Failed to read blacklist from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:283
-#: src/transport/gnunet-service-transport_blacklist.c:307
+#: src/transport/gnunet-service-transport_blacklist.c:284
+#: src/transport/gnunet-service-transport_blacklist.c:308
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:294
-#: src/transport/gnunet-service-transport_blacklist.c:330
+#: src/transport/gnunet-service-transport_blacklist.c:295
+#: src/transport/gnunet-service-transport_blacklist.c:331
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:344
+#: src/transport/gnunet-service-transport_blacklist.c:345
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:358
+#: src/transport/gnunet-service-transport_blacklist.c:359
 #, c-format
 msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:513
-#: src/transport/gnunet-service-transport_blacklist.c:751
+#: src/transport/gnunet-service-transport_blacklist.c:514
+#: src/transport/gnunet-service-transport_blacklist.c:752
 msgid "# disconnects due to blacklist"
 msgstr ""
 
@@ -4835,117 +5079,117 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1042
+#: src/transport/gnunet-service-transport_neighbours.c:1218
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1172
-#: src/transport/gnunet-service-transport_neighbours.c:1509
+#: src/transport/gnunet-service-transport_neighbours.c:1348
+#: src/transport/gnunet-service-transport_neighbours.c:1685
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1177
+#: src/transport/gnunet-service-transport_neighbours.c:1353
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1182
+#: src/transport/gnunet-service-transport_neighbours.c:1358
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1239
+#: src/transport/gnunet-service-transport_neighbours.c:1415
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1281
+#: src/transport/gnunet-service-transport_neighbours.c:1457
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1305
+#: src/transport/gnunet-service-transport_neighbours.c:1481
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1313
+#: src/transport/gnunet-service-transport_neighbours.c:1489
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1350
+#: src/transport/gnunet-service-transport_neighbours.c:1526
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1359
+#: src/transport/gnunet-service-transport_neighbours.c:1535
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1415
+#: src/transport/gnunet-service-transport_neighbours.c:1591
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1449
+#: src/transport/gnunet-service-transport_neighbours.c:1625
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1465
+#: src/transport/gnunet-service-transport_neighbours.c:1641
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2613
+#: src/transport/gnunet-service-transport_neighbours.c:2791
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2628
-#: src/transport/gnunet-service-transport_neighbours.c:2662
+#: src/transport/gnunet-service-transport_neighbours.c:2806
+#: src/transport/gnunet-service-transport_neighbours.c:2840
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2675
+#: src/transport/gnunet-service-transport_neighbours.c:2853
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2708
+#: src/transport/gnunet-service-transport_neighbours.c:2886
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2892
+#: src/transport/gnunet-service-transport_neighbours.c:3071
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2947
+#: src/transport/gnunet-service-transport_neighbours.c:3126
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2961
+#: src/transport/gnunet-service-transport_neighbours.c:3140
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2992
+#: src/transport/gnunet-service-transport_neighbours.c:3171
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3003
+#: src/transport/gnunet-service-transport_neighbours.c:3182
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3034
+#: src/transport/gnunet-service-transport_neighbours.c:3213
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3129
+#: src/transport/gnunet-service-transport_neighbours.c:3308
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
@@ -5147,42 +5391,42 @@
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
 #: src/transport/plugin_transport_http.c:817
-#: src/transport/plugin_transport_http_server.c:2550
+#: src/transport/plugin_transport_http_server.c:2553
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:866
-#: src/transport/plugin_transport_http_server.c:2318
+#: src/transport/plugin_transport_http_server.c:2321
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
 #: src/transport/plugin_transport_http.c:898
-#: src/transport/plugin_transport_http_server.c:2350 src/util/service.c:1053
+#: src/transport/plugin_transport_http_server.c:2353 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
 #: src/transport/plugin_transport_http.c:915
-#: src/transport/plugin_transport_http_server.c:2367 src/util/service.c:1070
+#: src/transport/plugin_transport_http_server.c:2370 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
 #: src/transport/plugin_transport_http.c:1020
-#: src/transport/plugin_transport_http_server.c:2478
+#: src/transport/plugin_transport_http_server.c:2481
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1133
-#: src/transport/plugin_transport_http_server.c:2646
+#: src/transport/plugin_transport_http_server.c:2649
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
 
 #: src/transport/plugin_transport_http.c:1146
-#: src/transport/plugin_transport_http_server.c:2657
+#: src/transport/plugin_transport_http_server.c:2660
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
@@ -5206,7 +5450,7 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1223
-#: src/transport/plugin_transport_http_server.c:2739
+#: src/transport/plugin_transport_http_server.c:2742
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
@@ -5215,27 +5459,27 @@
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1509
+#: src/transport/plugin_transport_http_client.c:1515
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1640
-#: src/transport/plugin_transport_http_server.c:2863
+#: src/transport/plugin_transport_http_client.c:1646
+#: src/transport/plugin_transport_http_server.c:2866
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1665
-#: src/transport/plugin_transport_http_server.c:2922
+#: src/transport/plugin_transport_http_client.c:1671
+#: src/transport/plugin_transport_http_server.c:2925
 #, 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:1693
-#: src/transport/plugin_transport_http_server.c:2769
+#: src/transport/plugin_transport_http_client.c:1699
+#: src/transport/plugin_transport_http_server.c:2772
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
@@ -5247,67 +5491,67 @@
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1597
+#: src/transport/plugin_transport_http_server.c:1600
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1605
+#: src/transport/plugin_transport_http_server.c:1608
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1906
+#: src/transport/plugin_transport_http_server.c:1909
 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:1930
+#: src/transport/plugin_transport_http_server.c:1933
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2625
+#: src/transport/plugin_transport_http_server.c:2628
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2639
+#: src/transport/plugin_transport_http_server.c:2642
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2664
+#: src/transport/plugin_transport_http_server.c:2667
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2679
+#: src/transport/plugin_transport_http_server.c:2682
 #, 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:2689
+#: src/transport/plugin_transport_http_server.c:2692
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2710
+#: src/transport/plugin_transport_http_server.c:2713
 #, 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:2720
+#: src/transport/plugin_transport_http_server.c:2723
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2755
+#: src/transport/plugin_transport_http_server.c:2758
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -5371,16 +5615,16 @@
 #: src/transport/plugin_transport_tcp.c:856
 #: src/transport/plugin_transport_tcp.c:906
 #: src/transport/plugin_transport_tcp.c:992
-#: src/transport/plugin_transport_tcp.c:1132
-#: src/transport/plugin_transport_tcp.c:1149
+#: src/transport/plugin_transport_tcp.c:1135
+#: src/transport/plugin_transport_tcp.c:1152
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
 #: src/transport/plugin_transport_tcp.c:774
 #: src/transport/plugin_transport_tcp.c:963
-#: src/transport/plugin_transport_tcp.c:1817
-#: src/transport/plugin_transport_tcp.c:2436
+#: src/transport/plugin_transport_tcp.c:1820
+#: src/transport/plugin_transport_tcp.c:2439
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
@@ -5400,49 +5644,54 @@
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1342
+#: src/transport/plugin_transport_tcp.c:1109
 #, c-format
+msgid "Trying to send with invalid session %p\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1345
+#, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1457
+#: src/transport/plugin_transport_tcp.c:1460
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1858
+#: src/transport/plugin_transport_tcp.c:1861
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:2032
+#: src/transport/plugin_transport_tcp.c:2035
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2102
+#: src/transport/plugin_transport_tcp.c:2105
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2326 src/util/service.c:948
+#: src/transport/plugin_transport_tcp.c:2329 src/util/service.c:948
 #: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2340
+#: src/transport/plugin_transport_tcp.c:2343
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2424
+#: src/transport/plugin_transport_tcp.c:2427
 #, 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:2428
+#: src/transport/plugin_transport_tcp.c:2431
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2432
+#: src/transport/plugin_transport_tcp.c:2435
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5462,14 +5711,14 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2345
+#: src/transport/plugin_transport_udp.c:2517
 #, 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:2359
+#: src/transport/plugin_transport_udp.c:2531
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5477,17 +5726,17 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2600
+#: src/transport/plugin_transport_udp.c:2772
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:2676
+#: src/transport/plugin_transport_udp.c:2848
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2719
+#: src/transport/plugin_transport_udp.c:2891
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -5649,7 +5898,7 @@
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/util/client.c:1168
+#: src/util/client.c:1177
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -5712,12 +5961,12 @@
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/util/configuration.c:263
+#: src/util/configuration.c:291
 #, fuzzy, c-format
-msgid "Syntax error while deserializing operation at line %u\n"
+msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfehler in Konfigurationsdatei `%s' in Zeile %d.\n"
 
-#: src/util/configuration.c:949
+#: src/util/configuration.c:998
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -5757,14 +6006,14 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:448 src/util/crypto_rsa.c:644
+#: src/util/crypto_ecc.c:448
 #, 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:463 src/util/crypto_rsa.c:661
+#: src/util/crypto_ecc.c:463 src/util/crypto_rsa.c:660
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
@@ -5772,22 +6021,22 @@
 msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
 #: src/util/crypto_ecc.c:559 src/util/crypto_ecc.c:603
-#: src/util/crypto_rsa.c:759 src/util/crypto_rsa.c:803
+#: src/util/crypto_rsa.c:757 src/util/crypto_rsa.c:801
 #, 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:564 src/util/crypto_rsa.c:764
+#: src/util/crypto_ecc.c:564 src/util/crypto_rsa.c:762
 #, 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:607 src/util/crypto_rsa.c:807
-#: src/util/crypto_rsa.c:843
+#: src/util/crypto_ecc.c:607 src/util/crypto_rsa.c:805
+#: src/util/crypto_rsa.c:841
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:638 src/util/crypto_rsa.c:838
+#: src/util/crypto_ecc.c:638 src/util/crypto_rsa.c:836
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
@@ -5797,12 +6046,12 @@
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:658 src/util/crypto_rsa.c:858
+#: src/util/crypto_ecc.c:658 src/util/crypto_rsa.c:856
 #, 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:780 src/util/crypto_rsa.c:946
+#: src/util/crypto_ecc.c:780 src/util/crypto_rsa.c:941
 msgid "interrupted by shutdown"
 msgstr ""
 
@@ -5832,32 +6081,39 @@
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/crypto_rsa.c:957
+#: src/util/crypto_rsa.c:644
+#, 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:952
 #, fuzzy
 msgid "gnunet-rsa failed"
 msgstr "gnunet-update ausführen"
 
-#: src/util/crypto_rsa.c:1348
+#: src/util/crypto_rsa.c:1343
 #, 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:567
+#: src/util/disk.c:601
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/disk.c:1171
+#: src/util/disk.c:1205
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1525 src/util/service.c:1667
+#: src/util/disk.c:1559 src/util/service.c:1669
 #, 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:1897
+#: src/util/disk.c:1931
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
@@ -6098,14 +6354,14 @@
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:417
+#: src/util/os_installation.c:420
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:699
+#: src/util/os_installation.c:702
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
@@ -6141,17 +6397,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/util/program.c:251 src/util/service.c:1789
+#: src/util/program.c:254 src/util/service.c:1791
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/pseudonym.c:276
+#: src/util/pseudonym.c:282
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/util/pseudonym.c:407 src/util/pseudonym.c:433
+#: src/util/pseudonym.c:413 src/util/pseudonym.c:439
 #, fuzzy
 msgid "no-name"
 msgstr "Name anzeigen"
@@ -6184,11 +6440,11 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/scheduler.c:781
+#: src/util/scheduler.c:782
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:911
+#: src/util/scheduler.c:912
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
@@ -6298,38 +6554,38 @@
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1523
+#: src/util/service.c:1525
 #, 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:1556
+#: src/util/service.c:1558
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/util/service.c:1605
+#: src/util/service.c:1607
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1609
+#: src/util/service.c:1611
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1613
+#: src/util/service.c:1615
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1668
+#: src/util/service.c:1670
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1681
+#: src/util/service.c:1683
 #, 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:1747
+#: src/util/service.c:1749
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6602,6 +6858,12 @@
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "provide inthe 'struct GNUNET_TRANSPORT_PeerIterateContextformation about "
+#~ "all tunnels (continuously)"
+#~ msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
+#, fuzzy
 #~ msgid "Connected to %s\n"
 #~ msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
@@ -6997,10 +7259,6 @@
 #~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
 #, fuzzy
-#~ msgid "Offering HELLO of peer %s to peer %s\n"
-#~ msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
-
-#, fuzzy
 #~ msgid "Failed during blacklist file copying!\n"
 #~ msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
@@ -7009,10 +7267,6 @@
 #~ msgstr "# Bytes des Typs %d empfangen"
 
 #, fuzzy
-#~ msgid "# fast reconnects failed"
-#~ msgstr "# verbundener Knoten"
-
-#, fuzzy
 #~ msgid "# peers disconnected due to timeout"
 #~ msgstr "# geschlossener Verbindungen (HANGUP gesendet)"
 
@@ -7829,9 +8083,6 @@
 #~ msgid "output in gnuplot format"
 #~ msgstr "Ausgabe im gnuplot Format"
 
-#~ msgid "number of iterations"
-#~ msgstr "Anzahl an Durchläufen"
-
 #~ msgid "number of messages to use per iteration"
 #~ msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
 
@@ -8144,9 +8395,6 @@
 #~ msgid "# session keys sent"
 #~ msgstr "# Sitzungsschlüssel gesendet"
 
-#~ msgid "# sessions established"
-#~ msgstr "# Sitzungen aufgebaut"
-
 #~ msgid "automate creation of a namespace by starting a collection"
 #~ msgstr ""
 #~ "Erstellung eines Namespaces durch das Anfangen einer Collection "
@@ -9186,9 +9434,6 @@
 #~ msgid "Protocol violation on socket. Expected command.\n"
 #~ msgstr "Protokollverletzung auf Socket. Kommando erwartet.\n"
 
-#~ msgid "Start GNUnet testbed controller."
-#~ msgstr "GNUnet testbed Controller starten."
-
 #~ msgid "Malformed entry in the configuration in section %s under %s: %s\n"
 #~ msgstr ""
 #~ "Beschädigter Eintrag in der Konfigurationsdatei in Sektion %s unter %s: "
@@ -9697,9 +9942,6 @@
 #~ msgid "Invalid response to `%s' from `%s'\n"
 #~ msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 
-#~ msgid "Received invalid RPC `%s'.\n"
-#~ msgstr "Ungültiger RPC `%s' empfangen.\n"
-
 #~ msgid "RPC for `%s' received for table that we do not participate in!\n"
 #~ msgstr ""
 #~ "RPC für `%s' empfangen für eine Tabelle, an der wir nicht beteiligt "

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2012-12-21 16:29:06 UTC (rev 25634)
+++ gnunet/po/es.po     2012-12-21 16:48:59 UTC (rev 25635)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-11-26 14:59+0100\n"
+"POT-Creation-Date: 2012-12-21 16:05+0100\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -75,77 +75,77 @@
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:230
+#: src/arm/gnunet-arm.c:229
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/arm/gnunet-arm.c:233
+#: src/arm/gnunet-arm.c:232
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-arm.c:263 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:385
-msgid "Fatal error initializing ARM API.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:287
+#: src/arm/gnunet-arm.c:253
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/arm/gnunet-arm.c:293
+#: src/arm/gnunet-arm.c:259
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/arm/gnunet-arm.c:416
+#: src/arm/gnunet-arm.c:306 src/arm/gnunet-arm.c:389 src/arm/gnunet-arm.c:406
+msgid "Fatal error initializing ARM API.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:435
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:418
+#: src/arm/gnunet-arm.c:437
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:420
+#: src/arm/gnunet-arm.c:439
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:422
+#: src/arm/gnunet-arm.c:441
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:425
+#: src/arm/gnunet-arm.c:444
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:428
+#: src/arm/gnunet-arm.c:447
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:430
+#: src/arm/gnunet-arm.c:449
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:433
+#: src/arm/gnunet-arm.c:452
 #, fuzzy
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr "tiempo para esperar hasta completar una iteración (en ms)"
 
-#: src/arm/gnunet-arm.c:435
+#: src/arm/gnunet-arm.c:454
 #, fuzzy
 msgid "list currently running services"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-arm.c:437
+#: src/arm/gnunet-arm.c:456
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:439
+#: src/arm/gnunet-arm.c:458
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:450
+#: src/arm/gnunet-arm.c:469
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -169,64 +169,64 @@
 msgid "Could not send list result to client\n"
 msgstr "Imposible mandar el mensaje a gnunetd\n"
 
-#: src/arm/gnunet-service-arm.c:536
+#: src/arm/gnunet-service-arm.c:537
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Imposible crear la cuenta de usuario:"
 
-#: src/arm/gnunet-service-arm.c:558
+#: src/arm/gnunet-service-arm.c:559
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:572
+#: src/arm/gnunet-service-arm.c:573
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:680
+#: src/arm/gnunet-service-arm.c:681
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:891
+#: src/arm/gnunet-service-arm.c:892
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:984
+#: src/arm/gnunet-service-arm.c:985
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:989
+#: src/arm/gnunet-service-arm.c:990
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:994
+#: src/arm/gnunet-service-arm.c:995
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/arm/gnunet-service-arm.c:1000
+#: src/arm/gnunet-service-arm.c:1001
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Servicio eliminado.\n"
 
-#: src/arm/gnunet-service-arm.c:1035
+#: src/arm/gnunet-service-arm.c:1036
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1227
+#: src/arm/gnunet-service-arm.c:1228
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:1238
+#: src/arm/gnunet-service-arm.c:1239
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1252
+#: src/arm/gnunet-service-arm.c:1253
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -245,93 +245,134 @@
 msgid "Received last message for %s \n"
 msgstr "GAP recibido contenido no válido de '%s'\n"
 
-#: src/ats-tool/gnunet-ats.c:134
+#: src/ats/gnunet-service-ats_addresses.c:983
 #, c-format
+msgid "Outbound quota configure for network `%s' is unlimited (%llu)\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:989
+#: src/ats/gnunet-service-ats_addresses.c:1014
+#, c-format
+msgid ""
+"Could not convert quota configure for network `%s':  `%s', assigning default "
+"bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:997
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1007
+#, c-format
+msgid "Inbound quota configure for network `%s' is unlimited (%llu)\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1022
+#, c-format
+msgid ""
+"No inbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:141
+#, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:136
+#: src/ats-tool/gnunet-ats.c:143
 #, c-format
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:190
+#: src/ats-tool/gnunet-ats.c:198
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', bw out: %u Bytes/s, bw in %u Bytes/s, "
 "%s\n"
 msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
-#: src/ats-tool/gnunet-ats.c:274 src/namestore/gnunet-namestore.c:610
+#: src/ats-tool/gnunet-ats.c:324
+#, c-format
+msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:343 src/namestore/gnunet-namestore.c:610
 #: src/transport/gnunet-transport.c:744
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "'%s' no es un fichero.\n"
 
-#: src/ats-tool/gnunet-ats.c:284 src/transport/gnunet-transport.c:750
+#: src/ats-tool/gnunet-ats.c:353 src/transport/gnunet-transport.c:750
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/ats-tool/gnunet-ats.c:292
+#: src/ats-tool/gnunet-ats.c:361
 #, c-format
-msgid "Please select one operation : %s or %s or %s or %s\n"
+msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:305 src/ats-tool/gnunet-ats.c:324
-#: src/ats-tool/gnunet-ats.c:341 src/ats-tool/gnunet-ats.c:366
+#: src/ats-tool/gnunet-ats.c:377 src/ats-tool/gnunet-ats.c:396
+#: src/ats-tool/gnunet-ats.c:413 src/ats-tool/gnunet-ats.c:438
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/ats-tool/gnunet-ats.c:314 src/ats-tool/gnunet-ats.c:331
+#: src/ats-tool/gnunet-ats.c:386 src/ats-tool/gnunet-ats.c:403
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/ats-tool/gnunet-ats.c:359
+#: src/ats-tool/gnunet-ats.c:431
 msgid "Type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:416
+#: src/ats-tool/gnunet-ats.c:488
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:419
+#: src/ats-tool/gnunet-ats.c:491
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:422
+#: src/ats-tool/gnunet-ats.c:494
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "GNUnet usa ahora la dirección IP %u.%u.%u.%u.\n"
 
-#: src/ats-tool/gnunet-ats.c:425
+#: src/ats-tool/gnunet-ats.c:497
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:428
+#: src/ats-tool/gnunet-ats.c:500
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/ats-tool/gnunet-ats.c:431
+#: src/ats-tool/gnunet-ats.c:503
+msgid "print all configured quotas"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:506
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:434
+#: src/ats-tool/gnunet-ats.c:509
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:437
+#: src/ats-tool/gnunet-ats.c:512
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:440
+#: src/ats-tool/gnunet-ats.c:515
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:449
+#: src/ats-tool/gnunet-ats.c:524
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Imprime información de los pares de GNUnet."
@@ -341,6 +382,42 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Probando transporte(s) %s\n"
 
+#: src/consensus/gnunet-consensus.c:230
+#, fuzzy
+msgid "session identifier"
+msgstr "# sesiones establecidas"
+
+#: src/consensus/gnunet-consensus-ibf.c:176
+#, fuzzy
+msgid "number of element in set A-B"
+msgstr "número de repeticiones"
+
+#: src/consensus/gnunet-consensus-ibf.c:179
+#, fuzzy
+msgid "number of element in set B-A"
+msgstr "número de repeticiones"
+
+#: src/consensus/gnunet-consensus-ibf.c:182
+msgid "number of common elements in A and B"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-ibf.c:185
+msgid "hash num"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-ibf.c:188
+msgid "ibf size"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-start-peers.c:158
+msgid "start peers with the given template configuration"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-start-peers.c:161
+#, fuzzy
+msgid "number of peers to start"
+msgstr "número de repeticiones"
+
 #: src/core/core_api.c:755
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
@@ -366,7 +443,7 @@
 msgid "Disconnected from"
 msgstr "'%s' conectado a '%s'.\n"
 
-#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:131
+#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:176
 #: src/peerinfo-tool/gnunet-peerinfo.c:541
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
@@ -580,11 +657,11 @@
 #: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1544
 #: src/topology/gnunet-daemon-topology.c:704
 #: src/topology/gnunet-daemon-topology.c:805
-#: src/transport/gnunet-service-transport_neighbours.c:874
-#: src/transport/gnunet-service-transport_neighbours.c:1091
-#: src/transport/gnunet-service-transport_neighbours.c:1100
-#: src/transport/gnunet-service-transport_neighbours.c:2637
-#: src/transport/gnunet-service-transport_neighbours.c:2899
+#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1267
+#: src/transport/gnunet-service-transport_neighbours.c:1276
+#: src/transport/gnunet-service-transport_neighbours.c:2815
+#: src/transport/gnunet-service-transport_neighbours.c:3078
 #, fuzzy
 msgid "# peers connected"
 msgstr "# de pares conectados"
@@ -949,6 +1026,11 @@
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
+#: src/datastore/plugin_datastore_heap.c:820
+#, fuzzy
+msgid "Heap database running\n"
+msgstr "base de datos sqlite"
+
 #: src/datastore/plugin_datastore_mysql.c:780
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
@@ -1008,7 +1090,7 @@
 msgid "Sqlite database running\n"
 msgstr "base de datos sqlite"
 
-#: src/datastore/plugin_datastore_template.c:241
+#: src/datastore/plugin_datastore_template.c:257
 msgid "Template database running\n"
 msgstr ""
 
@@ -1060,7 +1142,7 @@
 
 #: 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:733
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:736
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:1033
 msgid "be verbose (print progress information)"
@@ -1374,12 +1456,12 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:110
+#: src/dns/dnsparser.c:152
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/dns/dnsparser.c:584
+#: src/dns/dnsparser.c:626
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
@@ -1390,7 +1472,7 @@
 msgstr "Imposible encontrar la IP del host '%s': %s\n"
 
 #: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
-#: src/gns/gnunet-service-gns_resolver.c:1620
+#: src/gns/gnunet-service-gns_resolver.c:1621
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
@@ -1476,12 +1558,12 @@
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1281 src/exit/gnunet-daemon-exit.c:3025
+#: src/dns/gnunet-service-dns.c:1283 src/exit/gnunet-daemon-exit.c:3026
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1302
+#: src/dns/gnunet-service-dns.c:1305
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Argumento no válido: '%s'\n"
@@ -1666,35 +1748,35 @@
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3042
+#: src/exit/gnunet-daemon-exit.c:3043
 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:3050
+#: src/exit/gnunet-daemon-exit.c:3051
 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:3057
+#: src/exit/gnunet-daemon-exit.c:3058
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3063
+#: src/exit/gnunet-daemon-exit.c:3064
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3069 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3070 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3255
+#: src/exit/gnunet-daemon-exit.c:3274
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1753,76 +1835,76 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# mensajes de texto mandados por PING"
 
-#: src/fs/fs_api.c:450
+#: src/fs/fs_api.c:465
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:459
+#: src/fs/fs_api.c:474
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:465
+#: src/fs/fs_api.c:480
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1046
+#: src/fs/fs_api.c:1061
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:1505
+#: 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:1547
+#: src/fs/fs_api.c:1562
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1563
+#: src/fs/fs_api.c:1578
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2213
+#: src/fs/fs_api.c:2228
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2223
+#: src/fs/fs_api.c:2238
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2348 src/fs/fs_api.c:2588
+#: src/fs/fs_api.c:2363 src/fs/fs_api.c:2603
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2365
+#: src/fs/fs_api.c:2380
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2397 src/fs/fs_api.c:2881
+#: src/fs/fs_api.c:2393 src/fs/fs_api.c:2412 src/fs/fs_api.c:2896
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2579
+#: src/fs/fs_api.c:2594
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2825
+#: src/fs/fs_api.c:2840
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2919
+#: src/fs/fs_api.c:2934
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2034,7 +2116,7 @@
 msgid "Could not connect to datastore."
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/fs/fs_search.c:830
+#: src/fs/fs_search.c:892
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2209,24 +2291,24 @@
 msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
 
 #: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:279
-#: src/fs/gnunet-publish.c:680
+#: src/fs/gnunet-publish.c:683
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "seleccione el NIVEL deseado de anonimato al enviar"
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:684
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:687
 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:687
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:690
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:711
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:714
 msgid "specify the priority of the content"
 msgstr "especifica la prioridad del contenido"
 
 #: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:304
-#: src/fs/gnunet-publish.c:718
+#: src/fs/gnunet-publish.c:721
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2234,6 +2316,10 @@
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
+#: src/fs/gnunet-daemon-fsprofiler.c:656
+msgid "Daemon to use file-sharing to measure its performance."
+msgstr ""
+
 #: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
@@ -2296,7 +2382,7 @@
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "¡Subida rechazada!"
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:192
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:195
 #: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
@@ -2307,7 +2393,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:626
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:629
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "El fichero '%s' tiene la URI: '%s'\n"
@@ -2320,7 +2406,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:604
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:607
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2368,6 +2454,22 @@
 msgid "Special file-sharing operations"
 msgstr ""
 
+#: src/fs/gnunet-fs-profiler.c:182
+msgid "run the experiment with COUNT peers"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:185
+msgid "specifies name of a file with the HOSTS the testbed should use"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:188
+msgid "automatically terminate experiment after DELAY"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:197
+msgid "run a testbed to measure file-sharing performance"
+msgstr ""
+
 #: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:283
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
@@ -2396,7 +2498,7 @@
 "añade una clave adicional para todos los ficheros y directorios (esta opción "
 "puede ser especificada varias veces)"
 
-#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:699
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:702
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "cambia el meta-dato para el TIPO dado al VALOR dado"
 
@@ -2427,128 +2529,128 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:149
+#: src/fs/gnunet-publish.c:152
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:156
+#: src/fs/gnunet-publish.c:159
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Error descargando: %s\n"
 
-#: src/fs/gnunet-publish.c:166
+#: src/fs/gnunet-publish.c:169
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:170
+#: src/fs/gnunet-publish.c:173
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/fs/gnunet-publish.c:189
+#: src/fs/gnunet-publish.c:192
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "'%s' comienzo completo.\n"
 
-#: src/fs/gnunet-publish.c:307
+#: src/fs/gnunet-publish.c:310
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Actualizando los datos del módulo '%s'\n"
 
-#: src/fs/gnunet-publish.c:309
+#: src/fs/gnunet-publish.c:312
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Claves para los ficheros '%s':\n"
 
-#: src/fs/gnunet-publish.c:360 src/fs/gnunet-publish.c:614
+#: 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 "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-publish.c:435
+#: src/fs/gnunet-publish.c:438
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Imposible ejecutar '%s': %s\n"
 
-#: src/fs/gnunet-publish.c:462
+#: src/fs/gnunet-publish.c:465
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/fs/gnunet-publish.c:493
+#: src/fs/gnunet-publish.c:496
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/gnunet-publish.c:495
+#: src/fs/gnunet-publish.c:498
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/fs/gnunet-publish.c:500
+#: src/fs/gnunet-publish.c:503
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:505
+#: src/fs/gnunet-publish.c:508
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "Cierre completado.\n"
 
-#: src/fs/gnunet-publish.c:509
+#: src/fs/gnunet-publish.c:512
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Actualizando los datos del módulo '%s'\n"
 
-#: src/fs/gnunet-publish.c:513
+#: src/fs/gnunet-publish.c:516
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:520
+#: src/fs/gnunet-publish.c:523
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tError leyendo el directorio.\n"
 
-#: src/fs/gnunet-publish.c:554
+#: src/fs/gnunet-publish.c:557
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:561
+#: src/fs/gnunet-publish.c:564
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
 
-#: src/fs/gnunet-publish.c:567
+#: src/fs/gnunet-publish.c:570
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/fs/gnunet-publish.c:575 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:578 src/vpn/gnunet-vpn.c:214
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
 
-#: src/fs/gnunet-publish.c:585 src/fs/gnunet-publish.c:592
+#: src/fs/gnunet-publish.c:588 src/fs/gnunet-publish.c:595
 #: src/transport/gnunet-transport.c:774 src/transport/gnunet-transport.c:804
 #, 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:647
+#: src/fs/gnunet-publish.c:650
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-publish.c:659
+#: 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:691
+#: src/fs/gnunet-publish.c:694
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2556,7 +2658,7 @@
 "imprime la lista de las claves extraidas que podrían ser usadas, pero no "
 "realiza la subida"
 
-#: src/fs/gnunet-publish.c:695
+#: src/fs/gnunet-publish.c:698
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2564,7 +2666,7 @@
 "añade una clave adicional para el fichero del nivel más alto o el directorio "
 "(esta opción puede ser especificada varias veces)"
 
-#: src/fs/gnunet-publish.c:702
+#: src/fs/gnunet-publish.c:705
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2572,7 +2674,7 @@
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "encriptada en la base de datos de GNUnet)"
 
-#: src/fs/gnunet-publish.c:707
+#: src/fs/gnunet-publish.c:710
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2580,32 +2682,32 @@
 "especifica la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:715
+#: src/fs/gnunet-publish.c:718
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publica los ficheros bajo el pseudónimo NOMBRE (coloca el fichero en el "
 "espacio)"
 
-#: src/fs/gnunet-publish.c:721
+#: src/fs/gnunet-publish.c:724
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:725
+#: src/fs/gnunet-publish.c:728
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "cambia la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:729
+#: src/fs/gnunet-publish.c:732
 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:745
+#: src/fs/gnunet-publish.c:748
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2654,8 +2756,8 @@
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:628 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1321
-#: src/topology/gnunet-daemon-topology.c:1328
+#: src/topology/gnunet-daemon-topology.c:1322
+#: src/topology/gnunet-daemon-topology.c:1329
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
@@ -2798,8 +2900,7 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "La indexación de los datos falló en la posición %i.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:364
-#: src/fs/gnunet-service-fs_lc.c:490
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:369
 #, fuzzy
 msgid "# client searches active"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -2809,12 +2910,12 @@
 msgid "# replies received for local clients"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/fs/gnunet-service-fs_lc.c:323
+#: src/fs/gnunet-service-fs_lc.c:328
 #, fuzzy
 msgid "# client searches received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_lc.c:358
+#: src/fs/gnunet-service-fs_lc.c:363
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -2822,146 +2923,146 @@
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:397
+#: src/fs/gnunet-service-fs_pe.c:400
 msgid "# transmission failed (core has no bandwidth)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:426
+#: src/fs/gnunet-service-fs_pe.c:433
 #, fuzzy
 msgid "# query messages sent to other peers"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/fs/gnunet-service-fs_pe.c:475
+#: src/fs/gnunet-service-fs_pe.c:482
 msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:483
+#: src/fs/gnunet-service-fs_pe.c:490
 #, fuzzy
 msgid "# query plans executed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pe.c:543
+#: src/fs/gnunet-service-fs_pe.c:550
 #, fuzzy
 msgid "# requests merged"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pe.c:551
+#: src/fs/gnunet-service-fs_pe.c:558
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pe.c:605 src/fs/gnunet-service-fs_pe.c:689
-#: src/fs/gnunet-service-fs_pe.c:760
+#: src/fs/gnunet-service-fs_pe.c:612 src/fs/gnunet-service-fs_pe.c:696
+#: src/fs/gnunet-service-fs_pe.c:767
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:299
+#: src/fs/gnunet-service-fs_pr.c:312
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:391 src/fs/gnunet-service-fs_pr.c:654
+#: src/fs/gnunet-service-fs_pr.c:404 src/fs/gnunet-service-fs_pr.c:667
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:822
+#: src/fs/gnunet-service-fs_pr.c:835
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# bytes recibidos por TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:855
+#: src/fs/gnunet-service-fs_pr.c:868
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:864
+#: src/fs/gnunet-service-fs_pr.c:877
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:878
+#: src/fs/gnunet-service-fs_pr.c:891
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:891
+#: src/fs/gnunet-service-fs_pr.c:904
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1012
+#: src/fs/gnunet-service-fs_pr.c:1025
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1039
+#: src/fs/gnunet-service-fs_pr.c:1052
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1074
+#: src/fs/gnunet-service-fs_pr.c:1087
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# bytes recibidos vía HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1203
+#: src/fs/gnunet-service-fs_pr.c:1221
 #, fuzzy
 msgid "# Replies received from STREAM"
 msgstr "# bytes recibidos vía HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1255
+#: src/fs/gnunet-service-fs_pr.c:1273
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1275
+#: src/fs/gnunet-service-fs_pr.c:1293
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1322
+#: src/fs/gnunet-service-fs_pr.c:1340
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1337
+#: src/fs/gnunet-service-fs_pr.c:1355
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1346
+#: src/fs/gnunet-service-fs_pr.c:1364
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1361
+#: src/fs/gnunet-service-fs_pr.c:1379
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1375
+#: src/fs/gnunet-service-fs_pr.c:1393
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1388
+#: src/fs/gnunet-service-fs_pr.c:1406
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1393
+#: src/fs/gnunet-service-fs_pr.c:1411
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1420 src/fs/gnunet-service-fs_pr.c:1460
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1438 src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1619
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1496
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1489
+#: src/fs/gnunet-service-fs_pr.c:1507
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1577
+#: src/fs/gnunet-service-fs_pr.c:1595
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1662
+#: src/fs/gnunet-service-fs_pr.c:1680
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# mensajes PONG encriptados recibidos"
@@ -2970,6 +3071,36 @@
 msgid "time required, content pushing disabled"
 msgstr ""
 
+#: src/fs/gnunet-service-fs_stream.c:777
+#, fuzzy
+msgid "# replies received via stream"
+msgstr "# bytes recibidos por TCP"
+
+#: src/fs/gnunet-service-fs_stream.c:791
+#, fuzzy
+msgid "# replies received via stream dropped"
+msgstr "# bytes recibidos por TCP"
+
+#: src/fs/gnunet-service-fs_stream.c:930
+#: src/fs/gnunet-service-fs_stream.c:1384
+#, fuzzy
+msgid "# stream connections active"
+msgstr "# de pares conectados"
+
+#: 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 recibidos por TCP"
+
+#: src/fs/gnunet-service-fs_stream.c:1376
+#, fuzzy
+msgid "# stream client connections rejected"
+msgstr "Configuración de GNUnet"
+
 #: src/fs/gnunet-unindex.c:89
 #, c-format
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
@@ -3177,6 +3308,11 @@
 msgid "Unable to initialize resolver!\n"
 msgstr "Imposible inicializar SQLite.\n"
 
+#: src/gns/gnunet-service-gns_resolver.c:3439
+#, c-format
+msgid "Not a GADS TLD: `%s'\n"
+msgstr ""
+
 #: src/hello/gnunet-hello.c:118
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3211,37 +3347,37 @@
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "Error creando usuario"
 
-#: src/hello/hello.c:905
+#: src/hello/hello.c:904
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Imposible guardar la configuración"
 
-#: src/hello/hello.c:914
+#: src/hello/hello.c:913
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Imposible guardar la configuración"
 
-#: src/hello/hello.c:924
+#: src/hello/hello.c:923
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/hello/hello.c:934
+#: src/hello/hello.c:933
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/hello/hello.c:951
+#: src/hello/hello.c:950
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:960
+#: src/hello/hello.c:959
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:979
+#: src/hello/hello.c:978
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Fallo al conectar a gnunetd.\n"
@@ -3553,10 +3689,10 @@
 #: src/mesh/gnunet-daemon-regexprofiler.c:209
 #: src/mesh/gnunet-daemon-regexprofiler.c:222
 #: src/mesh/gnunet-daemon-regexprofiler.c:235
-#: src/mesh/gnunet-service-mesh.c:8692 src/mesh/gnunet-service-mesh.c:8704
-#: src/mesh/gnunet-service-mesh.c:8716 src/mesh/gnunet-service-mesh.c:8730
-#: src/mesh/gnunet-service-mesh.c:8742 src/mesh/gnunet-service-mesh.c:8754
-#: src/mesh/gnunet-service-mesh.c:8766 src/mesh/gnunet-service-mesh-new.c:8292
+#: src/mesh/gnunet-service-mesh.c:8931 src/mesh/gnunet-service-mesh.c:8943
+#: src/mesh/gnunet-service-mesh.c:8955 src/mesh/gnunet-service-mesh.c:8969
+#: src/mesh/gnunet-service-mesh.c:8981 src/mesh/gnunet-service-mesh.c:8993
+#: src/mesh/gnunet-service-mesh.c:9005 src/mesh/gnunet-service-mesh-new.c:8292
 #: src/mesh/gnunet-service-mesh-new.c:8304
 #: src/mesh/gnunet-service-mesh-new.c:8316
 #: src/mesh/gnunet-service-mesh-new.c:8329
@@ -3572,173 +3708,195 @@
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:162
+#: src/mesh/gnunet-mesh.c:211
 #, fuzzy
-msgid ""
-"provide inthe 'struct GNUNET_TRANSPORT_PeerIterateContextformation about all "
-"tunnels (continuously)"
+msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/mesh/gnunet-mesh.c:173
+#: src/mesh/gnunet-mesh.c:214
 #, fuzzy
+msgid "provide information about a particular tunnel"
+msgstr "Imprime información de los pares de GNUnet."
+
+#: src/mesh/gnunet-mesh.c:224
+#, fuzzy
 msgid "Print information about mesh tunnels and peers."
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/mesh/gnunet-regex-profiler.c:1147
-#: src/testbed/gnunet-testbed-profiler.c:320
+#: src/mesh/gnunet-regex-profiler.c:1162
+#: src/testbed/gnunet-testbed-profiler.c:333
 msgid "An operation has failed while starting peers\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1193
-#: src/testbed/gnunet-testbed-profiler.c:389
+#: src/mesh/gnunet-regex-profiler.c:1208
+#: src/testbed/gnunet-testbed-profiler.c:402
 #, fuzzy, c-format
 msgid "Creating a peer failed. Error: %s\n"
 msgstr ""
 "\n"
 "Error subiendo el fichero %s\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1320
-#: src/testbed/gnunet-testbed-profiler.c:494
+#: src/mesh/gnunet-regex-profiler.c:1335
+#: src/testbed/gnunet-testbed-profiler.c:507
 msgid "An operation has failed while starting slaves\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1342
+#: src/mesh/gnunet-regex-profiler.c:1357
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1397
+#: src/mesh/gnunet-regex-profiler.c:1412
 msgid "An operation has failed while linking\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1508
-#: src/testbed/gnunet-testbed-profiler.c:598
+#: src/mesh/gnunet-regex-profiler.c:1523
+#: src/testbed/gnunet-testbed-profiler.c:611
+#: src/testbed/testbed_api_testbed.c:735
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1588
-#: src/testbed/gnunet-testbed-profiler.c:677
+#: src/mesh/gnunet-regex-profiler.c:1604
+#: src/testbed/gnunet-testbed-profiler.c:690
 msgid "Unable to connect to master controller -- Check config\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1687
+#: src/mesh/gnunet-regex-profiler.c:1706
+#: src/testbed/gnunet-testbed-profiler.c:723
+#: src/testbed/testbed_api_testbed.c:858
 #, c-format
+msgid "Host %s cannot start testbed\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1709
+#: src/testbed/gnunet-testbed-profiler.c:726
+#: src/testbed/testbed_api_testbed.c:861
+msgid "Testbed cannot be started on localhost\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1749
+#, c-format
 msgid "No hosts-file specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1692
+#: src/mesh/gnunet-regex-profiler.c:1754
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1698
-#: src/testbed/gnunet-testbed-profiler.c:717
+#: src/mesh/gnunet-regex-profiler.c:1760
+#: src/testbed/gnunet-testbed-profiler.c:776
+#: src/testbed/testbed_api_testbed.c:942
 #, c-format
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1705
-#: src/testbed/gnunet-testbed-profiler.c:724
-#: src/testbed/testbed_api_testbed.c:759
+#: src/mesh/gnunet-regex-profiler.c:1763
+#: src/testbed/gnunet-testbed-profiler.c:779
 #, c-format
-msgid "Host %s cannot start testbed\n"
+msgid "Checking whether given hosts can start testbed. Please wait\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1712
-#: src/testbed/gnunet-testbed-profiler.c:731
+#: src/mesh/gnunet-regex-profiler.c:1784
+#: src/testbed/gnunet-testbed-profiler.c:800
 #, fuzzy, c-format
 msgid "Exiting\n"
 msgstr ""
 "\n"
 "Saliendo.\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1718
+#: src/mesh/gnunet-regex-profiler.c:1790
 #, fuzzy, c-format
 msgid "No configuration file given. Exiting\n"
 msgstr "usa el fichero de configuración FILENAME"
 
-#: src/mesh/gnunet-regex-profiler.c:1727
+#: src/mesh/gnunet-regex-profiler.c:1799
 #, fuzzy, c-format
 msgid "Configuration option (regex_prefix) missing. Exiting\n"
 msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1745
+#: src/mesh/gnunet-regex-profiler.c:1817
 #: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1752
+#: src/mesh/gnunet-regex-profiler.c:1824
 #, c-format
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1760
+#: src/mesh/gnunet-regex-profiler.c:1832
 #, c-format
 msgid ""
 "Error loading search strings. Given file does not contain enough strings. "
 "Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1766
+#: src/mesh/gnunet-regex-profiler.c:1838
 #, fuzzy, c-format
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Error abandonando DHT.\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1800
+#: src/mesh/gnunet-regex-profiler.c:1865
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Fallo en las estadísticas del tráfico.\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1803
+#: src/mesh/gnunet-regex-profiler.c:1868
 msgid "create COUNT number of random links between peers"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1806
+#: src/mesh/gnunet-regex-profiler.c:1871
 msgid "wait TIMEOUT before considering a string match as failed"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1809
+#: src/mesh/gnunet-regex-profiler.c:1874
 msgid "wait DELAY before starting string search"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1812
+#: src/mesh/gnunet-regex-profiler.c:1877
 msgid "number of search strings to read from search strings file"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1815
+#: src/mesh/gnunet-regex-profiler.c:1880
 #: src/regex/gnunet-regex-simulation-profiler.c:692
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1818
+#: src/mesh/gnunet-regex-profiler.c:1883
 msgid ""
 "if this option is set, only one peer is responsible for searching all strings"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1830
+#: src/mesh/gnunet-regex-profiler.c:1895
 msgid "Profiler for regex/mesh"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8398 src/mesh/gnunet-service-mesh-new.c:7998
+#: src/mesh/gnunet-service-mesh.c:8625 src/mesh/gnunet-service-mesh-new.c:7998
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8603 src/mesh/gnunet-service-mesh-new.c:8203
-#, fuzzy
-msgid "Mesh service could not access hostkey.  Exiting.\n"
+#: src/mesh/gnunet-service-mesh.c:8842
+#, fuzzy, c-format
+msgid "Mesh service could not access hostkey: %s. Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/mesh/gnunet-service-mesh.c:8778 src/mesh/gnunet-service-mesh.c:8789
-#: src/mesh/gnunet-service-mesh-new.c:8380
+#: src/mesh/gnunet-service-mesh.c:9017 src/mesh/gnunet-service-mesh.c:9027
+#: src/mesh/gnunet-service-mesh.c:9038 src/mesh/gnunet-service-mesh-new.c:8380
 #: src/mesh/gnunet-service-mesh-new.c:8391
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
 msgstr "Configuración de GNUnet"
 
+#: src/mesh/gnunet-service-mesh-new.c:8203
+#, fuzzy
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "Imposible acceder a la información del espacio.\n"
+
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -3962,42 +4120,42 @@
 msgid "Protocol error"
 msgstr ""
 
-#: src/namestore/namestore_common.c:509 src/namestore/namestore_common.c:649
+#: src/namestore/namestore_common.c:530 src/namestore/namestore_common.c:670
 #, fuzzy, c-format
 msgid "Unsupported record type %d\n"
 msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
 
-#: src/namestore/namestore_common.c:516
+#: src/namestore/namestore_common.c:537
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/namestore/namestore_common.c:539
+#: src/namestore/namestore_common.c:560
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/namestore/namestore_common.c:562
+#: src/namestore/namestore_common.c:583
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/namestore/namestore_common.c:580
+#: src/namestore/namestore_common.c:601
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/namestore/namestore_common.c:593
+#: src/namestore/namestore_common.c:614
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/namestore/namestore_common.c:614
+#: src/namestore/namestore_common.c:635
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/namestore/namestore_common.c:640
+#: src/namestore/namestore_common.c:661
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
@@ -4016,6 +4174,62 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
+#: src/nat/nat_auto.c:169
+msgid "NAT traversal with ICMP Server timed out.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:199
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:200
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:219
+#, fuzzy
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr "Imprime información de los pares de GNUnet."
+
+#: src/nat/nat_auto.c:265
+#, fuzzy, c-format
+msgid "Detected external IP `%s'\n"
+msgstr "Recibido RPC '%s' inválida.\n"
+
+#: src/nat/nat_auto.c:331
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:347
+#, fuzzy, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr "GNUnet usa ahora la dirección IP %u.%u.%u.%u.\n"
+
+#: src/nat/nat_auto.c:400
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:401
+#, fuzzy
+msgid "upnpc not found\n"
+msgstr "¡Comando '%s' no encontrado!\n"
+
+#: src/nat/nat_auto.c:434
+msgid "gnunet-helper-nat-server found, testing it\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:435
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:469
+msgid "gnunet-helper-nat-client found, enabling it\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:470
+msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+msgstr ""
+
 #: src/nat/nat.c:795
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
@@ -4106,11 +4320,6 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Imposible acceder al servicio"
 
-#: src/nse/gnunet-service-nse.c:938
-#, c-format
-msgid "Proof of work invalid: %llu!\n"
-msgstr ""
-
 #: src/nse/gnunet-service-nse.c:1389
 #, fuzzy, c-format
 msgid "NSE service could not access hostkey: %s\n"
@@ -4437,126 +4646,166 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:706
+#: src/sysmon/gnunet-service-sysmon.c:381
 #, c-format
+msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:732
+#, c-format
+msgid "\rChecked %u hosts"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:736
+#, c-format
+msgid ""
+"\n"
+"All hosts can start testbed. Creating peers\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:765
+#, c-format
 msgid "No hosts-file specified on command line\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:780
+#: src/testbed/gnunet-testbed-profiler.c:842
 msgid "Only `CLIQUE' and `RANDOM' are permitted.\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:795
+#: src/testbed/gnunet-testbed-profiler.c:857
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:798
+#: src/testbed/gnunet-testbed-profiler.c:860
 msgid "create COUNT number of random links"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:801
+#: src/testbed/gnunet-testbed-profiler.c:863
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:804
+#: src/testbed/gnunet-testbed-profiler.c:866
 msgid ""
 "Try to acheive TOPOLOGY. This options takes either CLIQUE or RANDOM. For "
 "CLIQUE the parameter -n is ignored. The default is to acheive a random graph "
 "topology."
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:819
+#: src/testbed/gnunet-testbed-profiler.c:881
 msgid "Profiler for testbed"
 msgstr ""
 
+#: src/testbed/ll_master.c:57
+#, fuzzy, c-format
+msgid "Job command file not given. Exiting\n"
+msgstr "usa el fichero de configuración FILENAME"
+
 #: src/testbed/testbed_api.c:320
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
-#: src/testbed/testbed_api_hosts.c:326
+#: src/testbed/testbed_api_hosts.c:313
 #, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "'%s' falló: ¡tabla no encontrada!\n"
 
-#: src/testbed/testbed_api_hosts.c:334
+#: src/testbed/testbed_api_hosts.c:321
 #, fuzzy, c-format
 msgid "Hosts file %s has no data\n"
 msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
 
-#: src/testbed/testbed_api_hosts.c:341
+#: src/testbed/testbed_api_hosts.c:328
 #, fuzzy, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
 
-#: src/testbed/testbed_api_testbed.c:320
+#: src/testbed/testbed_api_testbed.c:354
 msgid "Some operations are still pending. Cancelling them\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:580
+#: src/testbed/testbed_api_testbed.c:557
+msgid "Linking controllers failed. Exiting"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:886
+#, fuzzy
+msgid "Cannot start the master controller"
+msgstr "Arranca el cliente de chat de GNUnet"
+
+#: src/testbed/testbed_api_testbed.c:966
+msgid "Specified topology must be supported by testbed"
+msgstr ""
+
+#: src/testbed/testbed_api_topology.c:582
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "'%s' falló: ¡tabla no encontrada!\n"
 
-#: src/testbed/testbed_api_topology.c:586
+#: src/testbed/testbed_api_topology.c:588
 #, fuzzy, c-format
 msgid "Topology file %s has no data\n"
 msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
 
-#: src/testbed/testbed_api_topology.c:592
+#: src/testbed/testbed_api_topology.c:594
 #, fuzzy, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "La clave de sesión del par '%s' no pudo ser verificada.\n"
 
-#: src/testbed/testbed_api_topology.c:614
+#: src/testbed/testbed_api_topology.c:617
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/testbed/testbed_api_topology.c:623
-#: src/testbed/testbed_api_topology.c:648
+#: src/testbed/testbed_api_topology.c:626
+#: src/testbed/testbed_api_topology.c:651
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:629
-#: src/testbed/testbed_api_topology.c:654
+#: src/testbed/testbed_api_topology.c:632
+#: src/testbed/testbed_api_topology.c:657
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/testbed/testbed_api_topology.c:635
-#: src/testbed/testbed_api_topology.c:660
-msgid "Topology file need more peers than the given ones\n"
+#: src/testbed/testbed_api_topology.c:638
+#: src/testbed/testbed_api_topology.c:663
+msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:131
+#: src/testbed/testbed_api_topology.c:679
 #, fuzzy, c-format
+msgid "Ignoring to connect peer %u to peer %u\n"
+msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
+
+#: src/testing/gnunet-testing.c:132
+#, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/testing/gnunet-testing.c:202
+#: src/testing/gnunet-testing.c:203
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/testing/gnunet-testing.c:204
+#: src/testing/gnunet-testing.c:205
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:206
+#: src/testing/gnunet-testing.c:207
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/testing/gnunet-testing.c:208
+#: src/testing/gnunet-testing.c:209
 #, fuzzy
 msgid "configuration template"
 msgstr "Configuración de GNUnet"
 
-#: src/testing/gnunet-testing.c:217
+#: src/testing/gnunet-testing.c:218
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -4574,59 +4823,59 @@
 msgid "name of the service to run"
 msgstr ""
 
-#: src/testing/testing.c:199
+#: src/testing/testing.c:211
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:215
+#: src/testing/testing.c:227
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:526
+#: src/testing/testing.c:541
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "número de mensajes a usar por iteración"
 
-#: src/testing/testing.c:536
+#: src/testing/testing.c:551
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Error descargando: %s\n"
 
-#: src/testing/testing.c:850
+#: src/testing/testing.c:865
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/testing/testing.c:861
+#: src/testing/testing.c:876
 #, 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:875
+#: src/testing/testing.c:890
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/testing/testing.c:908
+#: src/testing/testing.c:923
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/testing/testing.c:926
+#: src/testing/testing.c:941
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/testing/testing.c:997
+#: src/testing/testing.c:1014
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing.c:1202
+#: src/testing/testing.c:1219
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s':"
@@ -4650,119 +4899,114 @@
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1033
+#: src/topology/gnunet-daemon-topology.c:1034
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1040
 #, fuzzy, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr "El formato del fichero '%s' no es válido.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1048
+#: src/topology/gnunet-daemon-topology.c:1049
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1056
+#: src/topology/gnunet-daemon-topology.c:1057
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1076
+#: src/topology/gnunet-daemon-topology.c:1077
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1089
+#: src/topology/gnunet-daemon-topology.c:1090
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1099
+#: src/topology/gnunet-daemon-topology.c:1100
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/topology/gnunet-daemon-topology.c:1105
+#: src/topology/gnunet-daemon-topology.c:1106
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1115
+#: src/topology/gnunet-daemon-topology.c:1116
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/topology/gnunet-daemon-topology.c:1121
+#: src/topology/gnunet-daemon-topology.c:1122
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1128
+#: src/topology/gnunet-daemon-topology.c:1129
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1163
+#: src/topology/gnunet-daemon-topology.c:1164
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/topology/gnunet-daemon-topology.c:1218
+#: src/topology/gnunet-daemon-topology.c:1219
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# mensajes salientes omitidos"
 
-#: src/topology/gnunet-daemon-topology.c:1357
+#: src/topology/gnunet-daemon-topology.c:1358
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:245
+#: src/transport/gnunet-service-transport_blacklist.c:246
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:251
-#, c-format
-msgid "Blacklist file `%s' is empty.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_blacklist.c:262
+#: src/transport/gnunet-service-transport_blacklist.c:263
 #, fuzzy, c-format
 msgid "Failed to read blacklist from `%s'\n"
 msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:283
-#: src/transport/gnunet-service-transport_blacklist.c:307
+#: src/transport/gnunet-service-transport_blacklist.c:284
+#: src/transport/gnunet-service-transport_blacklist.c:308
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr ""
 "Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:294
-#: src/transport/gnunet-service-transport_blacklist.c:330
+#: src/transport/gnunet-service-transport_blacklist.c:295
+#: src/transport/gnunet-service-transport_blacklist.c:331
 #, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:344
+#: src/transport/gnunet-service-transport_blacklist.c:345
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 "Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:358
+#: src/transport/gnunet-service-transport_blacklist.c:359
 #, c-format
 msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:513
-#: src/transport/gnunet-service-transport_blacklist.c:751
+#: src/transport/gnunet-service-transport_blacklist.c:514
+#: src/transport/gnunet-service-transport_blacklist.c:752
 msgid "# disconnects due to blacklist"
 msgstr ""
 
@@ -4818,116 +5062,116 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1042
+#: src/transport/gnunet-service-transport_neighbours.c:1218
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1172
-#: src/transport/gnunet-service-transport_neighbours.c:1509
+#: src/transport/gnunet-service-transport_neighbours.c:1348
+#: src/transport/gnunet-service-transport_neighbours.c:1685
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1177
+#: src/transport/gnunet-service-transport_neighbours.c:1353
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1182
+#: src/transport/gnunet-service-transport_neighbours.c:1358
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1239
+#: src/transport/gnunet-service-transport_neighbours.c:1415
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1281
+#: src/transport/gnunet-service-transport_neighbours.c:1457
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# claves de la sesión mandadas"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1305
+#: src/transport/gnunet-service-transport_neighbours.c:1481
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1313
+#: src/transport/gnunet-service-transport_neighbours.c:1489
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1350
+#: src/transport/gnunet-service-transport_neighbours.c:1526
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1359
+#: src/transport/gnunet-service-transport_neighbours.c:1535
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1415
+#: src/transport/gnunet-service-transport_neighbours.c:1591
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1449
+#: src/transport/gnunet-service-transport_neighbours.c:1625
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1465
+#: src/transport/gnunet-service-transport_neighbours.c:1641
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2613
+#: src/transport/gnunet-service-transport_neighbours.c:2791
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2628
-#: src/transport/gnunet-service-transport_neighbours.c:2662
+#: src/transport/gnunet-service-transport_neighbours.c:2806
+#: src/transport/gnunet-service-transport_neighbours.c:2840
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2675
+#: src/transport/gnunet-service-transport_neighbours.c:2853
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2708
+#: src/transport/gnunet-service-transport_neighbours.c:2886
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "envia COUNT mensajes"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2892
+#: src/transport/gnunet-service-transport_neighbours.c:3071
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# de pares conectados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2947
+#: src/transport/gnunet-service-transport_neighbours.c:3126
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2961
+#: src/transport/gnunet-service-transport_neighbours.c:3140
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2992
+#: src/transport/gnunet-service-transport_neighbours.c:3171
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3003
+#: src/transport/gnunet-service-transport_neighbours.c:3182
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3034
+#: src/transport/gnunet-service-transport_neighbours.c:3213
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3129
+#: src/transport/gnunet-service-transport_neighbours.c:3308
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# Anuncios de los pares recibidos"
@@ -5128,42 +5372,42 @@
 msgstr "Fallo al conectar a gnunetd.\n"
 
 #: src/transport/plugin_transport_http.c:817
-#: src/transport/plugin_transport_http_server.c:2550
+#: src/transport/plugin_transport_http_server.c:2553
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:866
-#: src/transport/plugin_transport_http_server.c:2318
+#: src/transport/plugin_transport_http_server.c:2321
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
 #: src/transport/plugin_transport_http.c:898
-#: src/transport/plugin_transport_http_server.c:2350 src/util/service.c:1053
+#: src/transport/plugin_transport_http_server.c:2353 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
 #: src/transport/plugin_transport_http.c:915
-#: src/transport/plugin_transport_http_server.c:2367 src/util/service.c:1070
+#: src/transport/plugin_transport_http_server.c:2370 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
 #: src/transport/plugin_transport_http.c:1020
-#: src/transport/plugin_transport_http_server.c:2478
+#: src/transport/plugin_transport_http_server.c:2481
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1133
-#: src/transport/plugin_transport_http_server.c:2646
+#: src/transport/plugin_transport_http_server.c:2649
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "¡Advertencias de la red desconectadas por configuración!\n"
 
 #: src/transport/plugin_transport_http.c:1146
-#: src/transport/plugin_transport_http_server.c:2657
+#: src/transport/plugin_transport_http_server.c:2660
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tConfiguración GTK\n"
@@ -5187,7 +5431,7 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1223
-#: src/transport/plugin_transport_http_server.c:2739
+#: src/transport/plugin_transport_http_server.c:2742
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
@@ -5196,27 +5440,27 @@
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1509
+#: src/transport/plugin_transport_http_client.c:1515
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1640
-#: src/transport/plugin_transport_http_server.c:2863
+#: src/transport/plugin_transport_http_client.c:1646
+#: src/transport/plugin_transport_http_server.c:2866
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1665
-#: src/transport/plugin_transport_http_server.c:2922
+#: src/transport/plugin_transport_http_client.c:1671
+#: src/transport/plugin_transport_http_server.c:2925
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 "Subida de '%s' completada, la velocidad media de subida actual es %8.3f "
 "kbps.\n"
 
-#: src/transport/plugin_transport_http_client.c:1693
-#: src/transport/plugin_transport_http_server.c:2769
+#: src/transport/plugin_transport_http_client.c:1699
+#: src/transport/plugin_transport_http_server.c:2772
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "Número máximo de clientes en el chat alcanzado.\n"
@@ -5228,67 +5472,67 @@
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1597
+#: src/transport/plugin_transport_http_server.c:1600
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1605
+#: src/transport/plugin_transport_http_server.c:1608
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1906
+#: src/transport/plugin_transport_http_server.c:1909
 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:1930
+#: src/transport/plugin_transport_http_server.c:1933
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2625
+#: src/transport/plugin_transport_http_server.c:2628
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2639
+#: src/transport/plugin_transport_http_server.c:2642
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2664
+#: src/transport/plugin_transport_http_server.c:2667
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2679
+#: src/transport/plugin_transport_http_server.c:2682
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Debes especificar un número positivo para '%s' en la configuración en la "
 "sección '%s'.\n"
 
-#: src/transport/plugin_transport_http_server.c:2689
+#: src/transport/plugin_transport_http_server.c:2692
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2710
+#: src/transport/plugin_transport_http_server.c:2713
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Debes especificar un número positivo para '%s' en la configuración en la "
 "sección '%s'.\n"
 
-#: src/transport/plugin_transport_http_server.c:2720
+#: src/transport/plugin_transport_http_server.c:2723
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2755
+#: src/transport/plugin_transport_http_server.c:2758
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Probando transporte(s) %s\n"
@@ -5347,16 +5591,16 @@
 #: src/transport/plugin_transport_tcp.c:856
 #: src/transport/plugin_transport_tcp.c:906
 #: src/transport/plugin_transport_tcp.c:992
-#: src/transport/plugin_transport_tcp.c:1132
-#: src/transport/plugin_transport_tcp.c:1149
+#: src/transport/plugin_transport_tcp.c:1135
+#: src/transport/plugin_transport_tcp.c:1152
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes enviados por TCP"
 
 #: src/transport/plugin_transport_tcp.c:774
 #: src/transport/plugin_transport_tcp.c:963
-#: src/transport/plugin_transport_tcp.c:1817
-#: src/transport/plugin_transport_tcp.c:2436
+#: src/transport/plugin_transport_tcp.c:1820
+#: src/transport/plugin_transport_tcp.c:2439
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# claves de la sesión aceptadas"
@@ -5376,49 +5620,54 @@
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes omitidos por TCP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:1342
+#: src/transport/plugin_transport_tcp.c:1109
 #, c-format
+msgid "Trying to send with invalid session %p\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1345
+#, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1457
+#: src/transport/plugin_transport_tcp.c:1460
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1858
+#: src/transport/plugin_transport_tcp.c:1861
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_tcp.c:2032
+#: src/transport/plugin_transport_tcp.c:2035
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_tcp.c:2102
+#: src/transport/plugin_transport_tcp.c:2105
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2326 src/util/service.c:948
+#: src/transport/plugin_transport_tcp.c:2329 src/util/service.c:948
 #: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2340
+#: src/transport/plugin_transport_tcp.c:2343
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/transport/plugin_transport_tcp.c:2424
+#: src/transport/plugin_transport_tcp.c:2427
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2428
+#: src/transport/plugin_transport_tcp.c:2431
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2432
+#: src/transport/plugin_transport_tcp.c:2435
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5438,14 +5687,14 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2345
+#: src/transport/plugin_transport_udp.c:2517
 #, 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:2359
+#: src/transport/plugin_transport_udp.c:2531
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5453,17 +5702,17 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2600
+#: src/transport/plugin_transport_udp.c:2772
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/transport/plugin_transport_udp.c:2676
+#: src/transport/plugin_transport_udp.c:2848
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2719
+#: src/transport/plugin_transport_udp.c:2891
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
@@ -5625,7 +5874,7 @@
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
 
-#: src/util/client.c:1168
+#: src/util/client.c:1177
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -5688,13 +5937,13 @@
 "El fichero de configuración debe especificar el directorio para almacenar "
 "los datos FS en la sección '%s' bajo '%s'.\n"
 
-#: src/util/configuration.c:263
+#: src/util/configuration.c:291
 #, fuzzy, c-format
-msgid "Syntax error while deserializing operation at line %u\n"
+msgid "Syntax error while deserializing in line %u\n"
 msgstr ""
 "Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/util/configuration.c:949
+#: src/util/configuration.c:998
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -5734,14 +5983,14 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:448 src/util/crypto_rsa.c:644
+#: src/util/crypto_ecc.c:448
 #, fuzzy, 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 un pseudónimo.\n"
 
-#: src/util/crypto_ecc.c:463 src/util/crypto_rsa.c:661
+#: src/util/crypto_ecc.c:463 src/util/crypto_rsa.c:660
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
@@ -5749,22 +5998,22 @@
 msgstr "El fichero '%s' no contiene un pseudónimo.\n"
 
 #: src/util/crypto_ecc.c:559 src/util/crypto_ecc.c:603
-#: src/util/crypto_rsa.c:759 src/util/crypto_rsa.c:803
+#: src/util/crypto_rsa.c:757 src/util/crypto_rsa.c:801
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "Imposible escribir PID al fichero '%s': %s.\n"
 
-#: src/util/crypto_ecc.c:564 src/util/crypto_rsa.c:764
+#: src/util/crypto_ecc.c:564 src/util/crypto_rsa.c:762
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Creando nueva clave local (esto puede llevar un tiempo).\n"
 
-#: src/util/crypto_ecc.c:607 src/util/crypto_rsa.c:807
-#: src/util/crypto_rsa.c:843
+#: src/util/crypto_ecc.c:607 src/util/crypto_rsa.c:805
+#: src/util/crypto_rsa.c:841
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:638 src/util/crypto_rsa.c:838
+#: src/util/crypto_ecc.c:638 src/util/crypto_rsa.c:836
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
@@ -5774,12 +6023,12 @@
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:658 src/util/crypto_rsa.c:858
+#: src/util/crypto_ecc.c:658 src/util/crypto_rsa.c:856
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "El fichero '%s' no contiene un pseudónimo.\n"
 
-#: src/util/crypto_ecc.c:780 src/util/crypto_rsa.c:946
+#: src/util/crypto_ecc.c:780 src/util/crypto_rsa.c:941
 msgid "interrupted by shutdown"
 msgstr ""
 
@@ -5809,32 +6058,39 @@
 msgstr ""
 "libgcrypt no está en la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/crypto_rsa.c:957
+#: src/util/crypto_rsa.c:644
+#, fuzzy, 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 un pseudónimo.\n"
+
+#: src/util/crypto_rsa.c:952
 #, fuzzy
 msgid "gnunet-rsa failed"
 msgstr "gnunet-setup"
 
-#: src/util/crypto_rsa.c:1348
+#: src/util/crypto_rsa.c:1343
 #, 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:567
+#: src/util/disk.c:601
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/util/disk.c:1171
+#: src/util/disk.c:1205
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
 
-#: src/util/disk.c:1525 src/util/service.c:1667
+#: src/util/disk.c:1559 src/util/service.c:1669
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
 
-#: src/util/disk.c:1897
+#: src/util/disk.c:1931
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
@@ -6073,14 +6329,14 @@
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:417
+#: src/util/os_installation.c:420
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:699
+#: src/util/os_installation.c:702
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
@@ -6115,17 +6371,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Imposible determinar mi dirección IPv6 pública.\n"
 
-#: src/util/program.c:251 src/util/service.c:1789
+#: src/util/program.c:254 src/util/service.c:1791
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/util/pseudonym.c:276
+#: src/util/pseudonym.c:282
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/util/pseudonym.c:407 src/util/pseudonym.c:433
+#: src/util/pseudonym.c:413 src/util/pseudonym.c:439
 #, fuzzy
 msgid "no-name"
 msgstr "Mostrar el nombre"
@@ -6158,11 +6414,11 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Imposible resolver '%s': %s\n"
 
-#: src/util/scheduler.c:781
+#: src/util/scheduler.c:782
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:911
+#: src/util/scheduler.c:912
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
@@ -6274,38 +6530,38 @@
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1523
+#: src/util/service.c:1525
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/service.c:1556
+#: src/util/service.c:1558
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
-#: src/util/service.c:1605
+#: src/util/service.c:1607
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1609
+#: src/util/service.c:1611
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1613
+#: src/util/service.c:1615
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1668
+#: src/util/service.c:1670
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1681
+#: src/util/service.c:1683
 #, 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:1747
+#: src/util/service.c:1749
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6578,6 +6834,12 @@
 msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "provide inthe 'struct GNUNET_TRANSPORT_PeerIterateContextformation about "
+#~ "all tunnels (continuously)"
+#~ msgstr "Imprime información de los pares de GNUnet."
+
+#, fuzzy
 #~ msgid "Connected to %s\n"
 #~ msgstr "'%s' conectado a '%s'.\n"
 
@@ -6944,10 +7206,6 @@
 #~ msgstr "Imposible inicializar la aplicación '%s'\n"
 
 #, fuzzy
-#~ msgid "Offering HELLO of peer %s to peer %s\n"
-#~ msgstr "Imposible conectar a %u.%u.%u.%u:%u: %s\n"
-
-#, fuzzy
 #~ msgid "Failed during blacklist file copying!\n"
 #~ msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
@@ -6956,10 +7214,6 @@
 #~ msgstr "# bytes recibidos por TCP"
 
 #, fuzzy
-#~ msgid "# fast reconnects failed"
-#~ msgstr "# de pares conectados"
-
-#, fuzzy
 #~ msgid "# peers disconnected due to timeout"
 #~ msgstr "# de pares conectados"
 
@@ -7703,9 +7957,6 @@
 #~ msgid "output in gnuplot format"
 #~ msgstr "salida en formato de gnuplot"
 
-#~ msgid "number of iterations"
-#~ msgstr "número de repeticiones"
-
 #~ msgid "number of messages to use per iteration"
 #~ msgstr "número de mensajes a usar por iteración"
 
@@ -7960,9 +8211,6 @@
 #~ msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
 #~ msgstr "Tipo desconocido en el mensaje embebido: %u (tamaño: %u)\n"
 
-#~ msgid "# sessions established"
-#~ msgstr "# sesiones establecidas"
-
 #~ msgid "automate creation of a namespace by starting a collection"
 #~ msgstr "creación automática de un espacio al empezar una colección"
 
@@ -9142,10 +9390,6 @@
 #~ msgid "Protocol violation on socket. Expected command.\n"
 #~ msgstr "Violación del protocolo en el socket. Esperando comando.\n"
 
-#, fuzzy
-#~ msgid "Start GNUnet testbed controller."
-#~ msgstr "Arranca el cliente de chat de GNUnet"
-
 #~ msgid "Malformed entry in the configuration in section %s under %s: %s\n"
 #~ msgstr ""
 #~ "Entrada mal formada en la configuración en la sección %s bajo %s: %s\n"
@@ -9338,9 +9582,6 @@
 #~ msgid "Invalid response to `%s' from `%s'\n"
 #~ msgstr "Respuesta inválida a '%s' de '%s'\n"
 
-#~ msgid "Received invalid RPC `%s'.\n"
-#~ msgstr "Recibido RPC '%s' inválida.\n"
-
 #~ msgid "RPC for `%s' received for table that we do not participate in!\n"
 #~ msgstr "¡RPC para '%s' recibida de la tabla en la cual no participamos!\n"
 

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2012-12-21 16:29:06 UTC (rev 25634)
+++ gnunet/po/sv.po     2012-12-21 16:48:59 UTC (rev 25635)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-11-26 14:59+0100\n"
+"POT-Creation-Date: 2012-12-21 16:05+0100\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -73,76 +73,76 @@
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:230
+#: src/arm/gnunet-arm.c:229
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:233
+#: src/arm/gnunet-arm.c:232
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:263 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:385
-msgid "Fatal error initializing ARM API.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:287
+#: src/arm/gnunet-arm.c:253
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/arm/gnunet-arm.c:293
+#: src/arm/gnunet-arm.c:259
 #, fuzzy, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:416
+#: src/arm/gnunet-arm.c:306 src/arm/gnunet-arm.c:389 src/arm/gnunet-arm.c:406
+msgid "Fatal error initializing ARM API.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:435
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:418
+#: src/arm/gnunet-arm.c:437
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:420
+#: src/arm/gnunet-arm.c:439
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:422
+#: src/arm/gnunet-arm.c:441
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:425
+#: src/arm/gnunet-arm.c:444
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:428
+#: src/arm/gnunet-arm.c:447
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:430
+#: src/arm/gnunet-arm.c:449
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:433
+#: src/arm/gnunet-arm.c:452
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:435
+#: src/arm/gnunet-arm.c:454
 #, fuzzy
 msgid "list currently running services"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:437
+#: src/arm/gnunet-arm.c:456
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:439
+#: src/arm/gnunet-arm.c:458
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:450
+#: src/arm/gnunet-arm.c:469
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -166,65 +166,65 @@
 msgid "Could not send list result to client\n"
 msgstr "Kunde inte skicka begäran till gnunetd.\n"
 
-#: src/arm/gnunet-service-arm.c:536
+#: src/arm/gnunet-service-arm.c:537
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/arm/gnunet-service-arm.c:558
+#: src/arm/gnunet-service-arm.c:559
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:572
+#: src/arm/gnunet-service-arm.c:573
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:680
+#: src/arm/gnunet-service-arm.c:681
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:891
+#: src/arm/gnunet-service-arm.c:892
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:984
+#: src/arm/gnunet-service-arm.c:985
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:989
+#: src/arm/gnunet-service-arm.c:990
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:994
+#: src/arm/gnunet-service-arm.c:995
 #, fuzzy
 msgid "unknown"
 msgstr "Okänt fel"
 
-#: src/arm/gnunet-service-arm.c:1000
+#: src/arm/gnunet-service-arm.c:1001
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-service-arm.c:1035
+#: src/arm/gnunet-service-arm.c:1036
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1227
+#: src/arm/gnunet-service-arm.c:1228
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1238
+#: src/arm/gnunet-service-arm.c:1239
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1252
+#: src/arm/gnunet-service-arm.c:1253
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -243,93 +243,134 @@
 msgid "Received last message for %s \n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/ats-tool/gnunet-ats.c:134
+#: src/ats/gnunet-service-ats_addresses.c:983
 #, c-format
+msgid "Outbound quota configure for network `%s' is unlimited (%llu)\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:989
+#: src/ats/gnunet-service-ats_addresses.c:1014
+#, c-format
+msgid ""
+"Could not convert quota configure for network `%s':  `%s', assigning default "
+"bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:997
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1007
+#, c-format
+msgid "Inbound quota configure for network `%s' is unlimited (%llu)\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1022
+#, c-format
+msgid ""
+"No inbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:141
+#, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:136
+#: src/ats-tool/gnunet-ats.c:143
 #, c-format
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:190
+#: src/ats-tool/gnunet-ats.c:198
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%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:274 src/namestore/gnunet-namestore.c:610
+#: src/ats-tool/gnunet-ats.c:324
+#, c-format
+msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:343 src/namestore/gnunet-namestore.c:610
 #: src/transport/gnunet-transport.c:744
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/ats-tool/gnunet-ats.c:284 src/transport/gnunet-transport.c:750
+#: src/ats-tool/gnunet-ats.c:353 src/transport/gnunet-transport.c:750
 #, 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:292
+#: src/ats-tool/gnunet-ats.c:361
 #, c-format
-msgid "Please select one operation : %s or %s or %s or %s\n"
+msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:305 src/ats-tool/gnunet-ats.c:324
-#: src/ats-tool/gnunet-ats.c:341 src/ats-tool/gnunet-ats.c:366
+#: src/ats-tool/gnunet-ats.c:377 src/ats-tool/gnunet-ats.c:396
+#: src/ats-tool/gnunet-ats.c:413 src/ats-tool/gnunet-ats.c:438
 #, 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:314 src/ats-tool/gnunet-ats.c:331
+#: src/ats-tool/gnunet-ats.c:386 src/ats-tool/gnunet-ats.c:403
 #, 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:359
+#: src/ats-tool/gnunet-ats.c:431
 msgid "Type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:416
+#: src/ats-tool/gnunet-ats.c:488
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:419
+#: src/ats-tool/gnunet-ats.c:491
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:422
+#: src/ats-tool/gnunet-ats.c:494
 #, 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:425
+#: src/ats-tool/gnunet-ats.c:497
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:428
+#: src/ats-tool/gnunet-ats.c:500
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/ats-tool/gnunet-ats.c:431
+#: src/ats-tool/gnunet-ats.c:503
+msgid "print all configured quotas"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:506
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:434
+#: src/ats-tool/gnunet-ats.c:509
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:437
+#: src/ats-tool/gnunet-ats.c:512
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:440
+#: src/ats-tool/gnunet-ats.c:515
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:449
+#: src/ats-tool/gnunet-ats.c:524
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "Skriv ut information om GNUnets motparter."
@@ -339,6 +380,42 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
+#: src/consensus/gnunet-consensus.c:230
+#, fuzzy
+msgid "session identifier"
+msgstr "# sessioner etablerade"
+
+#: src/consensus/gnunet-consensus-ibf.c:176
+#, fuzzy
+msgid "number of element in set A-B"
+msgstr "antal iterationer"
+
+#: src/consensus/gnunet-consensus-ibf.c:179
+#, fuzzy
+msgid "number of element in set B-A"
+msgstr "antal iterationer"
+
+#: src/consensus/gnunet-consensus-ibf.c:182
+msgid "number of common elements in A and B"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-ibf.c:185
+msgid "hash num"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-ibf.c:188
+msgid "ibf size"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-start-peers.c:158
+msgid "start peers with the given template configuration"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-start-peers.c:161
+#, fuzzy
+msgid "number of peers to start"
+msgstr "antal iterationer"
+
 #: src/core/core_api.c:755
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
@@ -364,7 +441,7 @@
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:131
+#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:176
 #: src/peerinfo-tool/gnunet-peerinfo.c:541
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
@@ -577,11 +654,11 @@
 #: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1544
 #: src/topology/gnunet-daemon-topology.c:704
 #: src/topology/gnunet-daemon-topology.c:805
-#: src/transport/gnunet-service-transport_neighbours.c:874
-#: src/transport/gnunet-service-transport_neighbours.c:1091
-#: src/transport/gnunet-service-transport_neighbours.c:1100
-#: src/transport/gnunet-service-transport_neighbours.c:2637
-#: src/transport/gnunet-service-transport_neighbours.c:2899
+#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1267
+#: src/transport/gnunet-service-transport_neighbours.c:1276
+#: src/transport/gnunet-service-transport_neighbours.c:2815
+#: src/transport/gnunet-service-transport_neighbours.c:3078
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
@@ -936,6 +1013,10 @@
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
+#: src/datastore/plugin_datastore_heap.c:820
+msgid "Heap database running\n"
+msgstr ""
+
 #: src/datastore/plugin_datastore_mysql.c:780
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
@@ -991,7 +1072,7 @@
 msgid "Sqlite database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_template.c:241
+#: src/datastore/plugin_datastore_template.c:257
 msgid "Template database running\n"
 msgstr ""
 
@@ -1043,7 +1124,7 @@
 
 #: 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:733
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:736
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:1033
 msgid "be verbose (print progress information)"
@@ -1356,12 +1437,12 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:110
+#: src/dns/dnsparser.c:152
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/dns/dnsparser.c:584
+#: src/dns/dnsparser.c:626
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -1372,7 +1453,7 @@
 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:1620
+#: src/gns/gnunet-service-gns_resolver.c:1621
 #, 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"
@@ -1458,12 +1539,12 @@
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1281 src/exit/gnunet-daemon-exit.c:3025
+#: src/dns/gnunet-service-dns.c:1283 src/exit/gnunet-daemon-exit.c:3026
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1302
+#: src/dns/gnunet-service-dns.c:1305
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
@@ -1647,35 +1728,35 @@
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3042
+#: src/exit/gnunet-daemon-exit.c:3043
 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:3050
+#: src/exit/gnunet-daemon-exit.c:3051
 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:3057
+#: src/exit/gnunet-daemon-exit.c:3058
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3063
+#: src/exit/gnunet-daemon-exit.c:3064
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3069 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3070 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3255
+#: src/exit/gnunet-daemon-exit.c:3274
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1733,76 +1814,76 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/fs_api.c:450
+#: src/fs/fs_api.c:465
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:459
+#: src/fs/fs_api.c:474
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/fs_api.c:465
+#: src/fs/fs_api.c:480
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1046
+#: src/fs/fs_api.c:1061
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:1505
+#: 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:1547
+#: src/fs/fs_api.c:1562
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1563
+#: src/fs/fs_api.c:1578
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2213
+#: src/fs/fs_api.c:2228
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2223
+#: 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"
 
-#: src/fs/fs_api.c:2348 src/fs/fs_api.c:2588
+#: src/fs/fs_api.c:2363 src/fs/fs_api.c:2603
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2365
+#: src/fs/fs_api.c:2380
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2397 src/fs/fs_api.c:2881
+#: src/fs/fs_api.c:2393 src/fs/fs_api.c:2412 src/fs/fs_api.c:2896
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2579
+#: src/fs/fs_api.c:2594
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2825
+#: src/fs/fs_api.c:2840
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2919
+#: src/fs/fs_api.c:2934
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2011,7 +2092,7 @@
 msgid "Could not connect to datastore."
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_search.c:830
+#: src/fs/fs_search.c:892
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2186,24 +2267,24 @@
 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:279
-#: src/fs/gnunet-publish.c:680
+#: src/fs/gnunet-publish.c:683
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:684
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:687
 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:687
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:690
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:711
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:714
 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:304
-#: src/fs/gnunet-publish.c:718
+#: src/fs/gnunet-publish.c:721
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2211,6 +2292,10 @@
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
+#: src/fs/gnunet-daemon-fsprofiler.c:656
+msgid "Daemon to use file-sharing to measure its performance."
+msgstr ""
+
 #: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
@@ -2273,7 +2358,7 @@
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Uppladdning vägrades!"
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:192
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:195
 #: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
@@ -2284,7 +2369,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:626
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:629
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
@@ -2297,7 +2382,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:604
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:607
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2346,6 +2431,22 @@
 msgid "Special file-sharing operations"
 msgstr "Visa alla alternativ"
 
+#: src/fs/gnunet-fs-profiler.c:182
+msgid "run the experiment with COUNT peers"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:185
+msgid "specifies name of a file with the HOSTS the testbed should use"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:188
+msgid "automatically terminate experiment after DELAY"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:197
+msgid "run a testbed to measure file-sharing performance"
+msgstr ""
+
 #: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:283
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
@@ -2371,7 +2472,7 @@
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:699
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:702
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
@@ -2400,173 +2501,173 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:149
+#: src/fs/gnunet-publish.c:152
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:156
+#: src/fs/gnunet-publish.c:159
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-publish.c:166
+#: src/fs/gnunet-publish.c:169
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:170
+#: src/fs/gnunet-publish.c:173
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:189
+#: src/fs/gnunet-publish.c:192
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "\"%s\" uppstart klar.\n"
 
-#: src/fs/gnunet-publish.c:307
+#: src/fs/gnunet-publish.c:310
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:309
+#: src/fs/gnunet-publish.c:312
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/fs/gnunet-publish.c:360 src/fs/gnunet-publish.c:614
+#: 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:435
+#: src/fs/gnunet-publish.c:438
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:462
+#: src/fs/gnunet-publish.c:465
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:493
+#: src/fs/gnunet-publish.c:496
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:495
+#: src/fs/gnunet-publish.c:498
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:500
+#: src/fs/gnunet-publish.c:503
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:505
+#: src/fs/gnunet-publish.c:508
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "Nedstängning klar.\n"
 
-#: src/fs/gnunet-publish.c:509
+#: src/fs/gnunet-publish.c:512
 #, 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:513
+#: src/fs/gnunet-publish.c:516
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:520
+#: src/fs/gnunet-publish.c:523
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/gnunet-publish.c:554
+#: src/fs/gnunet-publish.c:557
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:561
+#: src/fs/gnunet-publish.c:564
 #, 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:567
+#: src/fs/gnunet-publish.c:570
 #, 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:575 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:578 src/vpn/gnunet-vpn.c:214
 #, 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:585 src/fs/gnunet-publish.c:592
+#: src/fs/gnunet-publish.c:588 src/fs/gnunet-publish.c:595
 #: src/transport/gnunet-transport.c:774 src/transport/gnunet-transport.c:804
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:647
+#: 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:659
+#: 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:691
+#: src/fs/gnunet-publish.c:694
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:695
+#: src/fs/gnunet-publish.c:698
 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:702
+#: src/fs/gnunet-publish.c:705
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:707
+#: src/fs/gnunet-publish.c:710
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:715
+#: src/fs/gnunet-publish.c:718
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:721
+#: src/fs/gnunet-publish.c:724
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:725
+#: src/fs/gnunet-publish.c:728
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:729
+#: src/fs/gnunet-publish.c:732
 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:745
+#: src/fs/gnunet-publish.c:748
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2615,8 +2716,8 @@
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:628 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1321
-#: src/topology/gnunet-daemon-topology.c:1328
+#: src/topology/gnunet-daemon-topology.c:1322
+#: src/topology/gnunet-daemon-topology.c:1329
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -2755,8 +2856,7 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:364
-#: src/fs/gnunet-service-fs_lc.c:490
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:369
 #, fuzzy
 msgid "# client searches active"
 msgstr "# klartext PONG-meddelanden mottagna"
@@ -2766,12 +2866,12 @@
 msgid "# replies received for local clients"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:323
+#: src/fs/gnunet-service-fs_lc.c:328
 #, fuzzy
 msgid "# client searches received"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_lc.c:358
+#: src/fs/gnunet-service-fs_lc.c:363
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -2779,145 +2879,145 @@
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:397
+#: src/fs/gnunet-service-fs_pe.c:400
 #, fuzzy
 msgid "# transmission failed (core has no bandwidth)"
 msgstr "Ingen transport av typ %d är känd.\n"
 
-#: src/fs/gnunet-service-fs_pe.c:426
+#: src/fs/gnunet-service-fs_pe.c:433
 #, fuzzy
 msgid "# query messages sent to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_pe.c:475
+#: src/fs/gnunet-service-fs_pe.c:482
 msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:483
+#: src/fs/gnunet-service-fs_pe.c:490
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:543
+#: src/fs/gnunet-service-fs_pe.c:550
 #, fuzzy
 msgid "# requests merged"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pe.c:551
+#: src/fs/gnunet-service-fs_pe.c:558
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pe.c:605 src/fs/gnunet-service-fs_pe.c:689
-#: src/fs/gnunet-service-fs_pe.c:760
+#: src/fs/gnunet-service-fs_pe.c:612 src/fs/gnunet-service-fs_pe.c:696
+#: src/fs/gnunet-service-fs_pe.c:767
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:299
+#: src/fs/gnunet-service-fs_pr.c:312
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:391 src/fs/gnunet-service-fs_pr.c:654
+#: src/fs/gnunet-service-fs_pr.c:404 src/fs/gnunet-service-fs_pr.c:667
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:822
+#: src/fs/gnunet-service-fs_pr.c:835
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_pr.c:855
+#: src/fs/gnunet-service-fs_pr.c:868
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:864
+#: src/fs/gnunet-service-fs_pr.c:877
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:878
+#: src/fs/gnunet-service-fs_pr.c:891
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:891
+#: src/fs/gnunet-service-fs_pr.c:904
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1012
+#: src/fs/gnunet-service-fs_pr.c:1025
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1039
+#: src/fs/gnunet-service-fs_pr.c:1052
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1074
+#: src/fs/gnunet-service-fs_pr.c:1087
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1203
+#: src/fs/gnunet-service-fs_pr.c:1221
 #, fuzzy
 msgid "# Replies received from STREAM"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1255
+#: src/fs/gnunet-service-fs_pr.c:1273
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1275
+#: src/fs/gnunet-service-fs_pr.c:1293
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1322
+#: src/fs/gnunet-service-fs_pr.c:1340
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1337
+#: src/fs/gnunet-service-fs_pr.c:1355
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1346
+#: src/fs/gnunet-service-fs_pr.c:1364
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1361
+#: src/fs/gnunet-service-fs_pr.c:1379
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1375
+#: src/fs/gnunet-service-fs_pr.c:1393
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1388
+#: src/fs/gnunet-service-fs_pr.c:1406
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1393
+#: src/fs/gnunet-service-fs_pr.c:1411
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1420 src/fs/gnunet-service-fs_pr.c:1460
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1438 src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1619
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1496
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1489
+#: src/fs/gnunet-service-fs_pr.c:1507
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1577
+#: src/fs/gnunet-service-fs_pr.c:1595
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1662
+#: src/fs/gnunet-service-fs_pr.c:1680
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -2926,6 +3026,36 @@
 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"
@@ -3133,6 +3263,11 @@
 msgid "Unable to initialize resolver!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
+#: src/gns/gnunet-service-gns_resolver.c:3439
+#, c-format
+msgid "Not a GADS TLD: `%s'\n"
+msgstr ""
+
 #: src/hello/gnunet-hello.c:118
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3167,37 +3302,37 @@
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/hello/hello.c:905
+#: src/hello/hello.c:904
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:914
+#: src/hello/hello.c:913
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:924
+#: src/hello/hello.c:923
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hello/hello.c:934
+#: src/hello/hello.c:933
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hello/hello.c:951
+#: src/hello/hello.c:950
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:960
+#: src/hello/hello.c:959
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:979
+#: src/hello/hello.c:978
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
@@ -3500,10 +3635,10 @@
 #: src/mesh/gnunet-daemon-regexprofiler.c:209
 #: src/mesh/gnunet-daemon-regexprofiler.c:222
 #: src/mesh/gnunet-daemon-regexprofiler.c:235
-#: src/mesh/gnunet-service-mesh.c:8692 src/mesh/gnunet-service-mesh.c:8704
-#: src/mesh/gnunet-service-mesh.c:8716 src/mesh/gnunet-service-mesh.c:8730
-#: src/mesh/gnunet-service-mesh.c:8742 src/mesh/gnunet-service-mesh.c:8754
-#: src/mesh/gnunet-service-mesh.c:8766 src/mesh/gnunet-service-mesh-new.c:8292
+#: src/mesh/gnunet-service-mesh.c:8931 src/mesh/gnunet-service-mesh.c:8943
+#: src/mesh/gnunet-service-mesh.c:8955 src/mesh/gnunet-service-mesh.c:8969
+#: src/mesh/gnunet-service-mesh.c:8981 src/mesh/gnunet-service-mesh.c:8993
+#: src/mesh/gnunet-service-mesh.c:9005 src/mesh/gnunet-service-mesh-new.c:8292
 #: src/mesh/gnunet-service-mesh-new.c:8304
 #: src/mesh/gnunet-service-mesh-new.c:8316
 #: src/mesh/gnunet-service-mesh-new.c:8329
@@ -3519,173 +3654,195 @@
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:162
+#: src/mesh/gnunet-mesh.c:211
 #, fuzzy
-msgid ""
-"provide inthe 'struct GNUNET_TRANSPORT_PeerIterateContextformation about all "
-"tunnels (continuously)"
+msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-mesh.c:173
+#: src/mesh/gnunet-mesh.c:214
 #, fuzzy
+msgid "provide information about a particular tunnel"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/mesh/gnunet-mesh.c:224
+#, fuzzy
 msgid "Print information about mesh tunnels and peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-regex-profiler.c:1147
-#: src/testbed/gnunet-testbed-profiler.c:320
+#: src/mesh/gnunet-regex-profiler.c:1162
+#: src/testbed/gnunet-testbed-profiler.c:333
 msgid "An operation has failed while starting peers\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1193
-#: src/testbed/gnunet-testbed-profiler.c:389
+#: src/mesh/gnunet-regex-profiler.c:1208
+#: src/testbed/gnunet-testbed-profiler.c:402
 #, fuzzy, c-format
 msgid "Creating a peer failed. Error: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1320
-#: src/testbed/gnunet-testbed-profiler.c:494
+#: src/mesh/gnunet-regex-profiler.c:1335
+#: src/testbed/gnunet-testbed-profiler.c:507
 msgid "An operation has failed while starting slaves\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1342
+#: src/mesh/gnunet-regex-profiler.c:1357
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1397
+#: src/mesh/gnunet-regex-profiler.c:1412
 msgid "An operation has failed while linking\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1508
-#: src/testbed/gnunet-testbed-profiler.c:598
+#: src/mesh/gnunet-regex-profiler.c:1523
+#: src/testbed/gnunet-testbed-profiler.c:611
+#: src/testbed/testbed_api_testbed.c:735
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1588
-#: src/testbed/gnunet-testbed-profiler.c:677
+#: src/mesh/gnunet-regex-profiler.c:1604
+#: src/testbed/gnunet-testbed-profiler.c:690
 msgid "Unable to connect to master controller -- Check config\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1687
+#: src/mesh/gnunet-regex-profiler.c:1706
+#: src/testbed/gnunet-testbed-profiler.c:723
+#: src/testbed/testbed_api_testbed.c:858
 #, c-format
+msgid "Host %s cannot start testbed\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1709
+#: src/testbed/gnunet-testbed-profiler.c:726
+#: src/testbed/testbed_api_testbed.c:861
+msgid "Testbed cannot be started on localhost\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1749
+#, c-format
 msgid "No hosts-file specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1692
+#: src/mesh/gnunet-regex-profiler.c:1754
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1698
-#: src/testbed/gnunet-testbed-profiler.c:717
+#: src/mesh/gnunet-regex-profiler.c:1760
+#: src/testbed/gnunet-testbed-profiler.c:776
+#: src/testbed/testbed_api_testbed.c:942
 #, c-format
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1705
-#: src/testbed/gnunet-testbed-profiler.c:724
-#: src/testbed/testbed_api_testbed.c:759
+#: src/mesh/gnunet-regex-profiler.c:1763
+#: src/testbed/gnunet-testbed-profiler.c:779
 #, c-format
-msgid "Host %s cannot start testbed\n"
+msgid "Checking whether given hosts can start testbed. Please wait\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1712
-#: src/testbed/gnunet-testbed-profiler.c:731
+#: src/mesh/gnunet-regex-profiler.c:1784
+#: src/testbed/gnunet-testbed-profiler.c:800
 #, fuzzy, c-format
 msgid "Exiting\n"
 msgstr ""
 "\n"
 "Avslutar.\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1718
+#: src/mesh/gnunet-regex-profiler.c:1790
 #, fuzzy, c-format
 msgid "No configuration file given. Exiting\n"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/mesh/gnunet-regex-profiler.c:1727
+#: src/mesh/gnunet-regex-profiler.c:1799
 #, fuzzy, c-format
 msgid "Configuration option (regex_prefix) missing. Exiting\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1745
+#: src/mesh/gnunet-regex-profiler.c:1817
 #: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1752
+#: src/mesh/gnunet-regex-profiler.c:1824
 #, c-format
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1760
+#: src/mesh/gnunet-regex-profiler.c:1832
 #, c-format
 msgid ""
 "Error loading search strings. Given file does not contain enough strings. "
 "Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1766
+#: src/mesh/gnunet-regex-profiler.c:1838
 #, fuzzy, c-format
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1800
+#: src/mesh/gnunet-regex-profiler.c:1865
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Visa värde av alternativet"
 
-#: src/mesh/gnunet-regex-profiler.c:1803
+#: src/mesh/gnunet-regex-profiler.c:1868
 msgid "create COUNT number of random links between peers"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1806
+#: src/mesh/gnunet-regex-profiler.c:1871
 msgid "wait TIMEOUT before considering a string match as failed"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1809
+#: src/mesh/gnunet-regex-profiler.c:1874
 msgid "wait DELAY before starting string search"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1812
+#: src/mesh/gnunet-regex-profiler.c:1877
 msgid "number of search strings to read from search strings file"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1815
+#: src/mesh/gnunet-regex-profiler.c:1880
 #: src/regex/gnunet-regex-simulation-profiler.c:692
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1818
+#: src/mesh/gnunet-regex-profiler.c:1883
 msgid ""
 "if this option is set, only one peer is responsible for searching all strings"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1830
+#: src/mesh/gnunet-regex-profiler.c:1895
 msgid "Profiler for regex/mesh"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8398 src/mesh/gnunet-service-mesh-new.c:7998
+#: src/mesh/gnunet-service-mesh.c:8625 src/mesh/gnunet-service-mesh-new.c:7998
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8603 src/mesh/gnunet-service-mesh-new.c:8203
-#, fuzzy
-msgid "Mesh service could not access hostkey.  Exiting.\n"
+#: src/mesh/gnunet-service-mesh.c:8842
+#, 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:8778 src/mesh/gnunet-service-mesh.c:8789
-#: src/mesh/gnunet-service-mesh-new.c:8380
+#: src/mesh/gnunet-service-mesh.c:9017 src/mesh/gnunet-service-mesh.c:9027
+#: src/mesh/gnunet-service-mesh.c:9038 src/mesh/gnunet-service-mesh-new.c:8380
 #: src/mesh/gnunet-service-mesh-new.c:8391
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
 msgstr "GNUnet-konfiguration"
 
+#: src/mesh/gnunet-service-mesh-new.c:8203
+#, fuzzy
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -3907,42 +4064,42 @@
 msgid "Protocol error"
 msgstr ""
 
-#: src/namestore/namestore_common.c:509 src/namestore/namestore_common.c:649
+#: src/namestore/namestore_common.c:530 src/namestore/namestore_common.c:670
 #, fuzzy, c-format
 msgid "Unsupported record type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/namestore_common.c:516
+#: src/namestore/namestore_common.c:537
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/namestore/namestore_common.c:539
+#: src/namestore/namestore_common.c:560
 #, 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:562
+#: src/namestore/namestore_common.c:583
 #, 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:580
+#: src/namestore/namestore_common.c:601
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/namestore/namestore_common.c:593
+#: src/namestore/namestore_common.c:614
 #, 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:614
+#: src/namestore/namestore_common.c:635
 #, 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:640
+#: src/namestore/namestore_common.c:661
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -3961,6 +4118,62 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
+#: src/nat/nat_auto.c:169
+msgid "NAT traversal with ICMP Server timed out.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:199
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:200
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:219
+#, fuzzy
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr "Skriv ut information om GNUnets motparter."
+
+#: src/nat/nat_auto.c:265
+#, fuzzy, c-format
+msgid "Detected external IP `%s'\n"
+msgstr "Mottog ogiltig RPC \"%s\".\n"
+
+#: src/nat/nat_auto.c:331
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:347
+#, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:400
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:401
+#, fuzzy
+msgid "upnpc not found\n"
+msgstr "Kommando \"%s\" hittades inte!\n"
+
+#: src/nat/nat_auto.c:434
+msgid "gnunet-helper-nat-server found, testing it\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:435
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:469
+msgid "gnunet-helper-nat-client found, enabling it\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:470
+msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+msgstr ""
+
 #: src/nat/nat.c:795
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
@@ -4051,11 +4264,6 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:938
-#, c-format
-msgid "Proof of work invalid: %llu!\n"
-msgstr ""
-
 #: src/nse/gnunet-service-nse.c:1389
 #, fuzzy, c-format
 msgid "NSE service could not access hostkey: %s\n"
@@ -4380,126 +4588,165 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:706
+#: src/sysmon/gnunet-service-sysmon.c:381
 #, c-format
+msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:732
+#, c-format
+msgid "\rChecked %u hosts"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:736
+#, c-format
+msgid ""
+"\n"
+"All hosts can start testbed. Creating peers\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:765
+#, c-format
 msgid "No hosts-file specified on command line\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:780
+#: src/testbed/gnunet-testbed-profiler.c:842
 msgid "Only `CLIQUE' and `RANDOM' are permitted.\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:795
+#: src/testbed/gnunet-testbed-profiler.c:857
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:798
+#: src/testbed/gnunet-testbed-profiler.c:860
 msgid "create COUNT number of random links"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:801
+#: src/testbed/gnunet-testbed-profiler.c:863
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:804
+#: src/testbed/gnunet-testbed-profiler.c:866
 msgid ""
 "Try to acheive TOPOLOGY. This options takes either CLIQUE or RANDOM. For "
 "CLIQUE the parameter -n is ignored. The default is to acheive a random graph "
 "topology."
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:819
+#: src/testbed/gnunet-testbed-profiler.c:881
 msgid "Profiler for testbed"
 msgstr ""
 
+#: src/testbed/ll_master.c:57
+#, fuzzy, c-format
+msgid "Job command file not given. Exiting\n"
+msgstr "använd konfigurationsfil FILNAMN"
+
 #: src/testbed/testbed_api.c:320
 #, 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_hosts.c:326
+#: src/testbed/testbed_api_hosts.c:313
 #, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/testbed/testbed_api_hosts.c:334
+#: src/testbed/testbed_api_hosts.c:321
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:341
+#: src/testbed/testbed_api_hosts.c:328
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:320
+#: src/testbed/testbed_api_testbed.c:354
 msgid "Some operations are still pending. Cancelling them\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:580
+#: src/testbed/testbed_api_testbed.c:557
+msgid "Linking controllers failed. Exiting"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:886
+msgid "Cannot start the master controller"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:966
+msgid "Specified topology must be supported by testbed"
+msgstr ""
+
+#: src/testbed/testbed_api_topology.c:582
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/testbed/testbed_api_topology.c:586
+#: src/testbed/testbed_api_topology.c:588
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:592
+#: src/testbed/testbed_api_topology.c:594
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:614
+#: src/testbed/testbed_api_topology.c:617
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/testbed/testbed_api_topology.c:623
-#: src/testbed/testbed_api_topology.c:648
+#: src/testbed/testbed_api_topology.c:626
+#: src/testbed/testbed_api_topology.c:651
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:629
-#: src/testbed/testbed_api_topology.c:654
+#: src/testbed/testbed_api_topology.c:632
+#: src/testbed/testbed_api_topology.c:657
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/testbed/testbed_api_topology.c:635
-#: src/testbed/testbed_api_topology.c:660
-msgid "Topology file need more peers than the given ones\n"
+#: src/testbed/testbed_api_topology.c:638
+#: src/testbed/testbed_api_topology.c:663
+msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:131
+#: src/testbed/testbed_api_topology.c:679
 #, fuzzy, c-format
+msgid "Ignoring to connect peer %u to peer %u\n"
+msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
+
+#: src/testing/gnunet-testing.c:132
+#, 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:202
+#: src/testing/gnunet-testing.c:203
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/testing/gnunet-testing.c:204
+#: src/testing/gnunet-testing.c:205
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:206
+#: src/testing/gnunet-testing.c:207
 #, 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:208
+#: src/testing/gnunet-testing.c:209
 #, fuzzy
 msgid "configuration template"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/testing/gnunet-testing.c:217
+#: src/testing/gnunet-testing.c:218
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -4517,59 +4764,59 @@
 msgid "name of the service to run"
 msgstr ""
 
-#: src/testing/testing.c:199
+#: src/testing/testing.c:211
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:215
+#: src/testing/testing.c:227
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:526
+#: src/testing/testing.c:541
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/testing/testing.c:536
+#: src/testing/testing.c:551
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/testing/testing.c:850
+#: src/testing/testing.c:865
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/testing/testing.c:861
+#: src/testing/testing.c:876
 #, 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:875
+#: src/testing/testing.c:890
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/testing/testing.c:908
+#: src/testing/testing.c:923
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/testing/testing.c:926
+#: src/testing/testing.c:941
 #, 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:997
+#: src/testing/testing.c:1014
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/testing/testing.c:1202
+#: src/testing/testing.c:1219
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -4593,116 +4840,111 @@
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1033
+#: src/topology/gnunet-daemon-topology.c:1034
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1040
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1048
+#: src/topology/gnunet-daemon-topology.c:1049
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1056
+#: src/topology/gnunet-daemon-topology.c:1057
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1076
+#: src/topology/gnunet-daemon-topology.c:1077
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1089
+#: src/topology/gnunet-daemon-topology.c:1090
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1099
+#: src/topology/gnunet-daemon-topology.c:1100
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1105
+#: src/topology/gnunet-daemon-topology.c:1106
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1115
+#: src/topology/gnunet-daemon-topology.c:1116
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1121
+#: src/topology/gnunet-daemon-topology.c:1122
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1128
+#: src/topology/gnunet-daemon-topology.c:1129
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1163
+#: src/topology/gnunet-daemon-topology.c:1164
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/topology/gnunet-daemon-topology.c:1218
+#: src/topology/gnunet-daemon-topology.c:1219
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1357
+#: src/topology/gnunet-daemon-topology.c:1358
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:245
+#: src/transport/gnunet-service-transport_blacklist.c:246
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:251
-#, c-format
-msgid "Blacklist file `%s' is empty.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_blacklist.c:262
+#: src/transport/gnunet-service-transport_blacklist.c:263
 #, fuzzy, c-format
 msgid "Failed to read blacklist from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:283
-#: src/transport/gnunet-service-transport_blacklist.c:307
+#: src/transport/gnunet-service-transport_blacklist.c:284
+#: src/transport/gnunet-service-transport_blacklist.c:308
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:294
-#: src/transport/gnunet-service-transport_blacklist.c:330
+#: src/transport/gnunet-service-transport_blacklist.c:295
+#: src/transport/gnunet-service-transport_blacklist.c:331
 #, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:344
+#: src/transport/gnunet-service-transport_blacklist.c:345
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:358
+#: src/transport/gnunet-service-transport_blacklist.c:359
 #, c-format
 msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:513
-#: src/transport/gnunet-service-transport_blacklist.c:751
+#: src/transport/gnunet-service-transport_blacklist.c:514
+#: src/transport/gnunet-service-transport_blacklist.c:752
 msgid "# disconnects due to blacklist"
 msgstr ""
 
@@ -4757,115 +4999,115 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1042
+#: src/transport/gnunet-service-transport_neighbours.c:1218
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1172
-#: src/transport/gnunet-service-transport_neighbours.c:1509
+#: src/transport/gnunet-service-transport_neighbours.c:1348
+#: src/transport/gnunet-service-transport_neighbours.c:1685
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1177
+#: src/transport/gnunet-service-transport_neighbours.c:1353
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1182
+#: src/transport/gnunet-service-transport_neighbours.c:1358
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1239
+#: src/transport/gnunet-service-transport_neighbours.c:1415
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1281
+#: src/transport/gnunet-service-transport_neighbours.c:1457
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# sessionsnycklar skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1305
+#: src/transport/gnunet-service-transport_neighbours.c:1481
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1313
+#: src/transport/gnunet-service-transport_neighbours.c:1489
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1350
+#: src/transport/gnunet-service-transport_neighbours.c:1526
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1359
+#: src/transport/gnunet-service-transport_neighbours.c:1535
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1415
+#: src/transport/gnunet-service-transport_neighbours.c:1591
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1449
+#: src/transport/gnunet-service-transport_neighbours.c:1625
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1465
+#: src/transport/gnunet-service-transport_neighbours.c:1641
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2613
+#: src/transport/gnunet-service-transport_neighbours.c:2791
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2628
-#: src/transport/gnunet-service-transport_neighbours.c:2662
+#: src/transport/gnunet-service-transport_neighbours.c:2806
+#: src/transport/gnunet-service-transport_neighbours.c:2840
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2675
+#: src/transport/gnunet-service-transport_neighbours.c:2853
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2708
+#: src/transport/gnunet-service-transport_neighbours.c:2886
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2892
+#: src/transport/gnunet-service-transport_neighbours.c:3071
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2947
+#: src/transport/gnunet-service-transport_neighbours.c:3126
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2961
+#: src/transport/gnunet-service-transport_neighbours.c:3140
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2992
+#: src/transport/gnunet-service-transport_neighbours.c:3171
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3003
+#: src/transport/gnunet-service-transport_neighbours.c:3182
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3034
+#: src/transport/gnunet-service-transport_neighbours.c:3213
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3129
+#: src/transport/gnunet-service-transport_neighbours.c:3308
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
@@ -5067,41 +5309,41 @@
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
 #: src/transport/plugin_transport_http.c:817
-#: src/transport/plugin_transport_http_server.c:2550
+#: src/transport/plugin_transport_http_server.c:2553
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:866
-#: src/transport/plugin_transport_http_server.c:2318
+#: src/transport/plugin_transport_http_server.c:2321
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
 #: src/transport/plugin_transport_http.c:898
-#: src/transport/plugin_transport_http_server.c:2350 src/util/service.c:1053
+#: src/transport/plugin_transport_http_server.c:2353 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
 #: src/transport/plugin_transport_http.c:915
-#: src/transport/plugin_transport_http_server.c:2367 src/util/service.c:1070
+#: src/transport/plugin_transport_http_server.c:2370 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
 #: src/transport/plugin_transport_http.c:1020
-#: src/transport/plugin_transport_http_server.c:2478
+#: src/transport/plugin_transport_http_server.c:2481
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1133
-#: src/transport/plugin_transport_http_server.c:2646
+#: src/transport/plugin_transport_http_server.c:2649
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1146
-#: src/transport/plugin_transport_http_server.c:2657
+#: src/transport/plugin_transport_http_server.c:2660
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
@@ -5125,7 +5367,7 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1223
-#: src/transport/plugin_transport_http_server.c:2739
+#: src/transport/plugin_transport_http_server.c:2742
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Startade samling \"%s\".\n"
@@ -5134,26 +5376,26 @@
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1509
+#: src/transport/plugin_transport_http_client.c:1515
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1640
-#: src/transport/plugin_transport_http_server.c:2863
+#: src/transport/plugin_transport_http_client.c:1646
+#: src/transport/plugin_transport_http_server.c:2866
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1665
-#: src/transport/plugin_transport_http_server.c:2922
+#: src/transport/plugin_transport_http_client.c:1671
+#: src/transport/plugin_transport_http_server.c:2925
 #, 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:1693
-#: src/transport/plugin_transport_http_server.c:2769
+#: src/transport/plugin_transport_http_client.c:1699
+#: src/transport/plugin_transport_http_server.c:2772
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
@@ -5165,67 +5407,67 @@
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1597
+#: src/transport/plugin_transport_http_server.c:1600
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1605
+#: src/transport/plugin_transport_http_server.c:1608
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1906
+#: src/transport/plugin_transport_http_server.c:1909
 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:1930
+#: src/transport/plugin_transport_http_server.c:1933
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2625
+#: src/transport/plugin_transport_http_server.c:2628
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2639
+#: src/transport/plugin_transport_http_server.c:2642
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2664
+#: src/transport/plugin_transport_http_server.c:2667
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2679
+#: src/transport/plugin_transport_http_server.c:2682
 #, 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:2689
+#: src/transport/plugin_transport_http_server.c:2692
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2710
+#: src/transport/plugin_transport_http_server.c:2713
 #, 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:2720
+#: src/transport/plugin_transport_http_server.c:2723
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2755
+#: src/transport/plugin_transport_http_server.c:2758
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -5287,16 +5529,16 @@
 #: src/transport/plugin_transport_tcp.c:856
 #: src/transport/plugin_transport_tcp.c:906
 #: src/transport/plugin_transport_tcp.c:992
-#: src/transport/plugin_transport_tcp.c:1132
-#: src/transport/plugin_transport_tcp.c:1149
+#: src/transport/plugin_transport_tcp.c:1135
+#: src/transport/plugin_transport_tcp.c:1152
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
 #: src/transport/plugin_transport_tcp.c:774
 #: src/transport/plugin_transport_tcp.c:963
-#: src/transport/plugin_transport_tcp.c:1817
-#: src/transport/plugin_transport_tcp.c:2436
+#: src/transport/plugin_transport_tcp.c:1820
+#: src/transport/plugin_transport_tcp.c:2439
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
@@ -5316,49 +5558,54 @@
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1342
+#: src/transport/plugin_transport_tcp.c:1109
 #, c-format
+msgid "Trying to send with invalid session %p\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1345
+#, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1457
+#: src/transport/plugin_transport_tcp.c:1460
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1858
+#: src/transport/plugin_transport_tcp.c:1861
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:2032
+#: src/transport/plugin_transport_tcp.c:2035
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2102
+#: src/transport/plugin_transport_tcp.c:2105
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2326 src/util/service.c:948
+#: src/transport/plugin_transport_tcp.c:2329 src/util/service.c:948
 #: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2340
+#: src/transport/plugin_transport_tcp.c:2343
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2424
+#: src/transport/plugin_transport_tcp.c:2427
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2428
+#: src/transport/plugin_transport_tcp.c:2431
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2432
+#: src/transport/plugin_transport_tcp.c:2435
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5378,14 +5625,14 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2345
+#: src/transport/plugin_transport_udp.c:2517
 #, 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:2359
+#: src/transport/plugin_transport_udp.c:2531
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5393,17 +5640,17 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2600
+#: src/transport/plugin_transport_udp.c:2772
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:2676
+#: src/transport/plugin_transport_udp.c:2848
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2719
+#: src/transport/plugin_transport_udp.c:2891
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
@@ -5565,7 +5812,7 @@
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/util/client.c:1168
+#: src/util/client.c:1177
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -5622,12 +5869,12 @@
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
 
-#: src/util/configuration.c:263
+#: src/util/configuration.c:291
 #, fuzzy, c-format
-msgid "Syntax error while deserializing operation at line %u\n"
+msgid "Syntax error while deserializing in line %u\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/util/configuration.c:949
+#: src/util/configuration.c:998
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -5667,14 +5914,14 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:448 src/util/crypto_rsa.c:644
+#: src/util/crypto_ecc.c:448
 #, 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:463 src/util/crypto_rsa.c:661
+#: src/util/crypto_ecc.c:463 src/util/crypto_rsa.c:660
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
@@ -5682,22 +5929,22 @@
 msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
 #: src/util/crypto_ecc.c:559 src/util/crypto_ecc.c:603
-#: src/util/crypto_rsa.c:759 src/util/crypto_rsa.c:803
+#: src/util/crypto_rsa.c:757 src/util/crypto_rsa.c:801
 #, 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:564 src/util/crypto_rsa.c:764
+#: src/util/crypto_ecc.c:564 src/util/crypto_rsa.c:762
 #, 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:607 src/util/crypto_rsa.c:807
-#: src/util/crypto_rsa.c:843
+#: src/util/crypto_ecc.c:607 src/util/crypto_rsa.c:805
+#: src/util/crypto_rsa.c:841
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:638 src/util/crypto_rsa.c:838
+#: src/util/crypto_ecc.c:638 src/util/crypto_rsa.c:836
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
@@ -5707,12 +5954,12 @@
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:658 src/util/crypto_rsa.c:858
+#: src/util/crypto_ecc.c:658 src/util/crypto_rsa.c:856
 #, 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:780 src/util/crypto_rsa.c:946
+#: src/util/crypto_ecc.c:780 src/util/crypto_rsa.c:941
 msgid "interrupted by shutdown"
 msgstr ""
 
@@ -5741,33 +5988,40 @@
 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:957
+#: src/util/crypto_rsa.c:644
+#, 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:952
 #, fuzzy
 msgid "gnunet-rsa failed"
 msgstr "gnunet-update misslyckades!"
 
-#: src/util/crypto_rsa.c:1348
+#: src/util/crypto_rsa.c:1343
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/disk.c:567
+#: src/util/disk.c:601
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/disk.c:1171
+#: src/util/disk.c:1205
 #, 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:1525 src/util/service.c:1667
+#: src/util/disk.c:1559 src/util/service.c:1669
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/util/disk.c:1897
+#: src/util/disk.c:1931
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
@@ -6009,14 +6263,14 @@
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:417
+#: src/util/os_installation.c:420
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:699
+#: src/util/os_installation.c:702
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
@@ -6051,17 +6305,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/util/program.c:251 src/util/service.c:1789
+#: src/util/program.c:254 src/util/service.c:1791
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/pseudonym.c:276
+#: src/util/pseudonym.c:282
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/pseudonym.c:407 src/util/pseudonym.c:433
+#: src/util/pseudonym.c:413 src/util/pseudonym.c:439
 #, fuzzy
 msgid "no-name"
 msgstr "Visa namn"
@@ -6094,11 +6348,11 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/scheduler.c:781
+#: src/util/scheduler.c:782
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:911
+#: src/util/scheduler.c:912
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
@@ -6209,38 +6463,38 @@
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1523
+#: src/util/service.c:1525
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/service.c:1556
+#: src/util/service.c:1558
 #, 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:1605
+#: src/util/service.c:1607
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1609
+#: src/util/service.c:1611
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1613
+#: src/util/service.c:1615
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1668
+#: src/util/service.c:1670
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1681
+#: src/util/service.c:1683
 #, 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:1747
+#: src/util/service.c:1749
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6512,6 +6766,12 @@
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "provide inthe 'struct GNUNET_TRANSPORT_PeerIterateContextformation about "
+#~ "all tunnels (continuously)"
+#~ msgstr "Skriv ut information om GNUnets motparter."
+
+#, fuzzy
 #~ msgid "Connected to %s\n"
 #~ msgstr "\"%s\" ansluten till \"%s\".\n"
 
@@ -7327,9 +7587,6 @@
 #~ msgid "output in gnuplot format"
 #~ msgstr "utdata i gnuplot-format"
 
-#~ msgid "number of iterations"
-#~ msgstr "antal iterationer"
-
 #~ msgid "number of messages to use per iteration"
 #~ msgstr "antal meddelanden att använda per iteration"
 
@@ -7461,9 +7718,6 @@
 #~ "Session key received from peer `%s' has invalid format (discarded).\n"
 #~ msgstr "Meddelande mottaget från motpart är ogiltig.\n"
 
-#~ msgid "# sessions established"
-#~ msgstr "# sessioner etablerade"
-
 #~ msgid "create a new pseudonym under the given NICKNAME"
 #~ msgstr "skapa en ny pseudonym under angivet SMEKNAMN"
 
@@ -7906,9 +8160,6 @@
 #~ msgid "`%s' called with timeout above 1 hour (bug?)\n"
 #~ msgstr "\"%s\" anropad med timeout över 1 timma (fel?)\n"
 
-#~ msgid "Received invalid RPC `%s'.\n"
-#~ msgstr "Mottog ogiltig RPC \"%s\".\n"
-
 #~ msgid "allow SIZE bytes of memory for the local table"
 #~ msgstr "tillåt STORLEK byte av minne för lokaltabellen"
 

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2012-12-21 16:29:06 UTC (rev 25634)
+++ gnunet/po/vi.po     2012-12-21 16:48:59 UTC (rev 25635)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-11-26 14:59+0100\n"
+"POT-Creation-Date: 2012-12-21 16:05+0100\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -77,80 +77,80 @@
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:230
+#: src/arm/gnunet-arm.c:229
 #, 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:233
+#: src/arm/gnunet-arm.c:232
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:263 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:385
-msgid "Fatal error initializing ARM API.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:287
+#: src/arm/gnunet-arm.c:253
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/arm/gnunet-arm.c:293
+#: src/arm/gnunet-arm.c:259
 #, 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:416
+#: src/arm/gnunet-arm.c:306 src/arm/gnunet-arm.c:389 src/arm/gnunet-arm.c:406
+msgid "Fatal error initializing ARM API.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:435
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:418
+#: src/arm/gnunet-arm.c:437
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:420
+#: src/arm/gnunet-arm.c:439
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:422
+#: src/arm/gnunet-arm.c:441
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:425
+#: src/arm/gnunet-arm.c:444
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:428
+#: src/arm/gnunet-arm.c:447
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:430
+#: src/arm/gnunet-arm.c:449
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:433
+#: src/arm/gnunet-arm.c:452
 #, 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:435
+#: src/arm/gnunet-arm.c:454
 #, fuzzy
 msgid "list currently running services"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:437
+#: src/arm/gnunet-arm.c:456
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:439
+#: src/arm/gnunet-arm.c:458
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:450
+#: src/arm/gnunet-arm.c:469
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -173,65 +173,65 @@
 msgid "Could not send list result to client\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:536
+#: src/arm/gnunet-service-arm.c:537
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/arm/gnunet-service-arm.c:558
+#: src/arm/gnunet-service-arm.c:559
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:572
+#: src/arm/gnunet-service-arm.c:573
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:680
+#: src/arm/gnunet-service-arm.c:681
 #, fuzzy, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:891
+#: src/arm/gnunet-service-arm.c:892
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:984
+#: src/arm/gnunet-service-arm.c:985
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:989
+#: src/arm/gnunet-service-arm.c:990
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:994
+#: src/arm/gnunet-service-arm.c:995
 #, fuzzy
 msgid "unknown"
 msgstr "Lỗi không rõ"
 
-#: src/arm/gnunet-service-arm.c:1000
+#: src/arm/gnunet-service-arm.c:1001
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-service-arm.c:1035
+#: src/arm/gnunet-service-arm.c:1036
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1227
+#: src/arm/gnunet-service-arm.c:1228
 #, 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:1238
+#: src/arm/gnunet-service-arm.c:1239
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1252
+#: src/arm/gnunet-service-arm.c:1253
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -250,93 +250,134 @@
 msgid "Received last message for %s \n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/ats-tool/gnunet-ats.c:134
+#: src/ats/gnunet-service-ats_addresses.c:983
 #, c-format
+msgid "Outbound quota configure for network `%s' is unlimited (%llu)\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:989
+#: src/ats/gnunet-service-ats_addresses.c:1014
+#, c-format
+msgid ""
+"Could not convert quota configure for network `%s':  `%s', assigning default "
+"bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:997
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1007
+#, c-format
+msgid "Inbound quota configure for network `%s' is unlimited (%llu)\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1022
+#, c-format
+msgid ""
+"No inbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:141
+#, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:136
+#: src/ats-tool/gnunet-ats.c:143
 #, c-format
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:190
+#: src/ats-tool/gnunet-ats.c:198
 #, fuzzy, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%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:274 src/namestore/gnunet-namestore.c:610
+#: src/ats-tool/gnunet-ats.c:324
+#, c-format
+msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:343 src/namestore/gnunet-namestore.c:610
 #: src/transport/gnunet-transport.c:744
 #, 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:284 src/transport/gnunet-transport.c:750
+#: src/ats-tool/gnunet-ats.c:353 src/transport/gnunet-transport.c:750
 #, 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:292
+#: src/ats-tool/gnunet-ats.c:361
 #, c-format
-msgid "Please select one operation : %s or %s or %s or %s\n"
+msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:305 src/ats-tool/gnunet-ats.c:324
-#: src/ats-tool/gnunet-ats.c:341 src/ats-tool/gnunet-ats.c:366
+#: src/ats-tool/gnunet-ats.c:377 src/ats-tool/gnunet-ats.c:396
+#: src/ats-tool/gnunet-ats.c:413 src/ats-tool/gnunet-ats.c:438
 #, 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:314 src/ats-tool/gnunet-ats.c:331
+#: src/ats-tool/gnunet-ats.c:386 src/ats-tool/gnunet-ats.c:403
 #, 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:359
+#: src/ats-tool/gnunet-ats.c:431
 msgid "Type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:416
+#: src/ats-tool/gnunet-ats.c:488
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:419
+#: src/ats-tool/gnunet-ats.c:491
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:422
+#: src/ats-tool/gnunet-ats.c:494
 #, 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:425
+#: src/ats-tool/gnunet-ats.c:497
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:428
+#: src/ats-tool/gnunet-ats.c:500
 #, 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:431
+#: src/ats-tool/gnunet-ats.c:503
+msgid "print all configured quotas"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:506
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:434
+#: src/ats-tool/gnunet-ats.c:509
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:437
+#: src/ats-tool/gnunet-ats.c:512
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:440
+#: src/ats-tool/gnunet-ats.c:515
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:449
+#: src/ats-tool/gnunet-ats.c:524
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -346,6 +387,42 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
+#: src/consensus/gnunet-consensus.c:230
+#, fuzzy
+msgid "session identifier"
+msgstr "# các phiên chạy được thiết lập"
+
+#: src/consensus/gnunet-consensus-ibf.c:176
+#, fuzzy
+msgid "number of element in set A-B"
+msgstr "số lần lặp lại"
+
+#: src/consensus/gnunet-consensus-ibf.c:179
+#, fuzzy
+msgid "number of element in set B-A"
+msgstr "số lần lặp lại"
+
+#: src/consensus/gnunet-consensus-ibf.c:182
+msgid "number of common elements in A and B"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-ibf.c:185
+msgid "hash num"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-ibf.c:188
+msgid "ibf size"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-start-peers.c:158
+msgid "start peers with the given template configuration"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-start-peers.c:161
+#, fuzzy
+msgid "number of peers to start"
+msgstr "số lần lặp lại"
+
 #: src/core/core_api.c:755
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
@@ -371,7 +448,7 @@
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:131
+#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:176
 #: src/peerinfo-tool/gnunet-peerinfo.c:541
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
@@ -585,11 +662,11 @@
 #: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1544
 #: src/topology/gnunet-daemon-topology.c:704
 #: src/topology/gnunet-daemon-topology.c:805
-#: src/transport/gnunet-service-transport_neighbours.c:874
-#: src/transport/gnunet-service-transport_neighbours.c:1091
-#: src/transport/gnunet-service-transport_neighbours.c:1100
-#: src/transport/gnunet-service-transport_neighbours.c:2637
-#: src/transport/gnunet-service-transport_neighbours.c:2899
+#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1267
+#: src/transport/gnunet-service-transport_neighbours.c:1276
+#: src/transport/gnunet-service-transport_neighbours.c:2815
+#: src/transport/gnunet-service-transport_neighbours.c:3078
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
@@ -957,6 +1034,11 @@
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
+#: src/datastore/plugin_datastore_heap.c:820
+#, fuzzy
+msgid "Heap database running\n"
+msgstr "kho dữ liệu sqlite"
+
 #: src/datastore/plugin_datastore_mysql.c:780
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
@@ -1016,7 +1098,7 @@
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/datastore/plugin_datastore_template.c:241
+#: src/datastore/plugin_datastore_template.c:257
 msgid "Template database running\n"
 msgstr ""
 
@@ -1068,7 +1150,7 @@
 
 #: 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:733
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:736
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:1033
 msgid "be verbose (print progress information)"
@@ -1382,12 +1464,12 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:110
+#: src/dns/dnsparser.c:152
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/dns/dnsparser.c:584
+#: src/dns/dnsparser.c:626
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -1398,7 +1480,7 @@
 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:1620
+#: src/gns/gnunet-service-gns_resolver.c:1621
 #, 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"
@@ -1484,12 +1566,12 @@
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1281 src/exit/gnunet-daemon-exit.c:3025
+#: src/dns/gnunet-service-dns.c:1283 src/exit/gnunet-daemon-exit.c:3026
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1302
+#: src/dns/gnunet-service-dns.c:1305
 #, 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"
@@ -1674,35 +1756,35 @@
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3042
+#: src/exit/gnunet-daemon-exit.c:3043
 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:3050
+#: src/exit/gnunet-daemon-exit.c:3051
 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:3057
+#: src/exit/gnunet-daemon-exit.c:3058
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3063
+#: src/exit/gnunet-daemon-exit.c:3064
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3069 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3070 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3255
+#: src/exit/gnunet-daemon-exit.c:3274
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1761,76 +1843,76 @@
 msgid "# fragmentation transmissions completed"
 msgstr "# các sự truyền PONG bị lỗi"
 
-#: src/fs/fs_api.c:450
+#: src/fs/fs_api.c:465
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:459
+#: src/fs/fs_api.c:474
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/fs_api.c:465
+#: src/fs/fs_api.c:480
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1046
+#: src/fs/fs_api.c:1061
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:1505
+#: 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:1547
+#: src/fs/fs_api.c:1562
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1563
+#: src/fs/fs_api.c:1578
 #, 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:2213
+#: src/fs/fs_api.c:2228
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2223
+#: 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"
 
-#: src/fs/fs_api.c:2348 src/fs/fs_api.c:2588
+#: src/fs/fs_api.c:2363 src/fs/fs_api.c:2603
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2365
+#: src/fs/fs_api.c:2380
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2397 src/fs/fs_api.c:2881
+#: src/fs/fs_api.c:2393 src/fs/fs_api.c:2412 src/fs/fs_api.c:2896
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2579
+#: src/fs/fs_api.c:2594
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2825
+#: src/fs/fs_api.c:2840
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2919
+#: src/fs/fs_api.c:2934
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2037,7 +2119,7 @@
 msgid "Could not connect to datastore."
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/fs/fs_search.c:830
+#: src/fs/fs_search.c:892
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2209,24 +2291,24 @@
 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:279
-#: src/fs/gnunet-publish.c:680
+#: src/fs/gnunet-publish.c:683
 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:684
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:687
 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:687
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:690
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:711
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:714
 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:304
-#: src/fs/gnunet-publish.c:718
+#: src/fs/gnunet-publish.c:721
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2235,6 +2317,10 @@
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr "Tự động chia sẻ một thư mục."
 
+#: src/fs/gnunet-daemon-fsprofiler.c:656
+msgid "Daemon to use file-sharing to measure its performance."
+msgstr ""
+
 #: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
@@ -2297,7 +2383,7 @@
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:192
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:195
 #: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
@@ -2308,7 +2394,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:626
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:629
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
@@ -2321,7 +2407,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:604
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:607
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2373,6 +2459,22 @@
 msgid "Special file-sharing operations"
 msgstr "Tùy chọn chia sẻ tập tin"
 
+#: src/fs/gnunet-fs-profiler.c:182
+msgid "run the experiment with COUNT peers"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:185
+msgid "specifies name of a file with the HOSTS the testbed should use"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:188
+msgid "automatically terminate experiment after DELAY"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:197
+msgid "run a testbed to measure file-sharing performance"
+msgstr ""
+
 #: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:283
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
@@ -2401,7 +2503,7 @@
 "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:292 src/fs/gnunet-publish.c:699
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:702
 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"
 
@@ -2432,127 +2534,127 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:149
+#: src/fs/gnunet-publish.c:152
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:156
+#: src/fs/gnunet-publish.c:159
 #, 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:166
+#: src/fs/gnunet-publish.c:169
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:170
+#: src/fs/gnunet-publish.c:173
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/fs/gnunet-publish.c:189
+#: src/fs/gnunet-publish.c:192
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "Hoàn thành khởi chạy « %s ».\n"
 
-#: src/fs/gnunet-publish.c:307
+#: src/fs/gnunet-publish.c:310
 #, 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:309
+#: src/fs/gnunet-publish.c:312
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Từ khoá cho tập tin « %s »:\n"
 
-#: src/fs/gnunet-publish.c:360 src/fs/gnunet-publish.c:614
+#: 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:435
+#: src/fs/gnunet-publish.c:438
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:462
+#: src/fs/gnunet-publish.c:465
 #, 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:493
+#: src/fs/gnunet-publish.c:496
 #, 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:495
+#: src/fs/gnunet-publish.c:498
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-publish.c:500
+#: src/fs/gnunet-publish.c:503
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:505
+#: src/fs/gnunet-publish.c:508
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:509
+#: src/fs/gnunet-publish.c:512
 #, 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:513
+#: src/fs/gnunet-publish.c:516
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:520
+#: src/fs/gnunet-publish.c:523
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/gnunet-publish.c:554
+#: src/fs/gnunet-publish.c:557
 #, 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:561
+#: src/fs/gnunet-publish.c:564
 #, 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:567
+#: src/fs/gnunet-publish.c:570
 #, 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:575 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:578 src/vpn/gnunet-vpn.c:214
 #, 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:585 src/fs/gnunet-publish.c:592
+#: src/fs/gnunet-publish.c:588 src/fs/gnunet-publish.c:595
 #: src/transport/gnunet-transport.c:774 src/transport/gnunet-transport.c:804
 #, 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:647
+#: 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:659
+#: 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:691
+#: src/fs/gnunet-publish.c:694
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2560,7 +2662,7 @@
 "in ra danh sách các từ khóa đã giải phóng cần sử dụng, nhưng không thực hiện "
 "tải lên"
 
-#: src/fs/gnunet-publish.c:695
+#: src/fs/gnunet-publish.c:698
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2568,7 +2670,7 @@
 "thêm một từ khoá bổ sung cho tập tin hoặc thư mục ở cấp đầu (có thể chỉ ra "
 "tùy chọn này nhiều lần)"
 
-#: src/fs/gnunet-publish.c:702
+#: src/fs/gnunet-publish.c:705
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2576,7 +2678,7 @@
 "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng "
 "mã hóa trong cơ sở dữ liệu GNUnet)"
 
-#: src/fs/gnunet-publish.c:707
+#: src/fs/gnunet-publish.c:710
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2584,12 +2686,12 @@
 "chỉ ra mã số của một phiên bản đã cập nhật để công bố trong tương lai (chỉ "
 "cho sự chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:715
+#: src/fs/gnunet-publish.c:718
 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:721
+#: src/fs/gnunet-publish.c:724
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -2597,13 +2699,13 @@
 msgstr ""
 "chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
 
-#: src/fs/gnunet-publish.c:725
+#: src/fs/gnunet-publish.c:728
 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:729
+#: src/fs/gnunet-publish.c:732
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -2611,7 +2713,7 @@
 "Địa chỉ URI cần công bố (có thể được dùng thay vào gửi một tập tin để thêm "
 "từ khoá vào tập tin có địa chỉ URI tương ứng)"
 
-#: src/fs/gnunet-publish.c:745
+#: src/fs/gnunet-publish.c:748
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2662,8 +2764,8 @@
 msgstr "# tổng số định tuyến lỗ hổng thành công"
 
 #: src/fs/gnunet-service-fs.c:628 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1321
-#: src/topology/gnunet-daemon-topology.c:1328
+#: src/topology/gnunet-daemon-topology.c:1322
+#: src/topology/gnunet-daemon-topology.c:1329
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -2808,8 +2910,7 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Đánh chỉ mục dữ liệu của tập tin « %s » bị lỗi tại vị tri %llu.\n"
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:364
-#: src/fs/gnunet-service-fs_lc.c:490
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:369
 #, fuzzy
 msgid "# client searches active"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
@@ -2819,12 +2920,12 @@
 msgid "# replies received for local clients"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/fs/gnunet-service-fs_lc.c:323
+#: src/fs/gnunet-service-fs_lc.c:328
 #, fuzzy
 msgid "# client searches received"
 msgstr "# các yêu cầu khách lỗ hổng được nhận"
 
-#: src/fs/gnunet-service-fs_lc.c:358
+#: src/fs/gnunet-service-fs_lc.c:363
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -2833,148 +2934,148 @@
 msgid "# average retransmission delay (ms)"
 msgstr "# thời gian trung bình còn kết nối (theo miligiây)"
 
-#: src/fs/gnunet-service-fs_pe.c:397
+#: src/fs/gnunet-service-fs_pe.c:400
 #, fuzzy
 msgid "# transmission failed (core has no bandwidth)"
 msgstr "Lỗi thử gửi, kiểu truyền tải %d không được hỗ trợ\n"
 
-#: src/fs/gnunet-service-fs_pe.c:426
+#: src/fs/gnunet-service-fs_pe.c:433
 #, fuzzy
 msgid "# query messages sent to other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/fs/gnunet-service-fs_pe.c:475
+#: src/fs/gnunet-service-fs_pe.c:482
 msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:483
+#: src/fs/gnunet-service-fs_pe.c:490
 #, fuzzy
 msgid "# query plans executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_pe.c:543
+#: src/fs/gnunet-service-fs_pe.c:550
 #, fuzzy
 msgid "# requests merged"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pe.c:551
+#: src/fs/gnunet-service-fs_pe.c:558
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pe.c:605 src/fs/gnunet-service-fs_pe.c:689
-#: src/fs/gnunet-service-fs_pe.c:760
+#: src/fs/gnunet-service-fs_pe.c:612 src/fs/gnunet-service-fs_pe.c:696
+#: src/fs/gnunet-service-fs_pe.c:767
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:299
+#: src/fs/gnunet-service-fs_pr.c:312
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:391 src/fs/gnunet-service-fs_pr.c:654
+#: src/fs/gnunet-service-fs_pr.c:404 src/fs/gnunet-service-fs_pr.c:667
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:822
+#: src/fs/gnunet-service-fs_pr.c:835
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:855
+#: src/fs/gnunet-service-fs_pr.c:868
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:864
+#: src/fs/gnunet-service-fs_pr.c:877
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:878
+#: src/fs/gnunet-service-fs_pr.c:891
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:891
+#: src/fs/gnunet-service-fs_pr.c:904
 #, fuzzy
 msgid "# results found locally"
 msgstr "# nội dung lỗ hổng được tìm cục bộ"
 
-#: src/fs/gnunet-service-fs_pr.c:1012
+#: src/fs/gnunet-service-fs_pr.c:1025
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1039
+#: src/fs/gnunet-service-fs_pr.c:1052
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_pr.c:1074
+#: src/fs/gnunet-service-fs_pr.c:1087
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1203
+#: src/fs/gnunet-service-fs_pr.c:1221
 #, fuzzy
 msgid "# Replies received from STREAM"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1255
+#: src/fs/gnunet-service-fs_pr.c:1273
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1275
+#: src/fs/gnunet-service-fs_pr.c:1293
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1322
+#: src/fs/gnunet-service-fs_pr.c:1340
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1337
+#: src/fs/gnunet-service-fs_pr.c:1355
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1346
+#: src/fs/gnunet-service-fs_pr.c:1364
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1361
+#: src/fs/gnunet-service-fs_pr.c:1379
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1375
+#: src/fs/gnunet-service-fs_pr.c:1393
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1388
+#: src/fs/gnunet-service-fs_pr.c:1406
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1393
+#: src/fs/gnunet-service-fs_pr.c:1411
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1420 src/fs/gnunet-service-fs_pr.c:1460
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1438 src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1619
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1496
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1489
+#: src/fs/gnunet-service-fs_pr.c:1507
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1577
+#: src/fs/gnunet-service-fs_pr.c:1595
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1662
+#: src/fs/gnunet-service-fs_pr.c:1680
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -2983,6 +3084,36 @@
 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"
@@ -3192,6 +3323,11 @@
 msgid "Unable to initialize resolver!\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
+#: src/gns/gnunet-service-gns_resolver.c:3439
+#, c-format
+msgid "Not a GADS TLD: `%s'\n"
+msgstr ""
+
 #: src/hello/gnunet-hello.c:118
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3226,37 +3362,37 @@
 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:905
+#: src/hello/hello.c:904
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:914
+#: src/hello/hello.c:913
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:924
+#: src/hello/hello.c:923
 #, 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:934
+#: src/hello/hello.c:933
 #, 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:951
+#: src/hello/hello.c:950
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:960
+#: src/hello/hello.c:959
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:979
+#: src/hello/hello.c:978
 #, 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"
@@ -3570,10 +3706,10 @@
 #: src/mesh/gnunet-daemon-regexprofiler.c:209
 #: src/mesh/gnunet-daemon-regexprofiler.c:222
 #: src/mesh/gnunet-daemon-regexprofiler.c:235
-#: src/mesh/gnunet-service-mesh.c:8692 src/mesh/gnunet-service-mesh.c:8704
-#: src/mesh/gnunet-service-mesh.c:8716 src/mesh/gnunet-service-mesh.c:8730
-#: src/mesh/gnunet-service-mesh.c:8742 src/mesh/gnunet-service-mesh.c:8754
-#: src/mesh/gnunet-service-mesh.c:8766 src/mesh/gnunet-service-mesh-new.c:8292
+#: src/mesh/gnunet-service-mesh.c:8931 src/mesh/gnunet-service-mesh.c:8943
+#: src/mesh/gnunet-service-mesh.c:8955 src/mesh/gnunet-service-mesh.c:8969
+#: src/mesh/gnunet-service-mesh.c:8981 src/mesh/gnunet-service-mesh.c:8993
+#: src/mesh/gnunet-service-mesh.c:9005 src/mesh/gnunet-service-mesh-new.c:8292
 #: src/mesh/gnunet-service-mesh-new.c:8304
 #: src/mesh/gnunet-service-mesh-new.c:8316
 #: src/mesh/gnunet-service-mesh-new.c:8329
@@ -3589,169 +3725,191 @@
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:162
+#: src/mesh/gnunet-mesh.c:211
 #, fuzzy
-msgid ""
-"provide inthe 'struct GNUNET_TRANSPORT_PeerIterateContextformation about all "
-"tunnels (continuously)"
+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:173
+#: src/mesh/gnunet-mesh.c:214
 #, 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
+#, fuzzy
 msgid "Print information about mesh tunnels and peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/mesh/gnunet-regex-profiler.c:1147
-#: src/testbed/gnunet-testbed-profiler.c:320
+#: src/mesh/gnunet-regex-profiler.c:1162
+#: src/testbed/gnunet-testbed-profiler.c:333
 msgid "An operation has failed while starting peers\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1193
-#: src/testbed/gnunet-testbed-profiler.c:389
+#: src/mesh/gnunet-regex-profiler.c:1208
+#: src/testbed/gnunet-testbed-profiler.c:402
 #, fuzzy, c-format
 msgid "Creating a peer failed. Error: %s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1320
-#: src/testbed/gnunet-testbed-profiler.c:494
+#: src/mesh/gnunet-regex-profiler.c:1335
+#: src/testbed/gnunet-testbed-profiler.c:507
 msgid "An operation has failed while starting slaves\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1342
+#: src/mesh/gnunet-regex-profiler.c:1357
 #, 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/mesh/gnunet-regex-profiler.c:1397
+#: src/mesh/gnunet-regex-profiler.c:1412
 msgid "An operation has failed while linking\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1508
-#: src/testbed/gnunet-testbed-profiler.c:598
+#: src/mesh/gnunet-regex-profiler.c:1523
+#: src/testbed/gnunet-testbed-profiler.c:611
+#: src/testbed/testbed_api_testbed.c:735
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1588
-#: src/testbed/gnunet-testbed-profiler.c:677
+#: src/mesh/gnunet-regex-profiler.c:1604
+#: src/testbed/gnunet-testbed-profiler.c:690
 msgid "Unable to connect to master controller -- Check config\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1687
+#: src/mesh/gnunet-regex-profiler.c:1706
+#: src/testbed/gnunet-testbed-profiler.c:723
+#: src/testbed/testbed_api_testbed.c:858
 #, c-format
+msgid "Host %s cannot start testbed\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1709
+#: src/testbed/gnunet-testbed-profiler.c:726
+#: src/testbed/testbed_api_testbed.c:861
+msgid "Testbed cannot be started on localhost\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1749
+#, c-format
 msgid "No hosts-file specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1692
+#: src/mesh/gnunet-regex-profiler.c:1754
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1698
-#: src/testbed/gnunet-testbed-profiler.c:717
+#: src/mesh/gnunet-regex-profiler.c:1760
+#: src/testbed/gnunet-testbed-profiler.c:776
+#: src/testbed/testbed_api_testbed.c:942
 #, c-format
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1705
-#: src/testbed/gnunet-testbed-profiler.c:724
-#: src/testbed/testbed_api_testbed.c:759
+#: src/mesh/gnunet-regex-profiler.c:1763
+#: src/testbed/gnunet-testbed-profiler.c:779
 #, c-format
-msgid "Host %s cannot start testbed\n"
+msgid "Checking whether given hosts can start testbed. Please wait\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1712
-#: src/testbed/gnunet-testbed-profiler.c:731
+#: src/mesh/gnunet-regex-profiler.c:1784
+#: src/testbed/gnunet-testbed-profiler.c:800
 #, fuzzy, c-format
 msgid "Exiting\n"
 msgstr "Thoát"
 
-#: src/mesh/gnunet-regex-profiler.c:1718
+#: src/mesh/gnunet-regex-profiler.c:1790
 #, fuzzy, c-format
 msgid "No configuration file given. Exiting\n"
 msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
 
-#: src/mesh/gnunet-regex-profiler.c:1727
+#: src/mesh/gnunet-regex-profiler.c:1799
 #, fuzzy, c-format
 msgid "Configuration option (regex_prefix) missing. Exiting\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1745
+#: src/mesh/gnunet-regex-profiler.c:1817
 #: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1752
+#: src/mesh/gnunet-regex-profiler.c:1824
 #, c-format
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1760
+#: src/mesh/gnunet-regex-profiler.c:1832
 #, c-format
 msgid ""
 "Error loading search strings. Given file does not contain enough strings. "
 "Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1766
+#: src/mesh/gnunet-regex-profiler.c:1838
 #, fuzzy, c-format
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1800
+#: src/mesh/gnunet-regex-profiler.c:1865
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1803
+#: src/mesh/gnunet-regex-profiler.c:1868
 msgid "create COUNT number of random links between peers"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1806
+#: src/mesh/gnunet-regex-profiler.c:1871
 msgid "wait TIMEOUT before considering a string match as failed"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1809
+#: src/mesh/gnunet-regex-profiler.c:1874
 msgid "wait DELAY before starting string search"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1812
+#: src/mesh/gnunet-regex-profiler.c:1877
 msgid "number of search strings to read from search strings file"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1815
+#: src/mesh/gnunet-regex-profiler.c:1880
 #: src/regex/gnunet-regex-simulation-profiler.c:692
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1818
+#: src/mesh/gnunet-regex-profiler.c:1883
 msgid ""
 "if this option is set, only one peer is responsible for searching all strings"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1830
+#: src/mesh/gnunet-regex-profiler.c:1895
 msgid "Profiler for regex/mesh"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8398 src/mesh/gnunet-service-mesh-new.c:7998
+#: src/mesh/gnunet-service-mesh.c:8625 src/mesh/gnunet-service-mesh-new.c:7998
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8603 src/mesh/gnunet-service-mesh-new.c:8203
-#, fuzzy
-msgid "Mesh service could not access hostkey.  Exiting.\n"
+#: src/mesh/gnunet-service-mesh.c:8842
+#, 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:8778 src/mesh/gnunet-service-mesh.c:8789
-#: src/mesh/gnunet-service-mesh-new.c:8380
+#: src/mesh/gnunet-service-mesh.c:9017 src/mesh/gnunet-service-mesh.c:9027
+#: src/mesh/gnunet-service-mesh.c:9038 src/mesh/gnunet-service-mesh-new.c:8380
 #: src/mesh/gnunet-service-mesh-new.c:8391
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
+#: src/mesh/gnunet-service-mesh-new.c:8203
+#, fuzzy
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -3974,42 +4132,42 @@
 msgid "Protocol error"
 msgstr ""
 
-#: src/namestore/namestore_common.c:509 src/namestore/namestore_common.c:649
+#: src/namestore/namestore_common.c:530 src/namestore/namestore_common.c:670
 #, 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:516
+#: src/namestore/namestore_common.c:537
 #, 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:539
+#: src/namestore/namestore_common.c:560
 #, 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:562
+#: src/namestore/namestore_common.c:583
 #, 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:580
+#: src/namestore/namestore_common.c:601
 #, 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:593
+#: src/namestore/namestore_common.c:614
 #, 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:614
+#: src/namestore/namestore_common.c:635
 #, 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:640
+#: src/namestore/namestore_common.c:661
 #, 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"
@@ -4028,6 +4186,61 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
+#: src/nat/nat_auto.c:169
+msgid "NAT traversal with ICMP Server timed out.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:199
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:200
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:219
+#, fuzzy
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+
+#: src/nat/nat_auto.c:265
+#, c-format
+msgid "Detected external IP `%s'\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:331
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:347
+#, fuzzy, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
+
+#: src/nat/nat_auto.c:400
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:401
+msgid "upnpc not found\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:434
+msgid "gnunet-helper-nat-server found, testing it\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:435
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:469
+msgid "gnunet-helper-nat-client found, enabling it\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:470
+msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+msgstr ""
+
 #: src/nat/nat.c:795
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
@@ -4118,11 +4331,6 @@
 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:938
-#, c-format
-msgid "Proof of work invalid: %llu!\n"
-msgstr ""
-
 #: src/nse/gnunet-service-nse.c:1389
 #, fuzzy, c-format
 msgid "NSE service could not access hostkey: %s\n"
@@ -4452,126 +4660,165 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:706
+#: src/sysmon/gnunet-service-sysmon.c:381
 #, c-format
+msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:732
+#, c-format
+msgid "\rChecked %u hosts"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:736
+#, c-format
+msgid ""
+"\n"
+"All hosts can start testbed. Creating peers\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:765
+#, c-format
 msgid "No hosts-file specified on command line\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:780
+#: src/testbed/gnunet-testbed-profiler.c:842
 msgid "Only `CLIQUE' and `RANDOM' are permitted.\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:795
+#: src/testbed/gnunet-testbed-profiler.c:857
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:798
+#: src/testbed/gnunet-testbed-profiler.c:860
 msgid "create COUNT number of random links"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:801
+#: src/testbed/gnunet-testbed-profiler.c:863
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:804
+#: src/testbed/gnunet-testbed-profiler.c:866
 msgid ""
 "Try to acheive TOPOLOGY. This options takes either CLIQUE or RANDOM. For "
 "CLIQUE the parameter -n is ignored. The default is to acheive a random graph "
 "topology."
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:819
+#: src/testbed/gnunet-testbed-profiler.c:881
 msgid "Profiler for testbed"
 msgstr ""
 
+#: src/testbed/ll_master.c:57
+#, fuzzy, c-format
+msgid "Job command file not given. Exiting\n"
+msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
+
 #: src/testbed/testbed_api.c:320
 #, 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_hosts.c:326
+#: src/testbed/testbed_api_hosts.c:313
 #, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_hosts.c:334
+#: src/testbed/testbed_api_hosts.c:321
 #, fuzzy, c-format
 msgid "Hosts file %s has no data\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_hosts.c:341
+#: src/testbed/testbed_api_hosts.c:328
 #, fuzzy, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_testbed.c:320
+#: src/testbed/testbed_api_testbed.c:354
 msgid "Some operations are still pending. Cancelling them\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:580
+#: src/testbed/testbed_api_testbed.c:557
+msgid "Linking controllers failed. Exiting"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:886
+msgid "Cannot start the master controller"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:966
+msgid "Specified topology must be supported by testbed"
+msgstr ""
+
+#: src/testbed/testbed_api_topology.c:582
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:586
+#: src/testbed/testbed_api_topology.c:588
 #, fuzzy, c-format
 msgid "Topology file %s has no data\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:592
+#: src/testbed/testbed_api_topology.c:594
 #, fuzzy, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:614
+#: src/testbed/testbed_api_topology.c:617
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/testbed/testbed_api_topology.c:623
-#: src/testbed/testbed_api_topology.c:648
+#: src/testbed/testbed_api_topology.c:626
+#: src/testbed/testbed_api_topology.c:651
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:629
-#: src/testbed/testbed_api_topology.c:654
+#: src/testbed/testbed_api_topology.c:632
+#: src/testbed/testbed_api_topology.c:657
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/testbed/testbed_api_topology.c:635
-#: src/testbed/testbed_api_topology.c:660
-msgid "Topology file need more peers than the given ones\n"
+#: src/testbed/testbed_api_topology.c:638
+#: src/testbed/testbed_api_topology.c:663
+msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:131
+#: src/testbed/testbed_api_topology.c:679
 #, fuzzy, c-format
+msgid "Ignoring to connect peer %u to peer %u\n"
+msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
+
+#: src/testing/gnunet-testing.c:132
+#, 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:202
+#: src/testing/gnunet-testing.c:203
 #, 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:204
+#: src/testing/gnunet-testing.c:205
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:206
+#: src/testing/gnunet-testing.c:207
 #, 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:208
+#: src/testing/gnunet-testing.c:209
 #, fuzzy
 msgid "configuration template"
 msgstr "Cấu hình đã được lưu."
 
-#: src/testing/gnunet-testing.c:217
+#: src/testing/gnunet-testing.c:218
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -4589,59 +4836,59 @@
 msgid "name of the service to run"
 msgstr ""
 
-#: src/testing/testing.c:199
+#: src/testing/testing.c:211
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:215
+#: src/testing/testing.c:227
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:526
+#: src/testing/testing.c:541
 #, 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:536
+#: src/testing/testing.c:551
 #, 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:850
+#: src/testing/testing.c:865
 #, 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:861
+#: src/testing/testing.c:876
 #, 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:875
+#: src/testing/testing.c:890
 #, 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:908
+#: src/testing/testing.c:923
 #, 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:926
+#: src/testing/testing.c:941
 #, 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:997
+#: src/testing/testing.c:1014
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/testing/testing.c:1202
+#: src/testing/testing.c:1219
 #, 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 »:"
@@ -4665,124 +4912,119 @@
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1033
+#: src/topology/gnunet-daemon-topology.c:1034
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1040
 #, fuzzy, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1048
+#: src/topology/gnunet-daemon-topology.c:1049
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1056
+#: src/topology/gnunet-daemon-topology.c:1057
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1076
+#: src/topology/gnunet-daemon-topology.c:1077
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1089
+#: src/topology/gnunet-daemon-topology.c:1090
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
 
-#: src/topology/gnunet-daemon-topology.c:1099
+#: src/topology/gnunet-daemon-topology.c:1100
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1105
+#: src/topology/gnunet-daemon-topology.c:1106
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1115
+#: src/topology/gnunet-daemon-topology.c:1116
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1121
+#: src/topology/gnunet-daemon-topology.c:1122
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 "Xác định quá ít bạn bè (dưới số tối thiểu). Sẽ chỉ kết nối tới bạn bè.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1128
+#: src/topology/gnunet-daemon-topology.c:1129
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr "Cần thiết nhiều kết nối bạn bè hơn tổng số kết nối đích.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1163
+#: src/topology/gnunet-daemon-topology.c:1164
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/topology/gnunet-daemon-topology.c:1218
+#: src/topology/gnunet-daemon-topology.c:1219
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# các thông báo gửi đi bị loại bỏ"
 
-#: src/topology/gnunet-daemon-topology.c:1357
+#: src/topology/gnunet-daemon-topology.c:1358
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:245
+#: src/transport/gnunet-service-transport_blacklist.c:246
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:251
-#, c-format
-msgid "Blacklist file `%s' is empty.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_blacklist.c:262
+#: src/transport/gnunet-service-transport_blacklist.c:263
 #, fuzzy, c-format
 msgid "Failed to read blacklist from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:283
-#: src/transport/gnunet-service-transport_blacklist.c:307
+#: src/transport/gnunet-service-transport_blacklist.c:284
+#: src/transport/gnunet-service-transport_blacklist.c:308
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:294
-#: src/transport/gnunet-service-transport_blacklist.c:330
+#: src/transport/gnunet-service-transport_blacklist.c:295
+#: src/transport/gnunet-service-transport_blacklist.c:331
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:344
+#: src/transport/gnunet-service-transport_blacklist.c:345
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:358
+#: src/transport/gnunet-service-transport_blacklist.c:359
 #, c-format
 msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:513
-#: src/transport/gnunet-service-transport_blacklist.c:751
+#: src/transport/gnunet-service-transport_blacklist.c:514
+#: src/transport/gnunet-service-transport_blacklist.c:752
 msgid "# disconnects due to blacklist"
 msgstr ""
 
@@ -4838,117 +5080,117 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1042
+#: src/transport/gnunet-service-transport_neighbours.c:1218
 #, fuzzy
 msgid "# DISCONNECT messages sent"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1172
-#: src/transport/gnunet-service-transport_neighbours.c:1509
+#: src/transport/gnunet-service-transport_neighbours.c:1348
+#: src/transport/gnunet-service-transport_neighbours.c:1685
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1177
+#: src/transport/gnunet-service-transport_neighbours.c:1353
 #, fuzzy
 msgid "# messages transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/transport/gnunet-service-transport_neighbours.c:1182
+#: src/transport/gnunet-service-transport_neighbours.c:1358
 #, fuzzy
 msgid "# transmission failures for messages to other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1239
+#: src/transport/gnunet-service-transport_neighbours.c:1415
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1281
+#: src/transport/gnunet-service-transport_neighbours.c:1457
 #, fuzzy
 msgid "# keepalives sent"
 msgstr "# các khoá phiên chạy được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1305
+#: src/transport/gnunet-service-transport_neighbours.c:1481
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1313
+#: src/transport/gnunet-service-transport_neighbours.c:1489
 #, fuzzy
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1350
+#: src/transport/gnunet-service-transport_neighbours.c:1526
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1359
+#: src/transport/gnunet-service-transport_neighbours.c:1535
 #, fuzzy
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1415
+#: src/transport/gnunet-service-transport_neighbours.c:1591
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1449
+#: src/transport/gnunet-service-transport_neighbours.c:1625
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "theo dõi gnunetd sử dụng dải thông"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1465
+#: src/transport/gnunet-service-transport_neighbours.c:1641
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2613
+#: src/transport/gnunet-service-transport_neighbours.c:2791
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2628
-#: src/transport/gnunet-service-transport_neighbours.c:2662
+#: src/transport/gnunet-service-transport_neighbours.c:2806
+#: src/transport/gnunet-service-transport_neighbours.c:2840
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2675
+#: src/transport/gnunet-service-transport_neighbours.c:2853
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2708
+#: src/transport/gnunet-service-transport_neighbours.c:2886
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2892
+#: src/transport/gnunet-service-transport_neighbours.c:3071
 #, 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:2947
+#: src/transport/gnunet-service-transport_neighbours.c:3126
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2961
+#: src/transport/gnunet-service-transport_neighbours.c:3140
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2992
+#: src/transport/gnunet-service-transport_neighbours.c:3171
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3003
+#: src/transport/gnunet-service-transport_neighbours.c:3182
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3034
+#: src/transport/gnunet-service-transport_neighbours.c:3213
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3129
+#: src/transport/gnunet-service-transport_neighbours.c:3308
 #, 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"
@@ -5150,41 +5392,41 @@
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #: src/transport/plugin_transport_http.c:817
-#: src/transport/plugin_transport_http_server.c:2550
+#: src/transport/plugin_transport_http_server.c:2553
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:866
-#: src/transport/plugin_transport_http_server.c:2318
+#: src/transport/plugin_transport_http_server.c:2321
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Lỗi lưu cấu hình."
 
 #: src/transport/plugin_transport_http.c:898
-#: src/transport/plugin_transport_http_server.c:2350 src/util/service.c:1053
+#: src/transport/plugin_transport_http_server.c:2353 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
 #: src/transport/plugin_transport_http.c:915
-#: src/transport/plugin_transport_http_server.c:2367 src/util/service.c:1070
+#: src/transport/plugin_transport_http_server.c:2370 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
 #: src/transport/plugin_transport_http.c:1020
-#: src/transport/plugin_transport_http_server.c:2478
+#: src/transport/plugin_transport_http_server.c:2481
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1133
-#: src/transport/plugin_transport_http_server.c:2646
+#: src/transport/plugin_transport_http_server.c:2649
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1146
-#: src/transport/plugin_transport_http_server.c:2657
+#: src/transport/plugin_transport_http_server.c:2660
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
@@ -5210,7 +5452,7 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1223
-#: src/transport/plugin_transport_http_server.c:2739
+#: src/transport/plugin_transport_http_server.c:2742
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
@@ -5219,25 +5461,25 @@
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1509
+#: src/transport/plugin_transport_http_client.c:1515
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1640
-#: src/transport/plugin_transport_http_server.c:2863
+#: src/transport/plugin_transport_http_client.c:1646
+#: src/transport/plugin_transport_http_server.c:2866
 #, 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:1665
-#: src/transport/plugin_transport_http_server.c:2922
+#: src/transport/plugin_transport_http_client.c:1671
+#: src/transport/plugin_transport_http_server.c:2925
 #, 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:1693
-#: src/transport/plugin_transport_http_server.c:2769
+#: src/transport/plugin_transport_http_client.c:1699
+#: src/transport/plugin_transport_http_server.c:2772
 #, 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"
@@ -5249,63 +5491,63 @@
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1597
+#: src/transport/plugin_transport_http_server.c:1600
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1605
+#: src/transport/plugin_transport_http_server.c:1608
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1906
+#: src/transport/plugin_transport_http_server.c:1909
 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:1930
+#: src/transport/plugin_transport_http_server.c:1933
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2625
+#: src/transport/plugin_transport_http_server.c:2628
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2639
+#: src/transport/plugin_transport_http_server.c:2642
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2664
+#: src/transport/plugin_transport_http_server.c:2667
 #, 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:2679
+#: src/transport/plugin_transport_http_server.c:2682
 #, 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:2689
+#: src/transport/plugin_transport_http_server.c:2692
 #, 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:2710
+#: src/transport/plugin_transport_http_server.c:2713
 #, 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:2720
+#: src/transport/plugin_transport_http_server.c:2723
 #, 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:2755
+#: src/transport/plugin_transport_http_server.c:2758
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "không quyết định các tên máy"
@@ -5361,16 +5603,16 @@
 #: src/transport/plugin_transport_tcp.c:856
 #: src/transport/plugin_transport_tcp.c:906
 #: src/transport/plugin_transport_tcp.c:992
-#: src/transport/plugin_transport_tcp.c:1132
-#: src/transport/plugin_transport_tcp.c:1149
+#: src/transport/plugin_transport_tcp.c:1135
+#: src/transport/plugin_transport_tcp.c:1152
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
 #: src/transport/plugin_transport_tcp.c:774
 #: src/transport/plugin_transport_tcp.c:963
-#: src/transport/plugin_transport_tcp.c:1817
-#: src/transport/plugin_transport_tcp.c:2436
+#: src/transport/plugin_transport_tcp.c:1820
+#: src/transport/plugin_transport_tcp.c:2439
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
@@ -5390,49 +5632,54 @@
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1342
+#: src/transport/plugin_transport_tcp.c:1109
+#, c-format
+msgid "Trying to send with invalid session %p\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1345
 #, 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:1457
+#: src/transport/plugin_transport_tcp.c:1460
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1858
+#: src/transport/plugin_transport_tcp.c:1861
 #, 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:2032
+#: src/transport/plugin_transport_tcp.c:2035
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:2102
+#: src/transport/plugin_transport_tcp.c:2105
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2326 src/util/service.c:948
+#: src/transport/plugin_transport_tcp.c:2329 src/util/service.c:948
 #: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2340
+#: src/transport/plugin_transport_tcp.c:2343
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2424
+#: src/transport/plugin_transport_tcp.c:2427
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2428
+#: src/transport/plugin_transport_tcp.c:2431
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2432
+#: src/transport/plugin_transport_tcp.c:2435
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5452,14 +5699,14 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2345
+#: src/transport/plugin_transport_udp.c:2517
 #, 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:2359
+#: src/transport/plugin_transport_udp.c:2531
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5467,17 +5714,17 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2600
+#: src/transport/plugin_transport_udp.c:2772
 #, 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:2676
+#: src/transport/plugin_transport_udp.c:2848
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2719
+#: src/transport/plugin_transport_udp.c:2891
 #, 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"
@@ -5638,7 +5885,7 @@
 msgid "Failure to transmit request to service `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/client.c:1168
+#: src/util/client.c:1177
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -5697,12 +5944,12 @@
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/util/configuration.c:263
+#: src/util/configuration.c:291
 #, fuzzy, c-format
-msgid "Syntax error while deserializing operation at line %u\n"
+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:949
+#: src/util/configuration.c:998
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -5744,14 +5991,14 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:448 src/util/crypto_rsa.c:644
+#: src/util/crypto_ecc.c:448
 #, 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:463 src/util/crypto_rsa.c:661
+#: src/util/crypto_ecc.c:463 src/util/crypto_rsa.c:660
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
@@ -5759,22 +6006,22 @@
 msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
 
 #: src/util/crypto_ecc.c:559 src/util/crypto_ecc.c:603
-#: src/util/crypto_rsa.c:759 src/util/crypto_rsa.c:803
+#: src/util/crypto_rsa.c:757 src/util/crypto_rsa.c:801
 #, 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:564 src/util/crypto_rsa.c:764
+#: src/util/crypto_ecc.c:564 src/util/crypto_rsa.c:762
 #, 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:607 src/util/crypto_rsa.c:807
-#: src/util/crypto_rsa.c:843
+#: src/util/crypto_ecc.c:607 src/util/crypto_rsa.c:805
+#: src/util/crypto_rsa.c:841
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:638 src/util/crypto_rsa.c:838
+#: src/util/crypto_ecc.c:638 src/util/crypto_rsa.c:836
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
@@ -5784,12 +6031,12 @@
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:658 src/util/crypto_rsa.c:858
+#: src/util/crypto_ecc.c:658 src/util/crypto_rsa.c:856
 #, 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:780 src/util/crypto_rsa.c:946
+#: src/util/crypto_ecc.c:780 src/util/crypto_rsa.c:941
 msgid "interrupted by shutdown"
 msgstr ""
 
@@ -5817,31 +6064,38 @@
 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:957
+#: src/util/crypto_rsa.c:644
+#, 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:952
 msgid "gnunet-rsa failed"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1348
+#: src/util/crypto_rsa.c:1343
 #, 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:567
+#: src/util/disk.c:601
 #, 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:1171
+#: src/util/disk.c:1205
 #, 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:1525 src/util/service.c:1667
+#: src/util/disk.c:1559 src/util/service.c:1669
 #, 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:1897
+#: src/util/disk.c:1931
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
@@ -6083,14 +6337,14 @@
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:417
+#: src/util/os_installation.c:420
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:699
+#: src/util/os_installation.c:702
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
@@ -6125,17 +6379,17 @@
 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:251 src/util/service.c:1789
+#: src/util/program.c:254 src/util/service.c:1791
 #, 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"
 
-#: src/util/pseudonym.c:276
+#: src/util/pseudonym.c:282
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Lỗi phân tích dữ liệu giao diện từ « %s ».\n"
 
-#: src/util/pseudonym.c:407 src/util/pseudonym.c:433
+#: src/util/pseudonym.c:413 src/util/pseudonym.c:439
 msgid "no-name"
 msgstr "không-tên"
 
@@ -6165,11 +6419,11 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/scheduler.c:781
+#: src/util/scheduler.c:782
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:911
+#: src/util/scheduler.c:912
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
@@ -6279,38 +6533,38 @@
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1523
+#: src/util/service.c:1525
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/service.c:1556
+#: src/util/service.c:1558
 #, 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:1605
+#: src/util/service.c:1607
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1609
+#: src/util/service.c:1611
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1613
+#: src/util/service.c:1615
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1668
+#: src/util/service.c:1670
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/util/service.c:1681
+#: src/util/service.c:1683
 #, 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:1747
+#: src/util/service.c:1749
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6583,6 +6837,12 @@
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
 #, fuzzy
+#~ msgid ""
+#~ "provide inthe 'struct GNUNET_TRANSPORT_PeerIterateContextformation about "
+#~ "all tunnels (continuously)"
+#~ 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"
 
@@ -7055,10 +7315,6 @@
 #~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
 #, fuzzy
-#~ msgid "Offering HELLO of peer %s to peer %s\n"
-#~ msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
-
-#, fuzzy
 #~ msgid "Failed during blacklist file copying!\n"
 #~ msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
@@ -7967,9 +8223,6 @@
 #~ msgid "output in gnuplot format"
 #~ msgstr "kết xuất theo định dạng gnuplot"
 
-#~ msgid "number of iterations"
-#~ msgstr "số lần lặp lại"
-
 #~ msgid "number of messages to use per iteration"
 #~ msgstr "số tin nhắn cần dùng mỗi lần lặp"
 
@@ -8294,9 +8547,6 @@
 #~ msgstr ""
 #~ "Gặp kiểu không rõ trong thông báo nhúng từ « %s »: %u (kích cỡ : %u)\n"
 
-#~ msgid "# sessions established"
-#~ msgstr "# các phiên chạy được thiết lập"
-
 #~ msgid "automate creation of a namespace by starting a collection"
 #~ msgstr "tự động tạo một không gian tên bằng cách bắt đầu một thu thập"
 

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2012-12-21 16:29:06 UTC (rev 25634)
+++ gnunet/po/zh_CN.po  2012-12-21 16:48:59 UTC (rev 25635)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-11-26 14:59+0100\n"
+"POT-Creation-Date: 2012-12-21 16:05+0100\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -70,78 +70,78 @@
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:230
+#: src/arm/gnunet-arm.c:229
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "连接 %s:%u 出错。守护程序在运行吗?\n"
 
-#: src/arm/gnunet-arm.c:233
+#: src/arm/gnunet-arm.c:232
 msgid "Running services:\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:263 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:385
-msgid "Fatal error initializing ARM API.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:287
+#: src/arm/gnunet-arm.c:253
 #, fuzzy, c-format
 msgid "Failed to remove configuration file %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/arm/gnunet-arm.c:293
+#: src/arm/gnunet-arm.c:259
 #, c-format
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:416
+#: src/arm/gnunet-arm.c:306 src/arm/gnunet-arm.c:389 src/arm/gnunet-arm.c:406
+msgid "Fatal error initializing ARM API.\n"
+msgstr ""
+
+#: src/arm/gnunet-arm.c:435
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:418
+#: src/arm/gnunet-arm.c:437
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:420
+#: src/arm/gnunet-arm.c:439
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:422
+#: src/arm/gnunet-arm.c:441
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:425
+#: src/arm/gnunet-arm.c:444
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:428
+#: src/arm/gnunet-arm.c:447
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:430
+#: src/arm/gnunet-arm.c:449
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:433
+#: src/arm/gnunet-arm.c:452
 #, fuzzy
 msgid "timeout in MSECS milliseconds for completing current operation"
 msgstr "等待一次迭代完成的时间(毫秒)"
 
-#: src/arm/gnunet-arm.c:435
+#: src/arm/gnunet-arm.c:454
 msgid "list currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:437
+#: src/arm/gnunet-arm.c:456
 msgid "don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:439
+#: src/arm/gnunet-arm.c:458
 msgid "don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:450
+#: src/arm/gnunet-arm.c:469
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -164,65 +164,65 @@
 msgid "Could not send list result to client\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/arm/gnunet-service-arm.c:536
+#: src/arm/gnunet-service-arm.c:537
 #, fuzzy, c-format
 msgid "Unable to create socket for service `%s': %s\n"
 msgstr "无法创建用户账户:"
 
-#: src/arm/gnunet-service-arm.c:558
+#: src/arm/gnunet-service-arm.c:559
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:572
+#: src/arm/gnunet-service-arm.c:573
 #, c-format
 msgid "ARM now monitors connections to service `%s' at `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:680
+#: src/arm/gnunet-service-arm.c:681
 #, c-format
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:891
+#: src/arm/gnunet-service-arm.c:892
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:984
+#: src/arm/gnunet-service-arm.c:985
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:989
+#: src/arm/gnunet-service-arm.c:990
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:994
+#: src/arm/gnunet-service-arm.c:995
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:1000
+#: src/arm/gnunet-service-arm.c:1001
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-service-arm.c:1035
+#: src/arm/gnunet-service-arm.c:1036
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1227
+#: src/arm/gnunet-service-arm.c:1228
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-service-arm.c:1238
+#: src/arm/gnunet-service-arm.c:1239
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1252
+#: src/arm/gnunet-service-arm.c:1253
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -241,93 +241,134 @@
 msgid "Received last message for %s \n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:134
+#: src/ats/gnunet-service-ats_addresses.c:983
 #, c-format
+msgid "Outbound quota configure for network `%s' is unlimited (%llu)\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:989
+#: src/ats/gnunet-service-ats_addresses.c:1014
+#, c-format
+msgid ""
+"Could not convert quota configure for network `%s':  `%s', assigning default "
+"bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:997
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1007
+#, c-format
+msgid "Inbound quota configure for network `%s' is unlimited (%llu)\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses.c:1022
+#, c-format
+msgid ""
+"No inbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:141
+#, c-format
 msgid "%u address resolutions had a timeout\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:136
+#: src/ats-tool/gnunet-ats.c:143
 #, c-format
 msgid "ATS returned results for %u addresses\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:190
+#: src/ats-tool/gnunet-ats.c:198
 #, c-format
 msgid ""
 "Peer `%s' plugin `%s', address `%s', bw out: %u Bytes/s, bw in %u Bytes/s, "
 "%s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:274 src/namestore/gnunet-namestore.c:610
+#: src/ats-tool/gnunet-ats.c:324
+#, c-format
+msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:343 src/namestore/gnunet-namestore.c:610
 #: src/transport/gnunet-transport.c:744
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "服务已删除。\n"
 
-#: src/ats-tool/gnunet-ats.c:284 src/transport/gnunet-transport.c:750
+#: src/ats-tool/gnunet-ats.c:353 src/transport/gnunet-transport.c:750
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/ats-tool/gnunet-ats.c:292
+#: src/ats-tool/gnunet-ats.c:361
 #, c-format
-msgid "Please select one operation : %s or %s or %s or %s\n"
+msgid "Please select one operation : %s or %s or %s or %s or %s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:305 src/ats-tool/gnunet-ats.c:324
-#: src/ats-tool/gnunet-ats.c:341 src/ats-tool/gnunet-ats.c:366
+#: src/ats-tool/gnunet-ats.c:377 src/ats-tool/gnunet-ats.c:396
+#: src/ats-tool/gnunet-ats.c:413 src/ats-tool/gnunet-ats.c:438
 #, fuzzy, c-format
 msgid "Cannot connect to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:314 src/ats-tool/gnunet-ats.c:331
+#: src/ats-tool/gnunet-ats.c:386 src/ats-tool/gnunet-ats.c:403
 #, fuzzy, c-format
 msgid "Cannot issue request to ATS service, exiting...\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/ats-tool/gnunet-ats.c:359
+#: src/ats-tool/gnunet-ats.c:431
 msgid "Type required\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:416
+#: src/ats-tool/gnunet-ats.c:488
 msgid "get list of active addresses currently used"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:419
+#: src/ats-tool/gnunet-ats.c:491
 msgid "get list of all active addresses"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:422
+#: src/ats-tool/gnunet-ats.c:494
 #, fuzzy
 msgid "do not resolve IP addresses to hostnames"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/ats-tool/gnunet-ats.c:425
+#: src/ats-tool/gnunet-ats.c:497
 msgid "monitor mode"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:428
+#: src/ats-tool/gnunet-ats.c:500
 #, fuzzy
 msgid "set preference for the given peer"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/ats-tool/gnunet-ats.c:431
+#: src/ats-tool/gnunet-ats.c:503
+msgid "print all configured quotas"
+msgstr ""
+
+#: src/ats-tool/gnunet-ats.c:506
 msgid "peer id"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:434
+#: src/ats-tool/gnunet-ats.c:509
 msgid "preference type to set: latency | bandwidth"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:437
+#: src/ats-tool/gnunet-ats.c:512
 msgid "preference value"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:440
+#: src/ats-tool/gnunet-ats.c:515
 msgid "verbose output (include ATS address properties)"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:449
+#: src/ats-tool/gnunet-ats.c:524
 #, fuzzy
 msgid "Print information about ATS state"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -337,6 +378,41 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
+#: src/consensus/gnunet-consensus.c:230
+msgid "session identifier"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-ibf.c:176
+#, fuzzy
+msgid "number of element in set A-B"
+msgstr "迭代次数"
+
+#: src/consensus/gnunet-consensus-ibf.c:179
+#, fuzzy
+msgid "number of element in set B-A"
+msgstr "迭代次数"
+
+#: src/consensus/gnunet-consensus-ibf.c:182
+msgid "number of common elements in A and B"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-ibf.c:185
+msgid "hash num"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-ibf.c:188
+msgid "ibf size"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-start-peers.c:158
+msgid "start peers with the given template configuration"
+msgstr ""
+
+#: src/consensus/gnunet-consensus-start-peers.c:161
+#, fuzzy
+msgid "number of peers to start"
+msgstr "迭代次数"
+
 #: src/core/core_api.c:755
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
@@ -362,7 +438,7 @@
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:131
+#: src/core/gnunet-core.c:174 src/mesh/gnunet-mesh.c:176
 #: src/peerinfo-tool/gnunet-peerinfo.c:541
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
@@ -554,11 +630,11 @@
 #: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1544
 #: src/topology/gnunet-daemon-topology.c:704
 #: src/topology/gnunet-daemon-topology.c:805
-#: src/transport/gnunet-service-transport_neighbours.c:874
-#: src/transport/gnunet-service-transport_neighbours.c:1091
-#: src/transport/gnunet-service-transport_neighbours.c:1100
-#: src/transport/gnunet-service-transport_neighbours.c:2637
-#: src/transport/gnunet-service-transport_neighbours.c:2899
+#: src/transport/gnunet-service-transport_neighbours.c:1047
+#: src/transport/gnunet-service-transport_neighbours.c:1267
+#: src/transport/gnunet-service-transport_neighbours.c:1276
+#: src/transport/gnunet-service-transport_neighbours.c:2815
+#: src/transport/gnunet-service-transport_neighbours.c:3078
 msgid "# peers connected"
 msgstr ""
 
@@ -894,6 +970,11 @@
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
+#: src/datastore/plugin_datastore_heap.c:820
+#, fuzzy
+msgid "Heap database running\n"
+msgstr "sqlite 数据仓库"
+
 #: src/datastore/plugin_datastore_mysql.c:780
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
@@ -951,7 +1032,7 @@
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/datastore/plugin_datastore_template.c:241
+#: src/datastore/plugin_datastore_template.c:257
 msgid "Template database running\n"
 msgstr ""
 
@@ -1003,7 +1084,7 @@
 
 #: 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:733
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:736
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
 #: src/nse/gnunet-nse-profiler.c:1033
 msgid "be verbose (print progress information)"
@@ -1290,12 +1371,12 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:110
+#: src/dns/dnsparser.c:152
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/dns/dnsparser.c:584
+#: src/dns/dnsparser.c:626
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -1306,7 +1387,7 @@
 msgstr "找不到主机“%s”的 IP:%s\n"
 
 #: src/dns/dnsstub.c:295 src/dns/dnsstub.c:383
-#: src/gns/gnunet-service-gns_resolver.c:1620
+#: src/gns/gnunet-service-gns_resolver.c:1621
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -1391,12 +1472,12 @@
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1281 src/exit/gnunet-daemon-exit.c:3025
+#: src/dns/gnunet-service-dns.c:1283 src/exit/gnunet-daemon-exit.c:3026
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1302
+#: src/dns/gnunet-service-dns.c:1305
 #, fuzzy
 msgid "need a valid IPv4 or IPv6 address\n"
 msgstr "无效的进程优先级“%s”\n"
@@ -1564,35 +1645,35 @@
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3042
+#: src/exit/gnunet-daemon-exit.c:3043
 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:3050
+#: src/exit/gnunet-daemon-exit.c:3051
 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:3057
+#: src/exit/gnunet-daemon-exit.c:3058
 msgid ""
 "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
 "ENABLE_IPv4=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3063
+#: src/exit/gnunet-daemon-exit.c:3064
 msgid ""
 "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
 "ENABLE_IPv6=YES\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3069 src/pt/gnunet-daemon-pt.c:884
+#: src/exit/gnunet-daemon-exit.c:3070 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3255
+#: src/exit/gnunet-daemon-exit.c:3274
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -1644,76 +1725,76 @@
 msgid "# fragmentation transmissions completed"
 msgstr ""
 
-#: src/fs/fs_api.c:450
+#: src/fs/fs_api.c:465
 #, fuzzy, c-format
 msgid "Could not open file `%s': %s"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:459
+#: src/fs/fs_api.c:474
 #, fuzzy, c-format
 msgid "Could not read file `%s': %s"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/fs_api.c:465
+#: src/fs/fs_api.c:480
 #, c-format
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1046
+#: src/fs/fs_api.c:1061
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:1505
+#: 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:1547
+#: src/fs/fs_api.c:1562
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1563
+#: src/fs/fs_api.c:1578
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2213
+#: src/fs/fs_api.c:2228
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2223
+#: src/fs/fs_api.c:2238
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2348 src/fs/fs_api.c:2588
+#: src/fs/fs_api.c:2363 src/fs/fs_api.c:2603
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2365
+#: src/fs/fs_api.c:2380
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2378 src/fs/fs_api.c:2397 src/fs/fs_api.c:2881
+#: src/fs/fs_api.c:2393 src/fs/fs_api.c:2412 src/fs/fs_api.c:2896
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2579
+#: src/fs/fs_api.c:2594
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2825
+#: src/fs/fs_api.c:2840
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2919
+#: src/fs/fs_api.c:2934
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -1914,7 +1995,7 @@
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_search.c:830
+#: src/fs/fs_search.c:892
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2084,24 +2165,24 @@
 msgstr ""
 
 #: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:279
-#: src/fs/gnunet-publish.c:680
+#: src/fs/gnunet-publish.c:683
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:684
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:687
 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:687
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:690
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:711
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:714
 msgid "specify the priority of the content"
 msgstr ""
 
 #: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:304
-#: src/fs/gnunet-publish.c:718
+#: src/fs/gnunet-publish.c:721
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2109,6 +2190,10 @@
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
+#: src/fs/gnunet-daemon-fsprofiler.c:656
+msgid "Daemon to use file-sharing to measure its performance."
+msgstr ""
+
 #: src/fs/gnunet-directory.c:49
 #, c-format
 msgid "\t<original file embedded in %u bytes of meta data>\n"
@@ -2171,7 +2256,7 @@
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:192
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:195
 #: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
@@ -2182,7 +2267,7 @@
 msgid "You need to specify a URI argument.\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:626
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:629
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "运行 %s失败:%s %d\n"
@@ -2195,7 +2280,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:604
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:607
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2243,6 +2328,22 @@
 msgid "Special file-sharing operations"
 msgstr ""
 
+#: src/fs/gnunet-fs-profiler.c:182
+msgid "run the experiment with COUNT peers"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:185
+msgid "specifies name of a file with the HOSTS the testbed should use"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:188
+msgid "automatically terminate experiment after DELAY"
+msgstr ""
+
+#: src/fs/gnunet-fs-profiler.c:197
+msgid "run a testbed to measure file-sharing performance"
+msgstr ""
+
 #: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:283
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
@@ -2268,7 +2369,7 @@
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:699
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:702
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
@@ -2296,170 +2397,170 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:149
+#: src/fs/gnunet-publish.c:152
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:156
+#: src/fs/gnunet-publish.c:159
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:166
+#: src/fs/gnunet-publish.c:169
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:170
+#: src/fs/gnunet-publish.c:173
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:189
+#: src/fs/gnunet-publish.c:192
 msgid "Cleanup after abort complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:307
+#: src/fs/gnunet-publish.c:310
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-publish.c:309
+#: src/fs/gnunet-publish.c:312
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-publish.c:360 src/fs/gnunet-publish.c:614
+#: 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:435
+#: src/fs/gnunet-publish.c:438
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/fs/gnunet-publish.c:462
+#: src/fs/gnunet-publish.c:465
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:493
+#: src/fs/gnunet-publish.c:496
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:495
+#: src/fs/gnunet-publish.c:498
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-publish.c:500
+#: src/fs/gnunet-publish.c:503
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:505
+#: src/fs/gnunet-publish.c:508
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:509
+#: src/fs/gnunet-publish.c:512
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-publish.c:513
+#: src/fs/gnunet-publish.c:516
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:520
+#: src/fs/gnunet-publish.c:523
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/gnunet-publish.c:554
+#: src/fs/gnunet-publish.c:557
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:561
+#: src/fs/gnunet-publish.c:564
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:567
+#: src/fs/gnunet-publish.c:570
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:575 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:578 src/vpn/gnunet-vpn.c:214
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:585 src/fs/gnunet-publish.c:592
+#: src/fs/gnunet-publish.c:588 src/fs/gnunet-publish.c:595
 #: src/transport/gnunet-transport.c:774 src/transport/gnunet-transport.c:804
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:647
+#: 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:659
+#: 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:691
+#: src/fs/gnunet-publish.c:694
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:695
+#: src/fs/gnunet-publish.c:698
 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:702
+#: src/fs/gnunet-publish.c:705
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:707
+#: src/fs/gnunet-publish.c:710
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:715
+#: src/fs/gnunet-publish.c:718
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:721
+#: src/fs/gnunet-publish.c:724
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:725
+#: src/fs/gnunet-publish.c:728
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:729
+#: src/fs/gnunet-publish.c:732
 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:745
+#: src/fs/gnunet-publish.c:748
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2506,8 +2607,8 @@
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:628 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1321
-#: src/topology/gnunet-daemon-topology.c:1328
+#: src/topology/gnunet-daemon-topology.c:1322
+#: src/topology/gnunet-daemon-topology.c:1329
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -2639,8 +2740,7 @@
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:364
-#: src/fs/gnunet-service-fs_lc.c:490
+#: src/fs/gnunet-service-fs_lc.c:202 src/fs/gnunet-service-fs_lc.c:369
 msgid "# client searches active"
 msgstr ""
 
@@ -2648,11 +2748,11 @@
 msgid "# replies received for local clients"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:323
+#: src/fs/gnunet-service-fs_lc.c:328
 msgid "# client searches received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_lc.c:358
+#: src/fs/gnunet-service-fs_lc.c:363
 msgid "# client searches updated (merged content seen list)"
 msgstr ""
 
@@ -2660,136 +2760,136 @@
 msgid "# average retransmission delay (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:397
+#: src/fs/gnunet-service-fs_pe.c:400
 msgid "# transmission failed (core has no bandwidth)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:426
+#: src/fs/gnunet-service-fs_pe.c:433
 msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:475
+#: src/fs/gnunet-service-fs_pe.c:482
 msgid "# delay heap timeout"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:483
+#: src/fs/gnunet-service-fs_pe.c:490
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:543
+#: src/fs/gnunet-service-fs_pe.c:550
 msgid "# requests merged"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:551
+#: src/fs/gnunet-service-fs_pe.c:558
 msgid "# requests refreshed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:605 src/fs/gnunet-service-fs_pe.c:689
-#: src/fs/gnunet-service-fs_pe.c:760
+#: src/fs/gnunet-service-fs_pe.c:612 src/fs/gnunet-service-fs_pe.c:696
+#: src/fs/gnunet-service-fs_pe.c:767
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:299
+#: src/fs/gnunet-service-fs_pr.c:312
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:391 src/fs/gnunet-service-fs_pr.c:654
+#: src/fs/gnunet-service-fs_pr.c:404 src/fs/gnunet-service-fs_pr.c:667
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:822
+#: src/fs/gnunet-service-fs_pr.c:835
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:855
+#: src/fs/gnunet-service-fs_pr.c:868
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:864
+#: src/fs/gnunet-service-fs_pr.c:877
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:878
+#: src/fs/gnunet-service-fs_pr.c:891
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:891
+#: src/fs/gnunet-service-fs_pr.c:904
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1012
+#: src/fs/gnunet-service-fs_pr.c:1025
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1039
+#: src/fs/gnunet-service-fs_pr.c:1052
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1074
+#: src/fs/gnunet-service-fs_pr.c:1087
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1203
+#: src/fs/gnunet-service-fs_pr.c:1221
 msgid "# Replies received from STREAM"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1255
+#: src/fs/gnunet-service-fs_pr.c:1273
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1275
+#: src/fs/gnunet-service-fs_pr.c:1293
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1322
+#: src/fs/gnunet-service-fs_pr.c:1340
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1337
+#: src/fs/gnunet-service-fs_pr.c:1355
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1346
+#: src/fs/gnunet-service-fs_pr.c:1364
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1361
+#: src/fs/gnunet-service-fs_pr.c:1379
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1375
+#: src/fs/gnunet-service-fs_pr.c:1393
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1388
+#: src/fs/gnunet-service-fs_pr.c:1406
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1393
+#: src/fs/gnunet-service-fs_pr.c:1411
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1420 src/fs/gnunet-service-fs_pr.c:1460
-#: src/fs/gnunet-service-fs_pr.c:1601
+#: src/fs/gnunet-service-fs_pr.c:1438 src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1619
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1478
+#: src/fs/gnunet-service-fs_pr.c:1496
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1489
+#: src/fs/gnunet-service-fs_pr.c:1507
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1577
+#: src/fs/gnunet-service-fs_pr.c:1595
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1662
+#: src/fs/gnunet-service-fs_pr.c:1680
 msgid "# GAP PUT messages received"
 msgstr ""
 
@@ -2797,6 +2897,34 @@
 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"
@@ -2999,6 +3127,11 @@
 msgid "Unable to initialize resolver!\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
+#: src/gns/gnunet-service-gns_resolver.c:3439
+#, c-format
+msgid "Not a GADS TLD: `%s'\n"
+msgstr ""
+
 #: src/hello/gnunet-hello.c:118
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3033,36 +3166,36 @@
 msgid "Error writing HELLO to file `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/hello/hello.c:905
+#: src/hello/hello.c:904
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:914
+#: src/hello/hello.c:913
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:924
+#: src/hello/hello.c:923
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/hello/hello.c:934
+#: src/hello/hello.c:933
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:951
+#: src/hello/hello.c:950
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:960
+#: src/hello/hello.c:959
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:979
+#: src/hello/hello.c:978
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -3360,10 +3493,10 @@
 #: src/mesh/gnunet-daemon-regexprofiler.c:209
 #: src/mesh/gnunet-daemon-regexprofiler.c:222
 #: src/mesh/gnunet-daemon-regexprofiler.c:235
-#: src/mesh/gnunet-service-mesh.c:8692 src/mesh/gnunet-service-mesh.c:8704
-#: src/mesh/gnunet-service-mesh.c:8716 src/mesh/gnunet-service-mesh.c:8730
-#: src/mesh/gnunet-service-mesh.c:8742 src/mesh/gnunet-service-mesh.c:8754
-#: src/mesh/gnunet-service-mesh.c:8766 src/mesh/gnunet-service-mesh-new.c:8292
+#: src/mesh/gnunet-service-mesh.c:8931 src/mesh/gnunet-service-mesh.c:8943
+#: src/mesh/gnunet-service-mesh.c:8955 src/mesh/gnunet-service-mesh.c:8969
+#: src/mesh/gnunet-service-mesh.c:8981 src/mesh/gnunet-service-mesh.c:8993
+#: src/mesh/gnunet-service-mesh.c:9005 src/mesh/gnunet-service-mesh-new.c:8292
 #: src/mesh/gnunet-service-mesh-new.c:8304
 #: src/mesh/gnunet-service-mesh-new.c:8316
 #: src/mesh/gnunet-service-mesh-new.c:8329
@@ -3379,168 +3512,190 @@
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:162
-msgid ""
-"provide inthe 'struct GNUNET_TRANSPORT_PeerIterateContextformation about all "
-"tunnels (continuously)"
+#: src/mesh/gnunet-mesh.c:211
+msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
 msgstr ""
 
-#: src/mesh/gnunet-mesh.c:173
+#: src/mesh/gnunet-mesh.c:214
 #, fuzzy
+msgid "provide information about a particular tunnel"
+msgstr "无法获取有关用户“%s”的信息:%s\n"
+
+#: src/mesh/gnunet-mesh.c:224
+#, fuzzy
 msgid "Print information about mesh tunnels and peers."
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1147
-#: src/testbed/gnunet-testbed-profiler.c:320
+#: src/mesh/gnunet-regex-profiler.c:1162
+#: src/testbed/gnunet-testbed-profiler.c:333
 msgid "An operation has failed while starting peers\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1193
-#: src/testbed/gnunet-testbed-profiler.c:389
+#: src/mesh/gnunet-regex-profiler.c:1208
+#: src/testbed/gnunet-testbed-profiler.c:402
 #, fuzzy, c-format
 msgid "Creating a peer failed. Error: %s\n"
 msgstr "“%s”以错误码 %d 失败:%s\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1320
-#: src/testbed/gnunet-testbed-profiler.c:494
+#: src/mesh/gnunet-regex-profiler.c:1335
+#: src/testbed/gnunet-testbed-profiler.c:507
 msgid "An operation has failed while starting slaves\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1342
+#: src/mesh/gnunet-regex-profiler.c:1357
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1397
+#: src/mesh/gnunet-regex-profiler.c:1412
 msgid "An operation has failed while linking\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1508
-#: src/testbed/gnunet-testbed-profiler.c:598
+#: src/mesh/gnunet-regex-profiler.c:1523
+#: src/testbed/gnunet-testbed-profiler.c:611
+#: src/testbed/testbed_api_testbed.c:735
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1588
-#: src/testbed/gnunet-testbed-profiler.c:677
+#: src/mesh/gnunet-regex-profiler.c:1604
+#: src/testbed/gnunet-testbed-profiler.c:690
 msgid "Unable to connect to master controller -- Check config\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1687
+#: src/mesh/gnunet-regex-profiler.c:1706
+#: src/testbed/gnunet-testbed-profiler.c:723
+#: src/testbed/testbed_api_testbed.c:858
 #, c-format
+msgid "Host %s cannot start testbed\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1709
+#: src/testbed/gnunet-testbed-profiler.c:726
+#: src/testbed/testbed_api_testbed.c:861
+msgid "Testbed cannot be started on localhost\n"
+msgstr ""
+
+#: src/mesh/gnunet-regex-profiler.c:1749
+#, c-format
 msgid "No hosts-file specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1692
+#: src/mesh/gnunet-regex-profiler.c:1754
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1698
-#: src/testbed/gnunet-testbed-profiler.c:717
+#: src/mesh/gnunet-regex-profiler.c:1760
+#: src/testbed/gnunet-testbed-profiler.c:776
+#: src/testbed/testbed_api_testbed.c:942
 #, c-format
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1705
-#: src/testbed/gnunet-testbed-profiler.c:724
-#: src/testbed/testbed_api_testbed.c:759
+#: src/mesh/gnunet-regex-profiler.c:1763
+#: src/testbed/gnunet-testbed-profiler.c:779
 #, c-format
-msgid "Host %s cannot start testbed\n"
+msgid "Checking whether given hosts can start testbed. Please wait\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1712
-#: src/testbed/gnunet-testbed-profiler.c:731
+#: src/mesh/gnunet-regex-profiler.c:1784
+#: src/testbed/gnunet-testbed-profiler.c:800
 #, fuzzy, c-format
 msgid "Exiting\n"
 msgstr "退出"
 
-#: src/mesh/gnunet-regex-profiler.c:1718
+#: src/mesh/gnunet-regex-profiler.c:1790
 #, c-format
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1727
+#: src/mesh/gnunet-regex-profiler.c:1799
 #, fuzzy, c-format
 msgid "Configuration option (regex_prefix) missing. Exiting\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1745
+#: src/mesh/gnunet-regex-profiler.c:1817
 #: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1752
+#: src/mesh/gnunet-regex-profiler.c:1824
 #, c-format
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1760
+#: src/mesh/gnunet-regex-profiler.c:1832
 #, c-format
 msgid ""
 "Error loading search strings. Given file does not contain enough strings. "
 "Exiting.\n"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1766
+#: src/mesh/gnunet-regex-profiler.c:1838
 #, fuzzy, c-format
 msgid "Error loading search strings. Exiting.\n"
 msgstr "创建用户出错"
 
-#: src/mesh/gnunet-regex-profiler.c:1800
+#: src/mesh/gnunet-regex-profiler.c:1865
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/mesh/gnunet-regex-profiler.c:1803
+#: src/mesh/gnunet-regex-profiler.c:1868
 msgid "create COUNT number of random links between peers"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1806
+#: src/mesh/gnunet-regex-profiler.c:1871
 msgid "wait TIMEOUT before considering a string match as failed"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1809
+#: src/mesh/gnunet-regex-profiler.c:1874
 msgid "wait DELAY before starting string search"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1812
+#: src/mesh/gnunet-regex-profiler.c:1877
 msgid "number of search strings to read from search strings file"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1815
+#: src/mesh/gnunet-regex-profiler.c:1880
 #: src/regex/gnunet-regex-simulation-profiler.c:692
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1818
+#: src/mesh/gnunet-regex-profiler.c:1883
 msgid ""
 "if this option is set, only one peer is responsible for searching all strings"
 msgstr ""
 
-#: src/mesh/gnunet-regex-profiler.c:1830
+#: src/mesh/gnunet-regex-profiler.c:1895
 msgid "Profiler for regex/mesh"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8398 src/mesh/gnunet-service-mesh-new.c:7998
+#: src/mesh/gnunet-service-mesh.c:8625 src/mesh/gnunet-service-mesh-new.c:7998
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8603 src/mesh/gnunet-service-mesh-new.c:8203
-#, fuzzy
-msgid "Mesh service could not access hostkey.  Exiting.\n"
+#: src/mesh/gnunet-service-mesh.c:8842
+#, fuzzy, c-format
+msgid "Mesh service could not access hostkey: %s. Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/mesh/gnunet-service-mesh.c:8778 src/mesh/gnunet-service-mesh.c:8789
-#: src/mesh/gnunet-service-mesh-new.c:8380
+#: src/mesh/gnunet-service-mesh.c:9017 src/mesh/gnunet-service-mesh.c:9027
+#: src/mesh/gnunet-service-mesh.c:9038 src/mesh/gnunet-service-mesh-new.c:8380
 #: src/mesh/gnunet-service-mesh-new.c:8391
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
 msgstr "立即保存配置?"
 
+#: src/mesh/gnunet-service-mesh-new.c:8203
+#, fuzzy
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -3756,42 +3911,42 @@
 msgid "Protocol error"
 msgstr ""
 
-#: src/namestore/namestore_common.c:509 src/namestore/namestore_common.c:649
+#: src/namestore/namestore_common.c:530 src/namestore/namestore_common.c:670
 #, fuzzy, c-format
 msgid "Unsupported record type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/namestore_common.c:516
+#: src/namestore/namestore_common.c:537
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/namestore/namestore_common.c:539
+#: src/namestore/namestore_common.c:560
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/namestore_common.c:562
+#: src/namestore/namestore_common.c:583
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/namestore_common.c:580
+#: src/namestore/namestore_common.c:601
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/namestore/namestore_common.c:593
+#: src/namestore/namestore_common.c:614
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/namestore_common.c:614
+#: src/namestore/namestore_common.c:635
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/namestore_common.c:640
+#: src/namestore/namestore_common.c:661
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -3810,6 +3965,60 @@
 msgid "GNUnet NAT traversal test helper daemon"
 msgstr ""
 
+#: src/nat/nat_auto.c:169
+msgid "NAT traversal with ICMP Server timed out.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:199
+msgid "NAT traversal with ICMP Server succeeded.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:200
+msgid "NAT traversal with ICMP Server failed.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:219
+msgid "Testing connection reversal with ICMP server.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:265
+#, c-format
+msgid "Detected external IP `%s'\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:331
+msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:347
+#, fuzzy, c-format
+msgid "Detected internal network address `%s'.\n"
+msgstr "GNUnet 现在使用 IP 地址 %s。\n"
+
+#: src/nat/nat_auto.c:400
+msgid "upnpc found, enabling its use\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:401
+msgid "upnpc not found\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:434
+msgid "gnunet-helper-nat-server found, testing it\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:435
+msgid "No working gnunet-helper-nat-server found\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:469
+msgid "gnunet-helper-nat-client found, enabling it\n"
+msgstr ""
+
+#: src/nat/nat_auto.c:470
+msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
+msgstr ""
+
 #: src/nat/nat.c:795
 #, c-format
 msgid "gnunet-helper-nat-server generated malformed address `%s'\n"
@@ -3898,11 +4107,6 @@
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-service-nse.c:938
-#, c-format
-msgid "Proof of work invalid: %llu!\n"
-msgstr ""
-
 #: src/nse/gnunet-service-nse.c:1389
 #, fuzzy, c-format
 msgid "NSE service could not access hostkey: %s\n"
@@ -4217,126 +4421,165 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:706
+#: src/sysmon/gnunet-service-sysmon.c:381
 #, c-format
+msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:732
+#, c-format
+msgid "\rChecked %u hosts"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:736
+#, c-format
+msgid ""
+"\n"
+"All hosts can start testbed. Creating peers\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:765
+#, c-format
 msgid "No hosts-file specified on command line\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:780
+#: src/testbed/gnunet-testbed-profiler.c:842
 msgid "Only `CLIQUE' and `RANDOM' are permitted.\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:795
+#: src/testbed/gnunet-testbed-profiler.c:857
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:798
+#: src/testbed/gnunet-testbed-profiler.c:860
 msgid "create COUNT number of random links"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:801
+#: src/testbed/gnunet-testbed-profiler.c:863
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:804
+#: src/testbed/gnunet-testbed-profiler.c:866
 msgid ""
 "Try to acheive TOPOLOGY. This options takes either CLIQUE or RANDOM. For "
 "CLIQUE the parameter -n is ignored. The default is to acheive a random graph "
 "topology."
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:819
+#: src/testbed/gnunet-testbed-profiler.c:881
 msgid "Profiler for testbed"
 msgstr ""
 
+#: src/testbed/ll_master.c:57
+#, c-format
+msgid "Job command file not given. Exiting\n"
+msgstr ""
+
 #: src/testbed/testbed_api.c:320
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "“%s”以错误码 %d 失败:%s\n"
 
-#: src/testbed/testbed_api_hosts.c:326
+#: src/testbed/testbed_api_hosts.c:313
 #, c-format
 msgid "Hosts file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:334
+#: src/testbed/testbed_api_hosts.c:321
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:341
+#: src/testbed/testbed_api_hosts.c:328
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:320
+#: src/testbed/testbed_api_testbed.c:354
 msgid "Some operations are still pending. Cancelling them\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:580
+#: src/testbed/testbed_api_testbed.c:557
+msgid "Linking controllers failed. Exiting"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:886
+msgid "Cannot start the master controller"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:966
+msgid "Specified topology must be supported by testbed"
+msgstr ""
+
+#: src/testbed/testbed_api_topology.c:582
 #, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:586
+#: src/testbed/testbed_api_topology.c:588
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:592
+#: src/testbed/testbed_api_topology.c:594
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:614
+#: src/testbed/testbed_api_topology.c:617
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testbed/testbed_api_topology.c:623
-#: src/testbed/testbed_api_topology.c:648
+#: src/testbed/testbed_api_topology.c:626
+#: src/testbed/testbed_api_topology.c:651
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:629
-#: src/testbed/testbed_api_topology.c:654
+#: src/testbed/testbed_api_topology.c:632
+#: src/testbed/testbed_api_topology.c:657
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testbed/testbed_api_topology.c:635
-#: src/testbed/testbed_api_topology.c:660
-msgid "Topology file need more peers than the given ones\n"
+#: src/testbed/testbed_api_topology.c:638
+#: src/testbed/testbed_api_topology.c:663
+msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:131
+#: src/testbed/testbed_api_topology.c:679
 #, fuzzy, c-format
+msgid "Ignoring to connect peer %u to peer %u\n"
+msgstr "无法连接到 %s:%u:%s\n"
+
+#: src/testing/gnunet-testing.c:132
+#, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/gnunet-testing.c:202
+#: src/testing/gnunet-testing.c:203
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/testing/gnunet-testing.c:204
+#: src/testing/gnunet-testing.c:205
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:206
+#: src/testing/gnunet-testing.c:207
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr "打印配置文件中的一个值到标准输出"
 
-#: src/testing/gnunet-testing.c:208
+#: src/testing/gnunet-testing.c:209
 #, fuzzy
 msgid "configuration template"
 msgstr "配置已保存"
 
-#: src/testing/gnunet-testing.c:217
+#: src/testing/gnunet-testing.c:218
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -4354,59 +4597,59 @@
 msgid "name of the service to run"
 msgstr ""
 
-#: src/testing/testing.c:199
+#: src/testing/testing.c:211
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:215
+#: src/testing/testing.c:227
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:526
+#: src/testing/testing.c:541
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:536
+#: src/testing/testing.c:551
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/testing/testing.c:850
+#: src/testing/testing.c:865
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:861
+#: src/testing/testing.c:876
 #, 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:875
+#: src/testing/testing.c:890
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:908
+#: src/testing/testing.c:923
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:926
+#: src/testing/testing.c:941
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:997
+#: src/testing/testing.c:1014
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/testing/testing.c:1202
+#: src/testing/testing.c:1219
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -4428,119 +4671,114 @@
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1033
+#: src/topology/gnunet-daemon-topology.c:1034
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1040
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1048
+#: src/topology/gnunet-daemon-topology.c:1049
 #, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1056
+#: src/topology/gnunet-daemon-topology.c:1057
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1076
+#: src/topology/gnunet-daemon-topology.c:1077
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1089
+#: src/topology/gnunet-daemon-topology.c:1090
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1099
+#: src/topology/gnunet-daemon-topology.c:1100
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1105
+#: src/topology/gnunet-daemon-topology.c:1106
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1115
+#: src/topology/gnunet-daemon-topology.c:1116
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1121
+#: src/topology/gnunet-daemon-topology.c:1122
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1128
+#: src/topology/gnunet-daemon-topology.c:1129
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1163
+#: src/topology/gnunet-daemon-topology.c:1164
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1218
+#: src/topology/gnunet-daemon-topology.c:1219
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1357
+#: src/topology/gnunet-daemon-topology.c:1358
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:245
+#: src/transport/gnunet-service-transport_blacklist.c:246
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:251
-#, c-format
-msgid "Blacklist file `%s' is empty.\n"
-msgstr ""
-
-#: src/transport/gnunet-service-transport_blacklist.c:262
+#: src/transport/gnunet-service-transport_blacklist.c:263
 #, fuzzy, c-format
 msgid "Failed to read blacklist from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:283
-#: src/transport/gnunet-service-transport_blacklist.c:307
+#: src/transport/gnunet-service-transport_blacklist.c:284
+#: src/transport/gnunet-service-transport_blacklist.c:308
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:294
-#: src/transport/gnunet-service-transport_blacklist.c:330
+#: src/transport/gnunet-service-transport_blacklist.c:295
+#: src/transport/gnunet-service-transport_blacklist.c:331
 #, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:344
+#: src/transport/gnunet-service-transport_blacklist.c:345
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:358
+#: src/transport/gnunet-service-transport_blacklist.c:359
 #, c-format
 msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:513
-#: src/transport/gnunet-service-transport_blacklist.c:751
+#: src/transport/gnunet-service-transport_blacklist.c:514
+#: src/transport/gnunet-service-transport_blacklist.c:752
 msgid "# disconnects due to blacklist"
 msgstr ""
 
@@ -4591,101 +4829,101 @@
 msgid "# refreshed my HELLO"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1042
+#: src/transport/gnunet-service-transport_neighbours.c:1218
 msgid "# DISCONNECT messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1172
-#: src/transport/gnunet-service-transport_neighbours.c:1509
+#: src/transport/gnunet-service-transport_neighbours.c:1348
+#: src/transport/gnunet-service-transport_neighbours.c:1685
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1177
+#: src/transport/gnunet-service-transport_neighbours.c:1353
 msgid "# messages transmitted to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1182
+#: src/transport/gnunet-service-transport_neighbours.c:1358
 msgid "# transmission failures for messages to other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1239
+#: src/transport/gnunet-service-transport_neighbours.c:1415
 msgid "# messages timed out while in transport queue"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1281
+#: src/transport/gnunet-service-transport_neighbours.c:1457
 msgid "# keepalives sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1305
+#: src/transport/gnunet-service-transport_neighbours.c:1481
 msgid "# KEEPALIVE messages discarded (peer unknown)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1313
+#: src/transport/gnunet-service-transport_neighbours.c:1489
 msgid "# KEEPALIVE messages discarded (no session)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1350
+#: src/transport/gnunet-service-transport_neighbours.c:1526
 msgid "# KEEPALIVE_RESPONSE messages discarded (not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1359
+#: src/transport/gnunet-service-transport_neighbours.c:1535
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1415
+#: src/transport/gnunet-service-transport_neighbours.c:1591
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1449
+#: src/transport/gnunet-service-transport_neighbours.c:1625
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1465
+#: src/transport/gnunet-service-transport_neighbours.c:1641
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2613
+#: src/transport/gnunet-service-transport_neighbours.c:2791
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2628
-#: src/transport/gnunet-service-transport_neighbours.c:2662
+#: src/transport/gnunet-service-transport_neighbours.c:2806
+#: src/transport/gnunet-service-transport_neighbours.c:2840
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2675
+#: src/transport/gnunet-service-transport_neighbours.c:2853
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2708
+#: src/transport/gnunet-service-transport_neighbours.c:2886
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2892
+#: src/transport/gnunet-service-transport_neighbours.c:3071
 msgid "# unexpected SESSION ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2947
+#: src/transport/gnunet-service-transport_neighbours.c:3126
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2961
+#: src/transport/gnunet-service-transport_neighbours.c:3140
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2992
+#: src/transport/gnunet-service-transport_neighbours.c:3171
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3003
+#: src/transport/gnunet-service-transport_neighbours.c:3182
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3034
+#: src/transport/gnunet-service-transport_neighbours.c:3213
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3129
+#: src/transport/gnunet-service-transport_neighbours.c:3308
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -4883,41 +5121,41 @@
 msgstr "初始化“%s”服务失败。\n"
 
 #: src/transport/plugin_transport_http.c:817
-#: src/transport/plugin_transport_http_server.c:2550
+#: src/transport/plugin_transport_http_server.c:2553
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:866
-#: src/transport/plugin_transport_http_server.c:2318
+#: src/transport/plugin_transport_http_server.c:2321
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
 #: src/transport/plugin_transport_http.c:898
-#: src/transport/plugin_transport_http_server.c:2350 src/util/service.c:1053
+#: src/transport/plugin_transport_http_server.c:2353 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
 #: src/transport/plugin_transport_http.c:915
-#: src/transport/plugin_transport_http_server.c:2367 src/util/service.c:1070
+#: src/transport/plugin_transport_http_server.c:2370 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #: src/transport/plugin_transport_http.c:1020
-#: src/transport/plugin_transport_http_server.c:2478
+#: src/transport/plugin_transport_http_server.c:2481
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1133
-#: src/transport/plugin_transport_http_server.c:2646
+#: src/transport/plugin_transport_http_server.c:2649
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1146
-#: src/transport/plugin_transport_http_server.c:2657
+#: src/transport/plugin_transport_http_server.c:2660
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
@@ -4943,7 +5181,7 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1223
-#: src/transport/plugin_transport_http_server.c:2739
+#: src/transport/plugin_transport_http_server.c:2742
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
@@ -4952,25 +5190,25 @@
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1509
+#: src/transport/plugin_transport_http_client.c:1515
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1640
-#: src/transport/plugin_transport_http_server.c:2863
+#: src/transport/plugin_transport_http_client.c:1646
+#: src/transport/plugin_transport_http_server.c:2866
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:1665
-#: src/transport/plugin_transport_http_server.c:2922
+#: src/transport/plugin_transport_http_client.c:1671
+#: src/transport/plugin_transport_http_server.c:2925
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1693
-#: src/transport/plugin_transport_http_server.c:2769
+#: src/transport/plugin_transport_http_client.c:1699
+#: src/transport/plugin_transport_http_server.c:2772
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
@@ -4982,63 +5220,63 @@
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1597
+#: src/transport/plugin_transport_http_server.c:1600
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1605
+#: src/transport/plugin_transport_http_server.c:1608
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1906
+#: src/transport/plugin_transport_http_server.c:1909
 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:1930
+#: src/transport/plugin_transport_http_server.c:1933
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2625
+#: src/transport/plugin_transport_http_server.c:2628
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2639
+#: src/transport/plugin_transport_http_server.c:2642
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2664
+#: src/transport/plugin_transport_http_server.c:2667
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2679
+#: src/transport/plugin_transport_http_server.c:2682
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2689
+#: src/transport/plugin_transport_http_server.c:2692
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2710
+#: src/transport/plugin_transport_http_server.c:2713
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2720
+#: src/transport/plugin_transport_http_server.c:2723
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2755
+#: src/transport/plugin_transport_http_server.c:2758
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
@@ -5094,15 +5332,15 @@
 #: src/transport/plugin_transport_tcp.c:856
 #: src/transport/plugin_transport_tcp.c:906
 #: src/transport/plugin_transport_tcp.c:992
-#: src/transport/plugin_transport_tcp.c:1132
-#: src/transport/plugin_transport_tcp.c:1149
+#: src/transport/plugin_transport_tcp.c:1135
+#: src/transport/plugin_transport_tcp.c:1152
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
 #: src/transport/plugin_transport_tcp.c:774
 #: src/transport/plugin_transport_tcp.c:963
-#: src/transport/plugin_transport_tcp.c:1817
-#: src/transport/plugin_transport_tcp.c:2436
+#: src/transport/plugin_transport_tcp.c:1820
+#: src/transport/plugin_transport_tcp.c:2439
 msgid "# TCP sessions active"
 msgstr ""
 
@@ -5118,48 +5356,53 @@
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1342
+#: src/transport/plugin_transport_tcp.c:1109
 #, c-format
+msgid "Trying to send with invalid session %p\n"
+msgstr ""
+
+#: src/transport/plugin_transport_tcp.c:1345
+#, c-format
 msgid "Address of unexpected length: %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1457
+#: src/transport/plugin_transport_tcp.c:1460
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1858
+#: src/transport/plugin_transport_tcp.c:1861
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2032
+#: src/transport/plugin_transport_tcp.c:2035
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2102
+#: src/transport/plugin_transport_tcp.c:2105
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2326 src/util/service.c:948
+#: src/transport/plugin_transport_tcp.c:2329 src/util/service.c:948
 #: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2340
+#: src/transport/plugin_transport_tcp.c:2343
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2424
+#: src/transport/plugin_transport_tcp.c:2427
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2428
+#: src/transport/plugin_transport_tcp.c:2431
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2432
+#: src/transport/plugin_transport_tcp.c:2435
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5177,14 +5420,14 @@
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2345
+#: src/transport/plugin_transport_udp.c:2517
 #, 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:2359
+#: src/transport/plugin_transport_udp.c:2531
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5192,17 +5435,17 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2600
+#: src/transport/plugin_transport_udp.c:2772
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_udp.c:2676
+#: src/transport/plugin_transport_udp.c:2848
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2719
+#: src/transport/plugin_transport_udp.c:2891
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
@@ -5352,7 +5595,7 @@
 msgid "Failure to transmit request to service `%s'\n"
 msgstr ""
 
-#: src/util/client.c:1168
+#: src/util/client.c:1177
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
@@ -5409,12 +5652,12 @@
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/util/configuration.c:263
+#: src/util/configuration.c:291
 #, fuzzy, c-format
-msgid "Syntax error while deserializing operation at line %u\n"
+msgid "Syntax error while deserializing in line %u\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/util/configuration.c:949
+#: src/util/configuration.c:998
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -5454,14 +5697,14 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:448 src/util/crypto_rsa.c:644
+#: src/util/crypto_ecc.c:448
 #, 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:463 src/util/crypto_rsa.c:661
+#: src/util/crypto_ecc.c:463 src/util/crypto_rsa.c:660
 #, c-format
 msgid ""
 "File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
@@ -5469,22 +5712,22 @@
 msgstr ""
 
 #: src/util/crypto_ecc.c:559 src/util/crypto_ecc.c:603
-#: src/util/crypto_rsa.c:759 src/util/crypto_rsa.c:803
+#: src/util/crypto_rsa.c:757 src/util/crypto_rsa.c:801
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/crypto_ecc.c:564 src/util/crypto_rsa.c:764
+#: src/util/crypto_ecc.c:564 src/util/crypto_rsa.c:762
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_ecc.c:607 src/util/crypto_rsa.c:807
-#: src/util/crypto_rsa.c:843
+#: src/util/crypto_ecc.c:607 src/util/crypto_rsa.c:805
+#: src/util/crypto_rsa.c:841
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:638 src/util/crypto_rsa.c:838
+#: src/util/crypto_ecc.c:638 src/util/crypto_rsa.c:836
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
@@ -5494,12 +5737,12 @@
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:658 src/util/crypto_rsa.c:858
+#: src/util/crypto_ecc.c:658 src/util/crypto_rsa.c:856
 #, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:780 src/util/crypto_rsa.c:946
+#: src/util/crypto_ecc.c:780 src/util/crypto_rsa.c:941
 msgid "interrupted by shutdown"
 msgstr ""
 
@@ -5527,31 +5770,38 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/util/crypto_rsa.c:957
+#: src/util/crypto_rsa.c:644
+#, 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:952
 msgid "gnunet-rsa failed"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1348
+#: src/util/crypto_rsa.c:1343
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:567
+#: src/util/disk.c:601
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/disk.c:1171
+#: src/util/disk.c:1205
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录!\n"
 
-#: src/util/disk.c:1525 src/util/service.c:1667
+#: src/util/disk.c:1559 src/util/service.c:1669
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/util/disk.c:1897
+#: src/util/disk.c:1931
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
@@ -5790,14 +6040,14 @@
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:417
+#: src/util/os_installation.c:420
 #, fuzzy, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr "无法确定安装路径。请尝试设置“%s”\n"
 
-#: src/util/os_installation.c:699
+#: src/util/os_installation.c:702
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
@@ -5832,17 +6082,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/program.c:251 src/util/service.c:1789
+#: src/util/program.c:254 src/util/service.c:1791
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/pseudonym.c:276
+#: src/util/pseudonym.c:282
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/util/pseudonym.c:407 src/util/pseudonym.c:433
+#: src/util/pseudonym.c:413 src/util/pseudonym.c:439
 msgid "no-name"
 msgstr "无名称"
 
@@ -5872,11 +6122,11 @@
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/scheduler.c:781
+#: src/util/scheduler.c:782
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:911
+#: src/util/scheduler.c:912
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
@@ -5986,38 +6236,38 @@
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1523
+#: src/util/service.c:1525
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/util/service.c:1556
+#: src/util/service.c:1558
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1605
+#: src/util/service.c:1607
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1609
+#: src/util/service.c:1611
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1613
+#: src/util/service.c:1615
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1668
+#: src/util/service.c:1670
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/util/service.c:1681
+#: src/util/service.c:1683
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”:%s\n"
 
-#: src/util/service.c:1747
+#: src/util/service.c:1749
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6567,12 +6817,6 @@
 #~ msgid "Failed during blacklist file copying!\n"
 #~ msgstr "解析配置文件“%s”失败\n"
 
-#, fuzzy
-#~ msgid "# fast reconnects failed"
-#~ msgstr ""
-#~ "\n"
-#~ "按任意键继续\n"
-
 #~ msgid "Unknown user `%s'\n"
 #~ msgstr "未知的用户“%s”\n"
 
@@ -7179,9 +7423,6 @@
 #~ msgid "output in gnuplot format"
 #~ msgstr "以 gnuplot 格式输出"
 
-#~ msgid "number of iterations"
-#~ msgstr "迭代次数"
-
 #~ msgid "number of messages to use per iteration"
 #~ msgstr "每次迭代所使用的消息数量"
 




reply via email to

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