gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r26909 - in gnunet: . po src src/consensus src/set


From: gnunet
Subject: [GNUnet-SVN] r26909 - in gnunet: . po src src/consensus src/set
Date: Tue, 16 Apr 2013 20:32:56 +0200

Author: dold
Date: 2013-04-16 20:32:56 +0200 (Tue, 16 Apr 2013)
New Revision: 26909

Added:
   gnunet/src/set/
   gnunet/src/set/Makefile.am
   gnunet/src/set/gnunet-service-set.c
   gnunet/src/set/gnunet-set.c
   gnunet/src/set/ibf.c
   gnunet/src/set/ibf.h
   gnunet/src/set/set.conf.in
   gnunet/src/set/set_api.c
   gnunet/src/set/strata_estimator.c
   gnunet/src/set/strata_estimator.h
   gnunet/src/set/test_set.conf
   gnunet/src/set/test_set_api.c
Modified:
   gnunet/configure.ac
   gnunet/po/POTFILES.in
   gnunet/po/de.po
   gnunet/po/es.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
   gnunet/src/Makefile.am
   gnunet/src/consensus/gnunet-service-consensus.c
Log:
added skeleton for gnunet set


Modified: gnunet/configure.ac
===================================================================
--- gnunet/configure.ac 2013-04-16 18:01:29 UTC (rev 26908)
+++ gnunet/configure.ac 2013-04-16 18:32:56 UTC (rev 26909)
@@ -1243,6 +1243,8 @@
 src/postgres/Makefile
 src/pt/Makefile
 src/regex/Makefile
+src/set/Makefile
+src/set/set.conf
 src/statistics/Makefile
 src/statistics/statistics.conf
 src/stream/Makefile

Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2013-04-16 18:01:29 UTC (rev 26908)
+++ gnunet/po/POTFILES.in       2013-04-16 18:32:56 UTC (rev 26909)
@@ -1,4 +1,5 @@
 src/arm/arm_api.c
+src/arm/arm_monitor_api.c
 src/arm/do_start_process.c
 src/arm/gnunet-arm.c
 src/arm/gnunet-service-arm.c
@@ -22,6 +23,7 @@
 src/consensus/gnunet-consensus-start-peers.c
 src/consensus/gnunet-service-consensus.c
 src/consensus/ibf.c
+src/consensus/strata_estimator.c
 src/core/core_api.c
 src/core/core_api_is_connected.c
 src/core/core_api_iterate_peers.c
@@ -66,6 +68,7 @@
 src/dns/gnunet-service-dns.c
 src/dns/plugin_block_dns.c
 src/dv/dv_api.c
+src/dv/gnunet-dv.c
 src/dv/gnunet-service-dv.c
 src/dv/plugin_transport_dv.c
 src/exit/gnunet-daemon-exit.c
@@ -82,6 +85,7 @@
 src/fs/fs_list_indexed.c
 src/fs/fs_misc.c
 src/fs/fs_namespace.c
+src/fs/fs_pseudonym.c
 src/fs/fs_publish.c
 src/fs/fs_publish_ksk.c
 src/fs/fs_search.c
@@ -182,6 +186,11 @@
 src/regex/regex_graph.c
 src/regex/regex_random.c
 src/regex/regex_test_lib.c
+src/set/gnunet-service-set.c
+src/set/gnunet-set.c
+src/set/ibf.c
+src/set/set_api.c
+src/set/strata_estimator.c
 src/statistics/gnunet-service-statistics.c
 src/statistics/gnunet-statistics.c
 src/statistics/statistics_api.c
@@ -193,7 +202,10 @@
 src/testbed/gnunet_mpi_test.c
 src/testbed/gnunet-service-testbed.c
 src/testbed/gnunet-service-testbed_cache.c
+src/testbed/gnunet-service-testbed_cpustatus.c
+src/testbed/gnunet-service-testbed_links.c
 src/testbed/gnunet-service-testbed_oc.c
+src/testbed/gnunet-service-testbed_peers.c
 src/testbed/gnunet_testbed_ll_master.c
 src/testbed/gnunet_testbed_ll_monitor.c
 src/testbed/gnunet_testbed_mpi_spawn.c
@@ -284,7 +296,6 @@
 src/util/peer.c
 src/util/plugin.c
 src/util/program.c
-src/util/pseudonym.c
 src/util/resolver_api.c
 src/util/scheduler.c
 src/util/server.c

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2013-04-16 18:01:29 UTC (rev 26908)
+++ gnunet/po/de.po     2013-04-16 18:32:56 UTC (rev 26909)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-02-05 19:22+0100\n"
+"POT-Creation-Date: 2013-03-06 00:28+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"
@@ -247,38 +247,88 @@
 msgid "Received last message for %s \n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:993
-#: src/ats/gnunet-service-ats_addresses.c:1027
+#: src/ats/gnunet-service-ats_addresses.c:1176
+#: src/ats/gnunet-service-ats_addresses.c:1210
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:999
+#: src/ats/gnunet-service-ats_addresses.c:1182
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1006
+#: src/ats/gnunet-service-ats_addresses.c:1189
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1033
+#: src/ats/gnunet-service-ats_addresses.c:1216
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1040
+#: src/ats/gnunet-service-ats_addresses.c:1223
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
+#: src/ats/gnunet-service-ats_addresses_mlp.c:735
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1044
+#, fuzzy, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1226
+#, c-format
+msgid "Update for ATS type `%s' not implemented!\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1306
+#, c-format
+msgid "Updating address for peer `%s' not added before\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1726
+#, c-format
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1734
+#, c-format
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1744
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1752
+#, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1763
+#, c-format
+msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
+msgstr ""
+
 #: src/ats-tool/gnunet-ats.c:141
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -403,25 +453,25 @@
 msgid "consensus timeout"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/consensus/gnunet-consensus-ibf.c:176
+#: src/consensus/gnunet-consensus-ibf.c:217
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "Anzahl an Durchläufen"
 
-#: src/consensus/gnunet-consensus-ibf.c:179
+#: src/consensus/gnunet-consensus-ibf.c:220
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "Anzahl an Durchläufen"
 
-#: src/consensus/gnunet-consensus-ibf.c:182
+#: src/consensus/gnunet-consensus-ibf.c:223
 msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-ibf.c:185
+#: src/consensus/gnunet-consensus-ibf.c:226
 msgid "hash num"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-ibf.c:188
+#: src/consensus/gnunet-consensus-ibf.c:229
 msgid "ibf size"
 msgstr ""
 
@@ -475,23 +525,23 @@
 msgid "Print information about connected peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/core/gnunet-service-core.c:109
+#: src/core/gnunet-service-core.c:110
 #, fuzzy, c-format
-msgid "Failed to read hostkey: %s\n"
-msgstr "Fehler beim Starten der Collection.\n"
+msgid "Failed to read or generate private key: %s\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/core/gnunet-service-core.c:123
+#: src/core/gnunet-service-core.c:124
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:149
+#: src/core/gnunet-service-core.c:150
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/core/gnunet-service-core.c:163
-#: src/transport/gnunet-service-transport.c:737
+#: src/core/gnunet-service-core.c:164
+#: src/transport/gnunet-service-transport.c:725
 #, fuzzy
 msgid "Transport service is unable to access hostkey. Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -511,166 +561,178 @@
 msgid "# bytes of messages of type %u received"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:565
+#: src/core/gnunet-service-core_kx.c:532
 msgid "# bytes encrypted"
 msgstr "# Bytes verschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:617
+#: src/core/gnunet-service-core_kx.c:583
 msgid "# bytes decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:681 src/dv/gnunet-service-dv.c:3003
-#, fuzzy
-msgid "Error in communication with PEERINFO service\n"
-msgstr "Informationen über andere GNUnet Knoten ausgeben."
-
-#: src/core/gnunet-service-core_kx.c:700
-msgid "# Delayed connecting due to lack of public key"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:753
+#: src/core/gnunet-service-core_kx.c:667
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:775
+#: src/core/gnunet-service-core_kx.c:697
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:828
+#: src/core/gnunet-service-core_kx.c:761
+msgid "# old ephemeral keys ignored"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:767
 #, fuzzy
-msgid "# session keys received"
-msgstr "# Sitzungsschlüssel abgelehnt"
+msgid "# ephemeral keys received"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:845
-#, fuzzy, c-format
-msgid "`%s' is for `%s', not for me.  Ignoring.\n"
-msgstr "Größe der `%s' Nachricht ist zu kurz. Nachricht wird ignoriert.\n"
+#: src/core/gnunet-service-core_kx.c:803
+#, c-format
+msgid ""
+"Ephemeral key message rejected as its validity range does not match our "
+"system time (%llu not in [%llu,%llu]).\n"
+msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:890
+#: src/core/gnunet-service-core_kx.c:818
 #, fuzzy
-msgid "# SET_KEY messages decrypted"
+msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/core/gnunet-service-core_kx.c:977
-#: src/transport/gnunet-service-transport_validation.c:865
+#: src/core/gnunet-service-core_kx.c:921
+#: src/transport/gnunet-service-transport_validation.c:915
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1010
+#: src/core/gnunet-service-core_kx.c:929
+#, fuzzy
+msgid "# PING messages dropped (out of order)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/core/gnunet-service-core_kx.c:956
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:973
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:999
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1135
+#: src/core/gnunet-service-core_kx.c:1009
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1236
-#: src/transport/gnunet-service-transport_validation.c:1161
+#: src/core/gnunet-service-core_kx.c:1066
+#: src/transport/gnunet-service-transport_validation.c:1160
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1275
+#: src/core/gnunet-service-core_kx.c:1072
 #, fuzzy
+msgid "# PONG messages dropped (connection down)"
+msgstr "# verschlüsselter PONG Nachrichten empfangen"
+
+#: src/core/gnunet-service-core_kx.c:1077
+#, fuzzy
+msgid "# PONG messages dropped (out of order)"
+msgstr "# gap Anfragen verworfen: Kollision in RT"
+
+#: src/core/gnunet-service-core_kx.c:1107
+#, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1303
+#: src/core/gnunet-service-core_kx.c:1141
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1329
+#: src/core/gnunet-service-core_kx.c:1151
 #, fuzzy
+msgid "# timeouts prevented via PONG"
+msgstr "# Bytes empfangen über TCP"
+
+#: src/core/gnunet-service-core_kx.c:1158
+#, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1383
-#: src/core/gnunet-service-core_kx.c:1400
+#: src/core/gnunet-service-core_kx.c:1312
 #, fuzzy
-msgid "# SET_KEY and PING messages created"
-msgstr "# PING Nachrichten erstellt"
+msgid "# DATA message dropped (out of order)"
+msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1404
-msgid "# REKEY operations performed"
+#: src/core/gnunet-service-core_kx.c:1319
+#, c-format
+msgid ""
+"Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1539
-msgid "# failed to decrypt message (no session key)"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:1322
+#, fuzzy
+msgid "# sessions terminated by key expiration"
+msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1579
-#: src/core/gnunet-service-core_kx.c:1604
+#: src/core/gnunet-service-core_kx.c:1365
+#: src/core/gnunet-service-core_kx.c:1390
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1591
+#: src/core/gnunet-service-core_kx.c:1377
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1628
-#, fuzzy, c-format
-msgid "Message received far too old (%s). Content ignored.\n"
-msgstr "Empfangene Client-Nachricht ist ungültig.\n"
-
-#: src/core/gnunet-service-core_kx.c:1632
+#: src/core/gnunet-service-core_kx.c:1418
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von UDP (outgoing)"
 
-#: src/core/gnunet-service-core_kx.c:1640
+#: src/core/gnunet-service-core_kx.c:1426
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
 
-#: src/core/gnunet-service-core_kx.c:1703 src/hostlist/hostlist-server.c:552
-#: src/peerinfo-tool/gnunet-peerinfo.c:547
-#: src/transport/gnunet-service-transport.c:644
+#: src/core/gnunet-service-core_kx.c:1459
 #, fuzzy
-msgid "Could not access PEERINFO service.  Exiting.\n"
-msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+msgid "# PAYLOAD dropped (out of order)"
+msgstr "# Bytes verworfen von UDP (outgoing)"
 
 #: src/core/gnunet-service-core_neighbours.c:163
 #, fuzzy
 msgid "# sessions terminated by transport disconnect"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:334
+#: src/core/gnunet-service-core_neighbours.c:179
+#: src/core/gnunet-service-core_neighbours.c:333
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:247
+#: src/core/gnunet-service-core_neighbours.c:246
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:421
+#: src/core/gnunet-service-core_neighbours.c:420
 #, fuzzy, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/core/gnunet-service-core_sessions.c:206
-#: src/core/gnunet-service-core_sessions.c:269
+#: src/core/gnunet-service-core_sessions.c:210
+#: src/core/gnunet-service-core_sessions.c:280
 #: src/dht/gnunet-service-dht_neighbours.c:645
-#: src/dht/gnunet-service-dht_neighbours.c:703
-#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1544
+#: src/dht/gnunet-service-dht_neighbours.c:704
+#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1530
 #: src/topology/gnunet-daemon-topology.c:704
 #: src/topology/gnunet-daemon-topology.c:805
 #: src/transport/gnunet-service-transport_neighbours.c:1052
@@ -682,12 +744,12 @@
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
 
-#: src/core/gnunet-service-core_sessions.c:236
+#: src/core/gnunet-service-core_sessions.c:248
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/core/gnunet-service-core_sessions.c:406
+#: src/core/gnunet-service-core_sessions.c:417
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -755,7 +817,8 @@
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ecc.c:46
+#: src/namestore/plugin_namestore_sqlite.c:51
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:46
 #: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
 #: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
 #, c-format
@@ -1163,7 +1226,7 @@
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:736
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:1033
+#: src/nse/gnunet-nse-profiler.c:1037
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1333,93 +1396,93 @@
 msgid "# FIND PEER messages initiated"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:737
+#: src/dht/gnunet-service-dht_neighbours.c:738
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/dht/gnunet-service-dht_neighbours.c:792
+#: src/dht/gnunet-service-dht_neighbours.c:793
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:830
+#: src/dht/gnunet-service-dht_neighbours.c:831
 #, fuzzy
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1080
+#: src/dht/gnunet-service-dht_neighbours.c:1053
+#: src/dht/gnunet-service-dht_neighbours.c:1081
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1061
-#: src/dht/gnunet-service-dht_neighbours.c:1095
+#: src/dht/gnunet-service-dht_neighbours.c:1062
+#: src/dht/gnunet-service-dht_neighbours.c:1096
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1229
+#: src/dht/gnunet-service-dht_neighbours.c:1230
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1258
+#: src/dht/gnunet-service-dht_neighbours.c:1259
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1265
-#: src/dht/gnunet-service-dht_neighbours.c:1378
-#: src/dht/gnunet-service-dht_neighbours.c:1478
+#: src/dht/gnunet-service-dht_neighbours.c:1266
+#: src/dht/gnunet-service-dht_neighbours.c:1379
+#: src/dht/gnunet-service-dht_neighbours.c:1479
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1343
+#: src/dht/gnunet-service-dht_neighbours.c:1344
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1370
+#: src/dht/gnunet-service-dht_neighbours.c:1371
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1485
+#: src/dht/gnunet-service-dht_neighbours.c:1486
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1573
+#: src/dht/gnunet-service-dht_neighbours.c:1574
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1702
+#: src/dht/gnunet-service-dht_neighbours.c:1704
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1710
+#: src/dht/gnunet-service-dht_neighbours.c:1712
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1801
+#: src/dht/gnunet-service-dht_neighbours.c:1803
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1843
+#: src/dht/gnunet-service-dht_neighbours.c:1845
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1857
+#: src/dht/gnunet-service-dht_neighbours.c:1859
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1944
+#: src/dht/gnunet-service-dht_neighbours.c:1943
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Bytes empfangen über TCP"
@@ -1589,6 +1652,11 @@
 msgid "Failed to connect to the dv service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
+#: src/dv/gnunet-service-dv.c:3003
+#, fuzzy
+msgid "Error in communication with PEERINFO service\n"
+msgstr "Informationen über andere GNUnet Knoten ausgeben."
+
 #: src/dv/plugin_transport_dv.c:159
 #, fuzzy, c-format
 msgid "%s Received message from %s of type %d, distance %u!\n"
@@ -2018,53 +2086,48 @@
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/fs/fs_namespace_advertise.c:150
-#, fuzzy
-msgid "Unknown error"
-msgstr "Unbekannter Fehler"
-
-#: src/fs/fs_namespace_advertise.c:238 src/fs/fs_namespace_advertise.c:259
-#, fuzzy
-msgid "Failed to serialize meta data"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
-
-#: src/fs/fs_namespace_advertise.c:278
-#, fuzzy
-msgid "Failed to connect to datastore service"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/fs/fs_namespace.c:110
+#: src/fs/fs_namespace.c:104
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_namespace.c:132 src/fs/fs_namespace.c:220
+#: src/fs/fs_namespace.c:126 src/fs/fs_namespace.c:214
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
+#: src/fs/fs_namespace.c:240 src/fs/fs_namespace.c:284
+#: src/fs/fs_namespace.c:330
+msgid "Can't determine where namespace directory is\n"
+msgstr ""
+
 #: src/fs/fs_namespace.c:252
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/fs/fs_namespace.c:367
+#: src/fs/fs_namespace.c:296
 #, fuzzy, c-format
+msgid "Failed to read private key for namespace `%s'\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+
+#: src/fs/fs_namespace.c:467
+#, fuzzy, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 "Der Eintrag konnte dem Namespace `%s' nicht hinzugefügt werden (existiert "
 "er?)\n"
 
-#: src/fs/fs_namespace.c:558
-msgid "Identifiers or URI too long to create SBlock"
+#: src/fs/fs_namespace.c:659
+msgid "Identifiers or URI too long to create UBlock"
 msgstr ""
 
-#: src/fs/fs_namespace.c:593 src/fs/fs_publish_ksk.c:295
+#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:307
 #, fuzzy
 msgid "Internal error."
 msgstr "Unbekannter Fehler.\n"
 
-#: src/fs/fs_namespace.c:636
+#: src/fs/fs_namespace.c:747
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
@@ -2136,12 +2199,17 @@
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:258
+#: src/fs/fs_publish_ksk.c:269
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_search.c:892
+#: src/fs/fs_search.c:742
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s': %s\n"
+msgstr "Datei `%s' hat URI: %s\n"
+
+#: src/fs/fs_search.c:800
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2185,25 +2253,20 @@
 
 #: src/fs/fs_unindex.c:416
 #, fuzzy, c-format
-msgid "Failed to remove KBlock: %s\n"
+msgid "Failed to remove UBlock: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_unindex.c:506
-#, fuzzy, c-format
-msgid "Failed to parse URI `%s' from KBlock!\n"
-msgstr "Datei `%s' hat URI: %s\n"
-
-#: src/fs/fs_unindex.c:558 src/fs/fs_unindex.c:623
+#: src/fs/fs_unindex.c:566 src/fs/fs_unindex.c:633
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_unindex.c:636
+#: src/fs/fs_unindex.c:646
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:670
+#: src/fs/fs_unindex.c:680
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
@@ -2226,58 +2289,66 @@
 msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:373 src/fs/fs_uri.c:380
+#: src/fs/fs_uri.c:375
 msgid "Malformed SKS URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:424 src/fs/fs_uri.c:439
+#: src/fs/fs_uri.c:418 src/fs/fs_uri.c:433
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:569 src/fs/fs_uri.c:584 src/fs/fs_uri.c:594
-#: src/fs/fs_uri.c:622
+#: src/fs/fs_uri.c:563 src/fs/fs_uri.c:578 src/fs/fs_uri.c:588
+#: src/fs/fs_uri.c:616
 msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:604
+#: src/fs/fs_uri.c:598
 msgid "SKS URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:610
+#: src/fs/fs_uri.c:604
 msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:616
+#: src/fs/fs_uri.c:610
 msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:629
+#: src/fs/fs_uri.c:623
 msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:641
+#: src/fs/fs_uri.c:635
 msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:679
+#: src/fs/fs_uri.c:673
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:904
+#: src/fs/fs_uri.c:898
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/fs/fs_uri.c:910
+#: src/fs/fs_uri.c:904
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/fs/fs_uri.c:1115 src/fs/fs_uri.c:1142
+#: src/fs/fs_uri.c:944
+msgid "identifier is NULL!"
+msgstr ""
+
+#: src/fs/fs_uri.c:949
+msgid "identifier has zero length!"
+msgstr ""
+
+#: src/fs/fs_uri.c:1118 src/fs/fs_uri.c:1145
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1148
+#: src/fs/fs_uri.c:1151
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2315,7 +2386,7 @@
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:279
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:302
 #: src/fs/gnunet-publish.c:683
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
@@ -2332,7 +2403,7 @@
 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-auto-share.c:750 src/fs/gnunet-pseudonym.c:327
 #: src/fs/gnunet-publish.c:721
 msgid "set the desired replication LEVEL"
 msgstr ""
@@ -2496,26 +2567,26 @@
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:283
+#: src/fs/gnunet-pseudonym.c:178 src/statistics/gnunet-statistics.c:283
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/fs/gnunet-pseudonym.c:250 src/fs/gnunet-pseudonym.c:257
-#: src/fs/gnunet-pseudonym.c:259
+#: src/fs/gnunet-pseudonym.c:273 src/fs/gnunet-pseudonym.c:280
+#: src/fs/gnunet-pseudonym.c:282
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: Option `%s' ist mehrdeutig\n"
 
-#: src/fs/gnunet-pseudonym.c:282
+#: src/fs/gnunet-pseudonym.c:305
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:285
+#: src/fs/gnunet-pseudonym.c:308
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:288
+#: src/fs/gnunet-pseudonym.c:311
 #, fuzzy
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
@@ -2524,36 +2595,36 @@
 "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:702
+#: src/fs/gnunet-pseudonym.c:315 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 "
 "setzen"
 
-#: src/fs/gnunet-pseudonym.c:295
+#: src/fs/gnunet-pseudonym.c:318
 #, fuzzy
 msgid "print names of local namespaces"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/fs/gnunet-pseudonym.c:298
+#: src/fs/gnunet-pseudonym.c:321
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:301
+#: src/fs/gnunet-pseudonym.c:324
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:307
+#: src/fs/gnunet-pseudonym.c:330
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/fs/gnunet-pseudonym.c:310
+#: src/fs/gnunet-pseudonym.c:333
 #, fuzzy
 msgid "change rating of namespace ID by VALUE"
 msgstr "das Rating eines Namespaces setzen"
 
-#: src/fs/gnunet-pseudonym.c:322
+#: src/fs/gnunet-pseudonym.c:345
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2779,12 +2850,12 @@
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:309 src/fs/gnunet-service-fs.c:523
+#: src/fs/gnunet-service-fs.c:309 src/fs/gnunet-service-fs.c:521
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: src/fs/gnunet-service-fs.c:628 src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/fs/gnunet-service-fs.c:626 src/hostlist/gnunet-daemon-hostlist.c:297
 #: src/topology/gnunet-daemon-topology.c:1322
 #: src/topology/gnunet-daemon-topology.c:1329
 #, fuzzy, c-format
@@ -2810,7 +2881,7 @@
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1345
+#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P searches active"
 msgstr ""
 
@@ -2850,36 +2921,36 @@
 msgid "# requests done for a price (normal load)"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1170
+#: src/fs/gnunet-service-fs_cp.c:1169
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1204
+#: src/fs/gnunet-service-fs_cp.c:1203
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1227
+#: src/fs/gnunet-service-fs_cp.c:1226
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1288
+#: src/fs/gnunet-service-fs_cp.c:1276
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1314
+#: src/fs/gnunet-service-fs_cp.c:1300
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_cp.c:1343
+#: src/fs/gnunet-service-fs_cp.c:1329
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/fs/gnunet-service-fs_cp.c:1713
+#: src/fs/gnunet-service-fs_cp.c:1699
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
@@ -2988,113 +3059,113 @@
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:312
+#: src/fs/gnunet-service-fs_pr.c:310
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:404 src/fs/gnunet-service-fs_pr.c:667
+#: src/fs/gnunet-service-fs_pr.c:393 src/fs/gnunet-service-fs_pr.c:644
 #, fuzzy
 msgid "# Pending requests active"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pr.c:835
+#: src/fs/gnunet-service-fs_pr.c:812
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:868
+#: src/fs/gnunet-service-fs_pr.c:842
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:877
+#: src/fs/gnunet-service-fs_pr.c:851
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:891
+#: src/fs/gnunet-service-fs_pr.c:865
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:904
+#: src/fs/gnunet-service-fs_pr.c:878
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1025
+#: src/fs/gnunet-service-fs_pr.c:999
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1052
+#: src/fs/gnunet-service-fs_pr.c:1026
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/fs/gnunet-service-fs_pr.c:1087
+#: src/fs/gnunet-service-fs_pr.c:1061
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1221
+#: src/fs/gnunet-service-fs_pr.c:1189
 #, fuzzy
 msgid "# Replies received from STREAM"
 msgstr "# Bytes empfangen über HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1273
+#: src/fs/gnunet-service-fs_pr.c:1241
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1293
+#: src/fs/gnunet-service-fs_pr.c:1261
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1340
+#: src/fs/gnunet-service-fs_pr.c:1308
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1355
+#: src/fs/gnunet-service-fs_pr.c:1323
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1364
+#: src/fs/gnunet-service-fs_pr.c:1332
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1379
+#: src/fs/gnunet-service-fs_pr.c:1347
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1393
+#: src/fs/gnunet-service-fs_pr.c:1361
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1406
+#: src/fs/gnunet-service-fs_pr.c:1374
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1411
+#: src/fs/gnunet-service-fs_pr.c:1379
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1438 src/fs/gnunet-service-fs_pr.c:1478
-#: src/fs/gnunet-service-fs_pr.c:1619
+#: src/fs/gnunet-service-fs_pr.c:1406 src/fs/gnunet-service-fs_pr.c:1446
+#: src/fs/gnunet-service-fs_pr.c:1587
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1496
+#: src/fs/gnunet-service-fs_pr.c:1464
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1507
+#: src/fs/gnunet-service-fs_pr.c:1475
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1595
+#: src/fs/gnunet-service-fs_pr.c:1563
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1680
+#: src/fs/gnunet-service-fs_pr.c:1648
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -3468,14 +3539,14 @@
 #: src/hostlist/hostlist-client.c:469 src/hostlist/hostlist-client.c:680
 #: src/hostlist/hostlist-client.c:686 src/hostlist/hostlist-client.c:738
 #: src/hostlist/hostlist-client.c:747 src/hostlist/hostlist-client.c:868
-#: src/hostlist/hostlist-client.c:958 src/hostlist/hostlist-client.c:963
+#: src/hostlist/hostlist-client.c:960 src/hostlist/hostlist-client.c:965
 #: src/transport/plugin_transport_http_client.c:1052
 #: src/transport/plugin_transport_http_client.c:1067
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1325
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1327
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -3529,78 +3600,78 @@
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1035 src/hostlist/hostlist-client.c:1498
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1500
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1043
+#: src/hostlist/hostlist-client.c:1045
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1107 src/hostlist/hostlist-client.c:1123
+#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
 #, fuzzy
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/hostlist-client.c:1273
+#: src/hostlist/hostlist-client.c:1275
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:1277
+#: src/hostlist/hostlist-client.c:1279
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/hostlist/hostlist-client.c:1288
+#: src/hostlist/hostlist-client.c:1290
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-client.c:1321
+#: src/hostlist/hostlist-client.c:1323
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1323
+#: src/hostlist/hostlist-client.c:1325
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1368
+#: src/hostlist/hostlist-client.c:1370
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1375
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/hostlist-client.c:1397 src/hostlist/hostlist-client.c:1414
+#: src/hostlist/hostlist-client.c:1399 src/hostlist/hostlist-client.c:1416
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1409
+#: src/hostlist/hostlist-client.c:1411
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1463
+#: src/hostlist/hostlist-client.c:1465
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1475
+#: src/hostlist/hostlist-client.c:1477
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1487
+#: src/hostlist/hostlist-client.c:1489
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1491
+#: src/hostlist/hostlist-client.c:1493
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
@@ -3677,6 +3748,12 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
+#: src/hostlist/hostlist-server.c:552 src/peerinfo-tool/gnunet-peerinfo.c:547
+#: src/transport/gnunet-service-transport.c:632
+#, fuzzy
+msgid "Could not access PEERINFO service.  Exiting.\n"
+msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+
 #: src/hostlist/hostlist-server.c:562
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
@@ -3737,36 +3814,36 @@
 msgid "Print information about mesh tunnels and peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-service-mesh.c:8015 src/mesh/gnunet-service-mesh-new.c:8015
+#: src/mesh/gnunet-service-mesh.c:8010 src/mesh/gnunet-service-mesh-new.c:8015
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8232 src/mesh/gnunet-service-mesh-new.c:8232
+#: src/mesh/gnunet-service-mesh.c:8227 src/mesh/gnunet-service-mesh-new.c:8232
 #, 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:8314 src/mesh/gnunet-service-mesh.c:8326
-#: src/mesh/gnunet-service-mesh.c:8338 src/mesh/gnunet-service-mesh.c:8352
-#: src/mesh/gnunet-service-mesh.c:8364 src/mesh/gnunet-service-mesh.c:8376
-#: src/mesh/gnunet-service-mesh.c:8388 src/mesh/gnunet-service-mesh-new.c:8321
+#: src/mesh/gnunet-service-mesh.c:8309 src/mesh/gnunet-service-mesh.c:8321
+#: src/mesh/gnunet-service-mesh.c:8333 src/mesh/gnunet-service-mesh.c:8347
+#: src/mesh/gnunet-service-mesh.c:8359 src/mesh/gnunet-service-mesh.c:8371
+#: src/mesh/gnunet-service-mesh.c:8383 src/mesh/gnunet-service-mesh-new.c:8321
 #: src/mesh/gnunet-service-mesh-new.c:8333
 #: src/mesh/gnunet-service-mesh-new.c:8345
 #: src/mesh/gnunet-service-mesh-new.c:8359
 #: src/mesh/gnunet-service-mesh-new.c:8371
 #: src/mesh/gnunet-service-mesh-new.c:8383
-#: src/mesh/gnunet-service-mesh-new.c:8395
-#: src/regex/gnunet-daemon-regexprofiler.c:335
-#: src/regex/gnunet-daemon-regexprofiler.c:347
-#: src/regex/gnunet-daemon-regexprofiler.c:360
-#: src/regex/gnunet-daemon-regexprofiler.c:373
+#: src/mesh/gnunet-service-mesh-new.c:8395 src/nse/gnunet-service-nse.c:1478
+#: src/nse/gnunet-service-nse.c:1496
+#: src/regex/gnunet-daemon-regexprofiler.c:277
+#: src/regex/gnunet-daemon-regexprofiler.c:290
+#: src/regex/gnunet-daemon-regexprofiler.c:303
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:8400 src/mesh/gnunet-service-mesh.c:8410
-#: src/mesh/gnunet-service-mesh.c:8421 src/mesh/gnunet-service-mesh-new.c:8407
+#: src/mesh/gnunet-service-mesh.c:8395 src/mesh/gnunet-service-mesh.c:8405
+#: src/mesh/gnunet-service-mesh.c:8416 src/mesh/gnunet-service-mesh-new.c:8407
 #: src/mesh/gnunet-service-mesh-new.c:8417
 #: src/mesh/gnunet-service-mesh-new.c:8428
 #, fuzzy, c-format
@@ -3864,7 +3941,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:598
+#: src/peerinfo-tool/gnunet-peerinfo.c:599
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -3997,42 +4074,42 @@
 msgid "Protocol error"
 msgstr ""
 
-#: src/namestore/namestore_common.c:530 src/namestore/namestore_common.c:670
+#: src/namestore/namestore_common.c:532 src/namestore/namestore_common.c:672
 #, fuzzy, c-format
 msgid "Unsupported record type %d\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/namestore/namestore_common.c:537
+#: src/namestore/namestore_common.c:539
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/namestore_common.c:560
+#: src/namestore/namestore_common.c:562
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/namestore/namestore_common.c:583
+#: src/namestore/namestore_common.c:585
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/namestore/namestore_common.c:601
+#: src/namestore/namestore_common.c:603
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/namestore_common.c:614
+#: src/namestore/namestore_common.c:616
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/namestore/namestore_common.c:635
+#: src/namestore/namestore_common.c:637
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/namestore/namestore_common.c:661
+#: src/namestore/namestore_common.c:663
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -4155,44 +4232,44 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1009
+#: src/nse/gnunet-nse-profiler.c:1013
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/nse/gnunet-nse-profiler.c:1012
+#: src/nse/gnunet-nse-profiler.c:1016
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1015
+#: src/nse/gnunet-nse-profiler.c:1019
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1018
+#: src/nse/gnunet-nse-profiler.c:1022
 msgid "IP address of this system as seen by the rest of the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1021
+#: src/nse/gnunet-nse-profiler.c:1025
 msgid "delay between queries to statistics during a round"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1024
+#: src/nse/gnunet-nse-profiler.c:1028
 msgid "prefix of the filenames we use for writing the topology for each round"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1027
+#: src/nse/gnunet-nse-profiler.c:1031
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1030
+#: src/nse/gnunet-nse-profiler.c:1034
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1036
+#: src/nse/gnunet-nse-profiler.c:1040
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1046
+#: src/nse/gnunet-nse-profiler.c:1050
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
@@ -4202,12 +4279,11 @@
 msgid "NSE service could not access hostkey: %s\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/nse/gnunet-service-nse.c:1403 src/nse/gnunet-service-nse.c:1478
-#: src/nse/gnunet-service-nse.c:1495
+#: src/nse/gnunet-service-nse.c:1403
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1485
+#: src/nse/gnunet-service-nse.c:1486
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
@@ -4290,36 +4366,36 @@
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:622
+#: src/peerinfo-tool/gnunet-peerinfo.c:625
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Ich bin Peer `%s'.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:648
+#: src/peerinfo-tool/gnunet-peerinfo.c:651
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/peerinfo-tool/gnunet-peerinfo.c:654
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654
+#: src/peerinfo-tool/gnunet-peerinfo.c:657
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:657
+#: src/peerinfo-tool/gnunet-peerinfo.c:660
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:660
+#: src/peerinfo-tool/gnunet-peerinfo.c:663
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:663
+#: src/peerinfo-tool/gnunet-peerinfo.c:666
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:674
+#: src/peerinfo-tool/gnunet-peerinfo.c:677
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -4419,154 +4495,145 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:293
-#, fuzzy, c-format
-msgid "Regexprofiler could not access hostkey: %s. Exiting.\n"
-msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
-
-#: src/regex/gnunet-daemon-regexprofiler.c:452
+#: src/regex/gnunet-daemon-regexprofiler.c:376
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1147
-msgid "An operation has failed while starting peers\n"
+#: src/regex/gnunet-regex-profiler.c:1373
+#, c-format
+msgid "An operation has failed while starting peers: %s\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1193
+#: src/regex/gnunet-regex-profiler.c:1418
 #, fuzzy, c-format
 msgid "Creating a peer failed. Error: %s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/regex/gnunet-regex-profiler.c:1320
+#: src/regex/gnunet-regex-profiler.c:1545
 msgid "An operation has failed while starting slaves\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1342
+#: src/regex/gnunet-regex-profiler.c:1567
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/regex/gnunet-regex-profiler.c:1397
+#: src/regex/gnunet-regex-profiler.c:1622
 msgid "An operation has failed while linking\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1508
-#: src/testbed/testbed_api_testbed.c:805
+#: src/regex/gnunet-regex-profiler.c:1732
+#: src/testbed/testbed_api_testbed.c:799
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1589
+#: src/regex/gnunet-regex-profiler.c:1813
 msgid "Unable to connect to master controller -- Check config\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1691
-#: src/testbed/testbed_api_testbed.c:970
+#: src/regex/gnunet-regex-profiler.c:1915
+#: src/testbed/testbed_api_testbed.c:964
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1694
-#: src/testbed/testbed_api_testbed.c:974
+#: src/regex/gnunet-regex-profiler.c:1918
+#: src/testbed/testbed_api_testbed.c:968
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1734
+#: src/regex/gnunet-regex-profiler.c:1958
 #, c-format
 msgid "No hosts-file specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1739
+#: src/regex/gnunet-regex-profiler.c:1963
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1745
-#: src/testbed/testbed_api_testbed.c:1065
+#: src/regex/gnunet-regex-profiler.c:1969
+#: src/testbed/testbed_api_testbed.c:1071
 #, c-format
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1748
+#: src/regex/gnunet-regex-profiler.c:1972
 #, c-format
 msgid "Checking whether given hosts can start testbed. Please wait\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1769
+#: src/regex/gnunet-regex-profiler.c:1996
 #, fuzzy, c-format
 msgid "Exiting\n"
 msgstr ""
 "\n"
 "Abbruch.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1775
+#: src/regex/gnunet-regex-profiler.c:2002
 #, fuzzy, c-format
 msgid "No configuration file given. Exiting\n"
 msgstr "Konfigurationsdatei FILENAME verwenden"
 
-#: src/regex/gnunet-regex-profiler.c:1784
+#: src/regex/gnunet-regex-profiler.c:2011
 #, fuzzy, c-format
 msgid "Configuration option (regex_prefix) missing. Exiting\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1802
+#: src/regex/gnunet-regex-profiler.c:2029
 #: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1809
+#: src/regex/gnunet-regex-profiler.c:2036
 #, c-format
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1817
+#: src/regex/gnunet-regex-profiler.c:2044
 #, c-format
 msgid ""
 "Error loading search strings. Given file does not contain enough strings. "
 "Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1823
+#: src/regex/gnunet-regex-profiler.c:2050
 #, fuzzy, c-format
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fehler beim Verlassen der DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1850
+#: src/regex/gnunet-regex-profiler.c:2077
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1853
+#: src/regex/gnunet-regex-profiler.c:2080
 msgid "create COUNT number of random links between peers"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1856
+#: src/regex/gnunet-regex-profiler.c:2083
 msgid "wait TIMEOUT before considering a string match as failed"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1859
+#: src/regex/gnunet-regex-profiler.c:2086
 msgid "wait DELAY before starting string search"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1862
+#: src/regex/gnunet-regex-profiler.c:2089
 msgid "number of search strings to read from search strings file"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1865
+#: src/regex/gnunet-regex-profiler.c:2092
 #: src/regex/gnunet-regex-simulation-profiler.c:692
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1868
-msgid ""
-"if this option is set, only one peer is responsible for searching all strings"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1881
+#: src/regex/gnunet-regex-profiler.c:2105
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4681,58 +4748,67 @@
 msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:231
+#: src/testbed/gnunet_testbed_ll_master.c:57
+#, fuzzy, c-format
+msgid "Job command file not given. Exiting\n"
+msgstr "Konfigurationsdatei FILENAME verwenden"
+
+#: src/testbed/gnunet-testbed-profiler.c:235
 #, c-format
 msgid "No hosts-file specified on command line\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:261
+#: src/testbed/gnunet-testbed-profiler.c:267
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:264
+#: src/testbed/gnunet-testbed-profiler.c:270
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:276
+#: src/testbed/gnunet-testbed-profiler.c:286
 msgid "Profiler for testbed"
 msgstr ""
 
-#: src/testbed/ll_master.c:57
+#: src/testbed/testbed_api_hosts.c:469
 #, fuzzy, c-format
-msgid "Job command file not given. Exiting\n"
-msgstr "Konfigurationsdatei FILENAME verwenden"
-
-#: src/testbed/testbed_api.c:499
-#, 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:306
-#, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
 
-#: src/testbed/testbed_api_hosts.c:314
+#: src/testbed/testbed_api_hosts.c:477
 #, 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:321
+#: src/testbed/testbed_api_hosts.c:484
 #, 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:623
+#: src/testbed/testbed_api_hosts.c:593
+#, c-format
+msgid "The function %s is only available when compiled with (--with-ll)\n"
+msgstr ""
+
+#: src/testbed/testbed_api_hosts.c:1836
+#, fuzzy, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#: src/testbed/testbed_api_testbed.c:638
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1009
+#: src/testbed/testbed_api_testbed.c:1003
 #, fuzzy
 msgid "Cannot start the master controller"
 msgstr "GNUnet testbed Controller starten."
 
-#: src/testbed/testbed_api_testbed.c:1089
+#: src/testbed/testbed_api_testbed.c:1059
+msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1095
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
@@ -4783,17 +4859,17 @@
 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:203
+#: src/testing/gnunet-testing.c:209
 #, fuzzy
 msgid "create unique configuration files"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/testing/gnunet-testing.c:205
+#: src/testing/gnunet-testing.c:211
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:207
+#: src/testing/gnunet-testing.c:213
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
@@ -4801,12 +4877,12 @@
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/testing/gnunet-testing.c:209
+#: src/testing/gnunet-testing.c:215
 #, fuzzy
 msgid "configuration template"
 msgstr "GNUnet Konfiguration"
 
-#: src/testing/gnunet-testing.c:218
+#: src/testing/gnunet-testing.c:224
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -4825,59 +4901,59 @@
 msgid "name of the service to run"
 msgstr ""
 
-#: src/testing/testing.c:211
+#: src/testing/testing.c:217
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:227
+#: src/testing/testing.c:233
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:541
+#: src/testing/testing.c:547
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
 
-#: src/testing/testing.c:551
+#: src/testing/testing.c:558
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/testing/testing.c:865
+#: src/testing/testing.c:872
 #, 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:876
+#: src/testing/testing.c:883
 #, 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:890
+#: src/testing/testing.c:897
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/testing/testing.c:923
+#: src/testing/testing.c:931
 #, 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:941
+#: src/testing/testing.c:949
 #, 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:1014
+#: src/testing/testing.c:1029
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/testing/testing.c:1219
+#: src/testing/testing.c:1235
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
@@ -5025,17 +5101,12 @@
 msgid "# bytes payload received"
 msgstr "# Bytes entschlüsselt"
 
-#: src/transport/gnunet-service-transport.c:614
+#: src/transport/gnunet-service-transport.c:613
 #, fuzzy, c-format
 msgid "Transport service could not access hostkey: %s. Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/transport/gnunet-service-transport.c:625
-#, fuzzy
-msgid "Could not access STATISTICS service.  Exiting.\n"
-msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
-
-#: src/transport/gnunet-service-transport.c:720
+#: src/transport/gnunet-service-transport.c:708
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5186,53 +5257,53 @@
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:425
+#: src/transport/gnunet-service-transport_validation.c:453
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:487
+#: src/transport/gnunet-service-transport_validation.c:515
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:536
+#: src/transport/gnunet-service-transport_validation.c:564
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_validation.c:618
+#: src/transport/gnunet-service-transport_validation.c:651
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:860
+#: src/transport/gnunet-service-transport_validation.c:910
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_validation.c:925
+#: src/transport/gnunet-service-transport_validation.c:955
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1054
+#: src/transport/gnunet-service-transport_validation.c:1051
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1063
+#: src/transport/gnunet-service-transport_validation.c:1060
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1188
+#: src/transport/gnunet-service-transport_validation.c:1187
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1216
+#: src/transport/gnunet-service-transport_validation.c:1202
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1270
+#: src/transport/gnunet-service-transport_validation.c:1302
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
@@ -5457,18 +5528,18 @@
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1516
+#: src/transport/plugin_transport_http_client.c:1531
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1647
+#: src/transport/plugin_transport_http_client.c:1662
 #: src/transport/plugin_transport_http_server.c:2869
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1672
+#: src/transport/plugin_transport_http_client.c:1687
 #: src/transport/plugin_transport_http_server.c:2928
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
@@ -5476,7 +5547,7 @@
 "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
 "beträgt %8.3f KB/s.\n"
 
-#: src/transport/plugin_transport_http_client.c:1700
+#: src/transport/plugin_transport_http_client.c:1715
 #: src/transport/plugin_transport_http_server.c:2775
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
@@ -5739,7 +5810,7 @@
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_unix.c:1357
+#: src/transport/plugin_transport_unix.c:1355
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -5900,23 +5971,23 @@
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1007
+#: src/util/common_logging.c:258 src/util/common_logging.c:1034
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1005
+#: src/util/common_logging.c:260 src/util/common_logging.c:1032
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1003
+#: src/util/common_logging.c:262 src/util/common_logging.c:1030
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1001
+#: src/util/common_logging.c:264 src/util/common_logging.c:1028
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/common_logging.c:266 src/util/common_logging.c:1009
+#: src/util/common_logging.c:266 src/util/common_logging.c:1036
 msgid "NONE"
 msgstr ""
 
@@ -5930,28 +6001,28 @@
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1010
+#: src/util/common_logging.c:1037
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1149
+#: src/util/common_logging.c:1176
 #, fuzzy
 msgid "unknown address"
 msgstr "Unbekannter Fehler"
 
-#: src/util/common_logging.c:1187
+#: src/util/common_logging.c:1214
 #, fuzzy
 msgid "invalid address"
 msgstr "Ungültige Parameter: "
 
-#: src/util/common_logging.c:1205
+#: src/util/common_logging.c:1232
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/util/common_logging.c:1226
+#: src/util/common_logging.c:1253
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -6004,114 +6075,118 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:441
+#: src/util/crypto_ecc.c:447
 #, 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:456 src/util/crypto_rsa.c:660
+#: src/util/crypto_ecc.c:462 src/util/crypto_rsa.c:676
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
 "Deleting it.\n"
 msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/util/crypto_ecc.c:552 src/util/crypto_ecc.c:596
-#: src/util/crypto_rsa.c:757 src/util/crypto_rsa.c:801
+#: src/util/crypto_ecc.c:558 src/util/crypto_ecc.c:602
+#: src/util/crypto_rsa.c:750 src/util/crypto_rsa.c:887
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/util/crypto_ecc.c:557 src/util/crypto_rsa.c:762
+#: src/util/crypto_ecc.c:563 src/util/crypto_rsa.c:892
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
 
-#: src/util/crypto_ecc.c:600 src/util/crypto_rsa.c:805
-#: src/util/crypto_rsa.c:841
+#: src/util/crypto_ecc.c:606 src/util/crypto_rsa.c:754
+#: src/util/crypto_rsa.c:790
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:631 src/util/crypto_rsa.c:836
+#: src/util/crypto_ecc.c:637 src/util/crypto_rsa.c:785
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:636
+#: src/util/crypto_ecc.c:642
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:651 src/util/crypto_rsa.c:856
+#: src/util/crypto_ecc.c:657 src/util/crypto_rsa.c:805
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/util/crypto_ecc.c:773 src/util/crypto_rsa.c:941
+#: src/util/crypto_ecc.c:779 src/util/crypto_rsa.c:982
 msgid "interrupted by shutdown"
 msgstr ""
 
-#: src/util/crypto_ecc.c:784
+#: src/util/crypto_ecc.c:790
 #, fuzzy
 msgid "gnunet-ecc failed"
 msgstr "gnunet-update ausführen"
 
-#: src/util/crypto_ecc.c:979
+#: src/util/crypto_ecc.c:978
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/util/crypto_ecc.c:1047
+#: src/util/crypto_ecc.c:1046
 #, fuzzy, c-format
 msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/crypto_random.c:313
+#: src/util/crypto_ecc.c:1130
+msgid "To be implemented: not secure at the moment, please read README\n"
+msgstr ""
+
+#: src/util/crypto_random.c:281
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:342
+#: src/util/crypto_random.c:312
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/crypto_rsa.c:644
+#: src/util/crypto_rsa.c:660
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (too long, %llu bytes).  "
 "Renaming it.\n"
 msgstr "Die Datei `%s' enthält kein Pseudonym.\n"
 
-#: src/util/crypto_rsa.c:952
+#: src/util/crypto_rsa.c:993
 #, fuzzy
 msgid "gnunet-rsa failed"
 msgstr "gnunet-update ausführen"
 
-#: src/util/crypto_rsa.c:1343
+#: src/util/crypto_rsa.c:1378
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/disk.c:601
+#: src/util/disk.c:602
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/disk.c:1205
+#: src/util/disk.c:1206
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1559 src/util/service.c:1669
+#: src/util/disk.c:1560 src/util/service.c:1670
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#: src/util/disk.c:1931
+#: src/util/disk.c:1999
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
@@ -6226,56 +6301,59 @@
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/util/gnunet-ecc.c:107 src/util/gnunet-rsa.c:107
+#: src/util/gnunet-ecc.c:76
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/util/gnunet-ecc.c:113 src/util/gnunet-rsa.c:113
+#: src/util/gnunet-ecc.c:82
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:128 src/util/gnunet-rsa.c:137
+#: src/util/gnunet-ecc.c:100
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/gnunet-ecc.c:140 src/util/gnunet-rsa.c:149
+#: src/util/gnunet-ecc.c:112
 #, fuzzy, c-format
-msgid "Finished!\n"
+msgid ""
+"\n"
+"Finished!\n"
 msgstr "Fertigstellen"
 
-#: src/util/gnunet-ecc.c:163 src/util/gnunet-rsa.c:172
+#: src/util/gnunet-ecc.c:115
 #, c-format
+msgid ""
+"\n"
+"Error, %u keys not generated\n"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:138 src/util/gnunet-rsa.c:65
+#, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:220 src/util/gnunet-rsa.c:229
+#: src/util/gnunet-ecc.c:193
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:223 src/util/gnunet-rsa.c:232
+#: src/util/gnunet-ecc.c:196 src/util/gnunet-rsa.c:115
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:226 src/util/gnunet-rsa.c:235
+#: src/util/gnunet-ecc.c:199 src/util/gnunet-rsa.c:118
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:229 src/util/gnunet-rsa.c:238
+#: src/util/gnunet-ecc.c:202 src/util/gnunet-rsa.c:121
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:232 src/util/gnunet-rsa.c:241
-msgid ""
-"use insecure, weak random number generator for key generation (for testing "
-"only)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:243
+#: src/util/gnunet-ecc.c:213
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
@@ -6287,7 +6365,7 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:252
+#: src/util/gnunet-rsa.c:132
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -6326,17 +6404,17 @@
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:260
+#: src/util/helper.c:271
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/helper.c:305
+#: src/util/helper.c:316
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/helper.c:499
+#: src/util/helper.c:537
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
@@ -6364,16 +6442,6 @@
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/util/os_priority.c:302
-#, fuzzy, c-format
-msgid "Failed to open named pipe `%s' for reading: %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
-#: src/util/os_priority.c:303
-#, fuzzy, c-format
-msgid "Failed to open named pipe `%s' for writing: %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
-
 #: src/util/plugin.c:89
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -6395,17 +6463,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Öffentliche IP-Adresse konnte nicht ermittelt werden.\n"
 
-#: src/util/program.c:254 src/util/service.c:1791
+#: src/util/program.c:254 src/util/service.c:1792
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/pseudonym.c:282
+#: src/util/pseudonym.c:329 src/util/pseudonym.c:632
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/util/pseudonym.c:413 src/util/pseudonym.c:439
+#: src/util/pseudonym.c:464 src/util/pseudonym.c:490 src/util/pseudonym.c:628
 #, fuzzy
 msgid "no-name"
 msgstr "Name anzeigen"
@@ -6552,38 +6620,38 @@
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1525
+#: src/util/service.c:1526
 #, 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:1558
+#: src/util/service.c:1559
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/util/service.c:1607
+#: src/util/service.c:1608
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1611
+#: src/util/service.c:1612
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1615
+#: src/util/service.c:1616
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1670
+#: src/util/service.c:1671
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1683
+#: src/util/service.c:1684
 #, 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:1749
+#: src/util/service.c:1750
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6596,70 +6664,70 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:413
+#: src/util/strings.c:425
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:528
+#: src/util/strings.c:540
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:625
+#: src/util/strings.c:637
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:629
+#: src/util/strings.c:641
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:631
+#: src/util/strings.c:643
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:637
+#: src/util/strings.c:649
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:643
+#: src/util/strings.c:655
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:649
+#: src/util/strings.c:661
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:656
+#: src/util/strings.c:668
 #, fuzzy
 msgid "day"
 msgstr " Tage"
 
-#: src/util/strings.c:658
+#: src/util/strings.c:670
 #, fuzzy
 msgid "days"
 msgstr " Tage"
 
-#: src/util/strings.c:685
+#: src/util/strings.c:697
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1073
+#: src/util/strings.c:1086
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1081
+#: src/util/strings.c:1094
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1087
+#: src/util/strings.c:1100
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1094
+#: src/util/strings.c:1107
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1103
+#: src/util/strings.c:1116
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
@@ -6856,6 +6924,58 @@
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
+#~ msgid "Failed to read hostkey: %s\n"
+#~ msgstr "Fehler beim Starten der Collection.\n"
+
+#, fuzzy
+#~ msgid "# session keys received"
+#~ msgstr "# Sitzungsschlüssel abgelehnt"
+
+#, fuzzy
+#~ msgid "`%s' is for `%s', not for me.  Ignoring.\n"
+#~ msgstr "Größe der `%s' Nachricht ist zu kurz. Nachricht wird ignoriert.\n"
+
+#, fuzzy
+#~ msgid "# SET_KEY and PING messages created"
+#~ msgstr "# PING Nachrichten erstellt"
+
+#, fuzzy
+#~ msgid "Message received far too old (%s). Content ignored.\n"
+#~ msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "Unbekannter Fehler"
+
+#, fuzzy
+#~ msgid "Failed to serialize meta data"
+#~ msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to datastore service"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to parse URI `%s' from KBlock!\n"
+#~ msgstr "Datei `%s' hat URI: %s\n"
+
+#, fuzzy
+#~ msgid "Regexprofiler could not access hostkey: %s. Exiting.\n"
+#~ msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+
+#, fuzzy
+#~ msgid "Could not access STATISTICS service.  Exiting.\n"
+#~ msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to open named pipe `%s' for reading: %s\n"
+#~ msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#, fuzzy
+#~ msgid "Failed to open named pipe `%s' for writing: %s\n"
+#~ msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#, fuzzy
 #~ msgid "session identifier"
 #~ msgstr "# Sitzungen aufgebaut"
 

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2013-04-16 18:01:29 UTC (rev 26908)
+++ gnunet/po/es.po     2013-04-16 18:32:56 UTC (rev 26909)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-02-05 19:22+0100\n"
+"POT-Creation-Date: 2013-03-06 00:28+0100\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -21,7 +21,8 @@
 # que hace de cliente.
 #: src/arm/arm_api.c:162
 msgid "Failed to transmit shutdown request to client.\n"
-msgstr "Se produjo un fallo al transmitir una petición de apagado al 
cliente.\n"
+msgstr ""
+"Se produjo un fallo al transmitir una petición de apagado al cliente.\n"
 
 # Miguel: ¿Debería cambiar las siglas de ARM?
 # De momento las he mantenido con una traducción en
@@ -149,7 +150,8 @@
 # Miguel: ARM se mantiene en todo el texto, aquí está la traducción.
 #: src/arm/gnunet-arm.c:487
 msgid "Control services and the Automated Restart Manager (ARM)"
-msgstr "Servicios de control y el Gestor de Reinicio Automático (ARM en 
inglés)"
+msgstr ""
+"Servicios de control y el Gestor de Reinicio Automático (ARM en inglés)"
 
 #: src/arm/gnunet-service-arm.c:345
 #, c-format
@@ -182,7 +184,9 @@
 #: src/arm/gnunet-service-arm.c:559
 #, c-format
 msgid "Unable to bind listening socket for service `%s' to address `%s': %s\n"
-msgstr "Imposible asociar el «socket» de escucha para el servicio «%s» a la 
dirección «%s»: %s\n"
+msgstr ""
+"Imposible asociar el «socket» de escucha para el servicio «%s» a la "
+"dirección «%s»: %s\n"
 
 # Miguel: He traducido "monitor" por gestionar,
 # no es exactamente lo mismo que el texto en inglés, pero
@@ -240,8 +244,11 @@
 
 # Miguel: ¿No hay servicios -> no hay ningún servicio?
 #: src/arm/gnunet-service-arm.c:1253
-msgid "No default services configured, GNUnet will not really start right 
now.\n"
-msgstr "No hay servicios predeterminados configurados, GNUnet no va a 
iniciarse realmente ahora.\n"
+msgid ""
+"No default services configured, GNUnet will not really start right now.\n"
+msgstr ""
+"No hay servicios predeterminados configurados, GNUnet no va a iniciarse "
+"realmente ahora.\n"
 
 #: src/arm/mockup-service.c:44
 msgid "Initiating shutdown as requested by client.\n"
@@ -257,34 +264,103 @@
 msgid "Received last message for %s \n"
 msgstr "Recibido último mensaje para %s\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:993
-#: src/ats/gnunet-service-ats_addresses.c:1027
+#: src/ats/gnunet-service-ats_addresses.c:1176
+#: src/ats/gnunet-service-ats_addresses.c:1210
 #, c-format
-msgid "Could not load quota for network `%s':  `%s', assigning default 
bandwidth %llu\n"
-msgstr "No se pudieron cargar las cuotas para la red «%s»:  «%s», asignando el 
ancho de banda predeterminado %llu\n"
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+"No se pudieron cargar las cuotas para la red «%s»:  «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/gnunet-service-ats_addresses.c:999
+#: src/ats/gnunet-service-ats_addresses.c:1182
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1006
+#: src/ats/gnunet-service-ats_addresses.c:1189
 #, c-format
-msgid "No outbound quota configured for network `%s', assigning default 
bandwidth %llu\n"
-msgstr "No hay configurada una cuota de salida para la red «%s», asignando el 
ancho de banda predeterminado %llu\n"
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
 
 # Miguel: "Inbound" lo he traducido como entrada en todo el texto.
-#: src/ats/gnunet-service-ats_addresses.c:1033
+#: src/ats/gnunet-service-ats_addresses.c:1216
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr "La cuota de entrada configurada para la red «%s» es %llu\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1040
+#: src/ats/gnunet-service-ats_addresses.c:1223
 #, c-format
-msgid "No outbound quota configure for network `%s', assigning default 
bandwidth %llu\n"
-msgstr "No hay configurada una cuota de salida para la red «%s», asignando el 
ancho de banda predeterminado %llu\n"
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
 
+#: src/ats/gnunet-service-ats_addresses_mlp.c:735
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1044
+#, fuzzy, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1226
+#, c-format
+msgid "Update for ATS type `%s' not implemented!\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1306
+#, c-format
+msgid "Updating address for peer `%s' not added before\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1726
+#, fuzzy, c-format
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
+msgstr ""
+"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1734
+#, fuzzy, c-format
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
+msgstr ""
+"No hay configuración de cuota de entrada para la red '%s', asignando el "
+"ancho de banda predeterminado (%llu)\n"
+
+# Miguel: "Outbound" lo he traducido como salida en todo el texto.
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1744
+#, fuzzy, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
+
+# Miguel: "Outbound" lo he traducido como salida en todo el texto.
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1752
+#, fuzzy, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
+
+# Miguel: "Outbound" lo he traducido como salida en todo el texto.
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1763
+#, fuzzy, c-format
+msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
+msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
+
 # Miguel: ¿Como podría traducir "resolutions" y "resolve"?
 # Son difíciles de no calcar, puesto que no conozco como expresar
 # el concepto de obtener una dirección a partir de un nombre
@@ -303,8 +379,12 @@
 # puesto que no hay módulos fijos en contraposición a cargables.
 #: src/ats-tool/gnunet-ats.c:199
 #, c-format
-msgid "Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u 
Bytes/s, %s\n"
-msgstr "Par «%s» módulo «%s», dirección «%s», «%s» subida: %u Bytes/s, bajada 
%u Bytes/s, %s\n"
+msgid ""
+"Peer `%s' plugin `%s', address `%s', `%s' bw out: %u Bytes/s, bw in %u Bytes/"
+"s, %s\n"
+msgstr ""
+"Par «%s» módulo «%s», dirección «%s», «%s» subida: %u Bytes/s, bajada %u "
+"Bytes/s, %s\n"
 
 #: src/ats-tool/gnunet-ats.c:326
 #, c-format
@@ -377,7 +457,9 @@
 # pero creo que son palabras clave.
 #: src/ats-tool/gnunet-ats.c:511
 msgid "preference type to set: latency | bandwidth"
-msgstr "tipo de preferencia a modificar: latency (latencia) | bandwidth (ancho 
de banda)"
+msgstr ""
+"tipo de preferencia a modificar: latency (latencia) | bandwidth (ancho de "
+"banda)"
 
 #: src/ats-tool/gnunet-ats.c:514
 msgid "preference value"
@@ -416,25 +498,25 @@
 msgstr "plazo de consenso"
 
 # Miguel: Conjunto resta.
-#: src/consensus/gnunet-consensus-ibf.c:176
+#: src/consensus/gnunet-consensus-ibf.c:217
 msgid "number of element in set A-B"
 msgstr "número de elementos en el conjunto A-B"
 
-#: src/consensus/gnunet-consensus-ibf.c:179
+#: src/consensus/gnunet-consensus-ibf.c:220
 msgid "number of element in set B-A"
 msgstr "número de elementos en el conjunto B-A"
 
 # Miguel: Conjunto unión.
-#: src/consensus/gnunet-consensus-ibf.c:182
+#: src/consensus/gnunet-consensus-ibf.c:223
 msgid "number of common elements in A and B"
 msgstr "número de elementos comunes en A y B"
 
 # Miguel: "hash" me tiene un poco frito. ¿Existe alguna traducción buena?
-#: src/consensus/gnunet-consensus-ibf.c:185
+#: src/consensus/gnunet-consensus-ibf.c:226
 msgid "hash num"
 msgstr "número de hash"
 
-#: src/consensus/gnunet-consensus-ibf.c:188
+#: src/consensus/gnunet-consensus-ibf.c:229
 msgid "ibf size"
 msgstr "tamaño ibf"
 
@@ -448,7 +530,8 @@
 
 #: src/core/core_api.c:755
 msgid "Client was disconnected from core service, trying to reconnect.\n"
-msgstr "El cliente se desconectó del servicio principal, tratando de 
reconectar.\n"
+msgstr ""
+"El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
 #: src/core/gnunet-core.c:86 src/peerinfo-tool/gnunet-peerinfo.c:214
 #, c-format
@@ -478,30 +561,35 @@
 # Miguel: ¿Quizá continuamente fuese mejor?
 #: src/core/gnunet-core.c:211 src/transport/gnunet-transport.c:1005
 msgid "provide information about all current connections (continuously)"
-msgstr "provee información sobre todas las conexiones actuales (de forma 
continua)"
+msgstr ""
+"provee información sobre todas las conexiones actuales (de forma continua)"
 
 #: src/core/gnunet-core.c:222
 msgid "Print information about connected peers."
 msgstr "Imprime información sobre los pares conectados."
 
-#: src/core/gnunet-service-core.c:109
-#, c-format
-msgid "Failed to read hostkey: %s\n"
-msgstr "Se produjo un fallo al leer la clave de máquina: %s\n"
+#: src/core/gnunet-service-core.c:110
+#, fuzzy, c-format
+msgid "Failed to read or generate private key: %s\n"
+msgstr "Se produjo un fallo al leer o crear una clave de zona privada\n"
 
-#: src/core/gnunet-service-core.c:123
+#: src/core/gnunet-service-core.c:124
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr "El servicio principal de «%4s» está listo.\n"
 
-#: src/core/gnunet-service-core.c:149
+#: src/core/gnunet-service-core.c:150
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
-msgstr "Al servicio principal le falta la configuración de la clave de máquina 
(HOSTKEY).  Saliendo.\n"
+msgstr ""
+"Al servicio principal le falta la configuración de la clave de máquina "
+"(HOSTKEY).  Saliendo.\n"
 
-#: src/core/gnunet-service-core.c:163
-#: src/transport/gnunet-service-transport.c:737
+#: src/core/gnunet-service-core.c:164
+#: src/transport/gnunet-service-transport.c:725
 msgid "Transport service is unable to access hostkey. Exiting.\n"
-msgstr "El servicio de transporte no es capaz de acceder a la clave de la 
máquina. Saliendo.\n"
+msgstr ""
+"El servicio de transporte no es capaz de acceder a la clave de la máquina. "
+"Saliendo.\n"
 
 #: src/core/gnunet-service-core_clients.c:370
 msgid "# send requests dropped (disconnected)"
@@ -516,146 +604,167 @@
 msgid "# bytes of messages of type %u received"
 msgstr "# bytes de mensajes del tipo %u recibidos"
 
-#: src/core/gnunet-service-core_kx.c:565
+#: src/core/gnunet-service-core_kx.c:532
 msgid "# bytes encrypted"
 msgstr "# bytes cifrados"
 
-#: src/core/gnunet-service-core_kx.c:617
+#: src/core/gnunet-service-core_kx.c:583
 msgid "# bytes decrypted"
 msgstr "# bytes descifrados"
 
-#: src/core/gnunet-service-core_kx.c:681 src/dv/gnunet-service-dv.c:3003
-msgid "Error in communication with PEERINFO service\n"
-msgstr "Error en la comunicación con el servicio de información de pares 
(PEERINFO)\n"
-
-#: src/core/gnunet-service-core_kx.c:700
-msgid "# Delayed connecting due to lack of public key"
-msgstr "# Retrasada la conexión debido a la falta de clave pública"
-
-#: src/core/gnunet-service-core_kx.c:753
+#: src/core/gnunet-service-core_kx.c:667
 msgid "# key exchanges initiated"
 msgstr "# intercambio de claves iniciados"
 
-#: src/core/gnunet-service-core_kx.c:775
+#: src/core/gnunet-service-core_kx.c:697
 msgid "# key exchanges stopped"
 msgstr "# intercambio de claves parados"
 
-#: src/core/gnunet-service-core_kx.c:828
-msgid "# session keys received"
-msgstr "# claves de sesión recibidas"
+#: src/core/gnunet-service-core_kx.c:761
+msgid "# old ephemeral keys ignored"
+msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:845
+#: src/core/gnunet-service-core_kx.c:767
+#, fuzzy
+msgid "# ephemeral keys received"
+msgstr "# mapas de tipos recibidos"
+
+#: src/core/gnunet-service-core_kx.c:803
 #, c-format
-msgid "`%s' is for `%s', not for me.  Ignoring.\n"
-msgstr "«%s» es para «%s», no para mí. Ignorándolo.\n"
+msgid ""
+"Ephemeral key message rejected as its validity range does not match our "
+"system time (%llu not in [%llu,%llu]).\n"
+msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:890
-msgid "# SET_KEY messages decrypted"
+#: src/core/gnunet-service-core_kx.c:818
+#, fuzzy
+msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr "# mensajes «SET_KEY» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:977
-#: src/transport/gnunet-service-transport_validation.c:865
+#: src/core/gnunet-service-core_kx.c:921
+#: src/transport/gnunet-service-transport_validation.c:915
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1010
+#: src/core/gnunet-service-core_kx.c:929
+#, fuzzy
+msgid "# PING messages dropped (out of order)"
+msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
+
+#: src/core/gnunet-service-core_kx.c:956
 #, c-format
-msgid "Received PING from `%s' for different identity: I am `%s', PONG 
identity: `%s'\n"
-msgstr "Recibido PING de «%s» para una identidad diferente: Yo soy «%s», 
identidad del PONG: «%s»\n"
+msgid ""
+"Received PING from `%s' for different identity: I am `%s', PONG identity: `"
+"%s'\n"
+msgstr ""
+"Recibido PING de «%s» para una identidad diferente: Yo soy «%s», identidad "
+"del PONG: «%s»\n"
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:973
 msgid "# PONG messages created"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:999
 msgid "# sessions terminated by timeout"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1135
+#: src/core/gnunet-service-core_kx.c:1009
 msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
 
-#: src/core/gnunet-service-core_kx.c:1236
-#: src/transport/gnunet-service-transport_validation.c:1161
+#: src/core/gnunet-service-core_kx.c:1066
+#: src/transport/gnunet-service-transport_validation.c:1160
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1275
+#: src/core/gnunet-service-core_kx.c:1072
+#, fuzzy
+msgid "# PONG messages dropped (connection down)"
+msgstr "# mensajes PONG recibidos"
+
+#: src/core/gnunet-service-core_kx.c:1077
+#, fuzzy
+msgid "# PONG messages dropped (out of order)"
+msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
+
+#: src/core/gnunet-service-core_kx.c:1107
 msgid "# PONG messages decrypted"
 msgstr "# mensajes PONG descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1303
+#: src/core/gnunet-service-core_kx.c:1141
 msgid "# session keys confirmed via PONG"
 msgstr "# claves de sesión confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1329
+#: src/core/gnunet-service-core_kx.c:1151
+#, fuzzy
+msgid "# timeouts prevented via PONG"
+msgstr "# bytes recibidos vía TCP"
+
+#: src/core/gnunet-service-core_kx.c:1158
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1383
-#: src/core/gnunet-service-core_kx.c:1400
-msgid "# SET_KEY and PING messages created"
-msgstr "# mensajes «SET_KEY» y «PING» creados"
+#: src/core/gnunet-service-core_kx.c:1312
+#, fuzzy
+msgid "# DATA message dropped (out of order)"
+msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1404
-msgid "# REKEY operations performed"
-msgstr "# operaciones de cambio de clave (REKEY) realizadas"
+#: src/core/gnunet-service-core_kx.c:1319
+#, c-format
+msgid ""
+"Session to peer `%s' went down due to key expiration (should not happen)\n"
+msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1539
-msgid "# failed to decrypt message (no session key)"
-msgstr "# fallos al descifrar el mensaje (no hay clave de sesión)"
+#: src/core/gnunet-service-core_kx.c:1322
+#, fuzzy
+msgid "# sessions terminated by key expiration"
+msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1579
-#: src/core/gnunet-service-core_kx.c:1604
+#: src/core/gnunet-service-core_kx.c:1365
+#: src/core/gnunet-service-core_kx.c:1390
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1591
+#: src/core/gnunet-service-core_kx.c:1377
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1628
-#, c-format
-msgid "Message received far too old (%s). Content ignored.\n"
-msgstr "El mensaje recibido es muy antiguo (%s). Se ignora el contenido.\n"
-
-#: src/core/gnunet-service-core_kx.c:1632
+#: src/core/gnunet-service-core_kx.c:1418
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1640
+#: src/core/gnunet-service-core_kx.c:1426
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1703 src/hostlist/hostlist-server.c:552
-#: src/peerinfo-tool/gnunet-peerinfo.c:547
-#: src/transport/gnunet-service-transport.c:644
-msgid "Could not access PEERINFO service.  Exiting.\n"
-msgstr "No se pudo acceder al servicio de información de pares (PEERINFO).  
Saliendo.\n"
+#: src/core/gnunet-service-core_kx.c:1459
+#, fuzzy
+msgid "# PAYLOAD dropped (out of order)"
+msgstr "# bytes omitidos (fuera de secuencia)"
 
 #: src/core/gnunet-service-core_neighbours.c:163
 msgid "# sessions terminated by transport disconnect"
 msgstr "# sesiones terminadas por desconexión de transporte"
 
-#: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:334
+#: src/core/gnunet-service-core_neighbours.c:179
+#: src/core/gnunet-service-core_neighbours.c:333
 msgid "# neighbour entries allocated"
 msgstr "# entradas de vecinos alojadas"
 
-#: src/core/gnunet-service-core_neighbours.c:247
+#: src/core/gnunet-service-core_neighbours.c:246
 msgid "# encrypted bytes given to transport"
 msgstr "# bytes cifrados dados al transporte"
 
-#: src/core/gnunet-service-core_neighbours.c:421
+#: src/core/gnunet-service-core_neighbours.c:420
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Mensaje no soportado del tipo %u (%u bytes) recibido del par «%s»\n"
 
-#: src/core/gnunet-service-core_sessions.c:206
-#: src/core/gnunet-service-core_sessions.c:269
+#: src/core/gnunet-service-core_sessions.c:210
+#: src/core/gnunet-service-core_sessions.c:280
 #: src/dht/gnunet-service-dht_neighbours.c:645
-#: src/dht/gnunet-service-dht_neighbours.c:703
-#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1544
+#: src/dht/gnunet-service-dht_neighbours.c:704
+#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1530
 #: src/topology/gnunet-daemon-topology.c:704
 #: src/topology/gnunet-daemon-topology.c:805
 #: src/transport/gnunet-service-transport_neighbours.c:1052
@@ -666,11 +775,11 @@
 msgid "# peers connected"
 msgstr "# pares conectados"
 
-#: src/core/gnunet-service-core_sessions.c:236
+#: src/core/gnunet-service-core_sessions.c:248
 msgid "# type map refreshes sent"
 msgstr "# envíos de refrescos del mapa de tipos"
 
-#: src/core/gnunet-service-core_sessions.c:406
+#: src/core/gnunet-service-core_sessions.c:417
 msgid "# messages discarded (expired prior to transmission)"
 msgstr "# mensajes descartados (expirados antes de su transmisión)"
 
@@ -707,7 +816,8 @@
 #: src/datacache/datacache.c:192
 #, c-format
 msgid "Failed to load datacache plugin for `%s'\n"
-msgstr "Se produjo un fallo al cargar el módulo de la cache de datos para 
«%s»\n"
+msgstr ""
+"Se produjo un fallo al cargar el módulo de la cache de datos para «%s»\n"
 
 #: src/datacache/datacache.c:295
 msgid "# requests received"
@@ -733,7 +843,8 @@
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ecc.c:46
+#: src/namestore/plugin_namestore_sqlite.c:51
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:46
 #: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
 #: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
 #, c-format
@@ -748,7 +859,8 @@
 #: src/datastore/plugin_datastore_sqlite.c:401
 #: src/namestore/plugin_namestore_sqlite.c:362
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
-msgstr "Se intentó cerrar sqlite sin finalizar todas las sentencias 
preparadas.\n"
+msgstr ""
+"Se intentó cerrar sqlite sin finalizar todas las sentencias preparadas.\n"
 
 #: src/datacache/plugin_datacache_sqlite.c:491
 #, c-format
@@ -763,7 +875,9 @@
 # del modelo.
 #: src/datastore/datastore_api.c:310
 msgid "Failed to transmit request to drop database.\n"
-msgstr "Se produjo un fallo al transmitir la petición de eliminación a la base 
de datos.\n"
+msgstr ""
+"Se produjo un fallo al transmitir la petición de eliminación a la base de "
+"datos.\n"
 
 #: src/datastore/datastore_api.c:393
 msgid "# queue entry timeouts"
@@ -795,7 +909,8 @@
 
 #: src/datastore/datastore_api.c:762
 msgid "Failed to receive status response from database."
-msgstr "Se produjo un fallo al recibir el estado de respuesta de la base de 
datos."
+msgstr ""
+"Se produjo un fallo al recibir el estado de respuesta de la base de datos."
 
 #: src/datastore/datastore_api.c:776
 msgid "Error reading response from datastore service"
@@ -803,7 +918,8 @@
 
 #: src/datastore/datastore_api.c:788 src/datastore/datastore_api.c:794
 msgid "Invalid error message received from datastore service"
-msgstr "Mensaje de error no válido recibido del servicio de almacenamiento de 
datos"
+msgstr ""
+"Mensaje de error no válido recibido del servicio de almacenamiento de datos"
 
 #: src/datastore/datastore_api.c:798
 msgid "# status messages received"
@@ -873,17 +989,29 @@
 
 #: src/datastore/gnunet-service-datastore.c:669
 #, c-format
-msgid "Insufficient space (%llu bytes are available) to satisfy `%s' request 
for %llu bytes\n"
-msgstr "Espacio insuficiente (%llu bytes están disponibles) para satisfacer la 
petición «%s» de %llu bytes\n"
+msgid ""
+"Insufficient space (%llu bytes are available) to satisfy `%s' request for "
+"%llu bytes\n"
+msgstr ""
+"Espacio insuficiente (%llu bytes están disponibles) para satisfacer la "
+"petición «%s» de %llu bytes\n"
 
 #: src/datastore/gnunet-service-datastore.c:680
 #, c-format
-msgid "The requested amount (%llu bytes) is larger than the cache size (%llu 
bytes)\n"
-msgstr "La cantidad solicitada (%llu bytes) es mayor que el tamaño de la caché 
(%llu bytes)\n"
+msgid ""
+"The requested amount (%llu bytes) is larger than the cache size (%llu "
+"bytes)\n"
+msgstr ""
+"La cantidad solicitada (%llu bytes) es mayor que el tamaño de la caché (%llu "
+"bytes)\n"
 
 #: src/datastore/gnunet-service-datastore.c:684
-msgid "Insufficient space to satisfy request and requested amount is larger 
than cache size"
-msgstr "Espacio insuficiente para satisfacer la petición y la cantidad pedida 
es mayor que el tamaño de la caché"
+msgid ""
+"Insufficient space to satisfy request and requested amount is larger than "
+"cache size"
+msgstr ""
+"Espacio insuficiente para satisfacer la petición y la cantidad pedida es "
+"mayor que el tamaño de la caché"
 
 #: src/datastore/gnunet-service-datastore.c:690
 msgid "Insufficient space to satisfy request"
@@ -903,7 +1031,8 @@
 #: src/datastore/gnunet-service-datastore.c:846
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
-msgstr "Se necesitan %llu bytes más de espacio (%llu permitidos, usando 
%llu)\n"
+msgstr ""
+"Se necesitan %llu bytes más de espacio (%llu permitidos, usando %llu)\n"
 
 #: src/datastore/gnunet-service-datastore.c:1006
 msgid "# GET requests received"
@@ -941,7 +1070,9 @@
 #: src/datastore/gnunet-service-datastore.c:1216
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
-msgstr "El «payload» del almacén de datos es impreciso (%lld < %lld).  
Intentando repararlo.\n"
+msgstr ""
+"El «payload» del almacén de datos es impreciso (%lld < %lld).  Intentando "
+"repararlo.\n"
 
 #: src/datastore/gnunet-service-datastore.c:1277
 #, c-format
@@ -951,7 +1082,8 @@
 #: src/datastore/gnunet-service-datastore.c:1286
 #, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
-msgstr "Se produjo un fallo al inicializar el módulo del almacén de datos para 
«%s»\n"
+msgstr ""
+"Se produjo un fallo al inicializar el módulo del almacén de datos para «%s»\n"
 
 #: src/datastore/gnunet-service-datastore.c:1488
 #, c-format
@@ -969,13 +1101,16 @@
 #: src/datastore/gnunet-service-datastore.c:1514
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
-msgstr "No se pudo usar el nombre de fichero especificado «%s» para 
«bloomfilter».\n"
+msgstr ""
+"No se pudo usar el nombre de fichero especificado «%s» para «bloomfilter».\n"
 
 #: src/datastore/gnunet-service-datastore.c:1532
 #: src/datastore/gnunet-service-datastore.c:1548
 #, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
-msgstr "Se produjo un fallo al borrar el fichero de configuración defectuoso 
de «bloomfilter» «%s»:\n"
+msgstr ""
+"Se produjo un fallo al borrar el fichero de configuración defectuoso de "
+"«bloomfilter» «%s»:\n"
 
 #: src/datastore/gnunet-service-datastore.c:1578
 msgid "Failed to initialize bloomfilter.\n"
@@ -1033,17 +1168,24 @@
 
 #: src/datastore/plugin_datastore_sqlite.c:648
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
-msgstr "Datos no válidos en la base de datos.  Intentando arreglar (por 
borrado).\n"
+msgstr ""
+"Datos no válidos en la base de datos.  Intentando arreglar (por borrado).\n"
 
 # to should be too, i think
 #: src/datastore/plugin_datastore_sqlite.c:1134
 msgid "sqlite version to old to determine size, assuming zero\n"
-msgstr "la versión de sqlite es muy antigua para determinar el tamaño, se 
asume cero\n"
+msgstr ""
+"la versión de sqlite es muy antigua para determinar el tamaño, se asume "
+"cero\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:1153
 #, c-format
-msgid "Using sqlite page utilization to estimate payload (%llu pages of size 
%llu bytes)\n"
-msgstr "Usando la utilización de páginas de sqlite para estimar el «payload» 
(%llu páginas de %llu bytes de tamaño)\n"
+msgid ""
+"Using sqlite page utilization to estimate payload (%llu pages of size %llu "
+"bytes)\n"
+msgstr ""
+"Usando la utilización de páginas de sqlite para estimar el «payload» (%llu "
+"páginas de %llu bytes de tamaño)\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:1193
 #: src/namestore/plugin_namestore_sqlite.c:827
@@ -1104,13 +1246,14 @@
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:736
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:1033
+#: src/nse/gnunet-nse-profiler.c:1037
 msgid "be verbose (print progress information)"
 msgstr "ser prolijo (imprime información de progreso)"
 
 #: src/dht/gnunet-dht-get.c:222
 msgid "Issue a GET request to the GNUnet DHT, prints results."
-msgstr "Iniciando una peticion «GET» a la DHT de GNUnet, imprimiendo 
resultados."
+msgstr ""
+"Iniciando una peticion «GET» a la DHT de GNUnet, imprimiendo resultados."
 
 #: src/dht/gnunet-dht-monitor.c:268
 msgid "how long should the monitor command run"
@@ -1164,7 +1307,9 @@
 
 #: src/dht/gnunet-dht-put.c:235
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
-msgstr "Inicianco una petición «PUT» a la DHT de GNUnet para insertar «DATA» 
bajo «KEY»."
+msgstr ""
+"Inicianco una petición «PUT» a la DHT de GNUnet para insertar «DATA» bajo "
+"«KEY»."
 
 #: src/dht/gnunet-service-dht.c:172
 msgid "Failed to connect to transport service!\n"
@@ -1188,11 +1333,14 @@
 
 #: src/dht/gnunet-service-dht_clients.c:1035
 msgid "# Key match, type mismatches in REPLY to CLIENT"
-msgstr "# Coincidencias de clave, diferencias de tipo en la respuesta (REPLY) 
del cliente (CLIENT)"
+msgstr ""
+"# Coincidencias de clave, diferencias de tipo en la respuesta (REPLY) del "
+"cliente (CLIENT)"
 
 #: src/dht/gnunet-service-dht_clients.c:1048
 msgid "# Duplicate REPLIES to CLIENT request dropped"
-msgstr "# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) 
omitidas"
+msgstr ""
+"# Peticiones duplicadas de respuestas (REPLIES) a clientes (CLIENT) omitidas"
 
 #: src/dht/gnunet-service-dht_clients.c:1085
 #, c-format
@@ -1206,11 +1354,13 @@
 #: src/dht/gnunet-service-dht_clients.c:1157
 #: src/dht/gnunet-service-dht_clients.c:1199
 msgid "# REPLIES ignored for CLIENTS (no match)"
-msgstr "# Respuestas (REPLIES) ignoradas para clientes (CLIENTS) (sin 
coincidencia)"
+msgstr ""
+"# Respuestas (REPLIES) ignoradas para clientes (CLIENTS) (sin coincidencia)"
 
 #: src/dht/gnunet-service-dht_clients.c:1167
 msgid "Could not pass reply to client, message too big!\n"
-msgstr "¡No se pudo enviar respuesta al cliente, el mensaje es demasiado 
grande!\n"
+msgstr ""
+"¡No se pudo enviar respuesta al cliente, el mensaje es demasiado grande!\n"
 
 #: src/dht/gnunet-service-dht_datacache.c:64
 #, c-format
@@ -1262,79 +1412,79 @@
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes «FIND PEER» iniciados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:737
+#: src/dht/gnunet-service-dht_neighbours.c:738
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# Mensajes encolados descartados (par desconectado)"
 
-#: src/dht/gnunet-service-dht_neighbours.c:792
+#: src/dht/gnunet-service-dht_neighbours.c:793
 msgid "# Bytes transmitted to other peers"
 msgstr "# Bytes transmitidos a otros pares"
 
-#: src/dht/gnunet-service-dht_neighbours.c:830
+#: src/dht/gnunet-service-dht_neighbours.c:831
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# Bytes de ancho de banda solicitados por el servicio principal"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1080
+#: src/dht/gnunet-service-dht_neighbours.c:1053
+#: src/dht/gnunet-service-dht_neighbours.c:1081
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr "# Pares excluidos del encaminado debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1061
-#: src/dht/gnunet-service-dht_neighbours.c:1095
+#: src/dht/gnunet-service-dht_neighbours.c:1062
+#: src/dht/gnunet-service-dht_neighbours.c:1096
 msgid "# Peer selection failed"
 msgstr "# Selecciones de pares fallidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1229
+#: src/dht/gnunet-service-dht_neighbours.c:1230
 msgid "# PUT requests routed"
 msgstr "# Peticiones «PUT» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1258
+#: src/dht/gnunet-service-dht_neighbours.c:1259
 msgid "# PUT messages queued for transmission"
 msgstr "# mensajes «PUT» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1265
-#: src/dht/gnunet-service-dht_neighbours.c:1378
-#: src/dht/gnunet-service-dht_neighbours.c:1478
+#: src/dht/gnunet-service-dht_neighbours.c:1266
+#: src/dht/gnunet-service-dht_neighbours.c:1379
+#: src/dht/gnunet-service-dht_neighbours.c:1479
 msgid "# P2P messages dropped due to full queue"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1343
+#: src/dht/gnunet-service-dht_neighbours.c:1344
 msgid "# GET requests routed"
 msgstr "# Peticiones «GET» encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1370
+#: src/dht/gnunet-service-dht_neighbours.c:1371
 msgid "# GET messages queued for transmission"
 msgstr "# Mensajes «GET» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1485
+#: src/dht/gnunet-service-dht_neighbours.c:1486
 msgid "# RESULT messages queued for transmission"
 msgstr "# Mensajes «RESULT» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1573
+#: src/dht/gnunet-service-dht_neighbours.c:1574
 msgid "# P2P PUT requests received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1702
+#: src/dht/gnunet-service-dht_neighbours.c:1704
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1710
+#: src/dht/gnunet-service-dht_neighbours.c:1712
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a falta de «HELLO»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1801
+#: src/dht/gnunet-service-dht_neighbours.c:1803
 msgid "# P2P GET requests received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1843
+#: src/dht/gnunet-service-dht_neighbours.c:1845
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Peticiones «FIND PEER» P2P procesadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1857
+#: src/dht/gnunet-service-dht_neighbours.c:1859
 msgid "# P2P GET requests ONLY routed"
 msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1944
+#: src/dht/gnunet-service-dht_neighbours.c:1943
 msgid "# P2P RESULTS received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
 
@@ -1344,23 +1494,29 @@
 
 #: src/dht/gnunet-service-dht_routing.c:211
 msgid "# Good REPLIES matched against routing table"
-msgstr "# Buenas respuestas (REPLIES) encontradas en la tabla de 
encaminamiento"
+msgstr ""
+"# Buenas respuestas (REPLIES) encontradas en la tabla de encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:220
 msgid "# Duplicate REPLIES matched against routing table"
-msgstr "# Respuestas (REPLIES) duplicadas encontradas en la tabla de 
encaminamiento"
+msgstr ""
+"# Respuestas (REPLIES) duplicadas encontradas en la tabla de encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:226
 msgid "# Invalid REPLIES matched against routing table"
-msgstr "# Respuestas (REPLIES) no válidas encontradas en la tabla de 
encaminamiento"
+msgstr ""
+"# Respuestas (REPLIES) no válidas encontradas en la tabla de encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:232
 msgid "# Irrelevant REPLIES matched against routing table"
-msgstr "# Respuestas (REPLIES) irrelevantes encontradas en la tabla de 
encaminamiento"
+msgstr ""
+"# Respuestas (REPLIES) irrelevantes encontradas en la tabla de encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:244
 msgid "# Unsupported REPLIES matched against routing table"
-msgstr "# Respuestas (REPLIES) no soportadas encontradas en la tabla de 
encaminamiento"
+msgstr ""
+"# Respuestas (REPLIES) no soportadas encontradas en la tabla de "
+"encaminamiento"
 
 #: src/dht/gnunet-service-dht_routing.c:317
 msgid "# Entries removed from routing table"
@@ -1391,12 +1547,16 @@
 #: src/dns/dnsparser.c:152
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr "Se produjo un fallo al convertir el nombre en formato DNS IDNA «%s» a 
UTF-8: %s\n"
+msgstr ""
+"Se produjo un fallo al convertir el nombre en formato DNS IDNA «%s» a UTF-8: "
+"%s\n"
 
 #: src/dns/dnsparser.c:626
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
-msgstr "Se produjo un fallo al convertir el nombre en UTF-8 «%s» al formato 
DNS IDNA: %s\n"
+msgstr ""
+"Se produjo un fallo al convertir el nombre en UTF-8 «%s» al formato DNS "
+"IDNA: %s\n"
 
 #: src/dns/dnsstub.c:175
 #, c-format
@@ -1498,6 +1658,11 @@
 msgid "Failed to connect to the dv service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio dv!\n"
 
+#: src/dv/gnunet-service-dv.c:3003
+msgid "Error in communication with PEERINFO service\n"
+msgstr ""
+"Error en la comunicación con el servicio de información de pares (PEERINFO)\n"
+
 #: src/dv/plugin_transport_dv.c:159
 #, c-format
 msgid "%s Received message from %s of type %d, distance %u!\n"
@@ -1555,12 +1720,14 @@
 #: src/exit/gnunet-daemon-exit.c:1267
 #, c-format
 msgid "IPv4 packet with unsupported next header %u received.  Ignored.\n"
-msgstr "Recibido paquete IPv4 con cabecera «next» no soportada %u.  
Ignorado.\n"
+msgstr ""
+"Recibido paquete IPv4 con cabecera «next» no soportada %u.  Ignorado.\n"
 
 #: src/exit/gnunet-daemon-exit.c:1313
 #, c-format
 msgid "IPv6 packet with unsupported next header %d received.  Ignored.\n"
-msgstr "Recibido paquete IPv6 con cabecera «next» no soportada %d.  
Ignorado.\n"
+msgstr ""
+"Recibido paquete IPv6 con cabecera «next» no soportada %d.  Ignorado.\n"
 
 #: src/exit/gnunet-daemon-exit.c:1321
 #, c-format
@@ -1648,7 +1815,9 @@
 #: src/exit/gnunet-daemon-exit.c:3209
 #, c-format
 msgid "No addresses found for hostname `%s' of service `%s'!\n"
-msgstr "¡No se encontraron direcciones para el nombre de máquina «%s» del 
servicio «%s»!\n"
+msgstr ""
+"¡No se encontraron direcciones para el nombre de máquina «%s» del servicio "
+"«%s»!\n"
 
 #: src/exit/gnunet-daemon-exit.c:3223 src/exit/gnunet-daemon-exit.c:3235
 #, c-format
@@ -1658,23 +1827,41 @@
 #: src/exit/gnunet-daemon-exit.c:3246
 #, c-format
 msgid "No IP addresses found for hostname `%s' of service `%s'!\n"
-msgstr "¡No se encontraron direcciones IP para el nombre de máquina «%s» del 
servicio «%s»!\n"
+msgstr ""
+"¡No se encontraron direcciones IP para el nombre de máquina «%s» del "
+"servicio «%s»!\n"
 
 #: src/exit/gnunet-daemon-exit.c:3364
-msgid "This system does not support IPv4, will disable IPv4 functions despite 
them being enabled in the configuration\n"
-msgstr "Este sistema no soporta IPv4, se deshabilitarán las funciones IPv4 
aunque estén habilitadas en la configuración\n"
+msgid ""
+"This system does not support IPv4, will disable IPv4 functions despite them "
+"being enabled in the configuration\n"
+msgstr ""
+"Este sistema no soporta IPv4, se deshabilitarán las funciones IPv4 aunque "
+"estén habilitadas en la configuración\n"
 
 #: src/exit/gnunet-daemon-exit.c:3372
-msgid "This system does not support IPv6, will disable IPv6 functions despite 
them being enabled in the configuration\n"
-msgstr "Este sistema no soporta IPv6, se deshabilitarán las funciones IPv6 
aunque estén habilitadas en la configuración\n"
+msgid ""
+"This system does not support IPv6, will disable IPv6 functions despite them "
+"being enabled in the configuration\n"
+msgstr ""
+"Este sistema no soporta IPv6, se deshabilitarán las funciones IPv6 aunque "
+"estén habilitadas en la configuración\n"
 
 #: src/exit/gnunet-daemon-exit.c:3379
-msgid "Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use 
ENABLE_IPv4=YES\n"
-msgstr "No se puede habilitar salida IPv4 pero se deshabilita IPv4 sobre 
interfaz TUN, se usará ENABLE_IPv4=YES\n"
+msgid ""
+"Cannot enable IPv4 exit but disable IPv4 on TUN interface, will use "
+"ENABLE_IPv4=YES\n"
+msgstr ""
+"No se puede habilitar salida IPv4 pero se deshabilita IPv4 sobre interfaz "
+"TUN, se usará ENABLE_IPv4=YES\n"
 
 #: src/exit/gnunet-daemon-exit.c:3385
-msgid "Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use 
ENABLE_IPv6=YES\n"
-msgstr "No se pudo habilitar la salida IPv6 pero se deshabilita IPv6 sobre 
interfaz TUN, se usará ENABLE_IPv6=YES\n"
+msgid ""
+"Cannot enable IPv6 exit but disable IPv6 on TUN interface, will use "
+"ENABLE_IPv6=YES\n"
+msgstr ""
+"No se pudo habilitar la salida IPv6 pero se deshabilita IPv6 sobre interfaz "
+"TUN, se usará ENABLE_IPv6=YES\n"
 
 #: src/exit/gnunet-daemon-exit.c:3391 src/pt/gnunet-daemon-pt.c:884
 msgid "No useful service enabled.  Exiting.\n"
@@ -1756,7 +1943,9 @@
 #: src/fs/fs_api.c:1520
 #, c-format
 msgid "Failed to recover namespace `%s', cannot resume publishing operation.\n"
-msgstr "Se produjo un fallo al recuperar el espacio de nombres «%s», no se 
pudo retomar la operación de publicación.\n"
+msgstr ""
+"Se produjo un fallo al recuperar el espacio de nombres «%s», no se pudo "
+"retomar la operación de publicación.\n"
 
 #: src/fs/fs_api.c:1562
 #, c-format
@@ -1771,7 +1960,9 @@
 #: src/fs/fs_api.c:2229
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
-msgstr "Se produjo un fallo mientras se retomaba la operación de publicación 
«%s»: %s\n"
+msgstr ""
+"Se produjo un fallo mientras se retomaba la operación de publicación «%s»: "
+"%s\n"
 
 #: src/fs/fs_api.c:2239
 #, c-format
@@ -1791,33 +1982,45 @@
 #: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2897
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
-msgstr "Se produjo un fallo mientras se retomaba la operación de búsqueda 
«%s»: %s\n"
+msgstr ""
+"Se produjo un fallo mientras se retomaba la operación de búsqueda «%s»: %s\n"
 
 #: src/fs/fs_api.c:2595
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
-msgstr "Se produjo un fallo al retomar la sub-descarga «%s»: no se pudo abrir 
el fichero «%s»\n"
+msgstr ""
+"Se produjo un fallo al retomar la sub-descarga «%s»: no se pudo abrir el "
+"fichero «%s»\n"
 
 #: src/fs/fs_api.c:2841
 msgid "Could not resume running search, will resume as paused search\n"
-msgstr "No se pudo retomar la búsqueda en ejecución, se retomará como una 
búsqueda en pausa\n"
+msgstr ""
+"No se pudo retomar la búsqueda en ejecución, se retomará como una búsqueda "
+"en pausa\n"
 
 #: src/fs/fs_api.c:2935
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
-msgstr "Se produjo un fallo mientras se retomaba de la operación de descarga 
«%s»: %s\n"
+msgstr ""
+"Se produjo un fallo mientras se retomaba de la operación de descarga «%s»: "
+"%s\n"
 
 #: src/fs/fs_directory.c:210
 msgid "MAGIC mismatch.  This is not a GNUnet directory.\n"
 msgstr "No hay coincidencia con «MAGIC».  Esto no es un directorio GNUnet.\n"
 
 #: src/fs/fs_download.c:321
-msgid "Recursive downloads of directories larger than 4 GB are not supported 
on 32-bit systems\n"
-msgstr "Las descargas recursivas de directorios mayores de 4GB no están 
soportadas en sistemas de 32 bits\n"
+msgid ""
+"Recursive downloads of directories larger than 4 GB are not supported on 32-"
+"bit systems\n"
+msgstr ""
+"Las descargas recursivas de directorios mayores de 4GB no están soportadas "
+"en sistemas de 32 bits\n"
 
 #: src/fs/fs_download.c:341
 msgid "Directory too large for system address space\n"
-msgstr "Directorio demasiado grande para el espacio de direccionamiento del 
sistema\n"
+msgstr ""
+"Directorio demasiado grande para el espacio de direccionamiento del sistema\n"
 
 #: src/fs/fs_download.c:507 src/fs/fs_download.c:519
 #, c-format
@@ -1827,12 +2030,18 @@
 #: src/fs/fs_download.c:888
 #, c-format
 msgid "Failed to create directory for recursive download of `%s'\n"
-msgstr "Se produjo un fallo al crear el directorio para la descarga recursiva 
de «%s»\n"
+msgstr ""
+"Se produjo un fallo al crear el directorio para la descarga recursiva de "
+"«%s»\n"
 
 #: src/fs/fs_download.c:970
 #, c-format
-msgid "Internal error or bogus download URI (expected %u bytes at depth %u and 
offset %llu/%llu, got %u bytes)"
-msgstr "Error interno o URI de descarga defectuosa (se esperaban %u bytes a 
profundidad %u y desplazamiento %llu/%llu, se obtuvieron %u bytes)"
+msgid ""
+"Internal error or bogus download URI (expected %u bytes at depth %u and "
+"offset %llu/%llu, got %u bytes)"
+msgstr ""
+"Error interno o URI de descarga defectuosa (se esperaban %u bytes a "
+"profundidad %u y desplazamiento %llu/%llu, se obtuvieron %u bytes)"
 
 #: src/fs/fs_download.c:996
 msgid "internal error decrypting content"
@@ -1846,12 +2055,15 @@
 #: src/fs/fs_download.c:1029
 #, c-format
 msgid "Failed to seek to offset %llu in file `%s': %s"
-msgstr "Se produjo un fallo al buscar en el desplazamiento %llu del fichero 
«%s»: %s"
+msgstr ""
+"Se produjo un fallo al buscar en el desplazamiento %llu del fichero «%s»: %s"
 
 #: src/fs/fs_download.c:1038
 #, c-format
 msgid "Failed to write block of %u bytes at offset %llu in file `%s': %s"
-msgstr "Se produjo un fallo al escribir el bloque de %u bytes en el 
desplazamiento %llu del fichero «%s»: %s"
+msgstr ""
+"Se produjo un fallo al escribir el bloque de %u bytes en el desplazamiento "
+"%llu del fichero «%s»: %s"
 
 #: src/fs/fs_download.c:1136
 msgid "internal error decoding tree"
@@ -1863,8 +2075,12 @@
 
 #: src/fs/fs_getopt.c:192
 #, c-format
-msgid "Unknown metadata type in metadata option `%s'.  Using metadata type 
`unknown' instead.\n"
-msgstr "Tipo de metadatos desconocido en la opción de metadatos «%s».  Usando 
el tipo de metadatos desconocido (unknown) en su lugar.\n"
+msgid ""
+"Unknown metadata type in metadata option `%s'.  Using metadata type "
+"`unknown' instead.\n"
+msgstr ""
+"Tipo de metadatos desconocido en la opción de metadatos «%s».  Usando el "
+"tipo de metadatos desconocido (unknown) en su lugar.\n"
 
 # Miguel: "Failed to receive (valid) response" no lo he traducido
 # "por se produjo un fallo al recibir una respuesta", sino
@@ -1873,12 +2089,15 @@
 #: src/fs/fs_list_indexed.c:90
 #, c-format
 msgid "Failed to receive response for `%s' request from `%s' service.\n"
-msgstr "No se ha recibido la respuesta para la petición «%s» del servicio 
«%s».\n"
+msgstr ""
+"No se ha recibido la respuesta para la petición «%s» del servicio «%s».\n"
 
 #: src/fs/fs_list_indexed.c:113
 #, c-format
 msgid "Failed to receive valid response for `%s' request from `%s' service.\n"
-msgstr "No se ha recibido una respuesta válida para la petición «%s» del 
servicio «%s».\n"
+msgstr ""
+"No se ha recibido una respuesta válida para la petición «%s» del servicio "
+"«%s».\n"
 
 #: src/fs/fs_list_indexed.c:151
 #, c-format
@@ -1890,47 +2109,52 @@
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "No se encontró el tipo MIME «%s» en la lista de extensiones.\n"
 
-#: src/fs/fs_namespace_advertise.c:150
-msgid "Unknown error"
-msgstr "Error desconocido"
-
-#: src/fs/fs_namespace_advertise.c:238 src/fs/fs_namespace_advertise.c:259
-msgid "Failed to serialize meta data"
-msgstr "Se produjo un fallo al serializar metadatos"
-
-#: src/fs/fs_namespace_advertise.c:278
-msgid "Failed to connect to datastore service"
-msgstr "Se produjo un fallo al conectar con el servicio de almacenamiento"
-
-#: src/fs/fs_namespace.c:110
+#: src/fs/fs_namespace.c:104
 #, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Se produjo un fallo al abrir «%s» para escritura: %s\n"
 
-#: src/fs/fs_namespace.c:132 src/fs/fs_namespace.c:220
+#: src/fs/fs_namespace.c:126 src/fs/fs_namespace.c:214
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 
+#: src/fs/fs_namespace.c:240 src/fs/fs_namespace.c:284
+#: src/fs/fs_namespace.c:330
+msgid "Can't determine where namespace directory is\n"
+msgstr ""
+
 #: src/fs/fs_namespace.c:252
 #, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
-msgstr "Se produjo un fallo al crear o leer la clave privada para el espacio 
de nombres «%s»\n"
+msgstr ""
+"Se produjo un fallo al crear o leer la clave privada para el espacio de "
+"nombres «%s»\n"
 
-#: src/fs/fs_namespace.c:367
+#: src/fs/fs_namespace.c:296
+#, fuzzy, c-format
+msgid "Failed to read private key for namespace `%s'\n"
+msgstr ""
+"Se produjo un fallo al crear o leer la clave privada para el espacio de "
+"nombres «%s»\n"
+
+#: src/fs/fs_namespace.c:467
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
-msgstr "Se produjo un fallo al leer el fichero de la clave privada del espacio 
de nombres «%s», ¡borrándolo!\n"
+msgstr ""
+"Se produjo un fallo al leer el fichero de la clave privada del espacio de "
+"nombres «%s», ¡borrándolo!\n"
 
-#: src/fs/fs_namespace.c:558
-msgid "Identifiers or URI too long to create SBlock"
+#: src/fs/fs_namespace.c:659
+#, fuzzy
+msgid "Identifiers or URI too long to create UBlock"
 msgstr "Identificadores o URI demasiado largos para crear un bloque S (SBlock)"
 
-#: src/fs/fs_namespace.c:593 src/fs/fs_publish_ksk.c:295
+#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:307
 msgid "Internal error."
 msgstr "Error interno."
 
-#: src/fs/fs_namespace.c:636
+#: src/fs/fs_namespace.c:747
 msgid "Failed to connect to datastore."
 msgstr "Se produjo un fallo al conectar con el almacén de datos."
 
@@ -1947,7 +2171,9 @@
 
 #: src/fs/fs_publish.c:624
 msgid "timeout on index-start request to `fs' service"
-msgstr "expiración del plazo en la petición de inicio de indexado 
(index-start) al servicio «fs»"
+msgstr ""
+"expiración del plazo en la petición de inicio de indexado (index-start) al "
+"servicio «fs»"
 
 #: src/fs/fs_publish.c:636
 msgid "unknown error"
@@ -1968,7 +2194,8 @@
 #: src/fs/fs_publish.c:747
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
-msgstr "Se produjo un fallo al obtener los identificadores de fichero para 
«%s»\n"
+msgstr ""
+"Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
 #: src/fs/fs_publish.c:812
 #, c-format
@@ -1994,14 +2221,20 @@
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr "Reservando espacio para %u entradas y %llu bytes para publicación\n"
 
-#: src/fs/fs_publish_ksk.c:258
+#: src/fs/fs_publish_ksk.c:269
 msgid "Could not connect to datastore."
 msgstr "No se pudo conectar con el almacén de datos."
 
-#: src/fs/fs_search.c:892
+#: src/fs/fs_search.c:742
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s': %s\n"
+msgstr "Se produjo un fallo al procesar la URI: %s\n"
+
+#: src/fs/fs_search.c:800
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
-msgstr "Se obtuvo un resultado con un tipo desconocido de bloque «%d», 
ignorándolo"
+msgstr ""
+"Se obtuvo un resultado con un tipo desconocido de bloque «%d», ignorándolo"
 
 #: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
@@ -2025,7 +2258,8 @@
 
 #: src/fs/fs_unindex.c:293
 msgid "Failed to connect to FS service for unindexing."
-msgstr "Se produjo un fallo al conectar con el servicio «FS» para el 
desindexado."
+msgstr ""
+"Se produjo un fallo al conectar con el servicio «FS» para el desindexado."
 
 #: src/fs/fs_unindex.c:349 src/fs/fs_unindex.c:361
 msgid "Failed to get KSKs from directory scan."
@@ -2037,24 +2271,21 @@
 msgstr "Error interno escaneando «%s».\n"
 
 #: src/fs/fs_unindex.c:416
-#, c-format
-msgid "Failed to remove KBlock: %s\n"
+#, fuzzy, c-format
+msgid "Failed to remove UBlock: %s\n"
 msgstr "Se produjo un fallo al eliminar el KBlock: %s\n"
 
-#: src/fs/fs_unindex.c:506
-#, c-format
-msgid "Failed to parse URI `%s' from KBlock!\n"
-msgstr "¡Se produjo un fallo al procesar la URI «%s» del KBlock!\n"
-
-#: src/fs/fs_unindex.c:558 src/fs/fs_unindex.c:623
+#: src/fs/fs_unindex.c:566 src/fs/fs_unindex.c:633
 msgid "Failed to connect to `datastore' service."
-msgstr "Se produjo un fallo al conectar con el servicio de almacenamiento de 
datos (datastore)."
+msgstr ""
+"Se produjo un fallo al conectar con el servicio de almacenamiento de datos "
+"(datastore)."
 
-#: src/fs/fs_unindex.c:636
+#: src/fs/fs_unindex.c:646
 msgid "Failed to open file for unindexing."
 msgstr "Se produjo un fallo al abrir el fichero para desindexado."
 
-#: src/fs/fs_unindex.c:670
+#: src/fs/fs_unindex.c:680
 msgid "Failed to compute hash of file."
 msgstr "Se produjo un fallo al calcular el hash del fichero."
 
@@ -2076,57 +2307,65 @@
 msgid "Quotes not balanced in KSK URI"
 msgstr "Comillas no cerradas en URI KSK"
 
-#: src/fs/fs_uri.c:373 src/fs/fs_uri.c:380
+#: src/fs/fs_uri.c:375
 msgid "Malformed SKS URI"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:424 src/fs/fs_uri.c:439
+#: src/fs/fs_uri.c:418 src/fs/fs_uri.c:433
 msgid "Malformed CHK URI"
 msgstr "URI CHK mal formada"
 
-#: src/fs/fs_uri.c:569 src/fs/fs_uri.c:584 src/fs/fs_uri.c:594
-#: src/fs/fs_uri.c:622
+#: src/fs/fs_uri.c:563 src/fs/fs_uri.c:578 src/fs/fs_uri.c:588
+#: src/fs/fs_uri.c:616
 msgid "SKS URI malformed"
 msgstr "URI SKS mal formada"
 
-#: src/fs/fs_uri.c:604
+#: src/fs/fs_uri.c:598
 msgid "SKS URI malformed (could not decode public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
 
-#: src/fs/fs_uri.c:610
+#: src/fs/fs_uri.c:604
 msgid "SKS URI malformed (could not find signature)"
 msgstr "URI SKS mal formada (no se pudo encontrar la firma)"
 
-#: src/fs/fs_uri.c:616
+#: src/fs/fs_uri.c:610
 msgid "SKS URI malformed (could not decode signature)"
 msgstr "URI SKS mal formada (no se pudo decodificar la firma)"
 
-#: src/fs/fs_uri.c:629
+#: src/fs/fs_uri.c:623
 msgid "SKS URI malformed (could not parse expiration time)"
 msgstr "URI SKS mal formada (no se encuentra el tiempo de expiración)"
 
-#: src/fs/fs_uri.c:641
+#: src/fs/fs_uri.c:635
 msgid "SKS URI malformed (signature failed validation)"
 msgstr "URI SKS mal formada (se produjo un fallo al validar la firma)"
 
-#: src/fs/fs_uri.c:679
+#: src/fs/fs_uri.c:673
 msgid "Unrecognized URI type"
 msgstr "Tipo de URI no reconocido"
 
-#: src/fs/fs_uri.c:904
+#: src/fs/fs_uri.c:898
 msgid "Lacking key configuration settings.\n"
 msgstr "Falta configuración sobre las opciones de claves.\n"
 
-#: src/fs/fs_uri.c:910
+#: src/fs/fs_uri.c:904
 #, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "No se pudo acceder al fichero de clave de máquina «%s».\n"
 
-#: src/fs/fs_uri.c:1115 src/fs/fs_uri.c:1142
+#: src/fs/fs_uri.c:944
+msgid "identifier is NULL!"
+msgstr ""
+
+#: src/fs/fs_uri.c:949
+msgid "identifier has zero length!"
+msgstr ""
+
+#: src/fs/fs_uri.c:1118 src/fs/fs_uri.c:1145
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/fs/fs_uri.c:1148
+#: src/fs/fs_uri.c:1151
 msgid "Number of double-quotes not balanced!\n"
 msgstr "¡Número de comillas dobles no balanceado!\n"
 
@@ -2158,17 +2397,21 @@
 
 #: src/fs/gnunet-auto-share.c:686
 #, c-format
-msgid "You must specify one and only one directory name for automatic 
publication.\n"
-msgstr "Debes especificar uno y solo un nombre de directorio para publicación 
automática.\n"
+msgid ""
+"You must specify one and only one directory name for automatic publication.\n"
+msgstr ""
+"Debes especificar uno y solo un nombre de directorio para publicación "
+"automática.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:279
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:302
 #: src/fs/gnunet-publish.c:683
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del emisor"
 
 #: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:687
 msgid "disable adding the creation time to the metadata of the uploaded file"
-msgstr "deshabilitar añadir tiempo de creación a los metadatos del fichero 
subido"
+msgstr ""
+"deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
 
 #: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:690
 msgid "do not use libextractor to add keywords or metadata"
@@ -2178,7 +2421,7 @@
 msgid "specify the priority of the content"
 msgstr "especificar la prioridad del contenido"
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:304
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:327
 #: src/fs/gnunet-publish.c:721
 msgid "set the desired replication LEVEL"
 msgstr "establece el nivel LEVEL deseado de replicación"
@@ -2235,8 +2478,12 @@
 
 #: src/fs/gnunet-download.c:157
 #, c-format
-msgid "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to 
download\n"
-msgstr "Descargando «%s» en %llu/%llu (%s restantes, %s/s). El bloque tardó %s 
en descargarse\n"
+msgid ""
+"Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
+"download\n"
+msgstr ""
+"Descargando «%s» en %llu/%llu (%s restantes, %s/s). El bloque tardó %s en "
+"descargarse\n"
 
 #: src/fs/gnunet-download.c:179
 #, c-format
@@ -2306,8 +2553,12 @@
 msgstr "descarga un directorio de GNUnet recursivamente"
 
 #: src/fs/gnunet-download.c:339
-msgid "Download files from GNUnet using a GNUnet CHK or LOC URI 
(gnunet://fs/chk/...)"
-msgstr "Descargar ficheros de GNUnet usando una URI GNUnet CHK o LOC 
(gnunet://fs/chk/...)"
+msgid ""
+"Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
+"chk/...)"
+msgstr ""
+"Descargar ficheros de GNUnet usando una URI GNUnet CHK o LOC (gnunet://fs/"
+"chk/...)"
 
 #: src/fs/gnunet-fs.c:117
 msgid "print a list of all indexed files"
@@ -2323,7 +2574,9 @@
 
 #: src/fs/gnunet-fs-profiler.c:185
 msgid "specifies name of a file with the HOSTS the testbed should use"
-msgstr "especifica el nombre de un fichero con las máquinas (HOSTS) que la 
batería de pruebas debería usar"
+msgstr ""
+"especifica el nombre de un fichero con las máquinas (HOSTS) que la batería "
+"de pruebas debería usar"
 
 #: src/fs/gnunet-fs-profiler.c:188
 msgid "automatically terminate experiment after DELAY"
@@ -2331,56 +2584,62 @@
 
 #: src/fs/gnunet-fs-profiler.c:197
 msgid "run a testbed to measure file-sharing performance"
-msgstr "ejecuta una batería de pruebas para medir el rendimiento de la 
compartición de ficheros"
+msgstr ""
+"ejecuta una batería de pruebas para medir el rendimiento de la compartición "
+"de ficheros"
 
-#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:283
+#: src/fs/gnunet-pseudonym.c:178 src/statistics/gnunet-statistics.c:283
 #, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/fs/gnunet-pseudonym.c:250 src/fs/gnunet-pseudonym.c:257
-#: src/fs/gnunet-pseudonym.c:259
+#: src/fs/gnunet-pseudonym.c:273 src/fs/gnunet-pseudonym.c:280
+#: src/fs/gnunet-pseudonym.c:282
 #, c-format
 msgid "Option `%s' ignored\n"
 msgstr "Opción «%s» ignorada\n"
 
-#: src/fs/gnunet-pseudonym.c:282
+#: src/fs/gnunet-pseudonym.c:305
 msgid "create or advertise namespace NAME"
 msgstr "crear o anunciar un nombre de espacio de nombres (NAME)"
 
-#: src/fs/gnunet-pseudonym.c:285
+#: src/fs/gnunet-pseudonym.c:308
 msgid "delete namespace NAME "
 msgstr "borrar un nombre de espacio de nombres (NAME)"
 
-#: src/fs/gnunet-pseudonym.c:288
-msgid "add an additional keyword for the advertisment (this option can be 
specified multiple times)"
-msgstr "añade una palabra clave adicional para el anuncio (esta opción puede 
ser especificada varias veces)"
+#: src/fs/gnunet-pseudonym.c:311
+msgid ""
+"add an additional keyword for the advertisment (this option can be specified "
+"multiple times)"
+msgstr ""
+"añade una palabra clave adicional para el anuncio (esta opción puede ser "
+"especificada varias veces)"
 
-#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:702
+#: src/fs/gnunet-pseudonym.c:315 src/fs/gnunet-publish.c:702
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "establece los metadatos para el tipo TYPE dado al valor VALUE dado"
 
-#: src/fs/gnunet-pseudonym.c:295
+#: src/fs/gnunet-pseudonym.c:318
 msgid "print names of local namespaces"
 msgstr "imprime los nombres de los espacios de nombres locales"
 
-#: src/fs/gnunet-pseudonym.c:298
+#: src/fs/gnunet-pseudonym.c:321
 msgid "use the given PRIORITY for the advertisments"
 msgstr "usa la prioridad (PRIORITY) dada para los anuncios"
 
-#: src/fs/gnunet-pseudonym.c:301
+#: src/fs/gnunet-pseudonym.c:324
 msgid "do not print names of remote namespaces"
 msgstr "no imprime los nombres de los espacios de nombres remotos"
 
-#: src/fs/gnunet-pseudonym.c:307
+#: src/fs/gnunet-pseudonym.c:330
 msgid "specify ID of the root of the namespace"
 msgstr "especifica la identificación (ID) del espacio de nombres raíz"
 
-#: src/fs/gnunet-pseudonym.c:310
+#: src/fs/gnunet-pseudonym.c:333
 msgid "change rating of namespace ID by VALUE"
 msgstr "cambia la valoración del espacio de nombres «ID» al valor «VALUE»"
 
-#: src/fs/gnunet-pseudonym.c:322
+#: src/fs/gnunet-pseudonym.c:345
 msgid "Manage GNUnet pseudonyms."
 msgstr "Gestionar seudónimos de GNUnet."
 
@@ -2421,7 +2680,9 @@
 #: src/fs/gnunet-publish.c:363 src/fs/gnunet-publish.c:617
 #, c-format
 msgid "Failed to create namespace `%s' (illegal filename?)\n"
-msgstr "Se produjo un fallo al crear el espacio de nombres «%s» (¿nombre de 
fichero ilegal?).\n"
+msgstr ""
+"Se produjo un fallo al crear el espacio de nombres «%s» (¿nombre de fichero "
+"ilegal?).\n"
 
 #: src/fs/gnunet-publish.c:438
 msgid "Could not publish\n"
@@ -2495,40 +2756,73 @@
 msgstr "Se produjo un fallo al acceder «%s»: %s\n"
 
 #: src/fs/gnunet-publish.c:662
-msgid "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs 
installed?\n"
-msgstr "Se produjo un fallo al iniciar el meta-escáner de directorios.  ¿Está 
«gnunet-helper-publish-fs» instalado?\n"
+msgid ""
+"Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
+"installed?\n"
+msgstr ""
+"Se produjo un fallo al iniciar el meta-escáner de directorios.  ¿Está "
+"«gnunet-helper-publish-fs» instalado?\n"
 
 #: src/fs/gnunet-publish.c:694
-msgid "print list of extracted keywords that would be used, but do not perform 
upload"
-msgstr "imprimir una lista de las palabras clave extraídas que podrían ser 
usadas, pero sin realizar la subida"
+msgid ""
+"print list of extracted keywords that would be used, but do not perform "
+"upload"
+msgstr ""
+"imprimir una lista de las palabras clave extraídas que podrían ser usadas, "
+"pero sin realizar la subida"
 
 #: src/fs/gnunet-publish.c:698
-msgid "add an additional keyword for the top-level file or directory (this 
option can be specified multiple times)"
-msgstr "añadir una palabra clave adicional para el fichero del nivel más alto 
o el directorio (esta opción puede ser especificada varias veces)"
+msgid ""
+"add an additional keyword for the top-level file or directory (this option "
+"can be specified multiple times)"
+msgstr ""
+"añadir una palabra clave adicional para el fichero del nivel más alto o el "
+"directorio (esta opción puede ser especificada varias veces)"
 
 #: src/fs/gnunet-publish.c:705
-msgid "do not index, perform full insertion (stores entire file in encrypted 
form in GNUnet database)"
-msgstr "no indexar, hacer inserciones totales (almacena el fichero entero de 
forma cifrada en la base de datos de GNUnet)"
+msgid ""
+"do not index, perform full insertion (stores entire file in encrypted form "
+"in GNUnet database)"
+msgstr ""
+"no indexar, hacer inserciones totales (almacena el fichero entero de forma "
+"cifrada en la base de datos de GNUnet)"
 
 #: src/fs/gnunet-publish.c:710
-msgid "specify ID of an updated version to be published in the future (for 
namespace insertions only)"
-msgstr "especificar la ID de una versión actualizada para ser publicada en el 
futuro (para inserciones en el espacio de nombres únicamente)"
+msgid ""
+"specify ID of an updated version to be published in the future (for "
+"namespace insertions only)"
+msgstr ""
+"especificar la ID de una versión actualizada para ser publicada en el futuro "
+"(para inserciones en el espacio de nombres únicamente)"
 
 #: src/fs/gnunet-publish.c:718
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
-msgstr "publicar los ficheros bajo el seudónimo NAME (coloca el fichero en el 
espacio)"
+msgstr ""
+"publicar los ficheros bajo el seudónimo NAME (coloca el fichero en el "
+"espacio)"
 
 #: src/fs/gnunet-publish.c:724
-msgid "only simulate the process but do not do any actual publishing (useful 
to compute URIs)"
-msgstr "únicamente simular el proceso pero no publicar nada realmente (útil 
para calcular URI)"
+msgid ""
+"only simulate the process but do not do any actual publishing (useful to "
+"compute URIs)"
+msgstr ""
+"únicamente simular el proceso pero no publicar nada realmente (útil para "
+"calcular URI)"
 
 #: src/fs/gnunet-publish.c:728
-msgid "set the ID of this version of the publication (for namespace insertions 
only)"
-msgstr "establece la ID de esta versión de la publicación (para inserciones en 
el espacio únicamente)"
+msgid ""
+"set the ID of this version of the publication (for namespace insertions only)"
+msgstr ""
+"establece la ID de esta versión de la publicación (para inserciones en el "
+"espacio únicamente)"
 
 #: src/fs/gnunet-publish.c:732
-msgid "URI to be published (can be used instead of passing a file to add 
keywords to the file with the respective URI)"
-msgstr "URI a ser publicada (puede ser usado en vez de pasar un fichero para 
añadir claves con el fichero con la URI respectiva)"
+msgid ""
+"URI to be published (can be used instead of passing a file to add keywords "
+"to the file with the respective URI)"
+msgstr ""
+"URI a ser publicada (puede ser usado en vez de pasar un fichero para añadir "
+"claves con el fichero con la URI respectiva)"
 
 #: src/fs/gnunet-publish.c:748
 msgid "Publish a file or directory on GNUnet"
@@ -2537,7 +2831,9 @@
 #: src/fs/gnunet-search.c:114
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
-msgstr "Se produjo un fallo al escribir el directorio con los resultados de 
búsqueda de «%s»\n"
+msgstr ""
+"Se produjo un fallo al escribir el directorio con los resultados de búsqueda "
+"de «%s»\n"
 
 #: src/fs/gnunet-search.c:184
 #, c-format
@@ -2572,11 +2868,11 @@
 msgid "# running average P2P latency (ms)"
 msgstr "# latencia media de P2P en ejecución (ms)"
 
-#: src/fs/gnunet-service-fs.c:309 src/fs/gnunet-service-fs.c:523
+#: src/fs/gnunet-service-fs.c:309 src/fs/gnunet-service-fs.c:521
 msgid "# Loopback routes suppressed"
 msgstr "# Rutas en bucle local eliminadas"
 
-#: src/fs/gnunet-service-fs.c:628 src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/fs/gnunet-service-fs.c:626 src/hostlist/gnunet-daemon-hostlist.c:297
 #: src/topology/gnunet-daemon-topology.c:1322
 #: src/topology/gnunet-daemon-topology.c:1329
 #, c-format
@@ -2600,7 +2896,7 @@
 msgid "# replies dropped"
 msgstr "# respuestas omitidas"
 
-#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1345
+#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P searches active"
 msgstr "# busquedas P2P activas"
 
@@ -2636,31 +2932,31 @@
 msgid "# requests done for a price (normal load)"
 msgstr "# peticiones realizadas por un precio (carga normal)"
 
-#: src/fs/gnunet-service-fs_cp.c:1170
+#: src/fs/gnunet-service-fs_cp.c:1169
 msgid "# GET requests received (from other peers)"
 msgstr "# peticiones «GET» recibidas (de otros pares)"
 
-#: src/fs/gnunet-service-fs_cp.c:1204
+#: src/fs/gnunet-service-fs_cp.c:1203
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# peticiones omitidas debido a que el iniciador no está conectado"
 
-#: src/fs/gnunet-service-fs_cp.c:1227
+#: src/fs/gnunet-service-fs_cp.c:1226
 msgid "# requests dropped due to missing reverse route"
 msgstr "# peticiones omitidas debido a falta de ruta inversa"
 
-#: src/fs/gnunet-service-fs_cp.c:1288
+#: src/fs/gnunet-service-fs_cp.c:1276
 msgid "# requests dropped due TTL underflow"
 msgstr "# peticiones omitidas debido a expiración del TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1314
+#: src/fs/gnunet-service-fs_cp.c:1300
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# peticiones omitidas debido a una petición de mayor TTL"
 
-#: src/fs/gnunet-service-fs_cp.c:1343
+#: src/fs/gnunet-service-fs_cp.c:1329
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes de búsqueda P2P recibidos y procesados"
 
-#: src/fs/gnunet-service-fs_cp.c:1713
+#: src/fs/gnunet-service-fs_cp.c:1699
 msgid "# migration stop messages sent"
 msgstr "# mensajes de detención de migración enviados"
 
@@ -2677,13 +2973,18 @@
 
 #: src/fs/gnunet-service-fs_indexing.c:237
 #, c-format
-msgid "Index request received for file `%s' is already indexed as `%s'.  
Permitting anyway.\n"
-msgstr "La petición de indexado recibida para el fichero «%s» ya está indexada 
como «%s».  Se permite de todos modos.\n"
+msgid ""
+"Index request received for file `%s' is already indexed as `%s'.  Permitting "
+"anyway.\n"
+msgstr ""
+"La petición de indexado recibida para el fichero «%s» ya está indexada como "
+"«%s».  Se permite de todos modos.\n"
 
 #: src/fs/gnunet-service-fs_indexing.c:275
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
-msgstr "Hash no asociado intentando indexar el fichero «%s» que tiene hash 
«%s»\n"
+msgstr ""
+"Hash no asociado intentando indexar el fichero «%s» que tiene hash «%s»\n"
 
 #: src/fs/gnunet-service-fs_indexing.c:477
 #, c-format
@@ -2697,7 +2998,9 @@
 #: src/fs/gnunet-service-fs_indexing.c:557
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
-msgstr "No se pudo acceder al fichero indexado «%s» (%s) en el desplazamiento 
%llu: %s\n"
+msgstr ""
+"No se pudo acceder al fichero indexado «%s» (%s) en el desplazamiento %llu: "
+"%s\n"
 
 #: src/fs/gnunet-service-fs_indexing.c:559
 msgid "not indexed"
@@ -2722,7 +3025,8 @@
 
 #: src/fs/gnunet-service-fs_lc.c:363
 msgid "# client searches updated (merged content seen list)"
-msgstr "# búsquedas de clientes actualizadas (contenido unido visto en la 
lista)"
+msgstr ""
+"# búsquedas de clientes actualizadas (contenido unido visto en la lista)"
 
 #: src/fs/gnunet-service-fs_pe.c:269
 msgid "# average retransmission delay (ms)"
@@ -2758,107 +3062,108 @@
 msgid "# query plan entries"
 msgstr "# entradas de planes de búsqueda"
 
-#: src/fs/gnunet-service-fs_pr.c:312
+#: src/fs/gnunet-service-fs_pr.c:310
 msgid "# Pending requests created"
 msgstr "# Peticiones pendientes creadas"
 
-#: src/fs/gnunet-service-fs_pr.c:404 src/fs/gnunet-service-fs_pr.c:667
+#: src/fs/gnunet-service-fs_pr.c:393 src/fs/gnunet-service-fs_pr.c:644
 msgid "# Pending requests active"
 msgstr "# Peticiones pendientes activas"
 
-#: src/fs/gnunet-service-fs_pr.c:835
+#: src/fs/gnunet-service-fs_pr.c:812
 msgid "# replies received and matched"
 msgstr "# respuestas recibidas y asociadas"
 
-#: src/fs/gnunet-service-fs_pr.c:868
+#: src/fs/gnunet-service-fs_pr.c:842
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr "# respuestas duplicadas descartadas (bloomfilter)"
 
-#: src/fs/gnunet-service-fs_pr.c:877
+#: src/fs/gnunet-service-fs_pr.c:851
 msgid "# irrelevant replies discarded"
 msgstr "# respuestas irrelevantes descartadas"
 
-#: src/fs/gnunet-service-fs_pr.c:891
+#: src/fs/gnunet-service-fs_pr.c:865
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/fs/gnunet-service-fs_pr.c:904
+#: src/fs/gnunet-service-fs_pr.c:878
 msgid "# results found locally"
 msgstr "# resultados hallados localmente"
 
-#: src/fs/gnunet-service-fs_pr.c:1025
+#: src/fs/gnunet-service-fs_pr.c:999
 msgid "# Datastore `PUT' failures"
 msgstr "# «PUT» en el almacén de datos fallidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1052
+#: src/fs/gnunet-service-fs_pr.c:1026
 msgid "# storage requests dropped due to high load"
 msgstr "# peticiones de almacenamiento omitidas debido a alta carga"
 
-#: src/fs/gnunet-service-fs_pr.c:1087
+#: src/fs/gnunet-service-fs_pr.c:1061
 msgid "# Replies received from DHT"
 msgstr "# Respuestas recibidas de la DHT"
 
-#: src/fs/gnunet-service-fs_pr.c:1221
+#: src/fs/gnunet-service-fs_pr.c:1189
 msgid "# Replies received from STREAM"
 msgstr "# Respuestas recibidas de «STREAM»"
 
-#: src/fs/gnunet-service-fs_pr.c:1273
+#: src/fs/gnunet-service-fs_pr.c:1241
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr "¡La búsqueda en el almacén de datos toma %s!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1293
+#: src/fs/gnunet-service-fs_pr.c:1261
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr "¡La búsqueda en bajo demanda toma %s!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1340
+#: src/fs/gnunet-service-fs_pr.c:1308
 msgid "# Datastore lookups concluded (no results)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (sin resultados)"
 
-#: src/fs/gnunet-service-fs_pr.c:1355
+#: src/fs/gnunet-service-fs_pr.c:1323
 msgid "# Datastore lookups concluded (seen all)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (vistos todos)"
 
-#: src/fs/gnunet-service-fs_pr.c:1364
+#: src/fs/gnunet-service-fs_pr.c:1332
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (más de «MAX_RESULTS»)"
 
-#: src/fs/gnunet-service-fs_pr.c:1379
+#: src/fs/gnunet-service-fs_pr.c:1347
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr "# «DBLOCK» o «IBLOCK» pedido no encontrado"
 
-#: src/fs/gnunet-service-fs_pr.c:1393
+#: src/fs/gnunet-service-fs_pr.c:1361
 msgid "# on-demand blocks matched requests"
 msgstr "# peticiones asociadas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1406
+#: src/fs/gnunet-service-fs_pr.c:1374
 msgid "# on-demand lookups performed successfully"
 msgstr "# búsquedas satisfactorias de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1411
+#: src/fs/gnunet-service-fs_pr.c:1379
 msgid "# on-demand lookups failed"
 msgstr "# búsquedas fallidas de bloques bajo demanda"
 
-#: src/fs/gnunet-service-fs_pr.c:1438 src/fs/gnunet-service-fs_pr.c:1478
-#: src/fs/gnunet-service-fs_pr.c:1619
+#: src/fs/gnunet-service-fs_pr.c:1406 src/fs/gnunet-service-fs_pr.c:1446
+#: src/fs/gnunet-service-fs_pr.c:1587
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (error encolando)"
 
-#: src/fs/gnunet-service-fs_pr.c:1496
+#: src/fs/gnunet-service-fs_pr.c:1464
 msgid "# Datastore lookups concluded (found last result)"
-msgstr "# Búsquedas en el almacén de datos finalizadas (encontrado último 
resultado)"
+msgstr ""
+"# Búsquedas en el almacén de datos finalizadas (encontrado último resultado)"
 
-#: src/fs/gnunet-service-fs_pr.c:1507
+#: src/fs/gnunet-service-fs_pr.c:1475
 msgid "# Datastore lookups concluded (load too high)"
 msgstr "# Búsquedas en el almacén de datos finalizadas (carga demasiado alta)"
 
-#: src/fs/gnunet-service-fs_pr.c:1595
+#: src/fs/gnunet-service-fs_pr.c:1563
 msgid "# Datastore lookups initiated"
 msgstr "# Búsquedas en el almacén de datos iniciadas"
 
-#: src/fs/gnunet-service-fs_pr.c:1680
+#: src/fs/gnunet-service-fs_pr.c:1648
 msgid "# GAP PUT messages received"
 msgstr "# Mensajes «GAP PUT» recibidos"
 
@@ -2920,11 +3225,14 @@
 
 #: src/gns/gns_api.c:598
 msgid "Failed to serialize lookup reply from GNS service!\n"
-msgstr "¡Se produjo un fallo al serializar la respuesta de la búsqueda desde 
el servicio GNS!\n"
+msgstr ""
+"¡Se produjo un fallo al serializar la respuesta de la búsqueda desde el "
+"servicio GNS!\n"
 
 #: src/gns/gnunet-dns2gns.c:192
 msgid "Failed to pack DNS response into UDP packet!\n"
-msgstr "¡Se produjo un fallo al empaquetar una respuesta DNS en un paquete 
UDP!\n"
+msgstr ""
+"¡Se produjo un fallo al empaquetar una respuesta DNS en un paquete UDP!\n"
 
 #: src/gns/gnunet-dns2gns.c:367
 #, c-format
@@ -2951,11 +3259,14 @@
 
 #: src/gns/gnunet-dns2gns.c:685
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
-msgstr "Sufijo FCFS autoritativo a usar (opcional); predeterminado: 
fcfs.zkey.eu"
+msgstr ""
+"Sufijo FCFS autoritativo a usar (opcional); predeterminado: fcfs.zkey.eu"
 
 #: src/gns/gnunet-dns2gns.c:688
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
-msgstr "Puerto UDP en el que escuchar para peticiones DNS entrantes; 
predeterminado: 53"
+msgstr ""
+"Puerto UDP en el que escuchar para peticiones DNS entrantes; predeterminado: "
+"53"
 
 #: src/gns/gnunet-dns2gns.c:701
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
@@ -2969,7 +3280,9 @@
 #: src/gns/gnunet-gns.c:335
 #, c-format
 msgid "Please specify lookup, shorten or authority operation!\n"
-msgstr "¡Por favor, especifique la operación: búsqueda (lookup), acortado 
(shorten) o autoridad (authority)!\n"
+msgstr ""
+"¡Por favor, especifique la operación: búsqueda (lookup), acortado (shorten) "
+"o autoridad (authority)!\n"
 
 #: src/gns/gnunet-gns.c:356
 msgid "try to shorten a given name"
@@ -3075,7 +3388,9 @@
 #: src/gns/gnunet-service-gns.c:486
 #, c-format
 msgid "Records for name `%s' in zone %s too large to fit into DHT"
-msgstr "Los registros para el nombre «%s» en la zona %s son demasiado grandes 
para entrar en la DHT"
+msgstr ""
+"Los registros para el nombre «%s» en la zona %s son demasiado grandes para "
+"entrar en la DHT"
 
 #: src/gns/gnunet-service-gns.c:1216
 msgid "Failed to connect to the namestore!\n"
@@ -3130,11 +3445,15 @@
 
 #: src/hello/hello.c:904
 msgid "Failed to parse HELLO message: missing expiration time\n"
-msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: falta el tiempo de 
expiración\n"
+msgstr ""
+"Se produjo un fallo al procesar un mensaje «HELLO»: falta el tiempo de "
+"expiración\n"
 
 #: src/hello/hello.c:913
 msgid "Failed to parse HELLO message: invalid expiration time\n"
-msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: tiempo de 
expiración no válido\n"
+msgstr ""
+"Se produjo un fallo al procesar un mensaje «HELLO»: tiempo de expiración no "
+"válido\n"
 
 #: src/hello/hello.c:923
 msgid "Failed to parse HELLO message: malformed\n"
@@ -3142,7 +3461,9 @@
 
 #: src/hello/hello.c:933
 msgid "Failed to parse HELLO message: missing transport plugin\n"
-msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: falta el módulo de 
transporte\n"
+msgstr ""
+"Se produjo un fallo al procesar un mensaje «HELLO»: falta el módulo de "
+"transporte\n"
 
 #: src/hello/hello.c:950
 #, c-format
@@ -3157,23 +3478,33 @@
 #: src/hello/hello.c:978
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
-msgstr "Se produjo un fallo al procesar «%s» como una dirección para el módulo 
«%s»\n"
+msgstr ""
+"Se produjo un fallo al procesar «%s» como una dirección para el módulo «%s»\n"
 
 #: src/hostlist/gnunet-daemon-hostlist.c:264
-msgid "None of the functions for the hostlist daemon were enabled.  I have no 
reason to run!\n"
-msgstr "Ninguna de las funciones para el demonio de listas de máquinas fue 
activada.  ¡No tengo razón para ejecutarme!\n"
+msgid ""
+"None of the functions for the hostlist daemon were enabled.  I have no "
+"reason to run!\n"
+msgstr ""
+"Ninguna de las funciones para el demonio de listas de máquinas fue "
+"activada.  ¡No tengo razón para ejecutarme!\n"
 
 #: src/hostlist/gnunet-daemon-hostlist.c:317
 msgid "advertise our hostlist to other peers"
 msgstr "anuncia nuestra lista de máquinas a otros pares"
 
 #: src/hostlist/gnunet-daemon-hostlist.c:322
-msgid "bootstrap using hostlists (it is highly recommended that you always use 
this option)"
-msgstr "realizar inicialización usando listas de máquinas (es altamente 
recomendable que siempre se use esta opción)"
+msgid ""
+"bootstrap using hostlists (it is highly recommended that you always use this "
+"option)"
+msgstr ""
+"realizar inicialización usando listas de máquinas (es altamente recomendable "
+"que siempre se use esta opción)"
 
 #: src/hostlist/gnunet-daemon-hostlist.c:325
 msgid "enable learning about hostlist servers from other peers"
-msgstr "habilitar aprendizaje de servidores de listas de máquinas de otros 
pares"
+msgstr ""
+"habilitar aprendizaje de servidores de listas de máquinas de otros pares"
 
 #: src/hostlist/gnunet-daemon-hostlist.c:329
 msgid "provide a hostlist server"
@@ -3203,14 +3534,14 @@
 #: src/hostlist/hostlist-client.c:469 src/hostlist/hostlist-client.c:680
 #: src/hostlist/hostlist-client.c:686 src/hostlist/hostlist-client.c:738
 #: src/hostlist/hostlist-client.c:747 src/hostlist/hostlist-client.c:868
-#: src/hostlist/hostlist-client.c:958 src/hostlist/hostlist-client.c:963
+#: src/hostlist/hostlist-client.c:960 src/hostlist/hostlist-client.c:965
 #: src/transport/plugin_transport_http_client.c:1052
 #: src/transport/plugin_transport_http_client.c:1067
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s falló en %s:%d: «%s».\n"
 
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1325
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1327
 msgid "# advertised hostlist URIs"
 msgstr "# URI de listas de máquinas anunciadas"
 
@@ -3221,13 +3552,18 @@
 
 #: src/hostlist/hostlist-client.c:661
 #, c-format
-msgid "Advertised hostlist with URI `%s' could not be downloaded. Advertised 
URI gets dismissed.\n"
-msgstr "Lista de máquinas anunciada con la URI «%s» no pudo ser descargada. La 
URI anunciada es descartada.\n"
+msgid ""
+"Advertised hostlist with URI `%s' could not be downloaded. Advertised URI "
+"gets dismissed.\n"
+msgstr ""
+"Lista de máquinas anunciada con la URI «%s» no pudo ser descargada. La URI "
+"anunciada es descartada.\n"
 
 #: src/hostlist/hostlist-client.c:799
 #, c-format
 msgid "Timeout trying to download hostlist from `%s'\n"
-msgstr "Finalizado el plazo mientras se intentaba bajar lista de máquinas de 
«%s»\n"
+msgstr ""
+"Finalizado el plazo mientras se intentaba bajar lista de máquinas de «%s»\n"
 
 #: src/hostlist/hostlist-client.c:813
 #, c-format
@@ -3258,76 +3594,84 @@
 msgid "# hostlist downloads initiated"
 msgstr "# descargas de listas de máquinas iniciadas"
 
-#: src/hostlist/hostlist-client.c:1035 src/hostlist/hostlist-client.c:1498
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1500
 msgid "# milliseconds between hostlist downloads"
 msgstr "# milisegundos entre descargas de listas de máquinas"
 
-#: src/hostlist/hostlist-client.c:1043
+#: src/hostlist/hostlist-client.c:1045
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
-msgstr "Hay %u/%u conexiones.  Se considerará descargar una lista de máquinas 
en %s\n"
+msgstr ""
+"Hay %u/%u conexiones.  Se considerará descargar una lista de máquinas en %s\n"
 
-#: src/hostlist/hostlist-client.c:1107 src/hostlist/hostlist-client.c:1123
+#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
 msgid "# active connections"
 msgstr "# conexiones activas"
 
-#: src/hostlist/hostlist-client.c:1273
+#: src/hostlist/hostlist-client.c:1275
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Cargando entradas guardadas de listas de máquinas del fichero «%s»\n"
 
-#: src/hostlist/hostlist-client.c:1277
+#: src/hostlist/hostlist-client.c:1279
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "El fichero de listas de máquinas «%s» no existe\n"
 
-#: src/hostlist/hostlist-client.c:1288
+#: src/hostlist/hostlist-client.c:1290
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
-msgstr "No se pudo abrir el fichero «%s» en modo lectura para cargar las 
listas de máquinas: %s\n"
+msgstr ""
+"No se pudo abrir el fichero «%s» en modo lectura para cargar las listas de "
+"máquinas: %s\n"
 
-#: src/hostlist/hostlist-client.c:1321
+#: src/hostlist/hostlist-client.c:1323
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr "%u URI de listas de máquinas cargadas del fichero\n"
 
-#: src/hostlist/hostlist-client.c:1323
+#: src/hostlist/hostlist-client.c:1325
 msgid "# hostlist URIs read from file"
 msgstr "# URI de listas de máquinas leídas de fichero"
 
-#: src/hostlist/hostlist-client.c:1368
+#: src/hostlist/hostlist-client.c:1370
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
-msgstr "No se pudo abrir el fichero «%s» en modo escritura para almacenar las 
listas de máquinas: %s\n"
+msgstr ""
+"No se pudo abrir el fichero «%s» en modo escritura para almacenar las listas "
+"de máquinas: %s\n"
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1375
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Escribiendo %u URI de listas de máquinas a «%s»\n"
 
-#: src/hostlist/hostlist-client.c:1397 src/hostlist/hostlist-client.c:1414
+#: src/hostlist/hostlist-client.c:1399 src/hostlist/hostlist-client.c:1416
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Error escribiendo URI de listas de máquinas al fichero «%s»\n"
 
-#: src/hostlist/hostlist-client.c:1409
+#: src/hostlist/hostlist-client.c:1411
 msgid "# hostlist URIs written to file"
 msgstr "# URI de listas de máquinas escritas a fichero"
 
-#: src/hostlist/hostlist-client.c:1463
+#: src/hostlist/hostlist-client.c:1465
 msgid "Learning is enabled on this peer\n"
 msgstr "El aprendizaje está habilitado en este par\n"
 
-#: src/hostlist/hostlist-client.c:1475
+#: src/hostlist/hostlist-client.c:1477
 msgid "Learning is not enabled on this peer\n"
 msgstr "El aprendizaje no está habilitado en este par\n"
 
-#: src/hostlist/hostlist-client.c:1487
+#: src/hostlist/hostlist-client.c:1489
 #, c-format
-msgid "Since learning is not enabled on this peer, hostlist file `%s' was 
removed\n"
-msgstr "La lista de máquinas «%s» fue eliminada puesto que el aprendizaje no 
está habilitado en este par\n"
+msgid ""
+"Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
+msgstr ""
+"La lista de máquinas «%s» fue eliminada puesto que el aprendizaje no está "
+"habilitado en este par\n"
 
-#: src/hostlist/hostlist-client.c:1491
+#: src/hostlist/hostlist-client.c:1493
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "El fichero de listas de máquinas «%s» no pudo ser eliminado\n"
@@ -3346,7 +3690,9 @@
 #: src/topology/gnunet-daemon-topology.c:922
 #, c-format
 msgid "Error in communication with PEERINFO service: %s\n"
-msgstr "Error en la comunicación con el servicio de información de pares 
(PEERINFO): %s\n"
+msgstr ""
+"Error en la comunicación con el servicio de información de pares (PEERINFO): "
+"%s\n"
 
 #: src/hostlist/hostlist-server.c:205
 msgid "HELLOs without addresses encountered (ignored)"
@@ -3376,7 +3722,9 @@
 
 #: src/hostlist/hostlist-server.c:291
 msgid "Could not handle hostlist request since I do not have a response yet\n"
-msgstr "No se pudo manejar una petición de lista de máquinas debido a que no 
hay una respuesta todavía\n"
+msgstr ""
+"No se pudo manejar una petición de lista de máquinas debido a que no hay una "
+"respuesta todavía\n"
 
 #: src/hostlist/hostlist-server.c:294
 msgid "hostlist requests refused (not ready)"
@@ -3396,8 +3744,16 @@
 
 #: src/hostlist/hostlist-server.c:388
 msgid "Advertisement message could not be queued by core\n"
-msgstr "Los mensajes de anuncio no pudieron encolarse por el servicio 
principal\n"
+msgstr ""
+"Los mensajes de anuncio no pudieron encolarse por el servicio principal\n"
 
+#: src/hostlist/hostlist-server.c:552 src/peerinfo-tool/gnunet-peerinfo.c:547
+#: src/transport/gnunet-service-transport.c:632
+msgid "Could not access PEERINFO service.  Exiting.\n"
+msgstr ""
+"No se pudo acceder al servicio de información de pares (PEERINFO).  "
+"Saliendo.\n"
+
 #: src/hostlist/hostlist-server.c:562
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
@@ -3421,7 +3777,8 @@
 #: src/hostlist/hostlist-server.c:667
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
-msgstr "No se pudo arrancar un servidor de listas de máquinas HTTP en el 
puerto %u\n"
+msgstr ""
+"No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n"
 
 #: src/integration-tests/connection_watchdog.c:1001
 #, c-format
@@ -3435,7 +3792,8 @@
 
 #: src/integration-tests/connection_watchdog.c:1093
 msgid "Send ping messages to test connectivity (default == NO)"
-msgstr "Enviar mensajes «ping» para probar la conectividad (predeterminado: 
NO)"
+msgstr ""
+"Enviar mensajes «ping» para probar la conectividad (predeterminado: NO)"
 
 #: src/integration-tests/connection_watchdog.c:1102
 #: src/template/gnunet-template.c:70
@@ -3444,7 +3802,9 @@
 
 #: src/mesh/gnunet-mesh.c:211
 msgid "provide information about all tunnels (continuously) NOT IMPLEMENTED"
-msgstr "proveer información acerca de todos los túneles (de forma continua) 
SIN IMPLEMENTAR"
+msgstr ""
+"proveer información acerca de todos los túneles (de forma continua) SIN "
+"IMPLEMENTAR"
 
 #: src/mesh/gnunet-mesh.c:214
 msgid "provide information about a particular tunnel"
@@ -3454,41 +3814,47 @@
 msgid "Print information about mesh tunnels and peers."
 msgstr "Imprimir información acerca de tuneles mesh y pares."
 
-#: src/mesh/gnunet-service-mesh.c:8015 src/mesh/gnunet-service-mesh-new.c:8015
+#: src/mesh/gnunet-service-mesh.c:8010 src/mesh/gnunet-service-mesh-new.c:8015
 msgid "Wrong CORE service\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
-#: src/mesh/gnunet-service-mesh.c:8232 src/mesh/gnunet-service-mesh-new.c:8232
+#: src/mesh/gnunet-service-mesh.c:8227 src/mesh/gnunet-service-mesh-new.c:8232
 #, c-format
 msgid "Mesh service could not access hostkey: %s. Exiting.\n"
-msgstr "El servicio mesh no puede acceder a la clave de la máquina: %s. 
Saliendo.\n"
+msgstr ""
+"El servicio mesh no puede acceder a la clave de la máquina: %s. Saliendo.\n"
 
-#: src/mesh/gnunet-service-mesh.c:8314 src/mesh/gnunet-service-mesh.c:8326
-#: src/mesh/gnunet-service-mesh.c:8338 src/mesh/gnunet-service-mesh.c:8352
-#: src/mesh/gnunet-service-mesh.c:8364 src/mesh/gnunet-service-mesh.c:8376
-#: src/mesh/gnunet-service-mesh.c:8388 src/mesh/gnunet-service-mesh-new.c:8321
+#: src/mesh/gnunet-service-mesh.c:8309 src/mesh/gnunet-service-mesh.c:8321
+#: src/mesh/gnunet-service-mesh.c:8333 src/mesh/gnunet-service-mesh.c:8347
+#: src/mesh/gnunet-service-mesh.c:8359 src/mesh/gnunet-service-mesh.c:8371
+#: src/mesh/gnunet-service-mesh.c:8383 src/mesh/gnunet-service-mesh-new.c:8321
 #: src/mesh/gnunet-service-mesh-new.c:8333
 #: src/mesh/gnunet-service-mesh-new.c:8345
 #: src/mesh/gnunet-service-mesh-new.c:8359
 #: src/mesh/gnunet-service-mesh-new.c:8371
 #: src/mesh/gnunet-service-mesh-new.c:8383
-#: src/mesh/gnunet-service-mesh-new.c:8395
-#: src/regex/gnunet-daemon-regexprofiler.c:335
-#: src/regex/gnunet-daemon-regexprofiler.c:347
-#: src/regex/gnunet-daemon-regexprofiler.c:360
-#: src/regex/gnunet-daemon-regexprofiler.c:373
+#: src/mesh/gnunet-service-mesh-new.c:8395 src/nse/gnunet-service-nse.c:1478
+#: src/nse/gnunet-service-nse.c:1496
+#: src/regex/gnunet-daemon-regexprofiler.c:277
+#: src/regex/gnunet-daemon-regexprofiler.c:290
+#: src/regex/gnunet-daemon-regexprofiler.c:303
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
-msgstr "El servicio %s carece de opciones de configuración de clave (%s).  
Saliendo.\n"
+msgstr ""
+"El servicio %s carece de opciones de configuración de clave (%s).  "
+"Saliendo.\n"
 
-#: src/mesh/gnunet-service-mesh.c:8400 src/mesh/gnunet-service-mesh.c:8410
-#: src/mesh/gnunet-service-mesh.c:8421 src/mesh/gnunet-service-mesh-new.c:8407
+#: src/mesh/gnunet-service-mesh.c:8395 src/mesh/gnunet-service-mesh.c:8405
+#: src/mesh/gnunet-service-mesh.c:8416 src/mesh/gnunet-service-mesh-new.c:8407
 #: src/mesh/gnunet-service-mesh-new.c:8417
 #: src/mesh/gnunet-service-mesh-new.c:8428
 #, c-format
-msgid "%s service is lacking key configuration settings (%s). Using default 
(%u).\n"
-msgstr "El servicio %s carece de opciones de configuración de clave (%s). 
Usando predeterminada (%u).\n"
+msgid ""
+"%s service is lacking key configuration settings (%s). Using default (%u).\n"
+msgstr ""
+"El servicio %s carece de opciones de configuración de clave (%s). Usando "
+"predeterminada (%u).\n"
 
 #: src/mysql/mysql.c:174
 #, c-format
@@ -3556,8 +3922,12 @@
 
 #: src/namestore/gnunet-namestore.c:455
 #, c-format
-msgid "Deletion requires either absolute time, or no time at all. Got relative 
time `%s' instead.\n"
-msgstr "El borrado requiere o tiempo absoluto, o ningún tiempo. Tomado tiempo 
relativo «%s» en su defecto.\n"
+msgid ""
+"Deletion requires either absolute time, or no time at all. Got relative time "
+"`%s' instead.\n"
+msgstr ""
+"El borrado requiere o tiempo absoluto, o ningún tiempo. Tomado tiempo "
+"relativo «%s» en su defecto.\n"
 
 #: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
 #: src/namestore/gnunet-namestore.c:497
@@ -3574,7 +3944,7 @@
 msgstr "borrar"
 
 #: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:598
+#: src/peerinfo-tool/gnunet-peerinfo.c:599
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
@@ -3597,8 +3967,11 @@
 msgstr "mostrar registros"
 
 #: src/namestore/gnunet-namestore.c:686
-msgid "expiration time for record to use (for adding only), \"never\" is 
possible"
-msgstr "tiempo de expiración del registro a usar (únicamente para añadir), 
nunca (\"never\") es posible"
+msgid ""
+"expiration time for record to use (for adding only), \"never\" is possible"
+msgstr ""
+"tiempo de expiración del registro a usar (únicamente para añadir), nunca "
+"(\"never\") es posible"
 
 #: src/namestore/gnunet-namestore.c:689
 msgid "name of the record to add/delete/display"
@@ -3659,12 +4032,15 @@
 
 #: src/namestore/gnunet-service-namestore.c:2262
 msgid "No directory to load zonefiles specified in configuration\n"
-msgstr "Ningún directorio del que cargar ficheros de zona especificado en la 
configuración\n"
+msgstr ""
+"Ningún directorio del que cargar ficheros de zona especificado en la "
+"configuración\n"
 
 #: src/namestore/gnunet-service-namestore.c:2272
 #, c-format
 msgid "Creating directory `%s' for zone files failed!\n"
-msgstr "¡Se produjo un fallo creando el directorio «%s» para ficheros de 
zonas!\n"
+msgstr ""
+"¡Se produjo un fallo creando el directorio «%s» para ficheros de zonas!\n"
 
 #: src/namestore/namestore_api.c:345
 msgid "Namestore failed to add record"
@@ -3680,7 +4056,9 @@
 
 #: src/namestore/namestore_api.c:419
 msgid "Failed to put new set of records in database"
-msgstr "Se produjo un fallo al insertar un nuevo conjunto de registros en la 
base de datos"
+msgstr ""
+"Se produjo un fallo al insertar un nuevo conjunto de registros en la base de "
+"datos"
 
 #: src/namestore/namestore_api.c:423
 msgid "Failed to remove records from database"
@@ -3698,42 +4076,42 @@
 msgid "Protocol error"
 msgstr "Error de protocolo"
 
-#: src/namestore/namestore_common.c:530 src/namestore/namestore_common.c:670
+#: src/namestore/namestore_common.c:532 src/namestore/namestore_common.c:672
 #, c-format
 msgid "Unsupported record type %d\n"
 msgstr "Tipo de registro %d no soportado\n"
 
-#: src/namestore/namestore_common.c:537
+#: src/namestore/namestore_common.c:539
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "No se pudo procesar la dirección IPv4 «%s»\n"
 
-#: src/namestore/namestore_common.c:560
+#: src/namestore/namestore_common.c:562
 #, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "No se pudo procesar el registro SOA «%s»\n"
 
-#: src/namestore/namestore_common.c:583
+#: src/namestore/namestore_common.c:585
 #, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "No se pudo procesar el registro MX «%s»\n"
 
-#: src/namestore/namestore_common.c:601
+#: src/namestore/namestore_common.c:603
 #, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "No se pudo procesar dirección IPv4 «%s»\n"
 
-#: src/namestore/namestore_common.c:614
+#: src/namestore/namestore_common.c:616
 #, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "No se pudo procesar el registro PKEY «%s»\n"
 
-#: src/namestore/namestore_common.c:635
+#: src/namestore/namestore_common.c:637
 #, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
 
-#: src/namestore/namestore_common.c:661
+#: src/namestore/namestore_common.c:663
 #, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
@@ -3745,7 +4123,9 @@
 #: src/nat/gnunet-nat-server.c:279
 #, c-format
 msgid "Please pass valid port number as the first argument! (got `%s')\n"
-msgstr "¡Por favor, pase un número de puerto válido como primer parámetro! (se 
obtuvo «%s»)\n"
+msgstr ""
+"¡Por favor, pase un número de puerto válido como primer parámetro! (se "
+"obtuvo «%s»)\n"
 
 #: src/nat/gnunet-nat-server.c:321
 msgid "GNUnet NAT traversal test helper daemon"
@@ -3774,7 +4154,8 @@
 
 #: src/nat/nat_auto.c:331
 msgid "This system has a global IPv6 address, setting IPv6 to supported.\n"
-msgstr "Este sistema tiene una dirección IPv6 global, fijando IPv6 a 
habilitado.\n"
+msgstr ""
+"Este sistema tiene una dirección IPv6 global, fijando IPv6 a habilitado.\n"
 
 #: src/nat/nat_auto.c:347
 #, c-format
@@ -3803,7 +4184,9 @@
 
 #: src/nat/nat_auto.c:470
 msgid "gnunet-helper-nat-client not found or behind NAT, disabling it\n"
-msgstr "«gnunet-helper-nat-client» no encontrado o detrás de NAT, 
deshabilitando su uso\n"
+msgstr ""
+"«gnunet-helper-nat-client» no encontrado o detrás de NAT, deshabilitando su "
+"uso\n"
 
 #: src/nat/nat.c:795
 #, c-format
@@ -3821,12 +4204,18 @@
 
 #: src/nat/nat.c:1179 src/nat/nat.c:1191
 #, c-format
-msgid "Configuration requires `%s', but binary is not installed properly (SUID 
bit not set).  Option disabled.\n"
-msgstr "La configuración requiere «%s», pero el binario no está instalado de 
forma correcta (SUID bit no activado).  Opción deshabilitada.\n"
+msgid ""
+"Configuration requires `%s', but binary is not installed properly (SUID bit "
+"not set).  Option disabled.\n"
+msgstr ""
+"La configuración requiere «%s», pero el binario no está instalado de forma "
+"correcta (SUID bit no activado).  Opción deshabilitada.\n"
 
 #: src/nat/nat.c:1326
 msgid "Internal IP address not known, cannot use ICMP NAT traversal method\n"
-msgstr "Direcciones internas IP no conocidas, no se puede usar el método del 
recorrido NAT ICMP\n"
+msgstr ""
+"Direcciones internas IP no conocidas, no se puede usar el método del "
+"recorrido NAT ICMP\n"
 
 #: src/nat/nat.c:1337
 #, c-format
@@ -3848,45 +4237,53 @@
 #: src/nat/nat_test.c:411
 #, c-format
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
-msgstr "Se produjo un fallo al crear el «socket» de escucha asociado a «%s» 
para pruebas NAT: %s\n"
+msgstr ""
+"Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para "
+"pruebas NAT: %s\n"
 
-#: src/nse/gnunet-nse-profiler.c:1009
+#: src/nse/gnunet-nse-profiler.c:1013
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "límite al número de conexiones a servicios NSE, 0 para ilimitadas"
 
-#: src/nse/gnunet-nse-profiler.c:1012
+#: src/nse/gnunet-nse-profiler.c:1016
 msgid "name of the file for writing connection information and statistics"
-msgstr "nombre del fichero para escribir información y estadísticas de la 
conexión"
+msgstr ""
+"nombre del fichero para escribir información y estadísticas de la conexión"
 
-#: src/nse/gnunet-nse-profiler.c:1015
+#: src/nse/gnunet-nse-profiler.c:1019
 msgid "name of the file with the login information for the testbed"
-msgstr "nombre del fichero con la información de acceso usada para la batería 
de pruebas"
+msgstr ""
+"nombre del fichero con la información de acceso usada para la batería de "
+"pruebas"
 
-#: src/nse/gnunet-nse-profiler.c:1018
+#: src/nse/gnunet-nse-profiler.c:1022
 msgid "IP address of this system as seen by the rest of the testbed"
-msgstr "Dirección IP de este sistema como visto desde el resto de equipos de 
prueba"
+msgstr ""
+"Dirección IP de este sistema como visto desde el resto de equipos de prueba"
 
-#: src/nse/gnunet-nse-profiler.c:1021
+#: src/nse/gnunet-nse-profiler.c:1025
 msgid "delay between queries to statistics during a round"
 msgstr "retardo entre consultas a las estadísticas durante una ronda"
 
-#: src/nse/gnunet-nse-profiler.c:1024
+#: src/nse/gnunet-nse-profiler.c:1028
 msgid "prefix of the filenames we use for writing the topology for each round"
-msgstr "prefijo de los nombres de fichero usados para escribir la topología de 
cada ronda"
+msgstr ""
+"prefijo de los nombres de fichero usados para escribir la topología de cada "
+"ronda"
 
-#: src/nse/gnunet-nse-profiler.c:1027
+#: src/nse/gnunet-nse-profiler.c:1031
 msgid "name of the file for writing the main results"
 msgstr "nombre del fichero en el que escribir los resultados principales"
 
-#: src/nse/gnunet-nse-profiler.c:1030
+#: src/nse/gnunet-nse-profiler.c:1034
 msgid "Number of peers to run in each round, separated by commas"
 msgstr "Número de pares a ejecutar en cada ronda, separados por comas"
 
-#: src/nse/gnunet-nse-profiler.c:1036
+#: src/nse/gnunet-nse-profiler.c:1040
 msgid "delay between rounds"
 msgstr "retraso entre rondas"
 
-#: src/nse/gnunet-nse-profiler.c:1046
+#: src/nse/gnunet-nse-profiler.c:1050
 msgid "Measure quality and performance of the NSE service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
@@ -3895,12 +4292,12 @@
 msgid "NSE service could not access hostkey: %s\n"
 msgstr "El servicio NSE no puede acceder a la clave de máquina: %s\n"
 
-#: src/nse/gnunet-service-nse.c:1403 src/nse/gnunet-service-nse.c:1478
-#: src/nse/gnunet-service-nse.c:1495
+#: src/nse/gnunet-service-nse.c:1403
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
-msgstr "El servicio NSE carece de opciones de configuración de clave.  
Saliendo.\n"
+msgstr ""
+"El servicio NSE carece de opciones de configuración de clave.  Saliendo.\n"
 
-#: src/nse/gnunet-service-nse.c:1485
+#: src/nse/gnunet-service-nse.c:1486
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Requisitos de trabajo no válidos para el servicio NSE. Saliendo.\n"
 
@@ -3920,8 +4317,11 @@
 
 #: src/peerinfo/gnunet-service-peerinfo.c:297
 #, c-format
-msgid "File `%s' in directory `%s' does not match naming convention. 
Removed.\n"
-msgstr "El fichero «%s» en el directorio «%s» no sigue la convención de 
nombres. Eliminado.\n"
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+"El fichero «%s» en el directorio «%s» no sigue la convención de nombres. "
+"Eliminado.\n"
 
 #: src/peerinfo/gnunet-service-peerinfo.c:419
 #, c-format
@@ -3939,23 +4339,28 @@
 
 #: src/peerinfo/peerinfo_api.c:359
 msgid "failed to transmit request (service down?)"
-msgstr "se produjo un fallo al transmitir la petición (¿está caido el 
servicio?)"
+msgstr ""
+"se produjo un fallo al transmitir la petición (¿está caido el servicio?)"
 
 # Miguel: "Failed to receive" también aquí está traducido como
 # "no se obtuvo respuesta" por claridad.
 #: src/peerinfo/peerinfo_api.c:509
 msgid "Failed to receive response from `PEERINFO' service."
-msgstr "No se obtuvo respuesta del servicio de información de pares 
(PEERINFO)."
+msgstr ""
+"No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
 
 #: src/peerinfo/peerinfo_api.c:550 src/peerinfo/peerinfo_api.c:569
 #: src/peerinfo/peerinfo_api.c:584 src/peerinfo/peerinfo_api.c:595
 #: src/peerinfo/peerinfo_api.c:606
 msgid "Received invalid message from `PEERINFO' service."
-msgstr "Recibido mensaje no válido del servicio de información de pares 
(PEERINFO)."
+msgstr ""
+"Recibido mensaje no válido del servicio de información de pares (PEERINFO)."
 
 #: src/peerinfo/peerinfo_api.c:681
 msgid "Timeout transmitting iteration request to `PEERINFO' service."
-msgstr "Petición de transmisión de iteración de expiración al servicio de 
información de pares (PEERINFO)."
+msgstr ""
+"Petición de transmisión de iteración de expiración al servicio de "
+"información de pares (PEERINFO)."
 
 #: src/peerinfo/peerinfo_api_notify.c:256
 #, c-format
@@ -3977,36 +4382,36 @@
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "La carga de la clave de la máquina desde «%s» ha fallado.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:622
+#: src/peerinfo-tool/gnunet-peerinfo.c:625
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Yo soy el par «%s».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:648
+#: src/peerinfo-tool/gnunet-peerinfo.c:651
 msgid "don't resolve host names"
 msgstr "no resolver nombres de máquina"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/peerinfo-tool/gnunet-peerinfo.c:654
 msgid "output only the identity strings"
 msgstr "mostrar únicamente las cadenas de identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654
+#: src/peerinfo-tool/gnunet-peerinfo.c:657
 msgid "output our own identity only"
 msgstr "muestra únicamente nuestra propia identidad"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:657
+#: src/peerinfo-tool/gnunet-peerinfo.c:660
 msgid "list all known peers"
 msgstr "mostrar todos los pares conocidos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:660
+#: src/peerinfo-tool/gnunet-peerinfo.c:663
 msgid "also output HELLO uri(s)"
 msgstr "también mostrar las URI de «HELLO»"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:663
+#: src/peerinfo-tool/gnunet-peerinfo.c:666
 msgid "add given HELLO uri to the database"
 msgstr "añade la URI de «HELLO» dada a la base de datos"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:674
+#: src/peerinfo-tool/gnunet-peerinfo.c:677
 msgid "Print information about peers."
 msgstr "Imprimir información sobre los pares."
 
@@ -4094,149 +4499,156 @@
 
 #: src/pt/gnunet-daemon-pt.c:976
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
-msgstr "Demonio a ejecutar para realizar la traducción de protocolo IP a 
GNUnet"
+msgstr ""
+"Demonio a ejecutar para realizar la traducción de protocolo IP a GNUnet"
 
-#: src/regex/gnunet-daemon-regexprofiler.c:293
-#, c-format
-msgid "Regexprofiler could not access hostkey: %s. Exiting.\n"
-msgstr "El perfilador de expresiones regulares no puede acceder a la clave de 
máquina: %s. Saliendo.\n"
-
-#: src/regex/gnunet-daemon-regexprofiler.c:452
+#: src/regex/gnunet-daemon-regexprofiler.c:376
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr "Demonio para anunciar expresiones regulares para el par usando mesh."
 
-#: src/regex/gnunet-regex-profiler.c:1147
-msgid "An operation has failed while starting peers\n"
+#: src/regex/gnunet-regex-profiler.c:1373
+#, fuzzy, c-format
+msgid "An operation has failed while starting peers: %s\n"
 msgstr "Una operación ha fallado mientras se iniciaban los pares\n"
 
-#: src/regex/gnunet-regex-profiler.c:1193
+#: src/regex/gnunet-regex-profiler.c:1418
 #, c-format
 msgid "Creating a peer failed. Error: %s\n"
 msgstr "No se pudo crear un par. Error: %s\n"
 
-#: src/regex/gnunet-regex-profiler.c:1320
+#: src/regex/gnunet-regex-profiler.c:1545
 msgid "An operation has failed while starting slaves\n"
 msgstr "Una operación ha fallado mientras se arrancaban los esclavos\n"
 
-#: src/regex/gnunet-regex-profiler.c:1342
+#: src/regex/gnunet-regex-profiler.c:1567
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/regex/gnunet-regex-profiler.c:1397
+#: src/regex/gnunet-regex-profiler.c:1622
 msgid "An operation has failed while linking\n"
 msgstr "Una operación ha fallado mientras se enlazaba\n"
 
-#: src/regex/gnunet-regex-profiler.c:1508
-#: src/testbed/testbed_api_testbed.c:805
+#: src/regex/gnunet-regex-profiler.c:1732
+#: src/testbed/testbed_api_testbed.c:799
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr "El registro de máquinas falló para una máquina. Error: %s\n"
 
-#: src/regex/gnunet-regex-profiler.c:1589
+#: src/regex/gnunet-regex-profiler.c:1813
 msgid "Unable to connect to master controller -- Check config\n"
-msgstr "No se puede conectar al controlador principal -- Compruebe la 
configuración\n"
+msgstr ""
+"No se puede conectar al controlador principal -- Compruebe la configuración\n"
 
-#: src/regex/gnunet-regex-profiler.c:1691
-#: src/testbed/testbed_api_testbed.c:970
+#: src/regex/gnunet-regex-profiler.c:1915
+#: src/testbed/testbed_api_testbed.c:964
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr "La máquina %s no puede comenzar la batería de pruebas\n"
 
-#: src/regex/gnunet-regex-profiler.c:1694
-#: src/testbed/testbed_api_testbed.c:974
+#: src/regex/gnunet-regex-profiler.c:1918
+#: src/testbed/testbed_api_testbed.c:968
 msgid "Testbed cannot be started on localhost\n"
 msgstr "La batería de pruebas no se puede iniciar en localhost\n"
 
-#: src/regex/gnunet-regex-profiler.c:1734
+#: src/regex/gnunet-regex-profiler.c:1958
 #, c-format
 msgid "No hosts-file specified on command line. Exiting.\n"
-msgstr "No se ha especificado el fichero de máquinas en la línea de comandos. 
Saliendo.\n"
+msgstr ""
+"No se ha especificado el fichero de máquinas en la línea de comandos. "
+"Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1739
+#: src/regex/gnunet-regex-profiler.c:1963
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
-msgstr "No se ha especificado una política de directorios en la línea de 
comandos. Saliendo.\n"
+msgstr ""
+"No se ha especificado una política de directorios en la línea de comandos. "
+"Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1745
-#: src/testbed/testbed_api_testbed.c:1065
+#: src/regex/gnunet-regex-profiler.c:1969
+#: src/testbed/testbed_api_testbed.c:1071
 #, c-format
 msgid "No hosts loaded. Need at least one host\n"
 msgstr "No se han cargado máquinas. Se necesita al menos una máquina.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1748
+#: src/regex/gnunet-regex-profiler.c:1972
 #, c-format
 msgid "Checking whether given hosts can start testbed. Please wait\n"
-msgstr "Comprobando si las máquinas dadas pueden iniciar la batería de 
pruebas. Por favor, espere\n"
+msgstr ""
+"Comprobando si las máquinas dadas pueden iniciar la batería de pruebas. Por "
+"favor, espere\n"
 
-#: src/regex/gnunet-regex-profiler.c:1769
+#: src/regex/gnunet-regex-profiler.c:1996
 #, c-format
 msgid "Exiting\n"
 msgstr "Saliendo\n"
 
-#: src/regex/gnunet-regex-profiler.c:1775
+#: src/regex/gnunet-regex-profiler.c:2002
 #, c-format
 msgid "No configuration file given. Exiting\n"
 msgstr "No se ha introducido ningún fichero de configuración. Saliendo\n"
 
-#: src/regex/gnunet-regex-profiler.c:1784
+#: src/regex/gnunet-regex-profiler.c:2011
 #, c-format
 msgid "Configuration option (regex_prefix) missing. Exiting\n"
 msgstr "Falta una opción de configuración (regex_prefix). Saliendo\n"
 
-#: src/regex/gnunet-regex-profiler.c:1802
+#: src/regex/gnunet-regex-profiler.c:2029
 #: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr "Las políticas de directorio especificadas no existen. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1809
+#: src/regex/gnunet-regex-profiler.c:2036
 #, c-format
 msgid "No search strings file given. Exiting.\n"
 msgstr "No se ha proporcionado un fichero de cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1817
+#: src/regex/gnunet-regex-profiler.c:2044
 #, c-format
-msgid "Error loading search strings. Given file does not contain enough 
strings. Exiting.\n"
-msgstr "Error cargando cadenas de búsqueda. El fichero proporcionado no 
contiene cadenas suficientes. Saliendo.\n"
+msgid ""
+"Error loading search strings. Given file does not contain enough strings. "
+"Exiting.\n"
+msgstr ""
+"Error cargando cadenas de búsqueda. El fichero proporcionado no contiene "
+"cadenas suficientes. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1823
+#: src/regex/gnunet-regex-profiler.c:2050
 #, c-format
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Error cargando cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1850
+#: src/regex/gnunet-regex-profiler.c:2077
 msgid "name of the file for writing statistics"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1853
+#: src/regex/gnunet-regex-profiler.c:2080
 msgid "create COUNT number of random links between peers"
 msgstr "crear un número «COUNT» de enlaces aleatorios entre pares"
 
-#: src/regex/gnunet-regex-profiler.c:1856
+#: src/regex/gnunet-regex-profiler.c:2083
 msgid "wait TIMEOUT before considering a string match as failed"
-msgstr "esperar «TIMEOUT» antes de considerar que una coincidencia de cadenas 
como fallida"
+msgstr ""
+"esperar «TIMEOUT» antes de considerar que una coincidencia de cadenas como "
+"fallida"
 
-#: src/regex/gnunet-regex-profiler.c:1859
+#: src/regex/gnunet-regex-profiler.c:2086
 msgid "wait DELAY before starting string search"
 msgstr "esperar «DELAY» antes de empezar la búsqueda de cadenas"
 
-#: src/regex/gnunet-regex-profiler.c:1862
+#: src/regex/gnunet-regex-profiler.c:2089
 msgid "number of search strings to read from search strings file"
-msgstr "número de cadenas de búsqueda a leer del fichero de cadenas de 
búsqueda"
+msgstr ""
+"número de cadenas de búsqueda a leer del fichero de cadenas de búsqueda"
 
 # WTF???
-#: src/regex/gnunet-regex-profiler.c:1865
+#: src/regex/gnunet-regex-profiler.c:2092
 #: src/regex/gnunet-regex-simulation-profiler.c:692
 msgid "maximum path compression length"
 msgstr "longitud de la máxima compresión de rutas"
 
-#: src/regex/gnunet-regex-profiler.c:1868
-msgid "if this option is set, only one peer is responsible for searching all 
strings"
-msgstr "si esta opción está activada, únicamente un par es responsable de 
buscar todas las cadenas"
-
-#: src/regex/gnunet-regex-profiler.c:1881
+#: src/regex/gnunet-regex-profiler.c:2105
 msgid "Profiler for regex"
 msgstr "Perfilador para expresiones regulares."
 
@@ -4265,12 +4677,15 @@
 #: src/statistics/gnunet-statistics.c:143
 #, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
-msgstr "Se produjo un fallo al obtener las estadísticas de la máquina 
«%s:%llu»\n"
+msgstr ""
+"Se produjo un fallo al obtener las estadísticas de la máquina «%s:%llu»\n"
 
 #: src/statistics/gnunet-statistics.c:181
 #, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
-msgstr "Intentando conectar con máquina remota, pero el servicio «%s» no se 
está ejecutando\n"
+msgstr ""
+"Intentando conectar con máquina remota, pero el servicio «%s» no se está "
+"ejecutando\n"
 
 #: src/statistics/gnunet-statistics.c:190
 #, c-format
@@ -4337,67 +4752,85 @@
 msgstr "No se pudieron guardar algunas estadísticas persistentes\n"
 
 #: src/statistics/statistics_api.c:1056
-msgid "Failed to receive acknowledgement from statistics service, some 
statistics might have been lost!\n"
-msgstr "¡No se ha recibido el reconocimiento del servicio de estadísticas, 
algunas estadísticas se pueden haber perdido!\n"
+msgid ""
+"Failed to receive acknowledgement from statistics service, some statistics "
+"might have been lost!\n"
+msgstr ""
+"¡No se ha recibido el reconocimiento del servicio de estadísticas, algunas "
+"estadísticas se pueden haber perdido!\n"
 
 #: src/sysmon/gnunet-service-sysmon.c:546
 #, c-format
 msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
-msgstr "No se pudo determinar el intervalo de ejecución para «%s», 
estableciéndolo a los 60 segundos predeterminados.\n"
+msgstr ""
+"No se pudo determinar el intervalo de ejecución para «%s», estableciéndolo a "
+"los 60 segundos predeterminados.\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:231
+#: src/testbed/gnunet_testbed_ll_master.c:57
 #, c-format
+msgid "Job command file not given. Exiting\n"
+msgstr "Fichero de configuración de trabajos no proporcionado. Saliendo\n"
+
+#: src/testbed/gnunet-testbed-profiler.c:235
+#, c-format
 msgid "No hosts-file specified on command line\n"
-msgstr "No se ha especificado el fichero de máquinas en la línea de 
comandos.\n"
+msgstr ""
+"No se ha especificado el fichero de máquinas en la línea de comandos.\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:261
+#: src/testbed/gnunet-testbed-profiler.c:267
 msgid "create COUNT number of peers"
 msgstr "crea «COUNT» número de pares"
 
-#: src/testbed/gnunet-testbed-profiler.c:264
+#: src/testbed/gnunet-testbed-profiler.c:270
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr "tolerar un número «COUNT» de continuas expiraciones de plazo"
 
-#: src/testbed/gnunet-testbed-profiler.c:276
+#: src/testbed/gnunet-testbed-profiler.c:286
 msgid "Profiler for testbed"
 msgstr "Analizador de rendimiento para la batería de pruebas"
 
-#: src/testbed/ll_master.c:57
+#: src/testbed/testbed_api_hosts.c:469
 #, c-format
-msgid "Job command file not given. Exiting\n"
-msgstr "Fichero de configuración de trabajos no proporcionado. Saliendo\n"
-
-#: src/testbed/testbed_api.c:499
-#, c-format
-msgid "Adding host %u failed with error: %s\n"
-msgstr "No se pudo añadir la máquina %u por el error: %s\n"
-
-#: src/testbed/testbed_api_hosts.c:306
-#, c-format
 msgid "Hosts file %s not found\n"
 msgstr "El fichero de máquinas %s no fue encontrado\n"
 
-#: src/testbed/testbed_api_hosts.c:314
+#: src/testbed/testbed_api_hosts.c:477
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr "El archivo de máquinas %s no tiene datos\n"
 
-#: src/testbed/testbed_api_hosts.c:321
+#: src/testbed/testbed_api_hosts.c:484
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr "El archivo de máquinas %s no puede leerse\n"
 
-#: src/testbed/testbed_api_testbed.c:623
+#: src/testbed/testbed_api_hosts.c:593
+#, c-format
+msgid "The function %s is only available when compiled with (--with-ll)\n"
+msgstr ""
+
+#: src/testbed/testbed_api_hosts.c:1836
+#, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr "No se pudo añadir la máquina %u por el error: %s\n"
+
+#: src/testbed/testbed_api_testbed.c:638
 msgid "Linking controllers failed. Exiting"
 msgstr "Los controladores de enlazado fallaron. Saliendo"
 
-#: src/testbed/testbed_api_testbed.c:1009
+#: src/testbed/testbed_api_testbed.c:1003
 msgid "Cannot start the master controller"
 msgstr "No se puede iniciar el controlador maestro"
 
-#: src/testbed/testbed_api_testbed.c:1089
+#: src/testbed/testbed_api_testbed.c:1059
+#, fuzzy
+msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
+msgstr "No se han cargado máquinas. Se necesita al menos una máquina.\n"
+
+#: src/testbed/testbed_api_testbed.c:1095
 msgid "Specified topology must be supported by testbed"
-msgstr "La topología especificada debe estar soportada por la batería de 
pruebas"
+msgstr ""
+"La topología especificada debe estar soportada por la batería de pruebas"
 
 #: src/testbed/testbed_api_topology.c:668
 #, c-format
@@ -4417,7 +4850,8 @@
 #: src/testbed/testbed_api_topology.c:704
 #, c-format
 msgid "Failed to read peer index from toology file: %s"
-msgstr "Se produjo un fallo al leer el índice de pares del archivo de 
topología: %s"
+msgstr ""
+"Se produjo un fallo al leer el índice de pares del archivo de topología: %s"
 
 #: src/testbed/testbed_api_topology.c:713
 #: src/testbed/testbed_api_topology.c:737
@@ -4429,7 +4863,8 @@
 #: src/testbed/testbed_api_topology.c:743
 #, c-format
 msgid "Failed to read peer index from topology file: %s"
-msgstr "Se produjo un fallo al leer índice de pares del fichero de topología: 
%s"
+msgstr ""
+"Se produjo un fallo al leer índice de pares del fichero de topología: %s"
 
 #: src/testbed/testbed_api_topology.c:725
 #: src/testbed/testbed_api_topology.c:749
@@ -4444,27 +4879,36 @@
 #: src/testing/gnunet-testing.c:132
 #, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
-msgstr "No se pudo extraer la clave de máquina %u (¿desplazamiento demasiado 
grande?)\n"
+msgstr ""
+"No se pudo extraer la clave de máquina %u (¿desplazamiento demasiado "
+"grande?)\n"
 
-#: src/testing/gnunet-testing.c:203
+#: src/testing/gnunet-testing.c:209
 msgid "create unique configuration files"
 msgstr "crear ficheros de configuración únicos"
 
-#: src/testing/gnunet-testing.c:205
+#: src/testing/gnunet-testing.c:211
 msgid "extract hostkey file from pre-computed hostkey list"
-msgstr "extraer los ficheros de claves de máquinas de una lista pre-computada 
de claves de máquinas"
+msgstr ""
+"extraer los ficheros de claves de máquinas de una lista pre-computada de "
+"claves de máquinas"
 
-#: src/testing/gnunet-testing.c:207
-msgid "number of unique configuration files to create, or number of the 
hostkey to extract"
-msgstr "número de ficheros de configuración únicos o claves de máquina a 
crear, o el número de claves de máquina a extraer"
+#: src/testing/gnunet-testing.c:213
+msgid ""
+"number of unique configuration files to create, or number of the hostkey to "
+"extract"
+msgstr ""
+"número de ficheros de configuración únicos o claves de máquina a crear, o el "
+"número de claves de máquina a extraer"
 
-#: src/testing/gnunet-testing.c:209
+#: src/testing/gnunet-testing.c:215
 msgid "configuration template"
 msgstr "plantilla de configuración"
 
-#: src/testing/gnunet-testing.c:218
+#: src/testing/gnunet-testing.c:224
 msgid "Command line tool to access the testing library"
-msgstr "Herramienta de línea de comandos para acceder a la biblioteca de 
pruebas"
+msgstr ""
+"Herramienta de línea de comandos para acceder a la biblioteca de pruebas"
 
 #: src/testing/gnunet-testing-run-service.c:129
 #, c-format
@@ -4479,58 +4923,68 @@
 msgid "name of the service to run"
 msgstr "nombre del servicio a ejecutar"
 
-#: src/testing/testing.c:211
+#: src/testing/testing.c:217
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr "El fichero de máquinas no fue encontrado: %s\n"
 
-#: src/testing/testing.c:227
+#: src/testing/testing.c:233
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr "El fichero de máquinas no tiene el formato correcto: %s\n"
 
-#: src/testing/testing.c:541
+#: src/testing/testing.c:547
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr "El número de clave %u no existe\n"
 
-#: src/testing/testing.c:551
+#: src/testing/testing.c:558
 #, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Error decodificando clave %u\n"
 
-#: src/testing/testing.c:865
+#: src/testing/testing.c:872
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
-msgstr "Se produjo un fallo al crear la configuración para el par (¿no hay 
suficientes puertos libres?)\n"
+msgstr ""
+"Se produjo un fallo al crear la configuración para el par (¿no hay "
+"suficientes puertos libres?)\n"
 
 # Miguel: "testbed" lo he traducido como batería de pruebas, pero
 # no es una traducción muy literal.
-#: src/testing/testing.c:876
+#: src/testing/testing.c:883
 #, c-format
-msgid "You attempted to create a testbed with more than %u hosts.  Please 
precompute more hostkeys first.\n"
-msgstr "Se ha intentado crear una batería de pruebas con más de %u máquinas.  
Por favor, pre-compute más claves de máquinas primero.\n"
+msgid ""
+"You attempted to create a testbed with more than %u hosts.  Please "
+"precompute more hostkeys first.\n"
+msgstr ""
+"Se ha intentado crear una batería de pruebas con más de %u máquinas.  Por "
+"favor, pre-compute más claves de máquinas primero.\n"
 
-#: src/testing/testing.c:890
+#: src/testing/testing.c:897
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
-msgstr "Se produjo un fallo al inicializar la clave de la máquina desde el par 
%u\n"
+msgstr ""
+"Se produjo un fallo al inicializar la clave de la máquina desde el par %u\n"
 
-#: src/testing/testing.c:923
+#: src/testing/testing.c:931
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
-msgstr "Se produjo un fallo al escribir la clave de la máquina para el par %u: 
%s\n"
+msgstr ""
+"Se produjo un fallo al escribir la clave de la máquina para el par %u: %s\n"
 
-#: src/testing/testing.c:941
+#: src/testing/testing.c:949
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
-msgstr "Se produjo un fallo al escribir el fichero de configuración «%s» para 
el par %u: %s\n"
+msgstr ""
+"Se produjo un fallo al escribir el fichero de configuración «%s» para el par "
+"%u: %s\n"
 
-#: src/testing/testing.c:1014
+#: src/testing/testing.c:1029
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Se produjo un fallo al arrancar «%s»: %s\n"
 
-#: src/testing/testing.c:1219
+#: src/testing/testing.c:1235
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
@@ -4550,7 +5004,9 @@
 
 #: src/topology/gnunet-daemon-topology.c:991
 msgid "Failed to connect to core service, can not manage topology!\n"
-msgstr "¡Se produjo un fallo al conectar con el servicio principal, no se 
puede gestionar la topología!\n"
+msgstr ""
+"¡Se produjo un fallo al conectar con el servicio principal, no se puede "
+"gestionar la topología!\n"
 
 #: src/topology/gnunet-daemon-topology.c:1034
 #, c-format
@@ -4565,7 +5021,9 @@
 #: src/topology/gnunet-daemon-topology.c:1049
 #, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
-msgstr "Se produjo un fallo al leer la lista de amigos de «%s»: no hay memoria 
disponible\n"
+msgstr ""
+"Se produjo un fallo al leer la lista de amigos de «%s»: no hay memoria "
+"disponible\n"
 
 #: src/topology/gnunet-daemon-topology.c:1057
 #, c-format
@@ -4574,13 +5032,19 @@
 
 #: src/topology/gnunet-daemon-topology.c:1077
 #, c-format
-msgid "Syntax error in topology specification at offset %llu, skipping 
bytes.\n"
-msgstr "Error de sintaxis en la especificación de topología en el 
desplazamiento %llu, omitiendo bytes.\n"
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes.\n"
+msgstr ""
+"Error de sintaxis en la especificación de topología en el desplazamiento "
+"%llu, omitiendo bytes.\n"
 
 #: src/topology/gnunet-daemon-topology.c:1090
 #, c-format
-msgid "Syntax error in topology specification at offset %llu, skipping bytes 
`%s'.\n"
-msgstr "Error de sintaxis en la especificación de topología en el 
desplazamiento %llu, omitiendo bytes «%s».\n"
+msgid ""
+"Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
+msgstr ""
+"Error de sintaxis en la especificación de topología en el desplazamiento "
+"%llu, omitiendo bytes «%s».\n"
 
 #: src/topology/gnunet-daemon-topology.c:1100
 #, c-format
@@ -4597,12 +5061,19 @@
 msgstr "# amigos en configuración"
 
 #: src/topology/gnunet-daemon-topology.c:1122
-msgid "Fewer friends specified than required by minimum friend count. Will 
only connect to friends.\n"
-msgstr "Menos amigos especificados que los requeridos por el contador mínimo 
de amigos. Sólo me conectaré a amigos.\n"
+msgid ""
+"Fewer friends specified than required by minimum friend count. Will only "
+"connect to friends.\n"
+msgstr ""
+"Menos amigos especificados que los requeridos por el contador mínimo de "
+"amigos. Sólo me conectaré a amigos.\n"
 
 #: src/topology/gnunet-daemon-topology.c:1129
-msgid "More friendly connections required than target total number of 
connections.\n"
-msgstr "Más conexiones amistosas requeridas que el número objetivo total de 
conexiones.\n"
+msgid ""
+"More friendly connections required than target total number of connections.\n"
+msgstr ""
+"Más conexiones amistosas requeridas que el número objetivo total de "
+"conexiones.\n"
 
 #: src/topology/gnunet-daemon-topology.c:1164
 msgid "# HELLO messages received"
@@ -4615,7 +5086,9 @@
 
 #: src/topology/gnunet-daemon-topology.c:1358
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
-msgstr "Control de topología de GNUnet (manteniendo las restricciones del mesh 
de P2P y de F2F)"
+msgstr ""
+"Control de topología de GNUnet (manteniendo las restricciones del mesh de "
+"P2P y de F2F)"
 
 #: src/transport/gnunet-service-transport_blacklist.c:246
 #, c-format
@@ -4631,18 +5104,24 @@
 #: src/transport/gnunet-service-transport_blacklist.c:308
 #, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
-msgstr "¡Error de sintaxis en el fichero de la lista negra en el 
desplazamiento %llu, rindiendose!\n"
+msgstr ""
+"¡Error de sintaxis en el fichero de la lista negra en el desplazamiento "
+"%llu, rindiendose!\n"
 
 #: src/transport/gnunet-service-transport_blacklist.c:295
 #: src/transport/gnunet-service-transport_blacklist.c:331
 #, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
-msgstr "Error de sintaxis en el fichero de la lista negra en el desplazamiento 
%llu, omitiendo bytes.\n"
+msgstr ""
+"Error de sintaxis en el fichero de la lista negra en el desplazamiento %llu, "
+"omitiendo bytes.\n"
 
 #: src/transport/gnunet-service-transport_blacklist.c:345
 #, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
-msgstr "Error de sintaxis en el fichero de la lista negra en el desplazamiento 
%llu, omitiendo bytes «%s».\n"
+msgstr ""
+"Error de sintaxis en el fichero de la lista negra en el desplazamiento %llu, "
+"omitiendo bytes «%s».\n"
 
 #: src/transport/gnunet-service-transport_blacklist.c:359
 #, c-format
@@ -4666,23 +5145,24 @@
 msgid "# bytes payload received"
 msgstr "# bytes de «payload» recibidos"
 
-#: src/transport/gnunet-service-transport.c:614
+#: src/transport/gnunet-service-transport.c:613
 #, c-format
 msgid "Transport service could not access hostkey: %s. Exiting.\n"
-msgstr "El servicio de transporte no puede acceder a la clave de la máquina: 
%s. Saliendo.\n"
+msgstr ""
+"El servicio de transporte no puede acceder a la clave de la máquina: %s. "
+"Saliendo.\n"
 
-#: src/transport/gnunet-service-transport.c:625
-msgid "Could not access STATISTICS service.  Exiting.\n"
-msgstr "No se pudo acceder al servicio de estadísticas (STATISTICS).  
Saliendo.\n"
-
-#: src/transport/gnunet-service-transport.c:720
+#: src/transport/gnunet-service-transport.c:708
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
-msgstr "El servicio de transporte carece de opciones de configuración de 
clave.  Saliendo.\n"
+msgstr ""
+"El servicio de transporte carece de opciones de configuración de clave.  "
+"Saliendo.\n"
 
 #: src/transport/gnunet-service-transport_clients.c:389
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
-msgstr "Mensaje omitido de tipo %u y tamaño %u, hay %u/%u mensajes 
pendientes\n"
+msgstr ""
+"Mensaje omitido de tipo %u y tamaño %u, hay %u/%u mensajes pendientes\n"
 
 #: src/transport/gnunet-service-transport_clients.c:394
 msgid "# messages dropped due to slow client"
@@ -4808,49 +5288,53 @@
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr "El servicio de transporte carece de la opción «NEIGHBOUR_LIMIT».\n"
 
-#: src/transport/gnunet-service-transport_validation.c:425
+#: src/transport/gnunet-service-transport_validation.c:453
 msgid "# address records discarded"
 msgstr "# registros de direcciones descartados"
 
-#: src/transport/gnunet-service-transport_validation.c:487
+#: src/transport/gnunet-service-transport_validation.c:515
 #, c-format
-msgid "Not transmitting `%s' with `%s', message too big (%u bytes!). This 
should not happen.\n"
-msgstr "No transmitiendo «%s» con «%s», mensaje demasiado grande (¡%u bytes!). 
Esto no debería suceder.\n"
+msgid ""
+"Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
+"not happen.\n"
+msgstr ""
+"No transmitiendo «%s» con «%s», mensaje demasiado grande (¡%u bytes!). Esto "
+"no debería suceder.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:536
+#: src/transport/gnunet-service-transport_validation.c:564
 msgid "# PING without HELLO messages sent"
 msgstr "# Mensajes PING sin HELLO mandados"
 
-#: src/transport/gnunet-service-transport_validation.c:618
+#: src/transport/gnunet-service-transport_validation.c:651
 msgid "# address revalidations started"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-service-transport_validation.c:860
+#: src/transport/gnunet-service-transport_validation.c:910
 msgid "# PING message for different peer received"
 msgstr "# Mensajes PING recibidos para un par diferente"
 
-#: src/transport/gnunet-service-transport_validation.c:925
+#: src/transport/gnunet-service-transport_validation.c:955
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr "Recibido un mensaje PING con un error de validación de «%s»\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1054
+#: src/transport/gnunet-service-transport_validation.c:1051
 msgid "# PONGs unicast via reliable transport"
 msgstr "# unicast de PONG vía transporte confiable"
 
-#: src/transport/gnunet-service-transport_validation.c:1063
+#: src/transport/gnunet-service-transport_validation.c:1060
 msgid "# PONGs multicast to all available addresses"
 msgstr "# multicast de PONG a todas las direcciones disponibles"
 
-#: src/transport/gnunet-service-transport_validation.c:1188
+#: src/transport/gnunet-service-transport_validation.c:1187
 msgid "# PONGs dropped, no matching pending validation"
 msgstr "# PONG omitidos, no hay una validación pendiente coincidente"
 
-#: src/transport/gnunet-service-transport_validation.c:1216
+#: src/transport/gnunet-service-transport_validation.c:1202
 msgid "# PONGs dropped, signature expired"
 msgstr "# Mensajes PONG omitidos, firma expirada"
 
-#: src/transport/gnunet-service-transport_validation.c:1270
+#: src/transport/gnunet-service-transport_validation.c:1302
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
@@ -4883,12 +5367,14 @@
 
 #: src/transport/gnunet-transport.c:429
 msgid "No transport plugins configured, peer will never communicate\n"
-msgstr "No hay módulos de transporte configurados, el par nunca se 
comunicará\n"
+msgstr ""
+"No hay módulos de transporte configurados, el par nunca se comunicará\n"
 
 #: src/transport/gnunet-transport.c:442
 #, c-format
 msgid "No port configured for plugin `%s', cannot test it\n"
-msgstr "Ningún puerto fue configurado para el módulo «%s», no se puede 
probar\n"
+msgstr ""
+"Ningún puerto fue configurado para el módulo «%s», no se puede probar\n"
 
 #: src/transport/gnunet-transport.c:506
 #, c-format
@@ -4902,8 +5388,12 @@
 
 #: src/transport/gnunet-transport.c:553
 #, c-format
-msgid "Successfully connected to `%s', starting to send benchmark data in %u 
Kb blocks\n"
-msgstr "Conectado satisfactoriamente a «%s», empezando a mandar datos de 
prueba en bloques de %u Kb\n"
+msgid ""
+"Successfully connected to `%s', starting to send benchmark data in %u Kb "
+"blocks\n"
+msgstr ""
+"Conectado satisfactoriamente a «%s», empezando a mandar datos de prueba en "
+"bloques de %u Kb\n"
 
 #: src/transport/gnunet-transport.c:588
 #, c-format
@@ -4932,17 +5422,26 @@
 
 #: src/transport/gnunet-transport.c:794
 msgid "Failed to send connect request to transport service\n"
-msgstr "Se produjo un fallo al enviar una petición de conexión al servicio de 
transporte\n"
+msgstr ""
+"Se produjo un fallo al enviar una petición de conexión al servicio de "
+"transporte\n"
 
 #: src/transport/gnunet-transport.c:828
 #, c-format
-msgid "Multiple operations given. Please choose only one operation: %s, %s, 
%s, %s, %s, %s\n"
-msgstr "Múltiples operaciones introducidas. Por favor, seleccione únicamente 
una operación: %s, %s, %s, %s, %s, %s\n"
+msgid ""
+"Multiple operations given. Please choose only one operation: %s, %s, %s, %s, "
+"%s, %s\n"
+msgstr ""
+"Múltiples operaciones introducidas. Por favor, seleccione únicamente una "
+"operación: %s, %s, %s, %s, %s, %s\n"
 
 #: src/transport/gnunet-transport.c:834
 #, c-format
-msgid "No operation given. Please choose one operation: %s, %s, %s, %s, %s, 
%s\n"
-msgstr "Ninguna operación introducida. Por favor, seleccione alguna operación: 
%s, %s, %s, %s, %s, %s\n"
+msgid ""
+"No operation given. Please choose one operation: %s, %s, %s, %s, %s, %s\n"
+msgstr ""
+"Ninguna operación introducida. Por favor, seleccione alguna operación: %s, "
+"%s, %s, %s, %s, %s\n"
 
 #: src/transport/gnunet-transport.c:854 src/transport/gnunet-transport.c:884
 #: src/transport/gnunet-transport.c:906 src/transport/gnunet-transport.c:945
@@ -4970,8 +5469,11 @@
 msgstr "provee información sobre todas las conexiones actuales (una vez)"
 
 #: src/transport/gnunet-transport.c:1008
-msgid "provide information about all connects and disconnect events 
(continuously)"
-msgstr "provee información sobre todas los eventos de conexión y desconexión 
(continuamente)"
+msgid ""
+"provide information about all connects and disconnect events (continuously)"
+msgstr ""
+"provee información sobre todas los eventos de conexión y desconexión "
+"(continuamente)"
 
 #: src/transport/gnunet-transport.c:1011
 msgid "do not resolve hostnames"
@@ -5037,13 +5539,21 @@
 
 #: src/transport/plugin_transport_http.c:1177
 #, c-format
-msgid "Specific IPv4 address `%s' for plugin %s in configuration file is 
invalid! Binding to all addresses!\n"
-msgstr "¡La dirección IPV4 «%s» especificada para el módulo %s en el fichero 
de configuración no es válida! ¡Asociándose a todas las direcciones!\n"
+msgid ""
+"Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
+"Binding to all addresses!\n"
+msgstr ""
+"¡La dirección IPV4 «%s» especificada para el módulo %s en el fichero de "
+"configuración no es válida! ¡Asociándose a todas las direcciones!\n"
 
 #: src/transport/plugin_transport_http.c:1206
 #, c-format
-msgid "Specific IPv6 address `%s' for plugin %s in configuration file is 
invalid! Binding to all addresses!\n"
-msgstr "¡La dirección IPv6 «%s» especificada para el módulo %s en el fichero 
de configuración no es válida! ¡Asociándose a todas las direcciones!\n"
+msgid ""
+"Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
+"Binding to all addresses!\n"
+msgstr ""
+"¡La dirección IPv6 «%s» especificada para el módulo %s en el fichero de "
+"configuración no es válida! ¡Asociándose a todas las direcciones!\n"
 
 #: src/transport/plugin_transport_http.c:1223
 #: src/transport/plugin_transport_http_server.c:2745
@@ -5055,24 +5565,26 @@
 msgid "No external hostname configured\n"
 msgstr "No hay nombre de máquina externo configurado\n"
 
-#: src/transport/plugin_transport_http_client.c:1516
+#: src/transport/plugin_transport_http_client.c:1531
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
-msgstr "¡No se pudo inicializar el multi-manejador de curl, no se pudo iniciar 
el módulo %s!\n"
+msgstr ""
+"¡No se pudo inicializar el multi-manejador de curl, no se pudo iniciar el "
+"módulo %s!\n"
 
-#: src/transport/plugin_transport_http_client.c:1647
+#: src/transport/plugin_transport_http_client.c:1662
 #: src/transport/plugin_transport_http_server.c:2869
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
-#: src/transport/plugin_transport_http_client.c:1672
+#: src/transport/plugin_transport_http_client.c:1687
 #: src/transport/plugin_transport_http_server.c:2928
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr "Finalización del módulo «%s» completa\n"
 
-#: src/transport/plugin_transport_http_client.c:1700
+#: src/transport/plugin_transport_http_client.c:1715
 #: src/transport/plugin_transport_http_server.c:2775
 #, c-format
 msgid "Maximum number of connections is %u\n"
@@ -5080,8 +5592,12 @@
 
 #: src/transport/plugin_transport_http_server.c:1342
 #, c-format
-msgid "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload 
data size %u\n"
-msgstr "Acceso desde la conexión %p (%u de %u) para «%s» «%s» URL «%s» con 
tamaño de los datos de subida %u\n"
+msgid ""
+"Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
+"size %u\n"
+msgstr ""
+"Acceso desde la conexión %p (%u de %u) para «%s» «%s» URL «%s» con tamaño de "
+"los datos de subida %u\n"
 
 #: src/transport/plugin_transport_http_server.c:1603
 #, c-format
@@ -5090,16 +5606,25 @@
 
 #: src/transport/plugin_transport_http_server.c:1611
 #, c-format
-msgid "Server reached maximum number connections (%u), rejecting new 
connection\n"
-msgstr "El servidor ha alcanzado el número máximo de conexiones (%u), 
rechazando nueva conexión\n"
+msgid ""
+"Server reached maximum number connections (%u), rejecting new connection\n"
+msgstr ""
+"El servidor ha alcanzado el número máximo de conexiones (%u), rechazando "
+"nueva conexión\n"
 
 #: src/transport/plugin_transport_http_server.c:1912
-msgid "Could not create a new TLS certificate, program 
`gnunet-transport-certificate-creation' could not be started!\n"
-msgstr "¡No se pudo crear un certificado TLS nuevo, el programa 
«gnunet-transport-certificate-creation» no pudo ser iniciado!\n"
+msgid ""
+"Could not create a new TLS certificate, program `gnunet-transport-"
+"certificate-creation' could not be started!\n"
+msgstr ""
+"¡No se pudo crear un certificado TLS nuevo, el programa «gnunet-transport-"
+"certificate-creation» no pudo ser iniciado!\n"
 
 #: src/transport/plugin_transport_http_server.c:1936
 msgid "No usable TLS certificate found and creating one failed!\n"
-msgstr "¡No se encontró ningún certificado TLS útil y se produjo un fallo al 
crear uno!\n"
+msgstr ""
+"¡No se encontró ningún certificado TLS útil y se produjo un fallo al crear "
+"uno!\n"
 
 #: src/transport/plugin_transport_http_server.c:2631
 #, c-format
@@ -5119,7 +5644,9 @@
 #: src/transport/plugin_transport_http_server.c:2685
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
-msgstr "¡La dirección IPv4 «%s» especificada en el fichero de configuración no 
es válida!\n"
+msgstr ""
+"¡La dirección IPv4 «%s» especificada en el fichero de configuración no es "
+"válida!\n"
 
 #: src/transport/plugin_transport_http_server.c:2695
 #, c-format
@@ -5129,7 +5656,9 @@
 #: src/transport/plugin_transport_http_server.c:2716
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
-msgstr "¡La dirección IPv6 «%s» especificada en el fichero de configuración no 
es válida!\n"
+msgstr ""
+"¡La dirección IPv6 «%s» especificada en el fichero de configuración no es "
+"válida!\n"
 
 #: src/transport/plugin_transport_http_server.c:2726
 #, c-format
@@ -5170,7 +5699,9 @@
 
 #: src/transport/plugin_transport_smtp.c:799
 msgid "No email-address specified, can not start SMTP transport.\n"
-msgstr "No se ha especificado una dirección de correo, no se puede iniciar el 
transporte SMTP.\n"
+msgstr ""
+"No se ha especificado una dirección de correo, no se puede iniciar el "
+"transporte SMTP.\n"
 
 #: src/transport/plugin_transport_smtp.c:811
 msgid "# bytes received via SMTP"
@@ -5247,7 +5778,9 @@
 #: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
-msgstr "¡Se requiere un número de puerto válido para el servicio «%s» en la 
configuración!\n"
+msgstr ""
+"¡Se requiere un número de puerto válido para el servicio «%s» en la "
+"configuración!\n"
 
 #: src/transport/plugin_transport_tcp.c:2364
 msgid "Failed to start service.\n"
@@ -5278,17 +5811,29 @@
 #: src/transport/plugin_transport_udp_broadcasting.c:394
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr "Se produjo un fallo al establecer la opción de «broadcast» IPv4 para 
el «socket» en el puerto %d\n"
+msgstr ""
+"Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el "
+"«socket» en el puerto %d\n"
 
 #: src/transport/plugin_transport_udp.c:2517
 #, c-format
-msgid "UDP could not transmit message to `%s': Network seems down, please 
check your network configuration\n"
-msgstr "UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por 
favor, compruebe su configuración de red\n"
+msgid ""
+"UDP could not transmit message to `%s': Network seems down, please check "
+"your network configuration\n"
+msgstr ""
+"UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, "
+"compruebe su configuración de red\n"
 
 #: src/transport/plugin_transport_udp.c:2531
 #, c-format
-msgid "UDP could not transmit message to `%s': Please check your network 
configuration and disable IPv6 if your connection does not have a global IPv6 
address\n"
-msgstr "UDP no pudo transmitir el mensaje a «%s». Por favor, compruebe su 
configuración de red y deshabilite IPv6 si su conexión carece de una dirección 
IPv6 global\n"
+msgid ""
+"UDP could not transmit message to `%s': Please check your network "
+"configuration and disable IPv6 if your connection does not have a global "
+"IPv6 address\n"
+msgstr ""
+"UDP no pudo transmitir el mensaje a «%s». Por favor, compruebe su "
+"configuración de red y deshabilite IPv6 si su conexión carece de una "
+"dirección IPv6 global\n"
 
 #: src/transport/plugin_transport_udp.c:2772
 msgid "Failed to open UDP sockets\n"
@@ -5304,7 +5849,7 @@
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Dirección IPv6 no válida: «%s»\n"
 
-#: src/transport/plugin_transport_unix.c:1357
+#: src/transport/plugin_transport_unix.c:1355
 msgid "Failed to open UNIX sockets\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UNIX\n"
 
@@ -5371,7 +5916,9 @@
 #: src/transport/plugin_transport_wlan.c:1739
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
-msgstr "El ejecutable auxiliar «%s» no tiene activado el bit SUID, no se puede 
ejecutar el transporte WLAN\n"
+msgstr ""
+"El ejecutable auxiliar «%s» no tiene activado el bit SUID, no se puede "
+"ejecutar el transporte WLAN\n"
 
 #: src/transport/transport_api.c:659
 #, c-format
@@ -5414,7 +5961,8 @@
 #: src/util/client.c:276 src/util/client.c:753 src/util/service.c:984
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
-msgstr "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es 
%llu\n"
+msgstr ""
+"La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n"
 
 #: src/util/client.c:280 src/util/client.c:757 src/util/service.c:988
 #, c-format
@@ -5423,8 +5971,12 @@
 
 #: src/util/client.c:371
 #, c-format
-msgid "Could not determine valid hostname and port for service `%s' from 
configuration.\n"
-msgstr "No se pudo determinar un nombre de máquina y un puerto válidos para el 
servicio «%s» a partir de la configuración.\n"
+msgid ""
+"Could not determine valid hostname and port for service `%s' from "
+"configuration.\n"
+msgstr ""
+"No se pudo determinar un nombre de máquina y un puerto válidos para el "
+"servicio «%s» a partir de la configuración.\n"
 
 #: src/util/client.c:379
 #, c-format
@@ -5447,59 +5999,66 @@
 
 #: src/util/client.c:1177
 msgid "Could not submit request, not expecting to receive a response.\n"
-msgstr "No se pudo enviar correctamente la petición, no se espera recibir una 
respuesta.\n"
+msgstr ""
+"No se pudo enviar correctamente la petición, no se espera recibir una "
+"respuesta.\n"
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1007
+#: src/util/common_logging.c:258 src/util/common_logging.c:1034
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1005
+#: src/util/common_logging.c:260 src/util/common_logging.c:1032
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1003
+#: src/util/common_logging.c:262 src/util/common_logging.c:1030
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1001
+#: src/util/common_logging.c:264 src/util/common_logging.c:1028
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/common_logging.c:266 src/util/common_logging.c:1009
+#: src/util/common_logging.c:266 src/util/common_logging.c:1036
 msgid "NONE"
 msgstr "NINGUNO"
 
 #: src/util/common_logging.c:395
 #, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
-msgstr "Se produjo un fallo al crear o acceder al directorio para el fichero 
de log «%s»\n"
+msgstr ""
+"Se produjo un fallo al crear o acceder al directorio para el fichero de log "
+"«%s»\n"
 
 #: src/util/common_logging.c:819
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Mensaje `%.*s» repetido %u veces en el último %s\n"
 
-#: src/util/common_logging.c:1010
+#: src/util/common_logging.c:1037
 msgid "INVALID"
 msgstr "NO VÁLIDO"
 
-#: src/util/common_logging.c:1149
+#: src/util/common_logging.c:1176
 msgid "unknown address"
 msgstr "dirección desconocida"
 
-#: src/util/common_logging.c:1187
+#: src/util/common_logging.c:1214
 msgid "invalid address"
 msgstr "dirección no válida"
 
-#: src/util/common_logging.c:1205
+#: src/util/common_logging.c:1232
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "¡La configuración no especifica la opción «%s» en la sección «%s»!\n"
 
-#: src/util/common_logging.c:1226
+#: src/util/common_logging.c:1253
 #, c-format
-msgid "Configuration specifies invalid value for option `%s' in section `%s': 
%s\n"
-msgstr "La configuración especifica un valor no válido en la opción «%s» de la 
sección «%s»: %s\n"
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
+msgstr ""
+"La configuración especifica un valor no válido en la opción «%s» de la "
+"sección «%s»: %s\n"
 
 #: src/util/configuration.c:291
 #, c-format
@@ -5508,8 +6067,12 @@
 
 #: src/util/configuration.c:998
 #, c-format
-msgid "Configuration value '%s' for '%s' in section '%s' is not in set of 
legal choices\n"
-msgstr "El valor de configuración «%s» para «%s» de la sección «%s» no está 
dentro de las opciones legales\n"
+msgid ""
+"Configuration value '%s' for '%s' in section '%s' is not in set of legal "
+"choices\n"
+msgstr ""
+"El valor de configuración «%s» para «%s» de la sección «%s» no está dentro "
+"de las opciones legales\n"
 
 #: src/util/connection.c:427
 #, c-format
@@ -5523,8 +6086,11 @@
 
 #: src/util/connection.c:557
 #, c-format
-msgid "Failed to establish TCP connection to `%s:%u', no further addresses to 
try.\n"
-msgstr "Se produjo un fallo al establecer la conexión TCP a «%s:%u», no quedan 
direcciones por probar.\n"
+msgid ""
+"Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
+msgstr ""
+"Se produjo un fallo al establecer la conexión TCP a «%s:%u», no quedan "
+"direcciones por probar.\n"
 
 #: src/util/connection.c:755 src/util/connection.c:922
 #, c-format
@@ -5538,106 +6104,133 @@
 
 #: src/util/container_bloomfilter.c:518
 #, c-format
-msgid "Size of file on disk is incorrect for this Bloom filter (want %llu, 
have %llu)\n"
-msgstr "El tamaño del fichero en disco es incorrecto para este «Bloom filter» 
(esperado %llu, tiene %llu)\n"
+msgid ""
+"Size of file on disk is incorrect for this Bloom filter (want %llu, have "
+"%llu)\n"
+msgstr ""
+"El tamaño del fichero en disco es incorrecto para este «Bloom "
+"filter» (esperado %llu, tiene %llu)\n"
 
-#: src/util/crypto_ecc.c:441
+#: src/util/crypto_ecc.c:447
 #, c-format
-msgid "File `%s' does not contain a valid private key (too long, %llu bytes).  
Deleting it.\n"
-msgstr "El fichero «%s» no contiene una clave privada válida (demasiado 
grande, %llu bytes).  Borrándolo.\n"
+msgid ""
+"File `%s' does not contain a valid private key (too long, %llu bytes).  "
+"Deleting it.\n"
+msgstr ""
+"El fichero «%s» no contiene una clave privada válida (demasiado grande, %llu "
+"bytes).  Borrándolo.\n"
 
-#: src/util/crypto_ecc.c:456 src/util/crypto_rsa.c:660
+#: src/util/crypto_ecc.c:462 src/util/crypto_rsa.c:676
 #, c-format
-msgid "File `%s' does not contain a valid private key (failed decode, %llu 
bytes).  Deleting it.\n"
-msgstr "El fichero «%s» no contiene una clave privada válida (falló al 
decodificar, %llu bytes).  Borrándolo.\n"
+msgid ""
+"File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
+"Deleting it.\n"
+msgstr ""
+"El fichero «%s» no contiene una clave privada válida (falló al decodificar, "
+"%llu bytes).  Borrándolo.\n"
 
-#: src/util/crypto_ecc.c:552 src/util/crypto_ecc.c:596
-#: src/util/crypto_rsa.c:757 src/util/crypto_rsa.c:801
+#: src/util/crypto_ecc.c:558 src/util/crypto_ecc.c:602
+#: src/util/crypto_rsa.c:750 src/util/crypto_rsa.c:887
 #, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "No se pudo bloquear el fichero «%s»: %s...\n"
 
-#: src/util/crypto_ecc.c:557 src/util/crypto_rsa.c:762
+#: src/util/crypto_ecc.c:563 src/util/crypto_rsa.c:892
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Generando una clave privada nueva.  Esto puede tomar un tiempo.\n"
 
-#: src/util/crypto_ecc.c:600 src/util/crypto_rsa.c:805
-#: src/util/crypto_rsa.c:841
+#: src/util/crypto_ecc.c:606 src/util/crypto_rsa.c:754
+#: src/util/crypto_rsa.c:790
 msgid "This may be ok if someone is currently generating a private key.\n"
-msgstr "Esto puede estar bien si alguien está actualmente generando una clave 
privada.\n"
+msgstr ""
+"Esto puede estar bien si alguien está actualmente generando una clave "
+"privada.\n"
 
-#: src/util/crypto_ecc.c:631 src/util/crypto_rsa.c:836
+#: src/util/crypto_ecc.c:637 src/util/crypto_rsa.c:785
 #, c-format
-msgid "When trying to read key file `%s' I found %u bytes but I need at least 
%u.\n"
-msgstr "Cuando se intentaba leer el fichero de claves «%s» se encontraron %u 
bytes pero al menos %u son necesarios.\n"
+msgid ""
+"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
+msgstr ""
+"Cuando se intentaba leer el fichero de claves «%s» se encontraron %u bytes "
+"pero al menos %u son necesarios.\n"
 
-#: src/util/crypto_ecc.c:636
+#: src/util/crypto_ecc.c:642
 msgid "This may be ok if someone is currently generating a key.\n"
-msgstr "Esto puede ser correcto si alguien está actualmente generando una 
clave de máquina.\n"
+msgstr ""
+"Esto puede ser correcto si alguien está actualmente generando una clave de "
+"máquina.\n"
 
-#: src/util/crypto_ecc.c:651 src/util/crypto_rsa.c:856
+#: src/util/crypto_ecc.c:657 src/util/crypto_rsa.c:805
 #, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "El fichero «%s» no contiene una clave privada válida.  Borrándolo.\n"
 
-#: src/util/crypto_ecc.c:773 src/util/crypto_rsa.c:941
+#: src/util/crypto_ecc.c:779 src/util/crypto_rsa.c:982
 msgid "interrupted by shutdown"
 msgstr "interrumpido por apagado"
 
-#: src/util/crypto_ecc.c:784
+#: src/util/crypto_ecc.c:790
 msgid "gnunet-ecc failed"
 msgstr "«gnunet-ecc» falló"
 
-#: src/util/crypto_ecc.c:979
+#: src/util/crypto_ecc.c:978
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "El firmado ECC falló en %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:1047
+#: src/util/crypto_ecc.c:1046
 #, c-format
 msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de firma ECC falló en %s:%d: %s\n"
 
-#: src/util/crypto_random.c:313
+#: src/util/crypto_ecc.c:1130
+msgid "To be implemented: not secure at the moment, please read README\n"
+msgstr ""
+
+#: src/util/crypto_random.c:281
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr "Iniciando el proceso «%s» para generar entropía\n"
 
-#: src/util/crypto_random.c:342
+#: src/util/crypto_random.c:312
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt no tiene la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/crypto_rsa.c:644
+#: src/util/crypto_rsa.c:660
 #, c-format
-msgid "File `%s' does not contain a valid private key (too long, %llu bytes).  
Renaming it.\n"
-msgstr "El fichero «%s» no contiene una clave privada válida (demasiado 
grande, %llu bytes).  Renombrándolo.\n"
+msgid ""
+"File `%s' does not contain a valid private key (too long, %llu bytes).  "
+"Renaming it.\n"
+msgstr ""
+"El fichero «%s» no contiene una clave privada válida (demasiado grande, %llu "
+"bytes).  Renombrándolo.\n"
 
-#: src/util/crypto_rsa.c:952
+#: src/util/crypto_rsa.c:993
 msgid "gnunet-rsa failed"
 msgstr "«gnunet-rsa» falló"
 
-#: src/util/crypto_rsa.c:1343
+#: src/util/crypto_rsa.c:1378
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
 
-#: src/util/disk.c:601
+#: src/util/disk.c:602
 #, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "«%s» falló para la unidad «%S»: %u\n"
 
-#: src/util/disk.c:1205
+#: src/util/disk.c:1206
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
 
-#: src/util/disk.c:1559 src/util/service.c:1669
+#: src/util/disk.c:1560 src/util/service.c:1670
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n"
 
-#: src/util/disk.c:1931
+#: src/util/disk.c:1999
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "Ningún «%s» especificado para el servicio «%s» en la configuración.\n"
@@ -5704,8 +6297,11 @@
 
 #: src/util/getopt_helpers.c:86
 #, c-format
-msgid "Arguments mandatory for long options are also mandatory for short 
options.\n"
-msgstr "Los parámetros obligatorios para las opciones largas también lo son 
para sus versiones cortas.\n"
+msgid ""
+"Arguments mandatory for long options are also mandatory for short options.\n"
+msgstr ""
+"Los parámetros obligatorios para las opciones largas también lo son para sus "
+"versiones cortas.\n"
 
 #: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:316
 #, c-format
@@ -5729,7 +6325,8 @@
 
 #: src/util/gnunet-config.c:160
 msgid "obtain option of value as a filename (with $-expansion)"
-msgstr "obtener la opción del valor como un nombre de fichero (con expansión 
del $)"
+msgstr ""
+"obtener la opción del valor como un nombre de fichero (con expansión del $)"
 
 #: src/util/gnunet-config.c:163
 msgid "name of the section to access"
@@ -5747,17 +6344,17 @@
 msgid "Manipulate GNUnet configuration files"
 msgstr "Manipular ficheros de configuración de GNUnet"
 
-#: src/util/gnunet-ecc.c:107 src/util/gnunet-rsa.c:107
+#: src/util/gnunet-ecc.c:76
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Se produjo un fallo al abrir «%s»: %s\n"
 
-#: src/util/gnunet-ecc.c:113 src/util/gnunet-rsa.c:113
+#: src/util/gnunet-ecc.c:82
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr "Generando %u claves, por favor, espere"
 
-#: src/util/gnunet-ecc.c:128 src/util/gnunet-rsa.c:137
+#: src/util/gnunet-ecc.c:100
 #, c-format
 msgid ""
 "\n"
@@ -5766,37 +6363,42 @@
 "\n"
 "Se produjo un fallo al escribir en «%s»: %s\n"
 
-#: src/util/gnunet-ecc.c:140 src/util/gnunet-rsa.c:149
-#, c-format
-msgid "Finished!\n"
+#: src/util/gnunet-ecc.c:112
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Finished!\n"
 msgstr "¡Finalizado!\n"
 
-#: src/util/gnunet-ecc.c:163 src/util/gnunet-rsa.c:172
+#: src/util/gnunet-ecc.c:115
 #, c-format
+msgid ""
+"\n"
+"Error, %u keys not generated\n"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:138 src/util/gnunet-rsa.c:65
+#, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr "No se ha especificado la clave de máquina en la línea de comandos\n"
 
-#: src/util/gnunet-ecc.c:220 src/util/gnunet-rsa.c:229
+#: src/util/gnunet-ecc.c:193
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr "crea «COUNT» pares de claves pública-privada (para pruebas)"
 
-#: src/util/gnunet-ecc.c:223 src/util/gnunet-rsa.c:232
+#: src/util/gnunet-ecc.c:196 src/util/gnunet-rsa.c:115
 msgid "print the public key in ASCII format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:226 src/util/gnunet-rsa.c:235
+#: src/util/gnunet-ecc.c:199 src/util/gnunet-rsa.c:118
 msgid "print the hash of the public key in ASCII format"
 msgstr "imprime el hash de la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:229 src/util/gnunet-rsa.c:238
+#: src/util/gnunet-ecc.c:202 src/util/gnunet-rsa.c:121
 msgid "print the short hash of the public key in ASCII format"
 msgstr "imprime el hash corto de la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:232 src/util/gnunet-rsa.c:241
-msgid "use insecure, weak random number generator for key generation (for 
testing only)"
-msgstr "usar un generador de números aleatorios inseguro y débil para la 
generación de claves (únicamente para pruebas)"
-
-#: src/util/gnunet-ecc.c:243
+#: src/util/gnunet-ecc.c:213
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
@@ -5808,7 +6410,7 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr "Utilizar el resolvedor interno para pruebas de GNUnet"
 
-#: src/util/gnunet-rsa.c:252
+#: src/util/gnunet-rsa.c:132
 msgid "Manipulate GNUnet private RSA key files"
 msgstr "Manipular los ficheros de clave privada RSA de GNUnet"
 
@@ -5847,17 +6449,19 @@
 msgid "Perform default-actions for GNUnet URIs"
 msgstr "Realizar las acciones predeterminadas para URI de GNUnet"
 
-#: src/util/helper.c:260
+#: src/util/helper.c:271
 #, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Error leyendo de «%s»: %s\n"
 
-#: src/util/helper.c:305
+#: src/util/helper.c:316
 #, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
-msgstr "Se produjo un fallo al procesar el mensaje interno del programa 
auxiliar «%s»\n"
+msgstr ""
+"Se produjo un fallo al procesar el mensaje interno del programa auxiliar "
+"«%s»\n"
 
-#: src/util/helper.c:499
+#: src/util/helper.c:537
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Error escribiendo a «%s»: %s\n"
@@ -5869,29 +6473,26 @@
 
 #: src/util/network.c:1331
 #, c-format
-msgid "Fatal internal logic error, process hangs in `%s' (abort with 
CTRL-C)!\n"
-msgstr "¡Error lógico interno fatal, el proceso está colgado en «%s» (abortar 
con CTRL-C)!\n"
+msgid ""
+"Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
+msgstr ""
+"¡Error lógico interno fatal, el proceso está colgado en «%s» (abortar con "
+"CTRL-C)!\n"
 
 #: src/util/os_installation.c:420
 #, c-format
-msgid "Could not determine installation path for %s.  Set `%s' environment 
variable.\n"
-msgstr "No se pudo determinar la ruta de instalación de %s.  Establezca la 
variable de entorno «%s».\n"
+msgid ""
+"Could not determine installation path for %s.  Set `%s' environment "
+"variable.\n"
+msgstr ""
+"No se pudo determinar la ruta de instalación de %s.  Establezca la variable "
+"de entorno «%s».\n"
 
 #: src/util/os_installation.c:702
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "¡No se pudo encontrar el programa llamado «%s» en PATH!\n"
 
-#: src/util/os_priority.c:302
-#, c-format
-msgid "Failed to open named pipe `%s' for reading: %s\n"
-msgstr "Se produjo un fallo al abrir el fichero (tubería) «%s» para lectura: 
%s\n"
-
-#: src/util/os_priority.c:303
-#, c-format
-msgid "Failed to open named pipe `%s' for writing: %s\n"
-msgstr "Se produjo un fallo al abrir el fichero (tubería) «%s» para escritura: 
%s\n"
-
 #: src/util/plugin.c:89
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -5911,17 +6512,19 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "No se pudo determinar la ruta de instalación de los módulos.\n"
 
-#: src/util/program.c:254 src/util/service.c:1791
+#: src/util/program.c:254 src/util/service.c:1792
 #, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "No se pudo acceder al fichero de configuración «%s»\n"
 
-#: src/util/pseudonym.c:282
+#: src/util/pseudonym.c:329 src/util/pseudonym.c:632
 #, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr "Se produjo un fallo al procesar los metadatos del fichero «%s» acerca 
del seudónimo: %s\n"
+msgstr ""
+"Se produjo un fallo al procesar los metadatos del fichero «%s» acerca del "
+"seudónimo: %s\n"
 
-#: src/util/pseudonym.c:413 src/util/pseudonym.c:439
+#: src/util/pseudonym.c:464 src/util/pseudonym.c:490 src/util/pseudonym.c:628
 msgid "no-name"
 msgstr "sin nombre"
 
@@ -5932,8 +6535,11 @@
 
 #: src/util/resolver_api.c:221
 #, c-format
-msgid "Must specify `%s' or numeric IP address for `%s' of `%s' in 
configuration!\n"
-msgstr "¡Se debe especificar «%s» o una dirección numérica IP para «%s» de 
«%s» en la configuración!\n"
+msgid ""
+"Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
+msgstr ""
+"¡Se debe especificar «%s» o una dirección numérica IP para «%s» de «%s» en "
+"la configuración!\n"
 
 #: src/util/resolver_api.c:347
 #, c-format
@@ -5948,7 +6554,8 @@
 #: src/util/resolver_api.c:890
 #, c-format
 msgid "Could not resolve our FQDN : %s\n"
-msgstr "No se pudo resolver nuestro nombre de dominio cualificado (FQDN) : 
%s\n"
+msgstr ""
+"No se pudo resolver nuestro nombre de dominio cualificado (FQDN) : %s\n"
 
 #: src/util/scheduler.c:782
 msgid "Looks like we're busy waiting...\n"
@@ -5976,8 +6583,12 @@
 
 #: src/util/server.c:830
 #, c-format
-msgid "Processing code for message of type %u did not call 
`GNUNET_SERVER_receive_done' after %s\n"
-msgstr "El código de procesado para el mensaje del tipo %u no llamó a 
«GNUNET_SERVER_receive_done» después de %s\n"
+msgid ""
+"Processing code for message of type %u did not call "
+"`GNUNET_SERVER_receive_done' after %s\n"
+msgstr ""
+"El código de procesado para el mensaje del tipo %u no llamó a "
+"«GNUNET_SERVER_receive_done» después de %s\n"
 
 #: src/util/service.c:142 src/util/service.c:168 src/util/service.c:211
 #: src/util/service.c:232 src/util/service.c:239
@@ -6032,22 +6643,33 @@
 
 #: src/util/service.c:929
 #, c-format
-msgid "Disabling IPv6 support for service `%s', failed to create IPv6 socket: 
%s\n"
-msgstr "Deshabilitando el soporte para IPv6 para el servicio «%s», se produjo 
un fallo al crear un «socket» IPv6: %s\n"
+msgid ""
+"Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
+msgstr ""
+"Deshabilitando el soporte para IPv6 para el servicio «%s», se produjo un "
+"fallo al crear un «socket» IPv6: %s\n"
 
 #: src/util/service.c:1007
 #, c-format
-msgid "Disabling UNIX domain socket support for service `%s', failed to create 
UNIX domain socket: %s\n"
-msgstr "Deshabilitando el soporte de dominio de «sockets» UNIX para el 
servicio «%s», no se pudo crear un «socket» UNIX: %s\n"
+msgid ""
+"Disabling UNIX domain socket support for service `%s', failed to create UNIX "
+"domain socket: %s\n"
+msgstr ""
+"Deshabilitando el soporte de dominio de «sockets» UNIX para el servicio "
+"«%s», no se pudo crear un «socket» UNIX: %s\n"
 
 #: src/util/service.c:1024
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
-msgstr "No hay ni puerto (PORT) ni ruta unix (UNIXPATH) para el servicio «%s», 
pero uno es necesario\n"
+msgstr ""
+"No hay ni puerto (PORT) ni ruta unix (UNIXPATH) para el servicio «%s», pero "
+"uno es necesario\n"
 
 #: src/util/service.c:1258
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
-msgstr "No se pudo acceder a un «socket» pre-ascociado, lo intentaré asociar 
yo mismo\n"
+msgstr ""
+"No se pudo acceder a un «socket» pre-ascociado, lo intentaré asociar yo "
+"mismo\n"
 
 #: src/util/service.c:1309 src/util/service.c:1327
 #, c-format
@@ -6057,40 +6679,43 @@
 #: src/util/service.c:1354
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
-msgstr "No se pudo acceder al «socket» pre-ascociado %u, lo intentaré asociar 
yo mismo\n"
+msgstr ""
+"No se pudo acceder al «socket» pre-ascociado %u, lo intentaré asociar yo "
+"mismo\n"
 
-#: src/util/service.c:1525
+#: src/util/service.c:1526
 #, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
 
-#: src/util/service.c:1558
+#: src/util/service.c:1559
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "El servicio «%s» se ejecuta en %s\n"
 
-#: src/util/service.c:1607
+#: src/util/service.c:1608
 msgid "Service process failed to initialize\n"
 msgstr "No se pudo inicializar el proceso del servicio\n"
 
-#: src/util/service.c:1611
+#: src/util/service.c:1612
 msgid "Service process could not initialize server function\n"
-msgstr "No se pudo inicializar la función del servidor en el proceso del 
servicio\n"
+msgstr ""
+"No se pudo inicializar la función del servidor en el proceso del servicio\n"
 
-#: src/util/service.c:1615
+#: src/util/service.c:1616
 msgid "Service process failed to report status\n"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
-#: src/util/service.c:1670
+#: src/util/service.c:1671
 msgid "No such user"
 msgstr "No existe tal usuario"
 
-#: src/util/service.c:1683
+#: src/util/service.c:1684
 #, 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:1749
+#: src/util/service.c:1750
 msgid "do daemonize (detach from terminal)"
 msgstr "demonizar (desasociar del terminal)"
 
@@ -6103,68 +6728,74 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:413
+#: src/util/strings.c:425
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr "Los conjuntos de caracteres pedidos fueron «%s»->«%s»\n"
 
-#: src/util/strings.c:528
+#: src/util/strings.c:540
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
-msgstr "Se produjo un fallo al expandir «$HOME»: variable de entorno «HOME» no 
establecida"
+msgstr ""
+"Se produjo un fallo al expandir «$HOME»: variable de entorno «HOME» no "
+"establecida"
 
-#: src/util/strings.c:625
+#: src/util/strings.c:637
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:629
+#: src/util/strings.c:641
 msgid "forever"
 msgstr "para siempre"
 
-#: src/util/strings.c:631
+#: src/util/strings.c:643
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:637
+#: src/util/strings.c:649
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:643
+#: src/util/strings.c:655
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:649
+#: src/util/strings.c:661
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:656
+#: src/util/strings.c:668
 msgid "day"
 msgstr "día"
 
-#: src/util/strings.c:658
+#: src/util/strings.c:670
 msgid "days"
 msgstr "días"
 
-#: src/util/strings.c:685
+#: src/util/strings.c:697
 msgid "end of time"
 msgstr "fin del plazo"
 
-#: src/util/strings.c:1073
+#: src/util/strings.c:1086
 msgid "IPv6 address did not start with `['\n"
 msgstr "La dirección IPv6 no empezaba con «[»\n"
 
-#: src/util/strings.c:1081
+#: src/util/strings.c:1094
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr "La dirección IPv6 contenía «:» para separar el número de puerto\n"
 
-#: src/util/strings.c:1087
+#: src/util/strings.c:1100
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
-msgstr "La dirección IPv6 contenía «]» antes de «:» para separar el número de 
puerto\n"
+msgstr ""
+"La dirección IPv6 contenía «]» antes de «:» para separar el número de "
+"puerto\n"
 
-#: src/util/strings.c:1094
+#: src/util/strings.c:1107
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
-msgstr "La dirección IPv6 contenía un número de puerto válido después del 
último «:»\n"
+msgstr ""
+"La dirección IPv6 contenía un número de puerto válido después del último "
+"«:»\n"
 
-#: src/util/strings.c:1103
+#: src/util/strings.c:1116
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Dirección IPv6 «%s» no válida: %s\n"
@@ -6250,15 +6881,18 @@
 
 #: src/vpn/gnunet-service-vpn.c:2751
 msgid "Failed to allocate IP address for new destination\n"
-msgstr "Se produjo un fallo al alojar las direcciones IP para el nuevo 
destino\n"
+msgstr ""
+"Se produjo un fallo al alojar las direcciones IP para el nuevo destino\n"
 
 #: src/vpn/gnunet-service-vpn.c:3138
 msgid "IPv6 support disabled as this system does not support IPv6\n"
-msgstr "El soporte de IPv6 se deshabilita porque este sistema no soporta 
IPv6\n"
+msgstr ""
+"El soporte de IPv6 se deshabilita porque este sistema no soporta IPv6\n"
 
 #: src/vpn/gnunet-service-vpn.c:3170
 msgid "IPv4 support disabled as this system does not support IPv4\n"
-msgstr "El soporte de IPv4 se deshabilita porque este sistema no soporta 
IPv4\n"
+msgstr ""
+"El soporte de IPv4 se deshabilita porque este sistema no soporta IPv4\n"
 
 #: src/vpn/gnunet-vpn.c:151
 msgid "Error creating tunnel\n"
@@ -6299,7 +6933,8 @@
 
 #: src/vpn/gnunet-vpn.c:301
 msgid "print IP address only after mesh tunnel has been created"
-msgstr "imprimir direcciones IP solamente después de haber creado el túnel 
mesh"
+msgstr ""
+"imprimir direcciones IP solamente después de haber creado el túnel mesh"
 
 #: src/vpn/gnunet-vpn.c:304
 msgid "how long should the mapping be valid for new tunnels?"
@@ -6345,14 +6980,80 @@
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 
-#~ msgid "No inbound quota configure for network `%s', assigning default 
bandwidth %llu\n"
-#~ msgstr "No hay configuración de cuota de entrada para la red '%s', 
asignando el ancho de banda predeterminado (%llu)\n"
+#~ msgid "Failed to read hostkey: %s\n"
+#~ msgstr "Se produjo un fallo al leer la clave de máquina: %s\n"
 
+#~ msgid "# Delayed connecting due to lack of public key"
+#~ msgstr "# Retrasada la conexión debido a la falta de clave pública"
+
+#~ msgid "# session keys received"
+#~ msgstr "# claves de sesión recibidas"
+
+#~ msgid "`%s' is for `%s', not for me.  Ignoring.\n"
+#~ msgstr "«%s» es para «%s», no para mí. Ignorándolo.\n"
+
+#~ msgid "# SET_KEY and PING messages created"
+#~ msgstr "# mensajes «SET_KEY» y «PING» creados"
+
+#~ msgid "# REKEY operations performed"
+#~ msgstr "# operaciones de cambio de clave (REKEY) realizadas"
+
+#~ msgid "# failed to decrypt message (no session key)"
+#~ msgstr "# fallos al descifrar el mensaje (no hay clave de sesión)"
+
+#~ msgid "Message received far too old (%s). Content ignored.\n"
+#~ msgstr "El mensaje recibido es muy antiguo (%s). Se ignora el contenido.\n"
+
+#~ msgid "Unknown error"
+#~ msgstr "Error desconocido"
+
+#~ msgid "Failed to serialize meta data"
+#~ msgstr "Se produjo un fallo al serializar metadatos"
+
+#~ msgid "Failed to connect to datastore service"
+#~ msgstr "Se produjo un fallo al conectar con el servicio de almacenamiento"
+
+#~ msgid "Failed to parse URI `%s' from KBlock!\n"
+#~ msgstr "¡Se produjo un fallo al procesar la URI «%s» del KBlock!\n"
+
+#~ msgid "Regexprofiler could not access hostkey: %s. Exiting.\n"
+#~ msgstr ""
+#~ "El perfilador de expresiones regulares no puede acceder a la clave de "
+#~ "máquina: %s. Saliendo.\n"
+
+#~ msgid ""
+#~ "if this option is set, only one peer is responsible for searching all "
+#~ "strings"
+#~ msgstr ""
+#~ "si esta opción está activada, únicamente un par es responsable de buscar "
+#~ "todas las cadenas"
+
+#~ msgid "Could not access STATISTICS service.  Exiting.\n"
+#~ msgstr ""
+#~ "No se pudo acceder al servicio de estadísticas (STATISTICS).  Saliendo.\n"
+
+#~ msgid ""
+#~ "use insecure, weak random number generator for key generation (for "
+#~ "testing only)"
+#~ msgstr ""
+#~ "usar un generador de números aleatorios inseguro y débil para la "
+#~ "generación de claves (únicamente para pruebas)"
+
+#~ msgid "Failed to open named pipe `%s' for reading: %s\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al abrir el fichero (tubería) «%s» para lectura: %s\n"
+
+#~ msgid "Failed to open named pipe `%s' for writing: %s\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al abrir el fichero (tubería) «%s» para escritura: "
+#~ "%s\n"
+
 #~ msgid "session identifier"
 #~ msgstr "identificador de sesión"
 
 #~ msgid "Mesh service could not access hostkey.  Exiting.\n"
-#~ msgstr "El servicio 'MESH' no puede acceder a la clave de la máquina. 
Saliendo.\n"
+#~ msgstr ""
+#~ "El servicio 'MESH' no puede acceder a la clave de la máquina. Saliendo.\n"
 
 #~ msgid "\rChecked %u hosts"
 #~ msgstr "\rComprobadas %u máquinas"
@@ -6370,8 +7071,14 @@
 #~ msgid "create COUNT number of random links"
 #~ msgstr "crea «COUNT» número de enlaces aleatorios"
 
-#~ 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 "Intentar adquirir topología (TOPOLOGY) dada. Estas opciones toman 
«CLIQUE» o «RANDOM» como argumentos. «CLIQUE» ignora el parámetro -n. Lo 
predeterminado es adquirir una topología aleatoria (RANDOM) en el grafo."
+#~ 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 ""
+#~ "Intentar adquirir topología (TOPOLOGY) dada. Estas opciones toman "
+#~ "«CLIQUE» o «RANDOM» como argumentos. «CLIQUE» ignora el parámetro -n. Lo "
+#~ "predeterminado es adquirir una topología aleatoria (RANDOM) en el grafo."
 
 #~ msgid "Some operations are still pending. Cancelling them\n"
 #~ msgstr "Algunas operaciones están todavía pendientes.  Cancelándolas\n"
@@ -6380,7 +7087,8 @@
 #~ msgstr "Caché de datos MySQL ejecutándose\n"
 
 #~ msgid "Reply mismatched in terms of namespace.  Discarded.\n"
-#~ msgstr "Respuesta no asociada en terminos de espacio de nombres.  
Descartada.\n"
+#~ msgstr ""
+#~ "Respuesta no asociada en terminos de espacio de nombres.  Descartada.\n"
 
 #~ msgid "Proof of work invalid: %llu!\n"
 #~ msgstr "¡Prueba de trabajo no válida: %llu!\n"
@@ -6402,10 +7110,13 @@
 #~ msgstr "intentar conectar al par dado"
 
 #~ msgid "Configuration failes to specify option `%s' in section `%s'!\n"
-#~ msgstr "¡La configuración no especifica la opción «%s» en la sección 
«%s»!\n"
+#~ msgstr ""
+#~ "¡La configuración no especifica la opción «%s» en la sección «%s»!\n"
 
 #~ msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
-#~ msgstr "Error recibiendo respuesta a la petición «%s» del ARM para el 
servicio «%s»\n"
+#~ msgstr ""
+#~ "Error recibiendo respuesta a la petición «%s» del ARM para el servicio "
+#~ "«%s»\n"
 
 #~ msgid "Requesting start of service `%s'.\n"
 #~ msgstr "Solicitando incio del servicio «%s».\n"
@@ -6414,10 +7125,13 @@
 #~ msgstr "Solicitando finalización del servicio «%s».\n"
 
 #~ msgid "Error while trying to transmit request to start `%s' to ARM\n"
-#~ msgstr "Se produjo un fallo al transmitir la petición de inicio de «%s» al 
ARM\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al transmitir la petición de inicio de «%s» al ARM\n"
 
 #~ msgid "Error while trying to transmit request to stop `%s' to ARM\n"
-#~ msgstr "Se produjo un fallo al transmitir la petición de finalización de 
«%s» al ARM\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al transmitir la petición de finalización de «%s» al "
+#~ "ARM\n"
 
 #~ msgid "Asked to start service `%s' within %llu ms\n"
 #~ msgstr "Se solicitó iniciar el servicio «%s» en %llu ms\n"
@@ -6426,13 +7140,16 @@
 #~ msgstr "Parando el servicio «%s» en %llu ms\n"
 
 #~ msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
-#~ msgstr "Error fatal de configuración: falta la opción «%s» en la sección 
«%s».\n"
+#~ msgstr ""
+#~ "Error fatal de configuración: falta la opción «%s» en la sección «%s».\n"
 
 #~ msgid "Failed to transmit shutdown ACK.\n"
-#~ msgstr "Se produjo un fallo al transmitir el reconocimiento de 
finalización.\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al transmitir el reconocimiento de finalización.\n"
 
 #~ msgid "Configuration file `%s' for service `%s' not valid: %s\n"
-#~ msgstr "El fichero de configuración «%s» para el servicio «%s» no es 
válido: %s\n"
+#~ msgstr ""
+#~ "El fichero de configuración «%s» para el servicio «%s» no es válido: %s\n"
 
 #~ msgid "option missing"
 #~ msgstr "falta una opción"
@@ -6504,8 +7221,11 @@
 #~ msgstr "(%s) «%s» confirmó que usted recibió de él o ella: %s\n"
 
 #, fuzzy
-#~ msgid "(%s) `%s' was confirmed that you and only you received from him or 
her: %s\n"
-#~ msgstr "(%s) «%s» confirmó que usted y sólo usted recibió de él o ella: 
%s\n"
+#~ msgid ""
+#~ "(%s) `%s' was confirmed that you and only you received from him or her: "
+#~ "%s\n"
+#~ msgstr ""
+#~ "(%s) «%s» confirmó que usted y sólo usted recibió de él o ella: %s\n"
 
 #, fuzzy
 #~ msgid "(%s) `%s' said off the record: %s\n"
@@ -6547,14 +7267,26 @@
 #~ msgid "Unknown command `%s'\n"
 #~ msgstr "Comando desconocido «%s»\n"
 
-#~ msgid "Use `/join #roomname' to join a chat room. Joining a room will cause 
you to leave the current room"
-#~ msgstr "Use «/join #nombre_de_sala» para unirse a una sala de chat. Unirse 
a una sala provocará que deje su sala actual"
+#~ msgid ""
+#~ "Use `/join #roomname' to join a chat room. Joining a room will cause you "
+#~ "to leave the current room"
+#~ msgstr ""
+#~ "Use «/join #nombre_de_sala» para unirse a una sala de chat. Unirse a una "
+#~ "sala provocará que deje su sala actual"
 
-#~ msgid "Use `/nick nickname' to change your nickname.  This will cause you 
to leave the current room and immediately rejoin it with the new name."
-#~ msgstr "Use «/nick apodo» para cambiar su apodo.  Esto provocará que deje 
la sala actual y se reconecte inmediatamente con el nuevo nombre."
+#~ msgid ""
+#~ "Use `/nick nickname' to change your nickname.  This will cause you to "
+#~ "leave the current room and immediately rejoin it with the new name."
+#~ msgstr ""
+#~ "Use «/nick apodo» para cambiar su apodo.  Esto provocará que deje la sala "
+#~ "actual y se reconecte inmediatamente con el nuevo nombre."
 
-#~ msgid "Use `/msg nickname message' to send a private message to the 
specified user"
-#~ msgstr "Use «/msg apodo mensaje» para mandar un mensaje privado al usuario 
especificado"
+#~ msgid ""
+#~ "Use `/msg nickname message' to send a private message to the specified "
+#~ "user"
+#~ msgstr ""
+#~ "Use «/msg apodo mensaje» para mandar un mensaje privado al usuario "
+#~ "especificado"
 
 #~ msgid "The `/notice' command is an alias for `/msg'"
 #~ msgstr "El comando «/notice» es un alias para «/msg»"
@@ -6566,7 +7298,9 @@
 #~ msgstr "Use «/sig mensaje» para mandar mensajes firmados públicamente"
 
 #~ msgid "Use `/ack message' to require signed acknowledgment of the message"
-#~ msgstr "Use «/ack mensaje» para requerir una notificación firmada de la 
recepción del mensaje"
+#~ msgstr ""
+#~ "Use «/ack mensaje» para requerir una notificación firmada de la recepción "
+#~ "del mensaje"
 
 #~ msgid "Use `/anonymous message' to send a public anonymous message"
 #~ msgstr "Use «/anonymous mensaje» para mandar un mensaje anónimo público"
@@ -6581,7 +7315,9 @@
 #~ msgstr "El comando «/leave» es un alias para «/quit»"
 
 #~ msgid "Use `/names' to list all of the current members in the chat room"
-#~ msgstr "Use «/names» para mostrar una lista de los miembros actuales de la 
sala de chat"
+#~ msgstr ""
+#~ "Use «/names» para mostrar una lista de los miembros actuales de la sala "
+#~ "de chat"
 
 #~ msgid "Use `/help command' to get help for a specific command"
 #~ msgstr "Use «/help comando» para obtener ayuda sobre un comando específico"
@@ -6614,7 +7350,9 @@
 #~ msgstr "Se produjo un fallo al encolar una notificación de abandono\n"
 
 #~ msgid "Core service could not access hostkey.  Exiting.\n"
-#~ msgstr "El servicio principal no puede acceder a la clave de la máquina. 
Saliendo.\n"
+#~ msgstr ""
+#~ "El servicio principal no puede acceder a la clave de la máquina. "
+#~ "Saliendo.\n"
 
 #~ msgid "# entries in session map"
 #~ msgstr "# entradas en el mapa de sesiones"
@@ -6635,13 +7373,19 @@
 #~ msgstr "# Pares conectados"
 
 #~ msgid "Changing DNS reply according to client specifications\n"
-#~ msgstr "Cambiando la respuesta DNS de acuerdo con las especificaciones del 
cliente\n"
+#~ msgstr ""
+#~ "Cambiando la respuesta DNS de acuerdo con las especificaciones del "
+#~ "cliente\n"
 
-#~ msgid "Configured to provide DNS exit, but no valid DNS server 
configured!\n"
-#~ msgstr "¡Configurado para proveer salida DNS, pero no hay ningún servidor 
DNS válido configurado!\n"
+#~ msgid ""
+#~ "Configured to provide DNS exit, but no valid DNS server configured!\n"
+#~ msgstr ""
+#~ "¡Configurado para proveer salida DNS, pero no hay ningún servidor DNS "
+#~ "válido configurado!\n"
 
 #~ msgid "Configuration fails to specify `%s' in section `%s'\n"
-#~ msgstr "El fichero de configuración debe especificar «%s» en la sección 
«%s»\n"
+#~ msgstr ""
+#~ "El fichero de configuración debe especificar «%s» en la sección «%s»\n"
 
 #~ msgid "Failed to start daemon: %s\n"
 #~ msgstr "Se produjo un fallo al iniciar el demonio: %s\n"
@@ -6659,19 +7403,28 @@
 #~ msgstr "Falta la opción «%s» en la sección «%s» de la configuración\n"
 
 #~ msgid "Configuration fails to specify `%s', assuming default value."
-#~ msgstr "La configuración no especifica «%s», asumiendo el valor 
predeterminado."
+#~ msgstr ""
+#~ "La configuración no especifica «%s», asumiendo el valor predeterminado."
 
-#~ msgid "Invalid value specified for option `%s' in section `%s', content 
pushing disabled\n"
-#~ msgstr "Especificado valor no válido para la opción «%s» en la sección 
«%s», publicación de contenido deshabilitada\n"
+#~ msgid ""
+#~ "Invalid value specified for option `%s' in section `%s', content pushing "
+#~ "disabled\n"
+#~ msgstr ""
+#~ "Especificado valor no válido para la opción «%s» en la sección «%s», "
+#~ "publicación de contenido deshabilitada\n"
 
 #~ msgid "Failed to connect to the GNS service!\n"
 #~ msgstr "¡Se produjo un fallo al conectar con el servicio GNS!\n"
 
 #~ msgid "Issue a request to the GNUnet Naming System, prints results."
-#~ msgstr "Iniciar una peticion al servicio de nombrado de GNUnet (GNS), 
imprimiendo resultados."
+#~ msgstr ""
+#~ "Iniciar una peticion al servicio de nombrado de GNUnet (GNS), imprimiendo "
+#~ "resultados."
 
 #~ msgid "No `%s' specified in `%s' configuration, will not bootstrap.\n"
-#~ msgstr "No se ha especificado ningún «%s» en la configuración de «%s», no 
se inicializará\n"
+#~ msgstr ""
+#~ "No se ha especificado ningún «%s» en la configuración de «%s», no se "
+#~ "inicializará\n"
 
 #~ msgid "%s failed for `%s' at %s:%d: `%s'\n"
 #~ msgstr "%s falló para «%s» en %s:%d: «%s».\n"
@@ -6680,25 +7433,36 @@
 #~ msgstr "Guardados de listas de máquinas programados\n"
 
 #~ msgid "Hostlists will be saved to file again in %llums\n"
-#~ msgstr "Las listas de máquinas serán guardadas a fichero de nuevo en 
%llums\n"
+#~ msgstr ""
+#~ "Las listas de máquinas serán guardadas a fichero de nuevo en %llums\n"
 
 #~ msgid "Initial time between hostlist downloads is %llums\n"
 #~ msgstr "El tiempo inicial entre descargas de listas de máquinas es %llums\n"
 
-#~ msgid "No `%s' specified in `%s' configuration, cannot load hostlists from 
file.\n"
-#~ msgstr "No se ha especificado ningún «%s» en la configuración de «%s», no 
se pudo cargar la lista de máquinas del fichero\n"
+#~ msgid ""
+#~ "No `%s' specified in `%s' configuration, cannot load hostlists from "
+#~ "file.\n"
+#~ msgstr ""
+#~ "No se ha especificado ningún «%s» en la configuración de «%s», no se pudo "
+#~ "cargar la lista de máquinas del fichero\n"
 
-#~ msgid "No `%s' specified in `%s' configuration, cannot save hostlists to 
file.\n"
-#~ msgstr "No se ha especificado ningún «%s» en la configuración de «%s», no 
se puede almacenar la lista de máquinas en un fichero.\n"
+#~ msgid ""
+#~ "No `%s' specified in `%s' configuration, cannot save hostlists to file.\n"
+#~ msgstr ""
+#~ "No se ha especificado ningún «%s» en la configuración de «%s», no se "
+#~ "puede almacenar la lista de máquinas en un fichero.\n"
 
 #~ msgid "Hostlists will be saved to file again in  %llums\n"
-#~ msgstr "Las listas de máquinas serán guardadas a fichero de nuevo en  
%llums\n"
+#~ msgstr ""
+#~ "Las listas de máquinas serán guardadas a fichero de nuevo en  %llums\n"
 
 #~ msgid "Sending 100 CONTINUE reply\n"
 #~ msgstr "Enviando respuesta «100 CONTINUE»\n"
 
 #~ msgid "Mesh service is lacking key configuration settings.  Exiting.\n"
-#~ msgstr "El servicio mesh carece de opciones de configuración de clave.  
Saliendo.\n"
+#~ msgstr ""
+#~ "El servicio mesh carece de opciones de configuración de clave.  "
+#~ "Saliendo.\n"
 
 #~ msgid "Namestore added record successfully"
 #~ msgstr "El almacén de nombres añadió el registro satisfactoriamente"
@@ -6707,22 +7471,28 @@
 #~ msgstr "¡%s mal formada «%s» dada en la configuración!\n"
 
 #~ msgid "NSE service could not access hostkey.  Exiting.\n"
-#~ msgstr "El servicio NSE no puede acceder a la clave de la máquina. 
Saliendo.\n"
+#~ msgstr ""
+#~ "El servicio NSE no puede acceder a la clave de la máquina. Saliendo.\n"
 
 #~ msgid "Failed to transmit message to `%s' service.\n"
 #~ msgstr "Se produjo un fallo al transmitir un mensaje al servicio «%s».\n"
 
 #~ msgid "Failed to transmit iteration request to `PEERINFO' service\n"
-#~ msgstr "Petición de transmisión de iteración de expiración al servicio de 
información de pares (PEERINFO).\n"
+#~ msgstr ""
+#~ "Petición de transmisión de iteración de expiración al servicio de "
+#~ "información de pares (PEERINFO).\n"
 
 #~ msgid "Failed to connect to statistics service!\n"
 #~ msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
 
 #~ msgid "Could not read hostkeys file, specify hostkey file with -H!\n"
-#~ msgstr "¡No se pudo leer el fichero de claves de máquina, especifique el 
fichero de claves de máquina con -H!\n"
+#~ msgstr ""
+#~ "¡No se pudo leer el fichero de claves de máquina, especifique el fichero "
+#~ "de claves de máquina con -H!\n"
 
 #~ msgid "Specified hostkey file `%s' not found!\n"
-#~ msgstr "¡El fichero de claves de máquina especificado %s no fue 
encontrado!\n"
+#~ msgstr ""
+#~ "¡El fichero de claves de máquina especificado %s no fue encontrado!\n"
 
 #~ msgid "host key file"
 #~ msgstr "fichero de clave de máquina"
@@ -6734,19 +7504,24 @@
 #~ msgstr "No se pudo acceder a la clave de máquina.\n"
 
 #~ msgid "`scp' does not seem to terminate (timeout copying config).\n"
-#~ msgstr "Parece que «scp» no termina (expiración de plazo copiando la 
configuración).\n"
+#~ msgstr ""
+#~ "Parece que «scp» no termina (expiración de plazo copiando la "
+#~ "configuración).\n"
 
 #~ msgid "`scp' did not complete cleanly.\n"
 #~ msgstr "«scp» no se completó limpiamente.\n"
 
 #~ msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
-#~ msgstr "Se produjo un fallo al crear la tubería para el proceso 
«gnunet-peerinfo».\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al crear la tubería para el proceso «gnunet-"
+#~ "peerinfo».\n"
 
 #~ msgid "Failed to create pipe for `ssh' process.\n"
 #~ msgstr "Se produjo un fallo al crear la tubería para el proceso «ssh».\n"
 
 #~ msgid "Could not start `%s' process to create hostkey.\n"
-#~ msgstr "No se pudo iniciar el proceso «%s» para crear la clave de 
máquina.\n"
+#~ msgstr ""
+#~ "No se pudo iniciar el proceso «%s» para crear la clave de máquina.\n"
 
 #~ msgid "Failed to start `gnunet-peerinfo' process.\n"
 #~ msgstr "Se produjo un fallo al iniciar el proceso «gnunet-peerinfo».\n"
@@ -6782,13 +7557,17 @@
 #~ msgstr "¡Imposible obtener «HELLO» del par!\n"
 
 #~ msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
-#~ msgstr "¡«gnunet-arm» terminó con un estado de salida no cero (o expiró el 
plazo)!\n"
+#~ msgstr ""
+#~ "¡«gnunet-arm» terminó con un estado de salida no cero (o expiró el "
+#~ "plazo)!\n"
 
 #~ msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
 #~ msgstr "«gnunet-arm» o «ssh» no parecen terminar.\n"
 
 #~ msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
-#~ msgstr "el apagado (o bien «gnunet-arm» o bien «ssh») no se completó 
limpiamente.\n"
+#~ msgstr ""
+#~ "el apagado (o bien «gnunet-arm» o bien «ssh») no se completó "
+#~ "limpiamente.\n"
 
 #~ msgid "`scp' does not seem to terminate.\n"
 #~ msgstr "«scp» no parece terminar.\n"
@@ -6797,7 +7576,9 @@
 #~ msgstr "Iniciando el servicio %s para el par «%4s»\n"
 
 #~ msgid "Could not start `%s' process to copy configuration directory.\n"
-#~ msgstr "No se pudo iniciar el proceso «%s» para copiar el directorio de 
configuración.\n"
+#~ msgstr ""
+#~ "No se pudo iniciar el proceso «%s» para copiar el directorio de "
+#~ "configuración.\n"
 
 #~ msgid "Terminating peer `%4s'\n"
 #~ msgstr "Terminando par «%4s»\n"
@@ -6806,37 +7587,53 @@
 #~ msgstr "Fijando d->dead en el par «%4s»\n"
 
 #~ msgid "Peer not yet running, can not change configuration at this point."
-#~ msgstr "Par todavía no ejecutandose, no se puede cambiar la configuración 
en este punto."
+#~ msgstr ""
+#~ "Par todavía no ejecutandose, no se puede cambiar la configuración en este "
+#~ "punto."
 
 #~ msgid "Failed to write new configuration to disk."
 #~ msgstr "Se produjo un fallo al guardar la nueva configuración al disco"
 
 #~ msgid "Could not start `%s' process to copy configuration file.\n"
-#~ msgstr "No se pudo iniciar el proceso «%s» para copiar el fichero de 
configuración.\n"
+#~ msgstr ""
+#~ "No se pudo iniciar el proceso «%s» para copiar el fichero de "
+#~ "configuración.\n"
 
 #~ msgid "Failed to copy new configuration to remote machine."
-#~ msgstr "Se produjo un fallo al copiar la nueva configuración a la máquina 
remota."
+#~ msgstr ""
+#~ "Se produjo un fallo al copiar la nueva configuración a la máquina remota."
 
 #~ msgid "Peers failed to connect"
 #~ msgstr "Los pares fallaron al conectar"
 
 #~ msgid "Failed to connect to core service of first peer!\n"
-#~ msgstr "¡Se produjo un fallo al conectar con el servicio principal del 
primer par!\n"
+#~ msgstr ""
+#~ "¡Se produjo un fallo al conectar con el servicio principal del primer "
+#~ "par!\n"
 
 #~ msgid "Peers are not fully running yet, can not connect!\n"
-#~ msgstr "¡Los pares no están ejecutandose completamente todavía, no puedo 
conectarme!\n"
+#~ msgstr ""
+#~ "¡Los pares no están ejecutandose completamente todavía, no puedo "
+#~ "conectarme!\n"
 
 #~ msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
-#~ msgstr "Valor «%s» no válido para la opción «%s» en la sección «%s»: se 
esperaba un float\n"
+#~ msgstr ""
+#~ "Valor «%s» no válido para la opción «%s» en la sección «%s»: se esperaba "
+#~ "un float\n"
 
 #~ msgid "Target is %d connections per peer."
 #~ msgstr "El objetivo son %d conexiones por par"
 
-#~ msgid "Invalid value `%s' for option `%s' in section `%s': got %f, needed 
value greater than 0\n"
-#~ msgstr "Valor «%s» no válido para la opción «%s» en la sección «%s»: se 
obtuvo %f, se necesitaba un valor mayor que 0\n"
+#~ msgid ""
+#~ "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
+#~ "greater than 0\n"
+#~ msgstr ""
+#~ "Valor «%s» no válido para la opción «%s» en la sección «%s»: se obtuvo "
+#~ "%f, se necesitaba un valor mayor que 0\n"
 
 #~ msgid "Connecting nodes in 2d torus topology: %u rows %u columns\n"
-#~ msgstr "Conectando nodos en topología tórica bidimensional: %u filas %u 
columnas\n"
+#~ msgstr ""
+#~ "Conectando nodos en topología tórica bidimensional: %u filas %u columnas\n"
 
 #~ msgid "natural log of %d is %d, will run %d iterations\n"
 #~ msgstr "el logaritmo natural de %d es %d, se ejecutará %d iteraciones\n"
@@ -6850,8 +7647,12 @@
 #~ msgid "rand is %f probability is %f\n"
 #~ msgstr "aleatorio es %f probabilidad es %f\n"
 
-#~ msgid "No `%s' specified in peer configuration in section `%s', cannot copy 
friends file!\n"
-#~ msgstr "¡No se especifica «%s» en la configuración del par en la sección 
«%s», no se puede copiar el archivo de amigos!\n"
+#~ msgid ""
+#~ "No `%s' specified in peer configuration in section `%s', cannot copy "
+#~ "friends file!\n"
+#~ msgstr ""
+#~ "¡No se especifica «%s» en la configuración del par en la sección «%s», no "
+#~ "se puede copiar el archivo de amigos!\n"
 
 #~ msgid "Finished copying all friend files!\n"
 #~ msgstr "¡Se terminó de copiar todos los ficheros de amigos!\n"
@@ -6872,13 +7673,17 @@
 #~ msgstr "¡Se terminaron de copiar todos los ficheros de listas negras!\n"
 
 #~ msgid "Delaying connect, we have too many outstanding connections!\n"
-#~ msgstr "¡Retrasando la conexión, tenemos demasiadas conexiones 
pendientes!\n"
+#~ msgstr ""
+#~ "¡Retrasando la conexión, tenemos demasiadas conexiones pendientes!\n"
 
 #~ msgid "Creating connection, outstanding_connections is %d\n"
-#~ msgstr "Creando conexion, %d conexiones pendientes 
(outstanding_connections)\n"
+#~ msgstr ""
+#~ "Creando conexion, %d conexiones pendientes (outstanding_connections)\n"
 
 #~ msgid "Creating connection, outstanding_connections is %d (max %d)\n"
-#~ msgstr "Creando conexion, %d conexiones pendientes 
(outstanding_connections), máximo %d\n"
+#~ msgstr ""
+#~ "Creando conexion, %d conexiones pendientes (outstanding_connections), "
+#~ "máximo %d\n"
 
 #~ msgid "Creating clique topology\n"
 #~ msgstr "Creando topología de clique\n"
@@ -6908,7 +7713,9 @@
 #~ msgstr "Creando topología de línea recta\n"
 
 #~ msgid "Creating no allowed topology (all peers can connect at core level)\n"
-#~ msgstr "Creando topología no permitida (todos los pares se pueden conectar 
al nivel del servicio principal)\n"
+#~ msgstr ""
+#~ "Creando topología no permitida (todos los pares se pueden conectar al "
+#~ "nivel del servicio principal)\n"
 
 #~ msgid "Failed during friend file copying!\n"
 #~ msgstr "¡Se produjo un fallo durante la copia del fichero de amigos!\n"
@@ -6920,31 +7727,41 @@
 #~ msgstr "Añadiendo a la lista negra todas las topologías excepto clique\n"
 
 #~ msgid "Blacklisting all but small world (ring) topology\n"
-#~ msgstr "Añadiendo a la lista negra todas las topologías excepto mundo 
pequeño (anillo)\n"
+#~ msgstr ""
+#~ "Añadiendo a la lista negra todas las topologías excepto mundo pequeño "
+#~ "(anillo)\n"
 
 #~ msgid "Blacklisting all but small world (2d-torus) topology\n"
-#~ msgstr "Añadiendo a la lista negra todas las topologías excepto mundo 
pequeño (tórica bidimensional)\n"
+#~ msgstr ""
+#~ "Añadiendo a la lista negra todas las topologías excepto mundo pequeño "
+#~ "(tórica bidimensional)\n"
 
 #~ msgid "Blacklisting all but ring topology\n"
 #~ msgstr "Añadiendo a la lista negra todas las topologías excepto anillo\n"
 
 #~ msgid "Blacklisting all but 2d torus topology\n"
-#~ msgstr "Añadiendo a la lista negra todas las topologías excepto tórica 
bidimensional\n"
+#~ msgstr ""
+#~ "Añadiendo a la lista negra todas las topologías excepto tórica "
+#~ "bidimensional\n"
 
 #~ msgid "Blacklisting all but Erdos-Renyi topology\n"
-#~ msgstr "Añadiendo a la lista negra todas las topologías excepto 
Erdos-Renyi\n"
+#~ msgstr ""
+#~ "Añadiendo a la lista negra todas las topologías excepto Erdos-Renyi\n"
 
 #~ msgid "Blacklisting all but InterNAT topology\n"
 #~ msgstr "Añadiendo a la lista negra todas las topologías excepto InterNAT\n"
 
 #~ msgid "Blacklisting all but Scale Free topology\n"
-#~ msgstr "Añadiendo a la lista negra todas las topologías excepto Scale 
Free\n"
+#~ msgstr ""
+#~ "Añadiendo a la lista negra todas las topologías excepto Scale Free\n"
 
 #~ msgid "Blacklisting all but straight line topology\n"
-#~ msgstr "Añadiendo a la lista negra todas las topologías excepto línea 
recta\n"
+#~ msgstr ""
+#~ "Añadiendo a la lista negra todas las topologías excepto línea recta\n"
 
 #~ msgid "Failed during blacklist file copying!\n"
-#~ msgstr "¡Se produjo un fallo durante la copia del fichero de listas 
negras!\n"
+#~ msgstr ""
+#~ "¡Se produjo un fallo durante la copia del fichero de listas negras!\n"
 
 #~ msgid "Blacklist files created/copied successfully!\n"
 #~ msgstr "¡Ficheros de listas negras creados/copiados satisfactoriamente!\n"
@@ -6959,7 +7776,9 @@
 
 #, fuzzy
 #~ msgid "Creating small world (2d-torus) CONNECT topology\n"
-#~ msgstr "Añadiendo a la lista negra todas las topologías excepto mundo 
pequeño (tórica bidimensional) «CONNECT»\n"
+#~ msgstr ""
+#~ "Añadiendo a la lista negra todas las topologías excepto mundo pequeño "
+#~ "(tórica bidimensional) «CONNECT»\n"
 
 #, fuzzy
 #~ msgid "Creating ring CONNECT topology\n"
@@ -6990,25 +7809,33 @@
 #~ msgstr "No se crea ninguna topología «CONNECT»\n"
 
 #~ msgid "Unknown topology specification, can't connect peers!\n"
-#~ msgstr "¡Especificación de topología desconocida, no se puede conectar con 
los pares!\n"
+#~ msgstr ""
+#~ "¡Especificación de topología desconocida, no se puede conectar con los "
+#~ "pares!\n"
 
 #~ msgid "Connecting random subset (%'.2f percent) of possible peers\n"
-#~ msgstr "Conectando a un subconjunto aleatorio (%'.2f por ciento) de 
posibles pares\n"
+#~ msgstr ""
+#~ "Conectando a un subconjunto aleatorio (%'.2f por ciento) de posibles "
+#~ "pares\n"
 
 #~ msgid "Connecting a minimum of %u peers each (if possible)\n"
 #~ msgstr "Conectando a un mínimo de %u pares cada uno (si es posible)\n"
 
 #~ msgid "Using DFS to connect a minimum of %u peers each (if possible)\n"
-#~ msgstr "Usando DFS para conectar a un mínimo de %u pares cada uno (si es 
posible)\n"
+#~ msgstr ""
+#~ "Usando DFS para conectar a un mínimo de %u pares cada uno (si es "
+#~ "posible)\n"
 
 #~ msgid "Finding additional %u closest peers each (if possible)\n"
-#~ msgstr "Encontrando %u pares adicionales mas cercanos cada uno (si es 
posible)\n"
+#~ msgstr ""
+#~ "Encontrando %u pares adicionales mas cercanos cada uno (si es posible)\n"
 
 #~ msgid "Could not read hostkeys file!\n"
 #~ msgstr "¡No se puede leer el fichero de claves de máquina!\n"
 
 #~ msgid "Could not create configuration for peer number %u on `%s'!\n"
-#~ msgstr "¡No se puede crear la configuración para el par número %u en 
«%s»!\n"
+#~ msgstr ""
+#~ "¡No se puede crear la configuración para el par número %u en «%s»!\n"
 
 #~ msgid "Option `%s' in section `%s' not specified!\n"
 #~ msgstr "¡No se ha especificado la opción «%s» en la sección «%s»!\n"
@@ -7040,8 +7867,12 @@
 #~ msgid "# unexpected CONNECT_ACK messages"
 #~ msgstr "# mensajes «CONNECT_ACK» inesperados"
 
-#~ msgid "Not confirming PING with address `%s' since I cannot confirm having 
this address.\n"
-#~ msgstr "No confirmando el PING con dirección «%s» ya que no puedo confirmar 
tener esa dirección.\n"
+#~ msgid ""
+#~ "Not confirming PING with address `%s' since I cannot confirm having this "
+#~ "address.\n"
+#~ msgstr ""
+#~ "No confirmando el PING con dirección «%s» ya que no puedo confirmar tener "
+#~ "esa dirección.\n"
 
 #~ msgid "FREEING %s\n"
 #~ msgstr "LIBERANDO %s\n"
@@ -7064,14 +7895,18 @@
 #~ msgid "# wlan pending fragments"
 #~ msgstr "# fragmentos wlan pendientes"
 
-#~ msgid "Finished reading from gnunet-helper-transport-wlan stdout with code: 
%d\n"
-#~ msgstr "Se terminó de leer la salida estándar de 
«gnunet-helper-transport-wlan» con código: %d\n"
+#~ msgid ""
+#~ "Finished reading from gnunet-helper-transport-wlan stdout with code: %d\n"
+#~ msgstr ""
+#~ "Se terminó de leer la salida estándar de «gnunet-helper-transport-wlan» "
+#~ "con código: %d\n"
 
 #~ msgid "# wlan hello beacons send"
 #~ msgstr "# beacons hello de wlan enviados"
 
 #~ msgid "Error writing to wlan helper. errno == %d, ERROR: %s\n"
-#~ msgstr "Error escribiendo al programa auxiliar para wlan. errno == %d, 
ERROR: %s"
+#~ msgstr ""
+#~ "Error escribiendo al programa auxiliar para wlan. errno == %d, ERROR: %s"
 
 #~ msgid "# wlan acks send"
 #~ msgstr "# acks de wlan enviados"
@@ -7113,10 +7948,15 @@
 #~ msgstr "# mensajes de wlan dentro de WLAN_HELPER_DATA recibidos"
 
 #~ msgid "Syntax error in configuration file `%s' at line %u.\n"
-#~ msgstr "Error de sintáxis en el fichero de configuración «%s» en la línea 
%u.\n"
+#~ msgstr ""
+#~ "Error de sintáxis en el fichero de configuración «%s» en la línea %u.\n"
 
-#~ msgid "Could not satisfy pending transmission request, socket closed or 
connect failed (%p).\n"
-#~ msgstr "No se pudo satisfacer la petición de transmisión pendiente, 
«socket» cerrado o conexión fallida (%p).\n"
+#~ msgid ""
+#~ "Could not satisfy pending transmission request, socket closed or connect "
+#~ "failed (%p).\n"
+#~ msgstr ""
+#~ "No se pudo satisfacer la petición de transmisión pendiente, «socket» "
+#~ "cerrado o conexión fallida (%p).\n"
 
 #~ msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 #~ msgstr "Yo soy la máquina «%s».  Almacenada nueva clave privada en «%s».\n"
@@ -7157,8 +7997,11 @@
 #~ msgid "eternity"
 #~ msgstr "eternidad"
 
-#~ msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if 
any.\n"
-#~ msgstr "Usuario desconocido «%s». Asegurese de especificar su sufíjo 
numérico, en el caso de que lo haya.\n"
+#~ msgid ""
+#~ "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
+#~ msgstr ""
+#~ "Usuario desconocido «%s». Asegurese de especificar su sufíjo numérico, en "
+#~ "el caso de que lo haya.\n"
 
 #~ msgid "how long to execute? 0 = forever"
 #~ msgstr "¿cuánto tiempo se debe ejecutar? 0 = para siempre"
@@ -7167,19 +8010,28 @@
 #~ msgstr "Busca un registro usando GNS (NO IMPLEMENTADO)"
 
 #~ msgid "Option `%s' not specified in configuration section `%s'\n"
-#~ msgstr "No se ha especificado la opción «%s» en la sección de configuración 
«%s»\n"
+#~ msgstr ""
+#~ "No se ha especificado la opción «%s» en la sección de configuración «%s»\n"
 
 #~ msgid "Option `%s' not given, but I need a zone key file!\n"
-#~ msgstr "¡No se proporciona la opción «%s», pero se necesita un fichero de 
claves de zona!\n"
+#~ msgstr ""
+#~ "¡No se proporciona la opción «%s», pero se necesita un fichero de claves "
+#~ "de zona!\n"
 
-#~ msgid "File zone `%s' but corrupt content already exists, failed to write! 
\n"
-#~ msgstr "¡Ya existe el fichero de zonas «%s» pero con contenido corrupto, 
falló al escribir!\n"
+#~ msgid ""
+#~ "File zone `%s' but corrupt content already exists, failed to write! \n"
+#~ msgstr ""
+#~ "¡Ya existe el fichero de zonas «%s» pero con contenido corrupto, falló al "
+#~ "escribir!\n"
 
 #~ msgid "File zone `%s' containing this key already exists\n"
 #~ msgstr "Ya existe un fichero de zonas «%s» que contiene esta clave\n"
 
-#~ msgid "File zone `%s' but different zone key already exists, failed to 
write! \n"
-#~ msgstr "¡Ya existe el fichero de zonas «%s» pero con diferentes claves de 
zona, falló al escribir!\n"
+#~ msgid ""
+#~ "File zone `%s' but different zone key already exists, failed to write! \n"
+#~ msgstr ""
+#~ "¡Ya existe el fichero de zonas «%s» pero con diferentes claves de zona, "
+#~ "falló al escribir!\n"
 
 #~ msgid "Stored zonekey for zone `%s' in file `%s'\n"
 #~ msgstr "Almacenada clave de zona para la zona «%s» en el fichero «%s»\n"
@@ -7206,7 +8058,9 @@
 #~ msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
 
 #, fuzzy
-#~ msgid "provide inthe 'struct GNUNET_TRANSPORT_PeerIterateContextformation 
about all tunnels (continuously)"
+#~ msgid ""
+#~ "provide inthe 'struct GNUNET_TRANSPORT_PeerIterateContextformation about "
+#~ "all tunnels (continuously)"
 #~ msgstr "Imprime información de los pares de GNUnet."
 
 #, fuzzy
@@ -7429,7 +8283,8 @@
 #~ msgid ""
 #~ "Welcome to GNUnet!\n"
 #~ "\n"
-#~ "This assistant will ask you a few basic questions in order to configure 
GNUnet.\n"
+#~ "This assistant will ask you a few basic questions in order to configure "
+#~ "GNUnet.\n"
 #~ "\n"
 #~ "Please visit our homepage at\n"
 #~ "\thttp://gnunet.org/\n";
@@ -7442,7 +8297,8 @@
 #~ msgstr ""
 #~ "¡Bienvenido a GNUnet!\n"
 #~ "\n"
-#~ "Este asistente te preguntará unas cuestiones básicas para configurar 
GNUnet.\n"
+#~ "Este asistente te preguntará unas cuestiones básicas para configurar "
+#~ "GNUnet.\n"
 #~ "\n"
 #~ "Por favor, visita nuestra página en\n"
 #~ "\thttp://gnunet.org/\n";
@@ -7453,18 +8309,32 @@
 #~ "\n"
 #~ "el equipo de GNUnet"
 
-#~ msgid "Choose the network interface that connects your computer to the 
internet from the list below."
-#~ msgstr "Escoge la interfaz de red que conecta tu ordenador a Internet de la 
lista de abajo."
+#~ msgid ""
+#~ "Choose the network interface that connects your computer to the internet "
+#~ "from the list below."
+#~ msgstr ""
+#~ "Escoge la interfaz de red que conecta tu ordenador a Internet de la lista "
+#~ "de abajo."
 
-#~ msgid "The \"Network interface\" is the device that connects your computer 
to the internet. This is usually a modem, an ISDN card or a network card in 
case you are using DSL."
-#~ msgstr "La \"Interfaz de red\" es el dispositivo que conecta tu ordenador a 
Internet. Normalmente es un módem, una tarjeta de RDSI o una tarjeta de red en 
el caso de los xDSL como el ADSL."
+#~ msgid ""
+#~ "The \"Network interface\" is the device that connects your computer to "
+#~ "the internet. This is usually a modem, an ISDN card or a network card in "
+#~ "case you are using DSL."
+#~ msgstr ""
+#~ "La \"Interfaz de red\" es el dispositivo que conecta tu ordenador a "
+#~ "Internet. Normalmente es un módem, una tarjeta de RDSI o una tarjeta de "
+#~ "red en el caso de los xDSL como el ADSL."
 
 #, fuzzy
 #~ msgid "Network configuration: interface"
 #~ msgstr "Interfaz de red:"
 
-#~ msgid "What is the name of the network interface that connects your 
computer to the Internet?"
-#~ msgstr "¿Cuál es el nombre de la interfaz de red que conecta tu ordenador a 
Internet?"
+#~ msgid ""
+#~ "What is the name of the network interface that connects your computer to "
+#~ "the Internet?"
+#~ msgstr ""
+#~ "¿Cuál es el nombre de la interfaz de red que conecta tu ordenador a "
+#~ "Internet?"
 
 #, fuzzy
 #~ msgid "Network configuration: IP"
@@ -7473,19 +8343,28 @@
 #, fuzzy
 #~ msgid "What is this computer's public IP address or hostname?"
 #~ msgstr ""
-#~ "¿Cuál es es la dirección pública IP o el nombre del dominio de éste 
ordenador?\n"
+#~ "¿Cuál es es la dirección pública IP o el nombre del dominio de éste "
+#~ "ordenador?\n"
 #~ "\n"
 #~ "En caso de duda, dejar este campo en blanco."
 
 #, fuzzy
 #~ msgid ""
-#~ "If your provider always assigns the same IP-Address to you (a \"static\" 
IP-Address), enter it into the \"IP-Address\" field. If your IP-Address changes 
every now and then (\"dynamic\" IP-Address) but there's a hostname that always 
points to your actual IP-Address (\"Dynamic DNS\"), you can also enter it 
here.\n"
+#~ "If your provider always assigns the same IP-Address to you (a \"static\" "
+#~ "IP-Address), enter it into the \"IP-Address\" field. If your IP-Address "
+#~ "changes every now and then (\"dynamic\" IP-Address) but there's a "
+#~ "hostname that always points to your actual IP-Address (\"Dynamic DNS\"), "
+#~ "you can also enter it here.\n"
 #~ "If left empty, GNUnet will try to automatically detect the IP.\n"
 #~ "You can specify a hostname, GNUnet will then use DNS to resolve it.\n"
 #~ "If in doubt, leave this empty."
 #~ msgstr ""
-#~ "Si tu proveedor siempre te asigna la misma dirección IP (una IP 
\"estática\") introducela en el campo \"Dirección IP\". Si tu dirección IP 
cambia pero hay un nombre de dominio que siempre apunta a tu dirección IP 
actual (\"DNS dinámica\"), puedes introducirlo allí también.\n"
-#~ "En caso de duda deja el campo en blanco. GNUnet intentará determinar tu 
dirección IP"
+#~ "Si tu proveedor siempre te asigna la misma dirección IP (una IP \"estática"
+#~ "\") introducela en el campo \"Dirección IP\". Si tu dirección IP cambia "
+#~ "pero hay un nombre de dominio que siempre apunta a tu dirección IP actual "
+#~ "(\"DNS dinámica\"), puedes introducirlo allí también.\n"
+#~ "En caso de duda deja el campo en blanco. GNUnet intentará determinar tu "
+#~ "dirección IP"
 
 #, fuzzy
 #~ msgid "Bandwidth configuration: upload"
@@ -7499,11 +8378,19 @@
 #~ msgid ""
 #~ "You can limit GNUnet's resource usage here.\n"
 #~ "\n"
-#~ "The \"upstream\" is the data channel through which data is *sent* to the 
internet. The limit is the maximum amount which GNUnet is allowed to use. If 
you have a flatrate, you can set it to the maximum speed of your internet 
connection. You should not use a value that is higher than what your actual 
connection allows."
+#~ "The \"upstream\" is the data channel through which data is *sent* to the "
+#~ "internet. The limit is the maximum amount which GNUnet is allowed to use. "
+#~ "If you have a flatrate, you can set it to the maximum speed of your "
+#~ "internet connection. You should not use a value that is higher than what "
+#~ "your actual connection allows."
 #~ msgstr ""
 #~ "Puedes limitar el uso de recursos de GNUnet aquí.\n"
 #~ "\n"
-#~ "La \"subida\" es el canal de datos a través del cual los datos son 
*mandados* a Internet. El límite, o bien es el total máximo para este 
ordenador, o bien el que se le permita usar a GNUnet. Puedes especificar este 
valor más tarde. Si tienes una tarifa plana puedes configurarlo a la máxima 
velocidad de tu conexión a Internet."
+#~ "La \"subida\" es el canal de datos a través del cual los datos son "
+#~ "*mandados* a Internet. El límite, o bien es el total máximo para este "
+#~ "ordenador, o bien el que se le permita usar a GNUnet. Puedes especificar "
+#~ "este valor más tarde. Si tienes una tarifa plana puedes configurarlo a la "
+#~ "máxima velocidad de tu conexión a Internet."
 
 #, fuzzy
 #~ msgid "Bandwidth configuration: download"
@@ -7517,22 +8404,33 @@
 #~ msgid ""
 #~ "You can limit GNUnet's resource usage here.\n"
 #~ "\n"
-#~ "The \"downstream\" is the data channel through which data is *received* 
from the internet. The limit is the maximum amount which GNUnet is allowed to 
use. If you have a flatrate, you can set it to the maximum speed of your 
internet connection. You should not use a value that is higher than what your 
actual connection allows."
+#~ "The \"downstream\" is the data channel through which data is *received* "
+#~ "from the internet. The limit is the maximum amount which GNUnet is "
+#~ "allowed to use. If you have a flatrate, you can set it to the maximum "
+#~ "speed of your internet connection. You should not use a value that is "
+#~ "higher than what your actual connection allows."
 #~ msgstr ""
 #~ "Puedes limitar el uso de recursos de GNUnet aquí.\n"
 #~ "\n"
-#~ "La \"bajada\" es el canal de datos a través del cuál los datos son 
*recibidos* de Internet. El límite, o bien es el total máximo de este 
ordenador, o bien el que se le permita usar a GNUnet. Puedes especificar este 
valor más tarde. Si tienes una tarifa plana puedes configurarlo a la máxima 
velocidad de tu conexión a Internet."
+#~ "La \"bajada\" es el canal de datos a través del cuál los datos son "
+#~ "*recibidos* de Internet. El límite, o bien es el total máximo de este "
+#~ "ordenador, o bien el que se le permita usar a GNUnet. Puedes especificar "
+#~ "este valor más tarde. Si tienes una tarifa plana puedes configurarlo a la "
+#~ "máxima velocidad de tu conexión a Internet."
 
 #, fuzzy
 #~ msgid "Quota configuration"
 #~ msgstr "Configuración de GNUnet"
 
 #, fuzzy
-#~ msgid "The GNUnet datastore contains all content that GNUnet needs to store 
(indexed, inserted and migrated content)."
+#~ msgid ""
+#~ "The GNUnet datastore contains all content that GNUnet needs to store "
+#~ "(indexed, inserted and migrated content)."
 #~ msgstr ""
 #~ "¿Cuál es el tamaño máximo de almacenamiento en MB?\n"
 #~ "\n"
-#~ "El almacenamiento de GNUnet contiene todos los datos que GNUnet genera 
(datos del índice, contenido insertado y migrado)."
+#~ "El almacenamiento de GNUnet contiene todos los datos que GNUnet genera "
+#~ "(datos del índice, contenido insertado y migrado)."
 
 #, fuzzy
 #~ msgid "Daemon configuration: user account"
@@ -7540,45 +8438,63 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "For security reasons, it is a good idea to let this setup create a new 
user account under which the GNUnet service is started at system startup.\n"
+#~ "For security reasons, it is a good idea to let this setup create a new "
+#~ "user account under which the GNUnet service is started at system "
+#~ "startup.\n"
 #~ "\n"
-#~ "However, GNUnet may not be able to access files other than its own. This 
includes files you want to publish in GNUnet. You'll have to grant read 
permissions to the user specified below.\n"
+#~ "However, GNUnet may not be able to access files other than its own. This "
+#~ "includes files you want to publish in GNUnet. You'll have to grant read "
+#~ "permissions to the user specified below.\n"
 #~ "\n"
 #~ "Leave the field empty to run GNUnet with system privileges.\n"
 #~ msgstr ""
 #~ "Define el usuario bajo el que correrán los servicios de GNUnet.\n"
 #~ "\n"
-#~ "Por razones de seguridad, es una buena idea dejar que la configuración 
cree una nueva cuenta de usuario bajo el cual el servicio de GNUnet es 
arrancado al iniciar el sistema.\n"
+#~ "Por razones de seguridad, es una buena idea dejar que la configuración "
+#~ "cree una nueva cuenta de usuario bajo el cual el servicio de GNUnet es "
+#~ "arrancado al iniciar el sistema.\n"
 #~ "\n"
-#~ "Por consiguiente, GNUnet no tiene la posibilidad de acceder a otros 
ficheros que no sean los que posee. Ésto incluye los ficheros que quieras 
publicar en GNUnet. Tendrás que garantizar que el usuario especificado aquí 
posea permisos de lectura.\n"
+#~ "Por consiguiente, GNUnet no tiene la posibilidad de acceder a otros "
+#~ "ficheros que no sean los que posee. Ésto incluye los ficheros que quieras "
+#~ "publicar en GNUnet. Tendrás que garantizar que el usuario especificado "
+#~ "aquí posea permisos de lectura.\n"
 #~ "\n"
 #~ "Deja los campos vacíos para arrancar GNUnet con privilegios de sistema.\n"
 #~ "Usuario de GNUnet:"
 
 #, fuzzy
 #~ msgid ""
-#~ "For security reasons, it is a good idea to let this setup create a new 
group for the chosen user account.\n"
+#~ "For security reasons, it is a good idea to let this setup create a new "
+#~ "group for the chosen user account.\n"
 #~ "\n"
 #~ "You can also specify a already existent group here.\n"
 #~ "\n"
-#~ "Only members of this group will be allowed to start and stop the the 
GNUnet server and have access to GNUnet server data.\n"
+#~ "Only members of this group will be allowed to start and stop the the "
+#~ "GNUnet server and have access to GNUnet server data.\n"
 #~ msgstr ""
 #~ "Define el grupo bajo el que correrán los servicios de GNUnet aquí.\n"
 #~ "\n"
-#~ "Por razones de seguridad, es una buena idea dejar que la configuración 
cree un nuevo grupo para la cuenta de usuario creada.\n"
+#~ "Por razones de seguridad, es una buena idea dejar que la configuración "
+#~ "cree un nuevo grupo para la cuenta de usuario creada.\n"
 #~ "\n"
 #~ "Puedes especificar un grupo ya existente aquí.\n"
 #~ "\n"
-#~ "Sólo los miembros de este grupo esta autorizados a arrancar y parar el 
servidor de GNUnet y tener acceso a los datos del servidor de GNUnet.\n"
+#~ "Sólo los miembros de este grupo esta autorizados a arrancar y parar el "
+#~ "servidor de GNUnet y tener acceso a los datos del servidor de GNUnet.\n"
 #~ "\n"
 #~ "Grupo de GNUnet:"
 
 #, fuzzy
-#~ msgid "If you say \"yes\" here, the GNUnet background process will be 
automatically started when you turn on your computer. If you say \"no\" here, 
you have to launch GNUnet yourself each time you want to use it."
+#~ msgid ""
+#~ "If you say \"yes\" here, the GNUnet background process will be "
+#~ "automatically started when you turn on your computer. If you say \"no\" "
+#~ "here, you have to launch GNUnet yourself each time you want to use it."
 #~ msgstr ""
 #~ "¿Quieres arrancar GNUnet como un servicio de sistema?\n"
 #~ "n\n"
-#~ "Si dices \"sí\" aquí, el proceso en segundo plano de GNUnet sera 
automáticamente arrancado cuando enciendas tu ordenador. Si dices \"no\" aquí, 
tendrás que ejecutar GNUnet tu mismo cada vez que quieras usarlo."
+#~ "Si dices \"sí\" aquí, el proceso en segundo plano de GNUnet sera "
+#~ "automáticamente arrancado cuando enciendas tu ordenador. Si dices \"no\" "
+#~ "aquí, tendrás que ejecutar GNUnet tu mismo cada vez que quieras usarlo."
 
 #, fuzzy
 #~ msgid "Unable to create user account for daemon."
@@ -7603,7 +8519,9 @@
 
 #, fuzzy
 #~ msgid "Configuration unchanged, no need to save.\n"
-#~ msgstr "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar 
'%s'!\n"
+#~ msgstr ""
+#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar "
+#~ "'%s'!\n"
 
 #, fuzzy
 #~ msgid "Do you wish to save your new configuration?"
@@ -7633,7 +8551,9 @@
 
 #, fuzzy
 #~ msgid "Configuration changed. Save?"
-#~ msgstr "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar 
'%s'!\n"
+#~ msgstr ""
+#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar "
+#~ "'%s'!\n"
 
 #, fuzzy
 #~ msgid "Error saving configuration."
@@ -7666,7 +8586,9 @@
 
 #, fuzzy
 #~ msgid "Configuration file `%s' must be a filename (but is a directory).\n"
-#~ msgstr "El fichero de configuración '%s' no ha sido encontrado.  ¡Ejecute 
gnunet-setup!\n"
+#~ msgstr ""
+#~ "El fichero de configuración '%s' no ha sido encontrado.  ¡Ejecute gnunet-"
+#~ "setup!\n"
 
 #, fuzzy
 #~ msgid "Undefined option.\n"
@@ -7695,7 +8617,9 @@
 
 #, fuzzy
 #~ msgid "Configuration was unchanged, no need to save.\n"
-#~ msgstr "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar 
'%s'!\n"
+#~ msgstr ""
+#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar "
+#~ "'%s'!\n"
 
 #~ msgid "Can't open Service Control Manager"
 #~ msgstr "Imposible abrir el Service Control Manager"
@@ -7726,8 +8650,12 @@
 #~ msgstr "Error desconocido mientras se creaba un nuevo usuario"
 
 #, fuzzy
-#~ msgid "Configuration does not satisfy constraints of configuration 
specification file `%s'!\n"
-#~ msgstr "La configuración debe especificar un directorio para los datos FS 
en la sección '%s' bajo'%s'.\n"
+#~ msgid ""
+#~ "Configuration does not satisfy constraints of configuration specification "
+#~ "file `%s'!\n"
+#~ msgstr ""
+#~ "La configuración debe especificar un directorio para los datos FS en la "
+#~ "sección '%s' bajo'%s'.\n"
 
 #~ msgid "FATAL"
 #~ msgstr "FATAL"
@@ -7737,7 +8665,8 @@
 
 #, fuzzy
 #~ msgid "Syntax error in configuration entry HOST in section NETWORK: `%s'\n"
-#~ msgstr "Error de sintaxis en el fichero de configuración '%s' en la linea 
%d.\n"
+#~ msgstr ""
+#~ "Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
 #, fuzzy
 #~ msgid "Error connecting to %s:%u. Is the daemon running?\n"
@@ -7759,7 +8688,9 @@
 #~ msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
 
 #, fuzzy
-#~ msgid "Could not find interface `%s' using `%s', trying to find another 
interface.\n"
+#~ msgid ""
+#~ "Could not find interface `%s' using `%s', trying to find another "
+#~ "interface.\n"
 #~ msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
 
 #~ msgid "Could not find an IP address for interface `%s'.\n"
@@ -7799,12 +8730,17 @@
 #~ msgstr "Imposible guardar la configuración"
 
 #, fuzzy
-#~ msgid "%s:%d - RPC %s:%p could not be registered: another callback is 
already using this name (%p)\n"
-#~ msgstr "%s::%s - RPC %s:%p no pudo ser registrada: otro evento está 
actualmente usando este nombre (%p)\n"
+#~ msgid ""
+#~ "%s:%d - RPC %s:%p could not be registered: another callback is already "
+#~ "using this name (%p)\n"
+#~ msgstr ""
+#~ "%s::%s - RPC %s:%p no pudo ser registrada: otro evento está actualmente "
+#~ "usando este nombre (%p)\n"
 
 #, fuzzy
 #~ msgid "%s:%d - async RPC %s:%p could not be unregistered: not found\n"
-#~ msgstr "%s::%s RPC asíncrona %s:%p no pudo ser desregistrada: no 
encontrada\n"
+#~ msgstr ""
+#~ "%s::%s RPC asíncrona %s:%p no pudo ser desregistrada: no encontrada\n"
 
 #~ msgid "`%s' registering handlers %d %d %d\n"
 #~ msgstr "'%s' registrando manejadores %d %d %d\n"
@@ -7834,7 +8770,9 @@
 #~ msgstr "¡Debes especificar un receptor!\n"
 
 #~ msgid "Invalid receiver peer ID specified (`%s' is not valid name).\n"
-#~ msgstr "ID del par receptor especificada no válida ('%s' no es un nombre 
válido).\n"
+#~ msgstr ""
+#~ "ID del par receptor especificada no válida ('%s' no es un nombre "
+#~ "válido).\n"
 
 #~ msgid "Time:\n"
 #~ msgstr "Tiempo:\n"
@@ -7884,8 +8822,12 @@
 #~ msgid "# bytes allocated by SQLite"
 #~ msgstr "# bytes en la base de datos"
 
-#~ msgid "Failed to load MySQL database module.  Check that MySQL is running 
and configured properly!\n"
-#~ msgstr "Falló al cargar el modulo de la base de datos MySQL.  ¡Comprueba 
que MySQL esta ejecutandose y esta configurada correctamente!\n"
+#~ msgid ""
+#~ "Failed to load MySQL database module.  Check that MySQL is running and "
+#~ "configured properly!\n"
+#~ msgstr ""
+#~ "Falló al cargar el modulo de la base de datos MySQL.  ¡Comprueba que "
+#~ "MySQL esta ejecutandose y esta configurada correctamente!\n"
 
 #, fuzzy
 #~ msgid "use PRIORITY for the priority of the trace request"
@@ -7897,14 +8839,18 @@
 
 #, fuzzy
 #~ msgid "HELLO message has expiration too far in the future. Dropping.\n"
-#~ msgstr "mensaje de saludo recibido inválido (tiempo superior al límite). 
Omitiendo.\n"
+#~ msgstr ""
+#~ "mensaje de saludo recibido inválido (tiempo superior al límite). "
+#~ "Omitiendo.\n"
 
 #, fuzzy
 #~ msgid "Could not send HELLO+PING, ping buffer full.\n"
 #~ msgstr "Imposible mandar ahora saludos+PING, buffer del ping lleno.\n"
 
-#~ msgid "Announcing ourselves pointless: no other peers are known to us so 
far.\n"
-#~ msgstr "Es inútil anunciarnos: no hay más pares que nos conozcan más 
allá.\n"
+#~ msgid ""
+#~ "Announcing ourselves pointless: no other peers are known to us so far.\n"
+#~ msgstr ""
+#~ "Es inútil anunciarnos: no hay más pares que nos conozcan más allá.\n"
 
 #, fuzzy
 #~ msgid "# Peer advertisements of type NAT received"
@@ -7933,8 +8879,10 @@
 #~ msgid "`%s' registering handler %d (plaintext and ciphertext)\n"
 #~ msgstr "'%s' registrando manejador %d (texto plano e hipertexto)\n"
 
-#~ msgid "ensures that this peer is known by other peers and discovers other 
peers"
-#~ msgstr "Asegura que este par es conocido por otros pares y descubre otros 
pares"
+#~ msgid ""
+#~ "ensures that this peer is known by other peers and discovers other peers"
+#~ msgstr ""
+#~ "Asegura que este par es conocido por otros pares y descubre otros pares"
 
 #~ msgid "`%s' registering handler %d\n"
 #~ msgstr "'%s' registrando manejador %d\n"
@@ -7948,7 +8896,9 @@
 
 #, fuzzy
 #~ msgid "Existing key in file `%s' failed format check, creating new key.\n"
-#~ msgstr "Se produjo un fallo al comprobar la clave local existente en el 
fichero '%s', creando nueva clave local.\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al comprobar la clave local existente en el fichero "
+#~ "'%s', creando nueva clave local.\n"
 
 #, fuzzy
 #~ msgid "Creating new key for this nickname (this may take a while).\n"
@@ -7959,11 +8909,13 @@
 #~ msgstr "# bytes en la base de datos"
 
 #~ msgid "Transport library `%s' did not provide required function '%s%s'.\n"
-#~ msgstr "La biblioteca de transporte '%s' no provee la función '%s%s' 
requerida.\n"
+#~ msgstr ""
+#~ "La biblioteca de transporte '%s' no provee la función '%s%s' requerida.\n"
 
 #, fuzzy
 #~ msgid "Query (get KEY, put KEY VALUE) DHT table."
-#~ msgstr "Pregunta (coje KEY, pone KEY VALUE, borra KEY VALUE) a una tabla 
DHT."
+#~ msgstr ""
+#~ "Pregunta (coje KEY, pone KEY VALUE, borra KEY VALUE) a una tabla DHT."
 
 #, fuzzy
 #~ msgid "allow TIME ms to process a GET command"
@@ -7994,8 +8946,11 @@
 #~ msgid "`%s' registering client handlers: %d %d\n"
 #~ msgstr "'%s' registrando un manejador de clientes %d\n"
 
-#~ msgid "Existing hostkey in file `%s' failed format check, creating new 
hostkey.\n"
-#~ msgstr "Se produjo un fallo al comprobar la clave local existente en el 
fichero '%s', creando nueva clave local.\n"
+#~ msgid ""
+#~ "Existing hostkey in file `%s' failed format check, creating new hostkey.\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al comprobar la clave local existente en el fichero "
+#~ "'%s', creando nueva clave local.\n"
 
 #~ msgid "Done creating hostkey.\n"
 #~ msgstr "Correcto al crear la clave local.\n"
@@ -8025,7 +8980,8 @@
 #~ msgstr "¡Imposible crear la clave local!\n"
 
 #, fuzzy
-#~ msgid "Session key received from peer `%s' has invalid format 
(discarded).\n"
+#~ msgid ""
+#~ "Session key received from peer `%s' has invalid format (discarded).\n"
 #~ msgstr "El mensaje recibido del par es inválido.\n"
 
 #, fuzzy
@@ -8033,11 +8989,17 @@
 #~ msgstr "El mensaje recibido del par es inválido.\n"
 
 #~ msgid "setkey `%s' from `%s' fails CRC check (have: %u, want %u).\n"
-#~ msgstr "el cambio de clave '%s' de '%s' falló al comprobar el CRC (dio: %u, 
esperado %u).\n"
+#~ msgstr ""
+#~ "el cambio de clave '%s' de '%s' falló al comprobar el CRC (dio: %u, "
+#~ "esperado %u).\n"
 
 #, fuzzy
-#~ msgid "Error parsing encrypted session key from `%s', given message part 
size is invalid.\n"
-#~ msgstr "Error analizando la clave de sesión cifrada, el mensaje dado del 
tamaño de las partes es inválido.\n"
+#~ msgid ""
+#~ "Error parsing encrypted session key from `%s', given message part size is "
+#~ "invalid.\n"
+#~ msgstr ""
+#~ "Error analizando la clave de sesión cifrada, el mensaje dado del tamaño "
+#~ "de las partes es inválido.\n"
 
 #, fuzzy
 #~ msgid "Unknown type in embedded message from `%s': %u (size: %u)\n"
@@ -8053,26 +9015,45 @@
 #~ msgstr "borra el pseudónimo con el APODO dado"
 
 #~ msgid "end automated building of a namespace (ends collection)"
-#~ msgstr "finaliza la construcción automática de un espacio (finaliza la 
recolección)"
+#~ msgstr ""
+#~ "finaliza la construcción automática de un espacio (finaliza la "
+#~ "recolección)"
 
-#~ msgid "Create new pseudonyms, delete pseudonyms or list existing 
pseudonyms."
-#~ msgstr "Crea nuevos pseudónimos, borra pseudónimos o lista los pseudónimos 
existentes."
+#~ msgid ""
+#~ "Create new pseudonyms, delete pseudonyms or list existing pseudonyms."
+#~ msgstr ""
+#~ "Crea nuevos pseudónimos, borra pseudónimos o lista los pseudónimos "
+#~ "existentes."
 
-#~ msgid "use the given keyword to advertise the namespace (use when creating 
a new pseudonym)"
-#~ msgstr "usa la clave dada para anunciar el espacio (úsalo cuando crees un 
nuevo pseudónimo)"
+#~ msgid ""
+#~ "use the given keyword to advertise the namespace (use when creating a new "
+#~ "pseudonym)"
+#~ msgstr ""
+#~ "usa la clave dada para anunciar el espacio (úsalo cuando crees un nuevo "
+#~ "pseudónimo)"
 
 #, fuzzy
 #~ msgid "specify metadata describing the namespace or collection"
-#~ msgstr "finaliza la construcción automática de un espacio (finaliza la 
recolección)"
+#~ msgstr ""
+#~ "finaliza la construcción automática de un espacio (finaliza la "
+#~ "recolección)"
 
-#~ msgid "do not generate an advertisement for this namespace (use when 
creating a new pseudonym)"
-#~ msgstr "no genera un anuncio para este espacio (úsalo cuando crees un nuevo 
pseudónimo)"
+#~ msgid ""
+#~ "do not generate an advertisement for this namespace (use when creating a "
+#~ "new pseudonym)"
+#~ msgstr ""
+#~ "no genera un anuncio para este espacio (úsalo cuando crees un nuevo "
+#~ "pseudónimo)"
 
 #~ msgid "do not list the pseudonyms from the pseudonym database"
 #~ msgstr "no listar los pseudónimos de la base de datos de pseudónimos"
 
-#~ msgid "specify IDENTIFIER to be the address of the entrypoint to content in 
the namespace (use when creating a new pseudonym)"
-#~ msgstr "especifica el IDENTIFIER para ser la dirección del punto de entrada 
al contenido en el espacio (úsalo cuando crees un nuevo pseudónimo)"
+#~ msgid ""
+#~ "specify IDENTIFIER to be the address of the entrypoint to content in the "
+#~ "namespace (use when creating a new pseudonym)"
+#~ msgstr ""
+#~ "especifica el IDENTIFIER para ser la dirección del punto de entrada al "
+#~ "contenido en el espacio (úsalo cuando crees un nuevo pseudónimo)"
 
 #~ msgid "Namespace `%s' (%s) has rating %d.\n"
 #~ msgstr "El espacio '%s' (%s) ha sido valorado con un %d.\n"
@@ -8109,8 +9090,11 @@
 #~ msgid "Perform directory related operations."
 #~ msgstr "Realiza operaciones respecto al directorio."
 
-#~ msgid "remove all entries from the directory database and stop tracking 
URIs"
-#~ msgstr "borra todas las entradas de la base de datos del directorio y 
detiene el seguimiento de URIs"
+#~ msgid ""
+#~ "remove all entries from the directory database and stop tracking URIs"
+#~ msgstr ""
+#~ "borra todas las entradas de la base de datos del directorio y detiene el "
+#~ "seguimiento de URIs"
 
 #~ msgid "list entries from the directory database"
 #~ msgstr "lista las entradas de la base de datos del directorio"
@@ -8134,23 +9118,36 @@
 #~ msgstr "¡Subida rechazada!"
 
 #, fuzzy
-#~ msgid "run in debug mode; gnunet-auto-share will not daemonize and error 
messages will be written to stderr instead of a logfile"
-#~ msgstr "se ejecuta en modo de depuración; gnunetd no sera un demonio y los 
mensajes de error serán escritos a través de stderr en vez de en un fichero de 
log"
+#~ msgid ""
+#~ "run in debug mode; gnunet-auto-share will not daemonize and error "
+#~ "messages will be written to stderr instead of a logfile"
+#~ msgstr ""
+#~ "se ejecuta en modo de depuración; gnunetd no sera un demonio y los "
+#~ "mensajes de error serán escritos a través de stderr en vez de en un "
+#~ "fichero de log"
 
 #, fuzzy
-#~ msgid "do not use libextractor to add additional references to directory 
entries and/or the published file"
-#~ msgstr "usa libextractor para añadir referencias directas adicionales a las 
entradas del directorio"
+#~ msgid ""
+#~ "do not use libextractor to add additional references to directory entries "
+#~ "and/or the published file"
+#~ msgstr ""
+#~ "usa libextractor para añadir referencias directas adicionales a las "
+#~ "entradas del directorio"
 
 #~ msgid "Created entry `%s' in namespace `%s'\n"
 #~ msgstr "Creada la entrada '%s' en el espacio '%s'\n"
 
 #, fuzzy
-#~ msgid "%16llu of %16llu bytes inserted (estimating %6s to completion) - 
%s\n"
+#~ msgid ""
+#~ "%16llu of %16llu bytes inserted (estimating %6s to completion) - %s\n"
 #~ msgstr "%16llu de %16llu bytes insertados (%s estimado para completar)\n"
 
 #, fuzzy
-#~ msgid "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f 
KiB/s).\n"
-#~ msgstr "Subida de '%s' completada, %llu bytes tomaron %llu segundos (%8.3f 
kbps).\n"
+#~ msgid ""
+#~ "Upload of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
+#~ msgstr ""
+#~ "Subida de '%s' completada, %llu bytes tomaron %llu segundos (%8.3f "
+#~ "kbps).\n"
 
 #, fuzzy
 #~ msgid ""
@@ -8166,8 +9163,13 @@
 #~ "\n"
 #~ "Error subiendo el fichero %s\n"
 
-#~ msgid "even if gnunetd is running on the local machine, force the creation 
of a copy instead of making a link to the GNUnet share directory"
-#~ msgstr "aunque gnunetd este corriendo en el ordenador local, fuerza la 
creación de una copia en vez de hacer un enlace al directorio para compartir de 
GNUnet"
+#~ msgid ""
+#~ "even if gnunetd is running on the local machine, force the creation of a "
+#~ "copy instead of making a link to the GNUnet share directory"
+#~ msgstr ""
+#~ "aunque gnunetd este corriendo en el ordenador local, fuerza la creación "
+#~ "de una copia en vez de hacer un enlace al directorio para compartir de "
+#~ "GNUnet"
 
 #~ msgid "Make files available to GNUnet for sharing."
 #~ msgstr "Permite a GNUnet disponer de los ficheros para compartirlos."
@@ -8184,8 +9186,12 @@
 #~ msgid "Error converting arguments to URI!\n"
 #~ msgstr "¡Se produjo un error al convertir los argumentos a una URI!\n"
 
-#~ msgid "%16llu of %16llu bytes unindexed (estimating %llu seconds to 
completion)                "
-#~ msgstr "%16llu de %16llu bytes desindexados (estimados %llu segundos para 
completar)          "
+#~ msgid ""
+#~ "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
+#~ "completion)                "
+#~ msgstr ""
+#~ "%16llu de %16llu bytes desindexados (estimados %llu segundos para "
+#~ "completar)          "
 
 #, fuzzy
 #~ msgid ""
@@ -8193,11 +9199,14 @@
 #~ "Unindexing of `%s' complete, %llu bytes took %llu seconds (%8.3f KiB/s).\n"
 #~ msgstr ""
 #~ "\n"
-#~ "El desindexado de '%s' se completó, %llu bytes tomaron %llu segundos 
(%8.3f kbps).\n"
+#~ "El desindexado de '%s' se completó, %llu bytes tomaron %llu segundos "
+#~ "(%8.3f kbps).\n"
 
 #, fuzzy
 #~ msgid "Not enough arguments. You must specify a filename.\n"
-#~ msgstr "Argumentos insuficientes. Debes especificar una URI de un fichero 
de GNUnet\n"
+#~ msgstr ""
+#~ "Argumentos insuficientes. Debes especificar una URI de un fichero de "
+#~ "GNUnet\n"
 
 #~ msgid "`%s' failed.  Is `%s' a file?\n"
 #~ msgstr "'%s' falló.  ¿Es '%s' un fichero?\n"
@@ -8215,10 +9224,14 @@
 
 #, fuzzy
 #~ msgid "Download of file `%s' complete.  Speed was %8.3f KiB per second.\n"
-#~ msgstr "Descarga del fichero '%s' completada. La velocidad media fue 
%8.3fkilobytes por segundo.\n"
+#~ msgstr ""
+#~ "Descarga del fichero '%s' completada. La velocidad media fue "
+#~ "%8.3fkilobytes por segundo.\n"
 
 #~ msgid "Not enough arguments. You must specify a GNUnet file URI\n"
-#~ msgstr "Argumentos insuficientes. Debes especificar una URI de un fichero 
de GNUnet\n"
+#~ msgstr ""
+#~ "Argumentos insuficientes. Debes especificar una URI de un fichero de "
+#~ "GNUnet\n"
 
 #~ msgid "URI `%s' invalid for gnunet-download.\n"
 #~ msgstr "La URI '%s' no es válida para una descarga-de-gnunet.\n"
@@ -8247,7 +9260,9 @@
 #~ msgstr "Imposible hallar el hash de '%s'.\n"
 
 #~ msgid "Initialization for indexing file `%s' failed.\n"
-#~ msgstr "Durante la inicialización de la indexación del fichero '%s' se 
produjo un fallo.\n"
+#~ msgstr ""
+#~ "Durante la inicialización de la indexación del fichero '%s' se produjo un "
+#~ "fallo.\n"
 
 #, fuzzy
 #~ msgid "Cannot open file `%s': `%s'"
@@ -8275,29 +9290,47 @@
 #~ msgid "Format of file `%s' is invalid, trying to remove.\n"
 #~ msgstr "El formato del fichero '%s' no es válido.\n"
 
-#~ msgid "Decrypted content does not match key. This is either a bug or a 
maliciously inserted file. Download aborted.\n"
-#~ msgstr "El contenido descifrado no encuentra una clave. Esto puede ser un 
bug o un fichero introducido maliciosamente. Descarga abortada.\n"
+#~ msgid ""
+#~ "Decrypted content does not match key. This is either a bug or a "
+#~ "maliciously inserted file. Download aborted.\n"
+#~ msgstr ""
+#~ "El contenido descifrado no encuentra una clave. Esto puede ser un bug o "
+#~ "un fichero introducido maliciosamente. Descarga abortada.\n"
 
 #, fuzzy
 #~ msgid "Application aborted."
 #~ msgstr "_Opciones"
 
 #~ msgid "FSUI state file `%s' had syntax error at offset %u.\n"
-#~ msgstr "Fichero del estado de FSUI '%s' tiene un error de sintáxis en la 
asignación %u.\n"
+#~ msgstr ""
+#~ "Fichero del estado de FSUI '%s' tiene un error de sintáxis en la "
+#~ "asignación %u.\n"
 
 #, fuzzy
-#~ msgid "`%s' registering client handlers %d %d %d %d %d %d %d %d and P2P 
handlers %d %d\n"
-#~ msgstr "'%s' registrando manejadores de clientes %d %d %d %d %d %d %d %d 
%d\n"
+#~ msgid ""
+#~ "`%s' registering client handlers %d %d %d %d %d %d %d %d and P2P handlers "
+#~ "%d %d\n"
+#~ msgstr ""
+#~ "'%s' registrando manejadores de clientes %d %d %d %d %d %d %d %d %d\n"
 
 #~ msgid "enables (anonymous) file-sharing"
 #~ msgstr "activa la compartición de ficheros anónima"
 
-#~ msgid "Because the file `%s' has been unavailable for 3 days it got removed 
from your share.  Please unindex files before deleting them as the index now 
contains invalid references!\n"
-#~ msgstr "El fichero '%s' se ha eliminado de tus compartidos porque no ha 
estado disponible durante tres días.  Por favor, desindexa los ficheros antes 
de borrarlos porque eso causa que el índice tenga referencias no válidas.\n"
+#~ msgid ""
+#~ "Because the file `%s' has been unavailable for 3 days it got removed from "
+#~ "your share.  Please unindex files before deleting them as the index now "
+#~ "contains invalid references!\n"
+#~ msgstr ""
+#~ "El fichero '%s' se ha eliminado de tus compartidos porque no ha estado "
+#~ "disponible durante tres días.  Por favor, desindexa los ficheros antes de "
+#~ "borrarlos porque eso causa que el índice tenga referencias no válidas.\n"
 
 #, fuzzy
-#~ msgid "Unindexed ODB block `%s' from offset %llu already missing from 
datastore.\n"
-#~ msgstr "Bloque ODB '%s' desindexado del offset %llu perdido de la base de 
datos.\n"
+#~ msgid ""
+#~ "Unindexed ODB block `%s' from offset %llu already missing from "
+#~ "datastore.\n"
+#~ msgstr ""
+#~ "Bloque ODB '%s' desindexado del offset %llu perdido de la base de datos.\n"
 
 #~ msgid "# blocks migrated"
 #~ msgstr "# blocks migrados"
@@ -8349,7 +9382,8 @@
 
 #, fuzzy
 #~ msgid "`%s' registering client handlers %d %d %d and p2p handler %d\n"
-#~ msgstr "'%s' registrando manejadores de clientes %d %d %d %d %d %d %d %d 
%d\n"
+#~ msgstr ""
+#~ "'%s' registrando manejadores de clientes %d %d %d %d %d %d %d %d %d\n"
 
 #~ msgid "Supported peer-to-peer messages:\n"
 #~ msgstr "Mensajes P2P soportados:\n"
@@ -8412,8 +9446,13 @@
 #~ msgid "run as user LOGIN"
 #~ msgstr "ejecuta como el usuario LOGIN"
 
-#~ msgid "run in debug mode; gnunetd will not daemonize and error messages 
will be written to stderr instead of a logfile"
-#~ msgstr "se ejecuta en modo de depuración; gnunetd no sera un demonio y los 
mensajes de error serán escritos a través de stderr en vez de en un fichero de 
log"
+#~ msgid ""
+#~ "run in debug mode; gnunetd will not daemonize and error messages will be "
+#~ "written to stderr instead of a logfile"
+#~ msgstr ""
+#~ "se ejecuta en modo de depuración; gnunetd no sera un demonio y los "
+#~ "mensajes de error serán escritos a través de stderr en vez de en un "
+#~ "fichero de log"
 
 #~ msgid "Starts the gnunetd daemon."
 #~ msgstr "Arranca el demonio de gnunetd."
@@ -8423,7 +9462,9 @@
 #~ msgstr "especifica el host en el que gnunetd esta ejecutandose"
 
 #~ msgid "Configuration or GNUnet version changed.  You need to run `%s'!\n"
-#~ msgstr "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar 
'%s'!\n"
+#~ msgstr ""
+#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar "
+#~ "'%s'!\n"
 
 #~ msgid "The `%s' request received from client is malformed.\n"
 #~ msgstr "La petición '%s' recibida del cliente esta mal formada.\n"
@@ -8481,8 +9522,12 @@
 #~ msgstr "'%s': Imposible desconectar.\n"
 
 #, fuzzy
-#~ msgid "`%s' transport OK.  It took %ums to transmit %llu messages of %llu 
bytes each.\n"
-#~ msgstr "Transporte '%s' OK. Tomó %ums transmitir %d mensajes de %d bytes 
cada uno.\n"
+#~ msgid ""
+#~ "`%s' transport OK.  It took %ums to transmit %llu messages of %llu bytes "
+#~ "each.\n"
+#~ msgstr ""
+#~ "Transporte '%s' OK. Tomó %ums transmitir %d mensajes de %d bytes cada "
+#~ "uno.\n"
 
 #~ msgid " Transport %d is not being tested\n"
 #~ msgstr " El transporte %d no esta siendo probado\n"
@@ -8583,11 +9628,15 @@
 
 #, fuzzy
 #~ msgid "Configuration file that specifies the MySQL username and password"
-#~ msgstr "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar 
'%s'!\n"
+#~ msgstr ""
+#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar "
+#~ "'%s'!\n"
 
 #, fuzzy
 #~ msgid "Configuration of the MySQL database"
-#~ msgstr "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar 
'%s'!\n"
+#~ msgstr ""
+#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar "
+#~ "'%s'!\n"
 
 #, fuzzy
 #~ msgid "MB of diskspace GNUnet can use for anonymous file sharing"
@@ -8598,7 +9647,9 @@
 #~ msgstr "número de mensajes en un bloque de mensajes"
 
 #, fuzzy
-#~ msgid "MB of diskspace GNUnet can use for caching DHT index data (the data 
will be stored in /tmp)"
+#~ msgid ""
+#~ "MB of diskspace GNUnet can use for caching DHT index data (the data will "
+#~ "be stored in /tmp)"
 #~ msgstr "activa la compartición de ficheros anónima"
 
 #, fuzzy
@@ -8648,20 +9699,37 @@
 #~ msgstr "'%s(%s, %s)' falló.\n"
 
 #, fuzzy
-#~ msgid "Directory `%s' in directory `%s' does not match naming convention. 
Removed.\n"
-#~ msgstr "El fichero '%s' en el directorio '%s' no sigue la convención de 
nombres. Eliminando.\n"
+#~ msgid ""
+#~ "Directory `%s' in directory `%s' does not match naming convention. "
+#~ "Removed.\n"
+#~ msgstr ""
+#~ "El fichero '%s' en el directorio '%s' no sigue la convención de nombres. "
+#~ "Eliminando.\n"
 
-#~ msgid "set interval for availability of updates to SECONDS (for namespace 
insertions only)"
-#~ msgstr "cambia el intervalo de disponibilidad de las actualizaciones a 
SEGUNDOS (para inserciones en el espacio solamente)"
+#~ msgid ""
+#~ "set interval for availability of updates to SECONDS (for namespace "
+#~ "insertions only)"
+#~ msgstr ""
+#~ "cambia el intervalo de disponibilidad de las actualizaciones a SEGUNDOS "
+#~ "(para inserciones en el espacio solamente)"
 
-#~ msgid "specifies this as an aperiodic but updated publication (for 
namespace insertions only)"
-#~ msgstr "especifica esto como una aperiódica pero actualizada publicación 
(para inserciones en el espacio únicamente)"
+#~ msgid ""
+#~ "specifies this as an aperiodic but updated publication (for namespace "
+#~ "insertions only)"
+#~ msgstr ""
+#~ "especifica esto como una aperiódica pero actualizada publicación (para "
+#~ "inserciones en el espacio únicamente)"
 
 #~ msgid "specify creation time for SBlock (see man-page for format)"
-#~ msgstr "especifica el tiempo para la creación de un Superbloque (vea la 
página del manual para el formato)"
+#~ msgstr ""
+#~ "especifica el tiempo para la creación de un Superbloque (vea la página "
+#~ "del manual para el formato)"
 
-#~ msgid "ID of the previous version of the content (for namespace update 
only)"
-#~ msgstr "ID de la versión previa del contenido (para actualizaciones del 
espacio únicamente)"
+#~ msgid ""
+#~ "ID of the previous version of the content (for namespace update only)"
+#~ msgstr ""
+#~ "ID de la versión previa del contenido (para actualizaciones del espacio "
+#~ "únicamente)"
 
 #~ msgid "Parsing time failed. Use `%s' format.\n"
 #~ msgstr "Se produjo un fallo al analizar el tiempo. Use el formato '%s'.\n"
@@ -8669,8 +9737,12 @@
 #~ msgid "Publication interval for periodic publication changed."
 #~ msgstr "Intervalo de publicación periódica cambiado."
 
-#~ msgid "Publishing update for periodically updated content more than a week 
ahead of schedule.\n"
-#~ msgstr "publicaciones actualizadas para contenido actualizado 
periódicamente más de una semana antes de la tarea planificada.\n"
+#~ msgid ""
+#~ "Publishing update for periodically updated content more than a week ahead "
+#~ "of schedule.\n"
+#~ msgstr ""
+#~ "publicaciones actualizadas para contenido actualizado periódicamente más "
+#~ "de una semana antes de la tarea planificada.\n"
 
 #, fuzzy
 #~ msgid "Received malformed message via TCP. Closing.\n"
@@ -8685,7 +9757,8 @@
 #~ msgid ""
 #~ "Welcome to GNUnet!\n"
 #~ "\n"
-#~ "This assistant will ask you a few basic questions in order to configure 
GNUnet.\n"
+#~ "This assistant will ask you a few basic questions in order to configure "
+#~ "GNUnet.\n"
 #~ "\n"
 #~ "Please visit our homepage at\n"
 #~ "\thttp://gnunet.org\n";
@@ -8713,24 +9786,48 @@
 #~ msgid ""
 #~ "Enter information about your network connection here.\n"
 #~ "\n"
-#~ "The \"Network interface\" is the device that connects your computer to the 
internet. This is usually a modem, an ISDN card or a network card in case you 
are using DSL.\n"
+#~ "The \"Network interface\" is the device that connects your computer to "
+#~ "the internet. This is usually a modem, an ISDN card or a network card in "
+#~ "case you are using DSL.\n"
 #~ "\n"
-#~ "If your provider always assigns the same IP-Address to you (a \"static\" 
IP-Address), enter it into the \"IP-Address\" field. If your IP-Address changes 
every now and then (\"dynamic\" IP-Address) but there's a hostname that always 
points to your actual IP-Address (\"Dynamic DNS\"), you can also enter it 
here.\n"
-#~ "If in doubt, leave the field empty. GNUnet will then try to determine your 
IP-Address.\n"
+#~ "If your provider always assigns the same IP-Address to you (a \"static\" "
+#~ "IP-Address), enter it into the \"IP-Address\" field. If your IP-Address "
+#~ "changes every now and then (\"dynamic\" IP-Address) but there's a "
+#~ "hostname that always points to your actual IP-Address (\"Dynamic DNS\"), "
+#~ "you can also enter it here.\n"
+#~ "If in doubt, leave the field empty. GNUnet will then try to determine "
+#~ "your IP-Address.\n"
 #~ "\n"
-#~ "If you are connected to the internet through another computer doing SNAT, 
a router or a \"hardware firewall\" and other computers on the internet cannot 
connect to this computer, check the last option on this page. Leave it 
unchecked on direct connections through modems, ISDN cards and DNAT (also known 
as \"port forwarding\")."
+#~ "If you are connected to the internet through another computer doing SNAT, "
+#~ "a router or a \"hardware firewall\" and other computers on the internet "
+#~ "cannot connect to this computer, check the last option on this page. "
+#~ "Leave it unchecked on direct connections through modems, ISDN cards and "
+#~ "DNAT (also known as \"port forwarding\")."
 #~ msgstr ""
 #~ "Introduce información acerca de tu conexión aquí.\n"
 #~ "\n"
-#~ "La \"Interfaz de red\" es el dispositivo que conecta tu ordenador a 
Internet. Normalmente es un módem, una tarjeta de RDSI, un módem ADSL o una 
tarjeta de red en el caso de un router.\n"
+#~ "La \"Interfaz de red\" es el dispositivo que conecta tu ordenador a "
+#~ "Internet. Normalmente es un módem, una tarjeta de RDSI, un módem ADSL o "
+#~ "una tarjeta de red en el caso de un router.\n"
 #~ "\n"
-#~ "Si tu proveedor siempre te da la misma dirección IP (una dirección IP 
\"estática\") introducelo en el campo \"Dirección IP\". Si tu dirección IP 
cambia (una dirección IP \"dinámica\") pero hay un nombre de dominio que 
siempre apunta a tu dirección IP actual (\"DNS dinámica\") también puedes 
introducirla aquí.\n"
-#~ "En caso de duda deja el campo vacío. GNUnet intentara determinar tu 
dirección IP automaticamente.\n"
+#~ "Si tu proveedor siempre te da la misma dirección IP (una dirección IP "
+#~ "\"estática\") introducelo en el campo \"Dirección IP\". Si tu dirección "
+#~ "IP cambia (una dirección IP \"dinámica\") pero hay un nombre de dominio "
+#~ "que siempre apunta a tu dirección IP actual (\"DNS dinámica\") también "
+#~ "puedes introducirla aquí.\n"
+#~ "En caso de duda deja el campo vacío. GNUnet intentara determinar tu "
+#~ "dirección IP automaticamente.\n"
 #~ "\n"
-#~ "Si tu estas conectado a Internet a través de otro ordenador haciendo SNAT, 
a un router o a un \"cortafuegos de hardware\" y otros ordenadores no pueden 
conectar con tu ordenador marca la última opción en ésta página. Déjala sin 
marcar en conexiones directas a través de modems, tarjetas de RDSI y DNAT 
(también conocido como \"seguimiento de puertos\")."
+#~ "Si tu estas conectado a Internet a través de otro ordenador haciendo "
+#~ "SNAT, a un router o a un \"cortafuegos de hardware\" y otros ordenadores "
+#~ "no pueden conectar con tu ordenador marca la última opción en ésta "
+#~ "página. Déjala sin marcar en conexiones directas a través de modems, "
+#~ "tarjetas de RDSI y DNAT (también conocido como \"seguimiento de puertos"
+#~ "\")."
 
 #~ msgid "Computer cannot receive inbound connections (SNAT/Firewall)"
-#~ msgstr "El ordenador no puede recibir conexiones entrantes 
(SNAT/Cortafuegos)"
+#~ msgstr ""
+#~ "El ordenador no puede recibir conexiones entrantes (SNAT/Cortafuegos)"
 
 #~ msgid "IP-Address/Hostname:"
 #~ msgstr "Dirección IP/Nombre del dominio"
@@ -8742,15 +9839,21 @@
 #~ msgid ""
 #~ "You can limit GNUnet's ressource usage here.\n"
 #~ "\n"
-#~ "\"Bandwidth limitation\" is how much data may be sent per second. If you 
have a flatrate you can set it to the maximum speed of your internet 
connection.\n"
+#~ "\"Bandwidth limitation\" is how much data may be sent per second. If you "
+#~ "have a flatrate you can set it to the maximum speed of your internet "
+#~ "connection.\n"
 #~ "\n"
-#~ "The \"Max. CPU usage\" is the percentage of processor time GNUnet is 
allowed to use."
+#~ "The \"Max. CPU usage\" is the percentage of processor time GNUnet is "
+#~ "allowed to use."
 #~ msgstr ""
 #~ "Puedes limitar el uso de recursos de GNUnet aquí.\n"
 #~ "\n"
-#~ "\"Limitación de ancho de banda\" es cuantos datos pueden ser mandados por 
segundo. Si tienes una tarifa plana puedes seleccionar la velocidad máxima de 
tu conexión a Internet.\n"
+#~ "\"Limitación de ancho de banda\" es cuantos datos pueden ser mandados por "
+#~ "segundo. Si tienes una tarifa plana puedes seleccionar la velocidad "
+#~ "máxima de tu conexión a Internet.\n"
 #~ "\n"
-#~ "El \"Uso máximo de CPU\" es el porcentaje del tiempo de procesado que 
GNUnet puede usar."
+#~ "El \"Uso máximo de CPU\" es el porcentaje del tiempo de procesado que "
+#~ "GNUnet puede usar."
 
 #~ msgid "Downstream (Bytes/s):"
 #~ msgstr "Bajada (Bytes/s):"
@@ -8780,23 +9883,43 @@
 #~ msgstr "Limitación de carga"
 
 #~ msgid ""
-#~ "GNUnet is able to store data from other peers in your datastore. This is 
useful if an adversary has access to your inserted content and you need to deny 
that the content is yours. With \"content migration\" on, the content could 
have \"migrated\" over the internet to your node without your knowledge.\n"
-#~ "It also helps to spread popular content over different peers to enhance 
availability.\n"
+#~ "GNUnet is able to store data from other peers in your datastore. This is "
+#~ "useful if an adversary has access to your inserted content and you need "
+#~ "to deny that the content is yours. With \"content migration\" on, the "
+#~ "content could have \"migrated\" over the internet to your node without "
+#~ "your knowledge.\n"
+#~ "It also helps to spread popular content over different peers to enhance "
+#~ "availability.\n"
 #~ "\n"
-#~ "The GNUnet datastore contains all data that GNUnet generates (index data, 
inserted and migrated content). Its maximum size can be specified below.\n"
+#~ "The GNUnet datastore contains all data that GNUnet generates (index data, "
+#~ "inserted and migrated content). Its maximum size can be specified below.\n"
 #~ "\n"
-#~ "If you are an experienced user, you may want to tweak your GNUnet 
installation using the enhanced configurator.\n"
+#~ "If you are an experienced user, you may want to tweak your GNUnet "
+#~ "installation using the enhanced configurator.\n"
 #~ "\n"
-#~ "After changing the configuration and/or updating GNUnet, it is sometimes 
required to run gnunet-update to update internal data structures. Depending on 
the changes made, this may take some time."
+#~ "After changing the configuration and/or updating GNUnet, it is sometimes "
+#~ "required to run gnunet-update to update internal data structures. "
+#~ "Depending on the changes made, this may take some time."
 #~ msgstr ""
-#~ "GNUnet es capaz de almacenar datos de otros pares en tu base de datos. 
Ésto es útil si un adversario tiene acceso a tu contenido y tu necesitas negar 
que ese contenido sea tuyo. Con la \"migración de contenido\" activada, tu 
contenido puede haber \"migrado\" por Internet hasta tu nodo sin tu 
conocimiento.\n"
-#~ "Ésto también ayuda a difundir contenidos populares por diferentes pares 
para facilitar su disponibilidad.\n"
+#~ "GNUnet es capaz de almacenar datos de otros pares en tu base de datos. "
+#~ "Ésto es útil si un adversario tiene acceso a tu contenido y tu necesitas "
+#~ "negar que ese contenido sea tuyo. Con la \"migración de contenido\" "
+#~ "activada, tu contenido puede haber \"migrado\" por Internet hasta tu nodo "
+#~ "sin tu conocimiento.\n"
+#~ "Ésto también ayuda a difundir contenidos populares por diferentes pares "
+#~ "para facilitar su disponibilidad.\n"
 #~ "\n"
-#~ "La base de datos de GNUnet contiene todos los datos que GNUnet genera 
(índices, contenido insertado y descargado). Su máximo tamaño puede ser 
especificado debajo.\n"
+#~ "La base de datos de GNUnet contiene todos los datos que GNUnet genera "
+#~ "(índices, contenido insertado y descargado). Su máximo tamaño puede ser "
+#~ "especificado debajo.\n"
 #~ "\n"
-#~ "Si eres un usuario experimentado, puedes desear exprimir tu instalación de 
GNUnet usando la herramienta de configuración avanzada.\n"
+#~ "Si eres un usuario experimentado, puedes desear exprimir tu instalación "
+#~ "de GNUnet usando la herramienta de configuración avanzada.\n"
 #~ "\n"
-#~ "Después de cambiar la configuración y/o actualizar GNUnet, a veces 
esnecesario ejecutar gnunet-update para actualizar las estructuras de datos 
internas. Dependiendo de los cambios que se hayan hecho, ésto podrá tomar algún 
tiempo."
+#~ "Después de cambiar la configuración y/o actualizar GNUnet, a veces "
+#~ "esnecesario ejecutar gnunet-update para actualizar las estructuras de "
+#~ "datos internas. Dependiendo de los cambios que se hayan hecho, ésto podrá "
+#~ "tomar algún tiempo."
 
 #~ msgid "Store migrated content"
 #~ msgstr "Almacena contenido migrado"
@@ -8821,17 +9944,27 @@
 #~ msgid ""
 #~ "Define the user and the group owning the GNUnet service here.\n"
 #~ "\n"
-#~ "For security reasons, it is a good idea to let this setup create a new 
user account and a new group under which the GNUnet service is started at 
system startup.\n"
+#~ "For security reasons, it is a good idea to let this setup create a new "
+#~ "user account and a new group under which the GNUnet service is started at "
+#~ "system startup.\n"
 #~ "\n"
-#~ "However, GNUnet may not be able to access files other than its own. This 
includes files you want to publish in GNUnet. You'll have to grant read 
permissions to the user specified below.\n"
+#~ "However, GNUnet may not be able to access files other than its own. This "
+#~ "includes files you want to publish in GNUnet. You'll have to grant read "
+#~ "permissions to the user specified below.\n"
 #~ "\n"
 #~ "Leave the fields empty to run GNUnet with system privileges."
 #~ msgstr ""
-#~ "Define el usuario y el grupo bajo el que correrán los servicios de GNUnet 
aquí.\n"
+#~ "Define el usuario y el grupo bajo el que correrán los servicios de GNUnet "
+#~ "aquí.\n"
 #~ "\n"
-#~ "Por razones de seguridad, es una buena idea dejar que la configuración 
cree una nueva cuenta de usuario y un nuevo grupo bajo el cual el servicio de 
GNUnet es arrancado al iniciar el sistema.\n"
+#~ "Por razones de seguridad, es una buena idea dejar que la configuración "
+#~ "cree una nueva cuenta de usuario y un nuevo grupo bajo el cual el "
+#~ "servicio de GNUnet es arrancado al iniciar el sistema.\n"
 #~ "\n"
-#~ "Por consiguiente, GNUnet no tiene la posibilidad de acceder a otros 
ficheros que no sean los que posee. Ésto incluye los ficheros que quieras 
publicar en GNUnet. Tendrás que garantizar que el usuario especificado aquí 
posea permisos de lectura.\n"
+#~ "Por consiguiente, GNUnet no tiene la posibilidad de acceder a otros "
+#~ "ficheros que no sean los que posee. Ésto incluye los ficheros que quieras "
+#~ "publicar en GNUnet. Tendrás que garantizar que el usuario especificado "
+#~ "aquí posea permisos de lectura.\n"
 #~ "\n"
 #~ "Deja los campos vacíos para arrancar GNUnet con privilegios de sistema."
 
@@ -8855,7 +9988,8 @@
 
 #, fuzzy
 #~ msgid "(C) 2001-2007 Christian Grothoff (and other contributing authors)"
-#~ msgstr "C) 2001-2006 Christian Grothoff (y otros autores que han 
contribuido)"
+#~ msgstr ""
+#~ "C) 2001-2006 Christian Grothoff (y otros autores que han contribuido)"
 
 #~ msgid "This is the configuration tool for GNUnet."
 #~ msgstr "Esta es la herramienta de configuración de GNUnet."
@@ -8891,8 +10025,12 @@
 #~ msgid "HTTP: Could not determine my public IP address.\n"
 #~ msgstr "HTTP: Imposible determinar mi dirección IP pública.\n"
 
-#~ msgid "%s::%s - RPC %s:%p could not be unregistered: another callback 
registered under that name: %p\n"
-#~ msgstr "%s::%s - RPC %s:%p no pudo ser desregistrada: otro evento está 
actualmente registrado con este nombre (%p)\n"
+#~ msgid ""
+#~ "%s::%s - RPC %s:%p could not be unregistered: another callback registered "
+#~ "under that name: %p\n"
+#~ msgstr ""
+#~ "%s::%s - RPC %s:%p no pudo ser desregistrada: otro evento está "
+#~ "actualmente registrado con este nombre (%p)\n"
 
 #~ msgid "%s::%s - RPC %s:%p could not be unregistered: not found\n"
 #~ msgstr "%s::%s - RPC %s:%p no pudo ser desregistrada: no encontrada\n"
@@ -8961,7 +10099,9 @@
 #~ msgstr "UDP: Imposible determinar mi dirección IP pública.\n"
 
 #~ msgid "Failed to send message of size %d via UDP to %u.%u.%u.%u:%u: %s\n"
-#~ msgstr "Falló al mandar el mensaje de tamaño %d a través de UDP a 
%u.%u.%u.%u:%u: %s\n"
+#~ msgstr ""
+#~ "Falló al mandar el mensaje de tamaño %d a través de UDP a %u.%u.%u.%u:%u: "
+#~ "%s\n"
 
 #, fuzzy
 #~ msgid "Received malformed message from udp-peer connection. Closing.\n"
@@ -8980,24 +10120,38 @@
 #~ msgid "myself"
 #~ msgstr "yo"
 
-#~ msgid "Cover traffic requested but traffic service not loaded.  Rejecting 
request.\n"
-#~ msgstr "Solicitada la cobertura de tráfico pero el servicio de tráfico no 
ha sido cargado. Rechazando la petición.\n"
+#~ msgid ""
+#~ "Cover traffic requested but traffic service not loaded.  Rejecting "
+#~ "request.\n"
+#~ msgstr ""
+#~ "Solicitada la cobertura de tráfico pero el servicio de tráfico no ha sido "
+#~ "cargado. Rechazando la petición.\n"
 
 #~ msgid "Cannot satisfy desired level of anonymity, ignoring request.\n"
-#~ msgstr "Imposible satisfacer el nivel deseado de anonimato, ignorando la 
petición.\n"
+#~ msgstr ""
+#~ "Imposible satisfacer el nivel deseado de anonimato, ignorando la "
+#~ "petición.\n"
 
 #~ msgid "`%s' registering handlers %d %d\n"
 #~ msgstr "'%s' registrando manejadores %d %d\n"
 
 #, fuzzy
 #~ msgid "Indexed file disappeared, deleting block for query `%s'\n"
-#~ msgstr "Fichero indexado desaparecido, borrando el bloque para preguntas 
'%s'\n"
+#~ msgstr ""
+#~ "Fichero indexado desaparecido, borrando el bloque para preguntas '%s'\n"
 
-#~ msgid "Configuration file must specify directory for storage of FS data in 
section `%s' under `%s'.\n"
-#~ msgstr "El fichero de configuración debe especificar un directorio para el 
almacenamiento de los datos de FS en la sección '%s' bajo '%s'.\n"
+#~ msgid ""
+#~ "Configuration file must specify directory for storage of FS data in "
+#~ "section `%s' under `%s'.\n"
+#~ msgstr ""
+#~ "El fichero de configuración debe especificar un directorio para el "
+#~ "almacenamiento de los datos de FS en la sección '%s' bajo '%s'.\n"
 
-#~ msgid "Content `%s' seems to be not available on the network (tried %u 
times).\n"
-#~ msgstr "El contenido '%s' parece no estar disponible en la red (intentado 
%u veces).\n"
+#~ msgid ""
+#~ "Content `%s' seems to be not available on the network (tried %u times).\n"
+#~ msgstr ""
+#~ "El contenido '%s' parece no estar disponible en la red (intentado %u "
+#~ "veces).\n"
 
 #, fuzzy
 #~ msgid "Start GNUnet-testbed helper."
@@ -9007,13 +10161,18 @@
 #~ msgstr "Imposible conectar al puerto de LOOPBACK %d: %s\n"
 
 #~ msgid "No client service started. Trying again in 30 seconds.\n"
-#~ msgstr "No hay ningún servicio de cliente ejecutandose. Se volverá a 
intentar en 30 segundos.\n"
+#~ msgstr ""
+#~ "No hay ningún servicio de cliente ejecutandose. Se volverá a intentar en "
+#~ "30 segundos.\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "Error (%s) binding the TCP listener to port %d. No proxy service 
started.\n"
+#~ "Error (%s) binding the TCP listener to port %d. No proxy service "
+#~ "started.\n"
 #~ "Trying again in %d seconds...\n"
-#~ msgstr "No hay ningún servicio de cliente ejecutandose. Se volverá a 
intentar en 30 segundos.\n"
+#~ msgstr ""
+#~ "No hay ningún servicio de cliente ejecutandose. Se volverá a intentar en "
+#~ "30 segundos.\n"
 
 #~ msgid "Rejected unauthorized connection from %u.%u.%u.%u.\n"
 #~ msgstr "Rechazada conexión no autorizada de %u.%u.%u.%u.\n"
@@ -9022,22 +10181,26 @@
 #~ msgstr "Violación del protocolo en el socket. Esperando comando.\n"
 
 #~ 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"
+#~ msgstr ""
+#~ "Entrada mal formada en la configuración en la sección %s bajo %s: %s\n"
 
 #~ msgid "size of `%s' message is wrong. Ignoring.\n"
 #~ msgstr "el tamaño del mensaje '%s' es erroneo. Se ignora.\n"
 
 #~ msgid "TESTBED could not generate hello message for protocol %u\n"
-#~ msgstr "TESTBED no puede generar el mensaje de saludo para el protocolo 
%u\n"
+#~ msgstr ""
+#~ "TESTBED no puede generar el mensaje de saludo para el protocolo %u\n"
 
 #~ msgid "received invalid `%s' message (empty module name)\n"
 #~ msgstr "recibido mensaje '%s' no válido (nombre del módulo vacío)\n"
 
 #~ msgid "loading module `%s' failed.  Notifying client.\n"
-#~ msgstr "se produjo un fallo al cargar el módulo '%s'.  Notificando al 
cliente.\n"
+#~ msgstr ""
+#~ "se produjo un fallo al cargar el módulo '%s'.  Notificando al cliente.\n"
 
 #~ msgid "unloading module failed.  Notifying client.\n"
-#~ msgstr "se produjo un fallo al descargar el módulo.  Notificando al 
cliente.\n"
+#~ msgstr ""
+#~ "se produjo un fallo al descargar el módulo.  Notificando al cliente.\n"
 
 #~ msgid "received invalid `%s' message: %s.\n"
 #~ msgstr "recibido mensaje '%s' no válido: %s.\n"
@@ -9046,10 +10209,13 @@
 #~ msgstr "'..' no esta permitido en el nombre del fichero(%s).\n"
 
 #~ msgid "Empty filename for UPLOAD_FILE message is invalid!\n"
-#~ msgstr "¡Nombre del fichero vacío para el mensaje UPLOAD_FILE es 
inválido!\n"
+#~ msgstr ""
+#~ "¡Nombre del fichero vacío para el mensaje UPLOAD_FILE es inválido!\n"
 
 #~ msgid "Filename for UPLOAD_FILE message is not null-terminated (invalid!)\n"
-#~ msgstr "Nombre del fichero para el mensaje UPLOAD_FILE no esta terminado en 
null (¡inválido!)\n"
+#~ msgstr ""
+#~ "Nombre del fichero para el mensaje UPLOAD_FILE no esta terminado en null "
+#~ "(¡inválido!)\n"
 
 #~ msgid "Invalid message received at %s:%d."
 #~ msgstr "Mensaje inválido recibido en %s:%d."
@@ -9063,7 +10229,8 @@
 
 #, fuzzy
 #~ msgid "Could not register testbed, host `%s' unknown\n"
-#~ msgstr "Imposible descargar lista de contactos, servidor '%s' 
desconocido.\n"
+#~ msgstr ""
+#~ "Imposible descargar lista de contactos, servidor '%s' desconocido.\n"
 
 #~ msgid "Failed so send HTTP request `%s' to host `%s': %s\n"
 #~ msgstr "Falló al mandar la petición HTTP '%s' al host '%s': %s\n"
@@ -9093,15 +10260,26 @@
 #~ msgid ""
 #~ "Is this machine behind NAT?\n"
 #~ "\n"
-#~ "If you are connected to the internet through another computer doing SNAT, 
a router or a \"hardware firewall\" and other computers on the internet cannot 
connect to this computer, say \"yes\" here. Answer \"no\" on direct connections 
through modems, ISDN cards and DNAT (also known as \"port forwarding\")."
+#~ "If you are connected to the internet through another computer doing SNAT, "
+#~ "a router or a \"hardware firewall\" and other computers on the internet "
+#~ "cannot connect to this computer, say \"yes\" here. Answer \"no\" on "
+#~ "direct connections through modems, ISDN cards and DNAT (also known as "
+#~ "\"port forwarding\")."
 #~ msgstr ""
 #~ "¿Tu máquina esta detrás de un NAT?\n"
 #~ "\n"
-#~ "Si tu estás conectado a Internet a través de otro ordenador haciendo SNAT, 
un router o un \"cortafuegos de hardware\" y otros ordenadores no pueden 
conectarse al tuyo a través de Internet directamente, responde \"si\" aquí. 
Responde \"no\" en conexiones directas a través de módems, tarjetas de RDSI y 
DNAT (también conocido como \"seguimiento de puertos\")."
+#~ "Si tu estás conectado a Internet a través de otro ordenador haciendo "
+#~ "SNAT, un router o un \"cortafuegos de hardware\" y otros ordenadores no "
+#~ "pueden conectarse al tuyo a través de Internet directamente, responde \"si"
+#~ "\" aquí. Responde \"no\" en conexiones directas a través de módems, "
+#~ "tarjetas de RDSI y DNAT (también conocido como \"seguimiento de puertos"
+#~ "\")."
 
 #, fuzzy
 #~ msgid "Configuration of the logging system"
-#~ msgstr "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar 
'%s'!\n"
+#~ msgstr ""
+#~ "La configuración o la versión de GNUnet cambiaron.  ¡Debes ejecutar "
+#~ "'%s'!\n"
 
 #, fuzzy
 #~ msgid "Run gnunetd as this user."
@@ -9125,7 +10303,9 @@
 #~ msgstr "base de datos mysql"
 
 #, fuzzy
-#~ msgid "`%s' failed at %s:%d with error: I/%s S/%s SC/%s SS/%s SSC/%s U/%s 
D/%s DG/%s\n"
+#~ msgid ""
+#~ "`%s' failed at %s:%d with error: I/%s S/%s SC/%s SS/%s SSC/%s U/%s D/%s "
+#~ "DG/%s\n"
 #~ msgstr "'%s' falló en %s: %d con el error: %s\n"
 
 #~ msgid "Database failed to delete `%s'.\n"
@@ -9166,11 +10346,16 @@
 #~ msgid "User `%s' not known, cannot change UID to it.\n"
 #~ msgstr "Usuario '%s' desconocido, imposible cambiar la UID a él.\n"
 
-#~ msgid "Expected welcome on http connection, got garbage. Closing 
connection.\n"
-#~ msgstr "Esperada bienvenida en la conexión http, encontrada basura. 
Cerrando la conexión.\n"
+#~ msgid ""
+#~ "Expected welcome on http connection, got garbage. Closing connection.\n"
+#~ msgstr ""
+#~ "Esperada bienvenida en la conexión http, encontrada basura. Cerrando la "
+#~ "conexión.\n"
 
 #~ msgid "%s: Rejected connection from blacklisted address %u.%u.%u.%u.\n"
-#~ msgstr "%s: Conexión rechazada de una dirección de la \"lista negra\" 
%u.%u.%u.%u.\n"
+#~ msgstr ""
+#~ "%s: Conexión rechazada de una dirección de la \"lista negra\" %u.%u.%u."
+#~ "%u.\n"
 
 #~ msgid "Unexpected reply to `%s' operation.\n"
 #~ msgstr "Respuesta inesperada a la operación '%s'.\n"
@@ -9196,11 +10381,25 @@
 #~ msgid ""
 #~ "Share denoted bandwidth with other applications?\n"
 #~ "\n"
-#~ "Say \"yes\" here, if you don't want other network traffic to interfere 
with GNUnet's operation, but still wish to constrain GNUnet's bandwidth usage 
to values entered in the previous steps, or if you can't reliably measure the 
maximum capabilities of your connection. \"No\" can be very useful if other 
applications are causing a lot of traffic on your LAN.  In this case, you do 
not want to limit the traffic that GNUnet can inflict on your internet 
connection whenever your high-speed LAN gets used (e.g. by NFS)."
+#~ "Say \"yes\" here, if you don't want other network traffic to interfere "
+#~ "with GNUnet's operation, but still wish to constrain GNUnet's bandwidth "
+#~ "usage to values entered in the previous steps, or if you can't reliably "
+#~ "measure the maximum capabilities of your connection. \"No\" can be very "
+#~ "useful if other applications are causing a lot of traffic on your LAN.  "
+#~ "In this case, you do not want to limit the traffic that GNUnet can "
+#~ "inflict on your internet connection whenever your high-speed LAN gets "
+#~ "used (e.g. by NFS)."
 #~ msgstr ""
 #~ "¿Compartir el ancho de banda marcado con otras aplicaciones?\n"
 #~ "\n"
-#~ "Di \"sí\" aquí si no quieres que el resto del tráfico de la red no 
interfiera con las operaciones de GNUnet, pero aun quieres mantener el ancho de 
banda usado por GNUnet introducido en los pasos previos, o no puedes asegurar 
las máximas capacidades de tu conexión. \"No\" puede ser muy útil si otras 
aplicaciones crean mucho tráfico en tu LAN.  En ese caso no quieres limitar el 
tráfico que GNUnet puede crear en tu conexión a Internet cuando una LAN de alta 
velocidad es usada (por ejemplo bajo NFS)."
+#~ "Di \"sí\" aquí si no quieres que el resto del tráfico de la red no "
+#~ "interfiera con las operaciones de GNUnet, pero aun quieres mantener el "
+#~ "ancho de banda usado por GNUnet introducido en los pasos previos, o no "
+#~ "puedes asegurar las máximas capacidades de tu conexión. \"No\" puede ser "
+#~ "muy útil si otras aplicaciones crean mucho tráfico en tu LAN.  En ese "
+#~ "caso no quieres limitar el tráfico que GNUnet puede crear en tu conexión "
+#~ "a Internet cuando una LAN de alta velocidad es usada (por ejemplo bajo "
+#~ "NFS)."
 
 #~ msgid "How much CPU (in %) may be used?"
 #~ msgstr "¿Cuánta CPU (en %) podrá ser usada?"
@@ -9217,20 +10416,32 @@
 #~ msgid ""
 #~ "Store migrated content?\n"
 #~ "\n"
-#~ "GNUnet is able to store data from other peers in your datastore. This is 
useful if an adversary has access to your inserted content and you need to deny 
that the content is yours. With \"content migration\" on, the content could 
have \"migrated\" over the internet to your node without your knowledge.\n"
-#~ "It also helps to spread popular content over different peers to enhance 
availability."
+#~ "GNUnet is able to store data from other peers in your datastore. This is "
+#~ "useful if an adversary has access to your inserted content and you need "
+#~ "to deny that the content is yours. With \"content migration\" on, the "
+#~ "content could have \"migrated\" over the internet to your node without "
+#~ "your knowledge.\n"
+#~ "It also helps to spread popular content over different peers to enhance "
+#~ "availability."
 #~ msgstr ""
 #~ "¿Almacena el contenido migrado?\n"
 #~ "\n"
-#~ "GNUnet puede almacenar datos de otros pares en tu ordenador. Esto es muy 
útil si un adversario accede a tu contenido insertado y necesitas negar que 
dicho contenido sea tuyo. Con la \"migración de contenidos\" activada, el 
contenido puede haber \"migrado\" a través de internet a tu nodo sin tu 
conocimiento.\n"
-#~ "Ésto también ayuda a repartir contenido popular a través de diferentes 
pares para aumentar la disponibilidad."
+#~ "GNUnet puede almacenar datos de otros pares en tu ordenador. Esto es muy "
+#~ "útil si un adversario accede a tu contenido insertado y necesitas negar "
+#~ "que dicho contenido sea tuyo. Con la \"migración de contenidos\" "
+#~ "activada, el contenido puede haber \"migrado\" a través de internet a tu "
+#~ "nodo sin tu conocimiento.\n"
+#~ "Ésto también ayuda a repartir contenido popular a través de diferentes "
+#~ "pares para aumentar la disponibilidad."
 
 #~ msgid ""
-#~ "If you are an experienced user, you may want to tweak your GNUnet 
installation using the enhanced configurator.\n"
+#~ "If you are an experienced user, you may want to tweak your GNUnet "
+#~ "installation using the enhanced configurator.\n"
 #~ "\n"
 #~ "Do you want to start it after saving your configuration?"
 #~ msgstr ""
-#~ "Si eres un usuario experimentado, puedes desear exprimir tu instalación de 
GNUnet usando la herramienta de configuración avanzada.\n"
+#~ "Si eres un usuario experimentado, puedes desear exprimir tu instalación "
+#~ "de GNUnet usando la herramienta de configuración avanzada.\n"
 #~ "\n"
 #~ "¿Quieres arrancarla después de guardar tu configuración?"
 
@@ -9326,32 +10537,58 @@
 #~ msgid "Received invalid UDP message from %u.%u.%u.%u:%u, dropping.\n"
 #~ msgstr "Recibido mensaje UDP no válido del %u.%u.%u.%u:%u, omitiendo.\n"
 
-#~ msgid "Configuration file must specify directory for storing FS data in 
section `%s' under `%s'.\n"
-#~ msgstr "El fichero de configuración debe especificar el directorio para 
almacenar los datos FS en la sección '%s' bajo '%s'.\n"
+#~ msgid ""
+#~ "Configuration file must specify directory for storing FS data in section `"
+#~ "%s' under `%s'.\n"
+#~ msgstr ""
+#~ "El fichero de configuración debe especificar el directorio para almacenar "
+#~ "los datos FS en la sección '%s' bajo '%s'.\n"
 
-#~ msgid "Configuration file must specify a directory for GNUnet to store 
per-peer data under %s%s\n"
-#~ msgstr "El fichero de configuración debe especificar un directorio para que 
GNUnet almacene la información por-par bajo%s%s\n"
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s%s\n"
+#~ msgstr ""
+#~ "El fichero de configuración debe especificar un directorio para que "
+#~ "GNUnet almacene la información por-par bajo%s%s\n"
 
 #~ msgid "%s `%s' returned no known hosts!\n"
 #~ msgstr "¡%s '%s' devolvió hosts desconocidos!\n"
 
-#~ msgid "specify that the contents of the namespace are of the given MIMETYPE 
(use when creating a new pseudonym)"
-#~ msgstr "especifica que los contenidos del espacio son del MIMETYPE dado 
(úsalo cuando crees un nuevo pseudónimo)"
+#~ msgid ""
+#~ "specify that the contents of the namespace are of the given MIMETYPE (use "
+#~ "when creating a new pseudonym)"
+#~ msgstr ""
+#~ "especifica que los contenidos del espacio son del MIMETYPE dado (úsalo "
+#~ "cuando crees un nuevo pseudónimo)"
 
-#~ msgid "specify NAME to be the realname of the user controlling the 
namespace (use when creating a new pseudonym)"
-#~ msgstr "especifica el NAME  para ser el nombre real del usuario que 
controla el espacio (úsalo cuando crees un nuevo pseudónimo)"
+#~ msgid ""
+#~ "specify NAME to be the realname of the user controlling the namespace "
+#~ "(use when creating a new pseudonym)"
+#~ msgstr ""
+#~ "especifica el NAME  para ser el nombre real del usuario que controla el "
+#~ "espacio (úsalo cuando crees un nuevo pseudónimo)"
 
-#~ msgid "use DESCRIPTION to describe the content of the namespace (use when 
creating a new pseudonym)"
-#~ msgstr "usa la DESCRIPTION para describir el contenido del espacio (úsalo 
cuando crees un nuevo pseudónimo)"
+#~ msgid ""
+#~ "use DESCRIPTION to describe the content of the namespace (use when "
+#~ "creating a new pseudonym)"
+#~ msgstr ""
+#~ "usa la DESCRIPTION para describir el contenido del espacio (úsalo cuando "
+#~ "crees un nuevo pseudónimo)"
 
-#~ msgid "specify the given URI as an address that contains more information 
about the namespace (use when creating a new pseudonym)"
-#~ msgstr "especifica la URI dada como dirección que contiene mas información 
del espacio (úsalo cuando crees un nuevo pseudónimo)"
+#~ msgid ""
+#~ "specify the given URI as an address that contains more information about "
+#~ "the namespace (use when creating a new pseudonym)"
+#~ msgstr ""
+#~ "especifica la URI dada como dirección que contiene mas información del "
+#~ "espacio (úsalo cuando crees un nuevo pseudónimo)"
 
 #~ msgid "%8u of %8u bytes deleted."
 #~ msgstr "%8u de %8u bytes borrados."
 
 #~ msgid "specify the file to delete from GNUnet (obligatory, file must exist)"
-#~ msgstr "especifica el fichero a borrar de GNUnet (el fichero debe existir 
obligatoriamente)"
+#~ msgstr ""
+#~ "especifica el fichero a borrar de GNUnet (el fichero debe existir "
+#~ "obligatoriamente)"
 
 #~ msgid ""
 #~ "Remove file from GNUnet.  The specified file is not removed\n"
@@ -9383,7 +10620,9 @@
 #~ msgstr "Debes especificar un fichero o directorio para subir.\n"
 
 #~ msgid "Not enough arguments. You must specify a keyword or identifier.\n"
-#~ msgstr "No hay suficientes argumentos. Debes especificar una clave o un 
identificador.\n"
+#~ msgstr ""
+#~ "No hay suficientes argumentos. Debes especificar una clave o un "
+#~ "identificador.\n"
 
 #~ msgid "LEVEL"
 #~ msgstr "NIVEL"
@@ -9391,20 +10630,28 @@
 #~ msgid "FILENAME"
 #~ msgstr "FICHERO"
 
-#~ msgid "Configuration file must specify a directory for GNUnet to store 
per-peer data under %s%s.\n"
-#~ msgstr "El fichero de configuración debe especificar un directorio para que 
GNUnet almacene la información por-par bajo %s%s.\n"
+#~ msgid ""
+#~ "Configuration file must specify a directory for GNUnet to store per-peer "
+#~ "data under %s%s.\n"
+#~ msgstr ""
+#~ "El fichero de configuración debe especificar un directorio para que "
+#~ "GNUnet almacene la información por-par bajo %s%s.\n"
 
 #~ msgid "Template for gnunet-clients."
 #~ msgstr "Plantilla para clientes-de-gnunet."
 
 #~ msgid "Invalid port \"%s\" in hostlist specification, trying port %d.\n"
-#~ msgstr "Puerto inválido \"%s\" en la especificación de la lista local, 
probando el puerto %d.\n"
+#~ msgstr ""
+#~ "Puerto inválido \"%s\" en la especificación de la lista local, probando "
+#~ "el puerto %d.\n"
 
 #~ msgid "Parsing HTTP response for URL `%s' failed.\n"
 #~ msgstr "Analizando HTTP de la URL '%s' se produjo un fallo.\n"
 
 #~ msgid "Could not resolve name of HTTP proxy `%s'. Trying without a proxy.\n"
-#~ msgstr "Imposible resolver el nombre del proxy HTTP '%s'. Intentándolo sin 
un proxy.\n"
+#~ msgstr ""
+#~ "Imposible resolver el nombre del proxy HTTP '%s'. Intentándolo sin un "
+#~ "proxy.\n"
 
 #~ msgid "Option `%s' makes no sense without option `%s'."
 #~ msgstr "La opción '%s' no tiene ningún sentido sin la opción '%s'."
@@ -9431,7 +10678,9 @@
 #~ msgstr " menuconfig\tmenú basado en texto\n"
 
 #~ msgid " wizard-curses\tBasic text-based graphical configuration\n"
-#~ msgstr " wizard-curses\t Configuración básica en modo gráfico pero basado 
en texto\n"
+#~ msgstr ""
+#~ " wizard-curses\t Configuración básica en modo gráfico pero basado en "
+#~ "texto\n"
 
 #~ msgid ""
 #~ " wizard-gtk\tBasic GTK configuration\n"
@@ -9441,7 +10690,9 @@
 #~ "\n"
 
 #~ msgid "gnunet-setup must have write-access to the configuration file `%s'\n"
-#~ msgstr "gnunet-setup debe tener acceso de escritura al fichero de 
configuración '%s'\n"
+#~ msgstr ""
+#~ "gnunet-setup debe tener acceso de escritura al fichero de configuración "
+#~ "'%s'\n"
 
 #, fuzzy
 #~ msgid ""
@@ -9535,15 +10786,23 @@
 #~ msgid ""
 #~ "This is GNUnet's configuration interface.\n"
 #~ "\n"
-#~ "GNUnet's options are separated into categories. You can browse them in the 
left tree. If you click on one of the categories, its options are shown above. 
\n"
+#~ "GNUnet's options are separated into categories. You can browse them in "
+#~ "the left tree. If you click on one of the categories, its options are "
+#~ "shown above. \n"
 #~ "\n"
-#~ "To change the value of an option, simply click on its value and enter a 
new value. To get additional information about a specific option, click on its 
description."
+#~ "To change the value of an option, simply click on its value and enter a "
+#~ "new value. To get additional information about a specific option, click "
+#~ "on its description."
 #~ msgstr ""
 #~ "Ésta es la interfaz de configuración de GNUnet.\n"
 #~ "\n"
-#~ "Las opciones de GNUnet están separadas en categorías. Tu puedes 
explorarlas en el árbol de la izquierda. Si pulsas en una de las categorías las 
opciones son mostradas encima.\n"
+#~ "Las opciones de GNUnet están separadas en categorías. Tu puedes "
+#~ "explorarlas en el árbol de la izquierda. Si pulsas en una de las "
+#~ "categorías las opciones son mostradas encima.\n"
 #~ "\n"
-#~ "Para cambiar el valor de una opción, simplemente pulsa en su valor e 
introduce uno nuevo. Para obtener información adicional acerca de una opción 
específica, pulsa en su descripción."
+#~ "Para cambiar el valor de una opción, simplemente pulsa en su valor e "
+#~ "introduce uno nuevo. Para obtener información adicional acerca de una "
+#~ "opción específica, pulsa en su descripción."
 
 #~ msgid "Introduction"
 #~ msgstr "Introducción"
@@ -9552,27 +10811,43 @@
 #~ msgid ""
 #~ "Welcome to GNUnet Setup.\n"
 #~ "\n"
-#~ "For each option, a blank box indicates the feature is disabled, and 
checked one indicates it is enabled.\n"
-#~ "If you do not see an option that you believe should be present, try 
turning on Show All Options under the Options menu.\n"
+#~ "For each option, a blank box indicates the feature is disabled, and "
+#~ "checked one indicates it is enabled.\n"
+#~ "If you do not see an option that you believe should be present, try "
+#~ "turning on Show All Options under the Options menu.\n"
 #~ "\n"
-#~ "Although there is no cross reference yet to help you figure out what other 
options must be enabled to support the option you are interested in, you can 
still view the help of a grayed-out option.\n"
+#~ "Although there is no cross reference yet to help you figure out what "
+#~ "other options must be enabled to support the option you are interested "
+#~ "in, you can still view the help of a grayed-out option.\n"
 #~ "\n"
-#~ "Toggling Show Debug Info under the Options menu will show the 
dependencies, which you can then match by examining other options."
+#~ "Toggling Show Debug Info under the Options menu will show the "
+#~ "dependencies, which you can then match by examining other options."
 #~ msgstr ""
 #~ "Bienvenido a la configuración de GNUnet.\n"
 #~ "\n"
-#~ "Para cada opción una caja en blanco indica que la opción está desactivada 
y una marcada indica que está activada.\n"
-#~ "Si no ves una opción que crees que debería estar presente, prueba 
activando la opción \"Mostrar todas las opciones\" en el menú de 
\"Opciones\".\n"
+#~ "Para cada opción una caja en blanco indica que la opción está desactivada "
+#~ "y una marcada indica que está activada.\n"
+#~ "Si no ves una opción que crees que debería estar presente, prueba "
+#~ "activando la opción \"Mostrar todas las opciones\" en el menú de "
+#~ "\"Opciones\".\n"
 #~ "\n"
-#~ 
"Although·there·is·no·cross·reference·yet·to·help·you·figure·out·what·other·options·must·be·enabled·to·support·the·option·you·are·interested·in,·you·can·still·view·the·help·of·a·grayed-out·option.\n"
+#~ 
"Although·there·is·no·cross·reference·yet·to·help·you·figure·out·what·other·options·must·be·enabled·to·support·the·option·you·are·interested·in,"
+#~ "·you·can·still·view·the·help·of·a·grayed-out·option.\n"
 #~ "\n"
-#~ 
"Toggling·Show·Debug·Info·under·the·Options·menu·will·show·the·dependencies,·which·you·can·then·match·by·examining·other·options."
+#~ 
"Toggling·Show·Debug·Info·under·the·Options·menu·will·show·the·dependencies,"
+#~ "·which·you·can·then·match·by·examining·other·options."
 
-#~ msgid "Configuration file not found. Please run GNUnet Setup (Client 
Configuration) first."
-#~ msgstr "Fichero de configuración no encontrado. Por favor, ejecuta GNUnet 
Setup (Configuración del cliente) primero."
+#~ msgid ""
+#~ "Configuration file not found. Please run GNUnet Setup (Client "
+#~ "Configuration) first."
+#~ msgstr ""
+#~ "Fichero de configuración no encontrado. Por favor, ejecuta GNUnet Setup "
+#~ "(Configuración del cliente) primero."
 
 #~ msgid "Configuration file `%s' not found.  Run `gnunet-setup -d'!\n"
-#~ msgstr 
"El·fichero·de·configuración·'%s'·no·ha·sido·encontrado.··¡Ejecute·'gnunet-setup
 -d'!\n"
+#~ msgstr ""
+#~ "El·fichero·de·configuración·'%s'·no·ha·sido·encontrado.··¡Ejecute·'gnunet-"
+#~ "setup -d'!\n"
 
 #~ msgid "Cron stopped\n"
 #~ msgstr "Cron detenido\n"
@@ -9598,8 +10873,12 @@
 #~ msgid "Invalid LOGLEVEL `%s' specified.\n"
 #~ msgstr "LOGLEVEL inválido '%s' especificado.\n"
 
-#~ msgid "Cannot determine port of gnunetd server. Define in configuration 
file in section `%s' under `%s'.\n"
-#~ msgstr "Imposible determinar el puerto del servidor de gnunetd. Defínelo en 
el fichero de configuración en la sección '%s' bajo '%s'.\n"
+#~ msgid ""
+#~ "Cannot determine port of gnunetd server. Define in configuration file in "
+#~ "section `%s' under `%s'.\n"
+#~ msgstr ""
+#~ "Imposible determinar el puerto del servidor de gnunetd. Defínelo en el "
+#~ "fichero de configuración en la sección '%s' bajo '%s'.\n"
 
 #~ msgid ""
 #~ "Usage: %s\n"

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2013-04-16 18:01:29 UTC (rev 26908)
+++ gnunet/po/sv.po     2013-04-16 18:32:56 UTC (rev 26909)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-02-05 19:22+0100\n"
+"POT-Creation-Date: 2013-03-06 00:28+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"
@@ -243,38 +243,88 @@
 msgid "Received last message for %s \n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:993
-#: src/ats/gnunet-service-ats_addresses.c:1027
+#: src/ats/gnunet-service-ats_addresses.c:1176
+#: src/ats/gnunet-service-ats_addresses.c:1210
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:999
+#: src/ats/gnunet-service-ats_addresses.c:1182
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1006
+#: src/ats/gnunet-service-ats_addresses.c:1189
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1033
+#: src/ats/gnunet-service-ats_addresses.c:1216
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1040
+#: src/ats/gnunet-service-ats_addresses.c:1223
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
+#: src/ats/gnunet-service-ats_addresses_mlp.c:735
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1044
+#, fuzzy, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1226
+#, c-format
+msgid "Update for ATS type `%s' not implemented!\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1306
+#, c-format
+msgid "Updating address for peer `%s' not added before\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1726
+#, c-format
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1734
+#, c-format
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1744
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1752
+#, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1763
+#, c-format
+msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
+msgstr ""
+
 #: src/ats-tool/gnunet-ats.c:141
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -399,25 +449,25 @@
 msgid "consensus timeout"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/consensus/gnunet-consensus-ibf.c:176
+#: src/consensus/gnunet-consensus-ibf.c:217
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "antal iterationer"
 
-#: src/consensus/gnunet-consensus-ibf.c:179
+#: src/consensus/gnunet-consensus-ibf.c:220
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "antal iterationer"
 
-#: src/consensus/gnunet-consensus-ibf.c:182
+#: src/consensus/gnunet-consensus-ibf.c:223
 msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-ibf.c:185
+#: src/consensus/gnunet-consensus-ibf.c:226
 msgid "hash num"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-ibf.c:188
+#: src/consensus/gnunet-consensus-ibf.c:229
 msgid "ibf size"
 msgstr ""
 
@@ -471,23 +521,23 @@
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-service-core.c:109
+#: src/core/gnunet-service-core.c:110
 #, fuzzy, c-format
-msgid "Failed to read hostkey: %s\n"
-msgstr "Misslyckades att starta samling.\n"
+msgid "Failed to read or generate private key: %s\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/core/gnunet-service-core.c:123
+#: src/core/gnunet-service-core.c:124
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:149
+#: src/core/gnunet-service-core.c:150
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/core/gnunet-service-core.c:163
-#: src/transport/gnunet-service-transport.c:737
+#: src/core/gnunet-service-core.c:164
+#: src/transport/gnunet-service-transport.c:725
 #, fuzzy
 msgid "Transport service is unable to access hostkey. Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -506,166 +556,178 @@
 msgid "# bytes of messages of type %u received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:565
+#: src/core/gnunet-service-core_kx.c:532
 msgid "# bytes encrypted"
 msgstr "# byte krypterade"
 
-#: src/core/gnunet-service-core_kx.c:617
+#: src/core/gnunet-service-core_kx.c:583
 msgid "# bytes decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:681 src/dv/gnunet-service-dv.c:3003
-#, fuzzy
-msgid "Error in communication with PEERINFO service\n"
-msgstr "Skriv ut information om GNUnets motparter."
-
-#: src/core/gnunet-service-core_kx.c:700
-msgid "# Delayed connecting due to lack of public key"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:753
+#: src/core/gnunet-service-core_kx.c:667
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:775
+#: src/core/gnunet-service-core_kx.c:697
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:828
+#: src/core/gnunet-service-core_kx.c:761
+msgid "# old ephemeral keys ignored"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:767
 #, fuzzy
-msgid "# session keys received"
-msgstr "# sessionnycklar vägrade"
+msgid "# ephemeral keys received"
+msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:845
-#, fuzzy, c-format
-msgid "`%s' is for `%s', not for me.  Ignoring.\n"
-msgstr "storlek på \"%s\" meddelande är för litet. Ignorerar.\n"
+#: src/core/gnunet-service-core_kx.c:803
+#, c-format
+msgid ""
+"Ephemeral key message rejected as its validity range does not match our "
+"system time (%llu not in [%llu,%llu]).\n"
+msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:890
+#: src/core/gnunet-service-core_kx.c:818
 #, fuzzy
-msgid "# SET_KEY messages decrypted"
+msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:977
-#: src/transport/gnunet-service-transport_validation.c:865
+#: src/core/gnunet-service-core_kx.c:921
+#: src/transport/gnunet-service-transport_validation.c:915
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1010
+#: src/core/gnunet-service-core_kx.c:929
+#, fuzzy
+msgid "# PING messages dropped (out of order)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/core/gnunet-service-core_kx.c:956
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:973
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:999
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1135
+#: src/core/gnunet-service-core_kx.c:1009
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1236
-#: src/transport/gnunet-service-transport_validation.c:1161
+#: src/core/gnunet-service-core_kx.c:1066
+#: src/transport/gnunet-service-transport_validation.c:1160
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1275
+#: src/core/gnunet-service-core_kx.c:1072
 #, fuzzy
+msgid "# PONG messages dropped (connection down)"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/core/gnunet-service-core_kx.c:1077
+#, fuzzy
+msgid "# PONG messages dropped (out of order)"
+msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
+
+#: src/core/gnunet-service-core_kx.c:1107
+#, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1303
+#: src/core/gnunet-service-core_kx.c:1141
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1329
+#: src/core/gnunet-service-core_kx.c:1151
 #, fuzzy
+msgid "# timeouts prevented via PONG"
+msgstr "# byte mottogs via TCP"
+
+#: src/core/gnunet-service-core_kx.c:1158
+#, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1383
-#: src/core/gnunet-service-core_kx.c:1400
+#: src/core/gnunet-service-core_kx.c:1312
 #, fuzzy
-msgid "# SET_KEY and PING messages created"
-msgstr "# PING-meddelanden skapade"
+msgid "# DATA message dropped (out of order)"
+msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1404
-msgid "# REKEY operations performed"
+#: src/core/gnunet-service-core_kx.c:1319
+#, c-format
+msgid ""
+"Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1539
-msgid "# failed to decrypt message (no session key)"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:1322
+#, fuzzy
+msgid "# sessions terminated by key expiration"
+msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1579
-#: src/core/gnunet-service-core_kx.c:1604
+#: src/core/gnunet-service-core_kx.c:1365
+#: src/core/gnunet-service-core_kx.c:1390
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1591
+#: src/core/gnunet-service-core_kx.c:1377
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1628
-#, fuzzy, c-format
-msgid "Message received far too old (%s). Content ignored.\n"
-msgstr "Meddelande mottaget från klient är ogiltig.\n"
-
-#: src/core/gnunet-service-core_kx.c:1632
+#: src/core/gnunet-service-core_kx.c:1418
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1640
+#: src/core/gnunet-service-core_kx.c:1426
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1703 src/hostlist/hostlist-server.c:552
-#: src/peerinfo-tool/gnunet-peerinfo.c:547
-#: src/transport/gnunet-service-transport.c:644
+#: src/core/gnunet-service-core_kx.c:1459
 #, fuzzy
-msgid "Could not access PEERINFO service.  Exiting.\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+msgid "# PAYLOAD dropped (out of order)"
+msgstr "# byte kastade via UDP (utgående)"
 
 #: src/core/gnunet-service-core_neighbours.c:163
 #, fuzzy
 msgid "# sessions terminated by transport disconnect"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:334
+#: src/core/gnunet-service-core_neighbours.c:179
+#: src/core/gnunet-service-core_neighbours.c:333
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:247
+#: src/core/gnunet-service-core_neighbours.c:246
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:421
+#: src/core/gnunet-service-core_neighbours.c:420
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:206
-#: src/core/gnunet-service-core_sessions.c:269
+#: src/core/gnunet-service-core_sessions.c:210
+#: src/core/gnunet-service-core_sessions.c:280
 #: src/dht/gnunet-service-dht_neighbours.c:645
-#: src/dht/gnunet-service-dht_neighbours.c:703
-#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1544
+#: src/dht/gnunet-service-dht_neighbours.c:704
+#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1530
 #: src/topology/gnunet-daemon-topology.c:704
 #: src/topology/gnunet-daemon-topology.c:805
 #: src/transport/gnunet-service-transport_neighbours.c:1052
@@ -677,11 +739,11 @@
 msgid "# peers connected"
 msgstr "# av anslutna parter"
 
-#: src/core/gnunet-service-core_sessions.c:236
+#: src/core/gnunet-service-core_sessions.c:248
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:406
+#: src/core/gnunet-service-core_sessions.c:417
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -748,7 +810,8 @@
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ecc.c:46
+#: src/namestore/plugin_namestore_sqlite.c:51
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:46
 #: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
 #: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
 #, c-format
@@ -1140,7 +1203,7 @@
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:736
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:1033
+#: src/nse/gnunet-nse-profiler.c:1037
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1310,91 +1373,91 @@
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:737
+#: src/dht/gnunet-service-dht_neighbours.c:738
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:792
+#: src/dht/gnunet-service-dht_neighbours.c:793
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/dht/gnunet-service-dht_neighbours.c:830
+#: src/dht/gnunet-service-dht_neighbours.c:831
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1080
+#: src/dht/gnunet-service-dht_neighbours.c:1053
+#: src/dht/gnunet-service-dht_neighbours.c:1081
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1061
-#: src/dht/gnunet-service-dht_neighbours.c:1095
+#: src/dht/gnunet-service-dht_neighbours.c:1062
+#: src/dht/gnunet-service-dht_neighbours.c:1096
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1229
+#: src/dht/gnunet-service-dht_neighbours.c:1230
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1258
+#: src/dht/gnunet-service-dht_neighbours.c:1259
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1265
-#: src/dht/gnunet-service-dht_neighbours.c:1378
-#: src/dht/gnunet-service-dht_neighbours.c:1478
+#: src/dht/gnunet-service-dht_neighbours.c:1266
+#: src/dht/gnunet-service-dht_neighbours.c:1379
+#: src/dht/gnunet-service-dht_neighbours.c:1479
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1343
+#: src/dht/gnunet-service-dht_neighbours.c:1344
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1370
+#: src/dht/gnunet-service-dht_neighbours.c:1371
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1485
+#: src/dht/gnunet-service-dht_neighbours.c:1486
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1573
+#: src/dht/gnunet-service-dht_neighbours.c:1574
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1702
+#: src/dht/gnunet-service-dht_neighbours.c:1704
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1710
+#: src/dht/gnunet-service-dht_neighbours.c:1712
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1801
+#: src/dht/gnunet-service-dht_neighbours.c:1803
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1843
+#: src/dht/gnunet-service-dht_neighbours.c:1845
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1857
+#: src/dht/gnunet-service-dht_neighbours.c:1859
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1944
+#: src/dht/gnunet-service-dht_neighbours.c:1943
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -1564,6 +1627,11 @@
 msgid "Failed to connect to the dv service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
+#: src/dv/gnunet-service-dv.c:3003
+#, fuzzy
+msgid "Error in communication with PEERINFO service\n"
+msgstr "Skriv ut information om GNUnets motparter."
+
 #: src/dv/plugin_transport_dv.c:159
 #, fuzzy, c-format
 msgid "%s Received message from %s of type %d, distance %u!\n"
@@ -1990,51 +2058,46 @@
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/fs/fs_namespace_advertise.c:150
-#, fuzzy
-msgid "Unknown error"
-msgstr "Okänt fel"
-
-#: src/fs/fs_namespace_advertise.c:238 src/fs/fs_namespace_advertise.c:259
-#, fuzzy
-msgid "Failed to serialize meta data"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/fs/fs_namespace_advertise.c:278
-#, fuzzy
-msgid "Failed to connect to datastore service"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/fs/fs_namespace.c:110
+#: src/fs/fs_namespace.c:104
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_namespace.c:132 src/fs/fs_namespace.c:220
+#: src/fs/fs_namespace.c:126 src/fs/fs_namespace.c:214
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
+#: src/fs/fs_namespace.c:240 src/fs/fs_namespace.c:284
+#: src/fs/fs_namespace.c:330
+msgid "Can't determine where namespace directory is\n"
+msgstr ""
+
 #: src/fs/fs_namespace.c:252
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_namespace.c:367
+#: src/fs/fs_namespace.c:296
+#, fuzzy, c-format
+msgid "Failed to read private key for namespace `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/fs/fs_namespace.c:467
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:558
-msgid "Identifiers or URI too long to create SBlock"
+#: src/fs/fs_namespace.c:659
+msgid "Identifiers or URI too long to create UBlock"
 msgstr ""
 
-#: src/fs/fs_namespace.c:593 src/fs/fs_publish_ksk.c:295
+#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:307
 #, fuzzy
 msgid "Internal error."
 msgstr "Okänt fel.\n"
 
-#: src/fs/fs_namespace.c:636
+#: src/fs/fs_namespace.c:747
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -2105,12 +2168,17 @@
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:258
+#: src/fs/fs_publish_ksk.c:269
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_search.c:892
+#: src/fs/fs_search.c:742
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s': %s\n"
+msgstr "Fil \"%s\" har URI: %s\n"
+
+#: src/fs/fs_search.c:800
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2154,25 +2222,20 @@
 
 #: src/fs/fs_unindex.c:416
 #, fuzzy, c-format
-msgid "Failed to remove KBlock: %s\n"
+msgid "Failed to remove UBlock: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_unindex.c:506
-#, fuzzy, c-format
-msgid "Failed to parse URI `%s' from KBlock!\n"
-msgstr "Fil \"%s\" har URI: %s\n"
-
-#: src/fs/fs_unindex.c:558 src/fs/fs_unindex.c:623
+#: src/fs/fs_unindex.c:566 src/fs/fs_unindex.c:633
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/fs_unindex.c:636
+#: src/fs/fs_unindex.c:646
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:670
+#: src/fs/fs_unindex.c:680
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -2195,58 +2258,66 @@
 msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:373 src/fs/fs_uri.c:380
+#: src/fs/fs_uri.c:375
 msgid "Malformed SKS URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:424 src/fs/fs_uri.c:439
+#: src/fs/fs_uri.c:418 src/fs/fs_uri.c:433
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:569 src/fs/fs_uri.c:584 src/fs/fs_uri.c:594
-#: src/fs/fs_uri.c:622
+#: src/fs/fs_uri.c:563 src/fs/fs_uri.c:578 src/fs/fs_uri.c:588
+#: src/fs/fs_uri.c:616
 msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:604
+#: src/fs/fs_uri.c:598
 msgid "SKS URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:610
+#: src/fs/fs_uri.c:604
 msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:616
+#: src/fs/fs_uri.c:610
 msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:629
+#: src/fs/fs_uri.c:623
 msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:641
+#: src/fs/fs_uri.c:635
 msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:679
+#: src/fs/fs_uri.c:673
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:904
+#: src/fs/fs_uri.c:898
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/fs/fs_uri.c:910
+#: src/fs/fs_uri.c:904
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/fs/fs_uri.c:1115 src/fs/fs_uri.c:1142
+#: src/fs/fs_uri.c:944
+msgid "identifier is NULL!"
+msgstr ""
+
+#: src/fs/fs_uri.c:949
+msgid "identifier has zero length!"
+msgstr ""
+
+#: src/fs/fs_uri.c:1118 src/fs/fs_uri.c:1145
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1148
+#: src/fs/fs_uri.c:1151
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2284,7 +2355,7 @@
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:279
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:302
 #: src/fs/gnunet-publish.c:683
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
@@ -2301,7 +2372,7 @@
 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-auto-share.c:750 src/fs/gnunet-pseudonym.c:327
 #: src/fs/gnunet-publish.c:721
 msgid "set the desired replication LEVEL"
 msgstr ""
@@ -2465,57 +2536,57 @@
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:283
+#: src/fs/gnunet-pseudonym.c:178 src/statistics/gnunet-statistics.c:283
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/fs/gnunet-pseudonym.c:250 src/fs/gnunet-pseudonym.c:257
-#: src/fs/gnunet-pseudonym.c:259
+#: src/fs/gnunet-pseudonym.c:273 src/fs/gnunet-pseudonym.c:280
+#: src/fs/gnunet-pseudonym.c:282
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/fs/gnunet-pseudonym.c:282
+#: src/fs/gnunet-pseudonym.c:305
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:285
+#: src/fs/gnunet-pseudonym.c:308
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:288
+#: src/fs/gnunet-pseudonym.c:311
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:702
+#: src/fs/gnunet-pseudonym.c:315 src/fs/gnunet-publish.c:702
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:295
+#: src/fs/gnunet-pseudonym.c:318
 msgid "print names of local namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:298
+#: src/fs/gnunet-pseudonym.c:321
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:301
+#: src/fs/gnunet-pseudonym.c:324
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:307
+#: src/fs/gnunet-pseudonym.c:330
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-pseudonym.c:310
+#: src/fs/gnunet-pseudonym.c:333
 msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:322
+#: src/fs/gnunet-pseudonym.c:345
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2729,11 +2800,11 @@
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:309 src/fs/gnunet-service-fs.c:523
+#: src/fs/gnunet-service-fs.c:309 src/fs/gnunet-service-fs.c:521
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:628 src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/fs/gnunet-service-fs.c:626 src/hostlist/gnunet-daemon-hostlist.c:297
 #: src/topology/gnunet-daemon-topology.c:1322
 #: src/topology/gnunet-daemon-topology.c:1329
 #, fuzzy, c-format
@@ -2759,7 +2830,7 @@
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1345
+#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P searches active"
 msgstr ""
 
@@ -2797,32 +2868,32 @@
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1170
+#: src/fs/gnunet-service-fs_cp.c:1169
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1204
+#: src/fs/gnunet-service-fs_cp.c:1203
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1227
+#: src/fs/gnunet-service-fs_cp.c:1226
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1288
+#: src/fs/gnunet-service-fs_cp.c:1276
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1314
+#: src/fs/gnunet-service-fs_cp.c:1300
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1343
+#: src/fs/gnunet-service-fs_cp.c:1329
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1713
+#: src/fs/gnunet-service-fs_cp.c:1699
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -2930,112 +3001,112 @@
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:312
+#: src/fs/gnunet-service-fs_pr.c:310
 #, fuzzy
 msgid "# Pending requests created"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pr.c:404 src/fs/gnunet-service-fs_pr.c:667
+#: src/fs/gnunet-service-fs_pr.c:393 src/fs/gnunet-service-fs_pr.c:644
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:835
+#: src/fs/gnunet-service-fs_pr.c:812
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_pr.c:868
+#: src/fs/gnunet-service-fs_pr.c:842
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:877
+#: src/fs/gnunet-service-fs_pr.c:851
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:891
+#: src/fs/gnunet-service-fs_pr.c:865
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:904
+#: src/fs/gnunet-service-fs_pr.c:878
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1025
+#: src/fs/gnunet-service-fs_pr.c:999
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1052
+#: src/fs/gnunet-service-fs_pr.c:1026
 #, fuzzy
 msgid "# storage requests dropped due to high load"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/fs/gnunet-service-fs_pr.c:1087
+#: src/fs/gnunet-service-fs_pr.c:1061
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1221
+#: src/fs/gnunet-service-fs_pr.c:1189
 #, fuzzy
 msgid "# Replies received from STREAM"
 msgstr "# byte mottagna via HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1273
+#: src/fs/gnunet-service-fs_pr.c:1241
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1293
+#: src/fs/gnunet-service-fs_pr.c:1261
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1340
+#: src/fs/gnunet-service-fs_pr.c:1308
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1355
+#: src/fs/gnunet-service-fs_pr.c:1323
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1364
+#: src/fs/gnunet-service-fs_pr.c:1332
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1379
+#: src/fs/gnunet-service-fs_pr.c:1347
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1393
+#: src/fs/gnunet-service-fs_pr.c:1361
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1406
+#: src/fs/gnunet-service-fs_pr.c:1374
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1411
+#: src/fs/gnunet-service-fs_pr.c:1379
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1438 src/fs/gnunet-service-fs_pr.c:1478
-#: src/fs/gnunet-service-fs_pr.c:1619
+#: src/fs/gnunet-service-fs_pr.c:1406 src/fs/gnunet-service-fs_pr.c:1446
+#: src/fs/gnunet-service-fs_pr.c:1587
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1496
+#: src/fs/gnunet-service-fs_pr.c:1464
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1507
+#: src/fs/gnunet-service-fs_pr.c:1475
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1595
+#: src/fs/gnunet-service-fs_pr.c:1563
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1680
+#: src/fs/gnunet-service-fs_pr.c:1648
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -3407,14 +3478,14 @@
 #: src/hostlist/hostlist-client.c:469 src/hostlist/hostlist-client.c:680
 #: src/hostlist/hostlist-client.c:686 src/hostlist/hostlist-client.c:738
 #: src/hostlist/hostlist-client.c:747 src/hostlist/hostlist-client.c:868
-#: src/hostlist/hostlist-client.c:958 src/hostlist/hostlist-client.c:963
+#: src/hostlist/hostlist-client.c:960 src/hostlist/hostlist-client.c:965
 #: src/transport/plugin_transport_http_client.c:1052
 #: src/transport/plugin_transport_http_client.c:1067
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1325
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1327
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -3466,78 +3537,78 @@
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1035 src/hostlist/hostlist-client.c:1498
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1500
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1043
+#: src/hostlist/hostlist-client.c:1045
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1107 src/hostlist/hostlist-client.c:1123
+#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
 #, fuzzy
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: src/hostlist/hostlist-client.c:1273
+#: src/hostlist/hostlist-client.c:1275
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:1277
+#: src/hostlist/hostlist-client.c:1279
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/hostlist/hostlist-client.c:1288
+#: src/hostlist/hostlist-client.c:1290
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/hostlist-client.c:1321
+#: src/hostlist/hostlist-client.c:1323
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1323
+#: src/hostlist/hostlist-client.c:1325
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1368
+#: src/hostlist/hostlist-client.c:1370
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1375
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-client.c:1397 src/hostlist/hostlist-client.c:1414
+#: src/hostlist/hostlist-client.c:1399 src/hostlist/hostlist-client.c:1416
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1409
+#: src/hostlist/hostlist-client.c:1411
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1463
+#: src/hostlist/hostlist-client.c:1465
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1475
+#: src/hostlist/hostlist-client.c:1477
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1487
+#: src/hostlist/hostlist-client.c:1489
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1491
+#: src/hostlist/hostlist-client.c:1493
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
@@ -3609,6 +3680,12 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
+#: src/hostlist/hostlist-server.c:552 src/peerinfo-tool/gnunet-peerinfo.c:547
+#: src/transport/gnunet-service-transport.c:632
+#, fuzzy
+msgid "Could not access PEERINFO service.  Exiting.\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
 #: src/hostlist/hostlist-server.c:562
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
@@ -3669,36 +3746,36 @@
 msgid "Print information about mesh tunnels and peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-service-mesh.c:8015 src/mesh/gnunet-service-mesh-new.c:8015
+#: src/mesh/gnunet-service-mesh.c:8010 src/mesh/gnunet-service-mesh-new.c:8015
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8232 src/mesh/gnunet-service-mesh-new.c:8232
+#: src/mesh/gnunet-service-mesh.c:8227 src/mesh/gnunet-service-mesh-new.c:8232
 #, 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:8314 src/mesh/gnunet-service-mesh.c:8326
-#: src/mesh/gnunet-service-mesh.c:8338 src/mesh/gnunet-service-mesh.c:8352
-#: src/mesh/gnunet-service-mesh.c:8364 src/mesh/gnunet-service-mesh.c:8376
-#: src/mesh/gnunet-service-mesh.c:8388 src/mesh/gnunet-service-mesh-new.c:8321
+#: src/mesh/gnunet-service-mesh.c:8309 src/mesh/gnunet-service-mesh.c:8321
+#: src/mesh/gnunet-service-mesh.c:8333 src/mesh/gnunet-service-mesh.c:8347
+#: src/mesh/gnunet-service-mesh.c:8359 src/mesh/gnunet-service-mesh.c:8371
+#: src/mesh/gnunet-service-mesh.c:8383 src/mesh/gnunet-service-mesh-new.c:8321
 #: src/mesh/gnunet-service-mesh-new.c:8333
 #: src/mesh/gnunet-service-mesh-new.c:8345
 #: src/mesh/gnunet-service-mesh-new.c:8359
 #: src/mesh/gnunet-service-mesh-new.c:8371
 #: src/mesh/gnunet-service-mesh-new.c:8383
-#: src/mesh/gnunet-service-mesh-new.c:8395
-#: src/regex/gnunet-daemon-regexprofiler.c:335
-#: src/regex/gnunet-daemon-regexprofiler.c:347
-#: src/regex/gnunet-daemon-regexprofiler.c:360
-#: src/regex/gnunet-daemon-regexprofiler.c:373
+#: src/mesh/gnunet-service-mesh-new.c:8395 src/nse/gnunet-service-nse.c:1478
+#: src/nse/gnunet-service-nse.c:1496
+#: src/regex/gnunet-daemon-regexprofiler.c:277
+#: src/regex/gnunet-daemon-regexprofiler.c:290
+#: src/regex/gnunet-daemon-regexprofiler.c:303
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:8400 src/mesh/gnunet-service-mesh.c:8410
-#: src/mesh/gnunet-service-mesh.c:8421 src/mesh/gnunet-service-mesh-new.c:8407
+#: src/mesh/gnunet-service-mesh.c:8395 src/mesh/gnunet-service-mesh.c:8405
+#: src/mesh/gnunet-service-mesh.c:8416 src/mesh/gnunet-service-mesh-new.c:8407
 #: src/mesh/gnunet-service-mesh-new.c:8417
 #: src/mesh/gnunet-service-mesh-new.c:8428
 #, fuzzy, c-format
@@ -3796,7 +3873,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:598
+#: src/peerinfo-tool/gnunet-peerinfo.c:599
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
@@ -3927,42 +4004,42 @@
 msgid "Protocol error"
 msgstr ""
 
-#: src/namestore/namestore_common.c:530 src/namestore/namestore_common.c:670
+#: src/namestore/namestore_common.c:532 src/namestore/namestore_common.c:672
 #, fuzzy, c-format
 msgid "Unsupported record type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/namestore_common.c:537
+#: src/namestore/namestore_common.c:539
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/namestore/namestore_common.c:560
+#: src/namestore/namestore_common.c:562
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/namestore_common.c:583
+#: src/namestore/namestore_common.c:585
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/namestore_common.c:601
+#: src/namestore/namestore_common.c:603
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/namestore/namestore_common.c:614
+#: src/namestore/namestore_common.c:616
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/namestore_common.c:635
+#: src/namestore/namestore_common.c:637
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/namestore_common.c:661
+#: src/namestore/namestore_common.c:663
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -4085,44 +4162,44 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1009
+#: src/nse/gnunet-nse-profiler.c:1013
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/nse/gnunet-nse-profiler.c:1012
+#: src/nse/gnunet-nse-profiler.c:1016
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1015
+#: src/nse/gnunet-nse-profiler.c:1019
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1018
+#: src/nse/gnunet-nse-profiler.c:1022
 msgid "IP address of this system as seen by the rest of the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1021
+#: src/nse/gnunet-nse-profiler.c:1025
 msgid "delay between queries to statistics during a round"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1024
+#: src/nse/gnunet-nse-profiler.c:1028
 msgid "prefix of the filenames we use for writing the topology for each round"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1027
+#: src/nse/gnunet-nse-profiler.c:1031
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1030
+#: src/nse/gnunet-nse-profiler.c:1034
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1036
+#: src/nse/gnunet-nse-profiler.c:1040
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1046
+#: src/nse/gnunet-nse-profiler.c:1050
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
@@ -4132,12 +4209,11 @@
 msgid "NSE service could not access hostkey: %s\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/nse/gnunet-service-nse.c:1403 src/nse/gnunet-service-nse.c:1478
-#: src/nse/gnunet-service-nse.c:1495
+#: src/nse/gnunet-service-nse.c:1403
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1485
+#: src/nse/gnunet-service-nse.c:1486
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
@@ -4218,36 +4294,36 @@
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:622
+#: src/peerinfo-tool/gnunet-peerinfo.c:625
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:648
+#: src/peerinfo-tool/gnunet-peerinfo.c:651
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/peerinfo-tool/gnunet-peerinfo.c:654
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654
+#: src/peerinfo-tool/gnunet-peerinfo.c:657
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:657
+#: src/peerinfo-tool/gnunet-peerinfo.c:660
 msgid "list all known peers"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:660
+#: src/peerinfo-tool/gnunet-peerinfo.c:663
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:663
+#: src/peerinfo-tool/gnunet-peerinfo.c:666
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:674
+#: src/peerinfo-tool/gnunet-peerinfo.c:677
 #, fuzzy
 msgid "Print information about peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -4346,154 +4422,145 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:293
-#, fuzzy, c-format
-msgid "Regexprofiler could not access hostkey: %s. Exiting.\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
-
-#: src/regex/gnunet-daemon-regexprofiler.c:452
+#: src/regex/gnunet-daemon-regexprofiler.c:376
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1147
-msgid "An operation has failed while starting peers\n"
+#: src/regex/gnunet-regex-profiler.c:1373
+#, c-format
+msgid "An operation has failed while starting peers: %s\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1193
+#: src/regex/gnunet-regex-profiler.c:1418
 #, fuzzy, c-format
 msgid "Creating a peer failed. Error: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/regex/gnunet-regex-profiler.c:1320
+#: src/regex/gnunet-regex-profiler.c:1545
 msgid "An operation has failed while starting slaves\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1342
+#: src/regex/gnunet-regex-profiler.c:1567
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1397
+#: src/regex/gnunet-regex-profiler.c:1622
 msgid "An operation has failed while linking\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1508
-#: src/testbed/testbed_api_testbed.c:805
+#: src/regex/gnunet-regex-profiler.c:1732
+#: src/testbed/testbed_api_testbed.c:799
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1589
+#: src/regex/gnunet-regex-profiler.c:1813
 msgid "Unable to connect to master controller -- Check config\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1691
-#: src/testbed/testbed_api_testbed.c:970
+#: src/regex/gnunet-regex-profiler.c:1915
+#: src/testbed/testbed_api_testbed.c:964
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1694
-#: src/testbed/testbed_api_testbed.c:974
+#: src/regex/gnunet-regex-profiler.c:1918
+#: src/testbed/testbed_api_testbed.c:968
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1734
+#: src/regex/gnunet-regex-profiler.c:1958
 #, c-format
 msgid "No hosts-file specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1739
+#: src/regex/gnunet-regex-profiler.c:1963
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1745
-#: src/testbed/testbed_api_testbed.c:1065
+#: src/regex/gnunet-regex-profiler.c:1969
+#: src/testbed/testbed_api_testbed.c:1071
 #, c-format
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1748
+#: src/regex/gnunet-regex-profiler.c:1972
 #, c-format
 msgid "Checking whether given hosts can start testbed. Please wait\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1769
+#: src/regex/gnunet-regex-profiler.c:1996
 #, fuzzy, c-format
 msgid "Exiting\n"
 msgstr ""
 "\n"
 "Avslutar.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1775
+#: src/regex/gnunet-regex-profiler.c:2002
 #, fuzzy, c-format
 msgid "No configuration file given. Exiting\n"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/regex/gnunet-regex-profiler.c:1784
+#: src/regex/gnunet-regex-profiler.c:2011
 #, fuzzy, c-format
 msgid "Configuration option (regex_prefix) missing. Exiting\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1802
+#: src/regex/gnunet-regex-profiler.c:2029
 #: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1809
+#: src/regex/gnunet-regex-profiler.c:2036
 #, c-format
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1817
+#: src/regex/gnunet-regex-profiler.c:2044
 #, c-format
 msgid ""
 "Error loading search strings. Given file does not contain enough strings. "
 "Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1823
+#: src/regex/gnunet-regex-profiler.c:2050
 #, fuzzy, c-format
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1850
+#: src/regex/gnunet-regex-profiler.c:2077
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1853
+#: src/regex/gnunet-regex-profiler.c:2080
 msgid "create COUNT number of random links between peers"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1856
+#: src/regex/gnunet-regex-profiler.c:2083
 msgid "wait TIMEOUT before considering a string match as failed"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1859
+#: src/regex/gnunet-regex-profiler.c:2086
 msgid "wait DELAY before starting string search"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1862
+#: src/regex/gnunet-regex-profiler.c:2089
 msgid "number of search strings to read from search strings file"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1865
+#: src/regex/gnunet-regex-profiler.c:2092
 #: src/regex/gnunet-regex-simulation-profiler.c:692
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1868
-msgid ""
-"if this option is set, only one peer is responsible for searching all strings"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1881
+#: src/regex/gnunet-regex-profiler.c:2105
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4607,57 +4674,66 @@
 msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:231
+#: src/testbed/gnunet_testbed_ll_master.c:57
+#, fuzzy, c-format
+msgid "Job command file not given. Exiting\n"
+msgstr "använd konfigurationsfil FILNAMN"
+
+#: src/testbed/gnunet-testbed-profiler.c:235
 #, c-format
 msgid "No hosts-file specified on command line\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:261
+#: src/testbed/gnunet-testbed-profiler.c:267
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:264
+#: src/testbed/gnunet-testbed-profiler.c:270
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:276
+#: src/testbed/gnunet-testbed-profiler.c:286
 msgid "Profiler for testbed"
 msgstr ""
 
-#: src/testbed/ll_master.c:57
+#: src/testbed/testbed_api_hosts.c:469
 #, fuzzy, c-format
-msgid "Job command file not given. Exiting\n"
-msgstr "använd konfigurationsfil FILNAMN"
-
-#: src/testbed/testbed_api.c:499
-#, 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:306
-#, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/testbed/testbed_api_hosts.c:314
+#: src/testbed/testbed_api_hosts.c:477
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:321
+#: src/testbed/testbed_api_hosts.c:484
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:623
+#: src/testbed/testbed_api_hosts.c:593
+#, c-format
+msgid "The function %s is only available when compiled with (--with-ll)\n"
+msgstr ""
+
+#: src/testbed/testbed_api_hosts.c:1836
+#, fuzzy, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/testbed/testbed_api_testbed.c:638
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1009
+#: src/testbed/testbed_api_testbed.c:1003
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1089
+#: src/testbed/testbed_api_testbed.c:1059
+msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1095
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
@@ -4708,28 +4784,28 @@
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/gnunet-testing.c:203
+#: src/testing/gnunet-testing.c:209
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/testing/gnunet-testing.c:205
+#: src/testing/gnunet-testing.c:211
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:207
+#: src/testing/gnunet-testing.c:213
 #, 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:209
+#: src/testing/gnunet-testing.c:215
 #, fuzzy
 msgid "configuration template"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/testing/gnunet-testing.c:218
+#: src/testing/gnunet-testing.c:224
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -4747,59 +4823,59 @@
 msgid "name of the service to run"
 msgstr ""
 
-#: src/testing/testing.c:211
+#: src/testing/testing.c:217
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:227
+#: src/testing/testing.c:233
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:541
+#: src/testing/testing.c:547
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/testing/testing.c:551
+#: src/testing/testing.c:558
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/testing/testing.c:865
+#: src/testing/testing.c:872
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/testing/testing.c:876
+#: src/testing/testing.c:883
 #, 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:890
+#: src/testing/testing.c:897
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/testing/testing.c:923
+#: src/testing/testing.c:931
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/testing/testing.c:941
+#: src/testing/testing.c:949
 #, 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:1014
+#: src/testing/testing.c:1029
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/testing/testing.c:1219
+#: src/testing/testing.c:1235
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -4946,17 +5022,12 @@
 msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
 
-#: src/transport/gnunet-service-transport.c:614
+#: src/transport/gnunet-service-transport.c:613
 #, fuzzy, c-format
 msgid "Transport service could not access hostkey: %s. Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/transport/gnunet-service-transport.c:625
-#, fuzzy
-msgid "Could not access STATISTICS service.  Exiting.\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
-
-#: src/transport/gnunet-service-transport.c:720
+#: src/transport/gnunet-service-transport.c:708
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5104,53 +5175,53 @@
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:425
+#: src/transport/gnunet-service-transport_validation.c:453
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:487
+#: src/transport/gnunet-service-transport_validation.c:515
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:536
+#: src/transport/gnunet-service-transport_validation.c:564
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/transport/gnunet-service-transport_validation.c:618
+#: src/transport/gnunet-service-transport_validation.c:651
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:860
+#: src/transport/gnunet-service-transport_validation.c:910
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_validation.c:925
+#: src/transport/gnunet-service-transport_validation.c:955
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1054
+#: src/transport/gnunet-service-transport_validation.c:1051
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1063
+#: src/transport/gnunet-service-transport_validation.c:1060
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1188
+#: src/transport/gnunet-service-transport_validation.c:1187
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1216
+#: src/transport/gnunet-service-transport_validation.c:1202
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1270
+#: src/transport/gnunet-service-transport_validation.c:1302
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
@@ -5374,25 +5445,25 @@
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1516
+#: src/transport/plugin_transport_http_client.c:1531
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1647
+#: src/transport/plugin_transport_http_client.c:1662
 #: src/transport/plugin_transport_http_server.c:2869
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1672
+#: src/transport/plugin_transport_http_client.c:1687
 #: src/transport/plugin_transport_http_server.c:2928
 #, 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:1700
+#: src/transport/plugin_transport_http_client.c:1715
 #: src/transport/plugin_transport_http_server.c:2775
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
@@ -5653,7 +5724,7 @@
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_unix.c:1357
+#: src/transport/plugin_transport_unix.c:1355
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -5814,23 +5885,23 @@
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1007
+#: src/util/common_logging.c:258 src/util/common_logging.c:1034
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1005
+#: src/util/common_logging.c:260 src/util/common_logging.c:1032
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1003
+#: src/util/common_logging.c:262 src/util/common_logging.c:1030
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1001
+#: src/util/common_logging.c:264 src/util/common_logging.c:1028
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/common_logging.c:266 src/util/common_logging.c:1009
+#: src/util/common_logging.c:266 src/util/common_logging.c:1036
 msgid "NONE"
 msgstr ""
 
@@ -5844,24 +5915,24 @@
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1010
+#: src/util/common_logging.c:1037
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1149
+#: src/util/common_logging.c:1176
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1187
+#: src/util/common_logging.c:1214
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1205
+#: src/util/common_logging.c:1232
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/common_logging.c:1226
+#: src/util/common_logging.c:1253
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -5912,114 +5983,118 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:441
+#: src/util/crypto_ecc.c:447
 #, 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:456 src/util/crypto_rsa.c:660
+#: src/util/crypto_ecc.c:462 src/util/crypto_rsa.c:676
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
 "Deleting it.\n"
 msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
-#: src/util/crypto_ecc.c:552 src/util/crypto_ecc.c:596
-#: src/util/crypto_rsa.c:757 src/util/crypto_rsa.c:801
+#: src/util/crypto_ecc.c:558 src/util/crypto_ecc.c:602
+#: src/util/crypto_rsa.c:750 src/util/crypto_rsa.c:887
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/crypto_ecc.c:557 src/util/crypto_rsa.c:762
+#: src/util/crypto_ecc.c:563 src/util/crypto_rsa.c:892
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
 
-#: src/util/crypto_ecc.c:600 src/util/crypto_rsa.c:805
-#: src/util/crypto_rsa.c:841
+#: src/util/crypto_ecc.c:606 src/util/crypto_rsa.c:754
+#: src/util/crypto_rsa.c:790
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:631 src/util/crypto_rsa.c:836
+#: src/util/crypto_ecc.c:637 src/util/crypto_rsa.c:785
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:636
+#: src/util/crypto_ecc.c:642
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:651 src/util/crypto_rsa.c:856
+#: src/util/crypto_ecc.c:657 src/util/crypto_rsa.c:805
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
-#: src/util/crypto_ecc.c:773 src/util/crypto_rsa.c:941
+#: src/util/crypto_ecc.c:779 src/util/crypto_rsa.c:982
 msgid "interrupted by shutdown"
 msgstr ""
 
-#: src/util/crypto_ecc.c:784
+#: src/util/crypto_ecc.c:790
 #, fuzzy
 msgid "gnunet-ecc failed"
 msgstr "gnunet-update misslyckades!"
 
-#: src/util/crypto_ecc.c:979
+#: src/util/crypto_ecc.c:978
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:1047
+#: src/util/crypto_ecc.c:1046
 #, fuzzy, c-format
 msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_random.c:313
+#: src/util/crypto_ecc.c:1130
+msgid "To be implemented: not secure at the moment, please read README\n"
+msgstr ""
+
+#: src/util/crypto_random.c:281
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:342
+#: src/util/crypto_random.c:312
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 
-#: src/util/crypto_rsa.c:644
+#: src/util/crypto_rsa.c:660
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (too long, %llu bytes).  "
 "Renaming it.\n"
 msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
-#: src/util/crypto_rsa.c:952
+#: src/util/crypto_rsa.c:993
 #, fuzzy
 msgid "gnunet-rsa failed"
 msgstr "gnunet-update misslyckades!"
 
-#: src/util/crypto_rsa.c:1343
+#: src/util/crypto_rsa.c:1378
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/disk.c:601
+#: src/util/disk.c:602
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/disk.c:1205
+#: src/util/disk.c:1206
 #, 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:1559 src/util/service.c:1669
+#: src/util/disk.c:1560 src/util/service.c:1670
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/util/disk.c:1931
+#: src/util/disk.c:1999
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
@@ -6134,56 +6209,59 @@
 msgid "Manipulate GNUnet configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet-ecc.c:107 src/util/gnunet-rsa.c:107
+#: src/util/gnunet-ecc.c:76
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/gnunet-ecc.c:113 src/util/gnunet-rsa.c:113
+#: src/util/gnunet-ecc.c:82
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:128 src/util/gnunet-rsa.c:137
+#: src/util/gnunet-ecc.c:100
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/gnunet-ecc.c:140 src/util/gnunet-rsa.c:149
+#: src/util/gnunet-ecc.c:112
 #, fuzzy, c-format
-msgid "Finished!\n"
+msgid ""
+"\n"
+"Finished!\n"
 msgstr "Slutför"
 
-#: src/util/gnunet-ecc.c:163 src/util/gnunet-rsa.c:172
+#: src/util/gnunet-ecc.c:115
 #, c-format
+msgid ""
+"\n"
+"Error, %u keys not generated\n"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:138 src/util/gnunet-rsa.c:65
+#, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:220 src/util/gnunet-rsa.c:229
+#: src/util/gnunet-ecc.c:193
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:223 src/util/gnunet-rsa.c:232
+#: src/util/gnunet-ecc.c:196 src/util/gnunet-rsa.c:115
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:226 src/util/gnunet-rsa.c:235
+#: src/util/gnunet-ecc.c:199 src/util/gnunet-rsa.c:118
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:229 src/util/gnunet-rsa.c:238
+#: src/util/gnunet-ecc.c:202 src/util/gnunet-rsa.c:121
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:232 src/util/gnunet-rsa.c:241
-msgid ""
-"use insecure, weak random number generator for key generation (for testing "
-"only)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:243
+#: src/util/gnunet-ecc.c:213
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -6196,7 +6274,7 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:252
+#: src/util/gnunet-rsa.c:132
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -6235,17 +6313,17 @@
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:260
+#: src/util/helper.c:271
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/helper.c:305
+#: src/util/helper.c:316
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/helper.c:499
+#: src/util/helper.c:537
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
@@ -6273,16 +6351,6 @@
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/util/os_priority.c:302
-#, fuzzy, c-format
-msgid "Failed to open named pipe `%s' for reading: %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/util/os_priority.c:303
-#, fuzzy, c-format
-msgid "Failed to open named pipe `%s' for writing: %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
 #: src/util/plugin.c:89
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -6303,17 +6371,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "Kunde inte fastställa min publika IPv6-adress.\n"
 
-#: src/util/program.c:254 src/util/service.c:1791
+#: src/util/program.c:254 src/util/service.c:1792
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/pseudonym.c:282
+#: src/util/pseudonym.c:329 src/util/pseudonym.c:632
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/pseudonym.c:413 src/util/pseudonym.c:439
+#: src/util/pseudonym.c:464 src/util/pseudonym.c:490 src/util/pseudonym.c:628
 #, fuzzy
 msgid "no-name"
 msgstr "Visa namn"
@@ -6461,38 +6529,38 @@
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1525
+#: src/util/service.c:1526
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/service.c:1558
+#: src/util/service.c:1559
 #, 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:1607
+#: src/util/service.c:1608
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1611
+#: src/util/service.c:1612
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1615
+#: src/util/service.c:1616
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1670
+#: src/util/service.c:1671
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1683
+#: src/util/service.c:1684
 #, 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:1749
+#: src/util/service.c:1750
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6505,70 +6573,70 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:413
+#: src/util/strings.c:425
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:528
+#: src/util/strings.c:540
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:625
+#: src/util/strings.c:637
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:629
+#: src/util/strings.c:641
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:631
+#: src/util/strings.c:643
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:637
+#: src/util/strings.c:649
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:643
+#: src/util/strings.c:655
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:649
+#: src/util/strings.c:661
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:656
+#: src/util/strings.c:668
 #, fuzzy
 msgid "day"
 msgstr " dagar"
 
-#: src/util/strings.c:658
+#: src/util/strings.c:670
 #, fuzzy
 msgid "days"
 msgstr " dagar"
 
-#: src/util/strings.c:685
+#: src/util/strings.c:697
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1073
+#: src/util/strings.c:1086
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1081
+#: src/util/strings.c:1094
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1087
+#: src/util/strings.c:1100
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1094
+#: src/util/strings.c:1107
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1103
+#: src/util/strings.c:1116
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
@@ -6764,6 +6832,58 @@
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid "Failed to read hostkey: %s\n"
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy
+#~ msgid "# session keys received"
+#~ msgstr "# sessionnycklar vägrade"
+
+#, fuzzy
+#~ msgid "`%s' is for `%s', not for me.  Ignoring.\n"
+#~ msgstr "storlek på \"%s\" meddelande är för litet. Ignorerar.\n"
+
+#, fuzzy
+#~ msgid "# SET_KEY and PING messages created"
+#~ msgstr "# PING-meddelanden skapade"
+
+#, fuzzy
+#~ msgid "Message received far too old (%s). Content ignored.\n"
+#~ msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "Okänt fel"
+
+#, fuzzy
+#~ msgid "Failed to serialize meta data"
+#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to datastore service"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to parse URI `%s' from KBlock!\n"
+#~ msgstr "Fil \"%s\" har URI: %s\n"
+
+#, fuzzy
+#~ msgid "Regexprofiler could not access hostkey: %s. Exiting.\n"
+#~ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#, fuzzy
+#~ msgid "Could not access STATISTICS service.  Exiting.\n"
+#~ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#, fuzzy
+#~ msgid "Failed to open named pipe `%s' for reading: %s\n"
+#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#, fuzzy
+#~ msgid "Failed to open named pipe `%s' for writing: %s\n"
+#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#, fuzzy
 #~ msgid "session identifier"
 #~ msgstr "# sessioner etablerade"
 

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2013-04-16 18:01:29 UTC (rev 26908)
+++ gnunet/po/vi.po     2013-04-16 18:32:56 UTC (rev 26909)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-02-05 19:22+0100\n"
+"POT-Creation-Date: 2013-03-06 00:28+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"
@@ -250,38 +250,88 @@
 msgid "Received last message for %s \n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:993
-#: src/ats/gnunet-service-ats_addresses.c:1027
+#: src/ats/gnunet-service-ats_addresses.c:1176
+#: src/ats/gnunet-service-ats_addresses.c:1210
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:999
+#: src/ats/gnunet-service-ats_addresses.c:1182
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1006
+#: src/ats/gnunet-service-ats_addresses.c:1189
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1033
+#: src/ats/gnunet-service-ats_addresses.c:1216
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1040
+#: src/ats/gnunet-service-ats_addresses.c:1223
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
+#: src/ats/gnunet-service-ats_addresses_mlp.c:735
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1044
+#, fuzzy, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1226
+#, c-format
+msgid "Update for ATS type `%s' not implemented!\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1306
+#, c-format
+msgid "Updating address for peer `%s' not added before\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1726
+#, c-format
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1734
+#, c-format
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1744
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1752
+#, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1763
+#, c-format
+msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
+msgstr ""
+
 #: src/ats-tool/gnunet-ats.c:141
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -406,25 +456,25 @@
 msgid "consensus timeout"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/consensus/gnunet-consensus-ibf.c:176
+#: src/consensus/gnunet-consensus-ibf.c:217
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "số lần lặp lại"
 
-#: src/consensus/gnunet-consensus-ibf.c:179
+#: src/consensus/gnunet-consensus-ibf.c:220
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "số lần lặp lại"
 
-#: src/consensus/gnunet-consensus-ibf.c:182
+#: src/consensus/gnunet-consensus-ibf.c:223
 msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-ibf.c:185
+#: src/consensus/gnunet-consensus-ibf.c:226
 msgid "hash num"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-ibf.c:188
+#: src/consensus/gnunet-consensus-ibf.c:229
 msgid "ibf size"
 msgstr ""
 
@@ -478,23 +528,23 @@
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/core/gnunet-service-core.c:109
+#: src/core/gnunet-service-core.c:110
 #, fuzzy, c-format
-msgid "Failed to read hostkey: %s\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
+msgid "Failed to read or generate private key: %s\n"
+msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/core/gnunet-service-core.c:123
+#: src/core/gnunet-service-core.c:124
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:149
+#: src/core/gnunet-service-core.c:150
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/core/gnunet-service-core.c:163
-#: src/transport/gnunet-service-transport.c:737
+#: src/core/gnunet-service-core.c:164
+#: src/transport/gnunet-service-transport.c:725
 #, fuzzy
 msgid "Transport service is unable to access hostkey. Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
@@ -514,166 +564,178 @@
 msgid "# bytes of messages of type %u received"
 msgstr "# các byte nhiễu được nhận"
 
-#: src/core/gnunet-service-core_kx.c:565
+#: src/core/gnunet-service-core_kx.c:532
 msgid "# bytes encrypted"
 msgstr "# các byte đã mã hoá"
 
-#: src/core/gnunet-service-core_kx.c:617
+#: src/core/gnunet-service-core_kx.c:583
 msgid "# bytes decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:681 src/dv/gnunet-service-dv.c:3003
-#, fuzzy
-msgid "Error in communication with PEERINFO service\n"
-msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
-
-#: src/core/gnunet-service-core_kx.c:700
-msgid "# Delayed connecting due to lack of public key"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:753
+#: src/core/gnunet-service-core_kx.c:667
 msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:775
+#: src/core/gnunet-service-core_kx.c:697
 msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:828
+#: src/core/gnunet-service-core_kx.c:761
+msgid "# old ephemeral keys ignored"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:767
 #, fuzzy
-msgid "# session keys received"
-msgstr "# các khoá phiên chạy bị từ chối"
+msgid "# ephemeral keys received"
+msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_kx.c:845
+#: src/core/gnunet-service-core_kx.c:803
 #, c-format
-msgid "`%s' is for `%s', not for me.  Ignoring.\n"
+msgid ""
+"Ephemeral key message rejected as its validity range does not match our "
+"system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:890
+#: src/core/gnunet-service-core_kx.c:818
 #, fuzzy
-msgid "# SET_KEY messages decrypted"
+msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr "# các thông báo được chắp liền"
 
-#: src/core/gnunet-service-core_kx.c:977
-#: src/transport/gnunet-service-transport_validation.c:865
+#: src/core/gnunet-service-core_kx.c:921
+#: src/transport/gnunet-service-transport_validation.c:915
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1010
+#: src/core/gnunet-service-core_kx.c:929
+#, fuzzy
+msgid "# PING messages dropped (out of order)"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#: src/core/gnunet-service-core_kx.c:956
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:973
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:999
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1135
+#: src/core/gnunet-service-core_kx.c:1009
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# các thông báo PING nhập thô được gửi"
 
-#: src/core/gnunet-service-core_kx.c:1236
-#: src/transport/gnunet-service-transport_validation.c:1161
+#: src/core/gnunet-service-core_kx.c:1066
+#: src/transport/gnunet-service-transport_validation.c:1160
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1275
+#: src/core/gnunet-service-core_kx.c:1072
 #, fuzzy
+msgid "# PONG messages dropped (connection down)"
+msgstr "# các thông báo PONG đã mật mã được nhận"
+
+#: src/core/gnunet-service-core_kx.c:1077
+#, fuzzy
+msgid "# PONG messages dropped (out of order)"
+msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
+
+#: src/core/gnunet-service-core_kx.c:1107
+#, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1303
+#: src/core/gnunet-service-core_kx.c:1141
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1329
+#: src/core/gnunet-service-core_kx.c:1151
 #, fuzzy
+msgid "# timeouts prevented via PONG"
+msgstr "# các byte đã nhận qua TCP"
+
+#: src/core/gnunet-service-core_kx.c:1158
+#, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1383
-#: src/core/gnunet-service-core_kx.c:1400
+#: src/core/gnunet-service-core_kx.c:1312
 #, fuzzy
-msgid "# SET_KEY and PING messages created"
-msgstr "# các thông báo PING được tạo"
+msgid "# DATA message dropped (out of order)"
+msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1404
-msgid "# REKEY operations performed"
+#: src/core/gnunet-service-core_kx.c:1319
+#, c-format
+msgid ""
+"Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1539
-msgid "# failed to decrypt message (no session key)"
-msgstr ""
+#: src/core/gnunet-service-core_kx.c:1322
+#, fuzzy
+msgid "# sessions terminated by key expiration"
+msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1579
-#: src/core/gnunet-service-core_kx.c:1604
+#: src/core/gnunet-service-core_kx.c:1365
+#: src/core/gnunet-service-core_kx.c:1390
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1591
+#: src/core/gnunet-service-core_kx.c:1377
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1628
-#, fuzzy, c-format
-msgid "Message received far too old (%s). Content ignored.\n"
-msgstr "Thông báo nhận được cũ hơn một ngày. Đã loại bỏ.\n"
-
-#: src/core/gnunet-service-core_kx.c:1632
+#: src/core/gnunet-service-core_kx.c:1418
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1640
+#: src/core/gnunet-service-core_kx.c:1426
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1703 src/hostlist/hostlist-server.c:552
-#: src/peerinfo-tool/gnunet-peerinfo.c:547
-#: src/transport/gnunet-service-transport.c:644
+#: src/core/gnunet-service-core_kx.c:1459
 #, fuzzy
-msgid "Could not access PEERINFO service.  Exiting.\n"
-msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+msgid "# PAYLOAD dropped (out of order)"
+msgstr "# các byte loại bỏ bởi UDP (đi ra)"
 
 #: src/core/gnunet-service-core_neighbours.c:163
 #, fuzzy
 msgid "# sessions terminated by transport disconnect"
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:334
+#: src/core/gnunet-service-core_neighbours.c:179
+#: src/core/gnunet-service-core_neighbours.c:333
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:247
+#: src/core/gnunet-service-core_neighbours.c:246
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:421
+#: src/core/gnunet-service-core_neighbours.c:420
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:206
-#: src/core/gnunet-service-core_sessions.c:269
+#: src/core/gnunet-service-core_sessions.c:210
+#: src/core/gnunet-service-core_sessions.c:280
 #: src/dht/gnunet-service-dht_neighbours.c:645
-#: src/dht/gnunet-service-dht_neighbours.c:703
-#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1544
+#: src/dht/gnunet-service-dht_neighbours.c:704
+#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1530
 #: src/topology/gnunet-daemon-topology.c:704
 #: src/topology/gnunet-daemon-topology.c:805
 #: src/transport/gnunet-service-transport_neighbours.c:1052
@@ -685,12 +747,12 @@
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/core/gnunet-service-core_sessions.c:236
+#: src/core/gnunet-service-core_sessions.c:248
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# tổng số yêu cầu lỗ hổng được gửi"
 
-#: src/core/gnunet-service-core_sessions.c:406
+#: src/core/gnunet-service-core_sessions.c:417
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -758,7 +820,8 @@
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ecc.c:46
+#: src/namestore/plugin_namestore_sqlite.c:51
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:46
 #: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
 #: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
 #, c-format
@@ -1166,7 +1229,7 @@
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:736
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:1033
+#: src/nse/gnunet-nse-profiler.c:1037
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1334,94 +1397,94 @@
 msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:737
+#: src/dht/gnunet-service-dht_neighbours.c:738
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/dht/gnunet-service-dht_neighbours.c:792
+#: src/dht/gnunet-service-dht_neighbours.c:793
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/dht/gnunet-service-dht_neighbours.c:830
+#: src/dht/gnunet-service-dht_neighbours.c:831
 #, fuzzy
 msgid "# Bytes of bandwidth requested from core"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1080
+#: src/dht/gnunet-service-dht_neighbours.c:1053
+#: src/dht/gnunet-service-dht_neighbours.c:1081
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1061
-#: src/dht/gnunet-service-dht_neighbours.c:1095
+#: src/dht/gnunet-service-dht_neighbours.c:1062
+#: src/dht/gnunet-service-dht_neighbours.c:1096
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr "# các cuộc gọi HTTP select (lựa chọn)"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1229
+#: src/dht/gnunet-service-dht_neighbours.c:1230
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1258
+#: src/dht/gnunet-service-dht_neighbours.c:1259
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1265
-#: src/dht/gnunet-service-dht_neighbours.c:1378
-#: src/dht/gnunet-service-dht_neighbours.c:1478
+#: src/dht/gnunet-service-dht_neighbours.c:1266
+#: src/dht/gnunet-service-dht_neighbours.c:1379
+#: src/dht/gnunet-service-dht_neighbours.c:1479
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1343
+#: src/dht/gnunet-service-dht_neighbours.c:1344
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1370
+#: src/dht/gnunet-service-dht_neighbours.c:1371
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1485
+#: src/dht/gnunet-service-dht_neighbours.c:1486
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1573
+#: src/dht/gnunet-service-dht_neighbours.c:1574
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1702
+#: src/dht/gnunet-service-dht_neighbours.c:1704
 #, fuzzy
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1710
+#: src/dht/gnunet-service-dht_neighbours.c:1712
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1801
+#: src/dht/gnunet-service-dht_neighbours.c:1803
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1843
+#: src/dht/gnunet-service-dht_neighbours.c:1845
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1857
+#: src/dht/gnunet-service-dht_neighbours.c:1859
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1944
+#: src/dht/gnunet-service-dht_neighbours.c:1943
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -1591,6 +1654,11 @@
 msgid "Failed to connect to the dv service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
+#: src/dv/gnunet-service-dv.c:3003
+#, fuzzy
+msgid "Error in communication with PEERINFO service\n"
+msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
+
 #: src/dv/plugin_transport_dv.c:159
 #, fuzzy, c-format
 msgid "%s Received message from %s of type %d, distance %u!\n"
@@ -2021,51 +2089,46 @@
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/fs_namespace_advertise.c:150
-#, fuzzy
-msgid "Unknown error"
-msgstr "Lỗi không rõ.\n"
-
-#: src/fs/fs_namespace_advertise.c:238 src/fs/fs_namespace_advertise.c:259
-#, fuzzy
-msgid "Failed to serialize meta data"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/fs/fs_namespace_advertise.c:278
-#, fuzzy
-msgid "Failed to connect to datastore service"
-msgstr "Không kết nối được đến trình nền gnunetd."
-
-#: src/fs/fs_namespace.c:110
+#: src/fs/fs_namespace.c:104
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_namespace.c:132 src/fs/fs_namespace.c:220
+#: src/fs/fs_namespace.c:126 src/fs/fs_namespace.c:214
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
+#: src/fs/fs_namespace.c:240 src/fs/fs_namespace.c:284
+#: src/fs/fs_namespace.c:330
+msgid "Can't determine where namespace directory is\n"
+msgstr ""
+
 #: src/fs/fs_namespace.c:252
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/fs_namespace.c:367
+#: src/fs/fs_namespace.c:296
 #, fuzzy, c-format
+msgid "Failed to read private key for namespace `%s'\n"
+msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
+
+#: src/fs/fs_namespace.c:467
+#, fuzzy, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr "Lỗi thêm mục nhập vào không gian tên « %s » (có chưa ?)\n"
 
-#: src/fs/fs_namespace.c:558
-msgid "Identifiers or URI too long to create SBlock"
+#: src/fs/fs_namespace.c:659
+msgid "Identifiers or URI too long to create UBlock"
 msgstr ""
 
-#: src/fs/fs_namespace.c:593 src/fs/fs_publish_ksk.c:295
+#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:307
 #, fuzzy
 msgid "Internal error."
 msgstr "Lỗi VR."
 
-#: src/fs/fs_namespace.c:636
+#: src/fs/fs_namespace.c:747
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -2132,12 +2195,17 @@
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:258
+#: src/fs/fs_publish_ksk.c:269
 #, fuzzy
 msgid "Could not connect to datastore."
 msgstr "« %s »: Không thể kết nối.\n"
 
-#: src/fs/fs_search.c:892
+#: src/fs/fs_search.c:742
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s': %s\n"
+msgstr "Tập tin « %s » có URI: %s\n"
+
+#: src/fs/fs_search.c:800
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2181,25 +2249,20 @@
 
 #: src/fs/fs_unindex.c:416
 #, fuzzy, c-format
-msgid "Failed to remove KBlock: %s\n"
+msgid "Failed to remove UBlock: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_unindex.c:506
-#, fuzzy, c-format
-msgid "Failed to parse URI `%s' from KBlock!\n"
-msgstr "Tập tin « %s » có URI: %s\n"
-
-#: src/fs/fs_unindex.c:558 src/fs/fs_unindex.c:623
+#: src/fs/fs_unindex.c:566 src/fs/fs_unindex.c:633
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/fs_unindex.c:636
+#: src/fs/fs_unindex.c:646
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_unindex.c:670
+#: src/fs/fs_unindex.c:680
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -2221,58 +2284,66 @@
 msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:373 src/fs/fs_uri.c:380
+#: src/fs/fs_uri.c:375
 msgid "Malformed SKS URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:424 src/fs/fs_uri.c:439
+#: src/fs/fs_uri.c:418 src/fs/fs_uri.c:433
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:569 src/fs/fs_uri.c:584 src/fs/fs_uri.c:594
-#: src/fs/fs_uri.c:622
+#: src/fs/fs_uri.c:563 src/fs/fs_uri.c:578 src/fs/fs_uri.c:588
+#: src/fs/fs_uri.c:616
 msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:604
+#: src/fs/fs_uri.c:598
 msgid "SKS URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:610
+#: src/fs/fs_uri.c:604
 msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:616
+#: src/fs/fs_uri.c:610
 msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:629
+#: src/fs/fs_uri.c:623
 msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:641
+#: src/fs/fs_uri.c:635
 msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:679
+#: src/fs/fs_uri.c:673
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:904
+#: src/fs/fs_uri.c:898
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/fs/fs_uri.c:910
+#: src/fs/fs_uri.c:904
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/fs/fs_uri.c:1115 src/fs/fs_uri.c:1142
+#: src/fs/fs_uri.c:944
+msgid "identifier is NULL!"
+msgstr ""
+
+#: src/fs/fs_uri.c:949
+msgid "identifier has zero length!"
+msgstr ""
+
+#: src/fs/fs_uri.c:1118 src/fs/fs_uri.c:1145
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1148
+#: src/fs/fs_uri.c:1151
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
@@ -2308,7 +2379,7 @@
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:279
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:302
 #: 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"
@@ -2325,7 +2396,7 @@
 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-auto-share.c:750 src/fs/gnunet-pseudonym.c:327
 #: src/fs/gnunet-publish.c:721
 msgid "set the desired replication LEVEL"
 msgstr ""
@@ -2493,26 +2564,26 @@
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:283
+#: src/fs/gnunet-pseudonym.c:178 src/statistics/gnunet-statistics.c:283
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/fs/gnunet-pseudonym.c:250 src/fs/gnunet-pseudonym.c:257
-#: src/fs/gnunet-pseudonym.c:259
+#: src/fs/gnunet-pseudonym.c:273 src/fs/gnunet-pseudonym.c:280
+#: src/fs/gnunet-pseudonym.c:282
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
 
-#: src/fs/gnunet-pseudonym.c:282
+#: src/fs/gnunet-pseudonym.c:305
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:285
+#: src/fs/gnunet-pseudonym.c:308
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:288
+#: src/fs/gnunet-pseudonym.c:311
 #, fuzzy
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
@@ -2521,34 +2592,34 @@
 "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:702
+#: src/fs/gnunet-pseudonym.c:315 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"
 
-#: src/fs/gnunet-pseudonym.c:295
+#: src/fs/gnunet-pseudonym.c:318
 #, fuzzy
 msgid "print names of local namespaces"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: src/fs/gnunet-pseudonym.c:298
+#: src/fs/gnunet-pseudonym.c:321
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:301
+#: src/fs/gnunet-pseudonym.c:324
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:307
+#: src/fs/gnunet-pseudonym.c:330
 #, fuzzy
 msgid "specify ID of the root of the namespace"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: src/fs/gnunet-pseudonym.c:310
+#: src/fs/gnunet-pseudonym.c:333
 #, fuzzy
 msgid "change rating of namespace ID by VALUE"
 msgstr "đặt đánh giá của một không gian tên"
 
-#: src/fs/gnunet-pseudonym.c:322
+#: src/fs/gnunet-pseudonym.c:345
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2776,12 +2847,12 @@
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:309 src/fs/gnunet-service-fs.c:523
+#: src/fs/gnunet-service-fs.c:309 src/fs/gnunet-service-fs.c:521
 #, fuzzy
 msgid "# Loopback routes suppressed"
 msgstr "# tổng số định tuyến lỗ hổng thành công"
 
-#: src/fs/gnunet-service-fs.c:628 src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/fs/gnunet-service-fs.c:626 src/hostlist/gnunet-daemon-hostlist.c:297
 #: src/topology/gnunet-daemon-topology.c:1322
 #: src/topology/gnunet-daemon-topology.c:1329
 #, fuzzy, c-format
@@ -2808,7 +2879,7 @@
 msgid "# replies dropped"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1345
+#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P searches active"
 msgstr ""
 
@@ -2848,36 +2919,36 @@
 msgid "# requests done for a price (normal load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1170
+#: src/fs/gnunet-service-fs_cp.c:1169
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1204
+#: src/fs/gnunet-service-fs_cp.c:1203
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1227
+#: src/fs/gnunet-service-fs_cp.c:1226
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1288
+#: src/fs/gnunet-service-fs_cp.c:1276
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1314
+#: src/fs/gnunet-service-fs_cp.c:1300
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1343
+#: src/fs/gnunet-service-fs_cp.c:1329
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:1713
+#: src/fs/gnunet-service-fs_cp.c:1699
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
@@ -2986,114 +3057,114 @@
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:312
+#: src/fs/gnunet-service-fs_pr.c:310
 #, 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:404 src/fs/gnunet-service-fs_pr.c:667
+#: src/fs/gnunet-service-fs_pr.c:393 src/fs/gnunet-service-fs_pr.c:644
 #, 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:835
+#: src/fs/gnunet-service-fs_pr.c:812
 #, fuzzy
 msgid "# replies received and matched"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:868
+#: src/fs/gnunet-service-fs_pr.c:842
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:877
+#: src/fs/gnunet-service-fs_pr.c:851
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:891
+#: src/fs/gnunet-service-fs_pr.c:865
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:904
+#: src/fs/gnunet-service-fs_pr.c:878
 #, 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:1025
+#: src/fs/gnunet-service-fs_pr.c:999
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1052
+#: src/fs/gnunet-service-fs_pr.c:1026
 #, 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:1087
+#: src/fs/gnunet-service-fs_pr.c:1061
 #, fuzzy
 msgid "# Replies received from DHT"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1221
+#: src/fs/gnunet-service-fs_pr.c:1189
 #, fuzzy
 msgid "# Replies received from STREAM"
 msgstr "# các byte đã nhận qua HTTP"
 
-#: src/fs/gnunet-service-fs_pr.c:1273
+#: src/fs/gnunet-service-fs_pr.c:1241
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1293
+#: src/fs/gnunet-service-fs_pr.c:1261
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1340
+#: src/fs/gnunet-service-fs_pr.c:1308
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1355
+#: src/fs/gnunet-service-fs_pr.c:1323
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1364
+#: src/fs/gnunet-service-fs_pr.c:1332
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1379
+#: src/fs/gnunet-service-fs_pr.c:1347
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1393
+#: src/fs/gnunet-service-fs_pr.c:1361
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1406
+#: src/fs/gnunet-service-fs_pr.c:1374
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1411
+#: src/fs/gnunet-service-fs_pr.c:1379
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1438 src/fs/gnunet-service-fs_pr.c:1478
-#: src/fs/gnunet-service-fs_pr.c:1619
+#: src/fs/gnunet-service-fs_pr.c:1406 src/fs/gnunet-service-fs_pr.c:1446
+#: src/fs/gnunet-service-fs_pr.c:1587
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1496
+#: src/fs/gnunet-service-fs_pr.c:1464
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1507
+#: src/fs/gnunet-service-fs_pr.c:1475
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1595
+#: src/fs/gnunet-service-fs_pr.c:1563
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1680
+#: src/fs/gnunet-service-fs_pr.c:1648
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -3473,14 +3544,14 @@
 #: src/hostlist/hostlist-client.c:469 src/hostlist/hostlist-client.c:680
 #: src/hostlist/hostlist-client.c:686 src/hostlist/hostlist-client.c:738
 #: src/hostlist/hostlist-client.c:747 src/hostlist/hostlist-client.c:868
-#: src/hostlist/hostlist-client.c:958 src/hostlist/hostlist-client.c:963
+#: src/hostlist/hostlist-client.c:960 src/hostlist/hostlist-client.c:965
 #: src/transport/plugin_transport_http_client.c:1052
 #: src/transport/plugin_transport_http_client.c:1067
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1325
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1327
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -3530,80 +3601,80 @@
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1035 src/hostlist/hostlist-client.c:1498
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1500
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1043
+#: src/hostlist/hostlist-client.c:1045
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1107 src/hostlist/hostlist-client.c:1123
+#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
 #, fuzzy
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: src/hostlist/hostlist-client.c:1273
+#: src/hostlist/hostlist-client.c:1275
 #, fuzzy, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-client.c:1277
+#: src/hostlist/hostlist-client.c:1279
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/hostlist/hostlist-client.c:1288
+#: src/hostlist/hostlist-client.c:1290
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/hostlist-client.c:1321
+#: src/hostlist/hostlist-client.c:1323
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1323
+#: src/hostlist/hostlist-client.c:1325
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/hostlist-client.c:1368
+#: src/hostlist/hostlist-client.c:1370
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1375
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-client.c:1397 src/hostlist/hostlist-client.c:1414
+#: src/hostlist/hostlist-client.c:1399 src/hostlist/hostlist-client.c:1416
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1409
+#: src/hostlist/hostlist-client.c:1411
 #, fuzzy
 msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/hostlist-client.c:1463
+#: src/hostlist/hostlist-client.c:1465
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1475
+#: src/hostlist/hostlist-client.c:1477
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1487
+#: src/hostlist/hostlist-client.c:1489
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1491
+#: src/hostlist/hostlist-client.c:1493
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
@@ -3681,6 +3752,12 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
+#: src/hostlist/hostlist-server.c:552 src/peerinfo-tool/gnunet-peerinfo.c:547
+#: src/transport/gnunet-service-transport.c:632
+#, fuzzy
+msgid "Could not access PEERINFO service.  Exiting.\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
 #: src/hostlist/hostlist-server.c:562
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
@@ -3740,36 +3817,36 @@
 msgid "Print information about mesh tunnels and peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/mesh/gnunet-service-mesh.c:8015 src/mesh/gnunet-service-mesh-new.c:8015
+#: src/mesh/gnunet-service-mesh.c:8010 src/mesh/gnunet-service-mesh-new.c:8015
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8232 src/mesh/gnunet-service-mesh-new.c:8232
+#: src/mesh/gnunet-service-mesh.c:8227 src/mesh/gnunet-service-mesh-new.c:8232
 #, 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:8314 src/mesh/gnunet-service-mesh.c:8326
-#: src/mesh/gnunet-service-mesh.c:8338 src/mesh/gnunet-service-mesh.c:8352
-#: src/mesh/gnunet-service-mesh.c:8364 src/mesh/gnunet-service-mesh.c:8376
-#: src/mesh/gnunet-service-mesh.c:8388 src/mesh/gnunet-service-mesh-new.c:8321
+#: src/mesh/gnunet-service-mesh.c:8309 src/mesh/gnunet-service-mesh.c:8321
+#: src/mesh/gnunet-service-mesh.c:8333 src/mesh/gnunet-service-mesh.c:8347
+#: src/mesh/gnunet-service-mesh.c:8359 src/mesh/gnunet-service-mesh.c:8371
+#: src/mesh/gnunet-service-mesh.c:8383 src/mesh/gnunet-service-mesh-new.c:8321
 #: src/mesh/gnunet-service-mesh-new.c:8333
 #: src/mesh/gnunet-service-mesh-new.c:8345
 #: src/mesh/gnunet-service-mesh-new.c:8359
 #: src/mesh/gnunet-service-mesh-new.c:8371
 #: src/mesh/gnunet-service-mesh-new.c:8383
-#: src/mesh/gnunet-service-mesh-new.c:8395
-#: src/regex/gnunet-daemon-regexprofiler.c:335
-#: src/regex/gnunet-daemon-regexprofiler.c:347
-#: src/regex/gnunet-daemon-regexprofiler.c:360
-#: src/regex/gnunet-daemon-regexprofiler.c:373
+#: src/mesh/gnunet-service-mesh-new.c:8395 src/nse/gnunet-service-nse.c:1478
+#: src/nse/gnunet-service-nse.c:1496
+#: src/regex/gnunet-daemon-regexprofiler.c:277
+#: src/regex/gnunet-daemon-regexprofiler.c:290
+#: src/regex/gnunet-daemon-regexprofiler.c:303
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/mesh/gnunet-service-mesh.c:8400 src/mesh/gnunet-service-mesh.c:8410
-#: src/mesh/gnunet-service-mesh.c:8421 src/mesh/gnunet-service-mesh-new.c:8407
+#: src/mesh/gnunet-service-mesh.c:8395 src/mesh/gnunet-service-mesh.c:8405
+#: src/mesh/gnunet-service-mesh.c:8416 src/mesh/gnunet-service-mesh-new.c:8407
 #: src/mesh/gnunet-service-mesh-new.c:8417
 #: src/mesh/gnunet-service-mesh-new.c:8428
 #, fuzzy, c-format
@@ -3863,7 +3940,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:598
+#: src/peerinfo-tool/gnunet-peerinfo.c:599
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
@@ -3999,42 +4076,42 @@
 msgid "Protocol error"
 msgstr ""
 
-#: src/namestore/namestore_common.c:530 src/namestore/namestore_common.c:670
+#: src/namestore/namestore_common.c:532 src/namestore/namestore_common.c:672
 #, fuzzy, c-format
 msgid "Unsupported record type %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/namestore/namestore_common.c:537
+#: src/namestore/namestore_common.c:539
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/namestore/namestore_common.c:560
+#: src/namestore/namestore_common.c:562
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/namestore/namestore_common.c:583
+#: src/namestore/namestore_common.c:585
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/namestore/namestore_common.c:601
+#: src/namestore/namestore_common.c:603
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/namestore/namestore_common.c:614
+#: src/namestore/namestore_common.c:616
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/namestore/namestore_common.c:635
+#: src/namestore/namestore_common.c:637
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/namestore/namestore_common.c:661
+#: src/namestore/namestore_common.c:663
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
@@ -4156,44 +4233,44 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1009
+#: src/nse/gnunet-nse-profiler.c:1013
 #, fuzzy
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/nse/gnunet-nse-profiler.c:1012
+#: src/nse/gnunet-nse-profiler.c:1016
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1015
+#: src/nse/gnunet-nse-profiler.c:1019
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1018
+#: src/nse/gnunet-nse-profiler.c:1022
 msgid "IP address of this system as seen by the rest of the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1021
+#: src/nse/gnunet-nse-profiler.c:1025
 msgid "delay between queries to statistics during a round"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1024
+#: src/nse/gnunet-nse-profiler.c:1028
 msgid "prefix of the filenames we use for writing the topology for each round"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1027
+#: src/nse/gnunet-nse-profiler.c:1031
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1030
+#: src/nse/gnunet-nse-profiler.c:1034
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1036
+#: src/nse/gnunet-nse-profiler.c:1040
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1046
+#: src/nse/gnunet-nse-profiler.c:1050
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Không thể truy cập đến dịch vụ"
@@ -4203,12 +4280,11 @@
 msgid "NSE service could not access hostkey: %s\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/nse/gnunet-service-nse.c:1403 src/nse/gnunet-service-nse.c:1478
-#: src/nse/gnunet-service-nse.c:1495
+#: src/nse/gnunet-service-nse.c:1403
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1485
+#: src/nse/gnunet-service-nse.c:1486
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
@@ -4294,37 +4370,37 @@
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:622
+#: src/peerinfo-tool/gnunet-peerinfo.c:625
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:648
+#: src/peerinfo-tool/gnunet-peerinfo.c:651
 msgid "don't resolve host names"
 msgstr "không quyết định các tên máy"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/peerinfo-tool/gnunet-peerinfo.c:654
 msgid "output only the identity strings"
 msgstr "chỉ xuất những chuỗi nhận diện"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654
+#: src/peerinfo-tool/gnunet-peerinfo.c:657
 msgid "output our own identity only"
 msgstr "chỉ xuất nhận diện mình"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:657
+#: src/peerinfo-tool/gnunet-peerinfo.c:660
 #, fuzzy
 msgid "list all known peers"
 msgstr "liệt kê mọi bộ tiếp hợp mạng"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:660
+#: src/peerinfo-tool/gnunet-peerinfo.c:663
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:663
+#: src/peerinfo-tool/gnunet-peerinfo.c:666
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:674
+#: src/peerinfo-tool/gnunet-peerinfo.c:677
 #, fuzzy
 msgid "Print information about peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -4423,150 +4499,141 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:293
-#, fuzzy, c-format
-msgid "Regexprofiler 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/regex/gnunet-daemon-regexprofiler.c:452
+#: src/regex/gnunet-daemon-regexprofiler.c:376
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1147
-msgid "An operation has failed while starting peers\n"
+#: src/regex/gnunet-regex-profiler.c:1373
+#, c-format
+msgid "An operation has failed while starting peers: %s\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1193
+#: src/regex/gnunet-regex-profiler.c:1418
 #, fuzzy, c-format
 msgid "Creating a peer failed. Error: %s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/regex/gnunet-regex-profiler.c:1320
+#: src/regex/gnunet-regex-profiler.c:1545
 msgid "An operation has failed while starting slaves\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1342
+#: src/regex/gnunet-regex-profiler.c:1567
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/regex/gnunet-regex-profiler.c:1397
+#: src/regex/gnunet-regex-profiler.c:1622
 msgid "An operation has failed while linking\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1508
-#: src/testbed/testbed_api_testbed.c:805
+#: src/regex/gnunet-regex-profiler.c:1732
+#: src/testbed/testbed_api_testbed.c:799
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1589
+#: src/regex/gnunet-regex-profiler.c:1813
 msgid "Unable to connect to master controller -- Check config\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1691
-#: src/testbed/testbed_api_testbed.c:970
+#: src/regex/gnunet-regex-profiler.c:1915
+#: src/testbed/testbed_api_testbed.c:964
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1694
-#: src/testbed/testbed_api_testbed.c:974
+#: src/regex/gnunet-regex-profiler.c:1918
+#: src/testbed/testbed_api_testbed.c:968
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1734
+#: src/regex/gnunet-regex-profiler.c:1958
 #, c-format
 msgid "No hosts-file specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1739
+#: src/regex/gnunet-regex-profiler.c:1963
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1745
-#: src/testbed/testbed_api_testbed.c:1065
+#: src/regex/gnunet-regex-profiler.c:1969
+#: src/testbed/testbed_api_testbed.c:1071
 #, c-format
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1748
+#: src/regex/gnunet-regex-profiler.c:1972
 #, c-format
 msgid "Checking whether given hosts can start testbed. Please wait\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1769
+#: src/regex/gnunet-regex-profiler.c:1996
 #, fuzzy, c-format
 msgid "Exiting\n"
 msgstr "Thoát"
 
-#: src/regex/gnunet-regex-profiler.c:1775
+#: src/regex/gnunet-regex-profiler.c:2002
 #, fuzzy, c-format
 msgid "No configuration file given. Exiting\n"
 msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
 
-#: src/regex/gnunet-regex-profiler.c:1784
+#: src/regex/gnunet-regex-profiler.c:2011
 #, fuzzy, c-format
 msgid "Configuration option (regex_prefix) missing. Exiting\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/regex/gnunet-regex-profiler.c:1802
+#: src/regex/gnunet-regex-profiler.c:2029
 #: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1809
+#: src/regex/gnunet-regex-profiler.c:2036
 #, c-format
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1817
+#: src/regex/gnunet-regex-profiler.c:2044
 #, c-format
 msgid ""
 "Error loading search strings. Given file does not contain enough strings. "
 "Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1823
+#: src/regex/gnunet-regex-profiler.c:2050
 #, fuzzy, c-format
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/regex/gnunet-regex-profiler.c:1850
+#: src/regex/gnunet-regex-profiler.c:2077
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1853
+#: src/regex/gnunet-regex-profiler.c:2080
 msgid "create COUNT number of random links between peers"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1856
+#: src/regex/gnunet-regex-profiler.c:2083
 msgid "wait TIMEOUT before considering a string match as failed"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1859
+#: src/regex/gnunet-regex-profiler.c:2086
 msgid "wait DELAY before starting string search"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1862
+#: src/regex/gnunet-regex-profiler.c:2089
 msgid "number of search strings to read from search strings file"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1865
+#: src/regex/gnunet-regex-profiler.c:2092
 #: src/regex/gnunet-regex-simulation-profiler.c:692
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1868
-msgid ""
-"if this option is set, only one peer is responsible for searching all strings"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1881
+#: src/regex/gnunet-regex-profiler.c:2105
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4679,57 +4746,66 @@
 msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:231
+#: src/testbed/gnunet_testbed_ll_master.c:57
+#, fuzzy, c-format
+msgid "Job command file not given. Exiting\n"
+msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
+
+#: src/testbed/gnunet-testbed-profiler.c:235
 #, c-format
 msgid "No hosts-file specified on command line\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:261
+#: src/testbed/gnunet-testbed-profiler.c:267
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:264
+#: src/testbed/gnunet-testbed-profiler.c:270
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:276
+#: src/testbed/gnunet-testbed-profiler.c:286
 msgid "Profiler for testbed"
 msgstr ""
 
-#: src/testbed/ll_master.c:57
+#: src/testbed/testbed_api_hosts.c:469
 #, 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:499
-#, 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:306
-#, 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:314
+#: src/testbed/testbed_api_hosts.c:477
 #, 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:321
+#: src/testbed/testbed_api_hosts.c:484
 #, 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:623
+#: src/testbed/testbed_api_hosts.c:593
+#, c-format
+msgid "The function %s is only available when compiled with (--with-ll)\n"
+msgstr ""
+
+#: src/testbed/testbed_api_hosts.c:1836
+#, fuzzy, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr "« %s » thất bại với mã lỗi %d: %s\n"
+
+#: src/testbed/testbed_api_testbed.c:638
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1009
+#: src/testbed/testbed_api_testbed.c:1003
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1089
+#: src/testbed/testbed_api_testbed.c:1059
+msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1095
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
@@ -4780,28 +4856,28 @@
 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:203
+#: src/testing/gnunet-testing.c:209
 #, 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:205
+#: src/testing/gnunet-testing.c:211
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:207
+#: src/testing/gnunet-testing.c:213
 #, 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:209
+#: src/testing/gnunet-testing.c:215
 #, fuzzy
 msgid "configuration template"
 msgstr "Cấu hình đã được lưu."
 
-#: src/testing/gnunet-testing.c:218
+#: src/testing/gnunet-testing.c:224
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -4819,59 +4895,59 @@
 msgid "name of the service to run"
 msgstr ""
 
-#: src/testing/testing.c:211
+#: src/testing/testing.c:217
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:227
+#: src/testing/testing.c:233
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:541
+#: src/testing/testing.c:547
 #, 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:551
+#: src/testing/testing.c:558
 #, 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:865
+#: src/testing/testing.c:872
 #, 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:876
+#: src/testing/testing.c:883
 #, 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:890
+#: src/testing/testing.c:897
 #, 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:923
+#: src/testing/testing.c:931
 #, 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:941
+#: src/testing/testing.c:949
 #, 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:1014
+#: src/testing/testing.c:1029
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/testing/testing.c:1219
+#: src/testing/testing.c:1235
 #, 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 »:"
@@ -5026,17 +5102,12 @@
 msgid "# bytes payload received"
 msgstr "# các byte đã giải mã"
 
-#: src/transport/gnunet-service-transport.c:614
+#: src/transport/gnunet-service-transport.c:613
 #, fuzzy, c-format
 msgid "Transport service could not access hostkey: %s. Exiting.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/transport/gnunet-service-transport.c:625
-#, fuzzy
-msgid "Could not access STATISTICS service.  Exiting.\n"
-msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
-
-#: src/transport/gnunet-service-transport.c:720
+#: src/transport/gnunet-service-transport.c:708
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5187,53 +5258,53 @@
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:425
+#: src/transport/gnunet-service-transport_validation.c:453
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:487
+#: src/transport/gnunet-service-transport_validation.c:515
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:536
+#: src/transport/gnunet-service-transport_validation.c:564
 #, fuzzy
 msgid "# PING without HELLO messages sent"
 msgstr "# các thông báo PONG nhập thô được gửi"
 
-#: src/transport/gnunet-service-transport_validation.c:618
+#: src/transport/gnunet-service-transport_validation.c:651
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:860
+#: src/transport/gnunet-service-transport_validation.c:910
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/transport/gnunet-service-transport_validation.c:925
+#: src/transport/gnunet-service-transport_validation.c:955
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1054
+#: src/transport/gnunet-service-transport_validation.c:1051
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1063
+#: src/transport/gnunet-service-transport_validation.c:1060
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1188
+#: src/transport/gnunet-service-transport_validation.c:1187
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1216
+#: src/transport/gnunet-service-transport_validation.c:1202
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1270
+#: src/transport/gnunet-service-transport_validation.c:1302
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
@@ -5459,24 +5530,24 @@
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1516
+#: src/transport/plugin_transport_http_client.c:1531
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1647
+#: src/transport/plugin_transport_http_client.c:1662
 #: src/transport/plugin_transport_http_server.c:2869
 #, 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:1672
+#: src/transport/plugin_transport_http_client.c:1687
 #: src/transport/plugin_transport_http_server.c:2928
 #, 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:1700
+#: src/transport/plugin_transport_http_client.c:1715
 #: src/transport/plugin_transport_http_server.c:2775
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
@@ -5727,7 +5798,7 @@
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/transport/plugin_transport_unix.c:1357
+#: src/transport/plugin_transport_unix.c:1355
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -5887,23 +5958,23 @@
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1007
+#: src/util/common_logging.c:258 src/util/common_logging.c:1034
 msgid "DEBUG"
 msgstr "GỠ LỖI"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1005
+#: src/util/common_logging.c:260 src/util/common_logging.c:1032
 msgid "INFO"
 msgstr "TIN"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1003
+#: src/util/common_logging.c:262 src/util/common_logging.c:1030
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1001
+#: src/util/common_logging.c:264 src/util/common_logging.c:1028
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/common_logging.c:266 src/util/common_logging.c:1009
+#: src/util/common_logging.c:266 src/util/common_logging.c:1036
 msgid "NONE"
 msgstr ""
 
@@ -5917,25 +5988,25 @@
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n"
 
-#: src/util/common_logging.c:1010
+#: src/util/common_logging.c:1037
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1149
+#: src/util/common_logging.c:1176
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1187
+#: src/util/common_logging.c:1214
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1205
+#: src/util/common_logging.c:1232
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/util/common_logging.c:1226
+#: src/util/common_logging.c:1253
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -5989,111 +6060,115 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:441
+#: src/util/crypto_ecc.c:447
 #, 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:456 src/util/crypto_rsa.c:660
+#: src/util/crypto_ecc.c:462 src/util/crypto_rsa.c:676
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
 "Deleting it.\n"
 msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
 
-#: src/util/crypto_ecc.c:552 src/util/crypto_ecc.c:596
-#: src/util/crypto_rsa.c:757 src/util/crypto_rsa.c:801
+#: src/util/crypto_ecc.c:558 src/util/crypto_ecc.c:602
+#: src/util/crypto_rsa.c:750 src/util/crypto_rsa.c:887
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/util/crypto_ecc.c:557 src/util/crypto_rsa.c:762
+#: src/util/crypto_ecc.c:563 src/util/crypto_rsa.c:892
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Đang tạo khoá máy mới (có thể hơi lâu).\n"
 
-#: src/util/crypto_ecc.c:600 src/util/crypto_rsa.c:805
-#: src/util/crypto_rsa.c:841
+#: src/util/crypto_ecc.c:606 src/util/crypto_rsa.c:754
+#: src/util/crypto_rsa.c:790
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:631 src/util/crypto_rsa.c:836
+#: src/util/crypto_ecc.c:637 src/util/crypto_rsa.c:785
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:636
+#: src/util/crypto_ecc.c:642
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:651 src/util/crypto_rsa.c:856
+#: src/util/crypto_ecc.c:657 src/util/crypto_rsa.c:805
 #, fuzzy, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
 
-#: src/util/crypto_ecc.c:773 src/util/crypto_rsa.c:941
+#: src/util/crypto_ecc.c:779 src/util/crypto_rsa.c:982
 msgid "interrupted by shutdown"
 msgstr ""
 
-#: src/util/crypto_ecc.c:784
+#: src/util/crypto_ecc.c:790
 msgid "gnunet-ecc failed"
 msgstr ""
 
-#: src/util/crypto_ecc.c:979
+#: src/util/crypto_ecc.c:978
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/util/crypto_ecc.c:1047
+#: src/util/crypto_ecc.c:1046
 #, fuzzy, c-format
 msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/util/crypto_random.c:313
+#: src/util/crypto_ecc.c:1130
+msgid "To be implemented: not secure at the moment, please read README\n"
+msgstr ""
+
+#: src/util/crypto_random.c:281
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:342
+#: src/util/crypto_random.c:312
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/util/crypto_rsa.c:644
+#: src/util/crypto_rsa.c:660
 #, fuzzy, c-format
 msgid ""
 "File `%s' does not contain a valid private key (too long, %llu bytes).  "
 "Renaming it.\n"
 msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
 
-#: src/util/crypto_rsa.c:952
+#: src/util/crypto_rsa.c:993
 msgid "gnunet-rsa failed"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1343
+#: src/util/crypto_rsa.c:1378
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/util/disk.c:601
+#: src/util/disk.c:602
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/disk.c:1205
+#: src/util/disk.c:1206
 #, 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:1559 src/util/service.c:1669
+#: src/util/disk.c:1560 src/util/service.c:1670
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Không thể lấy thông tin về người dùng « %s »: %s\n"
 
-#: src/util/disk.c:1931
+#: src/util/disk.c:1999
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
@@ -6208,56 +6283,59 @@
 msgid "Manipulate GNUnet configuration files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/util/gnunet-ecc.c:107 src/util/gnunet-rsa.c:107
+#: src/util/gnunet-ecc.c:76
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/util/gnunet-ecc.c:113 src/util/gnunet-rsa.c:113
+#: src/util/gnunet-ecc.c:82
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:128 src/util/gnunet-rsa.c:137
+#: src/util/gnunet-ecc.c:100
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/gnunet-ecc.c:140 src/util/gnunet-rsa.c:149
+#: src/util/gnunet-ecc.c:112
 #, c-format
-msgid "Finished!\n"
+msgid ""
+"\n"
+"Finished!\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:163 src/util/gnunet-rsa.c:172
+#: src/util/gnunet-ecc.c:115
 #, c-format
+msgid ""
+"\n"
+"Error, %u keys not generated\n"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:138 src/util/gnunet-rsa.c:65
+#, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:220 src/util/gnunet-rsa.c:229
+#: src/util/gnunet-ecc.c:193
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:223 src/util/gnunet-rsa.c:232
+#: src/util/gnunet-ecc.c:196 src/util/gnunet-rsa.c:115
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:226 src/util/gnunet-rsa.c:235
+#: src/util/gnunet-ecc.c:199 src/util/gnunet-rsa.c:118
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:229 src/util/gnunet-rsa.c:238
+#: src/util/gnunet-ecc.c:202 src/util/gnunet-rsa.c:121
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:232 src/util/gnunet-rsa.c:241
-msgid ""
-"use insecure, weak random number generator for key generation (for testing "
-"only)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:243
+#: src/util/gnunet-ecc.c:213
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -6270,7 +6348,7 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:252
+#: src/util/gnunet-rsa.c:132
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -6309,17 +6387,17 @@
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:260
+#: src/util/helper.c:271
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/helper.c:305
+#: src/util/helper.c:316
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/helper.c:499
+#: src/util/helper.c:537
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
@@ -6347,16 +6425,6 @@
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/util/os_priority.c:302
-#, fuzzy, c-format
-msgid "Failed to open named pipe `%s' for reading: %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#: src/util/os_priority.c:303
-#, fuzzy, c-format
-msgid "Failed to open named pipe `%s' for writing: %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
 #: src/util/plugin.c:89
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -6377,17 +6445,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:254 src/util/service.c:1791
+#: src/util/program.c:254 src/util/service.c:1792
 #, 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:282
+#: src/util/pseudonym.c:329 src/util/pseudonym.c:632
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "Lỗi phân tích dữ liệu giao diện từ « %s ».\n"
 
-#: src/util/pseudonym.c:413 src/util/pseudonym.c:439
+#: src/util/pseudonym.c:464 src/util/pseudonym.c:490 src/util/pseudonym.c:628
 msgid "no-name"
 msgstr "không-tên"
 
@@ -6531,38 +6599,38 @@
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1525
+#: src/util/service.c:1526
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/service.c:1558
+#: src/util/service.c:1559
 #, 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:1607
+#: src/util/service.c:1608
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1611
+#: src/util/service.c:1612
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1615
+#: src/util/service.c:1616
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1670
+#: src/util/service.c:1671
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/util/service.c:1683
+#: src/util/service.c:1684
 #, 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:1749
+#: src/util/service.c:1750
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6575,71 +6643,71 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:413
+#: src/util/strings.c:425
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:528
+#: src/util/strings.c:540
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Lỗi mở rộng biến môi trường « $HOME »: chưa đặt biến môi trường « HOME »"
 
-#: src/util/strings.c:625
+#: src/util/strings.c:637
 msgid "ms"
 msgstr "mg"
 
-#: src/util/strings.c:629
+#: src/util/strings.c:641
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:631
+#: src/util/strings.c:643
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:637
+#: src/util/strings.c:649
 msgid "s"
 msgstr "g"
 
-#: src/util/strings.c:643
+#: src/util/strings.c:655
 msgid "m"
 msgstr "p"
 
-#: src/util/strings.c:649
+#: src/util/strings.c:661
 msgid "h"
 msgstr "g"
 
-#: src/util/strings.c:656
+#: src/util/strings.c:668
 #, fuzzy
 msgid "day"
 msgstr " ngày"
 
-#: src/util/strings.c:658
+#: src/util/strings.c:670
 #, fuzzy
 msgid "days"
 msgstr " ngày"
 
-#: src/util/strings.c:685
+#: src/util/strings.c:697
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1073
+#: src/util/strings.c:1086
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1081
+#: src/util/strings.c:1094
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1087
+#: src/util/strings.c:1100
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1094
+#: src/util/strings.c:1107
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1103
+#: src/util/strings.c:1116
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
@@ -6835,6 +6903,54 @@
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
 #, fuzzy
+#~ msgid "Failed to read hostkey: %s\n"
+#~ msgstr "Lỗi bắt đầu thu thập.\n"
+
+#, fuzzy
+#~ msgid "# session keys received"
+#~ msgstr "# các khoá phiên chạy bị từ chối"
+
+#, fuzzy
+#~ msgid "# SET_KEY and PING messages created"
+#~ msgstr "# các thông báo PING được tạo"
+
+#, fuzzy
+#~ msgid "Message received far too old (%s). Content ignored.\n"
+#~ msgstr "Thông báo nhận được cũ hơn một ngày. Đã loại bỏ.\n"
+
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "Lỗi không rõ.\n"
+
+#, fuzzy
+#~ msgid "Failed to serialize meta data"
+#~ msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to datastore service"
+#~ msgstr "Không kết nối được đến trình nền gnunetd."
+
+#, fuzzy
+#~ msgid "Failed to parse URI `%s' from KBlock!\n"
+#~ msgstr "Tập tin « %s » có URI: %s\n"
+
+#, fuzzy
+#~ msgid "Regexprofiler could not access hostkey: %s. Exiting.\n"
+#~ msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
+#, fuzzy
+#~ msgid "Could not access STATISTICS service.  Exiting.\n"
+#~ msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
+#, fuzzy
+#~ msgid "Failed to open named pipe `%s' for reading: %s\n"
+#~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#, fuzzy
+#~ msgid "Failed to open named pipe `%s' for writing: %s\n"
+#~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#, fuzzy
 #~ msgid "session identifier"
 #~ msgstr "# các phiên chạy được thiết lập"
 

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2013-04-16 18:01:29 UTC (rev 26908)
+++ gnunet/po/zh_CN.po  2013-04-16 18:32:56 UTC (rev 26909)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-02-05 19:22+0100\n"
+"POT-Creation-Date: 2013-03-06 00:28+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"
@@ -241,38 +241,88 @@
 msgid "Received last message for %s \n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:993
-#: src/ats/gnunet-service-ats_addresses.c:1027
+#: src/ats/gnunet-service-ats_addresses.c:1176
+#: src/ats/gnunet-service-ats_addresses.c:1210
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:999
+#: src/ats/gnunet-service-ats_addresses.c:1182
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1006
+#: src/ats/gnunet-service-ats_addresses.c:1189
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1033
+#: src/ats/gnunet-service-ats_addresses.c:1216
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1040
+#: src/ats/gnunet-service-ats_addresses.c:1223
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
+#: src/ats/gnunet-service-ats_addresses_mlp.c:735
+msgid "Problem size too large, cannot allocate memory!\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1044
+#, c-format
+msgid "Adding address for peer `%s' multiple times\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1226
+#, c-format
+msgid "Update for ATS type `%s' not implemented!\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1306
+#, c-format
+msgid "Updating address for peer `%s' not added before\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1726
+#, c-format
+msgid ""
+"Adjusting inconsistent outbound quota configuration for network `%s', is "
+"%llu must be at least %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1734
+#, c-format
+msgid ""
+"Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
+"must be at least %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1744
+#, c-format
+msgid ""
+"Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1752
+#, c-format
+msgid ""
+"Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_addresses_mlp.c:1763
+#, c-format
+msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
+msgstr ""
+
 #: src/ats-tool/gnunet-ats.c:141
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -396,25 +446,25 @@
 msgid "consensus timeout"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-ibf.c:176
+#: src/consensus/gnunet-consensus-ibf.c:217
 #, fuzzy
 msgid "number of element in set A-B"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus-ibf.c:179
+#: src/consensus/gnunet-consensus-ibf.c:220
 #, fuzzy
 msgid "number of element in set B-A"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus-ibf.c:182
+#: src/consensus/gnunet-consensus-ibf.c:223
 msgid "number of common elements in A and B"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-ibf.c:185
+#: src/consensus/gnunet-consensus-ibf.c:226
 msgid "hash num"
 msgstr ""
 
-#: src/consensus/gnunet-consensus-ibf.c:188
+#: src/consensus/gnunet-consensus-ibf.c:229
 msgid "ibf size"
 msgstr ""
 
@@ -466,23 +516,23 @@
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:109
+#: src/core/gnunet-service-core.c:110
 #, fuzzy, c-format
-msgid "Failed to read hostkey: %s\n"
-msgstr "运行 %s失败:%s %d\n"
+msgid "Failed to read or generate private key: %s\n"
+msgstr "无法为守护程序创建用户账户。"
 
-#: src/core/gnunet-service-core.c:123
+#: src/core/gnunet-service-core.c:124
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:149
+#: src/core/gnunet-service-core.c:150
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/core/gnunet-service-core.c:163
-#: src/transport/gnunet-service-transport.c:737
+#: src/core/gnunet-service-core.c:164
+#: src/transport/gnunet-service-transport.c:725
 #, fuzzy
 msgid "Transport service is unable to access hostkey. Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
@@ -500,148 +550,156 @@
 msgid "# bytes of messages of type %u received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:565
+#: src/core/gnunet-service-core_kx.c:532
 msgid "# bytes encrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:617
+#: src/core/gnunet-service-core_kx.c:583
 msgid "# bytes decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:681 src/dv/gnunet-service-dv.c:3003
-msgid "Error in communication with PEERINFO service\n"
+#: src/core/gnunet-service-core_kx.c:667
+msgid "# key exchanges initiated"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:700
-msgid "# Delayed connecting due to lack of public key"
+#: src/core/gnunet-service-core_kx.c:697
+msgid "# key exchanges stopped"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:753
-msgid "# key exchanges initiated"
+#: src/core/gnunet-service-core_kx.c:761
+msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:775
-msgid "# key exchanges stopped"
+#: src/core/gnunet-service-core_kx.c:767
+msgid "# ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:828
-msgid "# session keys received"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:845
+#: src/core/gnunet-service-core_kx.c:803
 #, c-format
-msgid "`%s' is for `%s', not for me.  Ignoring.\n"
+msgid ""
+"Ephemeral key message rejected as its validity range does not match our "
+"system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:890
-msgid "# SET_KEY messages decrypted"
+#: src/core/gnunet-service-core_kx.c:818
+msgid "# EPHEMERAL_KEY messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:977
-#: src/transport/gnunet-service-transport_validation.c:865
+#: src/core/gnunet-service-core_kx.c:921
+#: src/transport/gnunet-service-transport_validation.c:915
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1010
+#: src/core/gnunet-service-core_kx.c:929
+msgid "# PING messages dropped (out of order)"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:956
 #, c-format
 msgid ""
 "Received PING from `%s' for different identity: I am `%s', PONG identity: `"
 "%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1029
+#: src/core/gnunet-service-core_kx.c:973
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1125
+#: src/core/gnunet-service-core_kx.c:999
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1135
+#: src/core/gnunet-service-core_kx.c:1009
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1236
-#: src/transport/gnunet-service-transport_validation.c:1161
+#: src/core/gnunet-service-core_kx.c:1066
+#: src/transport/gnunet-service-transport_validation.c:1160
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1275
+#: src/core/gnunet-service-core_kx.c:1072
+msgid "# PONG messages dropped (connection down)"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1077
+msgid "# PONG messages dropped (out of order)"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1107
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1303
+#: src/core/gnunet-service-core_kx.c:1141
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1329
+#: src/core/gnunet-service-core_kx.c:1151
+msgid "# timeouts prevented via PONG"
+msgstr ""
+
+#: src/core/gnunet-service-core_kx.c:1158
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1383
-#: src/core/gnunet-service-core_kx.c:1400
-msgid "# SET_KEY and PING messages created"
+#: src/core/gnunet-service-core_kx.c:1312
+msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1404
-msgid "# REKEY operations performed"
+#: src/core/gnunet-service-core_kx.c:1319
+#, c-format
+msgid ""
+"Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1539
-msgid "# failed to decrypt message (no session key)"
+#: src/core/gnunet-service-core_kx.c:1322
+msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1579
-#: src/core/gnunet-service-core_kx.c:1604
+#: src/core/gnunet-service-core_kx.c:1365
+#: src/core/gnunet-service-core_kx.c:1390
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1591
+#: src/core/gnunet-service-core_kx.c:1377
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1628
-#, c-format
-msgid "Message received far too old (%s). Content ignored.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:1632
+#: src/core/gnunet-service-core_kx.c:1418
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1640
+#: src/core/gnunet-service-core_kx.c:1426
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1703 src/hostlist/hostlist-server.c:552
-#: src/peerinfo-tool/gnunet-peerinfo.c:547
-#: src/transport/gnunet-service-transport.c:644
-msgid "Could not access PEERINFO service.  Exiting.\n"
+#: src/core/gnunet-service-core_kx.c:1459
+msgid "# PAYLOAD dropped (out of order)"
 msgstr ""
 
 #: src/core/gnunet-service-core_neighbours.c:163
 msgid "# sessions terminated by transport disconnect"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:180
-#: src/core/gnunet-service-core_neighbours.c:334
+#: src/core/gnunet-service-core_neighbours.c:179
+#: src/core/gnunet-service-core_neighbours.c:333
 msgid "# neighbour entries allocated"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:247
+#: src/core/gnunet-service-core_neighbours.c:246
 msgid "# encrypted bytes given to transport"
 msgstr ""
 
-#: src/core/gnunet-service-core_neighbours.c:421
+#: src/core/gnunet-service-core_neighbours.c:420
 #, c-format
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:206
-#: src/core/gnunet-service-core_sessions.c:269
+#: src/core/gnunet-service-core_sessions.c:210
+#: src/core/gnunet-service-core_sessions.c:280
 #: src/dht/gnunet-service-dht_neighbours.c:645
-#: src/dht/gnunet-service-dht_neighbours.c:703
-#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1544
+#: src/dht/gnunet-service-dht_neighbours.c:704
+#: src/fs/gnunet-service-fs_cp.c:630 src/fs/gnunet-service-fs_cp.c:1530
 #: src/topology/gnunet-daemon-topology.c:704
 #: src/topology/gnunet-daemon-topology.c:805
 #: src/transport/gnunet-service-transport_neighbours.c:1052
@@ -652,11 +710,11 @@
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:236
+#: src/core/gnunet-service-core_sessions.c:248
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:406
+#: src/core/gnunet-service-core_sessions.c:417
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -720,7 +778,8 @@
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
-#: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ecc.c:46
+#: src/namestore/plugin_namestore_sqlite.c:51
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:46
 #: src/util/crypto_ksk.c:49 src/util/crypto_rsa.c:59
 #: src/include/gnunet_common.h:607 src/include/gnunet_common.h:614
 #, fuzzy, c-format
@@ -1100,7 +1159,7 @@
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
 #: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:736
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:1033
+#: src/nse/gnunet-nse-profiler.c:1037
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1259,79 +1318,79 @@
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:737
+#: src/dht/gnunet-service-dht_neighbours.c:738
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:792
+#: src/dht/gnunet-service-dht_neighbours.c:793
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:830
+#: src/dht/gnunet-service-dht_neighbours.c:831
 msgid "# Bytes of bandwidth requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1052
-#: src/dht/gnunet-service-dht_neighbours.c:1080
+#: src/dht/gnunet-service-dht_neighbours.c:1053
+#: src/dht/gnunet-service-dht_neighbours.c:1081
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1061
-#: src/dht/gnunet-service-dht_neighbours.c:1095
+#: src/dht/gnunet-service-dht_neighbours.c:1062
+#: src/dht/gnunet-service-dht_neighbours.c:1096
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1229
+#: src/dht/gnunet-service-dht_neighbours.c:1230
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1258
+#: src/dht/gnunet-service-dht_neighbours.c:1259
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1265
-#: src/dht/gnunet-service-dht_neighbours.c:1378
-#: src/dht/gnunet-service-dht_neighbours.c:1478
+#: src/dht/gnunet-service-dht_neighbours.c:1266
+#: src/dht/gnunet-service-dht_neighbours.c:1379
+#: src/dht/gnunet-service-dht_neighbours.c:1479
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1343
+#: src/dht/gnunet-service-dht_neighbours.c:1344
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1370
+#: src/dht/gnunet-service-dht_neighbours.c:1371
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1485
+#: src/dht/gnunet-service-dht_neighbours.c:1486
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1573
+#: src/dht/gnunet-service-dht_neighbours.c:1574
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1702
+#: src/dht/gnunet-service-dht_neighbours.c:1704
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1710
+#: src/dht/gnunet-service-dht_neighbours.c:1712
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1801
+#: src/dht/gnunet-service-dht_neighbours.c:1803
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1843
+#: src/dht/gnunet-service-dht_neighbours.c:1845
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1857
+#: src/dht/gnunet-service-dht_neighbours.c:1859
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1944
+#: src/dht/gnunet-service-dht_neighbours.c:1943
 msgid "# P2P RESULTS received"
 msgstr ""
 
@@ -1497,6 +1556,10 @@
 msgid "Failed to connect to the dv service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
+#: src/dv/gnunet-service-dv.c:3003
+msgid "Error in communication with PEERINFO service\n"
+msgstr ""
+
 #: src/dv/plugin_transport_dv.c:159
 #, c-format
 msgid "%s Received message from %s of type %d, distance %u!\n"
@@ -1900,51 +1963,46 @@
 msgid "Did not find mime type `%s' in extension list.\n"
 msgstr ""
 
-#: src/fs/fs_namespace_advertise.c:150
-#, fuzzy
-msgid "Unknown error"
-msgstr "未知错误"
-
-#: src/fs/fs_namespace_advertise.c:238 src/fs/fs_namespace_advertise.c:259
-#, fuzzy
-msgid "Failed to serialize meta data"
-msgstr "发送消息失败。\n"
-
-#: src/fs/fs_namespace_advertise.c:278
-#, fuzzy
-msgid "Failed to connect to datastore service"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/fs/fs_namespace.c:110
+#: src/fs/fs_namespace.c:104
 #, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_namespace.c:132 src/fs/fs_namespace.c:220
+#: src/fs/fs_namespace.c:126 src/fs/fs_namespace.c:214
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
+#: src/fs/fs_namespace.c:240 src/fs/fs_namespace.c:284
+#: src/fs/fs_namespace.c:330
+msgid "Can't determine where namespace directory is\n"
+msgstr ""
+
 #: src/fs/fs_namespace.c:252
 #, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:367
+#: src/fs/fs_namespace.c:296
+#, fuzzy, c-format
+msgid "Failed to read private key for namespace `%s'\n"
+msgstr "发送消息失败。\n"
+
+#: src/fs/fs_namespace.c:467
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:558
-msgid "Identifiers or URI too long to create SBlock"
+#: src/fs/fs_namespace.c:659
+msgid "Identifiers or URI too long to create UBlock"
 msgstr ""
 
-#: src/fs/fs_namespace.c:593 src/fs/fs_publish_ksk.c:295
+#: src/fs/fs_namespace.c:694 src/fs/fs_publish_ksk.c:307
 #, fuzzy
 msgid "Internal error."
 msgstr "未知错误。\n"
 
-#: src/fs/fs_namespace.c:636
+#: src/fs/fs_namespace.c:747
 msgid "Failed to connect to datastore."
 msgstr ""
 
@@ -2009,11 +2067,16 @@
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
 
-#: src/fs/fs_publish_ksk.c:258
+#: src/fs/fs_publish_ksk.c:269
 msgid "Could not connect to datastore."
 msgstr ""
 
-#: src/fs/fs_search.c:892
+#: src/fs/fs_search.c:742
+#, fuzzy, c-format
+msgid "Failed to parse URI `%s': %s\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/fs/fs_search.c:800
 #, c-format
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
@@ -2056,25 +2119,20 @@
 
 #: src/fs/fs_unindex.c:416
 #, fuzzy, c-format
-msgid "Failed to remove KBlock: %s\n"
+msgid "Failed to remove UBlock: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_unindex.c:506
-#, fuzzy, c-format
-msgid "Failed to parse URI `%s' from KBlock!\n"
-msgstr "运行 %s失败:%s %d\n"
-
-#: src/fs/fs_unindex.c:558 src/fs/fs_unindex.c:623
+#: src/fs/fs_unindex.c:566 src/fs/fs_unindex.c:633
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_unindex.c:636
+#: src/fs/fs_unindex.c:646
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_unindex.c:670
+#: src/fs/fs_unindex.c:680
 msgid "Failed to compute hash of file."
 msgstr ""
 
@@ -2095,58 +2153,66 @@
 msgid "Quotes not balanced in KSK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:373 src/fs/fs_uri.c:380
+#: src/fs/fs_uri.c:375
 msgid "Malformed SKS URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:424 src/fs/fs_uri.c:439
+#: src/fs/fs_uri.c:418 src/fs/fs_uri.c:433
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:569 src/fs/fs_uri.c:584 src/fs/fs_uri.c:594
-#: src/fs/fs_uri.c:622
+#: src/fs/fs_uri.c:563 src/fs/fs_uri.c:578 src/fs/fs_uri.c:588
+#: src/fs/fs_uri.c:616
 msgid "SKS URI malformed"
 msgstr ""
 
-#: src/fs/fs_uri.c:604
+#: src/fs/fs_uri.c:598
 msgid "SKS URI malformed (could not decode public key)"
 msgstr ""
 
-#: src/fs/fs_uri.c:610
+#: src/fs/fs_uri.c:604
 msgid "SKS URI malformed (could not find signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:616
+#: src/fs/fs_uri.c:610
 msgid "SKS URI malformed (could not decode signature)"
 msgstr ""
 
-#: src/fs/fs_uri.c:629
+#: src/fs/fs_uri.c:623
 msgid "SKS URI malformed (could not parse expiration time)"
 msgstr ""
 
-#: src/fs/fs_uri.c:641
+#: src/fs/fs_uri.c:635
 msgid "SKS URI malformed (signature failed validation)"
 msgstr ""
 
-#: src/fs/fs_uri.c:679
+#: src/fs/fs_uri.c:673
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:904
+#: src/fs/fs_uri.c:898
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "立即保存配置?"
 
-#: src/fs/fs_uri.c:910
+#: src/fs/fs_uri.c:904
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/fs/fs_uri.c:1115 src/fs/fs_uri.c:1142
+#: src/fs/fs_uri.c:944
+msgid "identifier is NULL!"
+msgstr ""
+
+#: src/fs/fs_uri.c:949
+msgid "identifier has zero length!"
+msgstr ""
+
+#: src/fs/fs_uri.c:1118 src/fs/fs_uri.c:1145
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1148
+#: src/fs/fs_uri.c:1151
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2182,7 +2248,7 @@
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:279
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:302
 #: src/fs/gnunet-publish.c:683
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
@@ -2199,7 +2265,7 @@
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:304
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:327
 #: src/fs/gnunet-publish.c:721
 msgid "set the desired replication LEVEL"
 msgstr ""
@@ -2362,56 +2428,56 @@
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:160 src/statistics/gnunet-statistics.c:283
+#: src/fs/gnunet-pseudonym.c:178 src/statistics/gnunet-statistics.c:283
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/fs/gnunet-pseudonym.c:250 src/fs/gnunet-pseudonym.c:257
-#: src/fs/gnunet-pseudonym.c:259
+#: src/fs/gnunet-pseudonym.c:273 src/fs/gnunet-pseudonym.c:280
+#: src/fs/gnunet-pseudonym.c:282
 #, fuzzy, c-format
 msgid "Option `%s' ignored\n"
 msgstr "%s:选项“%s”有歧义\n"
 
-#: src/fs/gnunet-pseudonym.c:282
+#: src/fs/gnunet-pseudonym.c:305
 msgid "create or advertise namespace NAME"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:285
+#: src/fs/gnunet-pseudonym.c:308
 msgid "delete namespace NAME "
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:288
+#: src/fs/gnunet-pseudonym.c:311
 msgid ""
 "add an additional keyword for the advertisment (this option can be specified "
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:702
+#: src/fs/gnunet-pseudonym.c:315 src/fs/gnunet-publish.c:702
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:295
+#: src/fs/gnunet-pseudonym.c:318
 msgid "print names of local namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:298
+#: src/fs/gnunet-pseudonym.c:321
 msgid "use the given PRIORITY for the advertisments"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:301
+#: src/fs/gnunet-pseudonym.c:324
 msgid "do not print names of remote namespaces"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:307
+#: src/fs/gnunet-pseudonym.c:330
 msgid "specify ID of the root of the namespace"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:310
+#: src/fs/gnunet-pseudonym.c:333
 msgid "change rating of namespace ID by VALUE"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:322
+#: src/fs/gnunet-pseudonym.c:345
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
@@ -2620,11 +2686,11 @@
 msgid "# running average P2P latency (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:309 src/fs/gnunet-service-fs.c:523
+#: src/fs/gnunet-service-fs.c:309 src/fs/gnunet-service-fs.c:521
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:628 src/hostlist/gnunet-daemon-hostlist.c:297
+#: src/fs/gnunet-service-fs.c:626 src/hostlist/gnunet-daemon-hostlist.c:297
 #: src/topology/gnunet-daemon-topology.c:1322
 #: src/topology/gnunet-daemon-topology.c:1329
 #, fuzzy, c-format
@@ -2648,7 +2714,7 @@
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1345
+#: src/fs/gnunet-service-fs_cp.c:782 src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P searches active"
 msgstr ""
 
@@ -2684,31 +2750,31 @@
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1170
+#: src/fs/gnunet-service-fs_cp.c:1169
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1204
+#: src/fs/gnunet-service-fs_cp.c:1203
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1227
+#: src/fs/gnunet-service-fs_cp.c:1226
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1288
+#: src/fs/gnunet-service-fs_cp.c:1276
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1314
+#: src/fs/gnunet-service-fs_cp.c:1300
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1343
+#: src/fs/gnunet-service-fs_cp.c:1329
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1713
+#: src/fs/gnunet-service-fs_cp.c:1699
 msgid "# migration stop messages sent"
 msgstr ""
 
@@ -2807,107 +2873,107 @@
 msgid "# query plan entries"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:312
+#: src/fs/gnunet-service-fs_pr.c:310
 msgid "# Pending requests created"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:404 src/fs/gnunet-service-fs_pr.c:667
+#: src/fs/gnunet-service-fs_pr.c:393 src/fs/gnunet-service-fs_pr.c:644
 msgid "# Pending requests active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:835
+#: src/fs/gnunet-service-fs_pr.c:812
 msgid "# replies received and matched"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:868
+#: src/fs/gnunet-service-fs_pr.c:842
 msgid "# duplicate replies discarded (bloomfilter)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:877
+#: src/fs/gnunet-service-fs_pr.c:851
 msgid "# irrelevant replies discarded"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:891
+#: src/fs/gnunet-service-fs_pr.c:865
 #, c-format
 msgid "Unsupported block type %u\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:904
+#: src/fs/gnunet-service-fs_pr.c:878
 msgid "# results found locally"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1025
+#: src/fs/gnunet-service-fs_pr.c:999
 msgid "# Datastore `PUT' failures"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1052
+#: src/fs/gnunet-service-fs_pr.c:1026
 msgid "# storage requests dropped due to high load"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1087
+#: src/fs/gnunet-service-fs_pr.c:1061
 msgid "# Replies received from DHT"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1221
+#: src/fs/gnunet-service-fs_pr.c:1189
 msgid "# Replies received from STREAM"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1273
+#: src/fs/gnunet-service-fs_pr.c:1241
 #, c-format
 msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1293
+#: src/fs/gnunet-service-fs_pr.c:1261
 #, c-format
 msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1340
+#: src/fs/gnunet-service-fs_pr.c:1308
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1355
+#: src/fs/gnunet-service-fs_pr.c:1323
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1364
+#: src/fs/gnunet-service-fs_pr.c:1332
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1379
+#: src/fs/gnunet-service-fs_pr.c:1347
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1393
+#: src/fs/gnunet-service-fs_pr.c:1361
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1406
+#: src/fs/gnunet-service-fs_pr.c:1374
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1411
+#: src/fs/gnunet-service-fs_pr.c:1379
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1438 src/fs/gnunet-service-fs_pr.c:1478
-#: src/fs/gnunet-service-fs_pr.c:1619
+#: src/fs/gnunet-service-fs_pr.c:1406 src/fs/gnunet-service-fs_pr.c:1446
+#: src/fs/gnunet-service-fs_pr.c:1587
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1496
+#: src/fs/gnunet-service-fs_pr.c:1464
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1507
+#: src/fs/gnunet-service-fs_pr.c:1475
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1595
+#: src/fs/gnunet-service-fs_pr.c:1563
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1680
+#: src/fs/gnunet-service-fs_pr.c:1648
 msgid "# GAP PUT messages received"
 msgstr ""
 
@@ -3270,14 +3336,14 @@
 #: src/hostlist/hostlist-client.c:469 src/hostlist/hostlist-client.c:680
 #: src/hostlist/hostlist-client.c:686 src/hostlist/hostlist-client.c:738
 #: src/hostlist/hostlist-client.c:747 src/hostlist/hostlist-client.c:868
-#: src/hostlist/hostlist-client.c:958 src/hostlist/hostlist-client.c:963
+#: src/hostlist/hostlist-client.c:960 src/hostlist/hostlist-client.c:965
 #: src/transport/plugin_transport_http_client.c:1052
 #: src/transport/plugin_transport_http_client.c:1067
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1325
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1327
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -3327,77 +3393,77 @@
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1035 src/hostlist/hostlist-client.c:1498
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1500
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1043
+#: src/hostlist/hostlist-client.c:1045
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1107 src/hostlist/hostlist-client.c:1123
+#: src/hostlist/hostlist-client.c:1109 src/hostlist/hostlist-client.c:1125
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1273
+#: src/hostlist/hostlist-client.c:1275
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1277
+#: src/hostlist/hostlist-client.c:1279
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1288
+#: src/hostlist/hostlist-client.c:1290
 #, fuzzy, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/hostlist-client.c:1321
+#: src/hostlist/hostlist-client.c:1323
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1323
+#: src/hostlist/hostlist-client.c:1325
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1368
+#: src/hostlist/hostlist-client.c:1370
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解析“%s”来确定已方的 IP 地址:%s\n"
 
-#: src/hostlist/hostlist-client.c:1373
+#: src/hostlist/hostlist-client.c:1375
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1397 src/hostlist/hostlist-client.c:1414
+#: src/hostlist/hostlist-client.c:1399 src/hostlist/hostlist-client.c:1416
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1409
+#: src/hostlist/hostlist-client.c:1411
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1463
+#: src/hostlist/hostlist-client.c:1465
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1475
+#: src/hostlist/hostlist-client.c:1477
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1487
+#: src/hostlist/hostlist-client.c:1489
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1491
+#: src/hostlist/hostlist-client.c:1493
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
@@ -3468,6 +3534,11 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
+#: src/hostlist/hostlist-server.c:552 src/peerinfo-tool/gnunet-peerinfo.c:547
+#: src/transport/gnunet-service-transport.c:632
+msgid "Could not access PEERINFO service.  Exiting.\n"
+msgstr ""
+
 #: src/hostlist/hostlist-server.c:562
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
@@ -3526,36 +3597,36 @@
 msgid "Print information about mesh tunnels and peers."
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/mesh/gnunet-service-mesh.c:8015 src/mesh/gnunet-service-mesh-new.c:8015
+#: src/mesh/gnunet-service-mesh.c:8010 src/mesh/gnunet-service-mesh-new.c:8015
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:8232 src/mesh/gnunet-service-mesh-new.c:8232
+#: src/mesh/gnunet-service-mesh.c:8227 src/mesh/gnunet-service-mesh-new.c:8232
 #, fuzzy, c-format
 msgid "Mesh service could not access hostkey: %s. Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/mesh/gnunet-service-mesh.c:8314 src/mesh/gnunet-service-mesh.c:8326
-#: src/mesh/gnunet-service-mesh.c:8338 src/mesh/gnunet-service-mesh.c:8352
-#: src/mesh/gnunet-service-mesh.c:8364 src/mesh/gnunet-service-mesh.c:8376
-#: src/mesh/gnunet-service-mesh.c:8388 src/mesh/gnunet-service-mesh-new.c:8321
+#: src/mesh/gnunet-service-mesh.c:8309 src/mesh/gnunet-service-mesh.c:8321
+#: src/mesh/gnunet-service-mesh.c:8333 src/mesh/gnunet-service-mesh.c:8347
+#: src/mesh/gnunet-service-mesh.c:8359 src/mesh/gnunet-service-mesh.c:8371
+#: src/mesh/gnunet-service-mesh.c:8383 src/mesh/gnunet-service-mesh-new.c:8321
 #: src/mesh/gnunet-service-mesh-new.c:8333
 #: src/mesh/gnunet-service-mesh-new.c:8345
 #: src/mesh/gnunet-service-mesh-new.c:8359
 #: src/mesh/gnunet-service-mesh-new.c:8371
 #: src/mesh/gnunet-service-mesh-new.c:8383
-#: src/mesh/gnunet-service-mesh-new.c:8395
-#: src/regex/gnunet-daemon-regexprofiler.c:335
-#: src/regex/gnunet-daemon-regexprofiler.c:347
-#: src/regex/gnunet-daemon-regexprofiler.c:360
-#: src/regex/gnunet-daemon-regexprofiler.c:373
+#: src/mesh/gnunet-service-mesh-new.c:8395 src/nse/gnunet-service-nse.c:1478
+#: src/nse/gnunet-service-nse.c:1496
+#: src/regex/gnunet-daemon-regexprofiler.c:277
+#: src/regex/gnunet-daemon-regexprofiler.c:290
+#: src/regex/gnunet-daemon-regexprofiler.c:303
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/mesh/gnunet-service-mesh.c:8400 src/mesh/gnunet-service-mesh.c:8410
-#: src/mesh/gnunet-service-mesh.c:8421 src/mesh/gnunet-service-mesh-new.c:8407
+#: src/mesh/gnunet-service-mesh.c:8395 src/mesh/gnunet-service-mesh.c:8405
+#: src/mesh/gnunet-service-mesh.c:8416 src/mesh/gnunet-service-mesh-new.c:8407
 #: src/mesh/gnunet-service-mesh-new.c:8417
 #: src/mesh/gnunet-service-mesh-new.c:8428
 #, fuzzy, c-format
@@ -3649,7 +3720,7 @@
 msgstr ""
 
 #: src/namestore/gnunet-namestore.c:569
-#: src/peerinfo-tool/gnunet-peerinfo.c:598
+#: src/peerinfo-tool/gnunet-peerinfo.c:599
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
@@ -3778,42 +3849,42 @@
 msgid "Protocol error"
 msgstr ""
 
-#: src/namestore/namestore_common.c:530 src/namestore/namestore_common.c:670
+#: src/namestore/namestore_common.c:532 src/namestore/namestore_common.c:672
 #, fuzzy, c-format
 msgid "Unsupported record type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/namestore_common.c:537
+#: src/namestore/namestore_common.c:539
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/namestore/namestore_common.c:560
+#: src/namestore/namestore_common.c:562
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/namestore_common.c:583
+#: src/namestore/namestore_common.c:585
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/namestore_common.c:601
+#: src/namestore/namestore_common.c:603
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/namestore/namestore_common.c:614
+#: src/namestore/namestore_common.c:616
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/namestore_common.c:635
+#: src/namestore/namestore_common.c:637
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/namestore_common.c:661
+#: src/namestore/namestore_common.c:663
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -3933,43 +4004,43 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1009
+#: src/nse/gnunet-nse-profiler.c:1013
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1012
+#: src/nse/gnunet-nse-profiler.c:1016
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1015
+#: src/nse/gnunet-nse-profiler.c:1019
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1018
+#: src/nse/gnunet-nse-profiler.c:1022
 msgid "IP address of this system as seen by the rest of the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1021
+#: src/nse/gnunet-nse-profiler.c:1025
 msgid "delay between queries to statistics during a round"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1024
+#: src/nse/gnunet-nse-profiler.c:1028
 msgid "prefix of the filenames we use for writing the topology for each round"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1027
+#: src/nse/gnunet-nse-profiler.c:1031
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1030
+#: src/nse/gnunet-nse-profiler.c:1034
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1036
+#: src/nse/gnunet-nse-profiler.c:1040
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:1046
+#: src/nse/gnunet-nse-profiler.c:1050
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
@@ -3979,12 +4050,11 @@
 msgid "NSE service could not access hostkey: %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/nse/gnunet-service-nse.c:1403 src/nse/gnunet-service-nse.c:1478
-#: src/nse/gnunet-service-nse.c:1495
+#: src/nse/gnunet-service-nse.c:1403
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1485
+#: src/nse/gnunet-service-nse.c:1486
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
@@ -4063,37 +4133,37 @@
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:622
+#: src/peerinfo-tool/gnunet-peerinfo.c:625
 #, c-format
 msgid "I am peer `%s'.\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:648
+#: src/peerinfo-tool/gnunet-peerinfo.c:651
 msgid "don't resolve host names"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:651
+#: src/peerinfo-tool/gnunet-peerinfo.c:654
 msgid "output only the identity strings"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:654
+#: src/peerinfo-tool/gnunet-peerinfo.c:657
 msgid "output our own identity only"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:657
+#: src/peerinfo-tool/gnunet-peerinfo.c:660
 #, fuzzy
 msgid "list all known peers"
 msgstr "列出所有网络适配器"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:660
+#: src/peerinfo-tool/gnunet-peerinfo.c:663
 msgid "also output HELLO uri(s)"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:663
+#: src/peerinfo-tool/gnunet-peerinfo.c:666
 msgid "add given HELLO uri to the database"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:674
+#: src/peerinfo-tool/gnunet-peerinfo.c:677
 #, fuzzy
 msgid "Print information about peers."
 msgstr "无法获取有关用户“%s”的信息:%s\n"
@@ -4184,150 +4254,141 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:293
-#, fuzzy, c-format
-msgid "Regexprofiler could not access hostkey: %s. Exiting.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/regex/gnunet-daemon-regexprofiler.c:452
+#: src/regex/gnunet-daemon-regexprofiler.c:376
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1147
-msgid "An operation has failed while starting peers\n"
+#: src/regex/gnunet-regex-profiler.c:1373
+#, c-format
+msgid "An operation has failed while starting peers: %s\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1193
+#: src/regex/gnunet-regex-profiler.c:1418
 #, fuzzy, c-format
 msgid "Creating a peer failed. Error: %s\n"
 msgstr "“%s”以错误码 %d 失败:%s\n"
 
-#: src/regex/gnunet-regex-profiler.c:1320
+#: src/regex/gnunet-regex-profiler.c:1545
 msgid "An operation has failed while starting slaves\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1342
+#: src/regex/gnunet-regex-profiler.c:1567
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/regex/gnunet-regex-profiler.c:1397
+#: src/regex/gnunet-regex-profiler.c:1622
 msgid "An operation has failed while linking\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1508
-#: src/testbed/testbed_api_testbed.c:805
+#: src/regex/gnunet-regex-profiler.c:1732
+#: src/testbed/testbed_api_testbed.c:799
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1589
+#: src/regex/gnunet-regex-profiler.c:1813
 msgid "Unable to connect to master controller -- Check config\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1691
-#: src/testbed/testbed_api_testbed.c:970
+#: src/regex/gnunet-regex-profiler.c:1915
+#: src/testbed/testbed_api_testbed.c:964
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1694
-#: src/testbed/testbed_api_testbed.c:974
+#: src/regex/gnunet-regex-profiler.c:1918
+#: src/testbed/testbed_api_testbed.c:968
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1734
+#: src/regex/gnunet-regex-profiler.c:1958
 #, c-format
 msgid "No hosts-file specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1739
+#: src/regex/gnunet-regex-profiler.c:1963
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1745
-#: src/testbed/testbed_api_testbed.c:1065
+#: src/regex/gnunet-regex-profiler.c:1969
+#: src/testbed/testbed_api_testbed.c:1071
 #, c-format
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1748
+#: src/regex/gnunet-regex-profiler.c:1972
 #, c-format
 msgid "Checking whether given hosts can start testbed. Please wait\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1769
+#: src/regex/gnunet-regex-profiler.c:1996
 #, fuzzy, c-format
 msgid "Exiting\n"
 msgstr "退出"
 
-#: src/regex/gnunet-regex-profiler.c:1775
+#: src/regex/gnunet-regex-profiler.c:2002
 #, c-format
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1784
+#: src/regex/gnunet-regex-profiler.c:2011
 #, fuzzy, c-format
 msgid "Configuration option (regex_prefix) missing. Exiting\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1802
+#: src/regex/gnunet-regex-profiler.c:2029
 #: src/regex/gnunet-regex-simulation-profiler.c:629
 #, c-format
 msgid "Specified policies directory does not exist. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1809
+#: src/regex/gnunet-regex-profiler.c:2036
 #, c-format
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1817
+#: src/regex/gnunet-regex-profiler.c:2044
 #, c-format
 msgid ""
 "Error loading search strings. Given file does not contain enough strings. "
 "Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1823
+#: src/regex/gnunet-regex-profiler.c:2050
 #, fuzzy, c-format
 msgid "Error loading search strings. Exiting.\n"
 msgstr "创建用户出错"
 
-#: src/regex/gnunet-regex-profiler.c:1850
+#: src/regex/gnunet-regex-profiler.c:2077
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1853
+#: src/regex/gnunet-regex-profiler.c:2080
 msgid "create COUNT number of random links between peers"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1856
+#: src/regex/gnunet-regex-profiler.c:2083
 msgid "wait TIMEOUT before considering a string match as failed"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1859
+#: src/regex/gnunet-regex-profiler.c:2086
 msgid "wait DELAY before starting string search"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1862
+#: src/regex/gnunet-regex-profiler.c:2089
 msgid "number of search strings to read from search strings file"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1865
+#: src/regex/gnunet-regex-profiler.c:2092
 #: src/regex/gnunet-regex-simulation-profiler.c:692
 msgid "maximum path compression length"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1868
-msgid ""
-"if this option is set, only one peer is responsible for searching all strings"
-msgstr ""
-
-#: src/regex/gnunet-regex-profiler.c:1881
+#: src/regex/gnunet-regex-profiler.c:2105
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4440,57 +4501,66 @@
 msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:231
+#: src/testbed/gnunet_testbed_ll_master.c:57
 #, c-format
+msgid "Job command file not given. Exiting\n"
+msgstr ""
+
+#: src/testbed/gnunet-testbed-profiler.c:235
+#, c-format
 msgid "No hosts-file specified on command line\n"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:261
+#: src/testbed/gnunet-testbed-profiler.c:267
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:264
+#: src/testbed/gnunet-testbed-profiler.c:270
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:276
+#: src/testbed/gnunet-testbed-profiler.c:286
 msgid "Profiler for testbed"
 msgstr ""
 
-#: src/testbed/ll_master.c:57
+#: src/testbed/testbed_api_hosts.c:469
 #, c-format
-msgid "Job command file not given. Exiting\n"
-msgstr ""
-
-#: src/testbed/testbed_api.c:499
-#, fuzzy, c-format
-msgid "Adding host %u failed with error: %s\n"
-msgstr "“%s”以错误码 %d 失败:%s\n"
-
-#: src/testbed/testbed_api_hosts.c:306
-#, c-format
 msgid "Hosts file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:314
+#: src/testbed/testbed_api_hosts.c:477
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:321
+#: src/testbed/testbed_api_hosts.c:484
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:623
+#: src/testbed/testbed_api_hosts.c:593
+#, c-format
+msgid "The function %s is only available when compiled with (--with-ll)\n"
+msgstr ""
+
+#: src/testbed/testbed_api_hosts.c:1836
+#, fuzzy, c-format
+msgid "Adding host %u failed with error: %s\n"
+msgstr "“%s”以错误码 %d 失败:%s\n"
+
+#: src/testbed/testbed_api_testbed.c:638
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1009
+#: src/testbed/testbed_api_testbed.c:1003
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1089
+#: src/testbed/testbed_api_testbed.c:1059
+msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1095
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
@@ -4541,28 +4611,28 @@
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/gnunet-testing.c:203
+#: src/testing/gnunet-testing.c:209
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/testing/gnunet-testing.c:205
+#: src/testing/gnunet-testing.c:211
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:207
+#: src/testing/gnunet-testing.c:213
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr "打印配置文件中的一个值到标准输出"
 
-#: src/testing/gnunet-testing.c:209
+#: src/testing/gnunet-testing.c:215
 #, fuzzy
 msgid "configuration template"
 msgstr "配置已保存"
 
-#: src/testing/gnunet-testing.c:218
+#: src/testing/gnunet-testing.c:224
 msgid "Command line tool to access the testing library"
 msgstr ""
 
@@ -4580,59 +4650,59 @@
 msgid "name of the service to run"
 msgstr ""
 
-#: src/testing/testing.c:211
+#: src/testing/testing.c:217
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:227
+#: src/testing/testing.c:233
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:541
+#: src/testing/testing.c:547
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:551
+#: src/testing/testing.c:558
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/testing/testing.c:865
+#: src/testing/testing.c:872
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:876
+#: src/testing/testing.c:883
 #, 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:890
+#: src/testing/testing.c:897
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:923
+#: src/testing/testing.c:931
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:941
+#: src/testing/testing.c:949
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1014
+#: src/testing/testing.c:1029
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/testing/testing.c:1219
+#: src/testing/testing.c:1235
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -4777,17 +4847,12 @@
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:614
+#: src/transport/gnunet-service-transport.c:613
 #, fuzzy, c-format
 msgid "Transport service could not access hostkey: %s. Exiting.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/gnunet-service-transport.c:625
-#, fuzzy
-msgid "Could not access STATISTICS service.  Exiting.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/transport/gnunet-service-transport.c:720
+#: src/transport/gnunet-service-transport.c:708
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -4919,51 +4984,51 @@
 msgid "Transport service is lacking NEIGHBOUR_LIMIT option.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:425
+#: src/transport/gnunet-service-transport_validation.c:453
 msgid "# address records discarded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:487
+#: src/transport/gnunet-service-transport_validation.c:515
 #, c-format
 msgid ""
 "Not transmitting `%s' with `%s', message too big (%u bytes!). This should "
 "not happen.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:536
+#: src/transport/gnunet-service-transport_validation.c:564
 msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:618
+#: src/transport/gnunet-service-transport_validation.c:651
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:860
+#: src/transport/gnunet-service-transport_validation.c:910
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:925
+#: src/transport/gnunet-service-transport_validation.c:955
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1054
+#: src/transport/gnunet-service-transport_validation.c:1051
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1063
+#: src/transport/gnunet-service-transport_validation.c:1060
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1188
+#: src/transport/gnunet-service-transport_validation.c:1187
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1216
+#: src/transport/gnunet-service-transport_validation.c:1202
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1270
+#: src/transport/gnunet-service-transport_validation.c:1302
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
@@ -5188,24 +5253,24 @@
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1516
+#: src/transport/plugin_transport_http_client.c:1531
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1647
+#: src/transport/plugin_transport_http_client.c:1662
 #: src/transport/plugin_transport_http_server.c:2869
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:1672
+#: src/transport/plugin_transport_http_client.c:1687
 #: src/transport/plugin_transport_http_server.c:2928
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1700
+#: src/transport/plugin_transport_http_client.c:1715
 #: src/transport/plugin_transport_http_server.c:2775
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
@@ -5448,7 +5513,7 @@
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_unix.c:1357
+#: src/transport/plugin_transport_unix.c:1355
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -5597,23 +5662,23 @@
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1007
+#: src/util/common_logging.c:258 src/util/common_logging.c:1034
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1005
+#: src/util/common_logging.c:260 src/util/common_logging.c:1032
 msgid "INFO"
 msgstr "信息"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1003
+#: src/util/common_logging.c:262 src/util/common_logging.c:1030
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1001
+#: src/util/common_logging.c:264 src/util/common_logging.c:1028
 msgid "ERROR"
 msgstr "错误"
 
-#: src/util/common_logging.c:266 src/util/common_logging.c:1009
+#: src/util/common_logging.c:266 src/util/common_logging.c:1036
 msgid "NONE"
 msgstr ""
 
@@ -5627,24 +5692,24 @@
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次,在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:1010
+#: src/util/common_logging.c:1037
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1149
+#: src/util/common_logging.c:1176
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1187
+#: src/util/common_logging.c:1214
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1205
+#: src/util/common_logging.c:1232
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/util/common_logging.c:1226
+#: src/util/common_logging.c:1253
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -5695,111 +5760,115 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:441
+#: src/util/crypto_ecc.c:447
 #, 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:456 src/util/crypto_rsa.c:660
+#: src/util/crypto_ecc.c:462 src/util/crypto_rsa.c:676
 #, c-format
 msgid ""
 "File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
 "Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:552 src/util/crypto_ecc.c:596
-#: src/util/crypto_rsa.c:757 src/util/crypto_rsa.c:801
+#: src/util/crypto_ecc.c:558 src/util/crypto_ecc.c:602
+#: src/util/crypto_rsa.c:750 src/util/crypto_rsa.c:887
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/crypto_ecc.c:557 src/util/crypto_rsa.c:762
+#: src/util/crypto_ecc.c:563 src/util/crypto_rsa.c:892
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_ecc.c:600 src/util/crypto_rsa.c:805
-#: src/util/crypto_rsa.c:841
+#: src/util/crypto_ecc.c:606 src/util/crypto_rsa.c:754
+#: src/util/crypto_rsa.c:790
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:631 src/util/crypto_rsa.c:836
+#: src/util/crypto_ecc.c:637 src/util/crypto_rsa.c:785
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:636
+#: src/util/crypto_ecc.c:642
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:651 src/util/crypto_rsa.c:856
+#: src/util/crypto_ecc.c:657 src/util/crypto_rsa.c:805
 #, c-format
 msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:773 src/util/crypto_rsa.c:941
+#: src/util/crypto_ecc.c:779 src/util/crypto_rsa.c:982
 msgid "interrupted by shutdown"
 msgstr ""
 
-#: src/util/crypto_ecc.c:784
+#: src/util/crypto_ecc.c:790
 msgid "gnunet-ecc failed"
 msgstr ""
 
-#: src/util/crypto_ecc.c:979
+#: src/util/crypto_ecc.c:978
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/crypto_ecc.c:1047
+#: src/util/crypto_ecc.c:1046
 #, c-format
 msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_random.c:313
+#: src/util/crypto_ecc.c:1130
+msgid "To be implemented: not secure at the moment, please read README\n"
+msgstr ""
+
+#: src/util/crypto_random.c:281
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:342
+#: src/util/crypto_random.c:312
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/util/crypto_rsa.c:644
+#: src/util/crypto_rsa.c:660
 #, c-format
 msgid ""
 "File `%s' does not contain a valid private key (too long, %llu bytes).  "
 "Renaming it.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:952
+#: src/util/crypto_rsa.c:993
 msgid "gnunet-rsa failed"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1343
+#: src/util/crypto_rsa.c:1378
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:601
+#: src/util/disk.c:602
 #, fuzzy, c-format
 msgid "`%s' failed for drive `%S': %u\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/disk.c:1205
+#: src/util/disk.c:1206
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录!\n"
 
-#: src/util/disk.c:1559 src/util/service.c:1669
+#: src/util/disk.c:1560 src/util/service.c:1670
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/util/disk.c:1931
+#: src/util/disk.c:1999
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
@@ -5911,56 +5980,59 @@
 msgid "Manipulate GNUnet configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-ecc.c:107 src/util/gnunet-rsa.c:107
+#: src/util/gnunet-ecc.c:76
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/util/gnunet-ecc.c:113 src/util/gnunet-rsa.c:113
+#: src/util/gnunet-ecc.c:82
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:128 src/util/gnunet-rsa.c:137
+#: src/util/gnunet-ecc.c:100
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/util/gnunet-ecc.c:140 src/util/gnunet-rsa.c:149
+#: src/util/gnunet-ecc.c:112
 #, c-format
-msgid "Finished!\n"
+msgid ""
+"\n"
+"Finished!\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:163 src/util/gnunet-rsa.c:172
+#: src/util/gnunet-ecc.c:115
 #, c-format
+msgid ""
+"\n"
+"Error, %u keys not generated\n"
+msgstr ""
+
+#: src/util/gnunet-ecc.c:138 src/util/gnunet-rsa.c:65
+#, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:220 src/util/gnunet-rsa.c:229
+#: src/util/gnunet-ecc.c:193
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:223 src/util/gnunet-rsa.c:232
+#: src/util/gnunet-ecc.c:196 src/util/gnunet-rsa.c:115
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:226 src/util/gnunet-rsa.c:235
+#: src/util/gnunet-ecc.c:199 src/util/gnunet-rsa.c:118
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:229 src/util/gnunet-rsa.c:238
+#: src/util/gnunet-ecc.c:202 src/util/gnunet-rsa.c:121
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:232 src/util/gnunet-rsa.c:241
-msgid ""
-"use insecure, weak random number generator for key generation (for testing "
-"only)"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:243
+#: src/util/gnunet-ecc.c:213
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改配置文件中的一个值"
@@ -5973,7 +6045,7 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:252
+#: src/util/gnunet-rsa.c:132
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -6012,17 +6084,17 @@
 msgid "Perform default-actions for GNUnet URIs"
 msgstr ""
 
-#: src/util/helper.c:260
+#: src/util/helper.c:271
 #, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/helper.c:305
+#: src/util/helper.c:316
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/util/helper.c:499
+#: src/util/helper.c:537
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
@@ -6050,16 +6122,6 @@
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
-#: src/util/os_priority.c:302
-#, fuzzy, c-format
-msgid "Failed to open named pipe `%s' for reading: %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
-#: src/util/os_priority.c:303
-#, fuzzy, c-format
-msgid "Failed to open named pipe `%s' for writing: %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
 #: src/util/plugin.c:89
 #, c-format
 msgid "Initialization of plugin mechanism failed: %s!\n"
@@ -6080,17 +6142,17 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/program.c:254 src/util/service.c:1791
+#: src/util/program.c:254 src/util/service.c:1792
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/pseudonym.c:282
+#: src/util/pseudonym.c:329 src/util/pseudonym.c:632
 #, fuzzy, c-format
 msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/util/pseudonym.c:413 src/util/pseudonym.c:439
+#: src/util/pseudonym.c:464 src/util/pseudonym.c:490 src/util/pseudonym.c:628
 msgid "no-name"
 msgstr "无名称"
 
@@ -6234,38 +6296,38 @@
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1525
+#: src/util/service.c:1526
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/util/service.c:1558
+#: src/util/service.c:1559
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1607
+#: src/util/service.c:1608
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1611
+#: src/util/service.c:1612
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1615
+#: src/util/service.c:1616
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1670
+#: src/util/service.c:1671
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/util/service.c:1683
+#: src/util/service.c:1684
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”:%s\n"
 
-#: src/util/service.c:1749
+#: src/util/service.c:1750
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6278,70 +6340,70 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:413
+#: src/util/strings.c:425
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:528
+#: src/util/strings.c:540
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败:没有设置环境变量“HOME”"
 
-#: src/util/strings.c:625
+#: src/util/strings.c:637
 msgid "ms"
 msgstr "毫秒"
 
-#: src/util/strings.c:629
+#: src/util/strings.c:641
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:631
+#: src/util/strings.c:643
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:637
+#: src/util/strings.c:649
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:643
+#: src/util/strings.c:655
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:649
+#: src/util/strings.c:661
 msgid "h"
 msgstr "时"
 
-#: src/util/strings.c:656
+#: src/util/strings.c:668
 #, fuzzy
 msgid "day"
 msgstr " 天"
 
-#: src/util/strings.c:658
+#: src/util/strings.c:670
 #, fuzzy
 msgid "days"
 msgstr " 天"
 
-#: src/util/strings.c:685
+#: src/util/strings.c:697
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1073
+#: src/util/strings.c:1086
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1081
+#: src/util/strings.c:1094
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1087
+#: src/util/strings.c:1100
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1094
+#: src/util/strings.c:1107
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1103
+#: src/util/strings.c:1116
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
@@ -6528,6 +6590,42 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Failed to read hostkey: %s\n"
+#~ msgstr "运行 %s失败:%s %d\n"
+
+#, fuzzy
+#~ msgid "Unknown error"
+#~ msgstr "未知错误"
+
+#, fuzzy
+#~ msgid "Failed to serialize meta data"
+#~ msgstr "发送消息失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to datastore service"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to parse URI `%s' from KBlock!\n"
+#~ msgstr "运行 %s失败:%s %d\n"
+
+#, fuzzy
+#~ msgid "Regexprofiler could not access hostkey: %s. Exiting.\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Could not access STATISTICS service.  Exiting.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to open named pipe `%s' for reading: %s\n"
+#~ msgstr "打开日志文件“%s”失败:%s\n"
+
+#, fuzzy
+#~ msgid "Failed to open named pipe `%s' for writing: %s\n"
+#~ msgstr "打开日志文件“%s”失败:%s\n"
+
+#, fuzzy
 #~ msgid "Mesh service could not access hostkey.  Exiting.\n"
 #~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
 

Modified: gnunet/src/Makefile.am
===================================================================
--- gnunet/src/Makefile.am      2013-04-16 18:01:29 UTC (rev 26908)
+++ gnunet/src/Makefile.am      2013-04-16 18:32:56 UTC (rev 26909)
@@ -3,7 +3,7 @@
 #endif
 
 if HAVE_EXPERIMENTAL
- EXP_DIR = gns chat consensus dv 
+ EXP_DIR = gns chat consensus dv set 
 endif
 
 if LINUX

Modified: gnunet/src/consensus/gnunet-service-consensus.c
===================================================================
--- gnunet/src/consensus/gnunet-service-consensus.c     2013-04-16 18:01:29 UTC 
(rev 26908)
+++ gnunet/src/consensus/gnunet-service-consensus.c     2013-04-16 18:32:56 UTC 
(rev 26909)
@@ -2279,7 +2279,7 @@
 static void
 initialize_session (struct ConsensusSession *session)
 {
-  const struct ConsensusSession *other_session;
+  struct ConsensusSession *other_session;
 
   GNUNET_assert (NULL != session->join_msg);
   initialize_session_peer_list (session);
@@ -2295,17 +2295,13 @@
     {
       if (GNUNET_NO == other_session->conclude)
       {
-        /* session already owned by another client */
         GNUNET_break (0);
-        disconnect_client (session->scss.client);
+        destroy_session (session);
         return;
       }
-      else
-      {
-        GNUNET_SERVER_client_drop (session->scss.client);
-        session->scss.client = NULL;
-        break;
-      }
+      GNUNET_SERVER_client_drop (other_session->scss.client);
+      other_session->scss.client = NULL;
+      break;
     }
     other_session = other_session->next;
   }

Added: gnunet/src/set/Makefile.am
===================================================================
--- gnunet/src/set/Makefile.am                          (rev 0)
+++ gnunet/src/set/Makefile.am  2013-04-16 18:32:56 UTC (rev 26909)
@@ -0,0 +1,72 @@
+INCLUDES = -I$(top_srcdir)/src/include
+
+pkgcfgdir= $(pkgdatadir)/config.d/
+
+libexecdir= $(pkglibdir)/libexec/
+
+pkgcfg_DATA = \
+  set.conf
+
+if MINGW
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols 
+endif
+
+if USE_COVERAGE
+  AM_CFLAGS = -fprofile-arcs -ftest-coverage
+endif
+
+bin_PROGRAMS = \
+ gnunet-set
+
+libexec_PROGRAMS = \
+ gnunet-service-set
+
+lib_LTLIBRARIES = \
+  libgnunetset.la
+
+gnunet_set_SOURCES = \
+ gnunet-set.c
+gnunet_set_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/set/libgnunetset.la \
+  $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(GN_LIBINTL)
+gnunet_set_DEPENDENCIES = \
+  libgnunetset.la
+
+gnunet_service_set_SOURCES = \
+ gnunet-service-set.c \
+ ibf.c \
+ strata_estimator.c
+gnunet_service_set_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/core/libgnunetcore.la \
+  $(top_builddir)/src/stream/libgnunetstream.la \
+  $(top_builddir)/src/mesh/libgnunetmesh.la \
+  $(GN_LIBINTL)
+
+libgnunetset_la_SOURCES = \
+  set_api.c
+libgnunetset_la_LIBADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(LTLIBINTL)
+libgnunetset_la_LDFLAGS = \
+  $(GN_LIB_LDFLAGS)
+
+check_PROGRAMS = \
+ test_set_api
+
+if ENABLE_TEST_RUN
+TESTS = $(check_PROGRAMS)
+endif
+
+test_set_api_SOURCES = \
+ test_set_api.c
+test_set_api_LDADD = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/set/libgnunetset.la
+
+EXTRA_DIST = \
+  test_set.conf
+

Added: gnunet/src/set/gnunet-service-set.c
===================================================================
--- gnunet/src/set/gnunet-service-set.c                         (rev 0)
+++ gnunet/src/set/gnunet-service-set.c 2013-04-16 18:32:56 UTC (rev 26909)
@@ -0,0 +1,71 @@
+/*
+      This file is part of GNUnet
+      (C) 2013 Christian Grothoff (and other contributing authors)
+
+      GNUnet is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published
+      by the Free Software Foundation; either version 2, or (at your
+      option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      General Public License for more details.
+
+      You should have received a copy of the GNU General Public License
+      along with GNUnet; see the file COPYING.  If not, write to the
+      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+      Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file set/gnunet-service-set.c
+ * @brief two-peer set operations
+ * @author Florian Dold
+ */
+
+#include "platform.h"
+#include "gnunet_common.h"
+#include "gnunet_protocols.h"
+#include "gnunet_applications.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_core_service.h"
+#include "gnunet_stream_lib.h"
+
+
+/**
+ * Function called by the service's run
+ * method to run service-specific setup code.
+ *
+ * @param cls closure
+ * @param server the initialized server
+ * @param cfg configuration to use
+ */
+static void
+run (void *cls,
+     struct GNUNET_SERVER_Handle * server,
+     const struct GNUNET_CONFIGURATION_Handle *
+     cfg)
+
+{
+  /* FIXME */
+}
+
+
+/**
+ * The main function for the set service.
+ *
+ * @param argc number of arguments from the command line
+ * @param argv command line arguments
+ * @return 0 ok, 1 on error
+ */
+int
+main (int argc, char *const *argv)
+{
+  int ret;
+  ret = GNUNET_SERVICE_run (argc, argv, "set", GNUNET_SERVICE_OPTION_NONE, 
&run, NULL);
+  GNUNET_log (GNUNET_ERROR_TYPE_INFO, "exit\n");
+  return (GNUNET_OK == ret) ? 0 : 1;
+}
+
+

Added: gnunet/src/set/gnunet-set.c
===================================================================
--- gnunet/src/set/gnunet-set.c                         (rev 0)
+++ gnunet/src/set/gnunet-set.c 2013-04-16 18:32:56 UTC (rev 26909)
@@ -0,0 +1,62 @@
+/*
+      This file is part of GNUnet
+      (C) 2012 Christian Grothoff (and other contributing authors)
+
+      GNUnet is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published
+      by the Free Software Foundation; either version 2, or (at your
+      option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      General Public License for more details.
+
+      You should have received a copy of the GNU General Public License
+      along with GNUnet; see the file COPYING.  If not, write to the
+      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+      Boston, MA 02111-1307, USA.
+ */
+
+/**
+ * @file set/gnunet-set.c
+ * @brief profiling tool for the set service
+ * @author Florian Dold
+ */
+#include "platform.h"
+#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testbed_service.h"
+
+
+/**
+ * Main function that will be run.
+ *
+ * @param cls closure
+ * @param args remaining command-line arguments
+ * @param cfgfile name of the configuration file used (for saving, can be 
NULL!)
+ * @param cfg configuration
+ */
+static void
+run (void *cls, char *const *args,
+     const char *cfgfile,
+     const struct GNUNET_CONFIGURATION_Handle *
+     cfg)
+{
+  /* FIXME */
+}
+
+
+
+int
+main (int argc, char **argv)
+{
+   static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+      GNUNET_GETOPT_OPTION_END
+  };
+  GNUNET_PROGRAM_run2 (argc, argv, "gnunet-set",
+                     "help",
+                     options, &run, NULL, GNUNET_YES);
+  return 0;
+}
+

Added: gnunet/src/set/ibf.c
===================================================================
--- gnunet/src/set/ibf.c                                (rev 0)
+++ gnunet/src/set/ibf.c        2013-04-16 18:32:56 UTC (rev 26909)
@@ -0,0 +1,357 @@
+/*
+      This file is part of GNUnet
+      (C) 2012 Christian Grothoff (and other contributing authors)
+
+      GNUnet is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published
+      by the Free Software Foundation; either version 2, or (at your
+      option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      General Public License for more details.
+
+      You should have received a copy of the GNU General Public License
+      along with GNUnet; see the file COPYING.  If not, write to the
+      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+      Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file consensus/ibf.c
+ * @brief implementation of the invertible bloom filter
+ * @author Florian Dold
+ */
+
+#include "ibf.h"
+
+/**
+ * Create a key from a hashcode.
+ *
+ * @param hash the hashcode
+ * @return a key
+ */
+struct IBF_Key
+ibf_key_from_hashcode (const struct GNUNET_HashCode *hash)
+{
+  /* FIXME: endianess */
+  return *(struct IBF_Key *) hash;
+}
+
+/**
+ * Create a hashcode from a key, by replicating the key
+ * until the hascode is filled
+ *
+ * @param key the key
+ * @param dst hashcode to store the result in
+ */
+void
+ibf_hashcode_from_key (struct IBF_Key key, struct GNUNET_HashCode *dst)
+{
+  struct IBF_Key *p;
+  unsigned int i;
+  const unsigned int keys_per_hashcode = sizeof (struct GNUNET_HashCode) / 
sizeof (struct IBF_Key);
+  p = (struct IBF_Key *) dst;
+  for (i = 0; i < keys_per_hashcode; i++)
+    *p++ = key;
+}
+
+
+/**
+ * Create an invertible bloom filter.
+ *
+ * @param size number of IBF buckets
+ * @param hash_num number of buckets one element is hashed in
+ * @return the newly created invertible bloom filter
+ */
+struct InvertibleBloomFilter *
+ibf_create (uint32_t size, uint8_t hash_num)
+{
+  struct InvertibleBloomFilter *ibf;
+
+  /* TODO: use malloc_large */
+
+  ibf = GNUNET_malloc (sizeof (struct InvertibleBloomFilter));
+  ibf->count = GNUNET_malloc (size * sizeof (uint8_t));
+  ibf->key_sum = GNUNET_malloc (size * sizeof (struct GNUNET_HashCode));
+  ibf->key_hash_sum = GNUNET_malloc (size * sizeof (struct GNUNET_HashCode));
+  ibf->size = size;
+  ibf->hash_num = hash_num;
+
+  return ibf;
+}
+
+/**
+ * Store unique bucket indices for the specified key in dst.
+ */
+static inline void
+ibf_get_indices (const struct InvertibleBloomFilter *ibf,
+                 struct IBF_Key key, int *dst)
+{
+  struct GNUNET_HashCode bucket_indices;
+  unsigned int filled;
+  int i;
+  GNUNET_CRYPTO_hash (&key, sizeof key, &bucket_indices);
+  filled = 0;
+  for (i = 0; filled < ibf->hash_num; i++)
+  {
+    unsigned int bucket;
+    unsigned int j;
+    if ( (0 != i) && (0 == (i % 16)) )
+      GNUNET_CRYPTO_hash (&bucket_indices, sizeof (struct GNUNET_HashCode), 
&bucket_indices);
+    bucket = bucket_indices.bits[i % 16] % ibf->size;
+    for (j = 0; j < filled; j++)
+      if (dst[j] == bucket)
+        goto try_next;
+    dst[filled++] = bucket;
+    try_next: ;
+  }
+}
+
+
+static void
+ibf_insert_into  (struct InvertibleBloomFilter *ibf,
+                  struct IBF_Key key,
+                  const int *buckets, int side)
+{
+  int i;
+  struct GNUNET_HashCode key_hash_sha;
+  struct IBF_KeyHash key_hash;
+  GNUNET_CRYPTO_hash (&key, sizeof key, &key_hash_sha);
+  key_hash.key_hash_val = key_hash_sha.bits[0];
+  for (i = 0; i < ibf->hash_num; i++)
+  {
+    const int bucket = buckets[i];
+    ibf->count[bucket].count_val += side;
+    ibf->key_sum[bucket].key_val ^= key.key_val;
+    ibf->key_hash_sum[bucket].key_hash_val ^= key_hash.key_hash_val;
+  }
+}
+
+
+/**
+ * Insert an element into an IBF.
+ *
+ * @param ibf the IBF
+ * @param key the element's hash code
+ */
+void
+ibf_insert (struct InvertibleBloomFilter *ibf, struct IBF_Key key)
+{
+  int buckets[ibf->hash_num];
+  GNUNET_assert (ibf->hash_num <= ibf->size);
+  ibf_get_indices (ibf, key, buckets);
+  ibf_insert_into (ibf, key, buckets, 1);
+}
+
+/**
+ * Test is the IBF is empty, i.e. all counts, keys and key hashes are zero.
+ */
+static int
+ibf_is_empty (struct InvertibleBloomFilter *ibf)
+{
+  int i;
+  for (i = 0; i < ibf->size; i++)
+  {
+    if (0 != ibf->count[i].count_val)
+      return GNUNET_NO;
+    if (0 != ibf->key_hash_sum[i].key_hash_val)
+      return GNUNET_NO;
+    if (0 != ibf->key_sum[i].key_val)
+      return GNUNET_NO;
+  }
+  return GNUNET_YES;
+}
+
+
+/**
+ * Decode and remove an element from the IBF, if possible.
+ *
+ * @param ibf the invertible bloom filter to decode
+ * @param ret_side sign of the cell's count where the decoded element came 
from.
+ *                 A negative sign indicates that the element was recovered
+ *                 resides in an IBF that was previously subtracted from.
+ * @param ret_id receives the hash code of the decoded element, if successful
+ * @return GNUNET_YES if decoding an element was successful,
+ *         GNUNET_NO if the IBF is empty,
+ *         GNUNET_SYSERR if the decoding has failed
+ */
+int
+ibf_decode (struct InvertibleBloomFilter *ibf,
+            int *ret_side, struct IBF_Key *ret_id)
+{
+  struct IBF_KeyHash hash;
+  int i;
+  struct GNUNET_HashCode key_hash_sha;
+  int buckets[ibf->hash_num];
+
+  GNUNET_assert (NULL != ibf);
+
+  for (i = 0; i < ibf->size; i++)
+  {
+    int j;
+    int hit;
+
+    /* we can only decode from pure buckets */
+    if ((1 != ibf->count[i].count_val) && (-1 != ibf->count[i].count_val))
+      continue;
+
+    GNUNET_CRYPTO_hash (&ibf->key_sum[i], sizeof (struct IBF_Key), 
&key_hash_sha);
+    hash.key_hash_val = key_hash_sha.bits[0];
+
+    /* test if the hash matches the key */
+    if (hash.key_hash_val != ibf->key_hash_sum[i].key_hash_val)
+      continue;
+
+    /* test if key in bucket hits its own location,
+     * if not, the key hash was subject to collision */
+    hit = GNUNET_NO;
+    ibf_get_indices (ibf, ibf->key_sum[i], buckets);
+    for (j = 0; j < ibf->hash_num; j++)
+      if (buckets[j] == i)
+        hit = GNUNET_YES;
+
+    if (GNUNET_NO == hit)
+      continue;
+
+    if (NULL != ret_side)
+      *ret_side = ibf->count[i].count_val;
+    if (NULL != ret_id)
+      *ret_id = ibf->key_sum[i];
+
+    /* insert on the opposite side, effectively removing the element */
+    ibf_insert_into (ibf, ibf->key_sum[i], buckets, -ibf->count[i].count_val);
+
+    return GNUNET_YES;
+  }
+
+  if (GNUNET_YES == ibf_is_empty (ibf))
+    return GNUNET_NO;
+  return GNUNET_SYSERR;
+}
+
+
+/**
+ * Write buckets from an ibf to a buffer.
+ * Exactly (IBF_BUCKET_SIZE*ibf->size) bytes are written to buf.
+ * 
+ * @param ibf the ibf to write
+ * @param start with which bucket to start
+ * @param count how many buckets to write
+ * @param buf buffer to write the data to
+ */
+void
+ibf_write_slice (const struct InvertibleBloomFilter *ibf, uint32_t start, 
uint32_t count, void *buf)
+{
+  struct IBF_Key *key_dst;
+  struct IBF_KeyHash *key_hash_dst;
+  struct IBF_Count *count_dst;
+
+  GNUNET_assert (start + count <= ibf->size);
+
+  /* copy keys */
+  key_dst = (struct IBF_Key *) buf;
+  memcpy (key_dst, ibf->key_sum + start, count * sizeof *key_dst);
+  key_dst += count;
+  /* copy key hashes */
+  key_hash_dst = (struct IBF_KeyHash *) key_dst;
+  memcpy (key_hash_dst, ibf->key_hash_sum + start, count * sizeof 
*key_hash_dst);
+  key_hash_dst += count;
+  /* copy counts */
+  count_dst = (struct IBF_Count *) key_hash_dst;
+  memcpy (count_dst, ibf->count + start, count * sizeof *count_dst);
+  count_dst += count;
+}
+
+
+/**
+ * Read buckets from a buffer into an ibf.
+ *
+ * @param buf pointer to the buffer to read from
+ * @param start which bucket to start at
+ * @param count how many buckets to read
+ * @param ibf the ibf to read from
+ */
+void
+ibf_read_slice (const void *buf, uint32_t start, uint32_t count, struct 
InvertibleBloomFilter *ibf)
+{
+  struct IBF_Key *key_src;
+  struct IBF_KeyHash *key_hash_src;
+  struct IBF_Count *count_src;
+
+  GNUNET_assert (start + count <= ibf->size);
+
+  /* copy keys */
+  key_src = (struct IBF_Key *) buf;
+  memcpy (ibf->key_sum + start, key_src, count * sizeof *key_src);
+  key_src += count;
+  /* copy key hashes */
+  key_hash_src = (struct IBF_KeyHash *) key_src;
+  memcpy (ibf->key_hash_sum + start, key_hash_src, count * sizeof 
*key_hash_src);
+  key_hash_src += count;
+  /* copy counts */
+  count_src = (struct IBF_Count *) key_hash_src;
+  memcpy (ibf->count + start, count_src, count * sizeof *count_src);
+  count_src += count;
+}
+
+
+/**
+ * Subtract ibf2 from ibf1, storing the result in ibf1.
+ * The two IBF's must have the same parameters size and hash_num.
+ *
+ * @param ibf1 IBF that is subtracted from
+ * @param ibf2 IBF that will be subtracted from ibf1
+ */
+void
+ibf_subtract (struct InvertibleBloomFilter *ibf1, const struct 
InvertibleBloomFilter *ibf2)
+{
+  int i;
+
+  GNUNET_assert (ibf1->size == ibf2->size);
+  GNUNET_assert (ibf1->hash_num == ibf2->hash_num);
+
+  for (i = 0; i < ibf1->size; i++)
+  {
+    ibf1->count[i].count_val -= ibf2->count[i].count_val;
+    ibf1->key_hash_sum[i].key_hash_val ^= ibf2->key_hash_sum[i].key_hash_val;
+    ibf1->key_sum[i].key_val ^= ibf2->key_sum[i].key_val;
+  }
+}
+
+
+/**
+ * Create a copy of an IBF, the copy has to be destroyed properly.
+ *
+ * @param ibf the IBF to copy
+ */
+struct InvertibleBloomFilter *
+ibf_dup (const struct InvertibleBloomFilter *ibf)
+{
+  struct InvertibleBloomFilter *copy;
+  copy = GNUNET_malloc (sizeof *copy);
+  copy->hash_num = ibf->hash_num;
+  copy->size = ibf->size;
+  copy->key_hash_sum = GNUNET_memdup (ibf->key_hash_sum, ibf->size * sizeof 
(struct IBF_KeyHash));
+  copy->key_sum = GNUNET_memdup (ibf->key_sum, ibf->size * sizeof (struct 
IBF_Key));
+  copy->count = GNUNET_memdup (ibf->count, ibf->size * sizeof (struct 
IBF_Count));
+  return copy;
+}
+
+
+/**
+ * Destroy all resources associated with the invertible bloom filter.
+ * No more ibf_*-functions may be called on ibf after calling destroy.
+ *
+ * @param ibf the intertible bloom filter to destroy
+ */
+void
+ibf_destroy (struct InvertibleBloomFilter *ibf)
+{
+  GNUNET_free (ibf->key_sum);
+  GNUNET_free (ibf->key_hash_sum);
+  GNUNET_free (ibf->count);
+  GNUNET_free (ibf);
+}
+

Added: gnunet/src/set/ibf.h
===================================================================
--- gnunet/src/set/ibf.h                                (rev 0)
+++ gnunet/src/set/ibf.h        2013-04-16 18:32:56 UTC (rev 26909)
@@ -0,0 +1,224 @@
+/*
+      This file is part of GNUnet
+      (C) 2012 Christian Grothoff (and other contributing authors)
+
+      GNUnet is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published
+      by the Free Software Foundation; either version 2, or (at your
+      option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      General Public License for more details.
+
+      You should have received a copy of the GNU General Public License
+      along with GNUnet; see the file COPYING.  If not, write to the
+      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+      Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file consensus/ibf.h
+ * @brief invertible bloom filter
+ * @author Florian Dold
+ */
+
+#ifndef GNUNET_CONSENSUS_IBF_H
+#define GNUNET_CONSENSUS_IBF_H
+
+#include "platform.h"
+#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#if 0                           /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+
+struct IBF_Key
+{
+  uint64_t key_val;
+};
+
+struct IBF_KeyHash
+{
+  uint32_t key_hash_val;
+};
+
+struct IBF_Count
+{
+  int8_t count_val;
+};
+
+/**
+ * Size of one ibf bucket in bytes
+ */
+#define IBF_BUCKET_SIZE (sizeof (struct IBF_Count) + sizeof (struct IBF_Key) + 
\
+    sizeof (struct IBF_KeyHash))
+
+/**
+ * Invertible bloom filter (IBF).
+ *
+ * An IBF is a counting bloom filter that has the ability to restore
+ * the hashes of its stored elements with high probability.
+ */
+struct InvertibleBloomFilter
+{
+  /**
+   * How many cells does this IBF have?
+   */
+  uint32_t size;
+
+  /**
+   * In how many cells do we hash one element?
+   * Usually 4 or 3.
+   */
+  uint8_t hash_num;
+
+  /**
+   * Xor sums of the elements' keys, used to identify the elements.
+   * Array of 'size' elements.
+   */
+  struct IBF_Key *key_sum;
+
+  /**
+   * Xor sums of the hashes of the keys of inserted elements.
+   * Array of 'size' elements.
+   */
+  struct IBF_KeyHash *key_hash_sum;
+
+  /**
+   * How many times has a bucket been hit?
+   * Can be negative, as a result of IBF subtraction.
+   * Array of 'size' elements.
+   */
+  struct IBF_Count *count;
+};
+
+
+/**
+ * Write buckets from an ibf to a buffer.
+ * Exactly (IBF_BUCKET_SIZE*ibf->size) bytes are written to buf.
+ * 
+ * @param ibf the ibf to write
+ * @param start with which bucket to start
+ * @param count how many buckets to write
+ * @param buf buffer to write the data to
+ */
+void
+ibf_write_slice (const struct InvertibleBloomFilter *ibf, uint32_t start, 
uint32_t count, void *buf);
+
+
+/**
+ * Read buckets from a buffer into an ibf.
+ *
+ * @param buf pointer to the buffer to read from
+ * @param start which bucket to start at
+ * @param count how many buckets to read
+ * @param ibf the ibf to read from
+ */
+void
+ibf_read_slice (const void *buf, uint32_t start, uint32_t count, struct 
InvertibleBloomFilter *ibf);
+
+
+/**
+ * Create a key from a hashcode.
+ *
+ * @param hash the hashcode
+ * @return a key
+ */
+struct IBF_Key
+ibf_key_from_hashcode (const struct GNUNET_HashCode *hash);
+
+
+/**
+ * Create a hashcode from a key, by replicating the key
+ * until the hascode is filled
+ *
+ * @param key the key
+ * @param dst hashcode to store the result in
+ */
+void
+ibf_hashcode_from_key (struct IBF_Key key, struct GNUNET_HashCode *dst);
+
+
+/**
+ * Create an invertible bloom filter.
+ *
+ * @param size number of IBF buckets
+ * @param hash_num number of buckets one element is hashed in, usually 3 or 4
+ * @return the newly created invertible bloom filter
+ */
+struct InvertibleBloomFilter *
+ibf_create (uint32_t size, uint8_t hash_num);
+
+
+/**
+ * Insert an element into an IBF.
+ *
+ * @param ibf the IBF
+ * @param key the element's hash code
+ */
+void
+ibf_insert (struct InvertibleBloomFilter *ibf, struct IBF_Key key);
+
+
+/**
+ * Subtract ibf2 from ibf1, storing the result in ibf1.
+ * The two IBF's must have the same parameters size and hash_num.
+ *
+ * @param ibf1 IBF that is subtracted from
+ * @param ibf2 IBF that will be subtracted from ibf1
+ */
+void
+ibf_subtract (struct InvertibleBloomFilter *ibf1, const struct 
InvertibleBloomFilter *ibf2);
+
+
+/**
+ * Decode and remove an element from the IBF, if possible.
+ *
+ * @param ibf the invertible bloom filter to decode
+ * @param ret_side sign of the cell's count where the decoded element came 
from.
+ *                 A negative sign indicates that the element was recovered
+ *                 resides in an IBF that was previously subtracted from.
+ * @param ret_id receives the hash code of the decoded element, if successful
+ * @return GNUNET_YES if decoding an element was successful,
+ *         GNUNET_NO if the IBF is empty,
+ *         GNUNET_SYSERR if the decoding has failed
+ */
+int
+ibf_decode (struct InvertibleBloomFilter *ibf, int *ret_side, struct IBF_Key 
*ret_id);
+
+
+/**
+ * Create a copy of an IBF, the copy has to be destroyed properly.
+ *
+ * @param ibf the IBF to copy
+ */
+struct InvertibleBloomFilter *
+ibf_dup (const struct InvertibleBloomFilter *ibf);
+
+/**
+ * Destroy all resources associated with the invertible bloom filter.
+ * No more ibf_*-functions may be called on ibf after calling destroy.
+ *
+ * @param ibf the intertible bloom filter to destroy
+ */
+void
+ibf_destroy (struct InvertibleBloomFilter *ibf);
+
+
+#if 0                           /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+

Added: gnunet/src/set/set.conf.in
===================================================================
Added: gnunet/src/set/set_api.c
===================================================================
Added: gnunet/src/set/strata_estimator.c
===================================================================
--- gnunet/src/set/strata_estimator.c                           (rev 0)
+++ gnunet/src/set/strata_estimator.c   2013-04-16 18:32:56 UTC (rev 26909)
@@ -0,0 +1,145 @@
+/*
+      This file is part of GNUnet
+      (C) 2012 Christian Grothoff (and other contributing authors)
+
+      GNUnet is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published
+      by the Free Software Foundation; either version 2, or (at your
+      option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      General Public License for more details.
+
+      You should have received a copy of the GNU General Public License
+      along with GNUnet; see the file COPYING.  If not, write to the
+      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+      Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file consensus/ibf.h
+ * @brief invertible bloom filter
+ * @author Florian Dold
+ */
+
+#include "platform.h"
+#include "gnunet_common.h"
+#include "ibf.h"
+#include "strata_estimator.h"
+
+void
+strata_estimator_write (const struct StrataEstimator *se, void *buf)
+{
+  int i;
+  for (i = 0; i < se->strata_count; i++)
+  {
+    ibf_write_slice (se->strata[i], 0, se->ibf_size, buf);
+    buf += se->ibf_size * IBF_BUCKET_SIZE;
+  }
+}
+
+void
+strata_estimator_read (const void *buf, struct StrataEstimator *se)
+{
+  int i;
+  for (i = 0; i < se->strata_count; i++)
+  {
+    ibf_read_slice (buf, 0, se->ibf_size, se->strata[i]);
+    buf += se->ibf_size * IBF_BUCKET_SIZE;
+  }
+}
+
+
+void
+strata_estimator_insert (struct StrataEstimator *se, struct GNUNET_HashCode 
*key)
+{
+  uint32_t v;
+  int i;
+  v = key->bits[0];
+  /* count trailing '1'-bits of v */
+  for (i = 0; v & 1; v>>=1, i++)
+    /* empty */;
+  ibf_insert (se->strata[i], ibf_key_from_hashcode (key));
+}
+
+
+
+struct StrataEstimator *
+strata_estimator_create (unsigned int strata_count, uint32_t ibf_size, uint8_t 
ibf_hashnum)
+{
+  struct StrataEstimator *se;
+  int i;
+
+  /* fixme: allocate everything in one chunk */
+
+  se = GNUNET_malloc (sizeof (struct StrataEstimator));
+  se->strata_count = strata_count;
+  se->ibf_size = ibf_size;
+  se->strata = GNUNET_malloc (sizeof (struct InvertibleBloomFilter *) * 
strata_count);
+  for (i = 0; i < strata_count; i++)
+    se->strata[i] = ibf_create (ibf_size, ibf_hashnum);
+  return se;
+}
+
+
+/**
+ * Estimate set difference with two strata estimators,
+ * i.e. arrays of IBFs.
+ * Does not not modify its arguments.
+ *
+ * @param se1 first strata estimator
+ * @param se2 second strata estimator
+ * @return the estimated difference
+ */
+unsigned int
+strata_estimator_difference (const struct StrataEstimator *se1,
+                             const struct StrataEstimator *se2)
+{
+  int i;
+  int count;
+
+  GNUNET_assert (se1->strata_count == se2->strata_count);
+  count = 0;
+  for (i = se1->strata_count - 1; i >= 0; i--)
+  {
+    struct InvertibleBloomFilter *diff;
+    /* number of keys decoded from the ibf */
+    int ibf_count;
+    int more;
+    ibf_count = 0;
+    /* FIXME: implement this without always allocating new IBFs */
+    diff = ibf_dup (se1->strata[i]);
+    ibf_subtract (diff, se2->strata[i]);
+    for (;;)
+    {
+      more = ibf_decode (diff, NULL, NULL);
+      if (GNUNET_NO == more)
+      {
+        count += ibf_count;
+        break;
+      }
+      if (GNUNET_SYSERR == more)
+      {
+        ibf_destroy (diff);
+        return count * (1 << (i + 1));
+      }
+      ibf_count++;
+    }
+    ibf_destroy (diff);
+  }
+  return count;
+}
+
+
+void
+strata_estimator_destroy (struct StrataEstimator *se)
+{
+  int i;
+  for (i = 0; i < se->strata_count; i++)
+    ibf_destroy (se->strata[i]);
+  GNUNET_free (se->strata);
+  GNUNET_free (se);
+}
+

Added: gnunet/src/set/strata_estimator.h
===================================================================
--- gnunet/src/set/strata_estimator.h                           (rev 0)
+++ gnunet/src/set/strata_estimator.h   2013-04-16 18:32:56 UTC (rev 26909)
@@ -0,0 +1,84 @@
+/*
+      This file is part of GNUnet
+      (C) 2012 Christian Grothoff (and other contributing authors)
+
+      GNUnet is free software; you can redistribute it and/or modify
+      it under the terms of the GNU General Public License as published
+      by the Free Software Foundation; either version 2, or (at your
+      option) any later version.
+
+      GNUnet is distributed in the hope that it will be useful, but
+      WITHOUT ANY WARRANTY; without even the implied warranty of
+      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+      General Public License for more details.
+
+      You should have received a copy of the GNU General Public License
+      along with GNUnet; see the file COPYING.  If not, write to the
+      Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+      Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file consensus/strata_estimator.h
+ * @brief estimator of set difference
+ * @author Florian Dold
+ */
+
+#ifndef GNUNET_CONSENSUS_STRATA_ESTIMATOR_H
+#define GNUNET_CONSENSUS_STRATA_ESTIMATOR_H
+
+#include "platform.h"
+#include "gnunet_common.h"
+#include "gnunet_util_lib.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#if 0                           /* keep Emacsens' auto-indent happy */
+}
+#endif
+#endif
+
+
+struct StrataEstimator
+{
+  struct InvertibleBloomFilter **strata;
+  unsigned int strata_count;
+  unsigned int ibf_size;
+};
+
+
+void
+strata_estimator_write (const struct StrataEstimator *se, void *buf);
+
+
+void
+strata_estimator_read (const void *buf, struct StrataEstimator *se);
+
+
+struct StrataEstimator *
+strata_estimator_create (unsigned int strata_count, uint32_t ibf_size, uint8_t 
ibf_hashnum);
+
+
+unsigned int
+strata_estimator_difference (const struct StrataEstimator *se1,
+                             const struct StrataEstimator *se2);
+
+
+void
+strata_estimator_insert (struct StrataEstimator *se, struct GNUNET_HashCode 
*key);
+
+
+void
+strata_estimator_destroy (struct StrataEstimator *se);
+
+
+#if 0                           /* keep Emacsens' auto-indent happy */
+{
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+

Added: gnunet/src/set/test_set.conf
===================================================================
Added: gnunet/src/set/test_set_api.c
===================================================================
--- gnunet/src/set/test_set_api.c                               (rev 0)
+++ gnunet/src/set/test_set_api.c       2013-04-16 18:32:56 UTC (rev 26909)
@@ -0,0 +1,39 @@
+/*
+     This file is part of GNUnet.
+     (C) 2012 Christian Grothoff (and other contributing authors)
+
+     GNUnet is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published
+     by the Free Software Foundation; either version 3, or (at your
+     option) any later version.
+
+     GNUnet is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with GNUnet; see the file COPYING.  If not, write to the
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file set/test_set_api.c
+ * @brief testcase for consensus_api.c
+ */
+#include "platform.h"
+#include "gnunet_util_lib.h"
+#include "gnunet_testing_lib.h"
+
+int
+main (int argc, char **argv)
+{
+  int ret;
+
+  ret = GNUNET_TESTING_peer_run ("test_set_api",
+                                 "test_set.conf",
+                                 &run, NULL);
+  return ret;
+}
+




reply via email to

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