gnunet-svn
[Top][All Lists]
Advanced

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

[GNUnet-SVN] r29318 - in gnunet: po src/consensus


From: gnunet
Subject: [GNUnet-SVN] r29318 - in gnunet: po src/consensus
Date: Mon, 16 Sep 2013 15:33:53 +0200

Author: dold
Date: 2013-09-16 15:33:53 +0200 (Mon, 16 Sep 2013)
New Revision: 29318

Modified:
   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/consensus/gnunet-consensus-profiler.c
Log:
- mem leak


Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2013-09-16 13:23:12 UTC (rev 29317)
+++ gnunet/po/POTFILES.in       2013-09-16 13:33:53 UTC (rev 29318)
@@ -14,6 +14,7 @@
 src/ats/gnunet-service-ats_scheduling.c
 src/ats/gnunet-service-ats-solver_mlp.c
 src/ats/gnunet-service-ats-solver_proportional.c
+src/ats/gnunet-service-ats-solver_ril.c
 src/ats-tool/gnunet-ats.c
 src/block/block.c
 src/block/plugin_block_template.c
@@ -88,7 +89,6 @@
 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_publish_ublock.c
@@ -105,7 +105,6 @@
 src/fs/gnunet-fs.c
 src/fs/gnunet-fs-profiler.c
 src/fs/gnunet-helper-fs-publish.c
-src/fs/gnunet-pseudonym.c
 src/fs/gnunet-publish.c
 src/fs/gnunet-search.c
 src/fs/gnunet-service-fs.c
@@ -159,6 +158,9 @@
 src/mesh/mesh_test_lib.c
 src/mesh/mesh_tunnel_tree.c
 src/mesh/plugin_block_mesh.c
+src/multicast/gnunet-multicast.c
+src/multicast/gnunet-service-multicast.c
+src/multicast/multicast_api.c
 src/mysql/mysql.c
 src/namestore/gnunet-namestore.c
 src/namestore/gnunet-namestore-fcfsd.c
@@ -187,6 +189,7 @@
 src/peerinfo-tool/gnunet-peerinfo_plugins.c
 src/postgres/postgres.c
 src/psycstore/gnunet-service-psycstore.c
+src/psycstore/plugin_psycstore_sqlite.c
 src/psycstore/psycstore_api.c
 src/pt/gnunet-daemon-pt.c
 src/regex/gnunet-daemon-regexprofiler.c
@@ -220,6 +223,8 @@
 src/template/gnunet-template.c
 src/testbed/gnunet-helper-testbed.c
 src/testbed/gnunet_mpi_test.c
+src/testbed/gnunet-service-test-barriers.c
+src/testbed/gnunet-service-testbed_barriers.c
 src/testbed/gnunet-service-testbed.c
 src/testbed/gnunet-service-testbed_cache.c
 src/testbed/gnunet-service-testbed_cpustatus.c
@@ -232,6 +237,7 @@
 src/testbed/gnunet_testbed_ll_monitor.c
 src/testbed/gnunet_testbed_mpi_spawn.c
 src/testbed/gnunet-testbed-profiler.c
+src/testbed/testbed_api_barriers.c
 src/testbed/testbed_api.c
 src/testbed/testbed_api_hosts.c
 src/testbed/testbed_api_operations.c
@@ -346,5 +352,6 @@
 src/include/gnunet_time_lib.h
 src/mesh/mesh_protocol_enc.h
 src/mesh/mesh_protocol.h
+src/scalarproduct/scalarproduct.h
 src/testbed/testbed_api.h
 src/testbed/testbed_api_operations.h

Modified: gnunet/po/de.po
===================================================================
--- gnunet/po/de.po     2013-09-16 13:23:12 UTC (rev 29317)
+++ gnunet/po/de.po     2013-09-16 13:33:53 UTC (rev 29318)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-08-09 23:01+0200\n"
+"POT-Creation-Date: 2013-09-16 15:01+0200\n"
 "PO-Revision-Date: 2006-03-17 21:37+0100\n"
 "Last-Translator: Nils Durner <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -36,7 +36,7 @@
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:962
+#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:971
 msgid "Message was sent successfully"
 msgstr ""
 
@@ -45,12 +45,12 @@
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:966
+#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:975
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:968
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:977
 msgid "ARM API is busy"
 msgstr ""
 
@@ -58,57 +58,57 @@
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:972
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:981
 #, fuzzy
 msgid "Request timed out"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:974
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:983
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Unbekannte Operation `%s'\n"
 
-#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:990
+#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:999
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# bytes in der Datenbank"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:992
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1001
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "`%s' startet\n"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:994
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1003
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:996
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1005
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "`%s' startet\n"
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:998
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1007
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1000
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1009
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1002
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1011
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1004
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1013
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "Namespace `%s' hat das Rating %d.\n"
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1006
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1015
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Fehler beim Starten der Collection.\n"
@@ -118,7 +118,7 @@
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr "`%s' fährt herunter.\n"
 
-#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1010
+#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1019
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -296,50 +296,50 @@
 msgid "Preparing to stop `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1023
+#: src/arm/gnunet-service-arm.c:1022
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1116
+#: src/arm/gnunet-service-arm.c:1115
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1121
+#: src/arm/gnunet-service-arm.c:1120
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1126
+#: src/arm/gnunet-service-arm.c:1125
 #, fuzzy
 msgid "unknown"
 msgstr "Unbekannter Fehler"
 
-#: src/arm/gnunet-service-arm.c:1132
+#: src/arm/gnunet-service-arm.c:1131
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dienst gelöscht.\n"
 
-#: src/arm/gnunet-service-arm.c:1154
+#: src/arm/gnunet-service-arm.c:1153
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1169
+#: src/arm/gnunet-service-arm.c:1168
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1387
+#: src/arm/gnunet-service-arm.c:1386
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/arm/gnunet-service-arm.c:1398
+#: src/arm/gnunet-service-arm.c:1397
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1412
+#: src/arm/gnunet-service-arm.c:1411
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -358,91 +358,91 @@
 msgid "Received last message for %s \n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1529
-#: src/ats/gnunet-service-ats_addresses.c:1563
+#: src/ats/gnunet-service-ats_addresses.c:1607
+#: src/ats/gnunet-service-ats_addresses.c:1641
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1535
+#: src/ats/gnunet-service-ats_addresses.c:1613
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1542
+#: src/ats/gnunet-service-ats_addresses.c:1620
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1569
+#: src/ats/gnunet-service-ats_addresses.c:1647
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1576
+#: src/ats/gnunet-service-ats_addresses.c:1654
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1773
+#: src/ats/gnunet-service-ats_addresses.c:1888
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:848
+#: src/ats/gnunet-service-ats-solver_mlp.c:849
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1171
+#: src/ats/gnunet-service-ats-solver_mlp.c:1193
 #, 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-solver_mlp.c:1216
+#: src/ats/gnunet-service-ats-solver_mlp.c:1238
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1890
+#: src/ats/gnunet-service-ats-solver_mlp.c:1956
 #, 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-solver_mlp.c:1898
+#: src/ats/gnunet-service-ats-solver_mlp.c:1964
 #, 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-solver_mlp.c:1908
+#: src/ats/gnunet-service-ats-solver_mlp.c:1974
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1916
+#: src/ats/gnunet-service-ats-solver_mlp.c:1982
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1927
+#: src/ats/gnunet-service-ats-solver_mlp.c:1993
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_proportional.c:1246
+#: src/ats/gnunet-service-ats-solver_proportional.c:1296
 #, fuzzy, c-format
-msgid "Cannot find network of type `%u' %s\n"
+msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
 #: src/ats-tool/gnunet-ats.c:145
@@ -467,7 +467,7 @@
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:461
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:438
 #: src/transport/gnunet-transport.c:812
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
@@ -560,31 +560,36 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/consensus/gnunet-consensus.c:352
+#: src/consensus/gnunet-consensus-profiler.c:393
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "Anzahl an Durchläufen"
 
-#: src/consensus/gnunet-consensus.c:355
+#: src/consensus/gnunet-consensus-profiler.c:396
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus.c:358 src/set/gnunet-set-profiler.c:287
-#: src/set/gnunet-set-profiler.c:290 src/set/gnunet-set-profiler.c:293
+#: src/consensus/gnunet-consensus-profiler.c:399
+#: src/set/gnunet-set-profiler.c:287 src/set/gnunet-set-profiler.c:290
+#: src/set/gnunet-set-profiler.c:293
 #, fuzzy
 msgid "number of values"
 msgstr "Anzahl an Durchläufen"
 
-#: src/consensus/gnunet-consensus.c:361
+#: src/consensus/gnunet-consensus-profiler.c:402
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
+#: src/consensus/gnunet-consensus-profiler.c:405
+msgid "be more verbose (print received values)"
+msgstr ""
+
 #: src/core/core_api.c:752
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:82
+#: src/core/gnunet-core.c:83
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Ich bin Peer `%s'.\n"
@@ -605,18 +610,18 @@
 msgid "Disconnected from"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:170
+#: src/core/gnunet-core.c:166 src/mesh/gnunet-mesh.c:170
 #: src/peerinfo-tool/gnunet-peerinfo.c:653
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ungültige Kommandozeilen Parameter:\n"
 
-#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:1004
+#: src/core/gnunet-core.c:203 src/transport/gnunet-transport.c:1004
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/core/gnunet-core.c:215
+#: src/core/gnunet-core.c:214
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
@@ -684,7 +689,7 @@
 msgstr "# defragmentierter Nachrichten"
 
 #: src/core/gnunet-service-core_kx.c:922
-#: src/transport/gnunet-service-transport_validation.c:935
+#: src/transport/gnunet-service-transport_validation.c:933
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
@@ -717,7 +722,7 @@
 msgstr "# Klartext PING Nachrichten gesendet"
 
 #: src/core/gnunet-service-core_kx.c:1067
-#: src/transport/gnunet-service-transport_validation.c:1226
+#: src/transport/gnunet-service-transport_validation.c:1224
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
@@ -813,8 +818,8 @@
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/core/gnunet-service-core_sessions.c:210
-#: src/core/gnunet-service-core_sessions.c:280
+#: src/core/gnunet-service-core_sessions.c:209
+#: src/core/gnunet-service-core_sessions.c:279
 #: src/dht/gnunet-service-dht_neighbours.c:641
 #: src/dht/gnunet-service-dht_neighbours.c:700
 #: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
@@ -823,18 +828,18 @@
 #: src/transport/gnunet-service-transport_neighbours.c:1041
 #: src/transport/gnunet-service-transport_neighbours.c:1265
 #: src/transport/gnunet-service-transport_neighbours.c:1274
-#: src/transport/gnunet-service-transport_neighbours.c:2793
-#: src/transport/gnunet-service-transport_neighbours.c:3047
+#: src/transport/gnunet-service-transport_neighbours.c:2799
+#: src/transport/gnunet-service-transport_neighbours.c:3053
 #, fuzzy
 msgid "# peers connected"
 msgstr "# verbundener Knoten"
 
-#: src/core/gnunet-service-core_sessions.c:248
+#: src/core/gnunet-service-core_sessions.c:247
 #, fuzzy
 msgid "# type map refreshes sent"
 msgstr "# p2p Trace-Antworten gesendet"
 
-#: src/core/gnunet-service-core_sessions.c:417
+#: src/core/gnunet-service-core_sessions.c:416
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -849,7 +854,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:115 src/datacache/datacache.c:266
-#: src/datastore/gnunet-service-datastore.c:834
+#: src/datastore/gnunet-service-datastore.c:838
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# bytes in der Datenbank"
@@ -860,8 +865,8 @@
 msgstr "# bytes in der Datenbank"
 
 #: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1483
-#: src/datastore/gnunet-service-datastore.c:1494
+#: src/datastore/gnunet-service-datastore.c:1487
+#: src/datastore/gnunet-service-datastore.c:1498
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
@@ -896,15 +901,16 @@
 
 #: src/datacache/plugin_datacache_sqlite.c:69
 #: src/datacache/plugin_datacache_sqlite.c:72
-#: src/datastore/plugin_datastore_mysql.c:803
-#: src/datastore/plugin_datastore_mysql.c:817
+#: src/datastore/plugin_datastore_mysql.c:806
+#: src/datastore/plugin_datastore_mysql.c:820
 #: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
-#: src/include/gnunet_common.h:616 src/include/gnunet_common.h:623
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:54
+#: src/include/gnunet_common.h:654 src/include/gnunet_common.h:663
+#: src/scalarproduct/scalarproduct.h:56
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
@@ -915,7 +921,7 @@
 
 #: src/datacache/plugin_datacache_sqlite.c:484
 #: src/datastore/plugin_datastore_sqlite.c:401
-#: src/namestore/plugin_namestore_sqlite.c:362
+#: src/namestore/plugin_namestore_sqlite.c:374
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -955,7 +961,7 @@
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608
+#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:276
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# Klartext PONG Nachrichten empfangen"
@@ -986,51 +992,51 @@
 msgid "# status messages received"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/datastore/datastore_api.c:867
+#: src/datastore/datastore_api.c:868
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:934
+#: src/datastore/datastore_api.c:935
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:995
+#: src/datastore/datastore_api.c:996
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1052
+#: src/datastore/datastore_api.c:1055
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1116
+#: src/datastore/datastore_api.c:1119
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/datastore/datastore_api.c:1161
+#: src/datastore/datastore_api.c:1164
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr ""
 "\n"
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1220
+#: src/datastore/datastore_api.c:1223
 #, fuzzy
 msgid "# Results received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/datastore/datastore_api.c:1286
+#: src/datastore/datastore_api.c:1290
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1349
+#: src/datastore/datastore_api.c:1353
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1410
+#: src/datastore/datastore_api.c:1414
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# dht Anfragen weitergeleitet"
@@ -1057,160 +1063,160 @@
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/datastore/gnunet-service-datastore.c:349
+#: src/datastore/gnunet-service-datastore.c:351
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/datastore/gnunet-service-datastore.c:422
+#: src/datastore/gnunet-service-datastore.c:425
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:480
+#: src/datastore/gnunet-service-datastore.c:483
 #: src/gns/gnunet-gns-helper-service-w32.c:155
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:511
+#: src/datastore/gnunet-service-datastore.c:514
 #: src/gns/gnunet-gns-helper-service-w32.c:183
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:626
+#: src/datastore/gnunet-service-datastore.c:630
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:669
+#: src/datastore/gnunet-service-datastore.c:673
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:680
+#: src/datastore/gnunet-service-datastore.c:684
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:688
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:690
+#: src/datastore/gnunet-service-datastore.c:694
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:695
-#: src/datastore/gnunet-service-datastore.c:747
-#: src/datastore/gnunet-service-datastore.c:960
-#: src/datastore/gnunet-service-datastore.c:1417
+#: src/datastore/gnunet-service-datastore.c:699
+#: src/datastore/gnunet-service-datastore.c:751
+#: src/datastore/gnunet-service-datastore.c:964
+#: src/datastore/gnunet-service-datastore.c:1421
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:760
+#: src/datastore/gnunet-service-datastore.c:764
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:846
+#: src/datastore/gnunet-service-datastore.c:850
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1006
+#: src/datastore/gnunet-service-datastore.c:1010
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1018
+#: src/datastore/gnunet-service-datastore.c:1022
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1046
+#: src/datastore/gnunet-service-datastore.c:1050
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1076
+#: src/datastore/gnunet-service-datastore.c:1080
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1109
+#: src/datastore/gnunet-service-datastore.c:1113
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1134
+#: src/datastore/gnunet-service-datastore.c:1138
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1142
+#: src/datastore/gnunet-service-datastore.c:1146
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1174
+#: src/datastore/gnunet-service-datastore.c:1178
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/datastore/gnunet-service-datastore.c:1216
+#: src/datastore/gnunet-service-datastore.c:1220
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1277
+#: src/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1286
+#: src/datastore/gnunet-service-datastore.c:1290
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1488
+#: src/datastore/gnunet-service-datastore.c:1492
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes erlaubt in der Datenbank"
 
-#: src/datastore/gnunet-service-datastore.c:1499
+#: src/datastore/gnunet-service-datastore.c:1503
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1501
+#: src/datastore/gnunet-service-datastore.c:1505
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1514
+#: src/datastore/gnunet-service-datastore.c:1518
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1532
-#: src/datastore/gnunet-service-datastore.c:1548
+#: src/datastore/gnunet-service-datastore.c:1536
+#: src/datastore/gnunet-service-datastore.c:1552
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/datastore/gnunet-service-datastore.c:1578
+#: src/datastore/gnunet-service-datastore.c:1582
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1607
+#: src/datastore/gnunet-service-datastore.c:1611
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1612
+#: src/datastore/gnunet-service-datastore.c:1616
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1615
+#: src/datastore/gnunet-service-datastore.c:1619
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
@@ -1219,17 +1225,17 @@
 msgid "Heap database running\n"
 msgstr "sqlite Datenspeicher"
 
-#: src/datastore/plugin_datastore_mysql.c:780
+#: src/datastore/plugin_datastore_mysql.c:783
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/datastore/plugin_datastore_mysql.c:788
+#: src/datastore/plugin_datastore_mysql.c:791
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "`%s' an `%s' schlug fehl bei %s:%d mit dem Fehler: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1019
+#: src/datastore/plugin_datastore_mysql.c:1022
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -1241,7 +1247,7 @@
 "Fehler beim Empfangen der Antwort von gnunetd.\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
-#: src/namestore/plugin_namestore_postgres.c:652
+#: src/namestore/plugin_namestore_postgres.c:735
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1251,29 +1257,30 @@
 msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:253
-#: src/namestore/plugin_namestore_sqlite.c:223
+#: src/namestore/plugin_namestore_sqlite.c:220
+#: src/psycstore/plugin_psycstore_sqlite.c:319
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:648
+#: src/datastore/plugin_datastore_sqlite.c:649
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "Ungültige Daten in %s. Korrektur wird versucht (durch Löschung).\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1134
+#: src/datastore/plugin_datastore_sqlite.c:1135
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1153
+#: src/datastore/plugin_datastore_sqlite.c:1154
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1193
-#: src/namestore/plugin_namestore_sqlite.c:829
+#: src/datastore/plugin_datastore_sqlite.c:1194
+#: src/namestore/plugin_namestore_sqlite.c:893
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite Datenspeicher"
@@ -1330,9 +1337,9 @@
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:861
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:864
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:899
+#: src/nse/gnunet-nse-profiler.c:904
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1565,50 +1572,50 @@
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1575
+#: src/dht/gnunet-service-dht_neighbours.c:1573
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1578
+#: src/dht/gnunet-service-dht_neighbours.c:1576
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1733
+#: src/dht/gnunet-service-dht_neighbours.c:1731
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1741
+#: src/dht/gnunet-service-dht_neighbours.c:1739
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1832
+#: src/dht/gnunet-service-dht_neighbours.c:1830
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1835
+#: src/dht/gnunet-service-dht_neighbours.c:1833
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1888
+#: src/dht/gnunet-service-dht_neighbours.c:1886
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1902
+#: src/dht/gnunet-service-dht_neighbours.c:1900
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1979
+#: src/dht/gnunet-service-dht_neighbours.c:1977
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1982
+#: src/dht/gnunet-service-dht_neighbours.c:1980
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Bytes empfangen über TCP"
@@ -1642,11 +1649,11 @@
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:400
+#: src/dht/gnunet-service-dht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:418
+#: src/dht/gnunet-service-dht_routing.c:417
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# Client Trace-Anfragen empfangen"
@@ -1665,12 +1672,12 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:152
+#: src/dns/dnsparser.c:233
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/dns/dnsparser.c:626
+#: src/dns/dnsparser.c:751
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
@@ -1681,7 +1688,6 @@
 msgstr "IP des Hosts `%s' konnte nicht ermittelt werden: %s\n"
 
 #: src/dns/dnsstub.c:296 src/dns/dnsstub.c:384
-#: src/gns/gnunet-service-gns_resolver.c:1651
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
@@ -1793,14 +1799,14 @@
 msgstr "# Bytes des Typs %d übertragen"
 
 #: src/exit/gnunet-daemon-exit.c:924 src/exit/gnunet-daemon-exit.c:2349
-#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1453
-#: src/vpn/gnunet-service-vpn.c:1852 src/vpn/gnunet-service-vpn.c:2015
+#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1451
+#: src/vpn/gnunet-service-vpn.c:1850 src/vpn/gnunet-service-vpn.c:2013
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:961 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1509
-#: src/vpn/gnunet-service-vpn.c:1911 src/vpn/gnunet-service-vpn.c:2048
+#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1507
+#: src/vpn/gnunet-service-vpn.c:1909 src/vpn/gnunet-service-vpn.c:2046
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -1907,13 +1913,13 @@
 msgid "# ICMP service requests received via mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1443
-#: src/vpn/gnunet-service-vpn.c:2009
+#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1441
+#: src/vpn/gnunet-service-vpn.c:2007
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1479
-#: src/vpn/gnunet-service-vpn.c:1491 src/vpn/gnunet-service-vpn.c:1899
+#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1477
+#: src/vpn/gnunet-service-vpn.c:1489 src/vpn/gnunet-service-vpn.c:1897
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
@@ -2047,69 +2053,69 @@
 msgid "Experiment `%s': Required capabilities invalid \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:393
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:392
 #, fuzzy, c-format
 msgid "Failed to parse file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:419
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:444
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:418
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:443
 msgid ""
 "No valid experiment issuers configured! Set value to peer id of issuer! "
 "Exit...\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:429
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:428
 #, fuzzy, c-format
 msgid "Invalid value `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:453
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
 #, fuzzy, c-format
 msgid "Invalid public key `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:460
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:459
 #, fuzzy, c-format
 msgid "Found issuer for public key `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:463
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:462
 #, fuzzy, c-format
 msgid "No issuer for public key `%s'\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:480
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:479
 #, fuzzy, c-format
 msgid "Cannot read experiments file `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:220
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
 #, c-format
 msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:290
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:291
 #, c-format
 msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:421
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:422
 #, c-format
 msgid "Added peer `%s' as active node\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:848
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:849
 #, fuzzy, c-format
 msgid "Connected to peer %s\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:877
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:878
 #, fuzzy, c-format
 msgid "Disconnected from peer %s\n"
 msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1057
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1058
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -2204,56 +2210,56 @@
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1061
+#: src/fs/fs_api.c:1062
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1557
+#: src/fs/fs_api.c:1565
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1571
+#: src/fs/fs_api.c:1579
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2228
+#: src/fs/fs_api.c:2236
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2238
+#: src/fs/fs_api.c:2246
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2364 src/fs/fs_api.c:2604
+#: src/fs/fs_api.c:2372 src/fs/fs_api.c:2612
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2381
+#: src/fs/fs_api.c:2389
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2896
+#: src/fs/fs_api.c:2402 src/fs/fs_api.c:2421 src/fs/fs_api.c:2904
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2595
+#: src/fs/fs_api.c:2603
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2840
+#: src/fs/fs_api.c:2848
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2934
+#: src/fs/fs_api.c:2942
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2367,80 +2373,69 @@
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_pseudonym.c:327 src/fs/fs_pseudonym.c:631
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:414
 #, fuzzy, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
-
-#: src/fs/fs_pseudonym.c:463 src/fs/fs_pseudonym.c:489
-#: src/fs/fs_pseudonym.c:627
-#, fuzzy
-msgid "no-name"
-msgstr "Name anzeigen"
-
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:399
-#, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:624 src/fs/fs_publish.c:641 src/fs/fs_publish.c:680
-#: src/fs/fs_publish.c:700 src/fs/fs_publish.c:725 src/fs/fs_publish.c:865
+#: src/fs/fs_publish.c:642 src/fs/fs_publish.c:659 src/fs/fs_publish.c:698
+#: src/fs/fs_publish.c:719 src/fs/fs_publish.c:743 src/fs/fs_publish.c:889
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indizieren der Datei `%s' schlug fehl.  Versuch Datei einzufügen...\n"
 
-#: src/fs/fs_publish.c:626
+#: src/fs/fs_publish.c:644
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:638
+#: src/fs/fs_publish.c:656
 #, fuzzy
 msgid "unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/fs/fs_publish.c:681
+#: src/fs/fs_publish.c:700
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:701
+#: src/fs/fs_publish.c:720
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:726
+#: src/fs/fs_publish.c:745
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/fs/fs_publish.c:749
+#: src/fs/fs_publish.c:768
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/fs/fs_publish.c:814
+#: src/fs/fs_publish.c:837
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/fs/fs_publish.c:820
+#: src/fs/fs_publish.c:843
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/fs/fs_publish.c:866
+#: src/fs/fs_publish.c:890
 #, fuzzy
 msgid "needs to be an actual file"
 msgstr "`%s' ist keine normale Datei.\n"
 
-#: src/fs/fs_publish.c:1092
+#: src/fs/fs_publish.c:1126
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1164
+#: src/fs/fs_publish.c:1198
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2450,6 +2445,11 @@
 msgid "Could not connect to datastore."
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
+#: src/fs/fs_publish_ublock.c:219
+#, fuzzy
+msgid "Internal error."
+msgstr "Unbekannter Fehler.\n"
+
 #: src/fs/fs_search.c:815
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
@@ -2460,59 +2460,59 @@
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:58
+#: src/fs/fs_unindex.c:59
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_unindex.c:64
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/fs/fs_unindex.c:233
+#: src/fs/fs_unindex.c:234
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:241
+#: src/fs/fs_unindex.c:242
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:249
+#: src/fs/fs_unindex.c:250
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Ungültige Antwort auf `%s'.\n"
 
-#: src/fs/fs_unindex.c:293
+#: src/fs/fs_unindex.c:291
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:349 src/fs/fs_unindex.c:361
+#: src/fs/fs_unindex.c:347 src/fs/fs_unindex.c:359
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/fs/fs_unindex.c:357
+#: src/fs/fs_unindex.c:355
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "=\tFehler beim Lesen des Verzeichnisses.\n"
 
-#: src/fs/fs_unindex.c:416
+#: src/fs/fs_unindex.c:414
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_unindex.c:565 src/fs/fs_unindex.c:628
+#: src/fs/fs_unindex.c:562 src/fs/fs_unindex.c:626
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/fs/fs_unindex.c:641
+#: src/fs/fs_unindex.c:639
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/fs/fs_unindex.c:675
+#: src/fs/fs_unindex.c:673
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
@@ -2543,13 +2543,16 @@
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
-#: src/fs/fs_uri.c:629
+#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:629
 msgid "SKS URI malformed"
 msgstr ""
 
+#: src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
+msgid "LOC URI malformed"
+msgstr ""
+
 #: src/fs/fs_uri.c:611
-msgid "SKS URI malformed (could not decode public key)"
+msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
 #: src/fs/fs_uri.c:617
@@ -2572,21 +2575,21 @@
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:911
+#: src/fs/fs_uri.c:912
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/fs/fs_uri.c:917
+#: src/fs/fs_uri.c:918
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/fs/fs_uri.c:1099 src/fs/fs_uri.c:1126
+#: src/fs/fs_uri.c:1102 src/fs/fs_uri.c:1129
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1132
+#: src/fs/fs_uri.c:1135
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2624,25 +2627,23 @@
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:310
-#: src/fs/gnunet-publish.c:808
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:811
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad an Sender-Anonymität festlegen"
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:812
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:815
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:815
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:818
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:839
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:842
 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:329
-#: src/fs/gnunet-publish.c:846
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:849
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2650,7 +2651,7 @@
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:656
+#: src/fs/gnunet-daemon-fsprofiler.c:657
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
@@ -2740,7 +2741,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:781
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:784
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2789,73 +2790,22 @@
 msgid "Special file-sharing operations"
 msgstr "Alle Optionen anzeigen"
 
-#: src/fs/gnunet-fs-profiler.c:190
+#: src/fs/gnunet-fs-profiler.c:193
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:193
+#: src/fs/gnunet-fs-profiler.c:196
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:196
+#: src/fs/gnunet-fs-profiler.c:199
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:205
+#: src/fs/gnunet-fs-profiler.c:208
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:227 src/fs/gnunet-pseudonym.c:229
-#, fuzzy, c-format
-msgid "Option `%s' ignored\n"
-msgstr "%s: Option `%s' ist mehrdeutig\n"
-
-#: src/fs/gnunet-pseudonym.c:265 src/statistics/gnunet-statistics.c:305
-#, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/fs/gnunet-pseudonym.c:313
-msgid "advertise namespace NAME"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:316
-#, fuzzy
-msgid ""
-"add an additional keyword for the advertisment (this option can be specified "
-"multiple times)"
-msgstr ""
-"Ein zusätzliches Schlüsselwort für alle Dateien und Verzeichnisse hinzufügen "
-"(diese Option kann mehrmals angegeben werden)"
-
-#: src/fs/gnunet-pseudonym.c:320 src/fs/gnunet-publish.c:827
-msgid "set the meta-data for the given TYPE to the given VALUE"
-msgstr ""
-"Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
-"setzen"
-
-#: src/fs/gnunet-pseudonym.c:323
-msgid "use the given PRIORITY for the advertisments"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:326
-msgid "do not print names of remote namespaces"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:332
-#, fuzzy
-msgid "specify ID of the root of the namespace"
-msgstr "das Rating eines Namespaces setzen"
-
-#: src/fs/gnunet-pseudonym.c:335
-#, fuzzy
-msgid "change rating of namespace ID by VALUE"
-msgstr "das Rating eines Namespaces setzen"
-
-#: src/fs/gnunet-pseudonym.c:347
-msgid "Manage GNUnet pseudonyms."
-msgstr ""
-
 #: src/fs/gnunet-publish.c:230
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -2945,39 +2895,39 @@
 msgid "Failed to access `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-publish.c:681
+#: src/fs/gnunet-publish.c:682
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:731
+#: src/fs/gnunet-publish.c:734
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:738
+#: src/fs/gnunet-publish.c:741
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-publish.c:744
+#: src/fs/gnunet-publish.c:747
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/fs/gnunet-publish.c:752 src/vpn/gnunet-vpn.c:213
+#: src/fs/gnunet-publish.c:755 src/vpn/gnunet-vpn.c:213
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/fs/gnunet-publish.c:762 src/fs/gnunet-publish.c:769
+#: src/fs/gnunet-publish.c:765 src/fs/gnunet-publish.c:772
 #: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/fs/gnunet-publish.c:819
+#: src/fs/gnunet-publish.c:822
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2985,7 +2935,7 @@
 "Liste der extrahierten Schlüsselworte, die verwendet werden würden, "
 "ausgeben, aber keinen Upload durchführen"
 
-#: src/fs/gnunet-publish.c:823
+#: src/fs/gnunet-publish.c:826
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2994,6 +2944,12 @@
 "obersten Ebene hinzufügen (diese Option kann mehrmals angegeben werden)"
 
 #: src/fs/gnunet-publish.c:830
+msgid "set the meta-data for the given TYPE to the given VALUE"
+msgstr ""
+"Die Meta-Daten des angegebenen Typs TYPE auf den angegebenen Wert VALUE "
+"setzen"
+
+#: src/fs/gnunet-publish.c:833
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3001,7 +2957,7 @@
 "Nicht indizieren, sondern komplett einfügen (speichert die gesamte Datei in "
 "verschlüsselter Form in der GNUnet Datenbank)"
 
-#: src/fs/gnunet-publish.c:835
+#: src/fs/gnunet-publish.c:838
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3009,32 +2965,32 @@
 "ID einer aktualisierten Version angeben, die in der Zukunft veröffentlich "
 "werden soll. (nur für das Einfügen in Namespaces)"
 
-#: src/fs/gnunet-publish.c:843
+#: src/fs/gnunet-publish.c:846
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "Die Datei unter dem Pseudonym NAME veröffentlichen (platziert die Datei in "
 "einem Namespace)"
 
-#: src/fs/gnunet-publish.c:849
+#: src/fs/gnunet-publish.c:852
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:853
+#: src/fs/gnunet-publish.c:856
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "die ID dieser Version der Veröffentlichung setzen (nur für das Einfügen in "
 "Namespaces)"
 
-#: src/fs/gnunet-publish.c:857
+#: src/fs/gnunet-publish.c:860
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:873
+#: src/fs/gnunet-publish.c:876
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3083,9 +3039,9 @@
 msgid "# Loopback routes suppressed"
 msgstr "# gap Routing erfolgreich (insgesamt)"
 
-#: src/fs/gnunet-service-fs.c:640 src/hostlist/gnunet-daemon-hostlist.c:291
-#: src/topology/gnunet-daemon-topology.c:1314
-#: src/topology/gnunet-daemon-topology.c:1321
+#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:293
+#: src/topology/gnunet-daemon-topology.c:1315
+#: src/topology/gnunet-daemon-topology.c:1322
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
@@ -3294,27 +3250,27 @@
 msgid "# query messages sent to other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
 
-#: src/fs/gnunet-service-fs_pe.c:482
-msgid "# delay heap timeout"
+#: src/fs/gnunet-service-fs_pe.c:484
+msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:490
+#: src/fs/gnunet-service-fs_pe.c:492
 #, fuzzy
 msgid "# query plans executed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/fs/gnunet-service-fs_pe.c:550
+#: src/fs/gnunet-service-fs_pe.c:552
 #, fuzzy
 msgid "# requests merged"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pe.c:558
+#: src/fs/gnunet-service-fs_pe.c:560
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/fs/gnunet-service-fs_pe.c:612 src/fs/gnunet-service-fs_pe.c:696
-#: src/fs/gnunet-service-fs_pe.c:767
+#: src/fs/gnunet-service-fs_pe.c:614 src/fs/gnunet-service-fs_pe.c:698
+#: src/fs/gnunet-service-fs_pe.c:769
 msgid "# query plan entries"
 msgstr ""
 
@@ -3464,191 +3420,229 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:598
+#: src/gns/gns_api.c:385
 #, fuzzy
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr "Fehler beim Empfangen der Antwort von gnunetd auf die `%s' Nachricht\n"
 
-#: src/gns/gnunet-dns2gns.c:192
+#: src/gns/gnunet-dns2gns.c:228
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-dns2gns.c:367
+#: src/gns/gnunet-dns2gns.c:400
 #, fuzzy, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-dns2gns.c:383
+#: src/gns/gnunet-dns2gns.c:416
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/gns/gnunet-dns2gns.c:391
+#: src/gns/gnunet-dns2gns.c:424
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "GAP hat ungültige Inhalte von `%s' empfangen.\n"
 
-#: src/gns/gnunet-dns2gns.c:681
-msgid "IP of recursive DNS resolver to use (required)"
+#: src/gns/gnunet-dns2gns.c:703
+msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:684
-msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+#: src/gns/gnunet-dns2gns.c:729
+#, fuzzy
+msgid "No DNS server specified!\n"
+msgstr "Keine Schlüsselwörter angegeben!\n"
+
+#: src/gns/gnunet-dns2gns.c:751
+#, fuzzy
+msgid "No valid GNS zone specified!\n"
+msgstr "Keine Schlüsselwörter angegeben!\n"
+
+#: src/gns/gnunet-dns2gns.c:772
+msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:687
+#: src/gns/gnunet-dns2gns.c:775
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:690
+#: src/gns/gnunet-dns2gns.c:778
+msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:781
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:703
+#: src/gns/gnunet-dns2gns.c:784
+msgid "Public key of the GNS zone to use (overrides default)"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:797
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:221
+#: src/gns/gnunet-gns.c:205
+#, c-format
+msgid "Please specify name to lookup!\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:285
+#, c-format
+msgid "Ego for `%s' not found, cannot perform lookup.\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:323
+#, c-format
+msgid ""
+"Ego for `master-zone' not found, cannot perform lookup.  Did you run gnunet-"
+"gns-import.sh?\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:352
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-gns.c:335
+#: src/gns/gnunet-gns.c:365
 #, c-format
-msgid "Please specify lookup, shorten or authority operation!\n"
+msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:356
-#, fuzzy
-msgid "try to shorten a given name"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#: src/gns/gnunet-gns.c:359
+#: src/gns/gnunet-gns.c:414
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:362
-msgid "Get the authority of a particular name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:365
+#: src/gns/gnunet-gns.c:417
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns.c:368
+#: src/gns/gnunet-gns.c:420
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:381
-msgid "GNUnet GNS access tool"
-msgstr ""
+#: src/gns/gnunet-gns.c:423
+#, fuzzy
+msgid "Specify the public key of the zone to lookup the record in"
+msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns-fcfsd.c:451
-#, fuzzy, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
+#: src/gns/gnunet-gns.c:426
+#, fuzzy
+msgid "Specify the name of the ego of the zone to lookup the record in"
+msgstr "Die Priorität des Inhalts angeben"
 
-#: src/gns/gnunet-gns-fcfsd.c:480
-#, fuzzy, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+#: src/gns/gnunet-gns.c:439
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/gns/gnunet-gns-fcfsd.c:524
+#: src/gns/gnunet-gns-proxy.c:60 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:960
+#: src/hostlist/hostlist-client.c:965
+#: src/transport/plugin_transport_http_client.c:1068
+#: src/transport/plugin_transport_http_client.c:1083
 #, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:587
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-fcfsd.c:649
+#: src/gns/gnunet-gns-proxy.c:2344
 #, fuzzy, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+msgid "Unable to import private key from file `%s'\n"
+msgstr "Fehler beim Anlegen des Benutzerkontos:"
 
-#: src/gns/gnunet-gns-fcfsd.c:665
+#: src/gns/gnunet-gns-proxy.c:2372
 #, fuzzy, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+msgid "Unable to import certificate %s\n"
+msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/gnunet-gns-fcfsd.c:701
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-fcfsd.c:709
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-fcfsd.c:913 src/namestore/gnunet-namestore.c:492
+#: src/gns/gnunet-gns-proxy.c:2637 src/namestore/gnunet-namestore-fcfsd.c:958
 #, fuzzy
-msgid "Failed to read or create private zone key\n"
-msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
-
-#: src/gns/gnunet-gns-fcfsd.c:923 src/namestore/gnunet-namestore.c:503
-#, fuzzy
-msgid "Failed to connect to namestore\n"
-msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
-
-#: src/gns/gnunet-gns-fcfsd.c:939 src/gns/gnunet-gns-proxy.c:2857
-#, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:973
-msgid "GNUnet GNS first come first serve registration service"
+#: src/gns/gnunet-gns-proxy.c:3020
+msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2494
-#, fuzzy, c-format
-msgid "Unable to import private key from file `%s'\n"
-msgstr "Fehler beim Anlegen des Benutzerkontos:"
+#: src/gns/gnunet-gns-proxy.c:3060
+msgid "No ego configured for `master-zone`\n"
+msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2522
+#: src/gns/gnunet-gns-proxy.c:3120
 #, fuzzy, c-format
-msgid "Unable to import certificate %s\n"
-msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
+msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:3510
+#: src/gns/gnunet-gns-proxy.c:3156
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3513
+#: src/gns/gnunet-gns-proxy.c:3159
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3525
+#: src/gns/gnunet-gns-proxy.c:3178
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:497
-#, c-format
-msgid "Records for name `%s' in zone %s too large to fit into DHT"
-msgstr ""
-
-#: src/gns/gnunet-service-gns.c:1225
+#: src/gns/gnunet-service-gns.c:649
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/gns/gnunet-service-gns.c:1286
+#: src/gns/gnunet-service-gns.c:692
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns.c:1297
+#: src/gns/gnunet-service-gns.c:708
 #, fuzzy
-msgid "Unable to initialize resolver!\n"
-msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
+msgid "valid public key required"
+msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:3446
+#: src/gns/gnunet-service-gns_interceptor.c:201
+#, fuzzy
+msgid "Error converting GNS response to DNS response!\n"
+msgstr "Fehler beim Konvertieren von Parametern in URI!\n"
+
+#: src/gns/gnunet-service-gns_interceptor.c:307
+#, fuzzy
+msgid "Failed to connect to the DNS service!\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:717
+#, fuzzy
+msgid "Failed to parse DNS response\n"
+msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:843
 #, c-format
-msgid "Not a GADS TLD: `%s'\n"
+msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
+#: src/gns/gnunet-service-gns_resolver.c:1475
+#, c-format
+msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1499
+msgid "GNS lookup recursion failed (no delegation record found)\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1523
+#, fuzzy, c-format
+msgid "Failed to cache GNS resolution: %s\n"
+msgstr "HTTP Anfrage konnte nicht an Host `%s' gesendet werden: %s\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:1782
+#, c-format
+msgid "Hostname `%s' is not well-formed, resolution fails\n"
+msgstr ""
+
 #: src/hello/gnunet-hello.c:123
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3688,66 +3682,66 @@
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:945
+#: src/hello/hello.c:947
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/hello/hello.c:954
+#: src/hello/hello.c:956
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Fehler beim Speichern der Konfiguration!"
 
-#: src/hello/hello.c:964
+#: src/hello/hello.c:966
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hello/hello.c:974
+#: src/hello/hello.c:976
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/hello/hello.c:991
+#: src/hello/hello.c:993
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:1000
+#: src/hello/hello.c:1002
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1019
+#: src/hello/hello.c:1021
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:258
+#: src/hostlist/gnunet-daemon-hostlist.c:260
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:311
+#: src/hostlist/gnunet-daemon-hostlist.c:313
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:318
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:319
+#: src/hostlist/gnunet-daemon-hostlist.c:321
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:323
+#: src/hostlist/gnunet-daemon-hostlist.c:325
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:338
+#: src/hostlist/gnunet-daemon-hostlist.c:340
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -3770,17 +3764,7 @@
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
-#: 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:960 src/hostlist/hostlist-client.c:965
-#: src/transport/plugin_transport_http_client.c:1063
-#: src/transport/plugin_transport_http_client.c:1078
-#, c-format
-msgid "%s failed at %s:%d: `%s'\n"
-msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
-
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1319
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1330
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -3834,78 +3818,78 @@
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1503
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045
+#: src/hostlist/hostlist-client.c:1046
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1105 src/hostlist/hostlist-client.c:1121
+#: src/hostlist/hostlist-client.c:1106 src/hostlist/hostlist-client.c:1122
 #, fuzzy
 msgid "# active connections"
 msgstr "GNUnet Konfiguration"
 
-#: src/hostlist/hostlist-client.c:1267
+#: src/hostlist/hostlist-client.c:1278
 #, 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:1271
+#: src/hostlist/hostlist-client.c:1282
 #, 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:1282
+#: src/hostlist/hostlist-client.c:1293
 #, 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:1315
+#: src/hostlist/hostlist-client.c:1326
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1317
+#: src/hostlist/hostlist-client.c:1328
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1362
+#: src/hostlist/hostlist-client.c:1373
 #, 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:1367
+#: src/hostlist/hostlist-client.c:1378
 #, 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:1391 src/hostlist/hostlist-client.c:1408
+#: src/hostlist/hostlist-client.c:1402 src/hostlist/hostlist-client.c:1419
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1403
+#: src/hostlist/hostlist-client.c:1414
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1457
+#: src/hostlist/hostlist-client.c:1468
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1469
+#: src/hostlist/hostlist-client.c:1480
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1481
+#: src/hostlist/hostlist-client.c:1492
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1485
+#: src/hostlist/hostlist-client.c:1496
 #, fuzzy, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
@@ -3984,7 +3968,7 @@
 msgstr ""
 
 #: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:659
-#: src/transport/gnunet-service-transport.c:785
+#: src/transport/gnunet-service-transport.c:806
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
@@ -4009,99 +3993,114 @@
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "`%s' ist nicht verfügbar."
 
-#: src/hostlist/hostlist-server.c:675
+#: src/hostlist/hostlist-server.c:676
 #, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/identity/gnunet-identity.c:135
+#: src/identity/gnunet-identity.c:165
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/identity/gnunet-identity.c:237
+#: src/identity/gnunet-identity.c:184
+#, fuzzy, c-format
+msgid "Failed to set default ego: %s\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
+
+#: src/identity/gnunet-identity.c:327
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:240
+#: src/identity/gnunet-identity.c:330
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:243
+#: src/identity/gnunet-identity.c:333
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:246
+#: src/identity/gnunet-identity.c:336
+msgid ""
+"set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:339
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:255
+#: src/identity/gnunet-identity.c:342
+msgid ""
+"set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:351
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:336
+#: src/identity/gnunet-service-identity.c:337
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:357
+#: src/identity/gnunet-service-identity.c:360
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:434
-#: src/identity/gnunet-service-identity.c:665
-#: src/identity/gnunet-service-identity.c:773
+#: src/identity/gnunet-service-identity.c:437
+#: src/identity/gnunet-service-identity.c:668
+#: src/identity/gnunet-service-identity.c:776
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/identity/gnunet-service-identity.c:441
+#: src/identity/gnunet-service-identity.c:444
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:511
+#: src/identity/gnunet-service-identity.c:514
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:642
+#: src/identity/gnunet-service-identity.c:645
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:681
-#: src/identity/gnunet-service-identity.c:790
+#: src/identity/gnunet-service-identity.c:684
+#: src/identity/gnunet-service-identity.c:793
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:824
+#: src/identity/gnunet-service-identity.c:827
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/identity/gnunet-service-identity.c:897
+#: src/identity/gnunet-service-identity.c:900
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/identity/gnunet-service-identity.c:909
+#: src/identity/gnunet-service-identity.c:912
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/integration-tests/connection_watchdog.c:990
+#: src/integration-tests/connection_watchdog.c:998
 #, fuzzy, c-format
 msgid "Transport plugin: `%s' port %llu\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/integration-tests/connection_watchdog.c:1023
+#: src/integration-tests/connection_watchdog.c:1031
 #, fuzzy, c-format
 msgid "Found %u transport plugins: `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/integration-tests/connection_watchdog.c:1082
+#: src/integration-tests/connection_watchdog.c:1091
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1091
-#: src/template/gnunet-template.c:70
+#: src/integration-tests/connection_watchdog.c:1100
+#: src/multicast/gnunet-multicast.c:70 src/template/gnunet-template.c:70
 #, fuzzy
 msgid "help text"
 msgstr "Hilfetext für -t"
@@ -4121,25 +4120,22 @@
 msgid "Print information about mesh tunnels and peers."
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/mesh/gnunet-service-mesh.c:5640
+#: src/mesh/gnunet-service-mesh.c:5634 src/mesh/gnunet-service-mesh-enc.c:7060
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:5780 src/mesh/gnunet-service-mesh.c:5792
-#: src/mesh/gnunet-service-mesh.c:5804 src/mesh/gnunet-service-mesh.c:5816
-#: src/mesh/gnunet-service-mesh.c:5828 src/mesh/gnunet-service-mesh.c:5840
-#: src/nse/gnunet-service-nse.c:1425 src/nse/gnunet-service-nse.c:1443
+#: src/mesh/gnunet-service-mesh.c:5774 src/mesh/gnunet-service-mesh.c:5786
+#: src/mesh/gnunet-service-mesh.c:5798 src/mesh/gnunet-service-mesh.c:5810
+#: src/mesh/gnunet-service-mesh.c:5822 src/mesh/gnunet-service-mesh.c:5834
+#: src/nse/gnunet-service-nse.c:1440 src/nse/gnunet-service-nse.c:1458
 #: src/regex/gnunet-daemon-regexprofiler.c:270
-#: src/regex/gnunet-daemon-regexprofiler.c:282
-#: src/regex/gnunet-daemon-regexprofiler.c:294
-#: src/regex/gnunet-daemon-regexprofiler.c:307
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:5852 src/mesh/gnunet-service-mesh.c:5862
-#: src/mesh/gnunet-service-mesh.c:5887
+#: src/mesh/gnunet-service-mesh.c:5846 src/mesh/gnunet-service-mesh.c:5856
+#: src/mesh/gnunet-service-mesh.c:5881
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -4155,204 +4151,235 @@
 msgid "Could not access file `%s': %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/namestore/gnunet-namestore.c:250
+#: src/namestore/gnunet-namestore.c:258
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:281
+#: src/namestore/gnunet-namestore.c:289
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr ""
 "\n"
 "Fehler beim Uploaden der Datei: %s\n"
 
-#: src/namestore/gnunet-namestore.c:342
+#: src/namestore/gnunet-namestore.c:338
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:358
-msgid "for at least"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:359
-msgid "until"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:475
-#, fuzzy, c-format
-msgid "Using default zone file `%s'\n"
-msgstr "Collection `%s' begonnen.\n"
-
-#: src/namestore/gnunet-namestore.c:484
+#: src/namestore/gnunet-namestore.c:446
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:513 src/namestore/gnunet-namestore.c:522
-#: src/namestore/gnunet-namestore.c:539 src/namestore/gnunet-namestore.c:561
-#: src/namestore/gnunet-namestore.c:605
+#: src/namestore/gnunet-namestore.c:456
+#: src/namestore/gnunet-namestore-fcfsd.c:992
+#, fuzzy
+msgid "Failed to connect to namestore\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
+
+#: src/namestore/gnunet-namestore.c:464 src/namestore/gnunet-namestore.c:473
+#: src/namestore/gnunet-namestore.c:490 src/namestore/gnunet-namestore.c:512
+#: src/namestore/gnunet-namestore.c:554
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/namestore/gnunet-namestore.c:514 src/namestore/gnunet-namestore.c:523
-#: src/namestore/gnunet-namestore.c:540 src/namestore/gnunet-namestore.c:562
+#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:474
+#: src/namestore/gnunet-namestore.c:491 src/namestore/gnunet-namestore.c:513
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:531
+#: src/namestore/gnunet-namestore.c:482
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/namestore/gnunet-namestore.c:551
+#: src/namestore/gnunet-namestore.c:502
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
 
-#: src/namestore/gnunet-namestore.c:587
+#: src/namestore/gnunet-namestore.c:538
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:606
+#: src/namestore/gnunet-namestore.c:555
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:649
+#: src/namestore/gnunet-namestore.c:588
 #: src/peerinfo-tool/gnunet-peerinfo.c:711
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:727
+#: src/namestore/gnunet-namestore.c:645
+#, fuzzy, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr "`%s': unbekannter Dienst: %s\n"
+
+#: src/namestore/gnunet-namestore.c:674
+#, fuzzy, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
+
+#: src/namestore/gnunet-namestore.c:702
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:730
+#: src/namestore/gnunet-namestore.c:705
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:733
+#: src/namestore/gnunet-namestore.c:708
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:736
+#: src/namestore/gnunet-namestore.c:711
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:739
+#: src/namestore/gnunet-namestore.c:714
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
 
-#: src/namestore/gnunet-namestore.c:742
+#: src/namestore/gnunet-namestore.c:717
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:745
+#: src/namestore/gnunet-namestore.c:720
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:748
+#: src/namestore/gnunet-namestore.c:723
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:751
+#: src/namestore/gnunet-namestore.c:726
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:754
+#: src/namestore/gnunet-namestore.c:729
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:757
-msgid "create or list non-authority record"
+#: src/namestore/gnunet-namestore.c:732
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:760
-msgid "filename with the zone key"
+#: src/namestore/gnunet-namestore.c:735
+msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:771
+#: src/namestore/gnunet-namestore.c:746
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
 
-#: src/namestore/gnunet-service-namestore.c:300
-#: src/namestore/gnunet-service-namestore.c:318
+#: src/namestore/gnunet-namestore-fcfsd.c:456
 #, fuzzy, c-format
-msgid "Failed to write zone key to file `%s': %s\n"
-msgstr "Datei wurde als `%s' gespeichert.\n"
+msgid "Unsupported form value `%s'\n"
+msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/namestore/gnunet-service-namestore.c:302
-msgid "file exists but reading key failed"
+#: src/namestore/gnunet-namestore-fcfsd.c:485
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:320
-msgid "file exists with different key"
+#: src/namestore/gnunet-namestore-fcfsd.c:560
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:2127
-#, fuzzy
-msgid "No directory to load zonefiles specified in configuration\n"
-msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:670
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/namestore/gnunet-service-namestore.c:2137
-#, c-format
-msgid "Creating directory `%s' for zone files failed!\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:686
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:722
+msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:346
-msgid "Namestore failed to add record"
+#: src/namestore/gnunet-namestore-fcfsd.c:730
+msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:372
-msgid "Namestore failed to add record\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:932
+msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/namestore_api_common.c:532
-#: src/namestore/namestore_api_common.c:672
+#: src/namestore/gnunet-namestore-fcfsd.c:1027
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:674
+msgid "Failed to cache encrypted block of my own zone!\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:319
+msgid "Namestore failed to cache block"
+msgstr ""
+
+#: src/namestore/namestore_api.c:345
+msgid "Namestore failed to store record\n"
+msgstr ""
+
+#: src/namestore/namestore_api_common.c:691
+#: src/namestore/namestore_api_common.c:831
 #, fuzzy, c-format
 msgid "Unsupported record type %d\n"
 msgstr "Ungültige Nachricht des Typs %u empfangen. Nachricht wird verworfen.\n"
 
-#: src/namestore/namestore_api_common.c:539
+#: src/namestore/namestore_api_common.c:698
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/namestore_api_common.c:562
+#: src/namestore/namestore_api_common.c:721
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/namestore/namestore_api_common.c:585
+#: src/namestore/namestore_api_common.c:744
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/namestore/namestore_api_common.c:603
+#: src/namestore/namestore_api_common.c:762
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/namestore_api_common.c:616
+#: src/namestore/namestore_api_common.c:775
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/namestore/namestore_api_common.c:637
+#: src/namestore/namestore_api_common.c:796
 #, 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_api_common.c:663
+#: src/namestore/namestore_api_common.c:822
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -4475,42 +4502,42 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:884
+#: src/nse/gnunet-nse-profiler.c:889
 #, 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:887
+#: src/nse/gnunet-nse-profiler.c:892
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:890 src/testbed/gnunet-testbed-profiler.c:284
+#: src/nse/gnunet-nse-profiler.c:895 src/testbed/gnunet-testbed-profiler.c:287
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:893
+#: src/nse/gnunet-nse-profiler.c:898
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:896
+#: src/nse/gnunet-nse-profiler.c:901
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:902
+#: src/nse/gnunet-nse-profiler.c:907
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:911
+#: src/nse/gnunet-nse-profiler.c:916
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Auf den Dienst konnte nicht zugegriffen werden"
 
-#: src/nse/gnunet-service-nse.c:1433
+#: src/nse/gnunet-service-nse.c:1448
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/nse/gnunet-service-nse.c:1472
+#: src/nse/gnunet-service-nse.c:1487
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -4519,21 +4546,21 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Verfügbare(r) Transport(e): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:355
+#: src/peerinfo/gnunet-service-peerinfo.c:353
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:372
+#: src/peerinfo/gnunet-service-peerinfo.c:370
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s %u \n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:450
+#: src/peerinfo/gnunet-service-peerinfo.c:448
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:486
+#: src/peerinfo/gnunet-service-peerinfo.c:484
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -4541,22 +4568,22 @@
 "Die Datei `%s' im Verzeichnis `%s' entspricht nicht der Namenskonvention. "
 "Datei wurde entfernt.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:639
+#: src/peerinfo/gnunet-service-peerinfo.c:637
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:644
+#: src/peerinfo/gnunet-service-peerinfo.c:642
 #, fuzzy, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:979
+#: src/peerinfo/gnunet-service-peerinfo.c:975
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1269
+#: src/peerinfo/gnunet-service-peerinfo.c:1265
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -4707,6 +4734,117 @@
 msgid "Unable to initialize Postgres: %s"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 
+#: src/psycstore/gnunet-service-psycstore.c:203
+#, fuzzy
+msgid "Failed to store membership information!\n"
+msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:227
+#, fuzzy
+msgid "Failed to test membership!\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:249
+#, fuzzy
+msgid "Failed to store fragment!\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:275
+#, fuzzy
+msgid "Failed to get fragment!\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:302
+#, fuzzy
+msgid "Failed to get message!\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:331
+#, fuzzy
+msgid "Failed to get message fragment!\n"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:357
+#, fuzzy
+msgid "Failed to get master counters!\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:395
+#, fuzzy
+msgid "Failed to get slave counters!\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:429
+#: src/psycstore/gnunet-service-psycstore.c:502
+msgid "Tried to set invalid state variable name!\n"
+msgstr ""
+
+#: src/psycstore/gnunet-service-psycstore.c:445
+#, fuzzy
+msgid "Failed to begin modifying state!\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:468
+#, fuzzy, c-format
+msgid "Unknown operator: %c\n"
+msgstr "Unbekannte Operation `%s'\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:478
+#, fuzzy
+msgid "Failed to end modifying state!\n"
+msgstr "Fehler beim Starten der Collection.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:516
+#, fuzzy
+msgid "Failed to begin synchronizing state!\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:532
+#, fuzzy
+msgid "Failed to end synchronizing state!\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:552
+#: src/psycstore/gnunet-service-psycstore.c:571
+#, fuzzy
+msgid "Failed to reset state!\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:594
+#: src/psycstore/gnunet-service-psycstore.c:645
+msgid "Tried to get invalid state variable name!\n"
+msgstr ""
+
+#: src/psycstore/gnunet-service-psycstore.c:621
+#: src/psycstore/gnunet-service-psycstore.c:660
+#, fuzzy
+msgid "Failed to get state variable!\n"
+msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:60
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d with error: %s (%d)\n"
+msgstr "`%s' schlug bei %s:%d mit dem Fehler %s fehl\n"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:253
+#, fuzzy, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:276
+#, fuzzy, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr "Fehler beim Anlegen des Benutzers"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:1796
+#, fuzzy
+msgid "SQLite database running\n"
+msgstr "sqlite Datenspeicher"
+
 #: src/pt/gnunet-daemon-pt.c:266
 #, fuzzy
 msgid "Failed to pack DNS request.  Dropping.\n"
@@ -4774,70 +4912,70 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:384
+#: src/regex/gnunet-daemon-regexprofiler.c:380
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1279
+#: src/regex/gnunet-regex-profiler.c:1281
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "Konfigurationsdatei FILENAME verwenden"
 
-#: src/regex/gnunet-regex-profiler.c:1290
+#: src/regex/gnunet-regex-profiler.c:1292
 #, fuzzy
 msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1319
+#: src/regex/gnunet-regex-profiler.c:1321
 #: 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:1325
+#: src/regex/gnunet-regex-profiler.c:1327
 #: 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:1332
+#: src/regex/gnunet-regex-profiler.c:1334
 #, 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:1341
+#: src/regex/gnunet-regex-profiler.c:1343
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1361
+#: src/regex/gnunet-regex-profiler.c:1363
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fehler beim Verlassen der DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1443
+#: src/regex/gnunet-regex-profiler.c:1445
 #, 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:1446
+#: src/regex/gnunet-regex-profiler.c:1448
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1449
+#: src/regex/gnunet-regex-profiler.c:1451
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1452
+#: src/regex/gnunet-regex-profiler.c:1454
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1455
+#: src/regex/gnunet-regex-profiler.c:1457
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1467
+#: src/regex/gnunet-regex-profiler.c:1469
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4853,6 +4991,243 @@
 msgid "Profiler for regex library"
 msgstr ""
 
+#: src/scalarproduct/gnunet-scalarproduct.c:195
+#, fuzzy
+msgid "You must specify at least one message ID to check!\n"
+msgstr "Sie müssen eine Liste von Dateien zum Einfügen angeben.\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:201
+msgid "This program needs a session identifier for comparing vectors.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:207
+msgid "Please give a session key for --input_key!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:216
+#, c-format
+msgid ""
+"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
+"valid peer identifier.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:240
+#: src/scalarproduct/gnunet-scalarproduct.c:298
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int32_t.\n"
+msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:247
+msgid "Need elements to compute the vectorproduct, got none.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:348
+msgid ""
+"A comma separated list of elements to compare as vector with our remote peer."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:351
+msgid ""
+"A comma separated mask to select which elements should actually be compared."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:354
+msgid ""
+"[Optional] peer to calculate our scalarproduct with. If this parameter is "
+"not given, the service will wait for a remote peer to compute the request."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:357
+msgid "Transaction ID shared with peer."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:366
+msgid "Calculate the Vectorproduct with a GNUnet peer."
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:381
+#, c-format
+msgid "Generated key set with key length %d bits.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:691
+#, fuzzy, c-format
+msgid "Client (%p) disconnected from us.\n"
+msgstr "`%s' hat sich mit `%s' verbunden.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:762
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1696
+#, fuzzy, c-format
+msgid "Could not send message to client (%p)!\n"
+msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:768
+#, c-format
+msgid "Sending session-end notification to client (%p) for session %s\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:891
+msgid "Message too large, fragmentation is currently not supported!)\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:896
+#, fuzzy
+msgid "Could not send service-response message via mesh!)\n"
+msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1092
+#, c-format
+msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1145
+#, fuzzy, c-format
+msgid "Successfully created new tunnel to peer (%s)!\n"
+msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1157
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1873
+msgid "Message too large, fragmentation is currently not supported!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1223
+#, fuzzy
+msgid "Transmitting service request.\n"
+msgstr "Collection `%s' begonnen.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1233
+#, fuzzy
+msgid "Could not send mutlicast message to tunnel!\n"
+msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1283
+#, fuzzy
+msgid "Too short message received from client!\n"
+msgstr "Empfangene Client-Nachricht ist ungültig.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1297
+#, fuzzy
+msgid "Invalid message received from client, session information incorrect!\n"
+msgstr "Ungültige `%s' Nachricht von Knoten `%s' empfangen.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1309
+#, c-format
+msgid ""
+"Duplicate session information received, cannot create new session with key `"
+"%s'\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1330
+#, c-format
+msgid ""
+"Got client-request-session with key %s, preparing tunnel to remote service.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1369
+#, c-format
+msgid "Creating new tunnel to for session with key %s.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1417
+#, c-format
+msgid ""
+"Got client-responder-session with key %s and a matching service-request-"
+"session set, processing.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1425
+#, c-format
+msgid ""
+"Got client-responder-session with key %s but NO matching service-request-"
+"session set, queuing element for later use.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
+#, c-format
+msgid "Peer disconnected, terminating session %s with peer (%s)\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1706
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1790
+#, c-format
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1813
+#, fuzzy
+msgid "Could not translate remote public key to sexpression!\n"
+msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1849
+#, fuzzy, c-format
+msgid ""
+"Could not translate E[a%d] to MPI!\n"
+"%s/%s\n"
+msgstr ""
+"Es konnte keine IP für das Gerät `%s' unter Verwendung von `%s' ermittelt "
+"werden.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1857
+#, c-format
+msgid "Got session with key %s and a matching element set, processing.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1866
+#, c-format
+msgid "Got session with key %s without a matching element set, queueing.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2039
+msgid "Shutting down, initiating cleanup.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+msgid "Generating Paillier-Keyset.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2116
+#, fuzzy
+msgid "Connect to MESH failed\n"
+msgstr " Verbindung fehlgeschlagen (Bug?)\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2120
+#, fuzzy
+msgid "Mesh initialized\n"
+msgstr " Verbindung fehlgeschlagen\n"
+
+#: src/scalarproduct/scalarproduct_api.c:243
+#, fuzzy
+msgid "# SUC responder result messages received"
+msgstr "# verschlüsselter PING Nachrichten empfangen"
+
+#: src/scalarproduct/scalarproduct_api.c:297
+#, fuzzy
+msgid "# bytes sent to scalarproduct"
+msgstr "# bytes in der Datenbank"
+
+#: src/scalarproduct/scalarproduct_api.c:340
+#: src/scalarproduct/scalarproduct_api.c:433
+#, fuzzy
+msgid "Failed to connect to the scalarproduct service\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/scalarproduct/scalarproduct_api.c:348
+#: src/scalarproduct/scalarproduct_api.c:441
+#, fuzzy
+msgid "Failed to send a message to the statistics service\n"
+msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#: src/scalarproduct/scalarproduct_api.c:382
+#: src/scalarproduct/scalarproduct_api.c:478
+#, fuzzy
+msgid "Failed to send a message to the scalarproduct service\n"
+msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
+
 #: src/set/gnunet-set-ibf-profiler.c:224
 #, fuzzy
 msgid "number of element in set A-B"
@@ -4889,78 +5264,83 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-statistics.c:141
+#: src/statistics/gnunet-statistics.c:142
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:143
+#: src/statistics/gnunet-statistics.c:144
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:186
+#: src/statistics/gnunet-statistics.c:191
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:192
+#: src/statistics/gnunet-statistics.c:197
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:223
+#: src/statistics/gnunet-statistics.c:228
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:231
+#: src/statistics/gnunet-statistics.c:236
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/statistics/gnunet-statistics.c:258
+#: src/statistics/gnunet-statistics.c:263
 #, fuzzy, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr "Verbindung zu gnunetd konnte nicht hergestellt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:266
+#: src/statistics/gnunet-statistics.c:271
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:273
+#: src/statistics/gnunet-statistics.c:278
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:331
+#: src/statistics/gnunet-statistics.c:310
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/statistics/gnunet-statistics.c:336
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:334
+#: src/statistics/gnunet-statistics.c:339
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:337
+#: src/statistics/gnunet-statistics.c:342
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:345
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:343
+#: src/statistics/gnunet-statistics.c:348
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:351
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:354
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:361
+#: src/statistics/gnunet-statistics.c:366
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet Aktivitäten ausgeben."
 
@@ -4977,27 +5357,22 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/sysmon/gnunet-service-sysmon.c:546
-#, c-format
-msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
-msgstr ""
-
 #: src/testbed/gnunet-service-testbed_cpustatus.c:727
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:964
+#: src/testbed/gnunet-service-testbed_peers.c:973
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:970
+#: src/testbed/gnunet-service-testbed_peers.c:979
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1008
+#: src/testbed/gnunet-service-testbed_peers.c:1017
 #, fuzzy, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "`%s' fährt herunter.\n"
@@ -5019,145 +5394,164 @@
 msgid "Spawning process `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:251
+#: src/testbed/gnunet-testbed-profiler.c:254
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:277
+#: src/testbed/gnunet-testbed-profiler.c:280
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:280
+#: src/testbed/gnunet-testbed-profiler.c:283
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:459
+#: src/testbed/testbed_api_hosts.c:415
 #, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
 
-#: src/testbed/testbed_api_hosts.c:467
+#: src/testbed/testbed_api_hosts.c:423
 #, 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:474
+#: src/testbed/testbed_api_hosts.c:430
 #, fuzzy, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/testbed/testbed_api_hosts.c:595
+#: src/testbed/testbed_api_hosts.c:570
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1878
+#: src/testbed/testbed_api_hosts.c:1572
 #, 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:802
+#: src/testbed/testbed_api_testbed.c:820
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:944
+#: src/testbed/testbed_api_testbed.c:989
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1009
+#: src/testbed/testbed_api_testbed.c:1055
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1111
+#: src/testbed/testbed_api_testbed.c:1144
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1115
+#: src/testbed/testbed_api_testbed.c:1148
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1153
+#: src/testbed/testbed_api_testbed.c:1186
 #, fuzzy
 msgid "Cannot start the master controller"
 msgstr "GNUnet testbed Controller starten."
 
-#: src/testbed/testbed_api_testbed.c:1171
+#: src/testbed/testbed_api_testbed.c:1204
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1231
+#: src/testbed/testbed_api_testbed.c:1264
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1243
+#: src/testbed/testbed_api_testbed.c:1276
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1267
+#: src/testbed/testbed_api_testbed.c:1300
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:670
+#: src/testbed/testbed_api_testbed.c:1350
+#, c-format
+msgid ""
+"Maximum number of edges a peer can have in a scale free topology cannot be "
+"more than %u.  Given `%s = %llu'"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1366
+#, c-format
+msgid ""
+"The number of edges that can established when adding a new node to scale "
+"free topology cannot be more than %u.  Given `%s = %llu'"
+msgstr ""
+
+#: src/testbed/testbed_api_topology.c:716
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "`%s' fehlgeschlagen: Tabelle nicht gefunden!\n"
 
-#: src/testbed/testbed_api_topology.c:676
+#: src/testbed/testbed_api_topology.c:722
 #, fuzzy, c-format
 msgid "Topology file %s has no data\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/testbed/testbed_api_topology.c:683
+#: src/testbed/testbed_api_topology.c:729
 #, fuzzy, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "Sitzungsschlüssel von Knoten `%s' konnte nicht überprüft werden.\n"
 
-#: src/testbed/testbed_api_topology.c:706
+#: src/testbed/testbed_api_topology.c:751
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/testbed/testbed_api_topology.c:715
-#: src/testbed/testbed_api_topology.c:739
+#: src/testbed/testbed_api_topology.c:760
+#: src/testbed/testbed_api_topology.c:784
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:721
-#: src/testbed/testbed_api_topology.c:745
+#: src/testbed/testbed_api_topology.c:766
+#: src/testbed/testbed_api_topology.c:790
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/testbed/testbed_api_topology.c:727
-#: src/testbed/testbed_api_topology.c:751
+#: src/testbed/testbed_api_topology.c:772
+#: src/testbed/testbed_api_topology.c:796
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:766
+#: src/testbed/testbed_api_topology.c:811
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/testing/gnunet-testing.c:130
+#: src/testing/gnunet-testing.c:173
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testing/gnunet-testing.c:199
+#: src/testing/gnunet-testing.c:258
+#, c-format
+msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+msgstr ""
+
+#: src/testing/gnunet-testing.c:355
 #, fuzzy
 msgid "create unique configuration files"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/testing/gnunet-testing.c:201
+#: src/testing/gnunet-testing.c:357
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:203
+#: src/testing/gnunet-testing.c:359
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
@@ -5165,88 +5559,82 @@
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/testing/gnunet-testing.c:205
+#: src/testing/gnunet-testing.c:361
 #, fuzzy
 msgid "configuration template"
 msgstr "GNUnet Konfiguration"
 
-#: src/testing/gnunet-testing.c:214
-msgid "Command line tool to access the testing library"
+#: src/testing/gnunet-testing.c:363
+msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing-run-service.c:129
-#, c-format
-msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+#: src/testing/gnunet-testing.c:376
+msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/gnunet-testing-run-service.c:186
-#, fuzzy
-msgid "name of the template configuration file to use (optional)"
-msgstr ""
-"Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
-
-#: src/testing/gnunet-testing-run-service.c:189
-msgid "name of the service to run"
-msgstr ""
-
-#: src/testing/testing.c:288
+#: src/testing/testing.c:276
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:304
+#: src/testing/testing.c:292
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:722
+#: src/testing/testing.c:711
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "Anzahl an Nachrichten, die pro Durchlauf verwendet wird"
 
-#: src/testing/testing.c:733
+#: src/testing/testing.c:722
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Fehler beim Download: %s\n"
 
-#: src/testing/testing.c:1177
-#, fuzzy
-msgid "Failed to create configuration for peer (not enough free ports?)\n"
-msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
-
-#: src/testing/testing.c:1184
+#: src/testing/testing.c:1158
 #, 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:1193
+#: src/testing/testing.c:1167
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/testing/testing.c:1209
+#: src/testing/testing.c:1177
+#, fuzzy
+msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
+msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+
+#: src/testing/testing.c:1190
+#, 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:1204
 #, fuzzy, c-format
-msgid "Cannot open hostkey file: %s\n"
+msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/testing/testing.c:1219
+#: src/testing/testing.c:1216
 #, 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:1241
+#: src/testing/testing.c:1238
 #, 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:1341
+#: src/testing/testing.c:1338
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/testing/testing.c:1707
+#: src/testing/testing.c:1702
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
@@ -5266,79 +5654,79 @@
 msgid "# friends connected"
 msgstr "# verbundener Knoten"
 
-#: src/topology/gnunet-daemon-topology.c:987
+#: src/topology/gnunet-daemon-topology.c:986
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1030
+#: src/topology/gnunet-daemon-topology.c:1031
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1036
+#: src/topology/gnunet-daemon-topology.c:1037
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1045
+#: src/topology/gnunet-daemon-topology.c:1046
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1053
+#: src/topology/gnunet-daemon-topology.c:1054
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1073
+#: src/topology/gnunet-daemon-topology.c:1074
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr "Syntaxfehler in Topolgieangabe, Bytes werden übersprungen.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1086
+#: src/topology/gnunet-daemon-topology.c:1087
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr "Syntaxfehler in Topologieangabe, überspringe Bytes `%s'.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1096
+#: src/topology/gnunet-daemon-topology.c:1097
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1102
+#: src/topology/gnunet-daemon-topology.c:1103
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1112
+#: src/topology/gnunet-daemon-topology.c:1113
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK Konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1118
+#: src/topology/gnunet-daemon-topology.c:1119
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1125
+#: src/topology/gnunet-daemon-topology.c:1126
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1156
+#: src/topology/gnunet-daemon-topology.c:1157
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/topology/gnunet-daemon-topology.c:1211
+#: src/topology/gnunet-daemon-topology.c:1212
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# ausgehender Nachrichten verworfen"
 
-#: src/topology/gnunet-daemon-topology.c:1350
+#: src/topology/gnunet-daemon-topology.c:1351
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -5353,21 +5741,21 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:453
-#: src/transport/gnunet-service-transport_blacklist.c:718
+#: src/transport/gnunet-service-transport_blacklist.c:717
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:169
+#: src/transport/gnunet-service-transport.c:168
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/transport/gnunet-service-transport.c:235
+#: src/transport/gnunet-service-transport.c:234
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# gap Anfragen insgesamt empfangen"
 
-#: src/transport/gnunet-service-transport.c:282
+#: src/transport/gnunet-service-transport.c:281
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# Bytes entschlüsselt"
@@ -5386,7 +5774,7 @@
 "`%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:754
+#: src/transport/gnunet-service-transport.c:775
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5424,7 +5812,7 @@
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1346
-#: src/transport/gnunet-service-transport_neighbours.c:1678
+#: src/transport/gnunet-service-transport_neighbours.c:1681
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# Bytes ausgehender Nachrichten verworfen"
@@ -5468,67 +5856,67 @@
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1584
+#: src/transport/gnunet-service-transport_neighbours.c:1586
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1618
+#: src/transport/gnunet-service-transport_neighbours.c:1620
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "Verfolgt die Bandbreitennutzung von gnunetd"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1634
+#: src/transport/gnunet-service-transport_neighbours.c:1636
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2769
+#: src/transport/gnunet-service-transport_neighbours.c:2775
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2784
-#: src/transport/gnunet-service-transport_neighbours.c:2815
+#: src/transport/gnunet-service-transport_neighbours.c:2790
+#: src/transport/gnunet-service-transport_neighbours.c:2821
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2828
+#: src/transport/gnunet-service-transport_neighbours.c:2834
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2859
+#: src/transport/gnunet-service-transport_neighbours.c:2865
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "COUNT Nachrichten versenden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3040
+#: src/transport/gnunet-service-transport_neighbours.c:3046
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# verschlüsselter PONG Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3093
+#: src/transport/gnunet-service-transport_neighbours.c:3099
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
+#: src/transport/gnunet-service-transport_neighbours.c:3113
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3144
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3149
+#: src/transport/gnunet-service-transport_neighbours.c:3155
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3194
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3283
+#: src/transport/gnunet-service-transport_neighbours.c:3289
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# gap Anfragen verworfen: Kollision in RT"
@@ -5570,50 +5958,50 @@
 msgid "# PING without HELLO messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/transport/gnunet-service-transport_validation.c:664
+#: src/transport/gnunet-service-transport_validation.c:660
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:930
+#: src/transport/gnunet-service-transport_validation.c:928
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/transport/gnunet-service-transport_validation.c:989
+#: src/transport/gnunet-service-transport_validation.c:987
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:999
+#: src/transport/gnunet-service-transport_validation.c:997
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1018
+#: src/transport/gnunet-service-transport_validation.c:1016
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1072
+#: src/transport/gnunet-service-transport_validation.c:1070
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1117
+#: src/transport/gnunet-service-transport_validation.c:1115
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1126
+#: src/transport/gnunet-service-transport_validation.c:1124
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1253
+#: src/transport/gnunet-service-transport_validation.c:1251
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1268
+#: src/transport/gnunet-service-transport_validation.c:1266
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1374
+#: src/transport/gnunet-service-transport_validation.c:1372
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
@@ -5846,42 +6234,42 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:815
-#: src/transport/plugin_transport_http_server.c:2585
+#: src/transport/plugin_transport_http_server.c:2614
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:864
-#: src/transport/plugin_transport_http_server.c:2353
+#: src/transport/plugin_transport_http_server.c:2382
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
 
 #: src/transport/plugin_transport_http.c:896
-#: src/transport/plugin_transport_http_server.c:2385 src/util/service.c:1062
+#: src/transport/plugin_transport_http_server.c:2414 src/util/service.c:1062
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
 #: src/transport/plugin_transport_http.c:913
-#: src/transport/plugin_transport_http_server.c:2402 src/util/service.c:1079
+#: src/transport/plugin_transport_http_server.c:2431 src/util/service.c:1079
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Binden an UDP Port %d.\n"
 
 #: src/transport/plugin_transport_http.c:1018
-#: src/transport/plugin_transport_http_server.c:2513
+#: src/transport/plugin_transport_http_server.c:2542
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1131
-#: src/transport/plugin_transport_http_server.c:2693
+#: src/transport/plugin_transport_http_server.c:2722
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "Netzwerkbekanntmachungen wurden per Konfiguration deaktiviert!\n"
 
 #: src/transport/plugin_transport_http.c:1144
-#: src/transport/plugin_transport_http_server.c:2704
+#: src/transport/plugin_transport_http_server.c:2733
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK Konfiguration\n"
@@ -5905,7 +6293,7 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2819
+#: src/transport/plugin_transport_http_server.c:2848
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Collection `%s' begonnen.\n"
@@ -5914,99 +6302,99 @@
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1582
+#: src/transport/plugin_transport_http_client.c:1587
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1713
-#: src/transport/plugin_transport_http_server.c:2943
+#: src/transport/plugin_transport_http_client.c:1724
+#: src/transport/plugin_transport_http_server.c:2978
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1738
-#: src/transport/plugin_transport_http_server.c:3003
+#: src/transport/plugin_transport_http_client.c:1749
+#: src/transport/plugin_transport_http_server.c:3038
 #, fuzzy, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 "Upload von `%s' komplett, derzeitige durchschnittliche Geschwindigkeit "
 "beträgt %8.3f KB/s.\n"
 
-#: src/transport/plugin_transport_http_client.c:1766
-#: src/transport/plugin_transport_http_server.c:2849
+#: src/transport/plugin_transport_http_client.c:1777
+#: src/transport/plugin_transport_http_server.c:2878
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "Maximale Anzahl an Chat Clients erreicht.\n"
 
-#: src/transport/plugin_transport_http_server.c:1368
+#: src/transport/plugin_transport_http_server.c:1379
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1632
+#: src/transport/plugin_transport_http_server.c:1644
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1640
+#: src/transport/plugin_transport_http_server.c:1652
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1941
+#: src/transport/plugin_transport_http_server.c:1953
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1965
+#: src/transport/plugin_transport_http_server.c:1977
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2672
+#: src/transport/plugin_transport_http_server.c:2701
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2686
+#: src/transport/plugin_transport_http_server.c:2715
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2711
+#: src/transport/plugin_transport_http_server.c:2740
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Teste Transport(e) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2726
+#: src/transport/plugin_transport_http_server.c:2755
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/transport/plugin_transport_http_server.c:2736
+#: src/transport/plugin_transport_http_server.c:2765
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2757
+#: src/transport/plugin_transport_http_server.c:2786
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/transport/plugin_transport_http_server.c:2767
+#: src/transport/plugin_transport_http_server.c:2796
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_http_server.c:2835
+#: src/transport/plugin_transport_http_server.c:2864
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -6061,92 +6449,92 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:627
+#: src/transport/plugin_transport_tcp.c:626
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:836
-#: src/transport/plugin_transport_tcp.c:925
-#: src/transport/plugin_transport_tcp.c:975
-#: src/transport/plugin_transport_tcp.c:1061
-#: src/transport/plugin_transport_tcp.c:1204
-#: src/transport/plugin_transport_tcp.c:1221
+#: src/transport/plugin_transport_tcp.c:834
+#: src/transport/plugin_transport_tcp.c:923
+#: src/transport/plugin_transport_tcp.c:973
+#: src/transport/plugin_transport_tcp.c:1059
+#: src/transport/plugin_transport_tcp.c:1202
+#: src/transport/plugin_transport_tcp.c:1219
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# Bytes gesendet über TCP"
 
-#: src/transport/plugin_transport_tcp.c:843
-#: src/transport/plugin_transport_tcp.c:1032
-#: src/transport/plugin_transport_tcp.c:2013
-#: src/transport/plugin_transport_tcp.c:2688
+#: src/transport/plugin_transport_tcp.c:841
+#: src/transport/plugin_transport_tcp.c:1030
+#: src/transport/plugin_transport_tcp.c:2009
+#: src/transport/plugin_transport_tcp.c:2690
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_tcp.c:929
+#: src/transport/plugin_transport_tcp.c:927
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:978
+#: src/transport/plugin_transport_tcp.c:976
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# Bytes des Typs %d übertragen"
 
-#: src/transport/plugin_transport_tcp.c:1065
+#: src/transport/plugin_transport_tcp.c:1063
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/transport/plugin_transport_tcp.c:1178
+#: src/transport/plugin_transport_tcp.c:1176
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1415
-#: src/transport/plugin_transport_udp.c:1454
+#: src/transport/plugin_transport_tcp.c:1413
+#: src/transport/plugin_transport_udp.c:1449
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1532
+#: src/transport/plugin_transport_tcp.c:1530
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2063
+#: src/transport/plugin_transport_tcp.c:2059
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_tcp.c:2246
+#: src/transport/plugin_transport_tcp.c:2242
 msgid "# bytes received via TCP"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_tcp.c:2326
+#: src/transport/plugin_transport_tcp.c:2322
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2568 src/util/service.c:957
+#: src/transport/plugin_transport_tcp.c:2570 src/util/service.c:957
 #: src/util/service.c:963
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2582
+#: src/transport/plugin_transport_tcp.c:2584
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/transport/plugin_transport_tcp.c:2675
+#: src/transport/plugin_transport_tcp.c:2677
 #, fuzzy, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/transport/plugin_transport_tcp.c:2679
+#: src/transport/plugin_transport_tcp.c:2681
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2683
+#: src/transport/plugin_transport_tcp.c:2685
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -6161,31 +6549,31 @@
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:403
+#: src/transport/plugin_transport_udp_broadcasting.c:402
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:420
+#: src/transport/plugin_transport_udp_broadcasting.c:419
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1556
+#: src/transport/plugin_transport_udp.c:1555
 #, c-format
 msgid ""
 "Trying to create session for address of unexpected length %u (should be %u "
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2587
+#: src/transport/plugin_transport_udp.c:2590
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2601
+#: src/transport/plugin_transport_udp.c:2604
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -6193,103 +6581,103 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2901
+#: src/transport/plugin_transport_udp.c:2905
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fehler beim Binden an UDP6 Port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:2999
+#: src/transport/plugin_transport_udp.c:3003
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3042
+#: src/transport/plugin_transport_udp.c:3046
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/transport/plugin_transport_udp.c:3101
+#: src/transport/plugin_transport_udp.c:3105
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Namespace `%s' konnte nicht erstellt werden (existiert bereits?).\n"
 
-#: src/transport/plugin_transport_unix.c:1641
+#: src/transport/plugin_transport_unix.c:1640
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/transport/plugin_transport_wlan.c:610
+#: src/transport/plugin_transport_wlan.c:623
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:629
+#: src/transport/plugin_transport_wlan.c:642
 #, fuzzy
 msgid "# WLAN messages defragmented"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:675
-#: src/transport/plugin_transport_wlan.c:742
-#: src/transport/plugin_transport_wlan.c:1874
+#: src/transport/plugin_transport_wlan.c:688
+#: src/transport/plugin_transport_wlan.c:756
+#: src/transport/plugin_transport_wlan.c:1899
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# Sitzungsschlüssel akzeptiert"
 
-#: src/transport/plugin_transport_wlan.c:835
+#: src/transport/plugin_transport_wlan.c:860
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# fragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:859
+#: src/transport/plugin_transport_wlan.c:884
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:967
-#: src/transport/plugin_transport_wlan.c:1052
-#: src/transport/plugin_transport_wlan.c:1876
+#: src/transport/plugin_transport_wlan.c:992
+#: src/transport/plugin_transport_wlan.c:1077
+#: src/transport/plugin_transport_wlan.c:1901
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# Client Trace-Anfragen empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1247
+#: src/transport/plugin_transport_wlan.c:1272
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1273
+#: src/transport/plugin_transport_wlan.c:1298
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# verworfener Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1283
+#: src/transport/plugin_transport_wlan.c:1308
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/transport/plugin_transport_wlan.c:1340
+#: src/transport/plugin_transport_wlan.c:1365
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# defragmentierter Nachrichten"
 
-#: src/transport/plugin_transport_wlan.c:1460
+#: src/transport/plugin_transport_wlan.c:1485
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1495
+#: src/transport/plugin_transport_wlan.c:1520
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/transport/plugin_transport_wlan.c:1558
+#: src/transport/plugin_transport_wlan.c:1583
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# Bytes gesendet über UDP"
 
-#: src/transport/plugin_transport_wlan.c:1671
+#: src/transport/plugin_transport_wlan.c:1696
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1855
+#: src/transport/plugin_transport_wlan.c:1880
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
@@ -6304,32 +6692,32 @@
 msgid "Failed to initialize testing library!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/util/bio.c:136 src/util/bio.c:142
+#: src/util/bio.c:137 src/util/bio.c:145
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/bio.c:143
+#: src/util/bio.c:147
 #, fuzzy
 msgid "End of file"
 msgstr "Eine Konfigurationsdatei laden"
 
-#: src/util/bio.c:195
+#: src/util/bio.c:199
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:205
+#: src/util/bio.c:209
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:250
+#: src/util/bio.c:254
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:264
+#: src/util/bio.c:268
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
@@ -6370,58 +6758,58 @@
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1034
+#: src/util/common_logging.c:256 src/util/common_logging.c:1033
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1032
+#: src/util/common_logging.c:258 src/util/common_logging.c:1031
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1030
+#: src/util/common_logging.c:260 src/util/common_logging.c:1029
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1028
+#: src/util/common_logging.c:262 src/util/common_logging.c:1027
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/common_logging.c:266 src/util/common_logging.c:1036
+#: src/util/common_logging.c:264 src/util/common_logging.c:1035
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:395
+#: src/util/common_logging.c:393
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/common_logging.c:819
+#: src/util/common_logging.c:817
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1037
+#: src/util/common_logging.c:1036
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1176
+#: src/util/common_logging.c:1138
 #, fuzzy
 msgid "unknown address"
 msgstr "Unbekannter Fehler"
 
-#: src/util/common_logging.c:1215
+#: src/util/common_logging.c:1177
 #, fuzzy
 msgid "invalid address"
 msgstr "Ungültige Parameter: "
 
-#: src/util/common_logging.c:1233
+#: src/util/common_logging.c:1195
 #, 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:1254
+#: src/util/common_logging.c:1216
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -6441,28 +6829,28 @@
 "choices\n"
 msgstr ""
 
-#: src/util/connection.c:427
+#: src/util/connection.c:424
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Zugriff verweigert für `%s' bei %s:%d.\n"
 
-#: src/util/connection.c:442
+#: src/util/connection.c:439
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:557
+#: src/util/connection.c:554
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Fehler beim Aufbauen einer Verbindung mit gnunetd.\n"
 
-#: src/util/connection.c:755 src/util/connection.c:922
+#: src/util/connection.c:752 src/util/connection.c:919
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/util/connection.c:913
+#: src/util/connection.c:910
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
@@ -6474,41 +6862,41 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:534 src/util/crypto_ecc.c:572
+#: src/util/crypto_ecc.c:580 src/util/crypto_ecc.c:618
 #, 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:539
+#: src/util/crypto_ecc.c:585
 #, 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:576
+#: src/util/crypto_ecc.c:622
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:607
+#: src/util/crypto_ecc.c:653
 #, 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:612
+#: src/util/crypto_ecc.c:658
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:694
+#: src/util/crypto_ecc.c:741
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/crypto_ecc.c:756
+#: src/util/crypto_ecc.c:803
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/util/crypto_ecc.c:836
+#: src/util/crypto_ecc.c:883
 #, fuzzy, c-format
 msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
@@ -6524,17 +6912,17 @@
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/disk.c:1149
+#: src/util/disk.c:1150
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
 
-#: src/util/disk.c:1506 src/util/service.c:1679
+#: src/util/disk.c:1507 src/util/service.c:1674
 #, 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:1953
+#: src/util/disk.c:1954
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
@@ -6649,59 +7037,55 @@
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/util/gnunet-ecc.c:65
+#: src/util/gnunet-ecc.c:60
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/util/gnunet-ecc.c:71
+#: src/util/gnunet-ecc.c:66
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:87
+#: src/util/gnunet-ecc.c:82
 #, 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:97
+#: src/util/gnunet-ecc.c:92
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr "Fertigstellen"
 
-#: src/util/gnunet-ecc.c:100
+#: src/util/gnunet-ecc.c:95
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:123
+#: src/util/gnunet-ecc.c:118
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:178
+#: src/util/gnunet-ecc.c:163
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:181
+#: src/util/gnunet-ecc.c:166
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:169
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:187
-msgid "print the short hash of the public key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:198
+#: src/util/gnunet-ecc.c:180
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
@@ -6763,12 +7147,12 @@
 msgid "Error writing to `%s': %s\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/network.c:127
+#: src/util/network.c:132
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1344
+#: src/util/network.c:1370
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -6817,17 +7201,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:1801
+#: src/util/program.c:254 src/util/service.c:1796
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/util/resolver_api.c:202
+#: src/util/resolver_api.c:198
 #, fuzzy, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr "Versuche, Datei `%s' für MySQL Konfiguration zu verwenden.\n"
 
-#: src/util/resolver_api.c:221
+#: src/util/resolver_api.c:217
 #, fuzzy, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
@@ -6835,46 +7219,46 @@
 "Sie müssen für `%s' in der Sektion `%s' der Konfigurationsdatei eine "
 "positive Zahl angeben.\n"
 
-#: src/util/resolver_api.c:347
+#: src/util/resolver_api.c:343
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet verwendet nun die IP-Adresse %u.%u.%u.%u.\n"
 
-#: src/util/resolver_api.c:351
+#: src/util/resolver_api.c:347
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/util/resolver_api.c:890
+#: src/util/resolver_api.c:886
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/scheduler.c:782
+#: src/util/scheduler.c:802
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:912
+#: src/util/scheduler.c:933
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:476
+#: src/util/server.c:482
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/util/server.c:485
+#: src/util/server.c:491
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/util/server.c:496
+#: src/util/server.c:502
 #, fuzzy, c-format
 msgid "`%s' failed for `%.*s': address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/util/server.c:888
+#: src/util/server.c:894
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -6954,48 +7338,48 @@
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1318 src/util/service.c:1336
+#: src/util/service.c:1316 src/util/service.c:1334
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1363
+#: src/util/service.c:1359
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1535
+#: src/util/service.c:1530
 #, 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:1568
+#: src/util/service.c:1563
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Knoten `%s' mit Vertrauen %8u und Adresse `%s'\n"
 
-#: src/util/service.c:1617
+#: src/util/service.c:1612
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1621
+#: src/util/service.c:1616
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1625
+#: src/util/service.c:1620
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1680
+#: src/util/service.c:1675
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1693
+#: src/util/service.c:1688
 #, 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:1759
+#: src/util/service.c:1754
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -7008,75 +7392,79 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:425
+#: src/util/strings.c:429
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:540
+#: src/util/strings.c:544
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:637
-msgid "ms"
-msgstr "ms"
+#: src/util/strings.c:641
+msgid "µs"
+msgstr ""
 
-#: src/util/strings.c:641
+#: src/util/strings.c:645
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:643
+#: src/util/strings.c:647
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:649
+#: src/util/strings.c:653
+msgid "ms"
+msgstr "ms"
+
+#: src/util/strings.c:659
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:655
+#: src/util/strings.c:665
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:661
+#: src/util/strings.c:671
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:668
+#: src/util/strings.c:678
 #, fuzzy
 msgid "day"
 msgstr " Tage"
 
-#: src/util/strings.c:670
+#: src/util/strings.c:680
 #, fuzzy
 msgid "days"
 msgstr " Tage"
 
-#: src/util/strings.c:697
+#: src/util/strings.c:708
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1098
+#: src/util/strings.c:1109
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1106
+#: src/util/strings.c:1117
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1112
+#: src/util/strings.c:1123
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1119
+#: src/util/strings.c:1130
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1128
+#: src/util/strings.c:1139
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1130
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1128
 #, fuzzy
 msgid "# Active tunnels"
 msgstr "GNUnet Konfiguration"
@@ -7111,71 +7499,89 @@
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1350
+#: src/vpn/gnunet-service-vpn.c:1348
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1371
+#: src/vpn/gnunet-service-vpn.c:1369
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1576
+#: src/vpn/gnunet-service-vpn.c:1574
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1614 src/vpn/gnunet-service-vpn.c:1655
+#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1653
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1665
+#: src/vpn/gnunet-service-vpn.c:1663
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1679
+#: src/vpn/gnunet-service-vpn.c:1677
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1761
+#: src/vpn/gnunet-service-vpn.c:1759
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2100
+#: src/vpn/gnunet-service-vpn.c:2098
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2255
+#: src/vpn/gnunet-service-vpn.c:2253
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "Empfangene Client-Nachricht ist ungültig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2406
+#: src/vpn/gnunet-service-vpn.c:2404
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2461
+#: src/vpn/gnunet-service-vpn.c:2459
 #, fuzzy
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden!\n"
 
-#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2713
+#: src/vpn/gnunet-service-vpn.c:2498 src/vpn/gnunet-service-vpn.c:2711
 #, fuzzy
 msgid "# Active destinations"
 msgstr "GNUnet Konfiguration"
 
-#: src/vpn/gnunet-service-vpn.c:2786
+#: src/vpn/gnunet-service-vpn.c:2784
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3143
+#: src/vpn/gnunet-service-vpn.c:3112
+#, fuzzy
+msgid "Must specify valid IPv6 address"
+msgstr "`%s' ist nicht verfügbar."
+
+#: src/vpn/gnunet-service-vpn.c:3133
+msgid "Must specify valid IPv6 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3141
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3175
+#: src/vpn/gnunet-service-vpn.c:3153
+#, fuzzy
+msgid "Must specify valid IPv4 address"
+msgstr "`%s' ist nicht verfügbar."
+
+#: src/vpn/gnunet-service-vpn.c:3164
+msgid "Must specify valid IPv4 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3173
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -7251,23 +7657,80 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:588 src/include/gnunet_common.h:593
-#: src/include/gnunet_common.h:599
+#: src/include/gnunet_common.h:618 src/include/gnunet_common.h:625
+#: src/include/gnunet_common.h:633
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:609
+#: src/include/gnunet_common.h:645
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Absicherung fehlgeschlagen bei %s:%d.\n"
 
-#: src/include/gnunet_common.h:630 src/include/gnunet_common.h:637
+#: src/include/gnunet_common.h:672 src/include/gnunet_common.h:681
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "`%s' schlug bei Datei `%s' fehl. Ort: %s:%d. Fehler: %s\n"
 
 #, fuzzy
+#~ msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+#~ msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
+
+#, fuzzy
+#~ msgid "no-name"
+#~ msgstr "Name anzeigen"
+
+#, fuzzy
+#~ msgid "Option `%s' ignored\n"
+#~ msgstr "%s: Option `%s' ist mehrdeutig\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "add an additional keyword for the advertisment (this option can be "
+#~ "specified multiple times)"
+#~ msgstr ""
+#~ "Ein zusätzliches Schlüsselwort für alle Dateien und Verzeichnisse "
+#~ "hinzufügen (diese Option kann mehrmals angegeben werden)"
+
+#, fuzzy
+#~ msgid "specify ID of the root of the namespace"
+#~ msgstr "das Rating eines Namespaces setzen"
+
+#, fuzzy
+#~ msgid "change rating of namespace ID by VALUE"
+#~ msgstr "das Rating eines Namespaces setzen"
+
+#, fuzzy
+#~ msgid "try to shorten a given name"
+#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
+
+#, fuzzy
+#~ msgid "Failed to read or create private zone key\n"
+#~ msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize resolver!\n"
+#~ msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
+
+#, fuzzy
+#~ msgid "Using default zone file `%s'\n"
+#~ msgstr "Collection `%s' begonnen.\n"
+
+#, fuzzy
+#~ msgid "Failed to write zone key to file `%s': %s\n"
+#~ msgstr "Datei wurde als `%s' gespeichert.\n"
+
+#, fuzzy
+#~ msgid "No directory to load zonefiles specified in configuration\n"
+#~ msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
+
+#, fuzzy
+#~ msgid "name of the template configuration file to use (optional)"
+#~ msgstr ""
+#~ "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
+
+#, fuzzy
 #~ msgid "number of peers to start"
 #~ msgstr "Anzahl an Durchläufen"
 
@@ -7294,10 +7757,6 @@
 #~ "er?)\n"
 
 #, fuzzy
-#~ msgid "Internal error."
-#~ msgstr "Unbekannter Fehler.\n"
-
-#, fuzzy
 #~ msgid "ECDSA signature verification failed at %s:%d: %s\n"
 #~ msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
@@ -7596,10 +8055,6 @@
 #~ msgstr "Konnte libgnunetutil nicht initialisieren!\n"
 
 #, fuzzy
-#~ msgid "Failed to connect to the chat service\n"
-#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#, fuzzy
 #~ msgid "(%s) `%s' said: %s\n"
 #~ msgstr "`%s' %s schlug fehl: %s\n"
 
@@ -7682,10 +8137,6 @@
 #~ msgstr "Fehler beim Speichern der Konfiguration!"
 
 #, fuzzy
-#~ msgid "Option `%s' in section `%s' missing in configuration!\n"
-#~ msgstr "In der Konfigurationsdatei wurden keine Anwendungen definiert!\n"
-
-#, fuzzy
 #~ msgid "Connected to %s service!\n"
 #~ msgstr "`%s' hat sich mit `%s' verbunden.\n"
 
@@ -7696,10 +8147,6 @@
 #~ "Verzeichnis angeben, in dem FS Daten gespeichert werden.\n"
 
 #, fuzzy
-#~ msgid "Failed to start daemon: %s\n"
-#~ msgstr "Fehler beim Starten der Collection.\n"
-
-#, fuzzy
 #~ msgid "Configuration fails to specify `%s', assuming default value."
 #~ msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
@@ -7756,11 +8203,6 @@
 #~ msgstr "Fehler beim Lesen von Informationen von gnunetd.\n"
 
 #, fuzzy
-#~ msgid "Failed to get hostkey!\n"
-#~ msgstr ""
-#~ "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
-
-#, fuzzy
 #~ msgid "Could not start `%s' process to start GNUnet.\n"
 #~ msgstr ""
 #~ "IP(v4) dieses Hosts konnte nicht ermittelt werden. Bitte geben Sie die IP "
@@ -7981,10 +8423,6 @@
 #~ msgstr "# verschlüsselter PING Nachrichten empfangen"
 
 #, fuzzy
-#~ msgid "Failed to connect to statistics service!\n"
-#~ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
-
-#, fuzzy
 #~ msgid "Failed to send to `%s': %s\n"
 #~ msgstr "Datei wurde als `%s' gespeichert.\n"
 
@@ -8509,10 +8947,6 @@
 #~ msgstr "Weitere Einstellungen"
 
 #, fuzzy
-#~ msgid "Unknown operation '%s'.\n"
-#~ msgstr "Unbekannte Operation `%s'\n"
-
-#, fuzzy
 #~ msgid "yes"
 #~ msgstr "Ja"
 
@@ -8667,10 +9101,6 @@
 #~ msgid "Lock acquired for too long (%llu ms) at %s:%u\n"
 #~ msgstr "Unerwartete sehr große Allokierung (%u Bytes) bei %s:%d!\n"
 
-#, fuzzy
-#~ msgid "GNUnet error log"
-#~ msgstr "GNUnet Netzwerk Topologie tracen."
-
 #~ msgid "Availability test failed for `%s' at %s:%d.\n"
 #~ msgstr "Verfügbarkeitstest für `%s' fehlgeschlagen bei %s:%d.\n"
 
@@ -9219,9 +9649,6 @@
 #~ msgid "write encountered (decrypted) search results to FILENAME"
 #~ msgstr "Begegnete (entschlüsselte) Suchergebnisse in FILENAME schreiben"
 
-#~ msgid "Error converting arguments to URI!\n"
-#~ msgstr "Fehler beim Konvertieren von Parametern in URI!\n"
-
 #~ msgid ""
 #~ "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
 #~ "completion)                "
@@ -9484,10 +9911,6 @@
 #~ msgid "Could not properly unload service `%s'!\n"
 #~ msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#, fuzzy
-#~ msgid "Core initialization failed.\n"
-#~ msgstr " Verbindung fehlgeschlagen\n"
-
 #~ msgid "Updates GNUnet datastructures after version change."
 #~ msgstr "GNUnet Datenstrukturen nach einer Versionsänderung aktualisieren."
 
@@ -9607,9 +10030,6 @@
 #~ "\n"
 #~ "Kontaktiere `%s'."
 
-#~ msgid " Connection failed (bug?)\n"
-#~ msgstr " Verbindung fehlgeschlagen (Bug?)\n"
-
 #, fuzzy
 #~ msgid "OK!\n"
 #~ msgstr "OK"
@@ -9625,9 +10045,6 @@
 #~ msgid "send messages with SIZE bytes payload"
 #~ msgstr "Nachrichten mit SIZE Bytes Nutzlast versenden"
 
-#~ msgid "specifies which TRANSPORT should be tested"
-#~ msgstr "Gibt an, welcher TRANSPORT getestet werden soll"
-
 #~ msgid "specifies after how many MS to time-out"
 #~ msgstr "Gibt an, nach wievielen MS die Zeit abgelaufen sein soll"
 
@@ -9769,12 +10186,6 @@
 #~ msgid "Full pathname of GNUnet client HOME directory"
 #~ msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#~ msgid "Could not determine my public IPv6 address.\n"
-#~ msgstr "Die öffentliche IPv6-Adresse konnte nicht ermittelt werden.\n"
-
-#~ msgid "`%s': unknown service: %s\n"
-#~ msgstr "`%s': unbekannter Dienst: %s\n"
-
 #, fuzzy
 #~ msgid "# bytes received via TCP6"
 #~ msgstr "# Bytes empfangen über TCP"
@@ -10487,9 +10898,6 @@
 #~ msgstr ""
 #~ "Sie müssen einen Spitznamen angeben (verwenden Sie die Option `%s').\n"
 
-#~ msgid "Could not send message to gnunetd\n"
-#~ msgstr "Nachricht konnte nicht an gnunetd gesendet werden.\n"
-
 #~ msgid "mysql datastore"
 #~ msgstr "mysql Datenspeicher"
 

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2013-09-16 13:23:12 UTC (rev 29317)
+++ gnunet/po/es.po     2013-09-16 13:33:53 UTC (rev 29318)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-08-09 23:01+0200\n"
+"POT-Creation-Date: 2013-09-16 15:01+0200\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel Ángel Arruga Vivas <address@hidden>\n"
 "Language-Team: Spanish <address@hidden>\n"
@@ -40,7 +40,7 @@
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Se produjo un fallo al eliminar el directorio «servicehome» %s.\n"
 
-#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:962
+#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:971
 #, fuzzy
 msgid "Message was sent successfully"
 msgstr "El almacén de nombres añadió el registro satisfactoriamente"
@@ -50,12 +50,12 @@
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "¡Se produjo un fallo al conectar con el servicio dv!\n"
 
-#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:966
+#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:975
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:968
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:977
 msgid "ARM API is busy"
 msgstr ""
 
@@ -66,47 +66,47 @@
 
 # Miguel: "timeout" lo he traducido como plazo, pero no se
 # si hay alguna palabra que lo describa mejor.
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:972
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:981
 #, fuzzy
 msgid "Request timed out"
 msgstr "plazo de consenso"
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:974
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:983
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Usuario desconocido «%s»\n"
 
-#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:990
+#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:999
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# elementos almacenados"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:992
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1001
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:994
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1003
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:996
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1005
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "'%s' comenzando\n"
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:998
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1007
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1000
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1009
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1002
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1011
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
@@ -114,12 +114,12 @@
 # Miguel: ¿Debería cambiar las siglas de ARM?
 # De momento las he mantenido con una traducción en
 # otro mensaje.
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1004
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1013
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "El servicio «%s» es desconocido para el ARM.\n"
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1006
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1015
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "El proceso del servicio no devolvió un estado\n"
@@ -130,7 +130,7 @@
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr "Petición ignorada porque el ARM se está apagando.\n"
 
-#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1010
+#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1019
 #, fuzzy, c-format
 msgid "%.s Unknown result code."
 msgstr "Código de respuesta del ARM desconocido.\n"
@@ -315,39 +315,39 @@
 msgid "Preparing to stop `%s'\n"
 msgstr "Preparando para parar «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:1023
+#: src/arm/gnunet-service-arm.c:1022
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Reiniciando el servicio «%s»\n"
 
-#: src/arm/gnunet-service-arm.c:1116
+#: src/arm/gnunet-service-arm.c:1115
 msgid "exit"
 msgstr "salida"
 
-#: src/arm/gnunet-service-arm.c:1121
+#: src/arm/gnunet-service-arm.c:1120
 msgid "signal"
 msgstr "señal"
 
-#: src/arm/gnunet-service-arm.c:1126
+#: src/arm/gnunet-service-arm.c:1125
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/arm/gnunet-service-arm.c:1132
+#: src/arm/gnunet-service-arm.c:1131
 #, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "El servicio «%s» tardó %s en finalizar\n"
 
-#: src/arm/gnunet-service-arm.c:1154
+#: src/arm/gnunet-service-arm.c:1153
 #, fuzzy, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n"
 
-#: src/arm/gnunet-service-arm.c:1169
+#: src/arm/gnunet-service-arm.c:1168
 #, fuzzy, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms\n"
 
-#: src/arm/gnunet-service-arm.c:1387
+#: src/arm/gnunet-service-arm.c:1386
 #, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Iniciando servicios predeterminados «%s»\n"
@@ -355,13 +355,13 @@
 # Miguel: He traducido "default" por "predeterminado", la locución
 # "por defecto" no tiene sentido en sitios como este y he tratado
 # de ser consistente.
-#: src/arm/gnunet-service-arm.c:1398
+#: src/arm/gnunet-service-arm.c:1397
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr "¡El servicio predeterminado «%s» no está configurado correctamente!\n"
 
 # Miguel: ¿No hay servicios -> no hay ningún servicio?
-#: src/arm/gnunet-service-arm.c:1412
+#: src/arm/gnunet-service-arm.c:1411
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -382,8 +382,8 @@
 msgid "Received last message for %s \n"
 msgstr "Recibido último mensaje para %s\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1529
-#: src/ats/gnunet-service-ats_addresses.c:1563
+#: src/ats/gnunet-service-ats_addresses.c:1607
+#: src/ats/gnunet-service-ats_addresses.c:1641
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
@@ -393,12 +393,12 @@
 "de banda predeterminado %llu\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/gnunet-service-ats_addresses.c:1535
+#: src/ats/gnunet-service-ats_addresses.c:1613
 #, 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:1542
+#: src/ats/gnunet-service-ats_addresses.c:1620
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
@@ -408,12 +408,12 @@
 "de banda predeterminado %llu\n"
 
 # Miguel: "Inbound" lo he traducido como entrada en todo el texto.
-#: src/ats/gnunet-service-ats_addresses.c:1569
+#: src/ats/gnunet-service-ats_addresses.c:1647
 #, 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:1576
+#: src/ats/gnunet-service-ats_addresses.c:1654
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
@@ -422,26 +422,26 @@
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1773
+#: src/ats/gnunet-service-ats_addresses.c:1888
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "¡No se puede inicializar el resolvedor!\n"
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:848
+#: src/ats/gnunet-service-ats-solver_mlp.c:849
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1171
+#: src/ats/gnunet-service-ats-solver_mlp.c:1193
 #, 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-solver_mlp.c:1216
+#: src/ats/gnunet-service-ats-solver_mlp.c:1238
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1890
+#: src/ats/gnunet-service-ats-solver_mlp.c:1956
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent outbound quota configuration for network `%s', is "
@@ -450,7 +450,7 @@
 "No hay configurada una cuota de salida para la red «%s», asignando el ancho "
 "de banda predeterminado %llu\n"
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1898
+#: src/ats/gnunet-service-ats-solver_mlp.c:1964
 #, fuzzy, c-format
 msgid ""
 "Adjusting inconsistent inbound quota configuration for network `%s', is %llu "
@@ -460,28 +460,28 @@
 "ancho de banda predeterminado (%llu)\n"
 
 # Miguel: "Outbound" lo he traducido como salida en todo el texto.
-#: src/ats/gnunet-service-ats-solver_mlp.c:1908
+#: src/ats/gnunet-service-ats-solver_mlp.c:1974
 #, 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-solver_mlp.c:1916
+#: src/ats/gnunet-service-ats-solver_mlp.c:1982
 #, 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-solver_mlp.c:1927
+#: src/ats/gnunet-service-ats-solver_mlp.c:1993
 #, fuzzy, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr "La cuota de salida configurada para la red «%s» es %llu\n"
 
-#: src/ats/gnunet-service-ats-solver_proportional.c:1246
+#: src/ats/gnunet-service-ats-solver_proportional.c:1296
 #, fuzzy, c-format
-msgid "Cannot find network of type `%u' %s\n"
+msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "No se encontró la IP del host «%s»: %s\n"
 
 # Miguel: ¿Como podría traducir "resolutions" y "resolve"?
@@ -514,7 +514,7 @@
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr "Cuota para la red «%11s» (entrada/salida): %10s / %10s\n"
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:461
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:438
 #: src/transport/gnunet-transport.c:812
 #, c-format
 msgid "Service `%s' is not running\n"
@@ -613,31 +613,36 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Cargando el módulo de bloques «%s»\n"
 
-#: src/consensus/gnunet-consensus.c:352
+#: src/consensus/gnunet-consensus-profiler.c:393
 msgid "number of peers in consensus"
 msgstr "número de pares en consenso"
 
-#: src/consensus/gnunet-consensus.c:355
+#: src/consensus/gnunet-consensus-profiler.c:396
 msgid "how many peers receive one value?"
 msgstr "¿cuántos pares reciben un valor?"
 
-#: src/consensus/gnunet-consensus.c:358 src/set/gnunet-set-profiler.c:287
-#: src/set/gnunet-set-profiler.c:290 src/set/gnunet-set-profiler.c:293
+#: src/consensus/gnunet-consensus-profiler.c:399
+#: src/set/gnunet-set-profiler.c:287 src/set/gnunet-set-profiler.c:290
+#: src/set/gnunet-set-profiler.c:293
 msgid "number of values"
 msgstr "número de valores"
 
 # Miguel: "timeout" lo he traducido como plazo, pero no se
 # si hay alguna palabra que lo describa mejor.
-#: src/consensus/gnunet-consensus.c:361
+#: src/consensus/gnunet-consensus-profiler.c:402
 msgid "consensus timeout"
 msgstr "plazo de consenso"
 
+#: src/consensus/gnunet-consensus-profiler.c:405
+msgid "be more verbose (print received values)"
+msgstr ""
+
 #: src/core/core_api.c:752
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/core/gnunet-core.c:82
+#: src/core/gnunet-core.c:83
 #, c-format
 msgid "Peer `%s'\n"
 msgstr "Par «%s»\n"
@@ -656,19 +661,19 @@
 msgid "Disconnected from"
 msgstr "Desconectado de"
 
-#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:170
+#: src/core/gnunet-core.c:166 src/mesh/gnunet-mesh.c:170
 #: src/peerinfo-tool/gnunet-peerinfo.c:653
 #, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Parámetro no válido «%s» en la línea de comandos\n"
 
 # Miguel: ¿Quizá continuamente fuese mejor?
-#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:1004
+#: src/core/gnunet-core.c:203 src/transport/gnunet-transport.c:1004
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 "provee información sobre todas las conexiones actuales (de forma continua)"
 
-#: src/core/gnunet-core.c:215
+#: src/core/gnunet-core.c:214
 msgid "Print information about connected peers."
 msgstr "Imprime información sobre los pares conectados."
 
@@ -734,7 +739,7 @@
 msgstr "# mensajes «SET_KEY» descifrados"
 
 #: src/core/gnunet-service-core_kx.c:922
-#: src/transport/gnunet-service-transport_validation.c:935
+#: src/transport/gnunet-service-transport_validation.c:933
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
@@ -765,7 +770,7 @@
 msgstr "# mensajes «keepalive» enviados"
 
 #: src/core/gnunet-service-core_kx.c:1067
-#: src/transport/gnunet-service-transport_validation.c:1226
+#: src/transport/gnunet-service-transport_validation.c:1224
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
@@ -852,8 +857,8 @@
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr "Mensaje no soportado del tipo %u (%u bytes) recibido del par «%s»\n"
 
-#: src/core/gnunet-service-core_sessions.c:210
-#: src/core/gnunet-service-core_sessions.c:280
+#: src/core/gnunet-service-core_sessions.c:209
+#: src/core/gnunet-service-core_sessions.c:279
 #: src/dht/gnunet-service-dht_neighbours.c:641
 #: src/dht/gnunet-service-dht_neighbours.c:700
 #: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
@@ -862,16 +867,16 @@
 #: src/transport/gnunet-service-transport_neighbours.c:1041
 #: src/transport/gnunet-service-transport_neighbours.c:1265
 #: src/transport/gnunet-service-transport_neighbours.c:1274
-#: src/transport/gnunet-service-transport_neighbours.c:2793
-#: src/transport/gnunet-service-transport_neighbours.c:3047
+#: src/transport/gnunet-service-transport_neighbours.c:2799
+#: src/transport/gnunet-service-transport_neighbours.c:3053
 msgid "# peers connected"
 msgstr "# pares conectados"
 
-#: src/core/gnunet-service-core_sessions.c:248
+#: src/core/gnunet-service-core_sessions.c:247
 msgid "# type map refreshes sent"
 msgstr "# envíos de refrescos del mapa de tipos"
 
-#: src/core/gnunet-service-core_sessions.c:417
+#: src/core/gnunet-service-core_sessions.c:416
 msgid "# messages discarded (expired prior to transmission)"
 msgstr "# mensajes descartados (expirados antes de su transmisión)"
 
@@ -885,7 +890,7 @@
 msgstr "# actualizaciones de mi mapa de tipos"
 
 #: src/datacache/datacache.c:115 src/datacache/datacache.c:266
-#: src/datastore/gnunet-service-datastore.c:834
+#: src/datastore/gnunet-service-datastore.c:838
 msgid "# bytes stored"
 msgstr "# bytes almacenados"
 
@@ -894,8 +899,8 @@
 msgstr "# elementos almacenados"
 
 #: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1483
-#: src/datastore/gnunet-service-datastore.c:1494
+#: src/datastore/gnunet-service-datastore.c:1487
+#: src/datastore/gnunet-service-datastore.c:1498
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "¡No se ha especificado ningún «%s» para «%s» en la configuración!\n"
@@ -929,15 +934,16 @@
 
 #: src/datacache/plugin_datacache_sqlite.c:69
 #: src/datacache/plugin_datacache_sqlite.c:72
-#: src/datastore/plugin_datastore_mysql.c:803
-#: src/datastore/plugin_datastore_mysql.c:817
+#: src/datastore/plugin_datastore_mysql.c:806
+#: src/datastore/plugin_datastore_mysql.c:820
 #: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
-#: src/include/gnunet_common.h:616 src/include/gnunet_common.h:623
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:54
+#: src/include/gnunet_common.h:654 src/include/gnunet_common.h:663
+#: src/scalarproduct/scalarproduct.h:56
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» falló en %s: %d con el error: %s\n"
@@ -948,7 +954,7 @@
 
 #: src/datacache/plugin_datacache_sqlite.c:484
 #: src/datastore/plugin_datastore_sqlite.c:401
-#: src/namestore/plugin_namestore_sqlite.c:362
+#: src/namestore/plugin_namestore_sqlite.c:374
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 "Se intentó cerrar sqlite sin finalizar todas las sentencias preparadas.\n"
@@ -990,7 +996,7 @@
 msgid "# datastore connections (re)created"
 msgstr "# conexiones a almacenes de datos (re)creadas"
 
-#: src/datastore/datastore_api.c:608
+#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:276
 msgid "# transmission request failures"
 msgstr "# fallos en peticiones de transmisión"
 
@@ -1016,43 +1022,43 @@
 msgid "# status messages received"
 msgstr "# mensajes de estado recibidos"
 
-#: src/datastore/datastore_api.c:867
+#: src/datastore/datastore_api.c:868
 msgid "# PUT requests executed"
 msgstr "# peticiones «PUT» ejecutadas"
 
-#: src/datastore/datastore_api.c:934
+#: src/datastore/datastore_api.c:935
 msgid "# RESERVE requests executed"
 msgstr "# peticiones «RESERVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:995
+#: src/datastore/datastore_api.c:996
 msgid "# RELEASE RESERVE requests executed"
 msgstr "# Peticiones «RELEASE RESERVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1052
+#: src/datastore/datastore_api.c:1055
 msgid "# UPDATE requests executed"
 msgstr "# peticiones «UPDATE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1116
+#: src/datastore/datastore_api.c:1119
 msgid "# REMOVE requests executed"
 msgstr "# peticiones «REMOVE» ejecutadas"
 
-#: src/datastore/datastore_api.c:1161
+#: src/datastore/datastore_api.c:1164
 msgid "Failed to receive response from database.\n"
 msgstr "Se produjo un fallo al recibir la respuesta de la base de datos.\n"
 
-#: src/datastore/datastore_api.c:1220
+#: src/datastore/datastore_api.c:1223
 msgid "# Results received"
 msgstr "# Resultados recibidos"
 
-#: src/datastore/datastore_api.c:1286
+#: src/datastore/datastore_api.c:1290
 msgid "# GET REPLICATION requests executed"
 msgstr "# peticiones «GET REPLICATION» ejecutadas"
 
-#: src/datastore/datastore_api.c:1349
+#: src/datastore/datastore_api.c:1353
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr "# peticiones «GET ZERO ANONYMITY» ejecutadas"
 
-#: src/datastore/datastore_api.c:1410
+#: src/datastore/datastore_api.c:1414
 msgid "# GET requests executed"
 msgstr "# peticiones «GET» ejecutadas"
 
@@ -1077,29 +1083,29 @@
 msgid "Manipulate GNUnet datastore"
 msgstr "Manipular ficheros de configuración de GNUnet"
 
-#: src/datastore/gnunet-service-datastore.c:349
+#: src/datastore/gnunet-service-datastore.c:351
 msgid "# bytes expired"
 msgstr "# bytes expirados"
 
-#: src/datastore/gnunet-service-datastore.c:422
+#: src/datastore/gnunet-service-datastore.c:425
 msgid "# bytes purged (low-priority)"
 msgstr "# bytes purgados (baja prioridad)"
 
-#: src/datastore/gnunet-service-datastore.c:480
+#: src/datastore/gnunet-service-datastore.c:483
 #: src/gns/gnunet-gns-helper-service-w32.c:155
 msgid "Transmission to client failed!\n"
 msgstr "¡La transmisión con el cliente ha fallado!\n"
 
-#: src/datastore/gnunet-service-datastore.c:511
+#: src/datastore/gnunet-service-datastore.c:514
 #: src/gns/gnunet-gns-helper-service-w32.c:183
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr "Apagado en proceso, abortando transmisión.\n"
 
-#: src/datastore/gnunet-service-datastore.c:626
+#: src/datastore/gnunet-service-datastore.c:630
 msgid "# results found"
 msgstr "# resultados encontrados"
 
-#: src/datastore/gnunet-service-datastore.c:669
+#: src/datastore/gnunet-service-datastore.c:673
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
@@ -1108,7 +1114,7 @@
 "Espacio insuficiente (%llu bytes están disponibles) para satisfacer la "
 "petición «%s» de %llu bytes\n"
 
-#: src/datastore/gnunet-service-datastore.c:680
+#: src/datastore/gnunet-service-datastore.c:684
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
@@ -1117,7 +1123,7 @@
 "La cantidad solicitada (%llu bytes) es mayor que el tamaño de la caché (%llu "
 "bytes)\n"
 
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:688
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
@@ -1125,118 +1131,118 @@
 "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
+#: src/datastore/gnunet-service-datastore.c:694
 msgid "Insufficient space to satisfy request"
 msgstr "Espacio insuficiente para satisfacer la petición"
 
-#: src/datastore/gnunet-service-datastore.c:695
-#: src/datastore/gnunet-service-datastore.c:747
-#: src/datastore/gnunet-service-datastore.c:960
-#: src/datastore/gnunet-service-datastore.c:1417
+#: src/datastore/gnunet-service-datastore.c:699
+#: src/datastore/gnunet-service-datastore.c:751
+#: src/datastore/gnunet-service-datastore.c:964
+#: src/datastore/gnunet-service-datastore.c:1421
 msgid "# reserved"
 msgstr "# reservado"
 
-#: src/datastore/gnunet-service-datastore.c:760
+#: src/datastore/gnunet-service-datastore.c:764
 msgid "Could not find matching reservation"
 msgstr "No se pudo encontrar una reserva coincidente"
 
-#: src/datastore/gnunet-service-datastore.c:846
+#: src/datastore/gnunet-service-datastore.c:850
 #, 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"
 
-#: src/datastore/gnunet-service-datastore.c:1006
+#: src/datastore/gnunet-service-datastore.c:1010
 msgid "# GET requests received"
 msgstr "# peticiones «GET» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1018
+#: src/datastore/gnunet-service-datastore.c:1022
 msgid "# requests filtered by bloomfilter"
 msgstr "# peticiones filtradas por el «bloomfilter»"
 
-#: src/datastore/gnunet-service-datastore.c:1046
+#: src/datastore/gnunet-service-datastore.c:1050
 msgid "# UPDATE requests received"
 msgstr "# peticiones «UPDATE» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1076
+#: src/datastore/gnunet-service-datastore.c:1080
 msgid "# GET REPLICATION requests received"
 msgstr "# peticiones «GET REPLICATION» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1109
+#: src/datastore/gnunet-service-datastore.c:1113
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# peticiones «GET ZERO ANONYMITY» recibidas"
 
-#: src/datastore/gnunet-service-datastore.c:1134
+#: src/datastore/gnunet-service-datastore.c:1138
 msgid "Content not found"
 msgstr "Contenido no encontrado"
 
-#: src/datastore/gnunet-service-datastore.c:1142
+#: src/datastore/gnunet-service-datastore.c:1146
 msgid "# bytes removed (explicit request)"
 msgstr "# bytes eliminados (petición explícita)"
 
-#: src/datastore/gnunet-service-datastore.c:1174
+#: src/datastore/gnunet-service-datastore.c:1178
 msgid "# REMOVE requests received"
 msgstr "# peticiones «REMOVE» recibidas"
 
 # Miguel: ¿Cómo traducir «payload»? ¿Código cargado?
-#: src/datastore/gnunet-service-datastore.c:1216
+#: src/datastore/gnunet-service-datastore.c:1220
 #, 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"
 
-#: src/datastore/gnunet-service-datastore.c:1277
+#: src/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr "Cargando el módulo del almacén de datos «%s»\n"
 
-#: src/datastore/gnunet-service-datastore.c:1286
+#: src/datastore/gnunet-service-datastore.c:1290
 #, 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"
 
-#: src/datastore/gnunet-service-datastore.c:1488
+#: src/datastore/gnunet-service-datastore.c:1492
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# bytes usados en el almacén de ficheros compartidos «%s»"
 
-#: src/datastore/gnunet-service-datastore.c:1499
+#: src/datastore/gnunet-service-datastore.c:1503
 msgid "# quota"
 msgstr "# cuota"
 
-#: src/datastore/gnunet-service-datastore.c:1501
+#: src/datastore/gnunet-service-datastore.c:1505
 msgid "# cache size"
 msgstr "# tamaño de la caché"
 
-#: src/datastore/gnunet-service-datastore.c:1514
+#: src/datastore/gnunet-service-datastore.c:1518
 #, 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"
 
-#: src/datastore/gnunet-service-datastore.c:1532
-#: src/datastore/gnunet-service-datastore.c:1548
+#: src/datastore/gnunet-service-datastore.c:1536
+#: src/datastore/gnunet-service-datastore.c:1552
 #, 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"
 
-#: src/datastore/gnunet-service-datastore.c:1578
+#: src/datastore/gnunet-service-datastore.c:1582
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Se produjo un fallo al inicializar «bloomfilter».\n"
 
-#: src/datastore/gnunet-service-datastore.c:1607
+#: src/datastore/gnunet-service-datastore.c:1611
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr "Reconstruyendo «bloomfilter».  Por favor, tenga paciencia.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1612
+#: src/datastore/gnunet-service-datastore.c:1616
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr "El módulo no soporta la función «get_keys». Por favor, corríjalo.\n"
 
-#: src/datastore/gnunet-service-datastore.c:1615
+#: src/datastore/gnunet-service-datastore.c:1619
 msgid "Bloomfilter construction complete.\n"
 msgstr "Construcción de «bloomfilter» completa.\n"
 
@@ -1244,17 +1250,17 @@
 msgid "Heap database running\n"
 msgstr "Base de datos de montículo ejecutándose\n"
 
-#: src/datastore/plugin_datastore_mysql.c:780
+#: src/datastore/plugin_datastore_mysql.c:783
 #, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "Se produjo un fallo al preparar la sentencia «%s»\n"
 
-#: src/datastore/plugin_datastore_mysql.c:788
+#: src/datastore/plugin_datastore_mysql.c:791
 #, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "«%s» para «%s» falló en %s: %d con error: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1019
+#: src/datastore/plugin_datastore_mysql.c:1022
 msgid "Mysql database running\n"
 msgstr "Base de datos Mysql ejecutándose\n"
 
@@ -1263,7 +1269,7 @@
 msgstr "Se produjo un fallo al borrar una tabla de la base de datos.\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
-#: src/namestore/plugin_namestore_postgres.c:652
+#: src/namestore/plugin_namestore_postgres.c:735
 msgid "Postgres database running\n"
 msgstr "Base de datos Postgres ejecutándose\n"
 
@@ -1273,24 +1279,25 @@
 msgstr "«%s» falló en %s:%u con el error: %s"
 
 #: src/datastore/plugin_datastore_sqlite.c:253
-#: src/namestore/plugin_namestore_sqlite.c:223
+#: src/namestore/plugin_namestore_sqlite.c:220
+#: src/psycstore/plugin_psycstore_sqlite.c:319
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Imposible inicializar SQLite: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:648
+#: src/datastore/plugin_datastore_sqlite.c:649
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 "Datos no válidos en la base de datos.  Intentando arreglar (por borrado).\n"
 
 # to should be too, i think
-#: src/datastore/plugin_datastore_sqlite.c:1134
+#: src/datastore/plugin_datastore_sqlite.c:1135
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 "la versión de sqlite es muy antigua para determinar el tamaño, se asume "
 "cero\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1153
+#: src/datastore/plugin_datastore_sqlite.c:1154
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
@@ -1299,8 +1306,8 @@
 "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:829
+#: src/datastore/plugin_datastore_sqlite.c:1194
+#: src/namestore/plugin_namestore_sqlite.c:893
 msgid "Sqlite database running\n"
 msgstr "Base de datos sqlite ejecutándose\n"
 
@@ -1356,9 +1363,9 @@
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:861
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:864
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:899
+#: src/nse/gnunet-nse-profiler.c:904
 msgid "be verbose (print progress information)"
 msgstr "ser prolijo (imprime información de progreso)"
 
@@ -1577,45 +1584,45 @@
 msgid "# RESULT messages queued for transmission"
 msgstr "# Mensajes «RESULT» encolados para transmisión"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1575
+#: src/dht/gnunet-service-dht_neighbours.c:1573
 msgid "# P2P PUT requests received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1578
+#: src/dht/gnunet-service-dht_neighbours.c:1576
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# Peticiones «PUT» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1733
+#: src/dht/gnunet-service-dht_neighbours.c:1731
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr "# Peticiones «FIND PEER» ignoradas debido a «Bloomfilter»"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1741
+#: src/dht/gnunet-service-dht_neighbours.c:1739
 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:1832
+#: src/dht/gnunet-service-dht_neighbours.c:1830
 msgid "# P2P GET requests received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1835
+#: src/dht/gnunet-service-dht_neighbours.c:1833
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# Peticiones «GET» P2P recibidas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1888
+#: src/dht/gnunet-service-dht_neighbours.c:1886
 msgid "# P2P FIND PEER requests processed"
 msgstr "# Peticiones «FIND PEER» P2P procesadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1902
+#: src/dht/gnunet-service-dht_neighbours.c:1900
 msgid "# P2P GET requests ONLY routed"
 msgstr "# Peticiones «GET» P2P SOLAMENTE encaminadas"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1979
+#: src/dht/gnunet-service-dht_neighbours.c:1977
 msgid "# P2P RESULTS received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1982
+#: src/dht/gnunet-service-dht_neighbours.c:1980
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Resultados (RESULTS) P2P recibidos"
@@ -1654,11 +1661,11 @@
 msgid "# Entries removed from routing table"
 msgstr "# Entradas eliminadas de la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:400
+#: src/dht/gnunet-service-dht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr "# Entradas añadidas a la tabla de encaminamiento"
 
-#: src/dht/gnunet-service-dht_routing.c:418
+#: src/dht/gnunet-service-dht_routing.c:417
 msgid "# DHT requests combined"
 msgstr "# Peticiones a la DHT combinadas"
 
@@ -1676,14 +1683,14 @@
 msgid "Block of type %u is malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/dns/dnsparser.c:152
+#: src/dns/dnsparser.c:233
 #, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr ""
 "Se produjo un fallo al convertir el nombre en formato DNS IDNA «%s» a UTF-8: "
 "%s\n"
 
-#: src/dns/dnsparser.c:626
+#: src/dns/dnsparser.c:751
 #, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr ""
@@ -1696,7 +1703,6 @@
 msgstr "No se pudo asociar con ningún puerto: %s\n"
 
 #: src/dns/dnsstub.c:296 src/dns/dnsstub.c:384
-#: src/gns/gnunet-service-gns_resolver.c:1651
 #, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
@@ -1805,14 +1811,14 @@
 msgstr "# Bytes transmitidos vía túneles MESH"
 
 #: src/exit/gnunet-daemon-exit.c:924 src/exit/gnunet-daemon-exit.c:2349
-#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1453
-#: src/vpn/gnunet-service-vpn.c:1852 src/vpn/gnunet-service-vpn.c:2015
+#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1451
+#: src/vpn/gnunet-service-vpn.c:1850 src/vpn/gnunet-service-vpn.c:2013
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (tipo no permitido)"
 
 #: src/exit/gnunet-daemon-exit.c:961 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1509
-#: src/vpn/gnunet-service-vpn.c:1911 src/vpn/gnunet-service-vpn.c:2048
+#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1507
+#: src/vpn/gnunet-service-vpn.c:1909 src/vpn/gnunet-service-vpn.c:2046
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (tipo no permitido)"
 
@@ -1909,13 +1915,13 @@
 msgid "# ICMP service requests received via mesh"
 msgstr "# Peticiones de servicio ICMP recibidas vía mesh"
 
-#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1443
-#: src/vpn/gnunet-service-vpn.c:2009
+#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1441
+#: src/vpn/gnunet-service-vpn.c:2007
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr "# Paquetes ICMPv4 omitidos (imposible atravesar v6)"
 
-#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1479
-#: src/vpn/gnunet-service-vpn.c:1491 src/vpn/gnunet-service-vpn.c:1899
+#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1477
+#: src/vpn/gnunet-service-vpn.c:1489 src/vpn/gnunet-service-vpn.c:1897
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr "# Paquetes ICMPv6 omitidos (imposible atravesar v4)"
 
@@ -2057,69 +2063,69 @@
 msgid "Experiment `%s': Required capabilities invalid \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:393
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:392
 #, fuzzy, c-format
 msgid "Failed to parse file `%s'\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:419
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:444
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:418
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:443
 msgid ""
 "No valid experiment issuers configured! Set value to peer id of issuer! "
 "Exit...\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:429
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:428
 #, fuzzy, c-format
 msgid "Invalid value `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:453
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
 #, fuzzy, c-format
 msgid "Invalid public key `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:460
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:459
 #, fuzzy, c-format
 msgid "Found issuer for public key `%s'\n"
 msgstr "Encontrados %u módulos de transporte: «%s»\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:463
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:462
 #, fuzzy, c-format
 msgid "No issuer for public key `%s'\n"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:480
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:479
 #, fuzzy, c-format
 msgid "Cannot read experiments file `%s'\n"
 msgstr "No se pudo leer la lista de amigos «%s»\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:220
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
 #, c-format
 msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:290
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:291
 #, c-format
 msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:421
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:422
 #, c-format
 msgid "Added peer `%s' as active node\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:848
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:849
 #, fuzzy, c-format
 msgid "Connected to peer %s\n"
 msgstr "Conectado a %s.\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:877
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:878
 #, fuzzy, c-format
 msgid "Disconnected from peer %s\n"
 msgstr "Desconectado de %s\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1057
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1058
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "¡Se produjo un fallo al conectar con el servicio DHT!\n"
@@ -2208,63 +2214,63 @@
 msgid "Short read reading from file `%s'!"
 msgstr "¡Lectura corta leyendo del fichero «%s»!"
 
-#: src/fs/fs_api.c:1061
+#: src/fs/fs_api.c:1062
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1557
+#: src/fs/fs_api.c:1565
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr "Fallo mientras se reiniciaba la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1571
+#: src/fs/fs_api.c:1579
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:2228
+#: src/fs/fs_api.c:2236
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de publicación «%s»: "
 "%s\n"
 
-#: src/fs/fs_api.c:2238
+#: src/fs/fs_api.c:2246
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de desindexado «%s»: %s\n"
 
-#: src/fs/fs_api.c:2364 src/fs/fs_api.c:2604
+#: src/fs/fs_api.c:2372 src/fs/fs_api.c:2612
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-descarga «%s»: %s\n"
 
-#: src/fs/fs_api.c:2381
+#: src/fs/fs_api.c:2389
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2896
+#: src/fs/fs_api.c:2402 src/fs/fs_api.c:2421 src/fs/fs_api.c:2904
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2595
+#: src/fs/fs_api.c:2603
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 "Se produjo un fallo al retomar la sub-descarga «%s»: no se pudo abrir el "
 "fichero «%s»\n"
 
-#: src/fs/fs_api.c:2840
+#: src/fs/fs_api.c:2848
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 "No se pudo retomar la búsqueda en ejecución, se retomará como una búsqueda "
 "en pausa\n"
 
-#: src/fs/fs_api.c:2934
+#: src/fs/fs_api.c:2942
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2394,77 +2400,65 @@
 msgid "Failed to connect to datastore."
 msgstr "Se produjo un fallo al conectar con el almacén de datos."
 
-#: src/fs/fs_pseudonym.c:327 src/fs/fs_pseudonym.c:631
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:414
 #, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr ""
-"Se produjo un fallo al procesar los metadatos del fichero «%s» acerca del "
-"seudónimo: %s\n"
-
-#: src/fs/fs_pseudonym.c:463 src/fs/fs_pseudonym.c:489
-#: src/fs/fs_pseudonym.c:627
-msgid "no-name"
-msgstr "sin nombre"
-
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:399
-#, c-format
 msgid "Publishing failed: %s"
 msgstr "Publicación fallida: %s"
 
-#: src/fs/fs_publish.c:624 src/fs/fs_publish.c:641 src/fs/fs_publish.c:680
-#: src/fs/fs_publish.c:700 src/fs/fs_publish.c:725 src/fs/fs_publish.c:865
+#: src/fs/fs_publish.c:642 src/fs/fs_publish.c:659 src/fs/fs_publish.c:698
+#: src/fs/fs_publish.c:719 src/fs/fs_publish.c:743 src/fs/fs_publish.c:889
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "No se pudo indexar el fichero «%s»: %s.  Se intentará insertar.\n"
 
-#: src/fs/fs_publish.c:626
+#: src/fs/fs_publish.c:644
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 "expiración del plazo en la petición de inicio de indexado (index-start) al "
 "servicio «fs»"
 
-#: src/fs/fs_publish.c:638
+#: src/fs/fs_publish.c:656
 msgid "unknown error"
 msgstr "error desconocido"
 
-#: src/fs/fs_publish.c:681
+#: src/fs/fs_publish.c:700
 msgid "failed to compute hash"
 msgstr "se produjo un fallo al calcular el hash"
 
-#: src/fs/fs_publish.c:701
+#: src/fs/fs_publish.c:720
 msgid "filename too long"
 msgstr "nombre de fichero demasiado largo"
 
-#: src/fs/fs_publish.c:726
+#: src/fs/fs_publish.c:745
 msgid "could not connect to `fs' service"
 msgstr "no se pudo conectar con el servicio «fs»"
 
-#: src/fs/fs_publish.c:749
+#: src/fs/fs_publish.c:768
 #, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/fs/fs_publish.c:814
+#: src/fs/fs_publish.c:837
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "La subida recursiva falló en «%s»: %s"
 
-#: src/fs/fs_publish.c:820
+#: src/fs/fs_publish.c:843
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Subida recursiva fallida: %s"
 
-#: src/fs/fs_publish.c:866
+#: src/fs/fs_publish.c:890
 msgid "needs to be an actual file"
 msgstr "tiene que ser un fichero de verdad"
 
-#: src/fs/fs_publish.c:1092
+#: src/fs/fs_publish.c:1126
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr "Espacio insuficiente para publicar: %s"
 
-#: src/fs/fs_publish.c:1164
+#: src/fs/fs_publish.c:1198
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr "Reservando espacio para %u entradas y %llu bytes para publicación\n"
@@ -2473,6 +2467,10 @@
 msgid "Could not connect to datastore."
 msgstr "No se pudo conectar con el almacén de datos."
 
+#: src/fs/fs_publish_ublock.c:219
+msgid "Internal error."
+msgstr "Error interno."
+
 #: src/fs/fs_search.c:815
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
@@ -2484,56 +2482,56 @@
 msgstr ""
 "Se obtuvo un resultado con un tipo desconocido de bloque «%d», ignorándolo"
 
-#: src/fs/fs_unindex.c:58
+#: src/fs/fs_unindex.c:59
 msgid "Failed to find given position in file"
 msgstr "Se produjo un fallo al buscar la posición dada en el fichero"
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_unindex.c:64
 msgid "Failed to read file"
 msgstr "No se pudo leer el fichero"
 
-#: src/fs/fs_unindex.c:233
+#: src/fs/fs_unindex.c:234
 msgid "Unexpected time for a response from `fs' service."
 msgstr "Tiempo inesperado para una respuesta del servicio «fs»."
 
-#: src/fs/fs_unindex.c:241
+#: src/fs/fs_unindex.c:242
 msgid "Timeout waiting for `fs' service."
 msgstr "Esperando al servicio «fs»."
 
-#: src/fs/fs_unindex.c:249
+#: src/fs/fs_unindex.c:250
 msgid "Invalid response from `fs' service."
 msgstr "Respuesta no válida del servicio «fs»."
 
-#: src/fs/fs_unindex.c:293
+#: src/fs/fs_unindex.c:291
 msgid "Failed to connect to FS service for unindexing."
 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
+#: src/fs/fs_unindex.c:347 src/fs/fs_unindex.c:359
 msgid "Failed to get KSKs from directory scan."
 msgstr "Se produjo un fallo al obtener KSKs de la búsqueda de directorios."
 
-#: src/fs/fs_unindex.c:357
+#: src/fs/fs_unindex.c:355
 #, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "Error interno escaneando «%s».\n"
 
-#: src/fs/fs_unindex.c:416
+#: src/fs/fs_unindex.c:414
 #, 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:565 src/fs/fs_unindex.c:628
+#: src/fs/fs_unindex.c:562 src/fs/fs_unindex.c:626
 msgid "Failed to connect to `datastore' service."
 msgstr ""
 "Se produjo un fallo al conectar con el servicio de almacenamiento de datos "
 "(datastore)."
 
-#: src/fs/fs_unindex.c:641
+#: src/fs/fs_unindex.c:639
 msgid "Failed to open file for unindexing."
 msgstr "Se produjo un fallo al abrir el fichero para desindexado."
 
-#: src/fs/fs_unindex.c:675
+#: src/fs/fs_unindex.c:673
 msgid "Failed to compute hash of file."
 msgstr "Se produjo un fallo al calcular el hash del fichero."
 
@@ -2563,13 +2561,18 @@
 msgid "Malformed CHK URI"
 msgstr "URI CHK mal formada"
 
-#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
-#: src/fs/fs_uri.c:629
+#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:629
 msgid "SKS URI malformed"
 msgstr "URI SKS mal formada"
 
+#: src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
+#, fuzzy
+msgid "LOC URI malformed"
+msgstr "URI SKS mal formada"
+
 #: src/fs/fs_uri.c:611
-msgid "SKS URI malformed (could not decode public key)"
+#, fuzzy
+msgid "LOC URI malformed (could not decode public key)"
 msgstr "URI SKS mal formada (no se pudo decodificar la clave pública)"
 
 #: src/fs/fs_uri.c:617
@@ -2592,20 +2595,20 @@
 msgid "Unrecognized URI type"
 msgstr "Tipo de URI no reconocido"
 
-#: src/fs/fs_uri.c:911
+#: src/fs/fs_uri.c:912
 msgid "Lacking key configuration settings.\n"
 msgstr "Falta configuración sobre las opciones de claves.\n"
 
-#: src/fs/fs_uri.c:917
+#: src/fs/fs_uri.c:918
 #, 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:1099 src/fs/fs_uri.c:1126
+#: src/fs/fs_uri.c:1102 src/fs/fs_uri.c:1129
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/fs/fs_uri.c:1132
+#: src/fs/fs_uri.c:1135
 msgid "Number of double-quotes not balanced!\n"
 msgstr "¡Número de comillas dobles no balanceado!\n"
 
@@ -2643,26 +2646,24 @@
 "Debes especificar uno y solo un nombre de directorio para publicación "
 "automática.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:310
-#: src/fs/gnunet-publish.c:808
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:811
 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:812
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:815
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 "deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:815
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:818
 msgid "do not use libextractor to add keywords or metadata"
 msgstr "no usar libextractor para añadir palabras clave o metadatos"
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:839
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:842
 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:329
-#: src/fs/gnunet-publish.c:846
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:849
 msgid "set the desired replication LEVEL"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
@@ -2670,7 +2671,7 @@
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr "Publicar automáticamente ficheros de un directorio en GNUnet"
 
-#: src/fs/gnunet-daemon-fsprofiler.c:656
+#: src/fs/gnunet-daemon-fsprofiler.c:657
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr "Demonio para medir el rendimiento de usar compartición de archivos."
 
@@ -2758,7 +2759,7 @@
 msgid "Target filename must be specified.\n"
 msgstr "El nombre de fichero de destino debe ser especificado.\n"
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:781
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:784
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2808,73 +2809,26 @@
 msgid "Special file-sharing operations"
 msgstr "Operaciones especiales de compartición de ficheros"
 
-#: src/fs/gnunet-fs-profiler.c:190
+#: src/fs/gnunet-fs-profiler.c:193
 msgid "run the experiment with COUNT peers"
 msgstr "ejecuta el experimento con «COUNT» pares"
 
-#: src/fs/gnunet-fs-profiler.c:193
+#: src/fs/gnunet-fs-profiler.c:196
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 "especifica el nombre de un fichero con las máquinas (HOSTS) que la batería "
 "de pruebas debería usar"
 
-#: src/fs/gnunet-fs-profiler.c:196
+#: src/fs/gnunet-fs-profiler.c:199
 msgid "automatically terminate experiment after DELAY"
 msgstr "termina el experimento automáticamente despues de «DELAY»"
 
-#: src/fs/gnunet-fs-profiler.c:205
+#: src/fs/gnunet-fs-profiler.c:208
 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"
 
-#: src/fs/gnunet-pseudonym.c:227 src/fs/gnunet-pseudonym.c:229
-#, c-format
-msgid "Option `%s' ignored\n"
-msgstr "Opción «%s» ignorada\n"
-
-#: src/fs/gnunet-pseudonym.c:265 src/statistics/gnunet-statistics.c:305
-#, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Parámetro no válido «%s»\n"
-
-#: src/fs/gnunet-pseudonym.c:313
-#, fuzzy
-msgid "advertise namespace NAME"
-msgstr "crear o anunciar un nombre de espacio de nombres (NAME)"
-
-#: src/fs/gnunet-pseudonym.c:316
-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:320 src/fs/gnunet-publish.c:827
-msgid "set the meta-data for the given TYPE to the given VALUE"
-msgstr "establece los metadatos para el tipo TYPE dado al valor VALUE dado"
-
-#: src/fs/gnunet-pseudonym.c:323
-msgid "use the given PRIORITY for the advertisments"
-msgstr "usa la prioridad (PRIORITY) dada para los anuncios"
-
-#: src/fs/gnunet-pseudonym.c:326
-msgid "do not print names of remote namespaces"
-msgstr "no imprime los nombres de los espacios de nombres remotos"
-
-#: src/fs/gnunet-pseudonym.c:332
-msgid "specify ID of the root of the namespace"
-msgstr "especifica la identificación (ID) del espacio de nombres raíz"
-
-#: src/fs/gnunet-pseudonym.c:335
-msgid "change rating of namespace ID by VALUE"
-msgstr "cambia la valoración del espacio de nombres «ID» al valor «VALUE»"
-
-#: src/fs/gnunet-pseudonym.c:347
-msgid "Manage GNUnet pseudonyms."
-msgstr "Gestionar seudónimos de GNUnet."
-
 #: src/fs/gnunet-publish.c:230
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -2959,7 +2913,7 @@
 msgid "Failed to access `%s': %s\n"
 msgstr "Se produjo un fallo al acceder «%s»: %s\n"
 
-#: src/fs/gnunet-publish.c:681
+#: src/fs/gnunet-publish.c:682
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
@@ -2967,33 +2921,33 @@
 "Se produjo un fallo al iniciar el meta-escáner de directorios.  ¿Está "
 "«gnunet-helper-publish-fs» instalado?\n"
 
-#: src/fs/gnunet-publish.c:731
+#: src/fs/gnunet-publish.c:734
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "¡No se pueden extraer metadatos de una URI!\n"
 
-#: src/fs/gnunet-publish.c:738
+#: src/fs/gnunet-publish.c:741
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Se debe especificar uno y solo un nombre de fichero para insertar.\n"
 
-#: src/fs/gnunet-publish.c:744
+#: src/fs/gnunet-publish.c:747
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "No se puede especificar una URI y un nombre de fichero.\n"
 
-#: src/fs/gnunet-publish.c:752 src/vpn/gnunet-vpn.c:213
+#: src/fs/gnunet-publish.c:755 src/vpn/gnunet-vpn.c:213
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "La opción «%s» es obligatoria cuando se usa la opción «%s».\n"
 
-#: src/fs/gnunet-publish.c:762 src/fs/gnunet-publish.c:769
+#: src/fs/gnunet-publish.c:765 src/fs/gnunet-publish.c:772
 #: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "La opción «%s» no tiene sentido sin la opción «%s».\n"
 
-#: src/fs/gnunet-publish.c:819
+#: src/fs/gnunet-publish.c:822
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -3001,7 +2955,7 @@
 "imprimir una lista de las palabras clave extraídas que podrían ser usadas, "
 "pero sin realizar la subida"
 
-#: src/fs/gnunet-publish.c:823
+#: src/fs/gnunet-publish.c:826
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -3010,6 +2964,10 @@
 "directorio (esta opción puede ser especificada varias veces)"
 
 #: src/fs/gnunet-publish.c:830
+msgid "set the meta-data for the given TYPE to the given VALUE"
+msgstr "establece los metadatos para el tipo TYPE dado al valor VALUE dado"
+
+#: src/fs/gnunet-publish.c:833
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -3017,7 +2975,7 @@
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "cifrada en la base de datos de GNUnet)"
 
-#: src/fs/gnunet-publish.c:835
+#: src/fs/gnunet-publish.c:838
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3025,13 +2983,13 @@
 "especificar la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio de nombres únicamente)"
 
-#: src/fs/gnunet-publish.c:843
+#: src/fs/gnunet-publish.c:846
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publicar los ficheros bajo el seudónimo NAME (coloca el fichero en el "
 "espacio)"
 
-#: src/fs/gnunet-publish.c:849
+#: src/fs/gnunet-publish.c:852
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
@@ -3039,14 +2997,14 @@
 "únicamente simular el proceso pero no publicar nada realmente (útil para "
 "calcular URI)"
 
-#: src/fs/gnunet-publish.c:853
+#: src/fs/gnunet-publish.c:856
 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:857
+#: src/fs/gnunet-publish.c:860
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3054,7 +3012,7 @@
 "URI a ser publicada (puede ser usado en vez de pasar un fichero para añadir "
 "claves con el fichero con la URI respectiva)"
 
-#: src/fs/gnunet-publish.c:873
+#: src/fs/gnunet-publish.c:876
 msgid "Publish a file or directory on GNUnet"
 msgstr "Publicar un fichero o un directorio en GNUnet"
 
@@ -3102,9 +3060,9 @@
 msgid "# Loopback routes suppressed"
 msgstr "# Rutas en bucle local eliminadas"
 
-#: src/fs/gnunet-service-fs.c:640 src/hostlist/gnunet-daemon-hostlist.c:291
-#: src/topology/gnunet-daemon-topology.c:1314
-#: src/topology/gnunet-daemon-topology.c:1321
+#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:293
+#: src/topology/gnunet-daemon-topology.c:1315
+#: src/topology/gnunet-daemon-topology.c:1322
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Se produjo un fallo al conectar con el servicio «%s».\n"
@@ -3302,24 +3260,25 @@
 msgstr "# mensajes de búsqueda enviados a otros pares"
 
 # ???
-#: src/fs/gnunet-service-fs_pe.c:482
-msgid "# delay heap timeout"
+#: src/fs/gnunet-service-fs_pe.c:484
+#, fuzzy
+msgid "# delay heap timeout (ms)"
 msgstr "# plazo del retraso del montículo"
 
-#: src/fs/gnunet-service-fs_pe.c:490
+#: src/fs/gnunet-service-fs_pe.c:492
 msgid "# query plans executed"
 msgstr "# planes de búsqueda ejecutados"
 
-#: src/fs/gnunet-service-fs_pe.c:550
+#: src/fs/gnunet-service-fs_pe.c:552
 msgid "# requests merged"
 msgstr "# peticiones unidas"
 
-#: src/fs/gnunet-service-fs_pe.c:558
+#: src/fs/gnunet-service-fs_pe.c:560
 msgid "# requests refreshed"
 msgstr "# peticiones refrescadas"
 
-#: src/fs/gnunet-service-fs_pe.c:612 src/fs/gnunet-service-fs_pe.c:696
-#: src/fs/gnunet-service-fs_pe.c:767
+#: src/fs/gnunet-service-fs_pe.c:614 src/fs/gnunet-service-fs_pe.c:698
+#: src/fs/gnunet-service-fs_pe.c:769
 msgid "# query plan entries"
 msgstr "# entradas de planes de búsqueda"
 
@@ -3460,192 +3419,229 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr "Desindexa un fichero previamente indexado con «gnunet-publish»."
 
-#: src/gns/gns_api.c:598
+#: src/gns/gns_api.c:385
 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"
 
-#: src/gns/gnunet-dns2gns.c:192
+#: src/gns/gnunet-dns2gns.c:228
 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"
 
-#: src/gns/gnunet-dns2gns.c:367
+#: src/gns/gnunet-dns2gns.c:400
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "No se puede procesar la petición DNS de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:383
+#: src/gns/gnunet-dns2gns.c:416
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Recibida petición DNS mal formada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:391
+#: src/gns/gnunet-dns2gns.c:424
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Recibida petición DNS no soportada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:681
+#: src/gns/gnunet-dns2gns.c:703
+msgid "No ego configured for `dns2gns` subsystem\n"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:729
+#, fuzzy
+msgid "No DNS server specified!\n"
+msgstr "¡Ninguna palabra clave especificada!\n"
+
+#: src/gns/gnunet-dns2gns.c:751
+#, fuzzy
+msgid "No valid GNS zone specified!\n"
+msgstr "¡Ninguna palabra clave especificada!\n"
+
+#: src/gns/gnunet-dns2gns.c:772
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr "IP del resolvedor recursivo DNS a usar (requerido)"
 
-#: src/gns/gnunet-dns2gns.c:684
-msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
-msgstr "Sufijo DNS autoritativo a usar (opcional); predeterminado: zkey.eu"
-
-#: src/gns/gnunet-dns2gns.c:687
+#: src/gns/gnunet-dns2gns.c:775
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 "Sufijo FCFS autoritativo a usar (opcional); predeterminado: fcfs.zkey.eu"
 
-#: src/gns/gnunet-dns2gns.c:690
+#: src/gns/gnunet-dns2gns.c:778
+msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+msgstr "Sufijo DNS autoritativo a usar (opcional); predeterminado: zkey.eu"
+
+#: src/gns/gnunet-dns2gns.c:781
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 "Puerto UDP en el que escuchar para peticiones DNS entrantes; predeterminado: "
 "53"
 
-#: src/gns/gnunet-dns2gns.c:703
+#: src/gns/gnunet-dns2gns.c:784
+msgid "Public key of the GNS zone to use (overrides default)"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:797
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)"
 
-#: src/gns/gnunet-gns.c:221
+#: src/gns/gnunet-gns.c:205
 #, c-format
+msgid "Please specify name to lookup!\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:285
+#, c-format
+msgid "Ego for `%s' not found, cannot perform lookup.\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:323
+#, c-format
+msgid ""
+"Ego for `master-zone' not found, cannot perform lookup.  Did you run gnunet-"
+"gns-import.sh?\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:352
+#, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/gns/gnunet-gns.c:335
+#: src/gns/gnunet-gns.c:365
 #, c-format
-msgid "Please specify lookup, shorten or authority operation!\n"
+msgid "Public key `%s' is not well-formed\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"
-msgstr "intentar acortar un nombre dado"
-
-#: src/gns/gnunet-gns.c:359
+#: src/gns/gnunet-gns.c:414
 msgid "Lookup a record for the given name"
 msgstr "Buscar el registro para el nombre dado"
 
-#: src/gns/gnunet-gns.c:362
-msgid "Get the authority of a particular name"
-msgstr "Obtener la autoridad de un nombre particular"
-
-#: src/gns/gnunet-gns.c:365
+#: src/gns/gnunet-gns.c:417
 msgid "Specify the type of the record to lookup"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns.c:368
+#: src/gns/gnunet-gns.c:420
 msgid "No unneeded output"
 msgstr "Sin salida innecesaria"
 
-#: src/gns/gnunet-gns.c:381
-msgid "GNUnet GNS access tool"
-msgstr "Herramienta de acceso GNUnet GNS"
+#: src/gns/gnunet-gns.c:423
+#, fuzzy
+msgid "Specify the public key of the zone to lookup the record in"
+msgstr "Especificar el tipo del registro a buscar"
 
-# form??
-#: src/gns/gnunet-gns-fcfsd.c:451
-#, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "Forma de valor no soportada «%s»\n"
+#: src/gns/gnunet-gns.c:426
+#, fuzzy
+msgid "Specify the name of the ego of the zone to lookup the record in"
+msgstr "Especificar el tipo del registro a buscar"
 
-#: src/gns/gnunet-gns-fcfsd.c:480
-#, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
+#: src/gns/gnunet-gns.c:439
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "Herramienta de acceso GNUnet GNS"
 
-#: src/gns/gnunet-gns-fcfsd.c:524
+#: src/gns/gnunet-gns-proxy.c:60 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:960
+#: src/hostlist/hostlist-client.c:965
+#: src/transport/plugin_transport_http_client.c:1068
+#: src/transport/plugin_transport_http_client.c:1083
 #, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr "Encontrado nombre «%s» para la clave dada\n"
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "%s falló en %s:%d: «%s».\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:587
+#: src/gns/gnunet-gns-proxy.c:2344
 #, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr "Encontrados %u registros para el dominio «%s»\n"
+msgid "Unable to import private key from file `%s'\n"
+msgstr "No se pudo importar la clave privada del fichero «%s»\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:649
+#: src/gns/gnunet-gns-proxy.c:2372
 #, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr "Se produjo un fallo al crear la página para «%s»\n"
+msgid "Unable to import certificate %s\n"
+msgstr "No se pudo importar el certificado %s\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:665
-#, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n"
-
-#: src/gns/gnunet-gns-fcfsd.c:701
-msgid "Domain name must not contain `.'\n"
-msgstr "El nombre de dominio no puede contener «.»\n"
-
-#: src/gns/gnunet-gns-fcfsd.c:709
-msgid "Domain name must not contain `+'\n"
-msgstr "El nombre de dominio no puede contener «+»\n"
-
-#: src/gns/gnunet-gns-fcfsd.c:913 src/namestore/gnunet-namestore.c:492
-msgid "Failed to read or create private zone key\n"
-msgstr "Se produjo un fallo al leer o crear una clave de zona privada\n"
-
-#: src/gns/gnunet-gns-fcfsd.c:923 src/namestore/gnunet-namestore.c:503
-msgid "Failed to connect to namestore\n"
-msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
-
-#: src/gns/gnunet-gns-fcfsd.c:939 src/gns/gnunet-gns-proxy.c:2857
+#: src/gns/gnunet-gns-proxy.c:2637 src/namestore/gnunet-namestore-fcfsd.c:958
 msgid "Failed to start HTTP server\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:973
-msgid "GNUnet GNS first come first serve registration service"
-msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
+#: src/gns/gnunet-gns-proxy.c:3020
+msgid "No ego configured for `shorten-zone`\n"
+msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2494
-#, c-format
-msgid "Unable to import private key from file `%s'\n"
-msgstr "No se pudo importar la clave privada del fichero «%s»\n"
+#: src/gns/gnunet-gns-proxy.c:3060
+msgid "No ego configured for `master-zone`\n"
+msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2522
-#, c-format
-msgid "Unable to import certificate %s\n"
-msgstr "No se pudo importar el certificado %s\n"
+#: src/gns/gnunet-gns-proxy.c:3120
+#, fuzzy, c-format
+msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
+msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:3510
+#: src/gns/gnunet-gns-proxy.c:3156
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3513
+#: src/gns/gnunet-gns-proxy.c:3159
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3525
+#: src/gns/gnunet-gns-proxy.c:3178
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
-#: src/gns/gnunet-service-gns.c:497
-#, c-format
-msgid "Records for name `%s' in zone %s too large to fit into DHT"
-msgstr ""
-"Los registros para el nombre «%s» en la zona %s son demasiado grandes para "
-"entrar en la DHT"
-
-#: src/gns/gnunet-service-gns.c:1225
+#: src/gns/gnunet-service-gns.c:649
 msgid "Failed to connect to the namestore!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/gns/gnunet-service-gns.c:1286
+#: src/gns/gnunet-service-gns.c:692
 msgid "Could not connect to DHT!\n"
 msgstr "¡No se pudo conectar a la DHT!\n"
 
-#: src/gns/gnunet-service-gns.c:1297
-msgid "Unable to initialize resolver!\n"
-msgstr "¡No se puede inicializar el resolvedor!\n"
+#: src/gns/gnunet-service-gns.c:708
+#, fuzzy
+msgid "valid public key required"
+msgstr "Tipo requerido\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:3446
+#: src/gns/gnunet-service-gns_interceptor.c:201
+#, fuzzy
+msgid "Error converting GNS response to DNS response!\n"
+msgstr "¡Se produjo un error al convertir los argumentos a una URI!\n"
+
+#: src/gns/gnunet-service-gns_interceptor.c:307
+#, fuzzy
+msgid "Failed to connect to the DNS service!\n"
+msgstr "¡Se produjo un fallo al conectar con el servicio GNS!\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:717
+#, fuzzy
+msgid "Failed to parse DNS response\n"
+msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:843
 #, c-format
-msgid "Not a GADS TLD: `%s'\n"
-msgstr "No es un TLD GADS: «%s»\n"
+msgid "Skipping record of unsupported type %d\n"
+msgstr ""
 
+#: src/gns/gnunet-service-gns_resolver.c:1475
+#, c-format
+msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1499
+msgid "GNS lookup recursion failed (no delegation record found)\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1523
+#, fuzzy, c-format
+msgid "Failed to cache GNS resolution: %s\n"
+msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:1782
+#, c-format
+msgid "Hostname `%s' is not well-formed, resolution fails\n"
+msgstr ""
+
 #: src/hello/gnunet-hello.c:123
 msgid "Call with name of HELLO file to modify.\n"
 msgstr "Llamar con el nombre del fichero «HELLO» para modificar.\n"
@@ -3685,45 +3681,45 @@
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:945
+#: src/hello/hello.c:947
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: falta el tiempo de "
 "expiración\n"
 
-#: src/hello/hello.c:954
+#: src/hello/hello.c:956
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: tiempo de expiración no "
 "válido\n"
 
-#: src/hello/hello.c:964
+#: src/hello/hello.c:966
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: mal formado\n"
 
-#: src/hello/hello.c:974
+#: src/hello/hello.c:976
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 "Se produjo un fallo al procesar un mensaje «HELLO»: falta el módulo de "
 "transporte\n"
 
-#: src/hello/hello.c:991
+#: src/hello/hello.c:993
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/hello/hello.c:1000
+#: src/hello/hello.c:1002
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr "El módulo «%s» no soporta URI todavía\n"
 
-#: src/hello/hello.c:1019
+#: src/hello/hello.c:1021
 #, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
 "Se produjo un fallo al procesar «%s» como una dirección para el módulo «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:258
+#: src/hostlist/gnunet-daemon-hostlist.c:260
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
@@ -3731,11 +3727,11 @@
 "Ninguna de las funciones para el demonio de listas de máquinas fue "
 "activada.  ¡No tengo razón para ejecutarme!\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:311
+#: src/hostlist/gnunet-daemon-hostlist.c:313
 msgid "advertise our hostlist to other peers"
 msgstr "anuncia nuestra lista de máquinas a otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:318
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
@@ -3743,16 +3739,16 @@
 "realizar inicialización usando listas de máquinas (es altamente recomendable "
 "que siempre se use esta opción)"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:319
+#: src/hostlist/gnunet-daemon-hostlist.c:321
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 "habilitar aprendizaje de servidores de listas de máquinas de otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:323
+#: src/hostlist/gnunet-daemon-hostlist.c:325
 msgid "provide a hostlist server"
 msgstr "proveer un servidor de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:338
+#: src/hostlist/gnunet-daemon-hostlist.c:340
 msgid "GNUnet hostlist server and client"
 msgstr "Servidor y cliente GNUnet de listas de máquinas"
 
@@ -3773,17 +3769,7 @@
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# «HELLO» válidos descargados de servidores de listas de máquinas"
 
-#: 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:960 src/hostlist/hostlist-client.c:965
-#: src/transport/plugin_transport_http_client.c:1063
-#: src/transport/plugin_transport_http_client.c:1078
-#, c-format
-msgid "%s failed at %s:%d: `%s'\n"
-msgstr "%s falló en %s:%d: «%s».\n"
-
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1319
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1330
 msgid "# advertised hostlist URIs"
 msgstr "# URI de listas de máquinas anunciadas"
 
@@ -3836,76 +3822,76 @@
 msgid "# hostlist downloads initiated"
 msgstr "# descargas de listas de máquinas iniciadas"
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1503
 msgid "# milliseconds between hostlist downloads"
 msgstr "# milisegundos entre descargas de listas de máquinas"
 
-#: src/hostlist/hostlist-client.c:1045
+#: src/hostlist/hostlist-client.c:1046
 #, 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"
 
-#: src/hostlist/hostlist-client.c:1105 src/hostlist/hostlist-client.c:1121
+#: src/hostlist/hostlist-client.c:1106 src/hostlist/hostlist-client.c:1122
 msgid "# active connections"
 msgstr "# conexiones activas"
 
-#: src/hostlist/hostlist-client.c:1267
+#: src/hostlist/hostlist-client.c:1278
 #, 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:1271
+#: src/hostlist/hostlist-client.c:1282
 #, 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:1282
+#: src/hostlist/hostlist-client.c:1293
 #, c-format
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo lectura para cargar las listas de "
 "máquinas: %s\n"
 
-#: src/hostlist/hostlist-client.c:1315
+#: src/hostlist/hostlist-client.c:1326
 #, 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:1317
+#: src/hostlist/hostlist-client.c:1328
 msgid "# hostlist URIs read from file"
 msgstr "# URI de listas de máquinas leídas de fichero"
 
-#: src/hostlist/hostlist-client.c:1362
+#: src/hostlist/hostlist-client.c:1373
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo escritura para almacenar las listas "
 "de máquinas: %s\n"
 
-#: src/hostlist/hostlist-client.c:1367
+#: src/hostlist/hostlist-client.c:1378
 #, 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:1391 src/hostlist/hostlist-client.c:1408
+#: src/hostlist/hostlist-client.c:1402 src/hostlist/hostlist-client.c:1419
 #, 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:1403
+#: src/hostlist/hostlist-client.c:1414
 msgid "# hostlist URIs written to file"
 msgstr "# URI de listas de máquinas escritas a fichero"
 
-#: src/hostlist/hostlist-client.c:1457
+#: src/hostlist/hostlist-client.c:1468
 msgid "Learning is enabled on this peer\n"
 msgstr "El aprendizaje está habilitado en este par\n"
 
-#: src/hostlist/hostlist-client.c:1469
+#: src/hostlist/hostlist-client.c:1480
 msgid "Learning is not enabled on this peer\n"
 msgstr "El aprendizaje no está habilitado en este par\n"
 
-#: src/hostlist/hostlist-client.c:1481
+#: src/hostlist/hostlist-client.c:1492
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -3913,7 +3899,7 @@
 "La lista de máquinas «%s» fue eliminada puesto que el aprendizaje no está "
 "habilitado en este par\n"
 
-#: src/hostlist/hostlist-client.c:1485
+#: src/hostlist/hostlist-client.c:1496
 #, 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"
@@ -3991,7 +3977,7 @@
 "Los mensajes de anuncio no pudieron encolarse por el servicio principal\n"
 
 #: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:659
-#: src/transport/gnunet-service-transport.c:785
+#: src/transport/gnunet-service-transport.c:806
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
@@ -4017,108 +4003,123 @@
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/hostlist-server.c:675
+#: src/hostlist/hostlist-server.c:676
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 "No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n"
 
-#: src/identity/gnunet-identity.c:135
+#: src/identity/gnunet-identity.c:165
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/identity/gnunet-identity.c:237
+#: src/identity/gnunet-identity.c:184
+#, fuzzy, c-format
+msgid "Failed to set default ego: %s\n"
+msgstr "Se produjo un fallo al crear la página para «%s»\n"
+
+#: src/identity/gnunet-identity.c:327
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:240
+#: src/identity/gnunet-identity.c:330
 #, fuzzy
 msgid "delete ego NAME "
 msgstr "borrar un nombre de espacio de nombres (NAME)"
 
-#: src/identity/gnunet-identity.c:243
+#: src/identity/gnunet-identity.c:333
 #, fuzzy
 msgid "display all egos"
 msgstr "mostrar registros"
 
+#: src/identity/gnunet-identity.c:336
+msgid ""
+"set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
+msgstr ""
+
 # Miguel: Aquí he dejado monitorización porque esto es
 # del servicio de traducción de direcciones.
-#: src/identity/gnunet-identity.c:246
+#: src/identity/gnunet-identity.c:339
 #, fuzzy
 msgid "run in monitor mode egos"
 msgstr "modo de monitorización"
 
-#: src/identity/gnunet-identity.c:255
+#: src/identity/gnunet-identity.c:342
+msgid ""
+"set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:351
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:336
+#: src/identity/gnunet-service-identity.c:337
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:357
+#: src/identity/gnunet-service-identity.c:360
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:434
-#: src/identity/gnunet-service-identity.c:665
-#: src/identity/gnunet-service-identity.c:773
+#: src/identity/gnunet-service-identity.c:437
+#: src/identity/gnunet-service-identity.c:668
+#: src/identity/gnunet-service-identity.c:776
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/identity/gnunet-service-identity.c:441
+#: src/identity/gnunet-service-identity.c:444
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:511
+#: src/identity/gnunet-service-identity.c:514
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:642
+#: src/identity/gnunet-service-identity.c:645
 #, fuzzy
 msgid "target name already exists"
 msgstr "El registro ya existía en el almacén de nombres"
 
-#: src/identity/gnunet-service-identity.c:681
-#: src/identity/gnunet-service-identity.c:790
+#: src/identity/gnunet-service-identity.c:684
+#: src/identity/gnunet-service-identity.c:793
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:824
+#: src/identity/gnunet-service-identity.c:827
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
 
-#: src/identity/gnunet-service-identity.c:897
+#: src/identity/gnunet-service-identity.c:900
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/identity/gnunet-service-identity.c:909
+#: src/identity/gnunet-service-identity.c:912
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Se produjo un fallo al leer el directorio «%s»\n"
 
-#: src/integration-tests/connection_watchdog.c:990
+#: src/integration-tests/connection_watchdog.c:998
 #, c-format
 msgid "Transport plugin: `%s' port %llu\n"
 msgstr "Módulo de transporte: «%s» puerto %llu\n"
 
-#: src/integration-tests/connection_watchdog.c:1023
+#: src/integration-tests/connection_watchdog.c:1031
 #, c-format
 msgid "Found %u transport plugins: `%s'\n"
 msgstr "Encontrados %u módulos de transporte: «%s»\n"
 
-#: src/integration-tests/connection_watchdog.c:1082
+#: src/integration-tests/connection_watchdog.c:1091
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 "Enviar mensajes «ping» para probar la conectividad (predeterminado: NO)"
 
-#: src/integration-tests/connection_watchdog.c:1091
-#: src/template/gnunet-template.c:70
+#: src/integration-tests/connection_watchdog.c:1100
+#: src/multicast/gnunet-multicast.c:70 src/template/gnunet-template.c:70
 msgid "help text"
 msgstr "texto de ayuda"
 
@@ -4136,18 +4137,15 @@
 msgid "Print information about mesh tunnels and peers."
 msgstr "Imprimir información acerca de tuneles mesh y pares."
 
-#: src/mesh/gnunet-service-mesh.c:5640
+#: src/mesh/gnunet-service-mesh.c:5634 src/mesh/gnunet-service-mesh-enc.c:7060
 msgid "Wrong CORE service\n"
 msgstr "Servicio principal (CORE) erróneo\n"
 
-#: src/mesh/gnunet-service-mesh.c:5780 src/mesh/gnunet-service-mesh.c:5792
-#: src/mesh/gnunet-service-mesh.c:5804 src/mesh/gnunet-service-mesh.c:5816
-#: src/mesh/gnunet-service-mesh.c:5828 src/mesh/gnunet-service-mesh.c:5840
-#: src/nse/gnunet-service-nse.c:1425 src/nse/gnunet-service-nse.c:1443
+#: src/mesh/gnunet-service-mesh.c:5774 src/mesh/gnunet-service-mesh.c:5786
+#: src/mesh/gnunet-service-mesh.c:5798 src/mesh/gnunet-service-mesh.c:5810
+#: src/mesh/gnunet-service-mesh.c:5822 src/mesh/gnunet-service-mesh.c:5834
+#: src/nse/gnunet-service-nse.c:1440 src/nse/gnunet-service-nse.c:1458
 #: src/regex/gnunet-daemon-regexprofiler.c:270
-#: src/regex/gnunet-daemon-regexprofiler.c:282
-#: src/regex/gnunet-daemon-regexprofiler.c:294
-#: src/regex/gnunet-daemon-regexprofiler.c:307
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
@@ -4155,8 +4153,8 @@
 "El servicio %s carece de opciones de configuración de clave (%s).  "
 "Saliendo.\n"
 
-#: src/mesh/gnunet-service-mesh.c:5852 src/mesh/gnunet-service-mesh.c:5862
-#: src/mesh/gnunet-service-mesh.c:5887
+#: src/mesh/gnunet-service-mesh.c:5846 src/mesh/gnunet-service-mesh.c:5856
+#: src/mesh/gnunet-service-mesh.c:5881
 #, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -4174,203 +4172,236 @@
 msgid "Could not access file `%s': %s\n"
 msgstr "No se pudo acceder al fichero «%s»: %s\n"
 
-#: src/namestore/gnunet-namestore.c:250
+#: src/namestore/gnunet-namestore.c:258
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr "No se pudo añadir el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:281
+#: src/namestore/gnunet-namestore.c:289
 #, c-format
 msgid "Deleting record failed: %s\n"
 msgstr "No se pudo borrar el registro: %s\n"
 
-#: src/namestore/gnunet-namestore.c:342
+#: src/namestore/gnunet-namestore.c:338
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr "\tRegistro corrupto o no soportado del tipo %u\n"
 
-#: src/namestore/gnunet-namestore.c:358
-msgid "for at least"
-msgstr "al menos por"
-
-#: src/namestore/gnunet-namestore.c:359
-msgid "until"
-msgstr "hasta"
-
-#: src/namestore/gnunet-namestore.c:475
+#: src/namestore/gnunet-namestore.c:446
 #, c-format
-msgid "Using default zone file `%s'\n"
-msgstr "Usando el fichero de zonas predeterminado «%s»\n"
-
-#: src/namestore/gnunet-namestore.c:484
-#, c-format
 msgid "No options given\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/namestore/gnunet-namestore.c:513 src/namestore/gnunet-namestore.c:522
-#: src/namestore/gnunet-namestore.c:539 src/namestore/gnunet-namestore.c:561
-#: src/namestore/gnunet-namestore.c:605
+#: src/namestore/gnunet-namestore.c:456
+#: src/namestore/gnunet-namestore-fcfsd.c:992
+msgid "Failed to connect to namestore\n"
+msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
+
+#: src/namestore/gnunet-namestore.c:464 src/namestore/gnunet-namestore.c:473
+#: src/namestore/gnunet-namestore.c:490 src/namestore/gnunet-namestore.c:512
+#: src/namestore/gnunet-namestore.c:554
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:514 src/namestore/gnunet-namestore.c:523
-#: src/namestore/gnunet-namestore.c:540 src/namestore/gnunet-namestore.c:562
+#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:474
+#: src/namestore/gnunet-namestore.c:491 src/namestore/gnunet-namestore.c:513
 msgid "add"
 msgstr "añadir"
 
-#: src/namestore/gnunet-namestore.c:531
+#: src/namestore/gnunet-namestore.c:482
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:551
+#: src/namestore/gnunet-namestore.c:502
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "Valor «%s» no válido para el tipo de registro «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:587
+#: src/namestore/gnunet-namestore.c:538
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:606
+#: src/namestore/gnunet-namestore.c:555
 msgid "del"
 msgstr "borrar"
 
-#: src/namestore/gnunet-namestore.c:649
+#: src/namestore/gnunet-namestore.c:588
 #: src/peerinfo-tool/gnunet-peerinfo.c:711
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:727
+#: src/namestore/gnunet-namestore.c:645
+#, fuzzy, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr "'%s': servicio desconocido: %s\n"
+
+#: src/namestore/gnunet-namestore.c:674
+#, fuzzy, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "Se debe especificar un apodo\n"
+
+#: src/namestore/gnunet-namestore.c:702
 msgid "add record"
 msgstr "añadir registro"
 
-#: src/namestore/gnunet-namestore.c:730
+#: src/namestore/gnunet-namestore.c:705
 msgid "delete record"
 msgstr "borrar registro"
 
-#: src/namestore/gnunet-namestore.c:733
+#: src/namestore/gnunet-namestore.c:708
 msgid "display records"
 msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore.c:736
+#: src/namestore/gnunet-namestore.c:711
 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:739
+#: src/namestore/gnunet-namestore.c:714
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/namestore/gnunet-namestore.c:742
+#: src/namestore/gnunet-namestore.c:717
 msgid "name of the record to add/delete/display"
 msgstr "nombre del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:745
+#: src/namestore/gnunet-namestore.c:720
 msgid "type of the record to add/delete/display"
 msgstr "tipo del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:748
+#: src/namestore/gnunet-namestore.c:723
 msgid "URI to import into our zone"
 msgstr "URI a importar a nuestra zona"
 
-#: src/namestore/gnunet-namestore.c:751
+#: src/namestore/gnunet-namestore.c:726
 msgid "value of the record to add/delete"
 msgstr "valor del registro a añadir/borrar"
 
-#: src/namestore/gnunet-namestore.c:754
+#: src/namestore/gnunet-namestore.c:729
 msgid "create or list public record"
 msgstr "crear o listar registros públicos"
 
-#: src/namestore/gnunet-namestore.c:757
-msgid "create or list non-authority record"
-msgstr "crear o listar registros sin-autoridad"
+#: src/namestore/gnunet-namestore.c:732
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:760
-msgid "filename with the zone key"
-msgstr "nombre del fichero con la clave de zona"
+#: src/namestore/gnunet-namestore.c:735
+#, fuzzy
+msgid "name of the ego controlling the zone"
+msgstr "nombre de la sección a la que acceder"
 
-#: src/namestore/gnunet-namestore.c:771
+#: src/namestore/gnunet-namestore.c:746
 msgid "GNUnet zone manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
 
-#: src/namestore/gnunet-service-namestore.c:300
-#: src/namestore/gnunet-service-namestore.c:318
+# form??
+#: src/namestore/gnunet-namestore-fcfsd.c:456
 #, c-format
-msgid "Failed to write zone key to file `%s': %s\n"
-msgstr "Se produjo un fallo al escribir la clave de zona al fichero «%s»: %s\n"
+msgid "Unsupported form value `%s'\n"
+msgstr "Forma de valor no soportada «%s»\n"
 
-#: src/namestore/gnunet-service-namestore.c:302
-msgid "file exists but reading key failed"
-msgstr "el fichero existe, pero no se pudo leer la clave"
+#: src/namestore/gnunet-namestore-fcfsd.c:485
+#, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
 
-#: src/namestore/gnunet-service-namestore.c:320
-msgid "file exists with different key"
-msgstr "el fichero existe con diferente clave"
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr "Encontrado nombre «%s» para la clave dada\n"
 
-#: src/namestore/gnunet-service-namestore.c:2127
-msgid "No directory to load zonefiles specified in configuration\n"
-msgstr ""
-"Ningún directorio del que cargar ficheros de zona especificado en la "
-"configuración\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:560
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr "Encontrados %u registros para el dominio «%s»\n"
 
-#: src/namestore/gnunet-service-namestore.c:2137
+#: src/namestore/gnunet-namestore-fcfsd.c:670
 #, c-format
-msgid "Creating directory `%s' for zone files failed!\n"
+msgid "Failed to create page for `%s'\n"
+msgstr "Se produjo un fallo al crear la página para «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:686
+#, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:722
+msgid "Domain name must not contain `.'\n"
+msgstr "El nombre de dominio no puede contener «.»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:730
+msgid "Domain name must not contain `+'\n"
+msgstr "El nombre de dominio no puede contener «+»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:932
+msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
-"¡Se produjo un fallo creando el directorio «%s» para ficheros de zonas!\n"
 
-#: src/namestore/namestore_api.c:346
-msgid "Namestore failed to add record"
+#: src/namestore/gnunet-namestore-fcfsd.c:1027
+#, fuzzy
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
+
+#: src/namestore/gnunet-service-namestore.c:674
+msgid "Failed to cache encrypted block of my own zone!\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:319
+#, fuzzy
+msgid "Namestore failed to cache block"
 msgstr "El almacén de nombres no pudo añadir el registro"
 
-#: src/namestore/namestore_api.c:372
-msgid "Namestore failed to add record\n"
+#: src/namestore/namestore_api.c:345
+#, fuzzy
+msgid "Namestore failed to store record\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
 
-#: src/namestore/namestore_api_common.c:532
-#: src/namestore/namestore_api_common.c:672
+#: src/namestore/namestore_api_common.c:691
+#: src/namestore/namestore_api_common.c:831
 #, c-format
 msgid "Unsupported record type %d\n"
 msgstr "Tipo de registro %d no soportado\n"
 
-#: src/namestore/namestore_api_common.c:539
+#: src/namestore/namestore_api_common.c:698
 #, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "No se pudo procesar la dirección IPv4 «%s»\n"
 
-#: src/namestore/namestore_api_common.c:562
+#: src/namestore/namestore_api_common.c:721
 #, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "No se pudo procesar el registro SOA «%s»\n"
 
-#: src/namestore/namestore_api_common.c:585
+#: src/namestore/namestore_api_common.c:744
 #, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "No se pudo procesar el registro MX «%s»\n"
 
-#: src/namestore/namestore_api_common.c:603
+#: src/namestore/namestore_api_common.c:762
 #, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "No se pudo procesar dirección IPv4 «%s»\n"
 
-#: src/namestore/namestore_api_common.c:616
+#: src/namestore/namestore_api_common.c:775
 #, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "No se pudo procesar el registro PKEY «%s»\n"
 
-#: src/namestore/namestore_api_common.c:637
+#: src/namestore/namestore_api_common.c:796
 #, 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_api_common.c:663
+#: src/namestore/namestore_api_common.c:822
 #, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro TLSA «%s»\n"
@@ -4500,42 +4531,42 @@
 "Se produjo un fallo al crear el «socket» de escucha asociado a «%s» para "
 "pruebas NAT: %s\n"
 
-#: src/nse/gnunet-nse-profiler.c:884
+#: src/nse/gnunet-nse-profiler.c:889
 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:887
+#: src/nse/gnunet-nse-profiler.c:892
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 "nombre del fichero para escribir información y estadísticas de la conexión"
 
-#: src/nse/gnunet-nse-profiler.c:890 src/testbed/gnunet-testbed-profiler.c:284
+#: src/nse/gnunet-nse-profiler.c:895 src/testbed/gnunet-testbed-profiler.c:287
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 "nombre del fichero con la información de acceso usada para la batería de "
 "pruebas"
 
-#: src/nse/gnunet-nse-profiler.c:893
+#: src/nse/gnunet-nse-profiler.c:898
 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:896
+#: src/nse/gnunet-nse-profiler.c:901
 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:902
+#: src/nse/gnunet-nse-profiler.c:907
 msgid "delay between rounds"
 msgstr "retraso entre rondas"
 
-#: src/nse/gnunet-nse-profiler.c:911
+#: src/nse/gnunet-nse-profiler.c:916
 msgid "Measure quality and performance of the NSE service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/nse/gnunet-service-nse.c:1433
+#: src/nse/gnunet-service-nse.c:1448
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Requisitos de trabajo no válidos para el servicio NSE. Saliendo.\n"
 
-#: src/nse/gnunet-service-nse.c:1472
+#: src/nse/gnunet-service-nse.c:1487
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 "El servicio NSE carece de opciones de configuración de clave.  Saliendo.\n"
@@ -4545,21 +4576,21 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Eliminando dirección de transporte «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:355
+#: src/peerinfo/gnunet-service-peerinfo.c:353
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:372
+#: src/peerinfo/gnunet-service-peerinfo.c:370
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s %u \n"
 msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:450
+#: src/peerinfo/gnunet-service-peerinfo.c:448
 msgid "# peers known"
 msgstr "# pares conocidos"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:486
+#: src/peerinfo/gnunet-service-peerinfo.c:484
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -4567,22 +4598,22 @@
 "El fichero «%s» en el directorio «%s» no sigue la convención de nombres. "
 "Eliminado.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:639
+#: src/peerinfo/gnunet-service-peerinfo.c:637
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:644
+#: src/peerinfo/gnunet-service-peerinfo.c:642
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "¡Aún no se han encontrado pares en «%s»!\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:979
+#: src/peerinfo/gnunet-service-peerinfo.c:975
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Escaneando directorio «%s».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1269
+#: src/peerinfo/gnunet-service-peerinfo.c:1265
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr "Importando HELLO de «%s»\n"
@@ -4735,6 +4766,117 @@
 msgid "Unable to initialize Postgres: %s"
 msgstr "No se pudo inicializar Postgres: %s"
 
+#: src/psycstore/gnunet-service-psycstore.c:203
+#, fuzzy
+msgid "Failed to store membership information!\n"
+msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:227
+#, fuzzy
+msgid "Failed to test membership!\n"
+msgstr "¡Se produjo un fallo al configurar el túnel mesh!\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:249
+#, fuzzy
+msgid "Failed to store fragment!\n"
+msgstr "Se produjo un fallo al iniciar el demonio: %s\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:275
+#, fuzzy
+msgid "Failed to get fragment!\n"
+msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:302
+#, fuzzy
+msgid "Failed to get message!\n"
+msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:331
+#, fuzzy
+msgid "Failed to get message fragment!\n"
+msgstr "Se produjo un fallo al procesar un mensaje «HELLO»: mal formado\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:357
+#, fuzzy
+msgid "Failed to get master counters!\n"
+msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:395
+#, fuzzy
+msgid "Failed to get slave counters!\n"
+msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:429
+#: src/psycstore/gnunet-service-psycstore.c:502
+msgid "Tried to set invalid state variable name!\n"
+msgstr ""
+
+#: src/psycstore/gnunet-service-psycstore.c:445
+#, fuzzy
+msgid "Failed to begin modifying state!\n"
+msgstr "Se produjo un fallo al cargar el estado: %s\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:468
+#, fuzzy, c-format
+msgid "Unknown operator: %c\n"
+msgstr "Operación desconocida '%s'\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:478
+#, fuzzy
+msgid "Failed to end modifying state!\n"
+msgstr "Se produjo un fallo al cargar el estado: %s\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:516
+#, fuzzy
+msgid "Failed to begin synchronizing state!\n"
+msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:532
+#, fuzzy
+msgid "Failed to end synchronizing state!\n"
+msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:552
+#: src/psycstore/gnunet-service-psycstore.c:571
+#, fuzzy
+msgid "Failed to reset state!\n"
+msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:594
+#: src/psycstore/gnunet-service-psycstore.c:645
+msgid "Tried to get invalid state variable name!\n"
+msgstr ""
+
+#: src/psycstore/gnunet-service-psycstore.c:621
+#: src/psycstore/gnunet-service-psycstore.c:660
+#, fuzzy
+msgid "Failed to get state variable!\n"
+msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:60
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d with error: %s (%d)\n"
+msgstr "«%s» falló en %s: %d con el error: %s\n"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:253
+#, fuzzy, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr "Error leyendo de «%s»: %s\n"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:276
+#, fuzzy, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr "Error abriendo fichero «%s»: %s\n"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:1796
+#, fuzzy
+msgid "SQLite database running\n"
+msgstr "Base de datos sqlite ejecutándose\n"
+
 #: src/pt/gnunet-daemon-pt.c:266
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr "Se produjo un fallo al empaquetar la petición DNS.  Omitiendo.\n"
@@ -4794,20 +4936,20 @@
 msgstr ""
 "Demonio a ejecutar para realizar la traducción de protocolo IP a GNUnet"
 
-#: src/regex/gnunet-daemon-regexprofiler.c:384
+#: src/regex/gnunet-daemon-regexprofiler.c:380
 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:1279
+#: src/regex/gnunet-regex-profiler.c:1281
 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:1290
+#: src/regex/gnunet-regex-profiler.c:1292
 #, fuzzy
 msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 msgstr "Falta una opción de configuración (regex_prefix). Saliendo\n"
 
-#: src/regex/gnunet-regex-profiler.c:1319
+#: src/regex/gnunet-regex-profiler.c:1321
 #: src/regex/gnunet-regex-simulation-profiler.c:622
 #, c-format
 msgid "No policy directory specified on command line. Exiting.\n"
@@ -4815,51 +4957,51 @@
 "No se ha especificado una política de directorios en la línea de comandos. "
 "Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1325
+#: src/regex/gnunet-regex-profiler.c:1327
 #: 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:1332
+#: src/regex/gnunet-regex-profiler.c:1334
 #, c-format
 msgid "No files found in `%s'\n"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/regex/gnunet-regex-profiler.c:1341
+#: src/regex/gnunet-regex-profiler.c:1343
 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:1361
+#: src/regex/gnunet-regex-profiler.c:1363
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Error cargando cadenas de búsqueda. Saliendo.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1443
+#: src/regex/gnunet-regex-profiler.c:1445
 msgid "name of the file for writing statistics"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1446
+#: src/regex/gnunet-regex-profiler.c:1448
 #, fuzzy
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 "esperar «TIMEOUT» antes de considerar que una coincidencia de cadenas como "
 "fallida"
 
-#: src/regex/gnunet-regex-profiler.c:1449
+#: src/regex/gnunet-regex-profiler.c:1451
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1452
+#: src/regex/gnunet-regex-profiler.c:1454
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1455
+#: src/regex/gnunet-regex-profiler.c:1457
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "nombre del fichero para escribir las estadísticas"
 
-#: src/regex/gnunet-regex-profiler.c:1467
+#: src/regex/gnunet-regex-profiler.c:1469
 msgid "Profiler for regex"
 msgstr "Perfilador para expresiones regulares."
 
@@ -4876,6 +5018,243 @@
 msgid "Profiler for regex library"
 msgstr "Analizador de rendimiento para la biblioteca de expresiones regulares"
 
+#: src/scalarproduct/gnunet-scalarproduct.c:195
+#, fuzzy
+msgid "You must specify at least one message ID to check!\n"
+msgstr "Debes especificar un fichero a inspeccionar.\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:201
+msgid "This program needs a session identifier for comparing vectors.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:207
+msgid "Please give a session key for --input_key!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:216
+#, c-format
+msgid ""
+"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
+"valid peer identifier.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:240
+#: src/scalarproduct/gnunet-scalarproduct.c:298
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int32_t.\n"
+msgstr "No se pudo conectar al servicio %s.\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:247
+msgid "Need elements to compute the vectorproduct, got none.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:348
+msgid ""
+"A comma separated list of elements to compare as vector with our remote peer."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:351
+msgid ""
+"A comma separated mask to select which elements should actually be compared."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:354
+msgid ""
+"[Optional] peer to calculate our scalarproduct with. If this parameter is "
+"not given, the service will wait for a remote peer to compute the request."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:357
+msgid "Transaction ID shared with peer."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:366
+msgid "Calculate the Vectorproduct with a GNUnet peer."
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:381
+#, c-format
+msgid "Generated key set with key length %d bits.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:691
+#, fuzzy, c-format
+msgid "Client (%p) disconnected from us.\n"
+msgstr "Desconectado de %s\n"
+
+# Miguel: Si no me equivoco, "status result" es un
+# resultado de tipo estado.
+#: src/scalarproduct/gnunet-service-scalarproduct.c:762
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1696
+#, fuzzy, c-format
+msgid "Could not send message to client (%p)!\n"
+msgstr "No se pudo mandar el resultado (estado) al cliente\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:768
+#, c-format
+msgid "Sending session-end notification to client (%p) for session %s\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:891
+msgid "Message too large, fragmentation is currently not supported!)\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:896
+msgid "Could not send service-response message via mesh!)\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1092
+#, c-format
+msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1145
+#, fuzzy, c-format
+msgid "Successfully created new tunnel to peer (%s)!\n"
+msgstr "Conectado satisfactoriamente a «%s»\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1157
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1873
+msgid "Message too large, fragmentation is currently not supported!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1223
+#, fuzzy
+msgid "Transmitting service request.\n"
+msgstr "Reiniciando el servicio «%s»\n"
+
+# Miguel: Si no me equivoco, "list result" es un resultado
+# de tipo lista.
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1233
+#, fuzzy
+msgid "Could not send mutlicast message to tunnel!\n"
+msgstr "No se pudo mandar el resultado (lista) al cliente\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1283
+#, fuzzy
+msgid "Too short message received from client!\n"
+msgstr "# peticiones «PUT» recibidas de clientes"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1297
+#, fuzzy
+msgid "Invalid message received from client, session information incorrect!\n"
+msgstr "Mensaje «%s» no válido recibido de la lista de máquinas en «%s»\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1309
+#, c-format
+msgid ""
+"Duplicate session information received, cannot create new session with key `"
+"%s'\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1330
+#, c-format
+msgid ""
+"Got client-request-session with key %s, preparing tunnel to remote service.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1369
+#, c-format
+msgid "Creating new tunnel to for session with key %s.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1417
+#, c-format
+msgid ""
+"Got client-responder-session with key %s and a matching service-request-"
+"session set, processing.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1425
+#, c-format
+msgid ""
+"Got client-responder-session with key %s but NO matching service-request-"
+"session set, queuing element for later use.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
+#, c-format
+msgid "Peer disconnected, terminating session %s with peer (%s)\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1706
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1790
+#, c-format
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1813
+msgid "Could not translate remote public key to sexpression!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1849
+#, fuzzy, c-format
+msgid ""
+"Could not translate E[a%d] to MPI!\n"
+"%s/%s\n"
+msgstr "Imposible obtener IP para la interfaz '%s' usando '%s'.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1857
+#, c-format
+msgid "Got session with key %s and a matching element set, processing.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1866
+#, c-format
+msgid "Got session with key %s without a matching element set, queueing.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2039
+msgid "Shutting down, initiating cleanup.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+msgid "Generating Paillier-Keyset.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2116
+#, fuzzy
+msgid "Connect to MESH failed\n"
+msgstr "Conexión fallida (¿bug?)\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2120
+#, fuzzy
+msgid "Mesh initialized\n"
+msgstr "Conexión fallida\n"
+
+#: src/scalarproduct/scalarproduct_api.c:243
+#, fuzzy
+msgid "# SUC responder result messages received"
+msgstr "# mensajes de detención de migración recibidos"
+
+#: src/scalarproduct/scalarproduct_api.c:297
+#, fuzzy
+msgid "# bytes sent to scalarproduct"
+msgstr "# bytes mandados al almacén de datos"
+
+#: src/scalarproduct/scalarproduct_api.c:340
+#: src/scalarproduct/scalarproduct_api.c:433
+#, fuzzy
+msgid "Failed to connect to the scalarproduct service\n"
+msgstr "Se produjo un fallo al conectar con el servicio de chat\n"
+
+#: src/scalarproduct/scalarproduct_api.c:348
+#: src/scalarproduct/scalarproduct_api.c:441
+#, fuzzy
+msgid "Failed to send a message to the statistics service\n"
+msgstr "¡Se produjo un fallo al conectar al servicio de estadísticas!\n"
+
+#: src/scalarproduct/scalarproduct_api.c:382
+#: src/scalarproduct/scalarproduct_api.c:478
+#, fuzzy
+msgid "Failed to send a message to the scalarproduct service\n"
+msgstr "Se produjo un fallo al enviar una petición al servicio de transporte\n"
+
 # Miguel: Conjunto resta.
 #: src/set/gnunet-set-ibf-profiler.c:224
 msgid "number of element in set A-B"
@@ -4913,80 +5292,85 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Escritos %llu bytes de estadísticas a «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:141
+#: src/statistics/gnunet-statistics.c:142
 msgid "Failed to obtain statistics.\n"
 msgstr "Se produjo un fallo al obtener las estadísticas.\n"
 
-#: src/statistics/gnunet-statistics.c:143
+#: src/statistics/gnunet-statistics.c:144
 #, 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"
 
-#: src/statistics/gnunet-statistics.c:186
+#: src/statistics/gnunet-statistics.c:191
 msgid "Missing argument: subsystem \n"
 msgstr "Falta el parámetro: subsistema\n"
 
-#: src/statistics/gnunet-statistics.c:192
+#: src/statistics/gnunet-statistics.c:197
 msgid "Missing argument: name\n"
 msgstr "Falta el argumento: nombre\n"
 
-#: src/statistics/gnunet-statistics.c:223
+#: src/statistics/gnunet-statistics.c:228
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr "No se proporcionó un subsistema o un nombre\n"
 
-#: src/statistics/gnunet-statistics.c:231
+#: src/statistics/gnunet-statistics.c:236
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Se produjo un fallo al inicializar la rutina de visualización\n"
 
-#: src/statistics/gnunet-statistics.c:258
+#: src/statistics/gnunet-statistics.c:263
 #, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr ""
 "Intentando conectar con máquina remota, pero el servicio «%s» no se está "
 "ejecutando\n"
 
-#: src/statistics/gnunet-statistics.c:266
+#: src/statistics/gnunet-statistics.c:271
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Se necesita un puerto para conectar con la máquina «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:273
+#: src/statistics/gnunet-statistics.c:278
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr "Un puerto debe estar entre 1 y 65534 para conectar a la máquina «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:331
+#: src/statistics/gnunet-statistics.c:310
+#, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Parámetro no válido «%s»\n"
+
+#: src/statistics/gnunet-statistics.c:336
 msgid "limit output to statistics for the given NAME"
 msgstr "limita la salida de estadísticas para el nombre (NAME) dado"
 
-#: src/statistics/gnunet-statistics.c:334
+#: src/statistics/gnunet-statistics.c:339
 msgid "make the value being set persistent"
 msgstr "hacer el valor persistente"
 
-#: src/statistics/gnunet-statistics.c:337
+#: src/statistics/gnunet-statistics.c:342
 msgid "limit output to the given SUBSYSTEM"
 msgstr "límite de salida para el subsistema (SUBSYSTEM) dado"
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:345
 msgid "just print the statistics value"
 msgstr "imprime el valor de las estadísticas"
 
-#: src/statistics/gnunet-statistics.c:343
+#: src/statistics/gnunet-statistics.c:348
 msgid "watch value continuously"
 msgstr "visualiza el valor continuamente"
 
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:351
 msgid "connect to remote host"
 msgstr "conectar a equipo remoto"
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:354
 msgid "port for remote host"
 msgstr "puerto del equipo remoto"
 
-#: src/statistics/gnunet-statistics.c:361
+#: src/statistics/gnunet-statistics.c:366
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
@@ -5002,31 +5386,24 @@
 "¡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"
-
 #: src/testbed/gnunet-service-testbed_cpustatus.c:727
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:964
+#: src/testbed/gnunet-service-testbed_peers.c:973
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "¡Se produjo un fallo al conectar con el servicio dv!\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:970
+#: src/testbed/gnunet-service-testbed_peers.c:979
 #, fuzzy
 msgid "Request doesn't fit into a message"
 msgstr "no imprime mensajes de estado"
 
 # Miguel: ¿Es mejor «ya que» que «porque» o «debido al apagado»?
-#: src/testbed/gnunet-service-testbed_peers.c:1008
+#: src/testbed/gnunet-service-testbed_peers.c:1017
 #, fuzzy, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "Petición ignorada porque el ARM se está apagando.\n"
@@ -5046,150 +5423,169 @@
 msgid "Spawning process `%s'\n"
 msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:251
+#: src/testbed/gnunet-testbed-profiler.c:254
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "El número máximo de conexiones es %u\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:277
+#: src/testbed/gnunet-testbed-profiler.c:280
 msgid "create COUNT number of peers"
 msgstr "crea «COUNT» número de pares"
 
-#: src/testbed/gnunet-testbed-profiler.c:280
+#: src/testbed/gnunet-testbed-profiler.c:283
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr "tolerar un número «COUNT» de continuas expiraciones de plazo"
 
-#: src/testbed/testbed_api_hosts.c:459
+#: src/testbed/testbed_api_hosts.c:415
 #, 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:467
+#: src/testbed/testbed_api_hosts.c:423
 #, 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:474
+#: src/testbed/testbed_api_hosts.c:430
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr "El archivo de máquinas %s no puede leerse\n"
 
-#: src/testbed/testbed_api_hosts.c:595
+#: src/testbed/testbed_api_hosts.c:570
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1878
+#: src/testbed/testbed_api_hosts.c:1572
 #, 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:802
+#: src/testbed/testbed_api_testbed.c:820
 msgid "Linking controllers failed. Exiting"
 msgstr "Los controladores de enlazado fallaron. Saliendo"
 
-#: src/testbed/testbed_api_testbed.c:944
+#: src/testbed/testbed_api_testbed.c:989
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr "El registro de máquinas falló para una máquina. Error: %s\n"
 
-#: src/testbed/testbed_api_testbed.c:1009
+#: src/testbed/testbed_api_testbed.c:1055
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1111
+#: src/testbed/testbed_api_testbed.c:1144
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr "La máquina %s no puede comenzar la batería de pruebas\n"
 
-#: src/testbed/testbed_api_testbed.c:1115
+#: src/testbed/testbed_api_testbed.c:1148
 msgid "Testbed cannot be started on localhost\n"
 msgstr "La batería de pruebas no se puede iniciar en localhost\n"
 
-#: src/testbed/testbed_api_testbed.c:1153
+#: src/testbed/testbed_api_testbed.c:1186
 msgid "Cannot start the master controller"
 msgstr "No se puede iniciar el controlador maestro"
 
-#: src/testbed/testbed_api_testbed.c:1171
+#: src/testbed/testbed_api_testbed.c:1204
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1231
+#: src/testbed/testbed_api_testbed.c:1264
 #, 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:1243
+#: src/testbed/testbed_api_testbed.c:1276
 msgid "No hosts loaded. Need at least one host\n"
 msgstr "No se han cargado máquinas. Se necesita al menos una máquina.\n"
 
-#: src/testbed/testbed_api_testbed.c:1267
+#: src/testbed/testbed_api_testbed.c:1300
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 "La topología especificada debe estar soportada por la batería de pruebas"
 
-#: src/testbed/testbed_api_topology.c:670
+#: src/testbed/testbed_api_testbed.c:1350
 #, c-format
+msgid ""
+"Maximum number of edges a peer can have in a scale free topology cannot be "
+"more than %u.  Given `%s = %llu'"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1366
+#, c-format
+msgid ""
+"The number of edges that can established when adding a new node to scale "
+"free topology cannot be more than %u.  Given `%s = %llu'"
+msgstr ""
+
+#: src/testbed/testbed_api_topology.c:716
+#, c-format
 msgid "Topology file %s not found\n"
 msgstr "El fichero de topología %s no fue encontrado\n"
 
-#: src/testbed/testbed_api_topology.c:676
+#: src/testbed/testbed_api_topology.c:722
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr "El fichero de topología %s no tiene datos\n"
 
-#: src/testbed/testbed_api_topology.c:683
+#: src/testbed/testbed_api_topology.c:729
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "El fichero de topología %s no puede ser leido\n"
 
-#: src/testbed/testbed_api_topology.c:706
+#: src/testbed/testbed_api_topology.c:751
 #, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr ""
 "Se produjo un fallo al leer el índice de pares del archivo de topología: %s"
 
-#: src/testbed/testbed_api_topology.c:715
-#: src/testbed/testbed_api_topology.c:739
+#: src/testbed/testbed_api_topology.c:760
+#: src/testbed/testbed_api_topology.c:784
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr "Valor en el fichero de topología dato: %s está fuera de rango\n"
 
-#: src/testbed/testbed_api_topology.c:721
-#: src/testbed/testbed_api_topology.c:745
+#: src/testbed/testbed_api_topology.c:766
+#: src/testbed/testbed_api_topology.c:790
 #, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr ""
 "Se produjo un fallo al leer índice de pares del fichero de topología: %s"
 
-#: src/testbed/testbed_api_topology.c:727
-#: src/testbed/testbed_api_topology.c:751
+#: src/testbed/testbed_api_topology.c:772
+#: src/testbed/testbed_api_topology.c:796
 msgid "Topology file needs more peers than given ones\n"
 msgstr "El fichero de topología necesita más pares que los dados\n"
 
-#: src/testbed/testbed_api_topology.c:766
+#: src/testbed/testbed_api_topology.c:811
 #, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "Ignorando conexión del par %u al par %u\n"
 
-#: src/testing/gnunet-testing.c:130
+#: src/testing/gnunet-testing.c:173
 #, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr ""
 "No se pudo extraer la clave de máquina %u (¿desplazamiento demasiado "
 "grande?)\n"
 
-#: src/testing/gnunet-testing.c:199
+#: src/testing/gnunet-testing.c:258
+#, c-format
+msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+msgstr "Comando desconocido, use «q» para salir o «r» para reiniciar el par\n"
+
+#: src/testing/gnunet-testing.c:355
 msgid "create unique configuration files"
 msgstr "crear ficheros de configuración únicos"
 
-#: src/testing/gnunet-testing.c:201
+#: src/testing/gnunet-testing.c:357
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 "extraer los ficheros de claves de máquinas de una lista pre-computada de "
 "claves de máquinas"
 
-#: src/testing/gnunet-testing.c:203
+#: src/testing/gnunet-testing.c:359
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
@@ -5197,57 +5593,42 @@
 "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:205
+#: src/testing/gnunet-testing.c:361
 msgid "configuration template"
 msgstr "plantilla de configuración"
 
-#: src/testing/gnunet-testing.c:214
+#: src/testing/gnunet-testing.c:363
+msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
+msgstr ""
+
+#: src/testing/gnunet-testing.c:376
 msgid "Command line tool to access the testing library"
 msgstr ""
 "Herramienta de línea de comandos para acceder a la biblioteca de pruebas"
 
-#: src/testing/gnunet-testing-run-service.c:129
+#: src/testing/testing.c:276
 #, c-format
-msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
-msgstr "Comando desconocido, use «q» para salir o «r» para reiniciar el par\n"
-
-#: src/testing/gnunet-testing-run-service.c:186
-msgid "name of the template configuration file to use (optional)"
-msgstr "nombre del fichero plantilla de configuración a usar (opcional)"
-
-#: src/testing/gnunet-testing-run-service.c:189
-msgid "name of the service to run"
-msgstr "nombre del servicio a ejecutar"
-
-#: src/testing/testing.c:288
-#, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr "El fichero de máquinas no fue encontrado: %s\n"
 
-#: src/testing/testing.c:304
+#: src/testing/testing.c:292
 #, 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:722
+#: src/testing/testing.c:711
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr "El número de clave %u no existe\n"
 
-#: src/testing/testing.c:733
+#: src/testing/testing.c:722
 #, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Error decodificando clave %u\n"
 
-#: src/testing/testing.c:1177
-msgid "Failed to create configuration for peer (not enough free ports?)\n"
-msgstr ""
-"Se produjo un fallo al crear la configuración para el par (¿no hay "
-"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:1184
+#: src/testing/testing.c:1158
 #, c-format
 msgid ""
 "You attempted to create a testbed with more than %u hosts.  Please "
@@ -5256,36 +5637,47 @@
 "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:1193
+#: src/testing/testing.c:1167
 #, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr ""
 "Se produjo un fallo al inicializar la clave de la máquina desde el par %u\n"
 
-#: src/testing/testing.c:1209
+#: src/testing/testing.c:1177
+#, fuzzy
+msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
+msgstr "¡Falta la opción «%s» en la sección «%s» de la configuración!\n"
+
+#: src/testing/testing.c:1190
+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"
+
+#: src/testing/testing.c:1204
 #, fuzzy, c-format
-msgid "Cannot open hostkey file: %s\n"
+msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "No se pudo abrir el fichero de claves de máquina: %s\n"
 
-#: src/testing/testing.c:1219
+#: src/testing/testing.c:1216
 #, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr ""
 "Se produjo un fallo al escribir la clave de la máquina para el par %u: %s\n"
 
-#: src/testing/testing.c:1241
+#: src/testing/testing.c:1238
 #, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr ""
 "Se produjo un fallo al escribir el fichero de configuración «%s» para el par "
 "%u: %s\n"
 
-#: src/testing/testing.c:1341
+#: src/testing/testing.c:1338
 #, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Se produjo un fallo al arrancar «%s»: %s\n"
 
-#: src/testing/testing.c:1707
+#: src/testing/testing.c:1702
 #, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Se produjo un fallo al cargar la configuración de %s\n"
@@ -5303,35 +5695,35 @@
 msgid "# friends connected"
 msgstr "# amigos conectados"
 
-#: src/topology/gnunet-daemon-topology.c:987
+#: src/topology/gnunet-daemon-topology.c:986
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 "¡Se produjo un fallo al conectar con el servicio principal, no se puede "
 "gestionar la topología!\n"
 
-#: src/topology/gnunet-daemon-topology.c:1030
+#: src/topology/gnunet-daemon-topology.c:1031
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "No se pudo leer la lista de amigos «%s»\n"
 
-#: src/topology/gnunet-daemon-topology.c:1036
+#: src/topology/gnunet-daemon-topology.c:1037
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr "El archivo de amigos «%s» está vacío.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1045
+#: src/topology/gnunet-daemon-topology.c:1046
 #, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr ""
 "Se produjo un fallo al leer la lista de amigos de «%s»: no hay memoria "
 "disponible\n"
 
-#: src/topology/gnunet-daemon-topology.c:1053
+#: src/topology/gnunet-daemon-topology.c:1054
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/topology/gnunet-daemon-topology.c:1073
+#: src/topology/gnunet-daemon-topology.c:1074
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
@@ -5339,7 +5731,7 @@
 "Error de sintaxis en la especificación de topología en el desplazamiento "
 "%llu, omitiendo bytes.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1086
+#: src/topology/gnunet-daemon-topology.c:1087
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
@@ -5347,21 +5739,21 @@
 "Error de sintaxis en la especificación de topología en el desplazamiento "
 "%llu, omitiendo bytes «%s».\n"
 
-#: src/topology/gnunet-daemon-topology.c:1096
+#: src/topology/gnunet-daemon-topology.c:1097
 #, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr "Encontrado amigo «%s» en la configuración\n"
 
-#: src/topology/gnunet-daemon-topology.c:1102
+#: src/topology/gnunet-daemon-topology.c:1103
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr "Me he encontrado «%s» en mi lista de amigos (inútil, ignorado)\n"
 
-#: src/topology/gnunet-daemon-topology.c:1112
+#: src/topology/gnunet-daemon-topology.c:1113
 msgid "# friends in configuration"
 msgstr "# amigos en configuración"
 
-#: src/topology/gnunet-daemon-topology.c:1118
+#: src/topology/gnunet-daemon-topology.c:1119
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
@@ -5369,23 +5761,23 @@
 "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:1125
+#: src/topology/gnunet-daemon-topology.c:1126
 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:1156
+#: src/topology/gnunet-daemon-topology.c:1157
 msgid "# HELLO messages received"
 msgstr "# mensajes «HELLO» recibidos"
 
 # gossiped??
-#: src/topology/gnunet-daemon-topology.c:1211
+#: src/topology/gnunet-daemon-topology.c:1212
 msgid "# HELLO messages gossipped"
 msgstr "# Mensajes «HELLO» rumoreados"
 
-#: src/topology/gnunet-daemon-topology.c:1350
+#: src/topology/gnunet-daemon-topology.c:1351
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 "Control de topología de GNUnet (manteniendo las restricciones del mesh de "
@@ -5402,19 +5794,19 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:453
-#: src/transport/gnunet-service-transport_blacklist.c:718
+#: src/transport/gnunet-service-transport_blacklist.c:717
 msgid "# disconnects due to blacklist"
 msgstr "# desconexiones debido a la lista negra"
 
-#: src/transport/gnunet-service-transport.c:169
+#: src/transport/gnunet-service-transport.c:168
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# bytes de «payload» descartados debido a par no conectado"
 
-#: src/transport/gnunet-service-transport.c:235
+#: src/transport/gnunet-service-transport.c:234
 msgid "# bytes total received"
 msgstr "# total de bytes recibidos"
 
-#: src/transport/gnunet-service-transport.c:282
+#: src/transport/gnunet-service-transport.c:281
 msgid "# bytes payload received"
 msgstr "# bytes de «payload» recibidos"
 
@@ -5430,7 +5822,7 @@
 "`%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:754
+#: src/transport/gnunet-service-transport.c:775
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 "El servicio de transporte carece de opciones de configuración de clave.  "
@@ -5468,7 +5860,7 @@
 msgstr "# Mensajes «DISCONNECT» enviados"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1346
-#: src/transport/gnunet-service-transport_neighbours.c:1678
+#: src/transport/gnunet-service-transport_neighbours.c:1681
 msgid "# bytes in message queue for other peers"
 msgstr "# bytes en la cola de mensajes para otros pares"
 
@@ -5504,61 +5896,61 @@
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# Mensajes «KEEPALIVE_RESPONSE» descartados (no esperado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1584
+#: src/transport/gnunet-service-transport_neighbours.c:1586
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# mensajes descartados debido a la falta de registro vecinal"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1618
+#: src/transport/gnunet-service-transport_neighbours.c:1620
 msgid "# bandwidth quota violations by other peers"
 msgstr "# violaciones de la cuota de ancho de banda por otros pares"
 
 # throttling?
-#: src/transport/gnunet-service-transport_neighbours.c:1634
+#: src/transport/gnunet-service-transport_neighbours.c:1636
 msgid "# ms throttling suggested"
 msgstr "# ms de impulso sugeridos"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2769
+#: src/transport/gnunet-service-transport_neighbours.c:2775
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (sin par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2784
-#: src/transport/gnunet-service-transport_neighbours.c:2815
+#: src/transport/gnunet-service-transport_neighbours.c:2790
+#: src/transport/gnunet-service-transport_neighbours.c:2821
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (no estaba preparado)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2828
+#: src/transport/gnunet-service-transport_neighbours.c:2834
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (esperando en el ATS)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2859
+#: src/transport/gnunet-service-transport_neighbours.c:2865
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "# Mensajes «CONNECT_ACK» inesperados (desconectando)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3040
+#: src/transport/gnunet-service-transport_neighbours.c:3046
 msgid "# unexpected SESSION ACK messages"
 msgstr "# Mensajes «SESSION ACK» inesperados"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3093
+#: src/transport/gnunet-service-transport_neighbours.c:3099
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr "# Mensajes «SET QUOTA» ignorados (no existe tal par)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
+#: src/transport/gnunet-service-transport_neighbours.c:3113
 msgid "# disconnects due to quota of 0"
 msgstr "# desconexiones debido a una cuota de 0"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3144
 msgid "# disconnect messages ignored (old format)"
 msgstr "# mensajes de desconexión ignorados (formato antiguo)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3149
+#: src/transport/gnunet-service-transport_neighbours.c:3155
 msgid "# disconnect messages ignored (timestamp)"
 msgstr "# mensajes de desconexión ignorados (marca temporal)"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3194
 msgid "# other peer asked to disconnect from us"
 msgstr "# peticiones de otro par para desconectarse de nosotros"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3283
+#: src/transport/gnunet-service-transport_neighbours.c:3289
 msgid "# disconnected from peer upon explicit request"
 msgstr "# desconexiones del par debido a una petición explícita"
 
@@ -5600,49 +5992,49 @@
 msgid "# PING without HELLO messages sent"
 msgstr "# Mensajes PING sin HELLO mandados"
 
-#: src/transport/gnunet-service-transport_validation.c:664
+#: src/transport/gnunet-service-transport_validation.c:660
 msgid "# address revalidations started"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-service-transport_validation.c:930
+#: src/transport/gnunet-service-transport_validation.c:928
 msgid "# PING message for different peer received"
 msgstr "# Mensajes PING recibidos para un par diferente"
 
-#: src/transport/gnunet-service-transport_validation.c:989
+#: src/transport/gnunet-service-transport_validation.c:987
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:999
+#: src/transport/gnunet-service-transport_validation.c:997
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1018
+#: src/transport/gnunet-service-transport_validation.c:1016
 #, 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:1072
+#: src/transport/gnunet-service-transport_validation.c:1070
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1117
+#: src/transport/gnunet-service-transport_validation.c:1115
 msgid "# PONGs unicast via reliable transport"
 msgstr "# unicast de PONG vía transporte confiable"
 
-#: src/transport/gnunet-service-transport_validation.c:1126
+#: src/transport/gnunet-service-transport_validation.c:1124
 msgid "# PONGs multicast to all available addresses"
 msgstr "# multicast de PONG a todas las direcciones disponibles"
 
-#: src/transport/gnunet-service-transport_validation.c:1253
+#: src/transport/gnunet-service-transport_validation.c:1251
 msgid "# PONGs dropped, no matching pending validation"
 msgstr "# PONG omitidos, no hay una validación pendiente coincidente"
 
-#: src/transport/gnunet-service-transport_validation.c:1268
+#: src/transport/gnunet-service-transport_validation.c:1266
 msgid "# PONGs dropped, signature expired"
 msgstr "# Mensajes PONG omitidos, firma expirada"
 
-#: src/transport/gnunet-service-transport_validation.c:1374
+#: src/transport/gnunet-service-transport_validation.c:1372
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
@@ -5885,40 +6277,40 @@
 "ejecutar el transporte WLAN\n"
 
 #: src/transport/plugin_transport_http.c:815
-#: src/transport/plugin_transport_http_server.c:2585
+#: src/transport/plugin_transport_http_server.c:2614
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr "¡Deshabilitando IPv6 ya que no está soportado en este sistema!\n"
 
 #: src/transport/plugin_transport_http.c:864
-#: src/transport/plugin_transport_http_server.c:2353
+#: src/transport/plugin_transport_http_server.c:2382
 msgid "Require valid port number for service in configuration!\n"
 msgstr "¡Se necesita un puerto válido para el servicio en la configuración!\n"
 
 #: src/transport/plugin_transport_http.c:896
-#: src/transport/plugin_transport_http_server.c:2385 src/util/service.c:1062
+#: src/transport/plugin_transport_http_server.c:2414 src/util/service.c:1062
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 
 #: src/transport/plugin_transport_http.c:913
-#: src/transport/plugin_transport_http_server.c:2402 src/util/service.c:1079
+#: src/transport/plugin_transport_http_server.c:2431 src/util/service.c:1079
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "No se encontró la dirección %s para «%s».\n"
 
 #: src/transport/plugin_transport_http.c:1018
-#: src/transport/plugin_transport_http_server.c:2513
+#: src/transport/plugin_transport_http_server.c:2542
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr "Encontradas %u direcciones para comunicar al servicio NAT\n"
 
 #: src/transport/plugin_transport_http.c:1131
-#: src/transport/plugin_transport_http_server.c:2693
+#: src/transport/plugin_transport_http_server.c:2722
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "¡Ni IPv4 ni IPv6 están habilitadas! Corrija la configuración\n"
 
 #: src/transport/plugin_transport_http.c:1144
-#: src/transport/plugin_transport_http_server.c:2704
+#: src/transport/plugin_transport_http_server.c:2733
 msgid "Port is required! Fix in configuration\n"
 msgstr "¡El puerto es necesario! Corrija la configuración\n"
 
@@ -5945,7 +6337,7 @@
 "configuración no es válida! ¡Asociándose a todas las direcciones!\n"
 
 #: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2819
+#: src/transport/plugin_transport_http_server.c:2848
 #, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Usando nombre de máquina externo «%s»\n"
@@ -5954,32 +6346,32 @@
 msgid "No external hostname configured\n"
 msgstr "No hay nombre de máquina externo configurado\n"
 
-#: src/transport/plugin_transport_http_client.c:1582
+#: src/transport/plugin_transport_http_client.c:1587
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 "¡No se pudo inicializar el multi-manejador de curl, no se pudo iniciar el "
 "módulo %s!\n"
 
-#: src/transport/plugin_transport_http_client.c:1713
-#: src/transport/plugin_transport_http_server.c:2943
+#: src/transport/plugin_transport_http_client.c:1724
+#: src/transport/plugin_transport_http_server.c:2978
 #, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Finalizando el módulo «%s»\n"
 
-#: src/transport/plugin_transport_http_client.c:1738
-#: src/transport/plugin_transport_http_server.c:3003
+#: src/transport/plugin_transport_http_client.c:1749
+#: src/transport/plugin_transport_http_server.c:3038
 #, 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:1766
-#: src/transport/plugin_transport_http_server.c:2849
+#: src/transport/plugin_transport_http_client.c:1777
+#: src/transport/plugin_transport_http_server.c:2878
 #, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "El número máximo de conexiones es %u\n"
 
-#: src/transport/plugin_transport_http_server.c:1368
+#: src/transport/plugin_transport_http_server.c:1379
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
@@ -5988,12 +6380,12 @@
 "Acceso desde la conexión %p (%u de %u) para «%s» «%s» URL «%s» con tamaño de "
 "los datos de subida %u\n"
 
-#: src/transport/plugin_transport_http_server.c:1632
+#: src/transport/plugin_transport_http_server.c:1644
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr "Aceptando conexión (%u de %u) desde «%s»\n"
 
-#: src/transport/plugin_transport_http_server.c:1640
+#: src/transport/plugin_transport_http_server.c:1652
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
@@ -6001,7 +6393,7 @@
 "El servidor ha alcanzado el número máximo de conexiones (%u), rechazando "
 "nueva conexión\n"
 
-#: src/transport/plugin_transport_http_server.c:1941
+#: src/transport/plugin_transport_http_server.c:1953
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
@@ -6009,52 +6401,52 @@
 "¡No se pudo crear un certificado TLS nuevo, el programa «gnunet-transport-"
 "certificate-creation» no pudo ser iniciado!\n"
 
-#: src/transport/plugin_transport_http_server.c:1965
+#: src/transport/plugin_transport_http_server.c:1977
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 "¡No se encontró ningún certificado TLS útil y se produjo un fallo al crear "
 "uno!\n"
 
-#: src/transport/plugin_transport_http_server.c:2672
+#: src/transport/plugin_transport_http_server.c:2701
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr "El soporte IPv4 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2686
+#: src/transport/plugin_transport_http_server.c:2715
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr "El soporte IPv6 es %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2711
+#: src/transport/plugin_transport_http_server.c:2740
 #, c-format
 msgid "Using port %u\n"
 msgstr "Usando puerto %u\n"
 
-#: src/transport/plugin_transport_http_server.c:2726
+#: src/transport/plugin_transport_http_server.c:2755
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "¡La dirección IPv4 «%s» especificada en el fichero de configuración no es "
 "válida!\n"
 
-#: src/transport/plugin_transport_http_server.c:2736
+#: src/transport/plugin_transport_http_server.c:2765
 #, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Asociando a la dirección IPv4 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2757
+#: src/transport/plugin_transport_http_server.c:2786
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "¡La dirección IPv6 «%s» especificada en el fichero de configuración no es "
 "válida!\n"
 
-#: src/transport/plugin_transport_http_server.c:2767
+#: src/transport/plugin_transport_http_server.c:2796
 #, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Asociando a la dirección IPv6 %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2835
+#: src/transport/plugin_transport_http_server.c:2864
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Notificando al transporte sólo el nombre de máquina «%s»\n"
@@ -6104,66 +6496,66 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# bytes omitidos por SMTP (salientes)"
 
-#: src/transport/plugin_transport_tcp.c:627
+#: src/transport/plugin_transport_tcp.c:626
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Longitud de dirección inesperada: %u bytes\n"
 
-#: src/transport/plugin_transport_tcp.c:836
-#: src/transport/plugin_transport_tcp.c:925
-#: src/transport/plugin_transport_tcp.c:975
-#: src/transport/plugin_transport_tcp.c:1061
-#: src/transport/plugin_transport_tcp.c:1204
-#: src/transport/plugin_transport_tcp.c:1221
+#: src/transport/plugin_transport_tcp.c:834
+#: src/transport/plugin_transport_tcp.c:923
+#: src/transport/plugin_transport_tcp.c:973
+#: src/transport/plugin_transport_tcp.c:1059
+#: src/transport/plugin_transport_tcp.c:1202
+#: src/transport/plugin_transport_tcp.c:1219
 msgid "# bytes currently in TCP buffers"
 msgstr "# bytes actualmente en los buffer TCP"
 
-#: src/transport/plugin_transport_tcp.c:843
-#: src/transport/plugin_transport_tcp.c:1032
-#: src/transport/plugin_transport_tcp.c:2013
-#: src/transport/plugin_transport_tcp.c:2688
+#: src/transport/plugin_transport_tcp.c:841
+#: src/transport/plugin_transport_tcp.c:1030
+#: src/transport/plugin_transport_tcp.c:2009
+#: src/transport/plugin_transport_tcp.c:2690
 msgid "# TCP sessions active"
 msgstr "# Sesiones TCP activas"
 
-#: src/transport/plugin_transport_tcp.c:929
+#: src/transport/plugin_transport_tcp.c:927
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# bytes omitidos por TCP (expirados)"
 
-#: src/transport/plugin_transport_tcp.c:978
+#: src/transport/plugin_transport_tcp.c:976
 msgid "# bytes transmitted via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:1065
+#: src/transport/plugin_transport_tcp.c:1063
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# bytes descartados por TCP (desconectado)"
 
-#: src/transport/plugin_transport_tcp.c:1178
+#: src/transport/plugin_transport_tcp.c:1176
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr "Intentando enviar con una sesión no válida %p\n"
 
-#: src/transport/plugin_transport_tcp.c:1415
-#: src/transport/plugin_transport_udp.c:1454
+#: src/transport/plugin_transport_tcp.c:1413
+#: src/transport/plugin_transport_udp.c:1449
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1532
+#: src/transport/plugin_transport_tcp.c:1530
 msgid "# transport-service disconnect requests for TCP"
 msgstr "# peticiones de desconexión del servicio de transporte por TCP"
 
-#: src/transport/plugin_transport_tcp.c:2063
+#: src/transport/plugin_transport_tcp.c:2059
 msgid "# TCP WELCOME messages received"
 msgstr "# Mensajes «WELCOME» TCP recibidos"
 
-#: src/transport/plugin_transport_tcp.c:2246
+#: src/transport/plugin_transport_tcp.c:2242
 msgid "# bytes received via TCP"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/transport/plugin_transport_tcp.c:2326
+#: src/transport/plugin_transport_tcp.c:2322
 msgid "# network-level TCP disconnect events"
 msgstr "# eventos de desconexión TCP a nivel de red"
 
-#: src/transport/plugin_transport_tcp.c:2568 src/util/service.c:957
+#: src/transport/plugin_transport_tcp.c:2570 src/util/service.c:957
 #: src/util/service.c:963
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
@@ -6171,20 +6563,20 @@
 "¡Se requiere un número de puerto válido para el servicio «%s» en la "
 "configuración!\n"
 
-#: src/transport/plugin_transport_tcp.c:2582
+#: src/transport/plugin_transport_tcp.c:2584
 msgid "Failed to start service.\n"
 msgstr "Se produjo un fallo al iniciar el servicio.\n"
 
-#: src/transport/plugin_transport_tcp.c:2675
+#: src/transport/plugin_transport_tcp.c:2677
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr "Transporte TCP escuchando en el puerto %llu\n"
 
-#: src/transport/plugin_transport_tcp.c:2679
+#: src/transport/plugin_transport_tcp.c:2681
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n"
 
-#: src/transport/plugin_transport_tcp.c:2683
+#: src/transport/plugin_transport_tcp.c:2685
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr "El transporte TCP anuncia que está en el puerto %llu\n"
@@ -6197,26 +6589,26 @@
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# beacons HELLO broadcast IPv4 recibidos vía UDP"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:403
+#: src/transport/plugin_transport_udp_broadcasting.c:402
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:420
+#: src/transport/plugin_transport_udp_broadcasting.c:419
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 "Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el "
 "«socket» en el puerto %d\n"
 
-#: src/transport/plugin_transport_udp.c:1556
+#: src/transport/plugin_transport_udp.c:1555
 #, c-format
 msgid ""
 "Trying to create session for address of unexpected length %u (should be %u "
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2587
+#: src/transport/plugin_transport_udp.c:2590
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
@@ -6225,7 +6617,7 @@
 "UDP no pudo transmitir el mensaje a «%s»: La red parece caída, por favor, "
 "compruebe su configuración de red\n"
 
-#: src/transport/plugin_transport_udp.c:2601
+#: src/transport/plugin_transport_udp.c:2604
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -6236,91 +6628,91 @@
 "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:2901
+#: src/transport/plugin_transport_udp.c:2905
 msgid "Failed to open UDP sockets\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UDP\n"
 
-#: src/transport/plugin_transport_udp.c:2999
+#: src/transport/plugin_transport_udp.c:3003
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr "La opción «%s» dada está fuera de rango: %llu > %u\n"
 
-#: src/transport/plugin_transport_udp.c:3042
+#: src/transport/plugin_transport_udp.c:3046
 #, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Dirección IPv6 no válida: «%s»\n"
 
-#: src/transport/plugin_transport_udp.c:3101
+#: src/transport/plugin_transport_udp.c:3105
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Se produjo un fallo al crear una nueva firma"
 
-#: src/transport/plugin_transport_unix.c:1641
+#: src/transport/plugin_transport_unix.c:1640
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Se produjo un fallo al abrir los «sockets» UNIX\n"
 
-#: src/transport/plugin_transport_wlan.c:610
+#: src/transport/plugin_transport_wlan.c:623
 msgid "# WLAN ACKs sent"
 msgstr "# ACK WLAN enviados"
 
-#: src/transport/plugin_transport_wlan.c:629
+#: src/transport/plugin_transport_wlan.c:642
 msgid "# WLAN messages defragmented"
 msgstr "# mensajes WLAN defragmentados"
 
-#: src/transport/plugin_transport_wlan.c:675
-#: src/transport/plugin_transport_wlan.c:742
-#: src/transport/plugin_transport_wlan.c:1874
+#: src/transport/plugin_transport_wlan.c:688
+#: src/transport/plugin_transport_wlan.c:756
+#: src/transport/plugin_transport_wlan.c:1899
 msgid "# WLAN sessions allocated"
 msgstr "# sesiones WLAN alojadas"
 
-#: src/transport/plugin_transport_wlan.c:835
+#: src/transport/plugin_transport_wlan.c:860
 msgid "# WLAN message fragments sent"
 msgstr "# fragmentos de mensaje WLAN enviados"
 
-#: src/transport/plugin_transport_wlan.c:859
+#: src/transport/plugin_transport_wlan.c:884
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr "# mensajes WLAN pendientes (con fragmentación)"
 
-#: src/transport/plugin_transport_wlan.c:967
-#: src/transport/plugin_transport_wlan.c:1052
-#: src/transport/plugin_transport_wlan.c:1876
+#: src/transport/plugin_transport_wlan.c:992
+#: src/transport/plugin_transport_wlan.c:1077
+#: src/transport/plugin_transport_wlan.c:1901
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# MAC de destino WLAN alojadas"
 
-#: src/transport/plugin_transport_wlan.c:1247
+#: src/transport/plugin_transport_wlan.c:1272
 msgid "# HELLO messages received via WLAN"
 msgstr "# mensajes HELLO recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1273
+#: src/transport/plugin_transport_wlan.c:1298
 msgid "# fragments received via WLAN"
 msgstr "# fragmentos recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1283
+#: src/transport/plugin_transport_wlan.c:1308
 msgid "# ACKs received via WLAN"
 msgstr "# ACK recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1340
+#: src/transport/plugin_transport_wlan.c:1365
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# mensajes DATA WLAN descartados debido a un error en el CRC32"
 
-#: src/transport/plugin_transport_wlan.c:1460
+#: src/transport/plugin_transport_wlan.c:1485
 msgid "# DATA messages received via WLAN"
 msgstr "# mensajes «DATA» recibidos vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1495
+#: src/transport/plugin_transport_wlan.c:1520
 msgid "# WLAN DATA messages processed"
 msgstr "# mensajes «DATA» WLAN procesados"
 
-#: src/transport/plugin_transport_wlan.c:1558
+#: src/transport/plugin_transport_wlan.c:1583
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# «beacons HELLO» enviados vía WLAN"
 
-#: src/transport/plugin_transport_wlan.c:1671
+#: src/transport/plugin_transport_wlan.c:1696
 msgid "WLAN address with invalid size encountered\n"
 msgstr "Dirección WLAN con tamaño no válido encontrada\n"
 
-#: src/transport/plugin_transport_wlan.c:1855
+#: src/transport/plugin_transport_wlan.c:1880
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
@@ -6336,31 +6728,31 @@
 msgid "Failed to initialize testing library!\n"
 msgstr "¡Se produjo un fallo al inicializar la biblioteca de pruebas!\n"
 
-#: src/util/bio.c:136 src/util/bio.c:142
+#: src/util/bio.c:137 src/util/bio.c:145
 #, c-format
 msgid "Error reading `%s': %s"
 msgstr "Error leyendo «%s»: %s"
 
-#: src/util/bio.c:143
+#: src/util/bio.c:147
 msgid "End of file"
 msgstr "Fin del fichero"
 
-#: src/util/bio.c:195
+#: src/util/bio.c:199
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr "Se produjo un error leyendo la cadena «%s»"
 
-#: src/util/bio.c:205
+#: src/util/bio.c:209
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr "La cadena «%s» es mayor de lo permitido (%u > %u)"
 
-#: src/util/bio.c:250
+#: src/util/bio.c:254
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr "Los metadatos serializados «%s» son mayores de lo permitido (%u>%u)"
 
-#: src/util/bio.c:264
+#: src/util/bio.c:268
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr "Se produjo un fallo al deserializar los metadatos «%s»"
@@ -6406,56 +6798,56 @@
 "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:1034
+#: src/util/common_logging.c:256 src/util/common_logging.c:1033
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1032
+#: src/util/common_logging.c:258 src/util/common_logging.c:1031
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1030
+#: src/util/common_logging.c:260 src/util/common_logging.c:1029
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1028
+#: src/util/common_logging.c:262 src/util/common_logging.c:1027
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/common_logging.c:266 src/util/common_logging.c:1036
+#: src/util/common_logging.c:264 src/util/common_logging.c:1035
 msgid "NONE"
 msgstr "NINGUNO"
 
-#: src/util/common_logging.c:395
+#: src/util/common_logging.c:393
 #, 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"
 
-#: src/util/common_logging.c:819
+#: src/util/common_logging.c:817
 #, 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:1037
+#: src/util/common_logging.c:1036
 msgid "INVALID"
 msgstr "NO VÁLIDO"
 
-#: src/util/common_logging.c:1176
+#: src/util/common_logging.c:1138
 msgid "unknown address"
 msgstr "dirección desconocida"
 
-#: src/util/common_logging.c:1215
+#: src/util/common_logging.c:1177
 msgid "invalid address"
 msgstr "dirección no válida"
 
-#: src/util/common_logging.c:1233
+#: src/util/common_logging.c:1195
 #, 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:1254
+#: src/util/common_logging.c:1216
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -6477,17 +6869,17 @@
 "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
+#: src/util/connection.c:424
 #, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Acceso denegado a «%s»\n"
 
-#: src/util/connection.c:442
+#: src/util/connection.c:439
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr "Aceptando conexión desde «%s»: %p\n"
 
-#: src/util/connection.c:557
+#: src/util/connection.c:554
 #, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
@@ -6495,12 +6887,12 @@
 "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
+#: src/util/connection.c:752 src/util/connection.c:919
 #, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Intentando conectar a «%s» (%p)\n"
 
-#: src/util/connection.c:913
+#: src/util/connection.c:910
 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr "El intento de conectar a «%s» falló\n"
@@ -6514,22 +6906,22 @@
 "El tamaño del fichero en disco es incorrecto para este «Bloom "
 "filter» (esperado %llu, tiene %llu)\n"
 
-#: src/util/crypto_ecc.c:534 src/util/crypto_ecc.c:572
+#: src/util/crypto_ecc.c:580 src/util/crypto_ecc.c:618
 #, 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:539
+#: src/util/crypto_ecc.c:585
 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:576
+#: src/util/crypto_ecc.c:622
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 "Esto puede estar bien si alguien está actualmente generando una clave "
 "privada.\n"
 
-#: src/util/crypto_ecc.c:607
+#: src/util/crypto_ecc.c:653
 #, c-format
 msgid ""
 "When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
@@ -6537,23 +6929,23 @@
 "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:612
+#: src/util/crypto_ecc.c:658
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 "Esto puede ser correcto si alguien está actualmente generando una clave de "
 "máquina.\n"
 
-#: src/util/crypto_ecc.c:694
+#: src/util/crypto_ecc.c:741
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "No se pudo acceder a la clave de máquina.\n"
 
-#: src/util/crypto_ecc.c:756
+#: src/util/crypto_ecc.c:803
 #, 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:836
+#: src/util/crypto_ecc.c:883
 #, 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"
@@ -6568,17 +6960,17 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt no tiene la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/disk.c:1149
+#: src/util/disk.c:1150
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
 
-#: src/util/disk.c:1506 src/util/service.c:1679
+#: src/util/disk.c:1507 src/util/service.c:1674
 #, 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:1953
+#: src/util/disk.c:1954
 #, 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"
@@ -6692,17 +7084,17 @@
 msgid "Manipulate GNUnet configuration files"
 msgstr "Manipular ficheros de configuración de GNUnet"
 
-#: src/util/gnunet-ecc.c:65
+#: src/util/gnunet-ecc.c:60
 #, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Se produjo un fallo al abrir «%s»: %s\n"
 
-#: src/util/gnunet-ecc.c:71
+#: src/util/gnunet-ecc.c:66
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr "Generando %u claves, por favor, espere"
 
-#: src/util/gnunet-ecc.c:87
+#: src/util/gnunet-ecc.c:82
 #, c-format
 msgid ""
 "\n"
@@ -6711,42 +7103,38 @@
 "\n"
 "Se produjo un fallo al escribir en «%s»: %s\n"
 
-#: src/util/gnunet-ecc.c:97
+#: src/util/gnunet-ecc.c:92
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr "¡Finalizado!\n"
 
-#: src/util/gnunet-ecc.c:100
+#: src/util/gnunet-ecc.c:95
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:123
+#: src/util/gnunet-ecc.c:118
 #, 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:178
+#: src/util/gnunet-ecc.c:163
 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:181
+#: src/util/gnunet-ecc.c:166
 msgid "print the public key in ASCII format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:169
 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:187
-msgid "print the short hash of the public key in ASCII format"
-msgstr "imprime el hash corto de la clave pública en formato ASCII"
-
-#: src/util/gnunet-ecc.c:198
+#: src/util/gnunet-ecc.c:180
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
@@ -6810,12 +7198,12 @@
 msgid "Error writing to `%s': %s\n"
 msgstr "Error escribiendo a «%s»: %s\n"
 
-#: src/util/network.c:127
+#: src/util/network.c:132
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr "Imposible acortar la ruta unix «%s» manteniendo el nombre único\n"
 
-#: src/util/network.c:1344
+#: src/util/network.c:1370
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -6866,17 +7254,17 @@
 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:1801
+#: src/util/program.c:254 src/util/service.c:1796
 #, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "No se pudo acceder al fichero de configuración «%s»\n"
 
-#: src/util/resolver_api.c:202
+#: src/util/resolver_api.c:198
 #, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr "¡Se debe especificar «%s» para «%s» en la configuración!\n"
 
-#: src/util/resolver_api.c:221
+#: src/util/resolver_api.c:217
 #, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
@@ -6884,47 +7272,47 @@
 "¡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
+#: src/util/resolver_api.c:343
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "Expiración de plazo intentando resolver la dirección IP «%s».\n"
 
-#: src/util/resolver_api.c:351
+#: src/util/resolver_api.c:347
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Expiración de plazo intentando resolver el nombre de máquina «%s».\n"
 
-#: src/util/resolver_api.c:890
+#: src/util/resolver_api.c:886
 #, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr ""
 "No se pudo resolver nuestro nombre de dominio cualificado (FQDN) : %s\n"
 
-#: src/util/scheduler.c:782
+#: src/util/scheduler.c:802
 msgid "Looks like we're busy waiting...\n"
 msgstr "Parece que estamos en espera ocupada...\n"
 
-#: src/util/scheduler.c:912
+#: src/util/scheduler.c:933
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr "¡Intento de cancelar la tarea muerta %llu!\n"
 
-#: src/util/server.c:476
+#: src/util/server.c:482
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "«%s» falló para el puerto %d (%s).\n"
 
-#: src/util/server.c:485
+#: src/util/server.c:491
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "«%s» falló para el puerto %d (%s): dirección en uso actualmente\n"
 
-#: src/util/server.c:496
+#: src/util/server.c:502
 #, c-format
 msgid "`%s' failed for `%.*s': address already in use\n"
 msgstr "«%s» falló para «%.*s»: dirección en uso actualmente\n"
 
-#: src/util/server.c:888
+#: src/util/server.c:894
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -7014,51 +7402,51 @@
 "No se pudo acceder a un «socket» pre-ascociado, lo intentaré asociar yo "
 "mismo\n"
 
-#: src/util/service.c:1318 src/util/service.c:1336
+#: src/util/service.c:1316 src/util/service.c:1334
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr "El valor especificado «%s» para el servicio «%s» no es válido\n"
 
-#: src/util/service.c:1363
+#: src/util/service.c:1359
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 "No se pudo acceder al «socket» pre-ascociado %u, lo intentaré asociar yo "
 "mismo\n"
 
-#: src/util/service.c:1535
+#: src/util/service.c:1530
 #, 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:1568
+#: src/util/service.c:1563
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "El servicio «%s» se ejecuta en %s\n"
 
-#: src/util/service.c:1617
+#: src/util/service.c:1612
 msgid "Service process failed to initialize\n"
 msgstr "No se pudo inicializar el proceso del servicio\n"
 
-#: src/util/service.c:1621
+#: src/util/service.c:1616
 msgid "Service process could not initialize server function\n"
 msgstr ""
 "No se pudo inicializar la función del servidor en el proceso del servicio\n"
 
-#: src/util/service.c:1625
+#: src/util/service.c:1620
 msgid "Service process failed to report status\n"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
-#: src/util/service.c:1680
+#: src/util/service.c:1675
 msgid "No such user"
 msgstr "No existe tal usuario"
 
-#: src/util/service.c:1693
+#: src/util/service.c:1688
 #, 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:1759
+#: src/util/service.c:1754
 msgid "do daemonize (detach from terminal)"
 msgstr "demonizar (desasociar del terminal)"
 
@@ -7071,79 +7459,83 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:425
+#: src/util/strings.c:429
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr "Los conjuntos de caracteres pedidos fueron «%s»->«%s»\n"
 
-#: src/util/strings.c:540
+#: src/util/strings.c:544
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Se produjo un fallo al expandir «$HOME»: variable de entorno «HOME» no "
 "establecida"
 
-#: src/util/strings.c:637
-msgid "ms"
-msgstr "ms"
+#: src/util/strings.c:641
+msgid "µs"
+msgstr ""
 
-#: src/util/strings.c:641
+#: src/util/strings.c:645
 msgid "forever"
 msgstr "para siempre"
 
-#: src/util/strings.c:643
+#: src/util/strings.c:647
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:649
+#: src/util/strings.c:653
+msgid "ms"
+msgstr "ms"
+
+#: src/util/strings.c:659
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:655
+#: src/util/strings.c:665
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:661
+#: src/util/strings.c:671
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:668
+#: src/util/strings.c:678
 msgid "day"
 msgstr "día"
 
-#: src/util/strings.c:670
+#: src/util/strings.c:680
 msgid "days"
 msgstr "días"
 
-#: src/util/strings.c:697
+#: src/util/strings.c:708
 msgid "end of time"
 msgstr "fin del plazo"
 
-#: src/util/strings.c:1098
+#: src/util/strings.c:1109
 msgid "IPv6 address did not start with `['\n"
 msgstr "La dirección IPv6 no empezaba con «[»\n"
 
-#: src/util/strings.c:1106
+#: src/util/strings.c:1117
 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:1112
+#: src/util/strings.c:1123
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 "La dirección IPv6 contenía «]» antes de «:» para separar el número de "
 "puerto\n"
 
-#: src/util/strings.c:1119
+#: src/util/strings.c:1130
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 "La dirección IPv6 contenía un número de puerto válido después del último "
 "«:»\n"
 
-#: src/util/strings.c:1128
+#: src/util/strings.c:1139
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Dirección IPv6 «%s» no válida: %s\n"
 
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1130
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1128
 msgid "# Active tunnels"
 msgstr "# Túneles activos"
 
@@ -7172,67 +7564,85 @@
 msgid "Protocol %u not supported, dropping\n"
 msgstr "Protocolo %u no soportado, omitiendo\n"
 
-#: src/vpn/gnunet-service-vpn.c:1350
+#: src/vpn/gnunet-service-vpn.c:1348
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv4 omitidos (no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:1371
+#: src/vpn/gnunet-service-vpn.c:1369
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr "# Paquetes ICMPv6 omitidos (no permitido)"
 
-#: src/vpn/gnunet-service-vpn.c:1576
+#: src/vpn/gnunet-service-vpn.c:1574
 msgid "# Packets received from TUN interface"
 msgstr "# Paquetes recibidos de la interfaz TUN"
 
-#: src/vpn/gnunet-service-vpn.c:1614 src/vpn/gnunet-service-vpn.c:1655
+#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1653
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr "Paquete recibido para el destino «%s» no mapeado (omitiéndolo)\n"
 
-#: src/vpn/gnunet-service-vpn.c:1665
+#: src/vpn/gnunet-service-vpn.c:1663
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr "Recibido paquete IPv4 con opciones (omitiéndolo)\n"
 
-#: src/vpn/gnunet-service-vpn.c:1679
+#: src/vpn/gnunet-service-vpn.c:1677
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr "Recibido paquete de protocolo %d desconocido desde TUN (omitiéndolo)\n"
 
-#: src/vpn/gnunet-service-vpn.c:1761
+#: src/vpn/gnunet-service-vpn.c:1759
 msgid "# ICMP packets received from mesh"
 msgstr "# Paquetes ICMP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2100
+#: src/vpn/gnunet-service-vpn.c:2098
 msgid "# UDP packets received from mesh"
 msgstr "# Paquetes UDP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2255
+#: src/vpn/gnunet-service-vpn.c:2253
 msgid "# TCP packets received from mesh"
 msgstr "# Paquetes TCP recibidos de mesh"
 
-#: src/vpn/gnunet-service-vpn.c:2406
+#: src/vpn/gnunet-service-vpn.c:2404
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr "No se encontraron direcciones IPv4 libres en el rango de la VPN\n"
 
-#: src/vpn/gnunet-service-vpn.c:2461
+#: src/vpn/gnunet-service-vpn.c:2459
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr "No se encontraron direcciones IPv6 libres en el rango de la VPN\n"
 
-#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2713
+#: src/vpn/gnunet-service-vpn.c:2498 src/vpn/gnunet-service-vpn.c:2711
 msgid "# Active destinations"
 msgstr "# Destinos activos"
 
-#: src/vpn/gnunet-service-vpn.c:2786
+#: src/vpn/gnunet-service-vpn.c:2784
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 "Se produjo un fallo al alojar las direcciones IP para el nuevo destino\n"
 
-#: src/vpn/gnunet-service-vpn.c:3143
+#: src/vpn/gnunet-service-vpn.c:3112
+#, fuzzy
+msgid "Must specify valid IPv6 address"
+msgstr "«%s» no es una dirección IP válida.\n"
+
+#: src/vpn/gnunet-service-vpn.c:3133
+msgid "Must specify valid IPv6 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3141
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 "El soporte de IPv6 se deshabilita porque este sistema no soporta IPv6\n"
 
-#: src/vpn/gnunet-service-vpn.c:3175
+#: src/vpn/gnunet-service-vpn.c:3153
+#, fuzzy
+msgid "Must specify valid IPv4 address"
+msgstr "«%s» no es una dirección IP válida.\n"
+
+#: src/vpn/gnunet-service-vpn.c:3164
+msgid "Must specify valid IPv4 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3173
 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"
@@ -7307,22 +7717,133 @@
 msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
 
-#: src/include/gnunet_common.h:588 src/include/gnunet_common.h:593
-#: src/include/gnunet_common.h:599
+#: src/include/gnunet_common.h:618 src/include/gnunet_common.h:625
+#: src/include/gnunet_common.h:633
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Aserción fallida en %s:%d.\n"
 
-#: src/include/gnunet_common.h:609
+#: src/include/gnunet_common.h:645
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Violación externa del protocolo detectada en %s:%d.\n"
 
-#: src/include/gnunet_common.h:630 src/include/gnunet_common.h:637
+#: src/include/gnunet_common.h:672 src/include/gnunet_common.h:681
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "«%s» falló en el fichero «%s» en %s:%d con el error: %s\n"
 
+#~ msgid "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"
+
+#~ msgid "no-name"
+#~ msgstr "sin nombre"
+
+#~ msgid "Option `%s' ignored\n"
+#~ msgstr "Opción «%s» ignorada\n"
+
+#, fuzzy
+#~ msgid "advertise namespace NAME"
+#~ msgstr "crear o anunciar un nombre de espacio de nombres (NAME)"
+
+#~ 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)"
+
+#~ msgid "use the given PRIORITY for the advertisments"
+#~ msgstr "usa la prioridad (PRIORITY) dada para los anuncios"
+
+#~ msgid "do not print names of remote namespaces"
+#~ msgstr "no imprime los nombres de los espacios de nombres remotos"
+
+#~ msgid "specify ID of the root of the namespace"
+#~ msgstr "especifica la identificación (ID) del espacio de nombres raíz"
+
+#~ msgid "change rating of namespace ID by VALUE"
+#~ msgstr "cambia la valoración del espacio de nombres «ID» al valor «VALUE»"
+
+#~ msgid "Manage GNUnet pseudonyms."
+#~ msgstr "Gestionar seudónimos de GNUnet."
+
+#~ 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"
+
+#~ msgid "try to shorten a given name"
+#~ msgstr "intentar acortar un nombre dado"
+
+#~ msgid "Get the authority of a particular name"
+#~ msgstr "Obtener la autoridad de un nombre particular"
+
+#~ msgid "Failed to read or create private zone key\n"
+#~ msgstr "Se produjo un fallo al leer o crear una clave de zona privada\n"
+
+#~ 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"
+
+#~ msgid "Unable to initialize resolver!\n"
+#~ msgstr "¡No se puede inicializar el resolvedor!\n"
+
+#~ msgid "Not a GADS TLD: `%s'\n"
+#~ msgstr "No es un TLD GADS: «%s»\n"
+
+#~ msgid "for at least"
+#~ msgstr "al menos por"
+
+#~ msgid "until"
+#~ msgstr "hasta"
+
+#~ msgid "Using default zone file `%s'\n"
+#~ msgstr "Usando el fichero de zonas predeterminado «%s»\n"
+
+#~ msgid "create or list non-authority record"
+#~ msgstr "crear o listar registros sin-autoridad"
+
+#~ msgid "filename with the zone key"
+#~ msgstr "nombre del fichero con la clave de zona"
+
+#~ msgid "Failed to write zone key to file `%s': %s\n"
+#~ msgstr ""
+#~ "Se produjo un fallo al escribir la clave de zona al fichero «%s»: %s\n"
+
+#~ msgid "file exists but reading key failed"
+#~ msgstr "el fichero existe, pero no se pudo leer la clave"
+
+#~ msgid "file exists with different key"
+#~ msgstr "el fichero existe con diferente clave"
+
+#~ 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"
+
+#~ msgid "Creating directory `%s' for zone files failed!\n"
+#~ msgstr ""
+#~ "¡Se produjo un fallo creando el directorio «%s» para ficheros de zonas!\n"
+
+#~ 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"
+
+#~ msgid "name of the template configuration file to use (optional)"
+#~ msgstr "nombre del fichero plantilla de configuración a usar (opcional)"
+
+#~ msgid "name of the service to run"
+#~ msgstr "nombre del servicio a ejecutar"
+
+#~ 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"
+
 #~ msgid "start peers with the given template configuration"
 #~ msgstr "inicia los pares con la plantilla de configuración dada"
 
@@ -7365,9 +7886,6 @@
 #~ msgstr ""
 #~ "Identificadores o URI demasiado largos para crear un bloque S (SBlock)"
 
-#~ msgid "Internal error."
-#~ msgstr "Error interno."
-
 #, fuzzy
 #~ msgid "ECDSA signature verification failed at %s:%d: %s\n"
 #~ msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
@@ -7811,9 +8329,6 @@
 #~ msgid "Could not serialize metadata\n"
 #~ msgstr "No se pudieron serializar los metadatos\n"
 
-#~ msgid "Failed to connect to the chat service\n"
-#~ msgstr "Se produjo un fallo al conectar con el servicio de chat\n"
-
 #~ msgid "Undefined mandatory parameter: joinCallback\n"
 #~ msgstr "Parámetro obligatorio indefinido: joinCallback\n"
 
@@ -7952,9 +8467,6 @@
 #~ msgid "Use `/help command' to get help for a specific command"
 #~ msgstr "Use «/help comando» para obtener ayuda sobre un comando específico"
 
-#~ msgid "You must specify a nickname\n"
-#~ msgstr "Se debe especificar un apodo\n"
-
 #~ msgid "Failed to join room `%s'\n"
 #~ msgstr "Se produjo un fallo al unirse a la sala «%s»\n"
 
@@ -7993,9 +8505,6 @@
 #~ msgid "Unable to initialize Postgres with configuration `%s': %s"
 #~ msgstr "No se pudo inicializar Postgres con la configuración «%s»: %s"
 
-#~ msgid "Option `%s' in section `%s' missing in configuration!\n"
-#~ msgstr "¡Falta la opción «%s» en la sección «%s» de la configuración!\n"
-
 #~ msgid "Connected to %s service!\n"
 #~ msgstr "¡Conectado al servicio «%s»!\n"
 
@@ -8017,9 +8526,6 @@
 #~ 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"
-
 #~ msgid "Failed to create namespace `%s'\n"
 #~ msgstr "Se produjo un fallo al crear el espacio de nombres «%s»\n"
 
@@ -8040,9 +8546,6 @@
 #~ "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 "
@@ -8106,9 +8609,6 @@
 #~ "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 "
@@ -8156,9 +8656,6 @@
 #~ msgid "Malformed output from gnunet-peerinfo!\n"
 #~ msgstr "¡Salida mal formada de «gnunet-peerinfo»!\n"
 
-#~ msgid "Failed to get hostkey!\n"
-#~ msgstr "¡Se produjo un fallo al obtener la clave de máquina!\n"
-
 #~ msgid "`Failed while waiting for topology setup!\n"
 #~ msgstr "¡Falló mientras se esperaba la configuración topológica!\n"
 
@@ -9200,10 +9697,6 @@
 #~ msgstr "Otras configuraciones"
 
 #, fuzzy
-#~ msgid "Unknown operation '%s'.\n"
-#~ msgstr "Operación desconocida '%s'\n"
-
-#, fuzzy
 #~ msgid "yes"
 #~ msgstr "Bytes"
 
@@ -9785,9 +10278,6 @@
 #~ msgid "write encountered (decrypted) search results to FILENAME"
 #~ msgstr "escribe los resultados encontrados (descifrados) a FILENAME"
 
-#~ 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)                "
@@ -10034,10 +10524,6 @@
 #~ msgid "Could not properly unload service `%s'!\n"
 #~ msgstr "¡Imposible descargar adecuadamente el servicio '%s'!\n"
 
-#, fuzzy
-#~ msgid "Core initialization failed.\n"
-#~ msgstr "Conexión fallida\n"
-
 #~ msgid "run as user LOGIN"
 #~ msgstr "ejecuta como el usuario LOGIN"
 
@@ -10134,9 +10620,6 @@
 #~ "\n"
 #~ "Contactando '%s'."
 
-#~ msgid " Connection failed (bug?)\n"
-#~ msgstr "Conexión fallida (¿bug?)\n"
-
 #, fuzzy
 #~ msgid "OK!\n"
 #~ msgstr "OK"
@@ -10645,9 +11128,6 @@
 #~ msgid "async RPC reply not received.\n"
 #~ msgstr "respuesta RPC asíncrona no recibida.\n"
 
-#~ msgid "`%s': unknown service: %s\n"
-#~ msgstr "'%s': servicio desconocido: %s\n"
-
 #, fuzzy
 #~ msgid "# bytes received via TCP6"
 #~ msgstr "# bytes recibidos por TCP"

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2013-09-16 13:23:12 UTC (rev 29317)
+++ gnunet/po/sv.po     2013-09-16 13:33:53 UTC (rev 29318)
@@ -7,13 +7,13 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-08-09 23:01+0200\n"
+"POT-Creation-Date: 2013-09-16 15:01+0200\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/arm/arm_api.c:335
@@ -35,7 +35,7 @@
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:962
+#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:971
 msgid "Message was sent successfully"
 msgstr ""
 
@@ -44,12 +44,12 @@
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:966
+#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:975
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# av anslutna parter"
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:968
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:977
 msgid "ARM API is busy"
 msgstr ""
 
@@ -57,57 +57,57 @@
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:972
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:981
 #, fuzzy
 msgid "Request timed out"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:974
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:983
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:990
+#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:999
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# byte krypterade"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:992
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1001
 #, fuzzy, c-format
 msgid "%s is starting"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:994
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1003
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:996
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1005
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "\"%s\" startar\n"
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:998
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1007
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1000
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1009
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1002
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1011
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1004
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1013
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1006
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1015
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Misslyckades att starta samling.\n"
@@ -117,7 +117,7 @@
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1010
+#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1019
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -294,50 +294,50 @@
 msgid "Preparing to stop `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1023
+#: src/arm/gnunet-service-arm.c:1022
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1116
+#: src/arm/gnunet-service-arm.c:1115
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1121
+#: src/arm/gnunet-service-arm.c:1120
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1126
+#: src/arm/gnunet-service-arm.c:1125
 #, fuzzy
 msgid "unknown"
 msgstr "Okänt fel"
 
-#: src/arm/gnunet-service-arm.c:1132
+#: src/arm/gnunet-service-arm.c:1131
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/arm/gnunet-service-arm.c:1154
+#: src/arm/gnunet-service-arm.c:1153
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1169
+#: src/arm/gnunet-service-arm.c:1168
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1387
+#: src/arm/gnunet-service-arm.c:1386
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1398
+#: src/arm/gnunet-service-arm.c:1397
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1412
+#: src/arm/gnunet-service-arm.c:1411
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -356,91 +356,91 @@
 msgid "Received last message for %s \n"
 msgstr "Mottog ogiltigt \"%s\" meddelande från \"%s\".\n"
 
-#: src/ats/gnunet-service-ats_addresses.c:1529
-#: src/ats/gnunet-service-ats_addresses.c:1563
+#: src/ats/gnunet-service-ats_addresses.c:1607
+#: src/ats/gnunet-service-ats_addresses.c:1641
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1535
+#: src/ats/gnunet-service-ats_addresses.c:1613
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1542
+#: src/ats/gnunet-service-ats_addresses.c:1620
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1569
+#: src/ats/gnunet-service-ats_addresses.c:1647
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1576
+#: src/ats/gnunet-service-ats_addresses.c:1654
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1773
+#: src/ats/gnunet-service-ats_addresses.c:1888
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:848
+#: src/ats/gnunet-service-ats-solver_mlp.c:849
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1171
+#: src/ats/gnunet-service-ats-solver_mlp.c:1193
 #, 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-solver_mlp.c:1216
+#: src/ats/gnunet-service-ats-solver_mlp.c:1238
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1890
+#: src/ats/gnunet-service-ats-solver_mlp.c:1956
 #, 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-solver_mlp.c:1898
+#: src/ats/gnunet-service-ats-solver_mlp.c:1964
 #, 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-solver_mlp.c:1908
+#: src/ats/gnunet-service-ats-solver_mlp.c:1974
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1916
+#: src/ats/gnunet-service-ats-solver_mlp.c:1982
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1927
+#: src/ats/gnunet-service-ats-solver_mlp.c:1993
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_proportional.c:1246
+#: src/ats/gnunet-service-ats-solver_proportional.c:1296
 #, fuzzy, c-format
-msgid "Cannot find network of type `%u' %s\n"
+msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
 #: src/ats-tool/gnunet-ats.c:145
@@ -465,7 +465,7 @@
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:461
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:438
 #: src/transport/gnunet-transport.c:812
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
@@ -558,31 +558,36 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/consensus/gnunet-consensus.c:352
+#: src/consensus/gnunet-consensus-profiler.c:393
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "antal iterationer"
 
-#: src/consensus/gnunet-consensus.c:355
+#: src/consensus/gnunet-consensus-profiler.c:396
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus.c:358 src/set/gnunet-set-profiler.c:287
-#: src/set/gnunet-set-profiler.c:290 src/set/gnunet-set-profiler.c:293
+#: src/consensus/gnunet-consensus-profiler.c:399
+#: src/set/gnunet-set-profiler.c:287 src/set/gnunet-set-profiler.c:290
+#: src/set/gnunet-set-profiler.c:293
 #, fuzzy
 msgid "number of values"
 msgstr "antal iterationer"
 
-#: src/consensus/gnunet-consensus.c:361
+#: src/consensus/gnunet-consensus-profiler.c:402
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# sessionsnycklar accepterade"
 
+#: src/consensus/gnunet-consensus-profiler.c:405
+msgid "be more verbose (print received values)"
+msgstr ""
+
 #: src/core/core_api.c:752
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:82
+#: src/core/gnunet-core.c:83
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
@@ -603,18 +608,18 @@
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:170
+#: src/core/gnunet-core.c:166 src/mesh/gnunet-mesh.c:170
 #: src/peerinfo-tool/gnunet-peerinfo.c:653
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
-#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:1004
+#: src/core/gnunet-core.c:203 src/transport/gnunet-transport.c:1004
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-core.c:215
+#: src/core/gnunet-core.c:214
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
@@ -681,7 +686,7 @@
 msgstr "# PING-meddelanden skapade"
 
 #: src/core/gnunet-service-core_kx.c:922
-#: src/transport/gnunet-service-transport_validation.c:935
+#: src/transport/gnunet-service-transport_validation.c:933
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
@@ -714,7 +719,7 @@
 msgstr "# PING-meddelanden i klartext skickade"
 
 #: src/core/gnunet-service-core_kx.c:1067
-#: src/transport/gnunet-service-transport_validation.c:1226
+#: src/transport/gnunet-service-transport_validation.c:1224
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -810,8 +815,8 @@
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:210
-#: src/core/gnunet-service-core_sessions.c:280
+#: src/core/gnunet-service-core_sessions.c:209
+#: src/core/gnunet-service-core_sessions.c:279
 #: src/dht/gnunet-service-dht_neighbours.c:641
 #: src/dht/gnunet-service-dht_neighbours.c:700
 #: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
@@ -820,17 +825,17 @@
 #: src/transport/gnunet-service-transport_neighbours.c:1041
 #: src/transport/gnunet-service-transport_neighbours.c:1265
 #: src/transport/gnunet-service-transport_neighbours.c:1274
-#: src/transport/gnunet-service-transport_neighbours.c:2793
-#: src/transport/gnunet-service-transport_neighbours.c:3047
+#: src/transport/gnunet-service-transport_neighbours.c:2799
+#: src/transport/gnunet-service-transport_neighbours.c:3053
 #, fuzzy
 msgid "# peers connected"
 msgstr "# av anslutna parter"
 
-#: src/core/gnunet-service-core_sessions.c:248
+#: src/core/gnunet-service-core_sessions.c:247
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:417
+#: src/core/gnunet-service-core_sessions.c:416
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -845,7 +850,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:115 src/datacache/datacache.c:266
-#: src/datastore/gnunet-service-datastore.c:834
+#: src/datastore/gnunet-service-datastore.c:838
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# byte krypterade"
@@ -856,8 +861,8 @@
 msgstr "# byte krypterade"
 
 #: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1483
-#: src/datastore/gnunet-service-datastore.c:1494
+#: src/datastore/gnunet-service-datastore.c:1487
+#: src/datastore/gnunet-service-datastore.c:1498
 #, fuzzy, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
@@ -891,15 +896,16 @@
 
 #: src/datacache/plugin_datacache_sqlite.c:69
 #: src/datacache/plugin_datacache_sqlite.c:72
-#: src/datastore/plugin_datastore_mysql.c:803
-#: src/datastore/plugin_datastore_mysql.c:817
+#: src/datastore/plugin_datastore_mysql.c:806
+#: src/datastore/plugin_datastore_mysql.c:820
 #: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
-#: src/include/gnunet_common.h:616 src/include/gnunet_common.h:623
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:54
+#: src/include/gnunet_common.h:654 src/include/gnunet_common.h:663
+#: src/scalarproduct/scalarproduct.h:56
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -910,7 +916,7 @@
 
 #: src/datacache/plugin_datacache_sqlite.c:484
 #: src/datastore/plugin_datastore_sqlite.c:401
-#: src/namestore/plugin_namestore_sqlite.c:362
+#: src/namestore/plugin_namestore_sqlite.c:374
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -950,7 +956,7 @@
 msgid "# datastore connections (re)created"
 msgstr "Nätverksanslutning"
 
-#: src/datastore/datastore_api.c:608
+#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:276
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# klartext PONG-meddelanden mottagna"
@@ -979,45 +985,45 @@
 msgid "# status messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/datastore/datastore_api.c:867
+#: src/datastore/datastore_api.c:868
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:934
+#: src/datastore/datastore_api.c:935
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:995
+#: src/datastore/datastore_api.c:996
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1052
+#: src/datastore/datastore_api.c:1055
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1116
+#: src/datastore/datastore_api.c:1119
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1161
+#: src/datastore/datastore_api.c:1164
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/datastore/datastore_api.c:1220
+#: src/datastore/datastore_api.c:1223
 #, fuzzy
 msgid "# Results received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/datastore_api.c:1286
+#: src/datastore/datastore_api.c:1290
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1349
+#: src/datastore/datastore_api.c:1353
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1410
+#: src/datastore/datastore_api.c:1414
 msgid "# GET requests executed"
 msgstr ""
 
@@ -1042,158 +1048,158 @@
 msgid "Manipulate GNUnet datastore"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/datastore/gnunet-service-datastore.c:349
+#: src/datastore/gnunet-service-datastore.c:351
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:422
+#: src/datastore/gnunet-service-datastore.c:425
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:480
+#: src/datastore/gnunet-service-datastore.c:483
 #: src/gns/gnunet-gns-helper-service-w32.c:155
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:511
+#: src/datastore/gnunet-service-datastore.c:514
 #: src/gns/gnunet-gns-helper-service-w32.c:183
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:626
+#: src/datastore/gnunet-service-datastore.c:630
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:669
+#: src/datastore/gnunet-service-datastore.c:673
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:680
+#: src/datastore/gnunet-service-datastore.c:684
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:688
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:690
+#: src/datastore/gnunet-service-datastore.c:694
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:695
-#: src/datastore/gnunet-service-datastore.c:747
-#: src/datastore/gnunet-service-datastore.c:960
-#: src/datastore/gnunet-service-datastore.c:1417
+#: src/datastore/gnunet-service-datastore.c:699
+#: src/datastore/gnunet-service-datastore.c:751
+#: src/datastore/gnunet-service-datastore.c:964
+#: src/datastore/gnunet-service-datastore.c:1421
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:760
+#: src/datastore/gnunet-service-datastore.c:764
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:846
+#: src/datastore/gnunet-service-datastore.c:850
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1006
+#: src/datastore/gnunet-service-datastore.c:1010
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1018
+#: src/datastore/gnunet-service-datastore.c:1022
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1046
+#: src/datastore/gnunet-service-datastore.c:1050
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1076
+#: src/datastore/gnunet-service-datastore.c:1080
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1109
+#: src/datastore/gnunet-service-datastore.c:1113
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1134
+#: src/datastore/gnunet-service-datastore.c:1138
 #, fuzzy
 msgid "Content not found"
 msgstr "Kommando \"%s\" hittades inte!\n"
 
-#: src/datastore/gnunet-service-datastore.c:1142
+#: src/datastore/gnunet-service-datastore.c:1146
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1174
+#: src/datastore/gnunet-service-datastore.c:1178
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/datastore/gnunet-service-datastore.c:1216
+#: src/datastore/gnunet-service-datastore.c:1220
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1277
+#: src/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1286
+#: src/datastore/gnunet-service-datastore.c:1290
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/datastore/gnunet-service-datastore.c:1488
+#: src/datastore/gnunet-service-datastore.c:1492
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# byte krypterade"
 
-#: src/datastore/gnunet-service-datastore.c:1499
+#: src/datastore/gnunet-service-datastore.c:1503
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1501
+#: src/datastore/gnunet-service-datastore.c:1505
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1514
+#: src/datastore/gnunet-service-datastore.c:1518
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1532
-#: src/datastore/gnunet-service-datastore.c:1548
+#: src/datastore/gnunet-service-datastore.c:1536
+#: src/datastore/gnunet-service-datastore.c:1552
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/datastore/gnunet-service-datastore.c:1578
+#: src/datastore/gnunet-service-datastore.c:1582
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/datastore/gnunet-service-datastore.c:1607
+#: src/datastore/gnunet-service-datastore.c:1611
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1612
+#: src/datastore/gnunet-service-datastore.c:1616
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1615
+#: src/datastore/gnunet-service-datastore.c:1619
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
@@ -1201,17 +1207,17 @@
 msgid "Heap database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_mysql.c:780
+#: src/datastore/plugin_datastore_mysql.c:783
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/datastore/plugin_datastore_mysql.c:788
+#: src/datastore/plugin_datastore_mysql.c:791
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" till \"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1019
+#: src/datastore/plugin_datastore_mysql.c:1022
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -1221,7 +1227,7 @@
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
-#: src/namestore/plugin_namestore_postgres.c:652
+#: src/namestore/plugin_namestore_postgres.c:735
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1231,28 +1237,29 @@
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:253
-#: src/namestore/plugin_namestore_sqlite.c:223
+#: src/namestore/plugin_namestore_sqlite.c:220
+#: src/psycstore/plugin_psycstore_sqlite.c:319
 #, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:648
+#: src/datastore/plugin_datastore_sqlite.c:649
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1134
+#: src/datastore/plugin_datastore_sqlite.c:1135
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1153
+#: src/datastore/plugin_datastore_sqlite.c:1154
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1193
-#: src/namestore/plugin_namestore_sqlite.c:829
+#: src/datastore/plugin_datastore_sqlite.c:1194
+#: src/namestore/plugin_namestore_sqlite.c:893
 msgid "Sqlite database running\n"
 msgstr ""
 
@@ -1308,9 +1315,9 @@
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:861
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:864
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:899
+#: src/nse/gnunet-nse-profiler.c:904
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1541,50 +1548,50 @@
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1575
+#: src/dht/gnunet-service-dht_neighbours.c:1573
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1578
+#: src/dht/gnunet-service-dht_neighbours.c:1576
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1733
+#: src/dht/gnunet-service-dht_neighbours.c:1731
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1741
+#: src/dht/gnunet-service-dht_neighbours.c:1739
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1832
+#: src/dht/gnunet-service-dht_neighbours.c:1830
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1835
+#: src/dht/gnunet-service-dht_neighbours.c:1833
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1888
+#: src/dht/gnunet-service-dht_neighbours.c:1886
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1902
+#: src/dht/gnunet-service-dht_neighbours.c:1900
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1979
+#: src/dht/gnunet-service-dht_neighbours.c:1977
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1982
+#: src/dht/gnunet-service-dht_neighbours.c:1980
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -1618,11 +1625,11 @@
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:400
+#: src/dht/gnunet-service-dht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:418
+#: src/dht/gnunet-service-dht_routing.c:417
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# byte mottogs via TCP"
@@ -1641,12 +1648,12 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:152
+#: src/dns/dnsparser.c:233
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/dns/dnsparser.c:626
+#: src/dns/dnsparser.c:751
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -1657,7 +1664,6 @@
 msgstr "Kunde inte köra \"%s\": %s\n"
 
 #: src/dns/dnsstub.c:296 src/dns/dnsstub.c:384
-#: src/gns/gnunet-service-gns_resolver.c:1651
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
@@ -1769,14 +1775,14 @@
 msgstr "# byte skickade av typen %d"
 
 #: src/exit/gnunet-daemon-exit.c:924 src/exit/gnunet-daemon-exit.c:2349
-#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1453
-#: src/vpn/gnunet-service-vpn.c:1852 src/vpn/gnunet-service-vpn.c:2015
+#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1451
+#: src/vpn/gnunet-service-vpn.c:1850 src/vpn/gnunet-service-vpn.c:2013
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:961 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1509
-#: src/vpn/gnunet-service-vpn.c:1911 src/vpn/gnunet-service-vpn.c:2048
+#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1507
+#: src/vpn/gnunet-service-vpn.c:1909 src/vpn/gnunet-service-vpn.c:2046
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -1882,13 +1888,13 @@
 msgid "# ICMP service requests received via mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1443
-#: src/vpn/gnunet-service-vpn.c:2009
+#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1441
+#: src/vpn/gnunet-service-vpn.c:2007
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1479
-#: src/vpn/gnunet-service-vpn.c:1491 src/vpn/gnunet-service-vpn.c:1899
+#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1477
+#: src/vpn/gnunet-service-vpn.c:1489 src/vpn/gnunet-service-vpn.c:1897
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
@@ -2022,69 +2028,69 @@
 msgid "Experiment `%s': Required capabilities invalid \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:393
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:392
 #, fuzzy, c-format
 msgid "Failed to parse file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:419
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:444
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:418
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:443
 msgid ""
 "No valid experiment issuers configured! Set value to peer id of issuer! "
 "Exit...\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:429
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:428
 #, fuzzy, c-format
 msgid "Invalid value `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:453
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
 #, fuzzy, c-format
 msgid "Invalid public key `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:460
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:459
 #, fuzzy, c-format
 msgid "Found issuer for public key `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:463
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:462
 #, fuzzy, c-format
 msgid "No issuer for public key `%s'\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:480
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:479
 #, fuzzy, c-format
 msgid "Cannot read experiments file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:220
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
 #, c-format
 msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:290
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:291
 #, c-format
 msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:421
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:422
 #, c-format
 msgid "Added peer `%s' as active node\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:848
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:849
 #, fuzzy, c-format
 msgid "Connected to peer %s\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:877
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:878
 #, fuzzy, c-format
 msgid "Disconnected from peer %s\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1057
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1058
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -2178,56 +2184,56 @@
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1061
+#: src/fs/fs_api.c:1062
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:1557
+#: src/fs/fs_api.c:1565
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1571
+#: src/fs/fs_api.c:1579
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2228
+#: src/fs/fs_api.c:2236
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2238
+#: src/fs/fs_api.c:2246
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2364 src/fs/fs_api.c:2604
+#: src/fs/fs_api.c:2372 src/fs/fs_api.c:2612
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2381
+#: src/fs/fs_api.c:2389
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2896
+#: src/fs/fs_api.c:2402 src/fs/fs_api.c:2421 src/fs/fs_api.c:2904
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2595
+#: src/fs/fs_api.c:2603
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2840
+#: src/fs/fs_api.c:2848
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2934
+#: src/fs/fs_api.c:2942
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2340,79 +2346,68 @@
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_pseudonym.c:327 src/fs/fs_pseudonym.c:631
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:414
 #, fuzzy, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/fs/fs_pseudonym.c:463 src/fs/fs_pseudonym.c:489
-#: src/fs/fs_pseudonym.c:627
-#, fuzzy
-msgid "no-name"
-msgstr "Visa namn"
-
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:399
-#, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:624 src/fs/fs_publish.c:641 src/fs/fs_publish.c:680
-#: src/fs/fs_publish.c:700 src/fs/fs_publish.c:725 src/fs/fs_publish.c:865
+#: src/fs/fs_publish.c:642 src/fs/fs_publish.c:659 src/fs/fs_publish.c:698
+#: src/fs/fs_publish.c:719 src/fs/fs_publish.c:743 src/fs/fs_publish.c:889
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Indexering av fil \"%s\" misslyckades. Försöker att infoga fil...\n"
 
-#: src/fs/fs_publish.c:626
+#: src/fs/fs_publish.c:644
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:638
+#: src/fs/fs_publish.c:656
 #, fuzzy
 msgid "unknown error"
 msgstr "Okänt fel"
 
-#: src/fs/fs_publish.c:681
+#: src/fs/fs_publish.c:700
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:701
+#: src/fs/fs_publish.c:720
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:726
+#: src/fs/fs_publish.c:745
 #, fuzzy
 msgid "could not connect to `fs' service"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/fs/fs_publish.c:749
+#: src/fs/fs_publish.c:768
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_publish.c:814
+#: src/fs/fs_publish.c:837
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/fs/fs_publish.c:820
+#: src/fs/fs_publish.c:843
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/fs_publish.c:866
+#: src/fs/fs_publish.c:890
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1092
+#: src/fs/fs_publish.c:1126
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1164
+#: src/fs/fs_publish.c:1198
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2422,6 +2417,11 @@
 msgid "Could not connect to datastore."
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
+#: src/fs/fs_publish_ublock.c:219
+#, fuzzy
+msgid "Internal error."
+msgstr "Okänt fel.\n"
+
 #: src/fs/fs_search.c:815
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
@@ -2432,59 +2432,59 @@
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:58
+#: src/fs/fs_unindex.c:59
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_unindex.c:64
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_unindex.c:233
+#: src/fs/fs_unindex.c:234
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:241
+#: src/fs/fs_unindex.c:242
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:249
+#: src/fs/fs_unindex.c:250
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Ogiltigt svar till \"%s\" från \"%s\"\n"
 
-#: src/fs/fs_unindex.c:293
+#: src/fs/fs_unindex.c:291
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:349 src/fs/fs_unindex.c:361
+#: src/fs/fs_unindex.c:347 src/fs/fs_unindex.c:359
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/fs_unindex.c:357
+#: src/fs/fs_unindex.c:355
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/fs_unindex.c:416
+#: src/fs/fs_unindex.c:414
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_unindex.c:565 src/fs/fs_unindex.c:628
+#: src/fs/fs_unindex.c:562 src/fs/fs_unindex.c:626
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/fs_unindex.c:641
+#: src/fs/fs_unindex.c:639
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:675
+#: src/fs/fs_unindex.c:673
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -2515,13 +2515,16 @@
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
-#: src/fs/fs_uri.c:629
+#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:629
 msgid "SKS URI malformed"
 msgstr ""
 
+#: src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
+msgid "LOC URI malformed"
+msgstr ""
+
 #: src/fs/fs_uri.c:611
-msgid "SKS URI malformed (could not decode public key)"
+msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
 #: src/fs/fs_uri.c:617
@@ -2544,21 +2547,21 @@
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:911
+#: src/fs/fs_uri.c:912
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/fs/fs_uri.c:917
+#: src/fs/fs_uri.c:918
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/fs/fs_uri.c:1099 src/fs/fs_uri.c:1126
+#: src/fs/fs_uri.c:1102 src/fs/fs_uri.c:1129
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1132
+#: src/fs/fs_uri.c:1135
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2596,25 +2599,23 @@
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:310
-#: src/fs/gnunet-publish.c:808
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:811
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:812
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:815
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:815
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:818
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:839
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:842
 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:329
-#: src/fs/gnunet-publish.c:846
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:849
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2622,7 +2623,7 @@
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:656
+#: src/fs/gnunet-daemon-fsprofiler.c:657
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
@@ -2712,7 +2713,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:781
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:784
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2761,67 +2762,22 @@
 msgid "Special file-sharing operations"
 msgstr "Visa alla alternativ"
 
-#: src/fs/gnunet-fs-profiler.c:190
+#: src/fs/gnunet-fs-profiler.c:193
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:193
+#: src/fs/gnunet-fs-profiler.c:196
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:196
+#: src/fs/gnunet-fs-profiler.c:199
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:205
+#: src/fs/gnunet-fs-profiler.c:208
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:227 src/fs/gnunet-pseudonym.c:229
-#, fuzzy, c-format
-msgid "Option `%s' ignored\n"
-msgstr "%s: flagga \"%s\" är tvetydig\n"
-
-#: src/fs/gnunet-pseudonym.c:265 src/statistics/gnunet-statistics.c:305
-#, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Ogiltigt argument: \"%s\"\n"
-
-#: src/fs/gnunet-pseudonym.c:313
-msgid "advertise namespace NAME"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:316
-msgid ""
-"add an additional keyword for the advertisment (this option can be specified "
-"multiple times)"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:320 src/fs/gnunet-publish.c:827
-msgid "set the meta-data for the given TYPE to the given VALUE"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:323
-msgid "use the given PRIORITY for the advertisments"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:326
-msgid "do not print names of remote namespaces"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:332
-#, fuzzy
-msgid "specify ID of the root of the namespace"
-msgstr "ange prioritet för innehållet"
-
-#: src/fs/gnunet-pseudonym.c:335
-msgid "change rating of namespace ID by VALUE"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:347
-msgid "Manage GNUnet pseudonyms."
-msgstr ""
-
 #: src/fs/gnunet-publish.c:230
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -2911,84 +2867,88 @@
 msgid "Failed to access `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-publish.c:681
+#: src/fs/gnunet-publish.c:682
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:731
+#: src/fs/gnunet-publish.c:734
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:738
+#: src/fs/gnunet-publish.c:741
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:744
+#: src/fs/gnunet-publish.c:747
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-publish.c:752 src/vpn/gnunet-vpn.c:213
+#: src/fs/gnunet-publish.c:755 src/vpn/gnunet-vpn.c:213
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/fs/gnunet-publish.c:762 src/fs/gnunet-publish.c:769
+#: src/fs/gnunet-publish.c:765 src/fs/gnunet-publish.c:772
 #: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:819
+#: src/fs/gnunet-publish.c:822
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:823
+#: src/fs/gnunet-publish.c:826
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
 #: src/fs/gnunet-publish.c:830
+msgid "set the meta-data for the given TYPE to the given VALUE"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:833
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:835
+#: src/fs/gnunet-publish.c:838
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:843
+#: src/fs/gnunet-publish.c:846
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:849
+#: src/fs/gnunet-publish.c:852
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:853
+#: src/fs/gnunet-publish.c:856
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:857
+#: src/fs/gnunet-publish.c:860
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:873
+#: src/fs/gnunet-publish.c:876
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3036,9 +2996,9 @@
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:640 src/hostlist/gnunet-daemon-hostlist.c:291
-#: src/topology/gnunet-daemon-topology.c:1314
-#: src/topology/gnunet-daemon-topology.c:1321
+#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:293
+#: src/topology/gnunet-daemon-topology.c:1315
+#: src/topology/gnunet-daemon-topology.c:1322
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -3241,26 +3201,26 @@
 msgid "# query messages sent to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_pe.c:482
-msgid "# delay heap timeout"
+#: src/fs/gnunet-service-fs_pe.c:484
+msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:490
+#: src/fs/gnunet-service-fs_pe.c:492
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:550
+#: src/fs/gnunet-service-fs_pe.c:552
 #, fuzzy
 msgid "# requests merged"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pe.c:558
+#: src/fs/gnunet-service-fs_pe.c:560
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# byte mottogs via TCP"
 
-#: src/fs/gnunet-service-fs_pe.c:612 src/fs/gnunet-service-fs_pe.c:696
-#: src/fs/gnunet-service-fs_pe.c:767
+#: src/fs/gnunet-service-fs_pe.c:614 src/fs/gnunet-service-fs_pe.c:698
+#: src/fs/gnunet-service-fs_pe.c:769
 msgid "# query plan entries"
 msgstr ""
 
@@ -3409,191 +3369,228 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:598
+#: src/gns/gns_api.c:385
 #, fuzzy
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr "Misslyckades att ta emot svar till \"%s\" meddelande från gnunetd\n"
 
-#: src/gns/gnunet-dns2gns.c:192
+#: src/gns/gnunet-dns2gns.c:228
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:367
+#: src/gns/gnunet-dns2gns.c:400
 #, fuzzy, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:383
+#: src/gns/gnunet-dns2gns.c:416
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/gns/gnunet-dns2gns.c:391
+#: src/gns/gnunet-dns2gns.c:424
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:681
-msgid "IP of recursive DNS resolver to use (required)"
+#: src/gns/gnunet-dns2gns.c:703
+msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:684
-msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+#: src/gns/gnunet-dns2gns.c:729
+#, fuzzy
+msgid "No DNS server specified!\n"
+msgstr "Inga nyckelord angivna!\n"
+
+#: src/gns/gnunet-dns2gns.c:751
+#, fuzzy
+msgid "No valid GNS zone specified!\n"
+msgstr "Inga nyckelord angivna!\n"
+
+#: src/gns/gnunet-dns2gns.c:772
+msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:687
+#: src/gns/gnunet-dns2gns.c:775
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:690
+#: src/gns/gnunet-dns2gns.c:778
+msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:781
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:703
+#: src/gns/gnunet-dns2gns.c:784
+msgid "Public key of the GNS zone to use (overrides default)"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:797
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:221
+#: src/gns/gnunet-gns.c:205
+#, c-format
+msgid "Please specify name to lookup!\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:285
+#, c-format
+msgid "Ego for `%s' not found, cannot perform lookup.\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:323
+#, c-format
+msgid ""
+"Ego for `master-zone' not found, cannot perform lookup.  Did you run gnunet-"
+"gns-import.sh?\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:352
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:335
+#: src/gns/gnunet-gns.c:365
 #, c-format
-msgid "Please specify lookup, shorten or authority operation!\n"
+msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:356
-#, fuzzy
-msgid "try to shorten a given name"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/gns/gnunet-gns.c:359
+#: src/gns/gnunet-gns.c:414
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:362
-msgid "Get the authority of a particular name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:365
+#: src/gns/gnunet-gns.c:417
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:368
+#: src/gns/gnunet-gns.c:420
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:381
-msgid "GNUnet GNS access tool"
-msgstr ""
+#: src/gns/gnunet-gns.c:423
+#, fuzzy
+msgid "Specify the public key of the zone to lookup the record in"
+msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns-fcfsd.c:451
-#, fuzzy, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
+#: src/gns/gnunet-gns.c:426
+#, fuzzy
+msgid "Specify the name of the ego of the zone to lookup the record in"
+msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns-fcfsd.c:480
+#: src/gns/gnunet-gns.c:439
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "Spåra GNUnets nätverkstopologi."
+
+#: src/gns/gnunet-gns-proxy.c:60 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:960
+#: src/hostlist/hostlist-client.c:965
+#: src/transport/plugin_transport_http_client.c:1068
+#: src/transport/plugin_transport_http_client.c:1083
 #, fuzzy, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:524
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-fcfsd.c:587
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-fcfsd.c:649
+#: src/gns/gnunet-gns-proxy.c:2344
 #, fuzzy, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+msgid "Unable to import private key from file `%s'\n"
+msgstr "Kunde inte skapa användarkonto:"
 
-#: src/gns/gnunet-gns-fcfsd.c:665
+#: src/gns/gnunet-gns-proxy.c:2372
 #, fuzzy, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+msgid "Unable to import certificate %s\n"
+msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-fcfsd.c:701
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-fcfsd.c:709
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-fcfsd.c:913 src/namestore/gnunet-namestore.c:492
+#: src/gns/gnunet-gns-proxy.c:2637 src/namestore/gnunet-namestore-fcfsd.c:958
 #, fuzzy
-msgid "Failed to read or create private zone key\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/gns/gnunet-gns-fcfsd.c:923 src/namestore/gnunet-namestore.c:503
-#, fuzzy
-msgid "Failed to connect to namestore\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/gns/gnunet-gns-fcfsd.c:939 src/gns/gnunet-gns-proxy.c:2857
-#, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:973
-msgid "GNUnet GNS first come first serve registration service"
+#: src/gns/gnunet-gns-proxy.c:3020
+msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2494
-#, fuzzy, c-format
-msgid "Unable to import private key from file `%s'\n"
-msgstr "Kunde inte skapa användarkonto:"
+#: src/gns/gnunet-gns-proxy.c:3060
+msgid "No ego configured for `master-zone`\n"
+msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2522
+#: src/gns/gnunet-gns-proxy.c:3120
 #, fuzzy, c-format
-msgid "Unable to import certificate %s\n"
-msgstr "Kunde inte spara konfigurationsfil \"%s\":"
+msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-proxy.c:3510
+#: src/gns/gnunet-gns-proxy.c:3156
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3513
+#: src/gns/gnunet-gns-proxy.c:3159
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3525
+#: src/gns/gnunet-gns-proxy.c:3178
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:497
-#, c-format
-msgid "Records for name `%s' in zone %s too large to fit into DHT"
-msgstr ""
-
-#: src/gns/gnunet-service-gns.c:1225
+#: src/gns/gnunet-service-gns.c:649
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:1286
+#: src/gns/gnunet-service-gns.c:692
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-service-gns.c:1297
+#: src/gns/gnunet-service-gns.c:708
 #, fuzzy
-msgid "Unable to initialize resolver!\n"
-msgstr "Kunde inte initiera SQLite.\n"
+msgid "valid public key required"
+msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:3446
+#: src/gns/gnunet-service-gns_interceptor.c:201
+msgid "Error converting GNS response to DNS response!\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_interceptor.c:307
+#, fuzzy
+msgid "Failed to connect to the DNS service!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:717
+#, fuzzy
+msgid "Failed to parse DNS response\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:843
 #, c-format
-msgid "Not a GADS TLD: `%s'\n"
+msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
+#: src/gns/gnunet-service-gns_resolver.c:1475
+#, c-format
+msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1499
+msgid "GNS lookup recursion failed (no delegation record found)\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1523
+#, fuzzy, c-format
+msgid "Failed to cache GNS resolution: %s\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:1782
+#, c-format
+msgid "Hostname `%s' is not well-formed, resolution fails\n"
+msgstr ""
+
 #: src/hello/gnunet-hello.c:123
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3633,66 +3630,66 @@
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:945
+#: src/hello/hello.c:947
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:954
+#: src/hello/hello.c:956
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Kunde inte spara konfiguration!"
 
-#: src/hello/hello.c:964
+#: src/hello/hello.c:966
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hello/hello.c:974
+#: src/hello/hello.c:976
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hello/hello.c:991
+#: src/hello/hello.c:993
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:1000
+#: src/hello/hello.c:1002
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1019
+#: src/hello/hello.c:1021
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:258
+#: src/hostlist/gnunet-daemon-hostlist.c:260
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:311
+#: src/hostlist/gnunet-daemon-hostlist.c:313
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:318
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:319
+#: src/hostlist/gnunet-daemon-hostlist.c:321
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:323
+#: src/hostlist/gnunet-daemon-hostlist.c:325
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:338
+#: src/hostlist/gnunet-daemon-hostlist.c:340
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -3713,17 +3710,7 @@
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: 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:960 src/hostlist/hostlist-client.c:965
-#: src/transport/plugin_transport_http_client.c:1063
-#: src/transport/plugin_transport_http_client.c:1078
-#, fuzzy, c-format
-msgid "%s failed at %s:%d: `%s'\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
-
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1319
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1330
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -3775,78 +3762,78 @@
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1503
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045
+#: src/hostlist/hostlist-client.c:1046
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1105 src/hostlist/hostlist-client.c:1121
+#: src/hostlist/hostlist-client.c:1106 src/hostlist/hostlist-client.c:1122
 #, fuzzy
 msgid "# active connections"
 msgstr "Nätverksanslutning"
 
-#: src/hostlist/hostlist-client.c:1267
+#: src/hostlist/hostlist-client.c:1278
 #, 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:1271
+#: src/hostlist/hostlist-client.c:1282
 #, fuzzy, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/hostlist/hostlist-client.c:1282
+#: src/hostlist/hostlist-client.c:1293
 #, 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:1315
+#: src/hostlist/hostlist-client.c:1326
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1317
+#: src/hostlist/hostlist-client.c:1328
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1362
+#: src/hostlist/hostlist-client.c:1373
 #, 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:1367
+#: src/hostlist/hostlist-client.c:1378
 #, 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:1391 src/hostlist/hostlist-client.c:1408
+#: src/hostlist/hostlist-client.c:1402 src/hostlist/hostlist-client.c:1419
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1403
+#: src/hostlist/hostlist-client.c:1414
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1457
+#: src/hostlist/hostlist-client.c:1468
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1469
+#: src/hostlist/hostlist-client.c:1480
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1481
+#: src/hostlist/hostlist-client.c:1492
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1485
+#: src/hostlist/hostlist-client.c:1496
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
@@ -3920,7 +3907,7 @@
 msgstr ""
 
 #: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:659
-#: src/transport/gnunet-service-transport.c:785
+#: src/transport/gnunet-service-transport.c:806
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
@@ -3945,99 +3932,114 @@
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/hostlist-server.c:675
+#: src/hostlist/hostlist-server.c:676
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:135
+#: src/identity/gnunet-identity.c:165
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/identity/gnunet-identity.c:237
+#: src/identity/gnunet-identity.c:184
+#, fuzzy, c-format
+msgid "Failed to set default ego: %s\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#: src/identity/gnunet-identity.c:327
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:240
+#: src/identity/gnunet-identity.c:330
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:243
+#: src/identity/gnunet-identity.c:333
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:246
+#: src/identity/gnunet-identity.c:336
+msgid ""
+"set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:339
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:255
+#: src/identity/gnunet-identity.c:342
+msgid ""
+"set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:351
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:336
+#: src/identity/gnunet-service-identity.c:337
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:357
+#: src/identity/gnunet-service-identity.c:360
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:434
-#: src/identity/gnunet-service-identity.c:665
-#: src/identity/gnunet-service-identity.c:773
+#: src/identity/gnunet-service-identity.c:437
+#: src/identity/gnunet-service-identity.c:668
+#: src/identity/gnunet-service-identity.c:776
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/gnunet-service-identity.c:441
+#: src/identity/gnunet-service-identity.c:444
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:511
+#: src/identity/gnunet-service-identity.c:514
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:642
+#: src/identity/gnunet-service-identity.c:645
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:681
-#: src/identity/gnunet-service-identity.c:790
+#: src/identity/gnunet-service-identity.c:684
+#: src/identity/gnunet-service-identity.c:793
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:824
+#: src/identity/gnunet-service-identity.c:827
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/gnunet-service-identity.c:897
+#: src/identity/gnunet-service-identity.c:900
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/identity/gnunet-service-identity.c:909
+#: src/identity/gnunet-service-identity.c:912
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/integration-tests/connection_watchdog.c:990
+#: src/integration-tests/connection_watchdog.c:998
 #, fuzzy, c-format
 msgid "Transport plugin: `%s' port %llu\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/integration-tests/connection_watchdog.c:1023
+#: src/integration-tests/connection_watchdog.c:1031
 #, fuzzy, c-format
 msgid "Found %u transport plugins: `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/integration-tests/connection_watchdog.c:1082
+#: src/integration-tests/connection_watchdog.c:1091
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1091
-#: src/template/gnunet-template.c:70
+#: src/integration-tests/connection_watchdog.c:1100
+#: src/multicast/gnunet-multicast.c:70 src/template/gnunet-template.c:70
 #, fuzzy
 msgid "help text"
 msgstr "hjälptext för -t"
@@ -4057,25 +4059,22 @@
 msgid "Print information about mesh tunnels and peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/mesh/gnunet-service-mesh.c:5640
+#: src/mesh/gnunet-service-mesh.c:5634 src/mesh/gnunet-service-mesh-enc.c:7060
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:5780 src/mesh/gnunet-service-mesh.c:5792
-#: src/mesh/gnunet-service-mesh.c:5804 src/mesh/gnunet-service-mesh.c:5816
-#: src/mesh/gnunet-service-mesh.c:5828 src/mesh/gnunet-service-mesh.c:5840
-#: src/nse/gnunet-service-nse.c:1425 src/nse/gnunet-service-nse.c:1443
+#: src/mesh/gnunet-service-mesh.c:5774 src/mesh/gnunet-service-mesh.c:5786
+#: src/mesh/gnunet-service-mesh.c:5798 src/mesh/gnunet-service-mesh.c:5810
+#: src/mesh/gnunet-service-mesh.c:5822 src/mesh/gnunet-service-mesh.c:5834
+#: src/nse/gnunet-service-nse.c:1440 src/nse/gnunet-service-nse.c:1458
 #: src/regex/gnunet-daemon-regexprofiler.c:270
-#: src/regex/gnunet-daemon-regexprofiler.c:282
-#: src/regex/gnunet-daemon-regexprofiler.c:294
-#: src/regex/gnunet-daemon-regexprofiler.c:307
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:5852 src/mesh/gnunet-service-mesh.c:5862
-#: src/mesh/gnunet-service-mesh.c:5887
+#: src/mesh/gnunet-service-mesh.c:5846 src/mesh/gnunet-service-mesh.c:5856
+#: src/mesh/gnunet-service-mesh.c:5881
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -4091,204 +4090,236 @@
 msgid "Could not access file `%s': %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/namestore/gnunet-namestore.c:250
+#: src/namestore/gnunet-namestore.c:258
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:281
+#: src/namestore/gnunet-namestore.c:289
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/namestore/gnunet-namestore.c:342
+#: src/namestore/gnunet-namestore.c:338
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:358
-msgid "for at least"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:359
-msgid "until"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:475
-#, fuzzy, c-format
-msgid "Using default zone file `%s'\n"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/namestore/gnunet-namestore.c:484
+#: src/namestore/gnunet-namestore.c:446
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:513 src/namestore/gnunet-namestore.c:522
-#: src/namestore/gnunet-namestore.c:539 src/namestore/gnunet-namestore.c:561
-#: src/namestore/gnunet-namestore.c:605
+#: src/namestore/gnunet-namestore.c:456
+#: src/namestore/gnunet-namestore-fcfsd.c:992
+#, fuzzy
+msgid "Failed to connect to namestore\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/namestore/gnunet-namestore.c:464 src/namestore/gnunet-namestore.c:473
+#: src/namestore/gnunet-namestore.c:490 src/namestore/gnunet-namestore.c:512
+#: src/namestore/gnunet-namestore.c:554
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore.c:514 src/namestore/gnunet-namestore.c:523
-#: src/namestore/gnunet-namestore.c:540 src/namestore/gnunet-namestore.c:562
+#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:474
+#: src/namestore/gnunet-namestore.c:491 src/namestore/gnunet-namestore.c:513
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:531
+#: src/namestore/gnunet-namestore.c:482
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore.c:551
+#: src/namestore/gnunet-namestore.c:502
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
 
-#: src/namestore/gnunet-namestore.c:587
+#: src/namestore/gnunet-namestore.c:538
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:606
+#: src/namestore/gnunet-namestore.c:555
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:649
+#: src/namestore/gnunet-namestore.c:588
 #: src/peerinfo-tool/gnunet-peerinfo.c:711
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:727
+#: src/namestore/gnunet-namestore.c:645
+#, fuzzy, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr "\"%s\": okänd tjänst: %s\n"
+
+#: src/namestore/gnunet-namestore.c:674
+#, fuzzy, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "anger vilken TRANSPORT som ska testas"
+
+#: src/namestore/gnunet-namestore.c:702
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:730
+#: src/namestore/gnunet-namestore.c:705
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:733
+#: src/namestore/gnunet-namestore.c:708
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:736
+#: src/namestore/gnunet-namestore.c:711
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:739
+#: src/namestore/gnunet-namestore.c:714
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:742
+#: src/namestore/gnunet-namestore.c:717
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:745
+#: src/namestore/gnunet-namestore.c:720
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:748
+#: src/namestore/gnunet-namestore.c:723
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:751
+#: src/namestore/gnunet-namestore.c:726
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:754
+#: src/namestore/gnunet-namestore.c:729
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:757
-msgid "create or list non-authority record"
+#: src/namestore/gnunet-namestore.c:732
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:760
-msgid "filename with the zone key"
-msgstr ""
+#: src/namestore/gnunet-namestore.c:735
+#, fuzzy
+msgid "name of the ego controlling the zone"
+msgstr "Visa värde av alternativet"
 
-#: src/namestore/gnunet-namestore.c:771
+#: src/namestore/gnunet-namestore.c:746
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
 
-#: src/namestore/gnunet-service-namestore.c:300
-#: src/namestore/gnunet-service-namestore.c:318
+#: src/namestore/gnunet-namestore-fcfsd.c:456
 #, fuzzy, c-format
-msgid "Failed to write zone key to file `%s': %s\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+msgid "Unsupported form value `%s'\n"
+msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-service-namestore.c:302
-msgid "file exists but reading key failed"
+#: src/namestore/gnunet-namestore-fcfsd.c:485
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:320
-msgid "file exists with different key"
+#: src/namestore/gnunet-namestore-fcfsd.c:560
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:2127
-#, fuzzy
-msgid "No directory to load zonefiles specified in configuration\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:670
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/namestore/gnunet-service-namestore.c:2137
-#, c-format
-msgid "Creating directory `%s' for zone files failed!\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:686
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:722
+msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:346
-msgid "Namestore failed to add record"
+#: src/namestore/gnunet-namestore-fcfsd.c:730
+msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:372
-msgid "Namestore failed to add record\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:932
+msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/namestore_api_common.c:532
-#: src/namestore/namestore_api_common.c:672
+#: src/namestore/gnunet-namestore-fcfsd.c:1027
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:674
+msgid "Failed to cache encrypted block of my own zone!\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:319
+msgid "Namestore failed to cache block"
+msgstr ""
+
+#: src/namestore/namestore_api.c:345
+msgid "Namestore failed to store record\n"
+msgstr ""
+
+#: src/namestore/namestore_api_common.c:691
+#: src/namestore/namestore_api_common.c:831
 #, fuzzy, c-format
 msgid "Unsupported record type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/namestore_api_common.c:539
+#: src/namestore/namestore_api_common.c:698
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/namestore/namestore_api_common.c:562
+#: src/namestore/namestore_api_common.c:721
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/namestore_api_common.c:585
+#: src/namestore/namestore_api_common.c:744
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/namestore_api_common.c:603
+#: src/namestore/namestore_api_common.c:762
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/namestore/namestore_api_common.c:616
+#: src/namestore/namestore_api_common.c:775
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/namestore_api_common.c:637
+#: src/namestore/namestore_api_common.c:796
 #, 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_api_common.c:663
+#: src/namestore/namestore_api_common.c:822
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -4411,42 +4442,42 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:884
+#: src/nse/gnunet-nse-profiler.c:889
 #, 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:887
+#: src/nse/gnunet-nse-profiler.c:892
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:890 src/testbed/gnunet-testbed-profiler.c:284
+#: src/nse/gnunet-nse-profiler.c:895 src/testbed/gnunet-testbed-profiler.c:287
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:893
+#: src/nse/gnunet-nse-profiler.c:898
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:896
+#: src/nse/gnunet-nse-profiler.c:901
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:902
+#: src/nse/gnunet-nse-profiler.c:907
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:911
+#: src/nse/gnunet-nse-profiler.c:916
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:1433
+#: src/nse/gnunet-service-nse.c:1448
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/nse/gnunet-service-nse.c:1472
+#: src/nse/gnunet-service-nse.c:1487
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -4455,42 +4486,42 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Tillgängliga transport(er): %s\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:355
+#: src/peerinfo/gnunet-service-peerinfo.c:353
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:372
+#: src/peerinfo/gnunet-service-peerinfo.c:370
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s %u \n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:450
+#: src/peerinfo/gnunet-service-peerinfo.c:448
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:486
+#: src/peerinfo/gnunet-service-peerinfo.c:484
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:639
+#: src/peerinfo/gnunet-service-peerinfo.c:637
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:644
+#: src/peerinfo/gnunet-service-peerinfo.c:642
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:979
+#: src/peerinfo/gnunet-service-peerinfo.c:975
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1269
+#: src/peerinfo/gnunet-service-peerinfo.c:1265
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -4641,6 +4672,116 @@
 msgid "Unable to initialize Postgres: %s"
 msgstr "Kunde inte initiera SQLite.\n"
 
+#: src/psycstore/gnunet-service-psycstore.c:203
+#, fuzzy
+msgid "Failed to store membership information!\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:227
+#, fuzzy
+msgid "Failed to test membership!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:249
+#, fuzzy
+msgid "Failed to store fragment!\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:275
+#, fuzzy
+msgid "Failed to get fragment!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:302
+#, fuzzy
+msgid "Failed to get message!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:331
+#, fuzzy
+msgid "Failed to get message fragment!\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:357
+#, fuzzy
+msgid "Failed to get master counters!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:395
+#, fuzzy
+msgid "Failed to get slave counters!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:429
+#: src/psycstore/gnunet-service-psycstore.c:502
+msgid "Tried to set invalid state variable name!\n"
+msgstr ""
+
+#: src/psycstore/gnunet-service-psycstore.c:445
+#, fuzzy
+msgid "Failed to begin modifying state!\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:468
+#, fuzzy, c-format
+msgid "Unknown operator: %c\n"
+msgstr "Okänd operation \"%s\"\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:478
+#, fuzzy
+msgid "Failed to end modifying state!\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:516
+#, fuzzy
+msgid "Failed to begin synchronizing state!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:532
+#, fuzzy
+msgid "Failed to end synchronizing state!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:552
+#: src/psycstore/gnunet-service-psycstore.c:571
+#, fuzzy
+msgid "Failed to reset state!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:594
+#: src/psycstore/gnunet-service-psycstore.c:645
+msgid "Tried to get invalid state variable name!\n"
+msgstr ""
+
+#: src/psycstore/gnunet-service-psycstore.c:621
+#: src/psycstore/gnunet-service-psycstore.c:660
+#, fuzzy
+msgid "Failed to get state variable!\n"
+msgstr "Kunde inte skapa värdnyckel!\n"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:60
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d with error: %s (%d)\n"
+msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:253
+#, fuzzy, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:276
+#, fuzzy, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr "Fel vid skapandet av användare"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:1796
+msgid "SQLite database running\n"
+msgstr ""
+
 #: src/pt/gnunet-daemon-pt.c:266
 #, fuzzy
 msgid "Failed to pack DNS request.  Dropping.\n"
@@ -4707,70 +4848,70 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:384
+#: src/regex/gnunet-daemon-regexprofiler.c:380
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1279
+#: src/regex/gnunet-regex-profiler.c:1281
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "använd konfigurationsfil FILNAMN"
 
-#: src/regex/gnunet-regex-profiler.c:1290
+#: src/regex/gnunet-regex-profiler.c:1292
 #, fuzzy
 msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1319
+#: src/regex/gnunet-regex-profiler.c:1321
 #: 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:1325
+#: src/regex/gnunet-regex-profiler.c:1327
 #: 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:1332
+#: src/regex/gnunet-regex-profiler.c:1334
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1341
+#: src/regex/gnunet-regex-profiler.c:1343
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1361
+#: src/regex/gnunet-regex-profiler.c:1363
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1443
+#: src/regex/gnunet-regex-profiler.c:1445
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1446
+#: src/regex/gnunet-regex-profiler.c:1448
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1449
+#: src/regex/gnunet-regex-profiler.c:1451
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1452
+#: src/regex/gnunet-regex-profiler.c:1454
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1455
+#: src/regex/gnunet-regex-profiler.c:1457
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Visa värde av alternativet"
 
-#: src/regex/gnunet-regex-profiler.c:1467
+#: src/regex/gnunet-regex-profiler.c:1469
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4787,6 +4928,239 @@
 msgid "Profiler for regex library"
 msgstr ""
 
+#: src/scalarproduct/gnunet-scalarproduct.c:195
+#, fuzzy
+msgid "You must specify at least one message ID to check!\n"
+msgstr "Du måste ange en lista av filer att lägga in.\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:201
+msgid "This program needs a session identifier for comparing vectors.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:207
+msgid "Please give a session key for --input_key!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:216
+#, c-format
+msgid ""
+"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
+"valid peer identifier.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:240
+#: src/scalarproduct/gnunet-scalarproduct.c:298
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int32_t.\n"
+msgstr "Kunde inte ansluta till gnunetd.\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:247
+msgid "Need elements to compute the vectorproduct, got none.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:348
+msgid ""
+"A comma separated list of elements to compare as vector with our remote peer."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:351
+msgid ""
+"A comma separated mask to select which elements should actually be compared."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:354
+msgid ""
+"[Optional] peer to calculate our scalarproduct with. If this parameter is "
+"not given, the service will wait for a remote peer to compute the request."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:357
+msgid "Transaction ID shared with peer."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:366
+msgid "Calculate the Vectorproduct with a GNUnet peer."
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:381
+#, c-format
+msgid "Generated key set with key length %d bits.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:691
+#, fuzzy, c-format
+msgid "Client (%p) disconnected from us.\n"
+msgstr "\"%s\" ansluten till \"%s\".\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:762
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1696
+#, fuzzy, c-format
+msgid "Could not send message to client (%p)!\n"
+msgstr "Kunde inte skicka begäran till gnunetd.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:768
+#, c-format
+msgid "Sending session-end notification to client (%p) for session %s\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:891
+msgid "Message too large, fragmentation is currently not supported!)\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:896
+msgid "Could not send service-response message via mesh!)\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1092
+#, c-format
+msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1145
+#, fuzzy, c-format
+msgid "Successfully created new tunnel to peer (%s)!\n"
+msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1157
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1873
+msgid "Message too large, fragmentation is currently not supported!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1223
+#, fuzzy
+msgid "Transmitting service request.\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1233
+#, fuzzy
+msgid "Could not send mutlicast message to tunnel!\n"
+msgstr "Kunde inte skicka begäran till gnunetd.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1283
+#, fuzzy
+msgid "Too short message received from client!\n"
+msgstr "Meddelande mottaget från klient är ogiltig.\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1297
+#, fuzzy
+msgid "Invalid message received from client, session information incorrect!\n"
+msgstr "Ogiltigt meddelande mottogs den %s:%d."
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1309
+#, c-format
+msgid ""
+"Duplicate session information received, cannot create new session with key `"
+"%s'\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1330
+#, c-format
+msgid ""
+"Got client-request-session with key %s, preparing tunnel to remote service.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1369
+#, c-format
+msgid "Creating new tunnel to for session with key %s.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1417
+#, c-format
+msgid ""
+"Got client-responder-session with key %s and a matching service-request-"
+"session set, processing.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1425
+#, c-format
+msgid ""
+"Got client-responder-session with key %s but NO matching service-request-"
+"session set, queuing element for later use.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
+#, c-format
+msgid "Peer disconnected, terminating session %s with peer (%s)\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1706
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1790
+#, c-format
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1813
+msgid "Could not translate remote public key to sexpression!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1849
+#, fuzzy, c-format
+msgid ""
+"Could not translate E[a%d] to MPI!\n"
+"%s/%s\n"
+msgstr "Kunde inte köra \"%s\": %s\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1857
+#, c-format
+msgid "Got session with key %s and a matching element set, processing.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1866
+#, c-format
+msgid "Got session with key %s without a matching element set, queueing.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2039
+msgid "Shutting down, initiating cleanup.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+msgid "Generating Paillier-Keyset.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2116
+#, fuzzy
+msgid "Connect to MESH failed\n"
+msgstr " Anslutning misslyckades (fel?)\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2120
+#, fuzzy
+msgid "Mesh initialized\n"
+msgstr " Anslutning misslyckades\n"
+
+#: src/scalarproduct/scalarproduct_api.c:243
+#, fuzzy
+msgid "# SUC responder result messages received"
+msgstr "# krypterade PONG-meddelanden mottagna"
+
+#: src/scalarproduct/scalarproduct_api.c:297
+#, fuzzy
+msgid "# bytes sent to scalarproduct"
+msgstr "# byte krypterade"
+
+#: src/scalarproduct/scalarproduct_api.c:340
+#: src/scalarproduct/scalarproduct_api.c:433
+#, fuzzy
+msgid "Failed to connect to the scalarproduct service\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/scalarproduct/scalarproduct_api.c:348
+#: src/scalarproduct/scalarproduct_api.c:441
+#, fuzzy
+msgid "Failed to send a message to the statistics service\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/scalarproduct/scalarproduct_api.c:382
+#: src/scalarproduct/scalarproduct_api.c:478
+#, fuzzy
+msgid "Failed to send a message to the scalarproduct service\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
 #: src/set/gnunet-set-ibf-profiler.c:224
 #, fuzzy
 msgid "number of element in set A-B"
@@ -4823,78 +5197,83 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-statistics.c:141
+#: src/statistics/gnunet-statistics.c:142
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:143
+#: src/statistics/gnunet-statistics.c:144
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:186
+#: src/statistics/gnunet-statistics.c:191
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:192
+#: src/statistics/gnunet-statistics.c:197
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:223
+#: src/statistics/gnunet-statistics.c:228
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:231
+#: src/statistics/gnunet-statistics.c:236
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/statistics/gnunet-statistics.c:258
+#: src/statistics/gnunet-statistics.c:263
 #, fuzzy, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/statistics/gnunet-statistics.c:266
+#: src/statistics/gnunet-statistics.c:271
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/statistics/gnunet-statistics.c:273
+#: src/statistics/gnunet-statistics.c:278
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:331
+#: src/statistics/gnunet-statistics.c:310
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Ogiltigt argument: \"%s\"\n"
+
+#: src/statistics/gnunet-statistics.c:336
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:334
+#: src/statistics/gnunet-statistics.c:339
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:337
+#: src/statistics/gnunet-statistics.c:342
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:345
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:343
+#: src/statistics/gnunet-statistics.c:348
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:351
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:354
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:361
+#: src/statistics/gnunet-statistics.c:366
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
@@ -4909,27 +5288,22 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/sysmon/gnunet-service-sysmon.c:546
-#, c-format
-msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
-msgstr ""
-
 #: src/testbed/gnunet-service-testbed_cpustatus.c:727
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:964
+#: src/testbed/gnunet-service-testbed_peers.c:973
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:970
+#: src/testbed/gnunet-service-testbed_peers.c:979
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1008
+#: src/testbed/gnunet-service-testbed_peers.c:1017
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
@@ -4949,230 +5323,244 @@
 msgid "Spawning process `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:251
+#: src/testbed/gnunet-testbed-profiler.c:254
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:277
+#: src/testbed/gnunet-testbed-profiler.c:280
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:280
+#: src/testbed/gnunet-testbed-profiler.c:283
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:459
+#: src/testbed/testbed_api_hosts.c:415
 #, fuzzy, c-format
 msgid "Hosts file %s not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/testbed/testbed_api_hosts.c:467
+#: src/testbed/testbed_api_hosts.c:423
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:474
+#: src/testbed/testbed_api_hosts.c:430
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:595
+#: src/testbed/testbed_api_hosts.c:570
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1878
+#: src/testbed/testbed_api_hosts.c:1572
 #, 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:802
+#: src/testbed/testbed_api_testbed.c:820
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:944
+#: src/testbed/testbed_api_testbed.c:989
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1009
+#: src/testbed/testbed_api_testbed.c:1055
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1111
+#: src/testbed/testbed_api_testbed.c:1144
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1115
+#: src/testbed/testbed_api_testbed.c:1148
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1153
+#: src/testbed/testbed_api_testbed.c:1186
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1171
+#: src/testbed/testbed_api_testbed.c:1204
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1231
+#: src/testbed/testbed_api_testbed.c:1264
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1243
+#: src/testbed/testbed_api_testbed.c:1276
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1267
+#: src/testbed/testbed_api_testbed.c:1300
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:670
+#: src/testbed/testbed_api_testbed.c:1350
+#, c-format
+msgid ""
+"Maximum number of edges a peer can have in a scale free topology cannot be "
+"more than %u.  Given `%s = %llu'"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1366
+#, c-format
+msgid ""
+"The number of edges that can established when adding a new node to scale "
+"free topology cannot be more than %u.  Given `%s = %llu'"
+msgstr ""
+
+#: src/testbed/testbed_api_topology.c:716
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/testbed/testbed_api_topology.c:676
+#: src/testbed/testbed_api_topology.c:722
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:683
+#: src/testbed/testbed_api_topology.c:729
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:706
+#: src/testbed/testbed_api_topology.c:751
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/testbed/testbed_api_topology.c:715
-#: src/testbed/testbed_api_topology.c:739
+#: src/testbed/testbed_api_topology.c:760
+#: src/testbed/testbed_api_topology.c:784
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:721
-#: src/testbed/testbed_api_topology.c:745
+#: src/testbed/testbed_api_topology.c:766
+#: src/testbed/testbed_api_topology.c:790
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/testbed/testbed_api_topology.c:727
-#: src/testbed/testbed_api_topology.c:751
+#: src/testbed/testbed_api_topology.c:772
+#: src/testbed/testbed_api_topology.c:796
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:766
+#: src/testbed/testbed_api_topology.c:811
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/testing/gnunet-testing.c:130
+#: src/testing/gnunet-testing.c:173
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/gnunet-testing.c:199
+#: src/testing/gnunet-testing.c:258
+#, c-format
+msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+msgstr ""
+
+#: src/testing/gnunet-testing.c:355
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/testing/gnunet-testing.c:201
+#: src/testing/gnunet-testing.c:357
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:203
+#: src/testing/gnunet-testing.c:359
 #, 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:205
+#: src/testing/gnunet-testing.c:361
 #, fuzzy
 msgid "configuration template"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/testing/gnunet-testing.c:214
-msgid "Command line tool to access the testing library"
+#: src/testing/gnunet-testing.c:363
+msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing-run-service.c:129
-#, c-format
-msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+#: src/testing/gnunet-testing.c:376
+msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/gnunet-testing-run-service.c:186
-#, fuzzy
-msgid "name of the template configuration file to use (optional)"
-msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
-
-#: src/testing/gnunet-testing-run-service.c:189
-msgid "name of the service to run"
-msgstr ""
-
-#: src/testing/testing.c:288
+#: src/testing/testing.c:276
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:304
+#: src/testing/testing.c:292
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:722
+#: src/testing/testing.c:711
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/testing/testing.c:733
+#: src/testing/testing.c:722
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/testing/testing.c:1177
-#, fuzzy
-msgid "Failed to create configuration for peer (not enough free ports?)\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
-
-#: src/testing/testing.c:1184
+#: src/testing/testing.c:1158
 #, 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:1193
+#: src/testing/testing.c:1167
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/testing/testing.c:1209
+#: src/testing/testing.c:1177
+#, fuzzy
+msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
+msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#: src/testing/testing.c:1190
+#, fuzzy
+msgid "Failed to create configuration for peer (not enough free ports?)\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#: src/testing/testing.c:1204
 #, fuzzy, c-format
-msgid "Cannot open hostkey file: %s\n"
+msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/testing/testing.c:1219
+#: src/testing/testing.c:1216
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/testing/testing.c:1241
+#: src/testing/testing.c:1238
 #, 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:1341
+#: src/testing/testing.c:1338
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/testing/testing.c:1707
+#: src/testing/testing.c:1702
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -5192,78 +5580,78 @@
 msgid "# friends connected"
 msgstr "# av anslutna parter"
 
-#: src/topology/gnunet-daemon-topology.c:987
+#: src/topology/gnunet-daemon-topology.c:986
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1030
+#: src/topology/gnunet-daemon-topology.c:1031
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1036
+#: src/topology/gnunet-daemon-topology.c:1037
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1045
+#: src/topology/gnunet-daemon-topology.c:1046
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1053
+#: src/topology/gnunet-daemon-topology.c:1054
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/topology/gnunet-daemon-topology.c:1073
+#: src/topology/gnunet-daemon-topology.c:1074
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1086
+#: src/topology/gnunet-daemon-topology.c:1087
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1096
+#: src/topology/gnunet-daemon-topology.c:1097
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1102
+#: src/topology/gnunet-daemon-topology.c:1103
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1112
+#: src/topology/gnunet-daemon-topology.c:1113
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1118
+#: src/topology/gnunet-daemon-topology.c:1119
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1125
+#: src/topology/gnunet-daemon-topology.c:1126
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1156
+#: src/topology/gnunet-daemon-topology.c:1157
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/topology/gnunet-daemon-topology.c:1211
+#: src/topology/gnunet-daemon-topology.c:1212
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1350
+#: src/topology/gnunet-daemon-topology.c:1351
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -5278,21 +5666,21 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:453
-#: src/transport/gnunet-service-transport_blacklist.c:718
+#: src/transport/gnunet-service-transport_blacklist.c:717
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:169
+#: src/transport/gnunet-service-transport.c:168
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport.c:235
+#: src/transport/gnunet-service-transport.c:234
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# byte krypterade"
 
-#: src/transport/gnunet-service-transport.c:282
+#: src/transport/gnunet-service-transport.c:281
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
@@ -5309,7 +5697,7 @@
 "`%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:754
+#: src/transport/gnunet-service-transport.c:775
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5346,7 +5734,7 @@
 msgstr "# krypterade PONG-meddelanden mottagna"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1346
-#: src/transport/gnunet-service-transport_neighbours.c:1678
+#: src/transport/gnunet-service-transport_neighbours.c:1681
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
@@ -5389,66 +5777,66 @@
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1584
+#: src/transport/gnunet-service-transport_neighbours.c:1586
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1618
+#: src/transport/gnunet-service-transport_neighbours.c:1620
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1634
+#: src/transport/gnunet-service-transport_neighbours.c:1636
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2769
+#: src/transport/gnunet-service-transport_neighbours.c:2775
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2784
-#: src/transport/gnunet-service-transport_neighbours.c:2815
+#: src/transport/gnunet-service-transport_neighbours.c:2790
+#: src/transport/gnunet-service-transport_neighbours.c:2821
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2828
+#: src/transport/gnunet-service-transport_neighbours.c:2834
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2859
+#: src/transport/gnunet-service-transport_neighbours.c:2865
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "skicka ANTAL meddelanden"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3040
+#: src/transport/gnunet-service-transport_neighbours.c:3046
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# krypterade PONG-meddelanden skickade"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3093
+#: src/transport/gnunet-service-transport_neighbours.c:3099
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
+#: src/transport/gnunet-service-transport_neighbours.c:3113
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3144
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3149
+#: src/transport/gnunet-service-transport_neighbours.c:3155
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3194
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3283
+#: src/transport/gnunet-service-transport_neighbours.c:3289
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# av anslutna parter"
@@ -5490,50 +5878,50 @@
 msgid "# PING without HELLO messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/transport/gnunet-service-transport_validation.c:664
+#: src/transport/gnunet-service-transport_validation.c:660
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:930
+#: src/transport/gnunet-service-transport_validation.c:928
 #, fuzzy
 msgid "# PING message for different peer received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/gnunet-service-transport_validation.c:989
+#: src/transport/gnunet-service-transport_validation.c:987
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:999
+#: src/transport/gnunet-service-transport_validation.c:997
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1018
+#: src/transport/gnunet-service-transport_validation.c:1016
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1072
+#: src/transport/gnunet-service-transport_validation.c:1070
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1117
+#: src/transport/gnunet-service-transport_validation.c:1115
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1126
+#: src/transport/gnunet-service-transport_validation.c:1124
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1253
+#: src/transport/gnunet-service-transport_validation.c:1251
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1268
+#: src/transport/gnunet-service-transport_validation.c:1266
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1374
+#: src/transport/gnunet-service-transport_validation.c:1372
 #, fuzzy, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
@@ -5766,41 +6154,41 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:815
-#: src/transport/plugin_transport_http_server.c:2585
+#: src/transport/plugin_transport_http_server.c:2614
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:864
-#: src/transport/plugin_transport_http_server.c:2353
+#: src/transport/plugin_transport_http_server.c:2382
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
 #: src/transport/plugin_transport_http.c:896
-#: src/transport/plugin_transport_http_server.c:2385 src/util/service.c:1062
+#: src/transport/plugin_transport_http_server.c:2414 src/util/service.c:1062
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
 #: src/transport/plugin_transport_http.c:913
-#: src/transport/plugin_transport_http_server.c:2402 src/util/service.c:1079
+#: src/transport/plugin_transport_http_server.c:2431 src/util/service.c:1079
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
 #: src/transport/plugin_transport_http.c:1018
-#: src/transport/plugin_transport_http_server.c:2513
+#: src/transport/plugin_transport_http_server.c:2542
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1131
-#: src/transport/plugin_transport_http_server.c:2693
+#: src/transport/plugin_transport_http_server.c:2722
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1144
-#: src/transport/plugin_transport_http_server.c:2704
+#: src/transport/plugin_transport_http_server.c:2733
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
@@ -5824,7 +6212,7 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2819
+#: src/transport/plugin_transport_http_server.c:2848
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Startade samling \"%s\".\n"
@@ -5833,98 +6221,98 @@
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1582
+#: src/transport/plugin_transport_http_client.c:1587
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1713
-#: src/transport/plugin_transport_http_server.c:2943
+#: src/transport/plugin_transport_http_client.c:1724
+#: src/transport/plugin_transport_http_server.c:2978
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_client.c:1738
-#: src/transport/plugin_transport_http_server.c:3003
+#: src/transport/plugin_transport_http_client.c:1749
+#: src/transport/plugin_transport_http_server.c:3038
 #, 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:1766
-#: src/transport/plugin_transport_http_server.c:2849
+#: src/transport/plugin_transport_http_client.c:1777
+#: src/transport/plugin_transport_http_server.c:2878
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/transport/plugin_transport_http_server.c:1368
+#: src/transport/plugin_transport_http_server.c:1379
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1632
+#: src/transport/plugin_transport_http_server.c:1644
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1640
+#: src/transport/plugin_transport_http_server.c:1652
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1941
+#: src/transport/plugin_transport_http_server.c:1953
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1965
+#: src/transport/plugin_transport_http_server.c:1977
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2672
+#: src/transport/plugin_transport_http_server.c:2701
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2686
+#: src/transport/plugin_transport_http_server.c:2715
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2711
+#: src/transport/plugin_transport_http_server.c:2740
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2726
+#: src/transport/plugin_transport_http_server.c:2755
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2736
+#: src/transport/plugin_transport_http_server.c:2765
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2757
+#: src/transport/plugin_transport_http_server.c:2786
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2767
+#: src/transport/plugin_transport_http_server.c:2796
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_http_server.c:2835
+#: src/transport/plugin_transport_http_server.c:2864
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
@@ -5977,92 +6365,92 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:627
+#: src/transport/plugin_transport_tcp.c:626
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:836
-#: src/transport/plugin_transport_tcp.c:925
-#: src/transport/plugin_transport_tcp.c:975
-#: src/transport/plugin_transport_tcp.c:1061
-#: src/transport/plugin_transport_tcp.c:1204
-#: src/transport/plugin_transport_tcp.c:1221
+#: src/transport/plugin_transport_tcp.c:834
+#: src/transport/plugin_transport_tcp.c:923
+#: src/transport/plugin_transport_tcp.c:973
+#: src/transport/plugin_transport_tcp.c:1059
+#: src/transport/plugin_transport_tcp.c:1202
+#: src/transport/plugin_transport_tcp.c:1219
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# byte skickades via TCP"
 
-#: src/transport/plugin_transport_tcp.c:843
-#: src/transport/plugin_transport_tcp.c:1032
-#: src/transport/plugin_transport_tcp.c:2013
-#: src/transport/plugin_transport_tcp.c:2688
+#: src/transport/plugin_transport_tcp.c:841
+#: src/transport/plugin_transport_tcp.c:1030
+#: src/transport/plugin_transport_tcp.c:2009
+#: src/transport/plugin_transport_tcp.c:2690
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_tcp.c:929
+#: src/transport/plugin_transport_tcp.c:927
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:978
+#: src/transport/plugin_transport_tcp.c:976
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# byte skickade av typen %d"
 
-#: src/transport/plugin_transport_tcp.c:1065
+#: src/transport/plugin_transport_tcp.c:1063
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/transport/plugin_transport_tcp.c:1178
+#: src/transport/plugin_transport_tcp.c:1176
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1415
-#: src/transport/plugin_transport_udp.c:1454
+#: src/transport/plugin_transport_tcp.c:1413
+#: src/transport/plugin_transport_udp.c:1449
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1532
+#: src/transport/plugin_transport_tcp.c:1530
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2063
+#: src/transport/plugin_transport_tcp.c:2059
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_tcp.c:2246
+#: src/transport/plugin_transport_tcp.c:2242
 msgid "# bytes received via TCP"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_tcp.c:2326
+#: src/transport/plugin_transport_tcp.c:2322
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2568 src/util/service.c:957
+#: src/transport/plugin_transport_tcp.c:2570 src/util/service.c:957
 #: src/util/service.c:963
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2582
+#: src/transport/plugin_transport_tcp.c:2584
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2675
+#: src/transport/plugin_transport_tcp.c:2677
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2679
+#: src/transport/plugin_transport_tcp.c:2681
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2683
+#: src/transport/plugin_transport_tcp.c:2685
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -6077,31 +6465,31 @@
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:403
+#: src/transport/plugin_transport_udp_broadcasting.c:402
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:420
+#: src/transport/plugin_transport_udp_broadcasting.c:419
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1556
+#: src/transport/plugin_transport_udp.c:1555
 #, c-format
 msgid ""
 "Trying to create session for address of unexpected length %u (should be %u "
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2587
+#: src/transport/plugin_transport_udp.c:2590
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2601
+#: src/transport/plugin_transport_udp.c:2604
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -6109,103 +6497,103 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2901
+#: src/transport/plugin_transport_udp.c:2905
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:2999
+#: src/transport/plugin_transport_udp.c:3003
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3042
+#: src/transport/plugin_transport_udp.c:3046
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_udp.c:3101
+#: src/transport/plugin_transport_udp.c:3105
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/plugin_transport_unix.c:1641
+#: src/transport/plugin_transport_unix.c:1640
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_wlan.c:610
+#: src/transport/plugin_transport_wlan.c:623
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:629
+#: src/transport/plugin_transport_wlan.c:642
 #, fuzzy
 msgid "# WLAN messages defragmented"
 msgstr "# PING-meddelanden skapade"
 
-#: src/transport/plugin_transport_wlan.c:675
-#: src/transport/plugin_transport_wlan.c:742
-#: src/transport/plugin_transport_wlan.c:1874
+#: src/transport/plugin_transport_wlan.c:688
+#: src/transport/plugin_transport_wlan.c:756
+#: src/transport/plugin_transport_wlan.c:1899
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_wlan.c:835
+#: src/transport/plugin_transport_wlan.c:860
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:859
+#: src/transport/plugin_transport_wlan.c:884
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:967
-#: src/transport/plugin_transport_wlan.c:1052
-#: src/transport/plugin_transport_wlan.c:1876
+#: src/transport/plugin_transport_wlan.c:992
+#: src/transport/plugin_transport_wlan.c:1077
+#: src/transport/plugin_transport_wlan.c:1901
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1247
+#: src/transport/plugin_transport_wlan.c:1272
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1273
+#: src/transport/plugin_transport_wlan.c:1298
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1283
+#: src/transport/plugin_transport_wlan.c:1308
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1340
+#: src/transport/plugin_transport_wlan.c:1365
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_wlan.c:1460
+#: src/transport/plugin_transport_wlan.c:1485
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1495
+#: src/transport/plugin_transport_wlan.c:1520
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1558
+#: src/transport/plugin_transport_wlan.c:1583
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_wlan.c:1671
+#: src/transport/plugin_transport_wlan.c:1696
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1855
+#: src/transport/plugin_transport_wlan.c:1880
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
@@ -6220,32 +6608,32 @@
 msgid "Failed to initialize testing library!\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/util/bio.c:136 src/util/bio.c:142
+#: src/util/bio.c:137 src/util/bio.c:145
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/bio.c:143
+#: src/util/bio.c:147
 #, fuzzy
 msgid "End of file"
 msgstr "Läs in en konfigurationsfil"
 
-#: src/util/bio.c:195
+#: src/util/bio.c:199
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:205
+#: src/util/bio.c:209
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:250
+#: src/util/bio.c:254
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:264
+#: src/util/bio.c:268
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
@@ -6286,54 +6674,54 @@
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1034
+#: src/util/common_logging.c:256 src/util/common_logging.c:1033
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1032
+#: src/util/common_logging.c:258 src/util/common_logging.c:1031
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1030
+#: src/util/common_logging.c:260 src/util/common_logging.c:1029
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1028
+#: src/util/common_logging.c:262 src/util/common_logging.c:1027
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/common_logging.c:266 src/util/common_logging.c:1036
+#: src/util/common_logging.c:264 src/util/common_logging.c:1035
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:395
+#: src/util/common_logging.c:393
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/common_logging.c:819
+#: src/util/common_logging.c:817
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1037
+#: src/util/common_logging.c:1036
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1176
+#: src/util/common_logging.c:1138
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1215
+#: src/util/common_logging.c:1177
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1233
+#: src/util/common_logging.c:1195
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/common_logging.c:1254
+#: src/util/common_logging.c:1216
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -6351,28 +6739,28 @@
 "choices\n"
 msgstr ""
 
-#: src/util/connection.c:427
+#: src/util/connection.c:424
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
 
-#: src/util/connection.c:442
+#: src/util/connection.c:439
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:557
+#: src/util/connection.c:554
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/connection.c:755 src/util/connection.c:922
+#: src/util/connection.c:752 src/util/connection.c:919
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/util/connection.c:913
+#: src/util/connection.c:910
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Anslutning misslyckades\n"
@@ -6384,41 +6772,41 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:534 src/util/crypto_ecc.c:572
+#: src/util/crypto_ecc.c:580 src/util/crypto_ecc.c:618
 #, 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:539
+#: src/util/crypto_ecc.c:585
 #, 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:576
+#: src/util/crypto_ecc.c:622
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:607
+#: src/util/crypto_ecc.c:653
 #, 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:612
+#: src/util/crypto_ecc.c:658
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:694
+#: src/util/crypto_ecc.c:741
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/crypto_ecc.c:756
+#: src/util/crypto_ecc.c:803
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:836
+#: src/util/crypto_ecc.c:883
 #, fuzzy, c-format
 msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -6433,17 +6821,17 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 
-#: src/util/disk.c:1149
+#: src/util/disk.c:1150
 #, 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:1506 src/util/service.c:1679
+#: src/util/disk.c:1507 src/util/service.c:1674
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/util/disk.c:1953
+#: src/util/disk.c:1954
 #, fuzzy, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
@@ -6558,59 +6946,55 @@
 msgid "Manipulate GNUnet configuration files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/gnunet-ecc.c:65
+#: src/util/gnunet-ecc.c:60
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/util/gnunet-ecc.c:71
+#: src/util/gnunet-ecc.c:66
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:87
+#: src/util/gnunet-ecc.c:82
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/gnunet-ecc.c:97
+#: src/util/gnunet-ecc.c:92
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr "Slutför"
 
-#: src/util/gnunet-ecc.c:100
+#: src/util/gnunet-ecc.c:95
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:123
+#: src/util/gnunet-ecc.c:118
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:178
+#: src/util/gnunet-ecc.c:163
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:181
+#: src/util/gnunet-ecc.c:166
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:169
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:187
-msgid "print the short hash of the public key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:198
+#: src/util/gnunet-ecc.c:180
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -6673,12 +7057,12 @@
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/network.c:127
+#: src/util/network.c:132
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1344
+#: src/util/network.c:1370
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -6727,17 +7111,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:1801
+#: src/util/program.c:254 src/util/service.c:1796
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/util/resolver_api.c:202
+#: src/util/resolver_api.c:198
 #, fuzzy, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr "Försöker använda fil \"%s\" för MySQL-konfiguration.\n"
 
-#: src/util/resolver_api.c:221
+#: src/util/resolver_api.c:217
 #, fuzzy, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
@@ -6745,47 +7129,47 @@
 "Du måste ange ett positivt nummer för \"%s\" i konfigurationen i sektion \"%s"
 "\".\n"
 
-#: src/util/resolver_api.c:347
+#: src/util/resolver_api.c:343
 #, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:351
+#: src/util/resolver_api.c:347
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/resolver_api.c:890
+#: src/util/resolver_api.c:886
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/scheduler.c:782
+#: src/util/scheduler.c:802
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:912
+#: src/util/scheduler.c:933
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/server.c:476
+#: src/util/server.c:482
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/server.c:485
+#: src/util/server.c:491
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/util/server.c:496
+#: src/util/server.c:502
 #, fuzzy, c-format
 msgid "`%s' failed for `%.*s': address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/util/server.c:888
+#: src/util/server.c:894
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -6865,48 +7249,48 @@
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1318 src/util/service.c:1336
+#: src/util/service.c:1316 src/util/service.c:1334
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1363
+#: src/util/service.c:1359
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1535
+#: src/util/service.c:1530
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/service.c:1568
+#: src/util/service.c:1563
 #, 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:1617
+#: src/util/service.c:1612
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1621
+#: src/util/service.c:1616
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1625
+#: src/util/service.c:1620
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1680
+#: src/util/service.c:1675
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1693
+#: src/util/service.c:1688
 #, 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:1759
+#: src/util/service.c:1754
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6919,75 +7303,79 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:425
+#: src/util/strings.c:429
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:540
+#: src/util/strings.c:544
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:637
-msgid "ms"
-msgstr "ms"
+#: src/util/strings.c:641
+msgid "µs"
+msgstr ""
 
-#: src/util/strings.c:641
+#: src/util/strings.c:645
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:643
+#: src/util/strings.c:647
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:649
+#: src/util/strings.c:653
+msgid "ms"
+msgstr "ms"
+
+#: src/util/strings.c:659
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:655
+#: src/util/strings.c:665
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:661
+#: src/util/strings.c:671
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:668
+#: src/util/strings.c:678
 #, fuzzy
 msgid "day"
 msgstr " dagar"
 
-#: src/util/strings.c:670
+#: src/util/strings.c:680
 #, fuzzy
 msgid "days"
 msgstr " dagar"
 
-#: src/util/strings.c:697
+#: src/util/strings.c:708
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1098
+#: src/util/strings.c:1109
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1106
+#: src/util/strings.c:1117
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1112
+#: src/util/strings.c:1123
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1119
+#: src/util/strings.c:1130
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1128
+#: src/util/strings.c:1139
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1130
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1128
 #, fuzzy
 msgid "# Active tunnels"
 msgstr "Nätverksanslutning"
@@ -7022,70 +7410,88 @@
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1350
+#: src/vpn/gnunet-service-vpn.c:1348
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1371
+#: src/vpn/gnunet-service-vpn.c:1369
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1576
+#: src/vpn/gnunet-service-vpn.c:1574
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:1614 src/vpn/gnunet-service-vpn.c:1655
+#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1653
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1665
+#: src/vpn/gnunet-service-vpn.c:1663
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1679
+#: src/vpn/gnunet-service-vpn.c:1677
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1761
+#: src/vpn/gnunet-service-vpn.c:1759
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2100
+#: src/vpn/gnunet-service-vpn.c:2098
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2255
+#: src/vpn/gnunet-service-vpn.c:2253
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/vpn/gnunet-service-vpn.c:2406
+#: src/vpn/gnunet-service-vpn.c:2404
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2461
+#: src/vpn/gnunet-service-vpn.c:2459
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2713
+#: src/vpn/gnunet-service-vpn.c:2498 src/vpn/gnunet-service-vpn.c:2711
 #, fuzzy
 msgid "# Active destinations"
 msgstr "Nätverksanslutning"
 
-#: src/vpn/gnunet-service-vpn.c:2786
+#: src/vpn/gnunet-service-vpn.c:2784
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3143
+#: src/vpn/gnunet-service-vpn.c:3112
+#, fuzzy
+msgid "Must specify valid IPv6 address"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/vpn/gnunet-service-vpn.c:3133
+msgid "Must specify valid IPv6 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3141
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3175
+#: src/vpn/gnunet-service-vpn.c:3153
+#, fuzzy
+msgid "Must specify valid IPv4 address"
+msgstr "\"%s\" är inte tillgänglig."
+
+#: src/vpn/gnunet-service-vpn.c:3164
+msgid "Must specify valid IPv4 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3173
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -7161,23 +7567,67 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:588 src/include/gnunet_common.h:593
-#: src/include/gnunet_common.h:599
+#: src/include/gnunet_common.h:618 src/include/gnunet_common.h:625
+#: src/include/gnunet_common.h:633
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/include/gnunet_common.h:609
+#: src/include/gnunet_common.h:645
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:630 src/include/gnunet_common.h:637
+#: src/include/gnunet_common.h:672 src/include/gnunet_common.h:681
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "no-name"
+#~ msgstr "Visa namn"
+
+#, fuzzy
+#~ msgid "Option `%s' ignored\n"
+#~ msgstr "%s: flagga \"%s\" är tvetydig\n"
+
+#, fuzzy
+#~ msgid "specify ID of the root of the namespace"
+#~ msgstr "ange prioritet för innehållet"
+
+#, fuzzy
+#~ msgid "try to shorten a given name"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to read or create private zone key\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize resolver!\n"
+#~ msgstr "Kunde inte initiera SQLite.\n"
+
+#, fuzzy
+#~ msgid "Using default zone file `%s'\n"
+#~ msgstr "Startade samling \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Failed to write zone key to file `%s': %s\n"
+#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#, fuzzy
+#~ msgid "No directory to load zonefiles specified in configuration\n"
+#~ msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#, fuzzy
+#~ msgid "name of the template configuration file to use (optional)"
+#~ msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
+
+#, fuzzy
 #~ msgid "number of peers to start"
 #~ msgstr "antal iterationer"
 
@@ -7198,10 +7648,6 @@
 #~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
 #, fuzzy
-#~ msgid "Internal error."
-#~ msgstr "Okänt fel.\n"
-
-#, fuzzy
 #~ msgid "ECDSA signature verification failed at %s:%d: %s\n"
 #~ msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
@@ -7482,10 +7928,6 @@
 #~ msgstr "Kunde inte initiera libgnunetutil!\n"
 
 #, fuzzy
-#~ msgid "Failed to connect to the chat service\n"
-#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#, fuzzy
 #~ msgid "(%s) `%s' said: %s\n"
 #~ msgstr "\"%s\" %s misslyckades: %s\n"
 
@@ -7548,10 +7990,6 @@
 #~ msgstr "Kunde inte spara konfiguration!"
 
 #, fuzzy
-#~ msgid "Option `%s' in section `%s' missing in configuration!\n"
-#~ msgstr "Inga applikationer definierade i konfiguration!\n"
-
-#, fuzzy
 #~ msgid "Connected to %s service!\n"
 #~ msgstr "\"%s\" ansluten till \"%s\".\n"
 
@@ -7560,10 +7998,6 @@
 #~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
 #, fuzzy
-#~ msgid "Failed to start daemon: %s\n"
-#~ msgstr "Misslyckades att starta samling.\n"
-
-#, fuzzy
 #~ msgid "Configuration fails to specify `%s', assuming default value."
 #~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
@@ -7604,10 +8038,6 @@
 #~ msgstr "Misslyckades att starta samling.\n"
 
 #, fuzzy
-#~ msgid "Failed to get hostkey!\n"
-#~ msgstr "Kunde inte skapa värdnyckel!\n"
-
-#, fuzzy
 #~ msgid "Could not start `%s' process to start GNUnet.\n"
 #~ msgstr "Kunde inte skapa värdnyckel!\n"
 
@@ -7792,10 +8222,6 @@
 #~ msgstr "# krypterade PONG-meddelanden mottagna"
 
 #, fuzzy
-#~ msgid "Failed to connect to statistics service!\n"
-#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#, fuzzy
 #~ msgid "Failed to send to `%s': %s\n"
 #~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
@@ -8089,10 +8515,6 @@
 #~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
 #, fuzzy
-#~ msgid "Unknown operation '%s'.\n"
-#~ msgstr "Okänd operation \"%s\"\n"
-
-#, fuzzy
 #~ msgid "yes"
 #~ msgstr "Ja"
 
@@ -8186,10 +8608,6 @@
 #~ msgid "Real-time delay violation (%llu ms) at %s:%u\n"
 #~ msgstr "Icke-förväntad mycket stor allokering (%u byte) vid %s:%d!\n"
 
-#, fuzzy
-#~ msgid "GNUnet error log"
-#~ msgstr "Spåra GNUnets nätverkstopologi."
-
 #~ msgid "Availability test failed for `%s' at %s:%d.\n"
 #~ msgstr "Tillgänglighetstest misslyckades för \"%s\" vid %s:%d.\n"
 
@@ -8589,10 +9007,6 @@
 #~ msgid "enables IPv6 over GNUnet (incomplete)"
 #~ msgstr "aktiverar P2P-chatt (ej komplett)"
 
-#, fuzzy
-#~ msgid "Core initialization failed.\n"
-#~ msgstr " Anslutning misslyckades\n"
-
 #~ msgid "Updates GNUnet datastructures after version change."
 #~ msgstr "Uppdaterar GNUnets datastruktur efter versionsändring."
 
@@ -8659,9 +9073,6 @@
 #~ "\n"
 #~ "Kontaktar \"%s\"."
 
-#~ msgid " Connection failed (bug?)\n"
-#~ msgstr " Anslutning misslyckades (fel?)\n"
-
 #, fuzzy
 #~ msgid "OK!\n"
 #~ msgstr "OK"
@@ -8669,9 +9080,6 @@
 #~ msgid "send messages with SIZE bytes payload"
 #~ msgstr "skicka meddelanden med STORLEK bytes nyttolast"
 
-#~ msgid "specifies which TRANSPORT should be tested"
-#~ msgstr "anger vilken TRANSPORT som ska testas"
-
 #~ msgid "specifies after how many MS to time-out"
 #~ msgstr "anger timeout efter antal MS"
 
@@ -9117,9 +9525,6 @@
 #~ msgid "%.*s filter %s (SMTP)"
 #~ msgstr "%.*s filter %s (SMTP)"
 
-#~ msgid "`%s': unknown service: %s\n"
-#~ msgstr "\"%s\": okänd tjänst: %s\n"
-
 #~ msgid "Configuration file `%s' not found.  Run gnunet-setup!\n"
 #~ msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör gnunet-setup!\n"
 

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2013-09-16 13:23:12 UTC (rev 29317)
+++ gnunet/po/vi.po     2013-09-16 13:33:53 UTC (rev 29318)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-08-09 23:01+0200\n"
+"POT-Creation-Date: 2013-09-16 15:01+0200\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -38,7 +38,7 @@
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 
-#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:962
+#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:971
 msgid "Message was sent successfully"
 msgstr ""
 
@@ -47,12 +47,12 @@
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:966
+#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:975
 #, fuzzy
 msgid "We disconnected from ARM before we could send a request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:968
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:977
 msgid "ARM API is busy"
 msgstr ""
 
@@ -60,57 +60,57 @@
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:972
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:981
 #, fuzzy
 msgid "Request timed out"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:974
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:983
 #, fuzzy
 msgid "Unknown request status"
 msgstr "Không rõ người dùng « %s »\n"
 
-#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:990
+#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:999
 #, fuzzy, c-format
 msgid "%s is stopped"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:992
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1001
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:994
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1003
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:996
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1005
 #, fuzzy, c-format
 msgid "%s is starting already"
 msgstr "« %s » đang đăng ký trình điều khiển %d\n"
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:998
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1007
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1000
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1009
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1002
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1011
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1004
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1013
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1006
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1015
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "Lỗi bắt đầu thu thập.\n"
@@ -120,7 +120,7 @@
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
 
-#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1010
+#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1019
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -300,50 +300,50 @@
 msgid "Preparing to stop `%s'\n"
 msgstr "Đang bắt đầu tài lên « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:1023
+#: src/arm/gnunet-service-arm.c:1022
 #, fuzzy, c-format
 msgid "Restarting service `%s'.\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-service-arm.c:1116
+#: src/arm/gnunet-service-arm.c:1115
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1121
+#: src/arm/gnunet-service-arm.c:1120
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1126
+#: src/arm/gnunet-service-arm.c:1125
 #, fuzzy
 msgid "unknown"
 msgstr "Lỗi không rõ"
 
-#: src/arm/gnunet-service-arm.c:1132
+#: src/arm/gnunet-service-arm.c:1131
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/arm/gnunet-service-arm.c:1154
+#: src/arm/gnunet-service-arm.c:1153
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1169
+#: src/arm/gnunet-service-arm.c:1168
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1387
+#: src/arm/gnunet-service-arm.c:1386
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/arm/gnunet-service-arm.c:1398
+#: src/arm/gnunet-service-arm.c:1397
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1412
+#: src/arm/gnunet-service-arm.c:1411
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -362,91 +362,91 @@
 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:1529
-#: src/ats/gnunet-service-ats_addresses.c:1563
+#: src/ats/gnunet-service-ats_addresses.c:1607
+#: src/ats/gnunet-service-ats_addresses.c:1641
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1535
+#: src/ats/gnunet-service-ats_addresses.c:1613
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1542
+#: src/ats/gnunet-service-ats_addresses.c:1620
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1569
+#: src/ats/gnunet-service-ats_addresses.c:1647
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1576
+#: src/ats/gnunet-service-ats_addresses.c:1654
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1773
+#: src/ats/gnunet-service-ats_addresses.c:1888
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:848
+#: src/ats/gnunet-service-ats-solver_mlp.c:849
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1171
+#: src/ats/gnunet-service-ats-solver_mlp.c:1193
 #, 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-solver_mlp.c:1216
+#: src/ats/gnunet-service-ats-solver_mlp.c:1238
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1890
+#: src/ats/gnunet-service-ats-solver_mlp.c:1956
 #, 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-solver_mlp.c:1898
+#: src/ats/gnunet-service-ats-solver_mlp.c:1964
 #, 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-solver_mlp.c:1908
+#: src/ats/gnunet-service-ats-solver_mlp.c:1974
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1916
+#: src/ats/gnunet-service-ats-solver_mlp.c:1982
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1927
+#: src/ats/gnunet-service-ats-solver_mlp.c:1993
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_proportional.c:1246
+#: src/ats/gnunet-service-ats-solver_proportional.c:1296
 #, fuzzy, c-format
-msgid "Cannot find network of type `%u' %s\n"
+msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
 #: src/ats-tool/gnunet-ats.c:145
@@ -471,7 +471,7 @@
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:461
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:438
 #: src/transport/gnunet-transport.c:812
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
@@ -564,31 +564,36 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/consensus/gnunet-consensus.c:352
+#: src/consensus/gnunet-consensus-profiler.c:393
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "số lần lặp lại"
 
-#: src/consensus/gnunet-consensus.c:355
+#: src/consensus/gnunet-consensus-profiler.c:396
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus.c:358 src/set/gnunet-set-profiler.c:287
-#: src/set/gnunet-set-profiler.c:290 src/set/gnunet-set-profiler.c:293
+#: src/consensus/gnunet-consensus-profiler.c:399
+#: src/set/gnunet-set-profiler.c:287 src/set/gnunet-set-profiler.c:290
+#: src/set/gnunet-set-profiler.c:293
 #, fuzzy
 msgid "number of values"
 msgstr "số lần lặp lại"
 
-#: src/consensus/gnunet-consensus.c:361
+#: src/consensus/gnunet-consensus-profiler.c:402
 #, fuzzy
 msgid "consensus timeout"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
+#: src/consensus/gnunet-consensus-profiler.c:405
+msgid "be more verbose (print received values)"
+msgstr ""
+
 #: src/core/core_api.c:752
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:82
+#: src/core/gnunet-core.c:83
 #, fuzzy, c-format
 msgid "Peer `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
@@ -609,18 +614,18 @@
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:170
+#: src/core/gnunet-core.c:166 src/mesh/gnunet-mesh.c:170
 #: src/peerinfo-tool/gnunet-peerinfo.c:653
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:1004
+#: src/core/gnunet-core.c:203 src/transport/gnunet-transport.c:1004
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/core/gnunet-core.c:215
+#: src/core/gnunet-core.c:214
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
@@ -688,7 +693,7 @@
 msgstr "# các thông báo được chắp liền"
 
 #: src/core/gnunet-service-core_kx.c:922
-#: src/transport/gnunet-service-transport_validation.c:935
+#: src/transport/gnunet-service-transport_validation.c:933
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
@@ -721,7 +726,7 @@
 msgstr "# các thông báo PING nhập thô được gửi"
 
 #: src/core/gnunet-service-core_kx.c:1067
-#: src/transport/gnunet-service-transport_validation.c:1226
+#: src/transport/gnunet-service-transport_validation.c:1224
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
@@ -817,8 +822,8 @@
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:210
-#: src/core/gnunet-service-core_sessions.c:280
+#: src/core/gnunet-service-core_sessions.c:209
+#: src/core/gnunet-service-core_sessions.c:279
 #: src/dht/gnunet-service-dht_neighbours.c:641
 #: src/dht/gnunet-service-dht_neighbours.c:700
 #: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
@@ -827,18 +832,18 @@
 #: src/transport/gnunet-service-transport_neighbours.c:1041
 #: src/transport/gnunet-service-transport_neighbours.c:1265
 #: src/transport/gnunet-service-transport_neighbours.c:1274
-#: src/transport/gnunet-service-transport_neighbours.c:2793
-#: src/transport/gnunet-service-transport_neighbours.c:3047
+#: src/transport/gnunet-service-transport_neighbours.c:2799
+#: src/transport/gnunet-service-transport_neighbours.c:3053
 #, fuzzy
 msgid "# peers connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/core/gnunet-service-core_sessions.c:248
+#: src/core/gnunet-service-core_sessions.c:247
 #, 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:417
+#: src/core/gnunet-service-core_sessions.c:416
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -853,7 +858,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:115 src/datacache/datacache.c:266
-#: src/datastore/gnunet-service-datastore.c:834
+#: src/datastore/gnunet-service-datastore.c:838
 #, fuzzy
 msgid "# bytes stored"
 msgstr "# các byte trong kho dữ liệu"
@@ -864,8 +869,8 @@
 msgstr "# các byte trong kho dữ liệu"
 
 #: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1483
-#: src/datastore/gnunet-service-datastore.c:1494
+#: src/datastore/gnunet-service-datastore.c:1487
+#: src/datastore/gnunet-service-datastore.c:1498
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
@@ -900,15 +905,16 @@
 
 #: src/datacache/plugin_datacache_sqlite.c:69
 #: src/datacache/plugin_datacache_sqlite.c:72
-#: src/datastore/plugin_datastore_mysql.c:803
-#: src/datastore/plugin_datastore_mysql.c:817
+#: src/datastore/plugin_datastore_mysql.c:806
+#: src/datastore/plugin_datastore_mysql.c:820
 #: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
-#: src/include/gnunet_common.h:616 src/include/gnunet_common.h:623
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:54
+#: src/include/gnunet_common.h:654 src/include/gnunet_common.h:663
+#: src/scalarproduct/scalarproduct.h:56
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
@@ -919,7 +925,7 @@
 
 #: src/datacache/plugin_datacache_sqlite.c:484
 #: src/datastore/plugin_datastore_sqlite.c:401
-#: src/namestore/plugin_namestore_sqlite.c:362
+#: src/namestore/plugin_namestore_sqlite.c:374
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -959,7 +965,7 @@
 msgid "# datastore connections (re)created"
 msgstr "# các kết nối dht"
 
-#: src/datastore/datastore_api.c:608
+#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:276
 #, fuzzy
 msgid "# transmission request failures"
 msgstr "# các sự truyền PONG bị lỗi"
@@ -990,51 +996,51 @@
 msgid "# status messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/datastore/datastore_api.c:867
+#: src/datastore/datastore_api.c:868
 #, fuzzy
 msgid "# PUT requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:934
+#: src/datastore/datastore_api.c:935
 #, fuzzy
 msgid "# RESERVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:995
+#: src/datastore/datastore_api.c:996
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1052
+#: src/datastore/datastore_api.c:1055
 #, fuzzy
 msgid "# UPDATE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1116
+#: src/datastore/datastore_api.c:1119
 #, fuzzy
 msgid "# REMOVE requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/datastore/datastore_api.c:1161
+#: src/datastore/datastore_api.c:1164
 #, fuzzy
 msgid "Failed to receive response from database.\n"
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/datastore/datastore_api.c:1220
+#: src/datastore/datastore_api.c:1223
 #, fuzzy
 msgid "# Results received"
 msgstr "# các kết quả dht được nhận"
 
-#: src/datastore/datastore_api.c:1286
+#: src/datastore/datastore_api.c:1290
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1349
+#: src/datastore/datastore_api.c:1353
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1410
+#: src/datastore/datastore_api.c:1414
 #, fuzzy
 msgid "# GET requests executed"
 msgstr "# các yêu cầu dht được định tuyến"
@@ -1060,160 +1066,160 @@
 msgid "Manipulate GNUnet datastore"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/datastore/gnunet-service-datastore.c:349
+#: src/datastore/gnunet-service-datastore.c:351
 #, fuzzy
 msgid "# bytes expired"
 msgstr "# các byte được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:422
+#: src/datastore/gnunet-service-datastore.c:425
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:480
+#: src/datastore/gnunet-service-datastore.c:483
 #: src/gns/gnunet-gns-helper-service-w32.c:155
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:511
+#: src/datastore/gnunet-service-datastore.c:514
 #: src/gns/gnunet-gns-helper-service-w32.c:183
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:626
+#: src/datastore/gnunet-service-datastore.c:630
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:669
+#: src/datastore/gnunet-service-datastore.c:673
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:680
+#: src/datastore/gnunet-service-datastore.c:684
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:688
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:690
+#: src/datastore/gnunet-service-datastore.c:694
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:695
-#: src/datastore/gnunet-service-datastore.c:747
-#: src/datastore/gnunet-service-datastore.c:960
-#: src/datastore/gnunet-service-datastore.c:1417
+#: src/datastore/gnunet-service-datastore.c:699
+#: src/datastore/gnunet-service-datastore.c:751
+#: src/datastore/gnunet-service-datastore.c:964
+#: src/datastore/gnunet-service-datastore.c:1421
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:760
+#: src/datastore/gnunet-service-datastore.c:764
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:846
+#: src/datastore/gnunet-service-datastore.c:850
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1006
+#: src/datastore/gnunet-service-datastore.c:1010
 #, fuzzy
 msgid "# GET requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1018
+#: src/datastore/gnunet-service-datastore.c:1022
 #, fuzzy
 msgid "# requests filtered by bloomfilter"
 msgstr "# các yêu cầu được lọc theo bộ lọc bloom"
 
-#: src/datastore/gnunet-service-datastore.c:1046
+#: src/datastore/gnunet-service-datastore.c:1050
 #, fuzzy
 msgid "# UPDATE requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1076
+#: src/datastore/gnunet-service-datastore.c:1080
 #, fuzzy
 msgid "# GET REPLICATION requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1109
+#: src/datastore/gnunet-service-datastore.c:1113
 #, fuzzy
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1134
+#: src/datastore/gnunet-service-datastore.c:1138
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1142
+#: src/datastore/gnunet-service-datastore.c:1146
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1174
+#: src/datastore/gnunet-service-datastore.c:1178
 #, fuzzy
 msgid "# REMOVE requests received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/datastore/gnunet-service-datastore.c:1216
+#: src/datastore/gnunet-service-datastore.c:1220
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1277
+#: src/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1286
+#: src/datastore/gnunet-service-datastore.c:1290
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/datastore/gnunet-service-datastore.c:1488
+#: src/datastore/gnunet-service-datastore.c:1492
 #, fuzzy, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr "# các byte được phép trong kho dữ liệu"
 
-#: src/datastore/gnunet-service-datastore.c:1499
+#: src/datastore/gnunet-service-datastore.c:1503
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1501
+#: src/datastore/gnunet-service-datastore.c:1505
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1514
+#: src/datastore/gnunet-service-datastore.c:1518
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1532
-#: src/datastore/gnunet-service-datastore.c:1548
+#: src/datastore/gnunet-service-datastore.c:1536
+#: src/datastore/gnunet-service-datastore.c:1552
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/datastore/gnunet-service-datastore.c:1578
+#: src/datastore/gnunet-service-datastore.c:1582
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/datastore/gnunet-service-datastore.c:1607
+#: src/datastore/gnunet-service-datastore.c:1611
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1612
+#: src/datastore/gnunet-service-datastore.c:1616
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1615
+#: src/datastore/gnunet-service-datastore.c:1619
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
@@ -1222,17 +1228,17 @@
 msgid "Heap database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/datastore/plugin_datastore_mysql.c:780
+#: src/datastore/plugin_datastore_mysql.c:783
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/datastore/plugin_datastore_mysql.c:788
+#: src/datastore/plugin_datastore_mysql.c:791
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1019
+#: src/datastore/plugin_datastore_mysql.c:1022
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -1244,7 +1250,7 @@
 "Không nhận được đáp ứng từ gnunetd.\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
-#: src/namestore/plugin_namestore_postgres.c:652
+#: src/namestore/plugin_namestore_postgres.c:735
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1254,29 +1260,30 @@
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
 
 #: src/datastore/plugin_datastore_sqlite.c:253
-#: src/namestore/plugin_namestore_sqlite.c:223
+#: src/namestore/plugin_namestore_sqlite.c:220
+#: src/psycstore/plugin_psycstore_sqlite.c:319
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:648
+#: src/datastore/plugin_datastore_sqlite.c:649
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "Dữ liệu sai trong %s. Đang thử sửa chữa (bằng cách xoá).\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1134
+#: src/datastore/plugin_datastore_sqlite.c:1135
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1153
+#: src/datastore/plugin_datastore_sqlite.c:1154
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1193
-#: src/namestore/plugin_namestore_sqlite.c:829
+#: src/datastore/plugin_datastore_sqlite.c:1194
+#: src/namestore/plugin_namestore_sqlite.c:893
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "kho dữ liệu sqlite"
@@ -1333,9 +1340,9 @@
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:861
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:864
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:899
+#: src/nse/gnunet-nse-profiler.c:904
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1566,51 +1573,51 @@
 msgid "# RESULT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1575
+#: src/dht/gnunet-service-dht_neighbours.c:1573
 #, 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:1578
+#: src/dht/gnunet-service-dht_neighbours.c:1576
 #, fuzzy
 msgid "# P2P PUT bytes received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1733
+#: src/dht/gnunet-service-dht_neighbours.c:1731
 #, 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:1741
+#: src/dht/gnunet-service-dht_neighbours.c:1739
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1832
+#: src/dht/gnunet-service-dht_neighbours.c:1830
 #, 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:1835
+#: src/dht/gnunet-service-dht_neighbours.c:1833
 #, fuzzy
 msgid "# P2P GET bytes received"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1888
+#: src/dht/gnunet-service-dht_neighbours.c:1886
 #, 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:1902
+#: src/dht/gnunet-service-dht_neighbours.c:1900
 #, 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:1979
+#: src/dht/gnunet-service-dht_neighbours.c:1977
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1982
+#: src/dht/gnunet-service-dht_neighbours.c:1980
 #, fuzzy
 msgid "# P2P RESULT bytes received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -1644,11 +1651,11 @@
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:400
+#: src/dht/gnunet-service-dht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:418
+#: src/dht/gnunet-service-dht_routing.c:417
 #, fuzzy
 msgid "# DHT requests combined"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
@@ -1667,12 +1674,12 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:152
+#: src/dns/dnsparser.c:233
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/dns/dnsparser.c:626
+#: src/dns/dnsparser.c:751
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -1683,7 +1690,6 @@
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
 #: src/dns/dnsstub.c:296 src/dns/dnsstub.c:384
-#: src/gns/gnunet-service-gns_resolver.c:1651
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -1795,14 +1801,14 @@
 msgstr "# các byte được gửi"
 
 #: src/exit/gnunet-daemon-exit.c:924 src/exit/gnunet-daemon-exit.c:2349
-#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1453
-#: src/vpn/gnunet-service-vpn.c:1852 src/vpn/gnunet-service-vpn.c:2015
+#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1451
+#: src/vpn/gnunet-service-vpn.c:1850 src/vpn/gnunet-service-vpn.c:2013
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:961 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1509
-#: src/vpn/gnunet-service-vpn.c:1911 src/vpn/gnunet-service-vpn.c:2048
+#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1507
+#: src/vpn/gnunet-service-vpn.c:1909 src/vpn/gnunet-service-vpn.c:2046
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -1909,13 +1915,13 @@
 msgid "# ICMP service requests received via mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1443
-#: src/vpn/gnunet-service-vpn.c:2009
+#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1441
+#: src/vpn/gnunet-service-vpn.c:2007
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1479
-#: src/vpn/gnunet-service-vpn.c:1491 src/vpn/gnunet-service-vpn.c:1899
+#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1477
+#: src/vpn/gnunet-service-vpn.c:1489 src/vpn/gnunet-service-vpn.c:1897
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
@@ -2049,69 +2055,69 @@
 msgid "Experiment `%s': Required capabilities invalid \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:393
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:392
 #, fuzzy, c-format
 msgid "Failed to parse file `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:419
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:444
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:418
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:443
 msgid ""
 "No valid experiment issuers configured! Set value to peer id of issuer! "
 "Exit...\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:429
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:428
 #, fuzzy, c-format
 msgid "Invalid value `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:453
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
 #, fuzzy, c-format
 msgid "Invalid public key `%s'\n"
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:460
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:459
 #, fuzzy, c-format
 msgid "Found issuer for public key `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:463
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:462
 #, fuzzy, c-format
 msgid "No issuer for public key `%s'\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:480
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:479
 #, fuzzy, c-format
 msgid "Cannot read experiments file `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:220
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
 #, c-format
 msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:290
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:291
 #, c-format
 msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:421
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:422
 #, c-format
 msgid "Added peer `%s' as active node\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:848
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:849
 #, fuzzy, c-format
 msgid "Connected to peer %s\n"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:877
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:878
 #, fuzzy, c-format
 msgid "Disconnected from peer %s\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1057
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1058
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -2206,56 +2212,56 @@
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1061
+#: src/fs/fs_api.c:1062
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:1557
+#: src/fs/fs_api.c:1565
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1571
+#: src/fs/fs_api.c:1579
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2228
+#: src/fs/fs_api.c:2236
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2238
+#: src/fs/fs_api.c:2246
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2364 src/fs/fs_api.c:2604
+#: src/fs/fs_api.c:2372 src/fs/fs_api.c:2612
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2381
+#: src/fs/fs_api.c:2389
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2896
+#: src/fs/fs_api.c:2402 src/fs/fs_api.c:2421 src/fs/fs_api.c:2904
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2595
+#: src/fs/fs_api.c:2603
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2840
+#: src/fs/fs_api.c:2848
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2934
+#: src/fs/fs_api.c:2942
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2370,74 +2376,64 @@
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_pseudonym.c:327 src/fs/fs_pseudonym.c:631
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:414
 #, fuzzy, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr "Lỗi phân tích dữ liệu giao diện từ « %s ».\n"
-
-#: src/fs/fs_pseudonym.c:463 src/fs/fs_pseudonym.c:489
-#: src/fs/fs_pseudonym.c:627
-msgid "no-name"
-msgstr "không-tên"
-
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:399
-#, fuzzy, c-format
 msgid "Publishing failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:624 src/fs/fs_publish.c:641 src/fs/fs_publish.c:680
-#: src/fs/fs_publish.c:700 src/fs/fs_publish.c:725 src/fs/fs_publish.c:865
+#: src/fs/fs_publish.c:642 src/fs/fs_publish.c:659 src/fs/fs_publish.c:698
+#: src/fs/fs_publish.c:719 src/fs/fs_publish.c:743 src/fs/fs_publish.c:889
 #, fuzzy, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr "Lỗi đánh chỉ mục tập tin « %s ». Đề nghị: thử chèn tập tin.\n"
 
-#: src/fs/fs_publish.c:626
+#: src/fs/fs_publish.c:644
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:638
+#: src/fs/fs_publish.c:656
 #, fuzzy
 msgid "unknown error"
 msgstr "Lỗi không rõ"
 
-#: src/fs/fs_publish.c:681
+#: src/fs/fs_publish.c:700
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:701
+#: src/fs/fs_publish.c:720
 #, fuzzy
 msgid "filename too long"
 msgstr "tên tập tin"
 
-#: src/fs/fs_publish.c:726
+#: src/fs/fs_publish.c:745
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:749
+#: src/fs/fs_publish.c:768
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/fs_publish.c:814
+#: src/fs/fs_publish.c:837
 #, fuzzy, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/fs/fs_publish.c:820
+#: src/fs/fs_publish.c:843
 #, fuzzy, c-format
 msgid "Recursive upload failed: %s"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/fs_publish.c:866
+#: src/fs/fs_publish.c:890
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1092
+#: src/fs/fs_publish.c:1126
 #, fuzzy, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr "Không đủ quyền truy cập cho « %s »: %s\n"
 
-#: src/fs/fs_publish.c:1164
+#: src/fs/fs_publish.c:1198
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2447,6 +2443,11 @@
 msgid "Could not connect to datastore."
 msgstr "« %s »: Không thể kết nối.\n"
 
+#: src/fs/fs_publish_ublock.c:219
+#, fuzzy
+msgid "Internal error."
+msgstr "Lỗi VR."
+
 #: src/fs/fs_search.c:815
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
@@ -2457,59 +2458,59 @@
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:58
+#: src/fs/fs_unindex.c:59
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_unindex.c:64
 #, fuzzy
 msgid "Failed to read file"
 msgstr "Lỗi gửi tin nhẳn.\n"
 
-#: src/fs/fs_unindex.c:233
+#: src/fs/fs_unindex.c:234
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:241
+#: src/fs/fs_unindex.c:242
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:249
+#: src/fs/fs_unindex.c:250
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/fs/fs_unindex.c:293
+#: src/fs/fs_unindex.c:291
 #, fuzzy
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_unindex.c:349 src/fs/fs_unindex.c:361
+#: src/fs/fs_unindex.c:347 src/fs/fs_unindex.c:359
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
 
-#: src/fs/fs_unindex.c:357
+#: src/fs/fs_unindex.c:355
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_unindex.c:416
+#: src/fs/fs_unindex.c:414
 #, fuzzy, c-format
 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:565 src/fs/fs_unindex.c:628
+#: src/fs/fs_unindex.c:562 src/fs/fs_unindex.c:626
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/fs_unindex.c:641
+#: src/fs/fs_unindex.c:639
 #, 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:675
+#: src/fs/fs_unindex.c:673
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -2539,13 +2540,16 @@
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
-#: src/fs/fs_uri.c:629
+#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:629
 msgid "SKS URI malformed"
 msgstr ""
 
+#: src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
+msgid "LOC URI malformed"
+msgstr ""
+
 #: src/fs/fs_uri.c:611
-msgid "SKS URI malformed (could not decode public key)"
+msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
 #: src/fs/fs_uri.c:617
@@ -2568,21 +2572,21 @@
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:911
+#: src/fs/fs_uri.c:912
 #, 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:917
+#: src/fs/fs_uri.c:918
 #, 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:1099 src/fs/fs_uri.c:1126
+#: src/fs/fs_uri.c:1102 src/fs/fs_uri.c:1129
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1132
+#: src/fs/fs_uri.c:1135
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
@@ -2618,25 +2622,23 @@
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:310
-#: src/fs/gnunet-publish.c:808
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:811
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của người gửi"
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:812
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:815
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr "tắt thêm giờ tạo vào siêu dữ liệu của tập tin đã tải lên"
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:815
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:818
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:839
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:842
 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:329
-#: src/fs/gnunet-publish.c:846
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:849
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2645,7 +2647,7 @@
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr "Tự động chia sẻ một thư mục."
 
-#: src/fs/gnunet-daemon-fsprofiler.c:656
+#: src/fs/gnunet-daemon-fsprofiler.c:657
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
@@ -2735,7 +2737,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:781
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:784
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2787,71 +2789,22 @@
 msgid "Special file-sharing operations"
 msgstr "Tùy chọn chia sẻ tập tin"
 
-#: src/fs/gnunet-fs-profiler.c:190
+#: src/fs/gnunet-fs-profiler.c:193
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:193
+#: src/fs/gnunet-fs-profiler.c:196
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:196
+#: src/fs/gnunet-fs-profiler.c:199
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:205
+#: src/fs/gnunet-fs-profiler.c:208
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:227 src/fs/gnunet-pseudonym.c:229
-#, fuzzy, c-format
-msgid "Option `%s' ignored\n"
-msgstr "%s: tùy chọn « %s » là mơ hồ\n"
-
-#: src/fs/gnunet-pseudonym.c:265 src/statistics/gnunet-statistics.c:305
-#, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "Đối số không hợp lệ cho « %s ».\n"
-
-#: src/fs/gnunet-pseudonym.c:313
-msgid "advertise namespace NAME"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:316
-#, fuzzy
-msgid ""
-"add an additional keyword for the advertisment (this option can be specified "
-"multiple times)"
-msgstr ""
-"thêm một từ khóa bổ sung cho tất cả tập tin và thư mục (có thể chỉ ra tùy "
-"chọn này nhiều lần)"
-
-#: src/fs/gnunet-pseudonym.c:320 src/fs/gnunet-publish.c:827
-msgid "set the meta-data for the given TYPE to the given VALUE"
-msgstr "đặt siêu dữ liệu cho KIỂU đưa ra thành GIÁ_TRỊ chỉ ra"
-
-#: src/fs/gnunet-pseudonym.c:323
-msgid "use the given PRIORITY for the advertisments"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:326
-msgid "do not print names of remote namespaces"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:332
-#, fuzzy
-msgid "specify ID of the root of the namespace"
-msgstr "đặt đánh giá của một không gian tên"
-
-#: src/fs/gnunet-pseudonym.c:335
-#, fuzzy
-msgid "change rating of namespace ID by VALUE"
-msgstr "đặt đánh giá của một không gian tên"
-
-#: src/fs/gnunet-pseudonym.c:347
-msgid "Manage GNUnet pseudonyms."
-msgstr ""
-
 #: src/fs/gnunet-publish.c:230
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -2940,39 +2893,39 @@
 msgid "Failed to access `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:681
+#: src/fs/gnunet-publish.c:682
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:731
+#: src/fs/gnunet-publish.c:734
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr "Không thể trích siêu dữ liệu ra một địa chỉ URI.\n"
 
-#: src/fs/gnunet-publish.c:738
+#: src/fs/gnunet-publish.c:741
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-publish.c:744
+#: src/fs/gnunet-publish.c:747
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-publish.c:752 src/vpn/gnunet-vpn.c:213
+#: src/fs/gnunet-publish.c:755 src/vpn/gnunet-vpn.c:213
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:762 src/fs/gnunet-publish.c:769
+#: src/fs/gnunet-publish.c:765 src/fs/gnunet-publish.c:772
 #: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr "Tùy chọn « %s » không có nghĩa khi không có tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:819
+#: src/fs/gnunet-publish.c:822
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2980,7 +2933,7 @@
 "in ra danh sách các từ khóa đã giải phóng cần sử dụng, nhưng không thực hiện "
 "tải lên"
 
-#: src/fs/gnunet-publish.c:823
+#: src/fs/gnunet-publish.c:826
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2989,6 +2942,10 @@
 "tùy chọn này nhiều lần)"
 
 #: src/fs/gnunet-publish.c:830
+msgid "set the meta-data for the given TYPE to the given VALUE"
+msgstr "đặt siêu dữ liệu cho KIỂU đưa ra thành GIÁ_TRỊ chỉ ra"
+
+#: src/fs/gnunet-publish.c:833
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2996,7 +2953,7 @@
 "không đánh chỉ mục, thực hiện việc chèn đầy đủ (chứa toàn bộ tập tin ở dạng "
 "mã hóa trong cơ sở dữ liệu GNUnet)"
 
-#: src/fs/gnunet-publish.c:835
+#: src/fs/gnunet-publish.c:838
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -3004,12 +2961,12 @@
 "chỉ ra mã số của một phiên bản đã cập nhật để công bố trong tương lai (chỉ "
 "cho sự chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:843
+#: src/fs/gnunet-publish.c:846
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "công bố các tập tin dưới biệt hiệu TÊN (đặt tập tin vào không gian tên)"
 
-#: src/fs/gnunet-publish.c:849
+#: src/fs/gnunet-publish.c:852
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -3017,13 +2974,13 @@
 msgstr ""
 "chỉ mô phỏng tiến trình, không thật công bố (có ích để tính địa chỉ URI)"
 
-#: src/fs/gnunet-publish.c:853
+#: src/fs/gnunet-publish.c:856
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "đặt mã số của phiên bản này của sự công bố (chỉ cho chèn không gian tên)"
 
-#: src/fs/gnunet-publish.c:857
+#: src/fs/gnunet-publish.c:860
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -3031,7 +2988,7 @@
 "Địa chỉ URI cần công bố (có thể được dùng thay vào gửi một tập tin để thêm "
 "từ khoá vào tập tin có địa chỉ URI tương ứng)"
 
-#: src/fs/gnunet-publish.c:873
+#: src/fs/gnunet-publish.c:876
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -3081,9 +3038,9 @@
 msgid "# Loopback routes suppressed"
 msgstr "# tổng số định tuyến lỗ hổng thành công"
 
-#: src/fs/gnunet-service-fs.c:640 src/hostlist/gnunet-daemon-hostlist.c:291
-#: src/topology/gnunet-daemon-topology.c:1314
-#: src/topology/gnunet-daemon-topology.c:1321
+#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:293
+#: src/topology/gnunet-daemon-topology.c:1315
+#: src/topology/gnunet-daemon-topology.c:1322
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -3293,27 +3250,27 @@
 msgid "# query messages sent to other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
 
-#: src/fs/gnunet-service-fs_pe.c:482
-msgid "# delay heap timeout"
+#: src/fs/gnunet-service-fs_pe.c:484
+msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:490
+#: src/fs/gnunet-service-fs_pe.c:492
 #, fuzzy
 msgid "# query plans executed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_pe.c:550
+#: src/fs/gnunet-service-fs_pe.c:552
 #, fuzzy
 msgid "# requests merged"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pe.c:558
+#: src/fs/gnunet-service-fs_pe.c:560
 #, fuzzy
 msgid "# requests refreshed"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/fs/gnunet-service-fs_pe.c:612 src/fs/gnunet-service-fs_pe.c:696
-#: src/fs/gnunet-service-fs_pe.c:767
+#: src/fs/gnunet-service-fs_pe.c:614 src/fs/gnunet-service-fs_pe.c:698
+#: src/fs/gnunet-service-fs_pe.c:769
 msgid "# query plan entries"
 msgstr ""
 
@@ -3464,193 +3421,231 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:598
+#: src/gns/gns_api.c:385
 #, fuzzy
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr ""
 "\n"
 "Không nhận được đáp ứng từ gnunetd.\n"
 
-#: src/gns/gnunet-dns2gns.c:192
+#: src/gns/gnunet-dns2gns.c:228
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-dns2gns.c:367
+#: src/gns/gnunet-dns2gns.c:400
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:383
+#: src/gns/gnunet-dns2gns.c:416
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:391
+#: src/gns/gnunet-dns2gns.c:424
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:681
-msgid "IP of recursive DNS resolver to use (required)"
+#: src/gns/gnunet-dns2gns.c:703
+msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:684
-msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+#: src/gns/gnunet-dns2gns.c:729
+#, fuzzy
+msgid "No DNS server specified!\n"
+msgstr "Chưa ghi rõ từ khoá.\n"
+
+#: src/gns/gnunet-dns2gns.c:751
+#, fuzzy
+msgid "No valid GNS zone specified!\n"
+msgstr "Chưa ghi rõ từ khoá.\n"
+
+#: src/gns/gnunet-dns2gns.c:772
+msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:687
+#: src/gns/gnunet-dns2gns.c:775
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:690
+#: src/gns/gnunet-dns2gns.c:778
+msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:781
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:703
+#: src/gns/gnunet-dns2gns.c:784
+msgid "Public key of the GNS zone to use (overrides default)"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:797
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:221
+#: src/gns/gnunet-gns.c:205
+#, c-format
+msgid "Please specify name to lookup!\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:285
+#, c-format
+msgid "Ego for `%s' not found, cannot perform lookup.\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:323
+#, c-format
+msgid ""
+"Ego for `master-zone' not found, cannot perform lookup.  Did you run gnunet-"
+"gns-import.sh?\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:352
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:335
+#: src/gns/gnunet-gns.c:365
 #, c-format
-msgid "Please specify lookup, shorten or authority operation!\n"
+msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:356
-#, fuzzy
-msgid "try to shorten a given name"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/gns/gnunet-gns.c:359
+#: src/gns/gnunet-gns.c:414
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:362
-msgid "Get the authority of a particular name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:365
+#: src/gns/gnunet-gns.c:417
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns.c:368
+#: src/gns/gnunet-gns.c:420
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:381
-msgid "GNUnet GNS access tool"
-msgstr ""
+#: src/gns/gnunet-gns.c:423
+#, fuzzy
+msgid "Specify the public key of the zone to lookup the record in"
+msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns-fcfsd.c:451
-#, fuzzy, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
+#: src/gns/gnunet-gns.c:426
+#, fuzzy
+msgid "Specify the name of the ego of the zone to lookup the record in"
+msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/gns/gnunet-gns-fcfsd.c:480
-#, fuzzy, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+#: src/gns/gnunet-gns.c:439
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "Bản ghi lỗi GNUnet"
 
-#: src/gns/gnunet-gns-fcfsd.c:524
+#: src/gns/gnunet-gns-proxy.c:60 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:960
+#: src/hostlist/hostlist-client.c:965
+#: src/transport/plugin_transport_http_client.c:1068
+#: src/transport/plugin_transport_http_client.c:1083
 #, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
+msgid "%s failed at %s:%d: `%s'\n"
+msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:587
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-fcfsd.c:649
+#: src/gns/gnunet-gns-proxy.c:2344
 #, fuzzy, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr "Không thể tạo miền tên.\n"
+msgid "Unable to import private key from file `%s'\n"
+msgstr "Không thể tạo tài khoản người dùng:"
 
-#: src/gns/gnunet-gns-fcfsd.c:665
+#: src/gns/gnunet-gns-proxy.c:2372
 #, fuzzy, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
+msgid "Unable to import certificate %s\n"
+msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/gns/gnunet-gns-fcfsd.c:701
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-fcfsd.c:709
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-fcfsd.c:913 src/namestore/gnunet-namestore.c:492
+#: src/gns/gnunet-gns-proxy.c:2637 src/namestore/gnunet-namestore-fcfsd.c:958
 #, fuzzy
-msgid "Failed to read or create private zone key\n"
-msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
-
-#: src/gns/gnunet-gns-fcfsd.c:923 src/namestore/gnunet-namestore.c:503
-#, fuzzy
-msgid "Failed to connect to namestore\n"
-msgstr "Không kết nối được đến trình nền gnunetd."
-
-#: src/gns/gnunet-gns-fcfsd.c:939 src/gns/gnunet-gns-proxy.c:2857
-#, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:973
-msgid "GNUnet GNS first come first serve registration service"
+#: src/gns/gnunet-gns-proxy.c:3020
+msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2494
-#, fuzzy, c-format
-msgid "Unable to import private key from file `%s'\n"
-msgstr "Không thể tạo tài khoản người dùng:"
+#: src/gns/gnunet-gns-proxy.c:3060
+msgid "No ego configured for `master-zone`\n"
+msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2522
+#: src/gns/gnunet-gns-proxy.c:3120
 #, fuzzy, c-format
-msgid "Unable to import certificate %s\n"
-msgstr "Không thể lưu tập tin cấu hình « %s »:"
+msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:3510
+#: src/gns/gnunet-gns-proxy.c:3156
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3513
+#: src/gns/gnunet-gns-proxy.c:3159
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3525
+#: src/gns/gnunet-gns-proxy.c:3178
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:497
-#, c-format
-msgid "Records for name `%s' in zone %s too large to fit into DHT"
-msgstr ""
-
-#: src/gns/gnunet-service-gns.c:1225
+#: src/gns/gnunet-service-gns.c:649
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/gns/gnunet-service-gns.c:1286
+#: src/gns/gnunet-service-gns.c:692
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/gns/gnunet-service-gns.c:1297
+#: src/gns/gnunet-service-gns.c:708
 #, fuzzy
-msgid "Unable to initialize resolver!\n"
-msgstr "Không thể sơ khởi SQLite: %s.\n"
+msgid "valid public key required"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:3446
+#: src/gns/gnunet-service-gns_interceptor.c:201
+#, fuzzy
+msgid "Error converting GNS response to DNS response!\n"
+msgstr "Gặp lỗi khi chuyển đổi các đối số sang URI.\n"
+
+#: src/gns/gnunet-service-gns_interceptor.c:307
+#, fuzzy
+msgid "Failed to connect to the DNS service!\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:717
+#, fuzzy
+msgid "Failed to parse DNS response\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:843
 #, c-format
-msgid "Not a GADS TLD: `%s'\n"
+msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
+#: src/gns/gnunet-service-gns_resolver.c:1475
+#, c-format
+msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1499
+msgid "GNS lookup recursion failed (no delegation record found)\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1523
+#, fuzzy, c-format
+msgid "Failed to cache GNS resolution: %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:1782
+#, c-format
+msgid "Hostname `%s' is not well-formed, resolution fails\n"
+msgstr ""
+
 #: src/hello/gnunet-hello.c:123
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3690,69 +3685,69 @@
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:945
+#: src/hello/hello.c:947
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:954
+#: src/hello/hello.c:956
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "Lỗi lưu cấu hình."
 
-#: src/hello/hello.c:964
+#: src/hello/hello.c:966
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/hello/hello.c:974
+#: src/hello/hello.c:976
 #, fuzzy
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/hello/hello.c:991
+#: src/hello/hello.c:993
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:1000
+#: src/hello/hello.c:1002
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1019
+#: src/hello/hello.c:1021
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:258
+#: src/hostlist/gnunet-daemon-hostlist.c:260
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:311
+#: src/hostlist/gnunet-daemon-hostlist.c:313
 #, fuzzy
 msgid "advertise our hostlist to other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:318
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:319
+#: src/hostlist/gnunet-daemon-hostlist.c:321
 #, fuzzy
 msgid "enable learning about hostlist servers from other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:323
+#: src/hostlist/gnunet-daemon-hostlist.c:325
 #, fuzzy
 msgid "provide a hostlist server"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:338
+#: src/hostlist/gnunet-daemon-hostlist.c:340
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -3776,17 +3771,7 @@
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
-#: 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:960 src/hostlist/hostlist-client.c:965
-#: src/transport/plugin_transport_http_client.c:1063
-#: src/transport/plugin_transport_http_client.c:1078
-#, c-format
-msgid "%s failed at %s:%d: `%s'\n"
-msgstr "%s bị lỗi tại %s:%d: « %s »\n"
-
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1319
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1330
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -3836,80 +3821,80 @@
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1503
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045
+#: src/hostlist/hostlist-client.c:1046
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1105 src/hostlist/hostlist-client.c:1121
+#: src/hostlist/hostlist-client.c:1106 src/hostlist/hostlist-client.c:1122
 #, fuzzy
 msgid "# active connections"
 msgstr "# các kết nối dht"
 
-#: src/hostlist/hostlist-client.c:1267
+#: src/hostlist/hostlist-client.c:1278
 #, 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:1271
+#: src/hostlist/hostlist-client.c:1282
 #, 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:1282
+#: src/hostlist/hostlist-client.c:1293
 #, 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:1315
+#: src/hostlist/hostlist-client.c:1326
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1317
+#: src/hostlist/hostlist-client.c:1328
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/hostlist-client.c:1362
+#: src/hostlist/hostlist-client.c:1373
 #, 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:1367
+#: src/hostlist/hostlist-client.c:1378
 #, 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:1391 src/hostlist/hostlist-client.c:1408
+#: src/hostlist/hostlist-client.c:1402 src/hostlist/hostlist-client.c:1419
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1403
+#: src/hostlist/hostlist-client.c:1414
 #, fuzzy
 msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả về"
 
-#: src/hostlist/hostlist-client.c:1457
+#: src/hostlist/hostlist-client.c:1468
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1469
+#: src/hostlist/hostlist-client.c:1480
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1481
+#: src/hostlist/hostlist-client.c:1492
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1485
+#: src/hostlist/hostlist-client.c:1496
 #, 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"
@@ -3989,7 +3974,7 @@
 msgstr ""
 
 #: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:659
-#: src/transport/gnunet-service-transport.c:785
+#: src/transport/gnunet-service-transport.c:806
 #, 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"
@@ -4014,99 +3999,114 @@
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/hostlist-server.c:675
+#: src/hostlist/hostlist-server.c:676
 #, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
 
-#: src/identity/gnunet-identity.c:135
+#: src/identity/gnunet-identity.c:165
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/identity/gnunet-identity.c:237
+#: src/identity/gnunet-identity.c:184
+#, fuzzy, c-format
+msgid "Failed to set default ego: %s\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/identity/gnunet-identity.c:327
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:240
+#: src/identity/gnunet-identity.c:330
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:243
+#: src/identity/gnunet-identity.c:333
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:246
+#: src/identity/gnunet-identity.c:336
+msgid ""
+"set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:339
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:255
+#: src/identity/gnunet-identity.c:342
+msgid ""
+"set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:351
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:336
+#: src/identity/gnunet-service-identity.c:337
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:357
+#: src/identity/gnunet-service-identity.c:360
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:434
-#: src/identity/gnunet-service-identity.c:665
-#: src/identity/gnunet-service-identity.c:773
+#: src/identity/gnunet-service-identity.c:437
+#: src/identity/gnunet-service-identity.c:668
+#: src/identity/gnunet-service-identity.c:776
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/gnunet-service-identity.c:441
+#: src/identity/gnunet-service-identity.c:444
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:511
+#: src/identity/gnunet-service-identity.c:514
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:642
+#: src/identity/gnunet-service-identity.c:645
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:681
-#: src/identity/gnunet-service-identity.c:790
+#: src/identity/gnunet-service-identity.c:684
+#: src/identity/gnunet-service-identity.c:793
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:824
+#: src/identity/gnunet-service-identity.c:827
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/identity/gnunet-service-identity.c:897
+#: src/identity/gnunet-service-identity.c:900
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/identity/gnunet-service-identity.c:909
+#: src/identity/gnunet-service-identity.c:912
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/integration-tests/connection_watchdog.c:990
+#: src/integration-tests/connection_watchdog.c:998
 #, fuzzy, c-format
 msgid "Transport plugin: `%s' port %llu\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/integration-tests/connection_watchdog.c:1023
+#: src/integration-tests/connection_watchdog.c:1031
 #, fuzzy, c-format
 msgid "Found %u transport plugins: `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/integration-tests/connection_watchdog.c:1082
+#: src/integration-tests/connection_watchdog.c:1091
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1091
-#: src/template/gnunet-template.c:70
+#: src/integration-tests/connection_watchdog.c:1100
+#: src/multicast/gnunet-multicast.c:70 src/template/gnunet-template.c:70
 msgid "help text"
 msgstr ""
 
@@ -4125,25 +4125,22 @@
 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:5640
+#: src/mesh/gnunet-service-mesh.c:5634 src/mesh/gnunet-service-mesh-enc.c:7060
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:5780 src/mesh/gnunet-service-mesh.c:5792
-#: src/mesh/gnunet-service-mesh.c:5804 src/mesh/gnunet-service-mesh.c:5816
-#: src/mesh/gnunet-service-mesh.c:5828 src/mesh/gnunet-service-mesh.c:5840
-#: src/nse/gnunet-service-nse.c:1425 src/nse/gnunet-service-nse.c:1443
+#: src/mesh/gnunet-service-mesh.c:5774 src/mesh/gnunet-service-mesh.c:5786
+#: src/mesh/gnunet-service-mesh.c:5798 src/mesh/gnunet-service-mesh.c:5810
+#: src/mesh/gnunet-service-mesh.c:5822 src/mesh/gnunet-service-mesh.c:5834
+#: src/nse/gnunet-service-nse.c:1440 src/nse/gnunet-service-nse.c:1458
 #: src/regex/gnunet-daemon-regexprofiler.c:270
-#: src/regex/gnunet-daemon-regexprofiler.c:282
-#: src/regex/gnunet-daemon-regexprofiler.c:294
-#: src/regex/gnunet-daemon-regexprofiler.c:307
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/mesh/gnunet-service-mesh.c:5852 src/mesh/gnunet-service-mesh.c:5862
-#: src/mesh/gnunet-service-mesh.c:5887
+#: src/mesh/gnunet-service-mesh.c:5846 src/mesh/gnunet-service-mesh.c:5856
+#: src/mesh/gnunet-service-mesh.c:5881
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -4159,201 +4156,231 @@
 msgid "Could not access file `%s': %s\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/namestore/gnunet-namestore.c:250
+#: src/namestore/gnunet-namestore.c:258
 #, fuzzy, c-format
 msgid "Adding record failed: %s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:281
+#: src/namestore/gnunet-namestore.c:289
 #, fuzzy, c-format
 msgid "Deleting record failed: %s\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/namestore/gnunet-namestore.c:342
+#: src/namestore/gnunet-namestore.c:338
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:358
-msgid "for at least"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:359
-msgid "until"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:475
+#: src/namestore/gnunet-namestore.c:446
 #, fuzzy, c-format
-msgid "Using default zone file `%s'\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
-
-#: src/namestore/gnunet-namestore.c:484
-#, fuzzy, c-format
 msgid "No options given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/namestore/gnunet-namestore.c:513 src/namestore/gnunet-namestore.c:522
-#: src/namestore/gnunet-namestore.c:539 src/namestore/gnunet-namestore.c:561
-#: src/namestore/gnunet-namestore.c:605
+#: src/namestore/gnunet-namestore.c:456
+#: src/namestore/gnunet-namestore-fcfsd.c:992
+#, fuzzy
+msgid "Failed to connect to namestore\n"
+msgstr "Không kết nối được đến trình nền gnunetd."
+
+#: src/namestore/gnunet-namestore.c:464 src/namestore/gnunet-namestore.c:473
+#: src/namestore/gnunet-namestore.c:490 src/namestore/gnunet-namestore.c:512
+#: src/namestore/gnunet-namestore.c:554
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/namestore/gnunet-namestore.c:514 src/namestore/gnunet-namestore.c:523
-#: src/namestore/gnunet-namestore.c:540 src/namestore/gnunet-namestore.c:562
+#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:474
+#: src/namestore/gnunet-namestore.c:491 src/namestore/gnunet-namestore.c:513
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:531
+#: src/namestore/gnunet-namestore.c:482
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/namestore/gnunet-namestore.c:551
+#: src/namestore/gnunet-namestore.c:502
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:587
+#: src/namestore/gnunet-namestore.c:538
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:606
+#: src/namestore/gnunet-namestore.c:555
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:649
+#: src/namestore/gnunet-namestore.c:588
 #: src/peerinfo-tool/gnunet-peerinfo.c:711
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/namestore/gnunet-namestore.c:727
+#: src/namestore/gnunet-namestore.c:645
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:674
+#, fuzzy, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "chỉ ra TRUYỀN_TẢI nào cần được thử nghiệm"
+
+#: src/namestore/gnunet-namestore.c:702
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:730
+#: src/namestore/gnunet-namestore.c:705
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:733
+#: src/namestore/gnunet-namestore.c:708
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:736
+#: src/namestore/gnunet-namestore.c:711
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:739
+#: src/namestore/gnunet-namestore.c:714
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/namestore/gnunet-namestore.c:742
+#: src/namestore/gnunet-namestore.c:717
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:745
+#: src/namestore/gnunet-namestore.c:720
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:748
+#: src/namestore/gnunet-namestore.c:723
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:751
+#: src/namestore/gnunet-namestore.c:726
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:754
+#: src/namestore/gnunet-namestore.c:729
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:757
-msgid "create or list non-authority record"
+#: src/namestore/gnunet-namestore.c:732
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:760
-#, fuzzy
-msgid "filename with the zone key"
-msgstr "tên tập tin"
+#: src/namestore/gnunet-namestore.c:735
+msgid "name of the ego controlling the zone"
+msgstr ""
 
-#: src/namestore/gnunet-namestore.c:771
+#: src/namestore/gnunet-namestore.c:746
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
 
-#: src/namestore/gnunet-service-namestore.c:300
-#: src/namestore/gnunet-service-namestore.c:318
+#: src/namestore/gnunet-namestore-fcfsd.c:456
 #, fuzzy, c-format
-msgid "Failed to write zone key to file `%s': %s\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+msgid "Unsupported form value `%s'\n"
+msgstr "Lệnh không được hỗ trợ « %s ». Đang hủy bỏ.\n"
 
-#: src/namestore/gnunet-service-namestore.c:302
-msgid "file exists but reading key failed"
+#: src/namestore/gnunet-namestore-fcfsd.c:485
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:320
-#, fuzzy
-msgid "file exists with different key"
-msgstr "tên tập tin"
+#: src/namestore/gnunet-namestore-fcfsd.c:560
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:2127
-msgid "No directory to load zonefiles specified in configuration\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:670
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "Không thể tạo miền tên.\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:686
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:722
+msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:2137
-#, c-format
-msgid "Creating directory `%s' for zone files failed!\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:730
+msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:346
-msgid "Namestore failed to add record"
+#: src/namestore/gnunet-namestore-fcfsd.c:932
+msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:372
-msgid "Namestore failed to add record\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:1027
+msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/namestore_api_common.c:532
-#: src/namestore/namestore_api_common.c:672
+#: src/namestore/gnunet-service-namestore.c:674
+msgid "Failed to cache encrypted block of my own zone!\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:319
+msgid "Namestore failed to cache block"
+msgstr ""
+
+#: src/namestore/namestore_api.c:345
+msgid "Namestore failed to store record\n"
+msgstr ""
+
+#: src/namestore/namestore_api_common.c:691
+#: src/namestore/namestore_api_common.c:831
 #, 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_api_common.c:539
+#: src/namestore/namestore_api_common.c:698
 #, 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_api_common.c:562
+#: src/namestore/namestore_api_common.c:721
 #, 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_api_common.c:585
+#: src/namestore/namestore_api_common.c:744
 #, 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_api_common.c:603
+#: src/namestore/namestore_api_common.c:762
 #, 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_api_common.c:616
+#: src/namestore/namestore_api_common.c:775
 #, 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_api_common.c:637
+#: src/namestore/namestore_api_common.c:796
 #, 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_api_common.c:663
+#: src/namestore/namestore_api_common.c:822
 #, 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"
@@ -4475,41 +4502,41 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:884
+#: src/nse/gnunet-nse-profiler.c:889
 #, 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:887
+#: src/nse/gnunet-nse-profiler.c:892
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:890 src/testbed/gnunet-testbed-profiler.c:284
+#: src/nse/gnunet-nse-profiler.c:895 src/testbed/gnunet-testbed-profiler.c:287
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:893
+#: src/nse/gnunet-nse-profiler.c:898
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:896
+#: src/nse/gnunet-nse-profiler.c:901
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:902
+#: src/nse/gnunet-nse-profiler.c:907
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:911
+#: src/nse/gnunet-nse-profiler.c:916
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/nse/gnunet-service-nse.c:1433
+#: src/nse/gnunet-service-nse.c:1448
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1472
+#: src/nse/gnunet-service-nse.c:1487
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -4518,21 +4545,21 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr "Đã nạp truyền tải « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:355
+#: src/peerinfo/gnunet-service-peerinfo.c:353
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:372
+#: src/peerinfo/gnunet-service-peerinfo.c:370
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s %u \n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:450
+#: src/peerinfo/gnunet-service-peerinfo.c:448
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:486
+#: src/peerinfo/gnunet-service-peerinfo.c:484
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
@@ -4540,22 +4567,22 @@
 "Tập tin « %s » trong thư mục « %s » không tùy theo quy ước đặt tên. Bị gỡ "
 "bỏ.\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:639
+#: src/peerinfo/gnunet-service-peerinfo.c:637
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:644
+#: src/peerinfo/gnunet-service-peerinfo.c:642
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:979
+#: src/peerinfo/gnunet-service-peerinfo.c:975
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1269
+#: src/peerinfo/gnunet-service-peerinfo.c:1265
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -4711,6 +4738,117 @@
 msgid "Unable to initialize Postgres: %s"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
+#: src/psycstore/gnunet-service-psycstore.c:203
+#, fuzzy
+msgid "Failed to store membership information!\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:227
+#, fuzzy
+msgid "Failed to test membership!\n"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:249
+#, fuzzy
+msgid "Failed to store fragment!\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:275
+#, fuzzy
+msgid "Failed to get fragment!\n"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:302
+#, fuzzy
+msgid "Failed to get message!\n"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:331
+#, fuzzy
+msgid "Failed to get message fragment!\n"
+msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:357
+#, fuzzy
+msgid "Failed to get master counters!\n"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:395
+#, fuzzy
+msgid "Failed to get slave counters!\n"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:429
+#: src/psycstore/gnunet-service-psycstore.c:502
+msgid "Tried to set invalid state variable name!\n"
+msgstr ""
+
+#: src/psycstore/gnunet-service-psycstore.c:445
+#, fuzzy
+msgid "Failed to begin modifying state!\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:468
+#, fuzzy, c-format
+msgid "Unknown operator: %c\n"
+msgstr "Không rõ thao tác « %s ».\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:478
+#, fuzzy
+msgid "Failed to end modifying state!\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:516
+#, fuzzy
+msgid "Failed to begin synchronizing state!\n"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:532
+#, fuzzy
+msgid "Failed to end synchronizing state!\n"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:552
+#: src/psycstore/gnunet-service-psycstore.c:571
+#, fuzzy
+msgid "Failed to reset state!\n"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:594
+#: src/psycstore/gnunet-service-psycstore.c:645
+msgid "Tried to get invalid state variable name!\n"
+msgstr ""
+
+#: src/psycstore/gnunet-service-psycstore.c:621
+#: src/psycstore/gnunet-service-psycstore.c:660
+#, fuzzy
+msgid "Failed to get state variable!\n"
+msgstr "Lỗi lấy thông kê về truyền tải.\n"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:60
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d with error: %s (%d)\n"
+msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:253
+#, fuzzy, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:276
+#, fuzzy, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr "Gặp lỗi khi tạo người dùng"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:1796
+#, fuzzy
+msgid "SQLite database running\n"
+msgstr "kho dữ liệu sqlite"
+
 #: src/pt/gnunet-daemon-pt.c:266
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
@@ -4777,70 +4915,70 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:384
+#: src/regex/gnunet-daemon-regexprofiler.c:380
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1279
+#: src/regex/gnunet-regex-profiler.c:1281
 #, fuzzy
 msgid "No configuration file given. Exiting\n"
 msgstr "dùng tập tin cấu hình TÊN_TẬP_TIN"
 
-#: src/regex/gnunet-regex-profiler.c:1290
+#: src/regex/gnunet-regex-profiler.c:1292
 #, fuzzy
 msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/regex/gnunet-regex-profiler.c:1319
+#: src/regex/gnunet-regex-profiler.c:1321
 #: 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:1325
+#: src/regex/gnunet-regex-profiler.c:1327
 #: 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:1332
+#: src/regex/gnunet-regex-profiler.c:1334
 #, 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:1341
+#: src/regex/gnunet-regex-profiler.c:1343
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1361
+#: src/regex/gnunet-regex-profiler.c:1363
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/regex/gnunet-regex-profiler.c:1443
+#: src/regex/gnunet-regex-profiler.c:1445
 #, 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:1446
+#: src/regex/gnunet-regex-profiler.c:1448
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1449
+#: src/regex/gnunet-regex-profiler.c:1451
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1452
+#: src/regex/gnunet-regex-profiler.c:1454
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1455
+#: src/regex/gnunet-regex-profiler.c:1457
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/regex/gnunet-regex-profiler.c:1467
+#: src/regex/gnunet-regex-profiler.c:1469
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4856,6 +4994,239 @@
 msgid "Profiler for regex library"
 msgstr ""
 
+#: src/scalarproduct/gnunet-scalarproduct.c:195
+#, fuzzy
+msgid "You must specify at least one message ID to check!\n"
+msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:201
+msgid "This program needs a session identifier for comparing vectors.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:207
+msgid "Please give a session key for --input_key!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:216
+#, c-format
+msgid ""
+"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
+"valid peer identifier.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:240
+#: src/scalarproduct/gnunet-scalarproduct.c:298
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int32_t.\n"
+msgstr "Không thể kết nối tới %s:%u: %s\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:247
+msgid "Need elements to compute the vectorproduct, got none.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:348
+msgid ""
+"A comma separated list of elements to compare as vector with our remote peer."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:351
+msgid ""
+"A comma separated mask to select which elements should actually be compared."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:354
+msgid ""
+"[Optional] peer to calculate our scalarproduct with. If this parameter is "
+"not given, the service will wait for a remote peer to compute the request."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:357
+msgid "Transaction ID shared with peer."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:366
+msgid "Calculate the Vectorproduct with a GNUnet peer."
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:381
+#, c-format
+msgid "Generated key set with key length %d bits.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:691
+#, fuzzy, c-format
+msgid "Client (%p) disconnected from us.\n"
+msgstr "« %.*s » được kết nối tới « %.*s ».\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:762
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1696
+#, fuzzy, c-format
+msgid "Could not send message to client (%p)!\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:768
+#, c-format
+msgid "Sending session-end notification to client (%p) for session %s\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:891
+msgid "Message too large, fragmentation is currently not supported!)\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:896
+msgid "Could not send service-response message via mesh!)\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1092
+#, c-format
+msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1145
+#, fuzzy, c-format
+msgid "Successfully created new tunnel to peer (%s)!\n"
+msgstr "Không đủ quyền cho « %s ».\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1157
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1873
+msgid "Message too large, fragmentation is currently not supported!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1223
+#, fuzzy
+msgid "Transmitting service request.\n"
+msgstr "Đang nạp và khởi động dùng « %s ».\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1233
+#, fuzzy
+msgid "Could not send mutlicast message to tunnel!\n"
+msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1283
+#, fuzzy
+msgid "Too short message received from client!\n"
+msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1297
+#, fuzzy
+msgid "Invalid message received from client, session information incorrect!\n"
+msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1309
+#, c-format
+msgid ""
+"Duplicate session information received, cannot create new session with key `"
+"%s'\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1330
+#, c-format
+msgid ""
+"Got client-request-session with key %s, preparing tunnel to remote service.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1369
+#, c-format
+msgid "Creating new tunnel to for session with key %s.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1417
+#, c-format
+msgid ""
+"Got client-responder-session with key %s and a matching service-request-"
+"session set, processing.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1425
+#, c-format
+msgid ""
+"Got client-responder-session with key %s but NO matching service-request-"
+"session set, queuing element for later use.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
+#, c-format
+msgid "Peer disconnected, terminating session %s with peer (%s)\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1706
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1790
+#, c-format
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1813
+msgid "Could not translate remote public key to sexpression!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1849
+#, fuzzy, c-format
+msgid ""
+"Could not translate E[a%d] to MPI!\n"
+"%s/%s\n"
+msgstr "Không thể lấy địa chỉ IP cho giao diện « %s », dùng « %s ».\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1857
+#, c-format
+msgid "Got session with key %s and a matching element set, processing.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1866
+#, c-format
+msgid "Got session with key %s without a matching element set, queueing.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2039
+msgid "Shutting down, initiating cleanup.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+msgid "Generating Paillier-Keyset.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2116
+#, fuzzy
+msgid "Connect to MESH failed\n"
+msgstr " Không kết nối được (lỗi ?)\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2120
+#, fuzzy
+msgid "Mesh initialized\n"
+msgstr "Lỗi sơ khởi lõi.\n"
+
+#: src/scalarproduct/scalarproduct_api.c:243
+#, fuzzy
+msgid "# SUC responder result messages received"
+msgstr "# các thông báo phát hiện dht được nhận"
+
+#: src/scalarproduct/scalarproduct_api.c:297
+#, fuzzy
+msgid "# bytes sent to scalarproduct"
+msgstr "# các byte trong kho dữ liệu"
+
+#: src/scalarproduct/scalarproduct_api.c:340
+#: src/scalarproduct/scalarproduct_api.c:433
+#, fuzzy
+msgid "Failed to connect to the scalarproduct service\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/scalarproduct/scalarproduct_api.c:348
+#: src/scalarproduct/scalarproduct_api.c:441
+#, fuzzy
+msgid "Failed to send a message to the statistics service\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/scalarproduct/scalarproduct_api.c:382
+#: src/scalarproduct/scalarproduct_api.c:478
+#, fuzzy
+msgid "Failed to send a message to the scalarproduct service\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
 #: src/set/gnunet-set-ibf-profiler.c:224
 #, fuzzy
 msgid "number of element in set A-B"
@@ -4892,78 +5263,83 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr "Đã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:141
+#: src/statistics/gnunet-statistics.c:142
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:143
+#: src/statistics/gnunet-statistics.c:144
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Lỗi lấy thông kê về truyền tải.\n"
 
-#: src/statistics/gnunet-statistics.c:186
+#: src/statistics/gnunet-statistics.c:191
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:192
+#: src/statistics/gnunet-statistics.c:197
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:223
+#: src/statistics/gnunet-statistics.c:228
 #, fuzzy, c-format
 msgid "No subsystem or name given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/statistics/gnunet-statistics.c:231
+#: src/statistics/gnunet-statistics.c:236
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:258
+#: src/statistics/gnunet-statistics.c:263
 #, fuzzy, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:266
+#: src/statistics/gnunet-statistics.c:271
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/statistics/gnunet-statistics.c:273
+#: src/statistics/gnunet-statistics.c:278
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:331
+#: src/statistics/gnunet-statistics.c:310
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "Đối số không hợp lệ cho « %s ».\n"
+
+#: src/statistics/gnunet-statistics.c:336
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:334
+#: src/statistics/gnunet-statistics.c:339
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:337
+#: src/statistics/gnunet-statistics.c:342
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:345
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:343
+#: src/statistics/gnunet-statistics.c:348
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:351
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:354
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:361
+#: src/statistics/gnunet-statistics.c:366
 msgid "Print statistics about GNUnet operations."
 msgstr "In ra thống kê về các thao tác GNUnet."
 
@@ -4978,27 +5354,22 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/sysmon/gnunet-service-sysmon.c:546
-#, c-format
-msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
-msgstr ""
-
 #: src/testbed/gnunet-service-testbed_cpustatus.c:727
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:964
+#: src/testbed/gnunet-service-testbed_peers.c:973
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:970
+#: src/testbed/gnunet-service-testbed_peers.c:979
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1008
+#: src/testbed/gnunet-service-testbed_peers.c:1017
 #, fuzzy, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr "« %s » đang tắt.\n"
@@ -5018,230 +5389,243 @@
 msgid "Spawning process `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/testbed/gnunet-testbed-profiler.c:251
+#: src/testbed/gnunet-testbed-profiler.c:254
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/testbed/gnunet-testbed-profiler.c:277
+#: src/testbed/gnunet-testbed-profiler.c:280
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:280
+#: src/testbed/gnunet-testbed-profiler.c:283
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:459
+#: src/testbed/testbed_api_hosts.c:415
 #, 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:467
+#: src/testbed/testbed_api_hosts.c:423
 #, 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:474
+#: src/testbed/testbed_api_hosts.c:430
 #, fuzzy, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_hosts.c:595
+#: src/testbed/testbed_api_hosts.c:570
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1878
+#: src/testbed/testbed_api_hosts.c:1572
 #, 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:802
+#: src/testbed/testbed_api_testbed.c:820
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:944
+#: src/testbed/testbed_api_testbed.c:989
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1009
+#: src/testbed/testbed_api_testbed.c:1055
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1111
+#: src/testbed/testbed_api_testbed.c:1144
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1115
+#: src/testbed/testbed_api_testbed.c:1148
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1153
+#: src/testbed/testbed_api_testbed.c:1186
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1171
+#: src/testbed/testbed_api_testbed.c:1204
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1231
+#: src/testbed/testbed_api_testbed.c:1264
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1243
+#: src/testbed/testbed_api_testbed.c:1276
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1267
+#: src/testbed/testbed_api_testbed.c:1300
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:670
+#: src/testbed/testbed_api_testbed.c:1350
+#, c-format
+msgid ""
+"Maximum number of edges a peer can have in a scale free topology cannot be "
+"more than %u.  Given `%s = %llu'"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1366
+#, c-format
+msgid ""
+"The number of edges that can established when adding a new node to scale "
+"free topology cannot be more than %u.  Given `%s = %llu'"
+msgstr ""
+
+#: src/testbed/testbed_api_topology.c:716
 #, fuzzy, c-format
 msgid "Topology file %s not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:676
+#: src/testbed/testbed_api_topology.c:722
 #, fuzzy, c-format
 msgid "Topology file %s has no data\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:683
+#: src/testbed/testbed_api_topology.c:729
 #, fuzzy, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/testbed/testbed_api_topology.c:706
+#: src/testbed/testbed_api_topology.c:751
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/testbed/testbed_api_topology.c:715
-#: src/testbed/testbed_api_topology.c:739
+#: src/testbed/testbed_api_topology.c:760
+#: src/testbed/testbed_api_topology.c:784
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:721
-#: src/testbed/testbed_api_topology.c:745
+#: src/testbed/testbed_api_topology.c:766
+#: src/testbed/testbed_api_topology.c:790
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/testbed/testbed_api_topology.c:727
-#: src/testbed/testbed_api_topology.c:751
+#: src/testbed/testbed_api_topology.c:772
+#: src/testbed/testbed_api_topology.c:796
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:766
+#: src/testbed/testbed_api_topology.c:811
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "đang kết nối đồng đẳng %s:%d tới đồng đẳng %s:%d\n"
 
-#: src/testing/gnunet-testing.c:130
+#: src/testing/gnunet-testing.c:173
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/testing/gnunet-testing.c:199
+#: src/testing/gnunet-testing.c:258
+#, c-format
+msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+msgstr ""
+
+#: src/testing/gnunet-testing.c:355
 #, 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:201
+#: src/testing/gnunet-testing.c:357
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:203
+#: src/testing/gnunet-testing.c:359
 #, 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:205
+#: src/testing/gnunet-testing.c:361
 #, fuzzy
 msgid "configuration template"
 msgstr "Cấu hình đã được lưu."
 
-#: src/testing/gnunet-testing.c:214
-msgid "Command line tool to access the testing library"
+#: src/testing/gnunet-testing.c:363
+msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing-run-service.c:129
-#, c-format
-msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+#: src/testing/gnunet-testing.c:376
+msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/gnunet-testing-run-service.c:186
-#, fuzzy
-msgid "name of the template configuration file to use (optional)"
-msgstr "Tập tin cấu hình gnunetd có đường dẫn nào?"
-
-#: src/testing/gnunet-testing-run-service.c:189
-msgid "name of the service to run"
-msgstr ""
-
-#: src/testing/testing.c:288
+#: src/testing/testing.c:276
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:304
+#: src/testing/testing.c:292
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:722
+#: src/testing/testing.c:711
 #, 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:733
+#: src/testing/testing.c:722
 #, 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:1177
-#, fuzzy
-msgid "Failed to create configuration for peer (not enough free ports?)\n"
-msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
-
-#: src/testing/testing.c:1184
+#: src/testing/testing.c:1158
 #, 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:1193
+#: src/testing/testing.c:1167
 #, 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:1209
+#: src/testing/testing.c:1177
+msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
+msgstr ""
+
+#: src/testing/testing.c:1190
+#, 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:1204
 #, fuzzy, c-format
-msgid "Cannot open hostkey file: %s\n"
+msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/testing/testing.c:1219
+#: src/testing/testing.c:1216
 #, 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:1241
+#: src/testing/testing.c:1238
 #, 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:1341
+#: src/testing/testing.c:1338
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/testing/testing.c:1707
+#: src/testing/testing.c:1702
 #, 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 »:"
@@ -5261,85 +5645,85 @@
 msgid "# friends connected"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/topology/gnunet-daemon-topology.c:987
+#: src/topology/gnunet-daemon-topology.c:986
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1030
+#: src/topology/gnunet-daemon-topology.c:1031
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1036
+#: src/topology/gnunet-daemon-topology.c:1037
 #, fuzzy, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr "Định dạng của tập tin « %s » là không hợp lệ.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1045
+#: src/topology/gnunet-daemon-topology.c:1046
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1053
+#: src/topology/gnunet-daemon-topology.c:1054
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/topology/gnunet-daemon-topology.c:1073
+#: src/topology/gnunet-daemon-topology.c:1074
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1086
+#: src/topology/gnunet-daemon-topology.c:1087
 #, fuzzy, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
 
-#: src/topology/gnunet-daemon-topology.c:1096
+#: src/topology/gnunet-daemon-topology.c:1097
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1102
+#: src/topology/gnunet-daemon-topology.c:1103
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1112
+#: src/topology/gnunet-daemon-topology.c:1113
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1118
+#: src/topology/gnunet-daemon-topology.c:1119
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 "Xác định quá ít bạn bè (dưới số tối thiểu). Sẽ chỉ kết nối tới bạn bè.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1125
+#: src/topology/gnunet-daemon-topology.c:1126
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr "Cần thiết nhiều kết nối bạn bè hơn tổng số kết nối đích.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1156
+#: src/topology/gnunet-daemon-topology.c:1157
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/topology/gnunet-daemon-topology.c:1211
+#: src/topology/gnunet-daemon-topology.c:1212
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# các thông báo gửi đi bị loại bỏ"
 
-#: src/topology/gnunet-daemon-topology.c:1350
+#: src/topology/gnunet-daemon-topology.c:1351
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -5354,21 +5738,21 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:453
-#: src/transport/gnunet-service-transport_blacklist.c:718
+#: src/transport/gnunet-service-transport_blacklist.c:717
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:169
+#: src/transport/gnunet-service-transport.c:168
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Các quảng cáo đồng đẳng bị hủy do trọng tải"
 
-#: src/transport/gnunet-service-transport.c:235
+#: src/transport/gnunet-service-transport.c:234
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# tổng số nội dung lỗ hổng được nhận"
 
-#: src/transport/gnunet-service-transport.c:282
+#: src/transport/gnunet-service-transport.c:281
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# các byte đã giải mã"
@@ -5385,7 +5769,7 @@
 "`%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:754
+#: src/transport/gnunet-service-transport.c:775
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5423,7 +5807,7 @@
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
 #: src/transport/gnunet-service-transport_neighbours.c:1346
-#: src/transport/gnunet-service-transport_neighbours.c:1678
+#: src/transport/gnunet-service-transport_neighbours.c:1681
 #, fuzzy
 msgid "# bytes in message queue for other peers"
 msgstr "# các byte thông báo gửi đi bị loại bỏ"
@@ -5467,67 +5851,67 @@
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1584
+#: src/transport/gnunet-service-transport_neighbours.c:1586
 #, fuzzy
 msgid "# messages discarded due to lack of neighbour record"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1618
+#: src/transport/gnunet-service-transport_neighbours.c:1620
 #, fuzzy
 msgid "# bandwidth quota violations by other peers"
 msgstr "theo dõi gnunetd sử dụng dải thông"
 
-#: src/transport/gnunet-service-transport_neighbours.c:1634
+#: src/transport/gnunet-service-transport_neighbours.c:1636
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2769
+#: src/transport/gnunet-service-transport_neighbours.c:2775
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2784
-#: src/transport/gnunet-service-transport_neighbours.c:2815
+#: src/transport/gnunet-service-transport_neighbours.c:2790
+#: src/transport/gnunet-service-transport_neighbours.c:2821
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2828
+#: src/transport/gnunet-service-transport_neighbours.c:2834
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:2859
+#: src/transport/gnunet-service-transport_neighbours.c:2865
 #, fuzzy
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr "gửi ĐẾM thông báo"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3040
+#: src/transport/gnunet-service-transport_neighbours.c:3046
 #, fuzzy
 msgid "# unexpected SESSION ACK messages"
 msgstr "# các thông báo PONG đã mật mã được gửi"
 
-#: src/transport/gnunet-service-transport_neighbours.c:3093
+#: src/transport/gnunet-service-transport_neighbours.c:3099
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
+#: src/transport/gnunet-service-transport_neighbours.c:3113
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3144
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3149
+#: src/transport/gnunet-service-transport_neighbours.c:3155
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3194
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3283
+#: src/transport/gnunet-service-transport_neighbours.c:3289
 #, fuzzy
 msgid "# disconnected from peer upon explicit request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
@@ -5569,50 +5953,50 @@
 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:664
+#: src/transport/gnunet-service-transport_validation.c:660
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:930
+#: src/transport/gnunet-service-transport_validation.c:928
 #, 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:989
+#: src/transport/gnunet-service-transport_validation.c:987
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:999
+#: src/transport/gnunet-service-transport_validation.c:997
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1018
+#: src/transport/gnunet-service-transport_validation.c:1016
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1072
+#: src/transport/gnunet-service-transport_validation.c:1070
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1117
+#: src/transport/gnunet-service-transport_validation.c:1115
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1126
+#: src/transport/gnunet-service-transport_validation.c:1124
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1253
+#: src/transport/gnunet-service-transport_validation.c:1251
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1268
+#: src/transport/gnunet-service-transport_validation.c:1266
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1374
+#: src/transport/gnunet-service-transport_validation.c:1372
 #, 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"
@@ -5845,41 +6229,41 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:815
-#: src/transport/plugin_transport_http_server.c:2585
+#: src/transport/plugin_transport_http_server.c:2614
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:864
-#: src/transport/plugin_transport_http_server.c:2353
+#: src/transport/plugin_transport_http_server.c:2382
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Lỗi lưu cấu hình."
 
 #: src/transport/plugin_transport_http.c:896
-#: src/transport/plugin_transport_http_server.c:2385 src/util/service.c:1062
+#: src/transport/plugin_transport_http_server.c:2414 src/util/service.c:1062
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
 #: src/transport/plugin_transport_http.c:913
-#: src/transport/plugin_transport_http_server.c:2402 src/util/service.c:1079
+#: src/transport/plugin_transport_http_server.c:2431 src/util/service.c:1079
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
 #: src/transport/plugin_transport_http.c:1018
-#: src/transport/plugin_transport_http_server.c:2513
+#: src/transport/plugin_transport_http_server.c:2542
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1131
-#: src/transport/plugin_transport_http_server.c:2693
+#: src/transport/plugin_transport_http_server.c:2722
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1144
-#: src/transport/plugin_transport_http_server.c:2704
+#: src/transport/plugin_transport_http_server.c:2733
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
@@ -5905,7 +6289,7 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2819
+#: src/transport/plugin_transport_http_server.c:2848
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
@@ -5914,93 +6298,93 @@
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1582
+#: src/transport/plugin_transport_http_client.c:1587
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1713
-#: src/transport/plugin_transport_http_server.c:2943
+#: src/transport/plugin_transport_http_client.c:1724
+#: src/transport/plugin_transport_http_server.c:2978
 #, 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:1738
-#: src/transport/plugin_transport_http_server.c:3003
+#: src/transport/plugin_transport_http_client.c:1749
+#: src/transport/plugin_transport_http_server.c:3038
 #, 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:1766
-#: src/transport/plugin_transport_http_server.c:2849
+#: src/transport/plugin_transport_http_client.c:1777
+#: src/transport/plugin_transport_http_server.c:2878
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/transport/plugin_transport_http_server.c:1368
+#: src/transport/plugin_transport_http_server.c:1379
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1632
+#: src/transport/plugin_transport_http_server.c:1644
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1640
+#: src/transport/plugin_transport_http_server.c:1652
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1941
+#: src/transport/plugin_transport_http_server.c:1953
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1965
+#: src/transport/plugin_transport_http_server.c:1977
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2672
+#: src/transport/plugin_transport_http_server.c:2701
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2686
+#: src/transport/plugin_transport_http_server.c:2715
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2711
+#: src/transport/plugin_transport_http_server.c:2740
 #, fuzzy, c-format
 msgid "Using port %u\n"
 msgstr "Đang thử nghiệm (các) truyền tải %s\n"
 
-#: src/transport/plugin_transport_http_server.c:2726
+#: src/transport/plugin_transport_http_server.c:2755
 #, fuzzy, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/transport/plugin_transport_http_server.c:2736
+#: src/transport/plugin_transport_http_server.c:2765
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/transport/plugin_transport_http_server.c:2757
+#: src/transport/plugin_transport_http_server.c:2786
 #, fuzzy, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/transport/plugin_transport_http_server.c:2767
+#: src/transport/plugin_transport_http_server.c:2796
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/transport/plugin_transport_http_server.c:2835
+#: src/transport/plugin_transport_http_server.c:2864
 #, fuzzy, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr "không quyết định các tên máy"
@@ -6047,92 +6431,92 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr "# các byte loại đi bởi SMTP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:627
+#: src/transport/plugin_transport_tcp.c:626
 #, fuzzy, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/transport/plugin_transport_tcp.c:836
-#: src/transport/plugin_transport_tcp.c:925
-#: src/transport/plugin_transport_tcp.c:975
-#: src/transport/plugin_transport_tcp.c:1061
-#: src/transport/plugin_transport_tcp.c:1204
-#: src/transport/plugin_transport_tcp.c:1221
+#: src/transport/plugin_transport_tcp.c:834
+#: src/transport/plugin_transport_tcp.c:923
+#: src/transport/plugin_transport_tcp.c:973
+#: src/transport/plugin_transport_tcp.c:1059
+#: src/transport/plugin_transport_tcp.c:1202
+#: src/transport/plugin_transport_tcp.c:1219
 #, fuzzy
 msgid "# bytes currently in TCP buffers"
 msgstr "# các byte đã gừi qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:843
-#: src/transport/plugin_transport_tcp.c:1032
-#: src/transport/plugin_transport_tcp.c:2013
-#: src/transport/plugin_transport_tcp.c:2688
+#: src/transport/plugin_transport_tcp.c:841
+#: src/transport/plugin_transport_tcp.c:1030
+#: src/transport/plugin_transport_tcp.c:2009
+#: src/transport/plugin_transport_tcp.c:2690
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_tcp.c:929
+#: src/transport/plugin_transport_tcp.c:927
 #, fuzzy
 msgid "# bytes discarded by TCP (timeout)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:978
+#: src/transport/plugin_transport_tcp.c:976
 #, fuzzy
 msgid "# bytes transmitted via TCP"
 msgstr "# các byte được gửi"
 
-#: src/transport/plugin_transport_tcp.c:1065
+#: src/transport/plugin_transport_tcp.c:1063
 #, fuzzy
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/transport/plugin_transport_tcp.c:1178
+#: src/transport/plugin_transport_tcp.c:1176
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1415
-#: src/transport/plugin_transport_udp.c:1454
+#: src/transport/plugin_transport_tcp.c:1413
+#: src/transport/plugin_transport_udp.c:1449
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1532
+#: src/transport/plugin_transport_tcp.c:1530
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2063
+#: src/transport/plugin_transport_tcp.c:2059
 #, fuzzy
 msgid "# TCP WELCOME messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_tcp.c:2246
+#: src/transport/plugin_transport_tcp.c:2242
 msgid "# bytes received via TCP"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_tcp.c:2326
+#: src/transport/plugin_transport_tcp.c:2322
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2568 src/util/service.c:957
+#: src/transport/plugin_transport_tcp.c:2570 src/util/service.c:957
 #: src/util/service.c:963
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2582
+#: src/transport/plugin_transport_tcp.c:2584
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2675
+#: src/transport/plugin_transport_tcp.c:2677
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2679
+#: src/transport/plugin_transport_tcp.c:2681
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2683
+#: src/transport/plugin_transport_tcp.c:2685
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -6147,31 +6531,31 @@
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:403
+#: src/transport/plugin_transport_udp_broadcasting.c:402
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:420
+#: src/transport/plugin_transport_udp_broadcasting.c:419
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1556
+#: src/transport/plugin_transport_udp.c:1555
 #, c-format
 msgid ""
 "Trying to create session for address of unexpected length %u (should be %u "
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2587
+#: src/transport/plugin_transport_udp.c:2590
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2601
+#: src/transport/plugin_transport_udp.c:2604
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -6179,103 +6563,103 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2901
+#: src/transport/plugin_transport_udp.c:2905
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_udp.c:2999
+#: src/transport/plugin_transport_udp.c:3003
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3042
+#: src/transport/plugin_transport_udp.c:3046
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/transport/plugin_transport_udp.c:3101
+#: src/transport/plugin_transport_udp.c:3105
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/transport/plugin_transport_unix.c:1641
+#: src/transport/plugin_transport_unix.c:1640
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_wlan.c:610
+#: src/transport/plugin_transport_wlan.c:623
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:629
+#: src/transport/plugin_transport_wlan.c:642
 #, fuzzy
 msgid "# WLAN messages defragmented"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:675
-#: src/transport/plugin_transport_wlan.c:742
-#: src/transport/plugin_transport_wlan.c:1874
+#: src/transport/plugin_transport_wlan.c:688
+#: src/transport/plugin_transport_wlan.c:756
+#: src/transport/plugin_transport_wlan.c:1899
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_wlan.c:835
+#: src/transport/plugin_transport_wlan.c:860
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# các thông báo bị tế phân"
 
-#: src/transport/plugin_transport_wlan.c:859
+#: src/transport/plugin_transport_wlan.c:884
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:967
-#: src/transport/plugin_transport_wlan.c:1052
-#: src/transport/plugin_transport_wlan.c:1876
+#: src/transport/plugin_transport_wlan.c:992
+#: src/transport/plugin_transport_wlan.c:1077
+#: src/transport/plugin_transport_wlan.c:1901
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# các yêu cầu get (lấy) dht được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1247
+#: src/transport/plugin_transport_wlan.c:1272
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1273
+#: src/transport/plugin_transport_wlan.c:1298
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:1283
+#: src/transport/plugin_transport_wlan.c:1308
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_wlan.c:1340
+#: src/transport/plugin_transport_wlan.c:1365
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# các thông báo được chắp liền"
 
-#: src/transport/plugin_transport_wlan.c:1460
+#: src/transport/plugin_transport_wlan.c:1485
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1495
+#: src/transport/plugin_transport_wlan.c:1520
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/transport/plugin_transport_wlan.c:1558
+#: src/transport/plugin_transport_wlan.c:1583
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_wlan.c:1671
+#: src/transport/plugin_transport_wlan.c:1696
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1855
+#: src/transport/plugin_transport_wlan.c:1880
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
@@ -6290,31 +6674,31 @@
 msgid "Failed to initialize testing library!\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/util/bio.c:136 src/util/bio.c:142
+#: src/util/bio.c:137 src/util/bio.c:145
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/bio.c:143
+#: src/util/bio.c:147
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:195
+#: src/util/bio.c:199
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:205
+#: src/util/bio.c:209
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:250
+#: src/util/bio.c:254
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:264
+#: src/util/bio.c:268
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
@@ -6355,55 +6739,55 @@
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1034
+#: src/util/common_logging.c:256 src/util/common_logging.c:1033
 msgid "DEBUG"
 msgstr "GỠ LỖI"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1032
+#: src/util/common_logging.c:258 src/util/common_logging.c:1031
 msgid "INFO"
 msgstr "TIN"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1030
+#: src/util/common_logging.c:260 src/util/common_logging.c:1029
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1028
+#: src/util/common_logging.c:262 src/util/common_logging.c:1027
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/common_logging.c:266 src/util/common_logging.c:1036
+#: src/util/common_logging.c:264 src/util/common_logging.c:1035
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:395
+#: src/util/common_logging.c:393
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/util/common_logging.c:819
+#: src/util/common_logging.c:817
 #, fuzzy, c-format
 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:1037
+#: src/util/common_logging.c:1036
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1176
+#: src/util/common_logging.c:1138
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1215
+#: src/util/common_logging.c:1177
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1233
+#: src/util/common_logging.c:1195
 #, 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:1254
+#: src/util/common_logging.c:1216
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -6424,28 +6808,28 @@
 "Giá trị cấu hình « %s » cho « %s » trong phần « %s » không phải nằm trong "
 "tập hợp các sự chọn được phép\n"
 
-#: src/util/connection.c:427
+#: src/util/connection.c:424
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "Không đủ quyền cho « %s ».\n"
 
-#: src/util/connection.c:442
+#: src/util/connection.c:439
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:557
+#: src/util/connection.c:554
 #, fuzzy, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr "Lỗi thiết lập kết nối với đồng đẳng.\n"
 
-#: src/util/connection.c:755 src/util/connection.c:922
+#: src/util/connection.c:752 src/util/connection.c:919
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/util/connection.c:913
+#: src/util/connection.c:910
 #, fuzzy, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr " Lỗi kết nối\n"
@@ -6457,41 +6841,41 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:534 src/util/crypto_ecc.c:572
+#: src/util/crypto_ecc.c:580 src/util/crypto_ecc.c:618
 #, 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:539
+#: src/util/crypto_ecc.c:585
 #, 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:576
+#: src/util/crypto_ecc.c:622
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:607
+#: src/util/crypto_ecc.c:653
 #, 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:612
+#: src/util/crypto_ecc.c:658
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:694
+#: src/util/crypto_ecc.c:741
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/util/crypto_ecc.c:756
+#: src/util/crypto_ecc.c:803
 #, 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:836
+#: src/util/crypto_ecc.c:883
 #, 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"
@@ -6506,17 +6890,17 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/util/disk.c:1149
+#: src/util/disk.c:1150
 #, 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:1506 src/util/service.c:1679
+#: src/util/disk.c:1507 src/util/service.c:1674
 #, 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:1953
+#: src/util/disk.c:1954
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
@@ -6631,59 +7015,55 @@
 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:65
+#: src/util/gnunet-ecc.c:60
 #, 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:71
+#: src/util/gnunet-ecc.c:66
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:87
+#: src/util/gnunet-ecc.c:82
 #, 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:97
+#: src/util/gnunet-ecc.c:92
 #, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:100
+#: src/util/gnunet-ecc.c:95
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:123
+#: src/util/gnunet-ecc.c:118
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:178
+#: src/util/gnunet-ecc.c:163
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:181
+#: src/util/gnunet-ecc.c:166
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:169
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:187
-msgid "print the short hash of the public key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:198
+#: src/util/gnunet-ecc.c:180
 #, 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"
@@ -6746,12 +7126,12 @@
 msgid "Error writing to `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/network.c:127
+#: src/util/network.c:132
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1344
+#: src/util/network.c:1370
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -6799,62 +7179,62 @@
 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:1801
+#: src/util/program.c:254 src/util/service.c:1796
 #, 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/resolver_api.c:202
+#: src/util/resolver_api.c:198
 #, fuzzy, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr "Đang thử dùng tập tin « %s » cho cấu hình MySQL.\n"
 
-#: src/util/resolver_api.c:221
+#: src/util/resolver_api.c:217
 #, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:347
+#: src/util/resolver_api.c:343
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet bây giờ sử dụng địa chỉ IP %s.\n"
 
-#: src/util/resolver_api.c:351
+#: src/util/resolver_api.c:347
 #, fuzzy, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr "không quyết định các tên máy"
 
-#: src/util/resolver_api.c:890
+#: src/util/resolver_api.c:886
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/scheduler.c:782
+#: src/util/scheduler.c:802
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:912
+#: src/util/scheduler.c:933
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:476
+#: src/util/server.c:482
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/util/server.c:485
+#: src/util/server.c:491
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/util/server.c:496
+#: src/util/server.c:502
 #, fuzzy, c-format
 msgid "`%s' failed for `%.*s': address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/util/server.c:888
+#: src/util/server.c:894
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -6934,48 +7314,48 @@
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1318 src/util/service.c:1336
+#: src/util/service.c:1316 src/util/service.c:1334
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1363
+#: src/util/service.c:1359
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1535
+#: src/util/service.c:1530
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/service.c:1568
+#: src/util/service.c:1563
 #, 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:1617
+#: src/util/service.c:1612
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1621
+#: src/util/service.c:1616
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1625
+#: src/util/service.c:1620
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1680
+#: src/util/service.c:1675
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/util/service.c:1693
+#: src/util/service.c:1688
 #, 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:1759
+#: src/util/service.c:1754
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6988,76 +7368,80 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:425
+#: src/util/strings.c:429
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:540
+#: src/util/strings.c:544
 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:637
-msgid "ms"
-msgstr "mg"
+#: src/util/strings.c:641
+msgid "µs"
+msgstr ""
 
-#: src/util/strings.c:641
+#: src/util/strings.c:645
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:643
+#: src/util/strings.c:647
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:649
+#: src/util/strings.c:653
+msgid "ms"
+msgstr "mg"
+
+#: src/util/strings.c:659
 msgid "s"
 msgstr "g"
 
-#: src/util/strings.c:655
+#: src/util/strings.c:665
 msgid "m"
 msgstr "p"
 
-#: src/util/strings.c:661
+#: src/util/strings.c:671
 msgid "h"
 msgstr "g"
 
-#: src/util/strings.c:668
+#: src/util/strings.c:678
 #, fuzzy
 msgid "day"
 msgstr " ngày"
 
-#: src/util/strings.c:670
+#: src/util/strings.c:680
 #, fuzzy
 msgid "days"
 msgstr " ngày"
 
-#: src/util/strings.c:697
+#: src/util/strings.c:708
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1098
+#: src/util/strings.c:1109
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1106
+#: src/util/strings.c:1117
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1112
+#: src/util/strings.c:1123
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1119
+#: src/util/strings.c:1130
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1128
+#: src/util/strings.c:1139
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1130
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1128
 #, fuzzy
 msgid "# Active tunnels"
 msgstr "# các kết nối dht"
@@ -7092,70 +7476,88 @@
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1350
+#: src/vpn/gnunet-service-vpn.c:1348
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1371
+#: src/vpn/gnunet-service-vpn.c:1369
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1576
+#: src/vpn/gnunet-service-vpn.c:1574
 #, fuzzy
 msgid "# Packets received from TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:1614 src/vpn/gnunet-service-vpn.c:1655
+#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1653
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1665
+#: src/vpn/gnunet-service-vpn.c:1663
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1679
+#: src/vpn/gnunet-service-vpn.c:1677
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1761
+#: src/vpn/gnunet-service-vpn.c:1759
 #, fuzzy
 msgid "# ICMP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2100
+#: src/vpn/gnunet-service-vpn.c:2098
 #, fuzzy
 msgid "# UDP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2255
+#: src/vpn/gnunet-service-vpn.c:2253
 #, fuzzy
 msgid "# TCP packets received from mesh"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/vpn/gnunet-service-vpn.c:2406
+#: src/vpn/gnunet-service-vpn.c:2404
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2461
+#: src/vpn/gnunet-service-vpn.c:2459
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2713
+#: src/vpn/gnunet-service-vpn.c:2498 src/vpn/gnunet-service-vpn.c:2711
 #, fuzzy
 msgid "# Active destinations"
 msgstr "# các kết nối dht"
 
-#: src/vpn/gnunet-service-vpn.c:2786
+#: src/vpn/gnunet-service-vpn.c:2784
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3143
+#: src/vpn/gnunet-service-vpn.c:3112
+#, fuzzy
+msgid "Must specify valid IPv6 address"
+msgstr "« %s » không sẵn sàng.\n"
+
+#: src/vpn/gnunet-service-vpn.c:3133
+msgid "Must specify valid IPv6 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3141
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3175
+#: src/vpn/gnunet-service-vpn.c:3153
+#, fuzzy
+msgid "Must specify valid IPv4 address"
+msgstr "« %s » không sẵn sàng.\n"
+
+#: src/vpn/gnunet-service-vpn.c:3164
+msgid "Must specify valid IPv4 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3173
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -7231,23 +7633,82 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:588 src/include/gnunet_common.h:593
-#: src/include/gnunet_common.h:599
+#: src/include/gnunet_common.h:618 src/include/gnunet_common.h:625
+#: src/include/gnunet_common.h:633
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:609
+#: src/include/gnunet_common.h:645
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:630 src/include/gnunet_common.h:637
+#: src/include/gnunet_common.h:672 src/include/gnunet_common.h:681
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
 #, fuzzy
+#~ msgid "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"
+
+#~ msgid "no-name"
+#~ msgstr "không-tên"
+
+#, fuzzy
+#~ msgid "Option `%s' ignored\n"
+#~ msgstr "%s: tùy chọn « %s » là mơ hồ\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "add an additional keyword for the advertisment (this option can be "
+#~ "specified multiple times)"
+#~ msgstr ""
+#~ "thêm một từ khóa bổ sung cho tất cả tập tin và thư mục (có thể chỉ ra tùy "
+#~ "chọn này nhiều lần)"
+
+#, fuzzy
+#~ msgid "specify ID of the root of the namespace"
+#~ msgstr "đặt đánh giá của một không gian tên"
+
+#, fuzzy
+#~ msgid "change rating of namespace ID by VALUE"
+#~ msgstr "đặt đánh giá của một không gian tên"
+
+#, fuzzy
+#~ msgid "try to shorten a given name"
+#~ msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to read or create private zone key\n"
+#~ msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
+
+#, fuzzy
+#~ msgid "Unable to initialize resolver!\n"
+#~ msgstr "Không thể sơ khởi SQLite: %s.\n"
+
+#, fuzzy
+#~ msgid "Using default zone file `%s'\n"
+#~ msgstr "Đang bắt đầu tài về « %s »\n"
+
+#, fuzzy
+#~ msgid "filename with the zone key"
+#~ msgstr "tên tập tin"
+
+#, fuzzy
+#~ msgid "Failed to write zone key to file `%s': %s\n"
+#~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#, fuzzy
+#~ msgid "file exists with different key"
+#~ msgstr "tên tập tin"
+
+#, fuzzy
+#~ msgid "name of the template configuration file to use (optional)"
+#~ msgstr "Tập tin cấu hình gnunetd có đường dẫn nào?"
+
+#, fuzzy
 #~ msgid "number of peers to start"
 #~ msgstr "số lần lặp lại"
 
@@ -7272,10 +7733,6 @@
 #~ msgstr "Lỗi thêm mục nhập vào không gian tên « %s » (có chưa ?)\n"
 
 #, fuzzy
-#~ msgid "Internal error."
-#~ msgstr "Lỗi VR."
-
-#, fuzzy
 #~ msgid "ECDSA signature verification failed at %s:%d: %s\n"
 #~ msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
@@ -7577,10 +8034,6 @@
 #~ msgid "Could not serialize metadata\n"
 #~ msgstr "Không thể tạo miền tên.\n"
 
-#, fuzzy
-#~ msgid "Failed to connect to the chat service\n"
-#~ msgstr "Lỗi kết nối đến gnunetd.\n"
-
 #~ msgid "anonymous"
 #~ msgstr "nặc danh"
 
@@ -7745,10 +8198,6 @@
 #~ msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
 #, fuzzy
-#~ msgid "Failed to start daemon: %s\n"
-#~ msgstr "Lỗi bắt đầu thu thập.\n"
-
-#, fuzzy
 #~ msgid "Configuration fails to specify `%s', assuming default value."
 #~ msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
 
@@ -7798,10 +8247,6 @@
 #~ msgstr "Gặp lỗi khi đọc thông tin từ gnunetd.\n"
 
 #, fuzzy
-#~ msgid "Failed to get hostkey!\n"
-#~ msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#, fuzzy
 #~ msgid "Could not start `%s' process to start GNUnet.\n"
 #~ msgstr "Không thể tạo miền tên.\n"
 
@@ -8028,10 +8473,6 @@
 #~ msgstr "# các thông báo phát hiện dht được nhận"
 
 #, fuzzy
-#~ msgid "Failed to connect to statistics service!\n"
-#~ msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#, fuzzy
 #~ msgid "Could not access file: %s\n"
 #~ msgstr "Không thể truy cập đến « %s »: %s\n"
 
@@ -8547,9 +8988,6 @@
 #~ msgid "Undefined option.\n"
 #~ msgstr "Tùy chọn không xác định.\n"
 
-#~ msgid "Unknown operation '%s'.\n"
-#~ msgstr "Không rõ thao tác « %s ».\n"
-
 #~ msgid "yes"
 #~ msgstr "có"
 
@@ -8795,9 +9233,6 @@
 #~ msgid "Lock acquired for too long (%llu ms) at %s:%u\n"
 #~ msgstr "Khoá đặt được quá lâu (%llu miligiây) tại %s:%u\n"
 
-#~ msgid "GNUnet error log"
-#~ msgstr "Bản ghi lỗi GNUnet"
-
 #~ msgid "Out of memory (for logging)\n"
 #~ msgstr "Tràn bộ nhớ (để ghi sự kiện)\n"
 
@@ -9359,9 +9794,6 @@
 #~ msgid "write encountered (decrypted) search results to FILENAME"
 #~ msgstr "ghi kết quả tìm kiếm tìm thấy (đã giải mã) vào tập tin TÊN_TẬP_TIN"
 
-#~ msgid "Error converting arguments to URI!\n"
-#~ msgstr "Gặp lỗi khi chuyển đổi các đối số sang URI.\n"
-
 #~ msgid ""
 #~ "%16llu of %16llu bytes unindexed (estimating %llu seconds to "
 #~ "completion)                "
@@ -9850,9 +10282,6 @@
 #~ msgid "Could not properly unload service `%s'!\n"
 #~ msgstr "Không thể hủy nạp đúng dịch vụ « %s ».\n"
 
-#~ msgid "Core initialization failed.\n"
-#~ msgstr "Lỗi sơ khởi lõi.\n"
-
 #~ msgid "Updates GNUnet datastructures after version change."
 #~ msgstr "Cập nhật cấu trúc dữ liệu GNUnet sau khi thay đổi phiên bản."
 
@@ -10003,9 +10432,6 @@
 #~ "\n"
 #~ "Đang liên lạc với « %s »."
 
-#~ msgid " Connection failed (bug?)\n"
-#~ msgstr " Không kết nối được (lỗi ?)\n"
-
 #~ msgid "Timeout after %llums.\n"
 #~ msgstr "Quá hạn sau %llu miligiây.\n"
 
@@ -10024,9 +10450,6 @@
 #~ msgid "send messages with SIZE bytes payload"
 #~ msgstr "gửi thông báo có KÍCH_CỠ byte tải trọng"
 
-#~ msgid "specifies which TRANSPORT should be tested"
-#~ msgstr "chỉ ra TRUYỀN_TẢI nào cần được thử nghiệm"
-
 #~ msgid "specifies after how many MS to time-out"
 #~ msgstr "chỉ ra hết thời gian chờ sau bao nhiêu miligiay"
 

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2013-09-16 13:23:12 UTC (rev 29317)
+++ gnunet/po/zh_CN.po  2013-09-16 13:33:53 UTC (rev 29318)
@@ -7,13 +7,13 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2013-08-09 23:01+0200\n"
+"POT-Creation-Date: 2013-09-16 15:01+0200\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: src/arm/arm_api.c:335
@@ -35,7 +35,7 @@
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:962
+#: src/arm/gnunet-arm.c:214 src/testbed/gnunet-service-testbed_peers.c:971
 msgid "Message was sent successfully"
 msgstr ""
 
@@ -44,11 +44,11 @@
 msgid "Misconfiguration (can not connect to the ARM service)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:966
+#: src/arm/gnunet-arm.c:218 src/testbed/gnunet-service-testbed_peers.c:975
 msgid "We disconnected from ARM before we could send a request"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:968
+#: src/arm/gnunet-arm.c:220 src/testbed/gnunet-service-testbed_peers.c:977
 msgid "ARM API is busy"
 msgstr ""
 
@@ -56,56 +56,56 @@
 msgid "Request does not fit into a message"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:972
+#: src/arm/gnunet-arm.c:224 src/testbed/gnunet-service-testbed_peers.c:981
 msgid "Request timed out"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:974
+#: src/arm/gnunet-arm.c:226 src/testbed/gnunet-service-testbed_peers.c:983
 #, fuzzy
 msgid "Unknown request status"
 msgstr "未知的用户“%s”\n"
 
-#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:990
+#: src/arm/gnunet-arm.c:242 src/testbed/gnunet-service-testbed_peers.c:999
 #, c-format
 msgid "%s is stopped"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:992
+#: src/arm/gnunet-arm.c:244 src/testbed/gnunet-service-testbed_peers.c:1001
 #, c-format
 msgid "%s is starting"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:994
+#: src/arm/gnunet-arm.c:246 src/testbed/gnunet-service-testbed_peers.c:1003
 #, c-format
 msgid "%s is stopping"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:996
+#: src/arm/gnunet-arm.c:248 src/testbed/gnunet-service-testbed_peers.c:1005
 #, c-format
 msgid "%s is starting already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:998
+#: src/arm/gnunet-arm.c:250 src/testbed/gnunet-service-testbed_peers.c:1007
 #, c-format
 msgid "%s is stopping already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1000
+#: src/arm/gnunet-arm.c:252 src/testbed/gnunet-service-testbed_peers.c:1009
 #, c-format
 msgid "%s is started already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1002
+#: src/arm/gnunet-arm.c:254 src/testbed/gnunet-service-testbed_peers.c:1011
 #, c-format
 msgid "%s is stopped already"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1004
+#: src/arm/gnunet-arm.c:256 src/testbed/gnunet-service-testbed_peers.c:1013
 #, fuzzy, c-format
 msgid "%s service is not known to ARM"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1006
+#: src/arm/gnunet-arm.c:258 src/testbed/gnunet-service-testbed_peers.c:1015
 #, fuzzy, c-format
 msgid "%s service failed to start"
 msgstr "运行 %s失败:%s %d\n"
@@ -115,7 +115,7 @@
 msgid "%s service cannot be started because ARM is shutting down"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1010
+#: src/arm/gnunet-arm.c:262 src/testbed/gnunet-service-testbed_peers.c:1019
 #, c-format
 msgid "%.s Unknown result code."
 msgstr ""
@@ -293,50 +293,50 @@
 msgid "Preparing to stop `%s'\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1023
+#: src/arm/gnunet-service-arm.c:1022
 #, c-format
 msgid "Restarting service `%s'.\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1116
+#: src/arm/gnunet-service-arm.c:1115
 msgid "exit"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1121
+#: src/arm/gnunet-service-arm.c:1120
 msgid "signal"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1126
+#: src/arm/gnunet-service-arm.c:1125
 #, fuzzy
 msgid "unknown"
 msgstr "未知错误"
 
-#: src/arm/gnunet-service-arm.c:1132
+#: src/arm/gnunet-service-arm.c:1131
 #, fuzzy, c-format
 msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
 
-#: src/arm/gnunet-service-arm.c:1154
+#: src/arm/gnunet-service-arm.c:1153
 #, c-format
 msgid "Service `%s' terminated normally, will restart at any time\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1169
+#: src/arm/gnunet-service-arm.c:1168
 #, c-format
 msgid "Service `%s' terminated with status %s/%d, will restart in %s\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1387
+#: src/arm/gnunet-service-arm.c:1386
 #, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-service-arm.c:1398
+#: src/arm/gnunet-service-arm.c:1397
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1412
+#: src/arm/gnunet-service-arm.c:1411
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -355,91 +355,91 @@
 msgid "Received last message for %s \n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1529
-#: src/ats/gnunet-service-ats_addresses.c:1563
+#: src/ats/gnunet-service-ats_addresses.c:1607
+#: src/ats/gnunet-service-ats_addresses.c:1641
 #, c-format
 msgid ""
 "Could not load quota for network `%s':  `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1535
+#: src/ats/gnunet-service-ats_addresses.c:1613
 #, c-format
 msgid "Outbound quota configure for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1542
+#: src/ats/gnunet-service-ats_addresses.c:1620
 #, c-format
 msgid ""
 "No outbound quota configured for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1569
+#: src/ats/gnunet-service-ats_addresses.c:1647
 #, c-format
 msgid "Inbound quota configured for network `%s' is %llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1576
+#: src/ats/gnunet-service-ats_addresses.c:1654
 #, c-format
 msgid ""
 "No outbound quota configure for network `%s', assigning default bandwidth "
 "%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats_addresses.c:1773
+#: src/ats/gnunet-service-ats_addresses.c:1888
 #, fuzzy
 msgid "Failed to initialize solver!\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:848
+#: src/ats/gnunet-service-ats-solver_mlp.c:849
 msgid "Problem size too large, cannot allocate memory!\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1171
+#: src/ats/gnunet-service-ats-solver_mlp.c:1193
 #, c-format
 msgid "Adding address for peer `%s' multiple times\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1216
+#: src/ats/gnunet-service-ats-solver_mlp.c:1238
 #, c-format
 msgid "Updating address property `%s' for peer `%s' %p not added before\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1890
+#: src/ats/gnunet-service-ats-solver_mlp.c:1956
 #, 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-solver_mlp.c:1898
+#: src/ats/gnunet-service-ats-solver_mlp.c:1964
 #, 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-solver_mlp.c:1908
+#: src/ats/gnunet-service-ats-solver_mlp.c:1974
 #, c-format
 msgid ""
 "Adjusting outbound quota configuration for network `%s'from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1916
+#: src/ats/gnunet-service-ats-solver_mlp.c:1982
 #, c-format
 msgid ""
 "Adjusting inbound quota configuration for network `%s' from %llu to %.0f\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_mlp.c:1927
+#: src/ats/gnunet-service-ats-solver_mlp.c:1993
 #, c-format
 msgid "Using default quota configuration for network `%s' (in/out) %llu/%llu\n"
 msgstr ""
 
-#: src/ats/gnunet-service-ats-solver_proportional.c:1246
+#: src/ats/gnunet-service-ats-solver_proportional.c:1296
 #, fuzzy, c-format
-msgid "Cannot find network of type `%u' %s\n"
+msgid "Invalid network type `%u' `%s': Disconnect!\n"
 msgstr "找不到主机“%s”的 IP:%s\n"
 
 #: src/ats-tool/gnunet-ats.c:145
@@ -464,7 +464,7 @@
 msgid "Quota for network `%11s' (in/out): %10s / %10s\n"
 msgstr ""
 
-#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:461
+#: src/ats-tool/gnunet-ats.c:347 src/namestore/gnunet-namestore.c:438
 #: src/transport/gnunet-transport.c:812
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
@@ -557,30 +557,35 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/consensus/gnunet-consensus.c:352
+#: src/consensus/gnunet-consensus-profiler.c:393
 #, fuzzy
 msgid "number of peers in consensus"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus.c:355
+#: src/consensus/gnunet-consensus-profiler.c:396
 msgid "how many peers receive one value?"
 msgstr ""
 
-#: src/consensus/gnunet-consensus.c:358 src/set/gnunet-set-profiler.c:287
-#: src/set/gnunet-set-profiler.c:290 src/set/gnunet-set-profiler.c:293
+#: src/consensus/gnunet-consensus-profiler.c:399
+#: src/set/gnunet-set-profiler.c:287 src/set/gnunet-set-profiler.c:290
+#: src/set/gnunet-set-profiler.c:293
 #, fuzzy
 msgid "number of values"
 msgstr "迭代次数"
 
-#: src/consensus/gnunet-consensus.c:361
+#: src/consensus/gnunet-consensus-profiler.c:402
 msgid "consensus timeout"
 msgstr ""
 
+#: src/consensus/gnunet-consensus-profiler.c:405
+msgid "be more verbose (print received values)"
+msgstr ""
+
 #: src/core/core_api.c:752
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:82
+#: src/core/gnunet-core.c:83
 #, c-format
 msgid "Peer `%s'\n"
 msgstr ""
@@ -601,17 +606,17 @@
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:167 src/mesh/gnunet-mesh.c:170
+#: src/core/gnunet-core.c:166 src/mesh/gnunet-mesh.c:170
 #: src/peerinfo-tool/gnunet-peerinfo.c:653
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/core/gnunet-core.c:204 src/transport/gnunet-transport.c:1004
+#: src/core/gnunet-core.c:203 src/transport/gnunet-transport.c:1004
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core.c:215
+#: src/core/gnunet-core.c:214
 msgid "Print information about connected peers."
 msgstr ""
 
@@ -674,7 +679,7 @@
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:922
-#: src/transport/gnunet-service-transport_validation.c:935
+#: src/transport/gnunet-service-transport_validation.c:933
 msgid "# PING messages received"
 msgstr ""
 
@@ -702,7 +707,7 @@
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:1067
-#: src/transport/gnunet-service-transport_validation.c:1226
+#: src/transport/gnunet-service-transport_validation.c:1224
 msgid "# PONG messages received"
 msgstr ""
 
@@ -783,8 +788,8 @@
 msgid "Unsupported message of type %u (%u bytes) received from peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:210
-#: src/core/gnunet-service-core_sessions.c:280
+#: src/core/gnunet-service-core_sessions.c:209
+#: src/core/gnunet-service-core_sessions.c:279
 #: src/dht/gnunet-service-dht_neighbours.c:641
 #: src/dht/gnunet-service-dht_neighbours.c:700
 #: src/fs/gnunet-service-fs_cp.c:601 src/fs/gnunet-service-fs_cp.c:1495
@@ -793,16 +798,16 @@
 #: src/transport/gnunet-service-transport_neighbours.c:1041
 #: src/transport/gnunet-service-transport_neighbours.c:1265
 #: src/transport/gnunet-service-transport_neighbours.c:1274
-#: src/transport/gnunet-service-transport_neighbours.c:2793
-#: src/transport/gnunet-service-transport_neighbours.c:3047
+#: src/transport/gnunet-service-transport_neighbours.c:2799
+#: src/transport/gnunet-service-transport_neighbours.c:3053
 msgid "# peers connected"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:248
+#: src/core/gnunet-service-core_sessions.c:247
 msgid "# type map refreshes sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_sessions.c:417
+#: src/core/gnunet-service-core_sessions.c:416
 msgid "# messages discarded (expired prior to transmission)"
 msgstr ""
 
@@ -816,7 +821,7 @@
 msgstr ""
 
 #: src/datacache/datacache.c:115 src/datacache/datacache.c:266
-#: src/datastore/gnunet-service-datastore.c:834
+#: src/datastore/gnunet-service-datastore.c:838
 msgid "# bytes stored"
 msgstr ""
 
@@ -825,8 +830,8 @@
 msgstr ""
 
 #: src/datacache/datacache.c:143 src/datacache/datacache.c:150
-#: src/datastore/gnunet-service-datastore.c:1483
-#: src/datastore/gnunet-service-datastore.c:1494
+#: src/datastore/gnunet-service-datastore.c:1487
+#: src/datastore/gnunet-service-datastore.c:1498
 #, c-format
 msgid "No `%s' specified for `%s' in configuration!\n"
 msgstr ""
@@ -860,15 +865,16 @@
 
 #: src/datacache/plugin_datacache_sqlite.c:69
 #: src/datacache/plugin_datacache_sqlite.c:72
-#: src/datastore/plugin_datastore_mysql.c:803
-#: src/datastore/plugin_datastore_mysql.c:817
+#: src/datastore/plugin_datastore_mysql.c:806
+#: src/datastore/plugin_datastore_mysql.c:820
 #: src/datastore/plugin_datastore_sqlite.c:57 src/mysql/mysql.c:41
 #: src/mysql/mysql.c:48 src/mysql/mysql.c:522 src/mysql/mysql.c:531
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51
-#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:52
-#: src/include/gnunet_common.h:616 src/include/gnunet_common.h:623
+#: src/testbed/testbed_api_hosts.c:69 src/util/crypto_ecc.c:54
+#: src/include/gnunet_common.h:654 src/include/gnunet_common.h:663
+#: src/scalarproduct/scalarproduct.h:56
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
@@ -879,7 +885,7 @@
 
 #: src/datacache/plugin_datacache_sqlite.c:484
 #: src/datastore/plugin_datastore_sqlite.c:401
-#: src/namestore/plugin_namestore_sqlite.c:362
+#: src/namestore/plugin_namestore_sqlite.c:374
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -916,7 +922,7 @@
 msgid "# datastore connections (re)created"
 msgstr ""
 
-#: src/datastore/datastore_api.c:608
+#: src/datastore/datastore_api.c:608 src/scalarproduct/scalarproduct_api.c:276
 msgid "# transmission request failures"
 msgstr ""
 
@@ -940,43 +946,43 @@
 msgid "# status messages received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:867
+#: src/datastore/datastore_api.c:868
 msgid "# PUT requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:934
+#: src/datastore/datastore_api.c:935
 msgid "# RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:995
+#: src/datastore/datastore_api.c:996
 msgid "# RELEASE RESERVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1052
+#: src/datastore/datastore_api.c:1055
 msgid "# UPDATE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1116
+#: src/datastore/datastore_api.c:1119
 msgid "# REMOVE requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1161
+#: src/datastore/datastore_api.c:1164
 msgid "Failed to receive response from database.\n"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1220
+#: src/datastore/datastore_api.c:1223
 msgid "# Results received"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1286
+#: src/datastore/datastore_api.c:1290
 msgid "# GET REPLICATION requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1349
+#: src/datastore/datastore_api.c:1353
 msgid "# GET ZERO ANONYMITY requests executed"
 msgstr ""
 
-#: src/datastore/datastore_api.c:1410
+#: src/datastore/datastore_api.c:1414
 msgid "# GET requests executed"
 msgstr ""
 
@@ -1001,153 +1007,153 @@
 msgid "Manipulate GNUnet datastore"
 msgstr "更改配置文件中的一个值"
 
-#: src/datastore/gnunet-service-datastore.c:349
+#: src/datastore/gnunet-service-datastore.c:351
 msgid "# bytes expired"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:422
+#: src/datastore/gnunet-service-datastore.c:425
 msgid "# bytes purged (low-priority)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:480
+#: src/datastore/gnunet-service-datastore.c:483
 #: src/gns/gnunet-gns-helper-service-w32.c:155
 msgid "Transmission to client failed!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:511
+#: src/datastore/gnunet-service-datastore.c:514
 #: src/gns/gnunet-gns-helper-service-w32.c:183
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:626
+#: src/datastore/gnunet-service-datastore.c:630
 msgid "# results found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:669
+#: src/datastore/gnunet-service-datastore.c:673
 #, c-format
 msgid ""
 "Insufficient space (%llu bytes are available) to satisfy `%s' request for "
 "%llu bytes\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:680
+#: src/datastore/gnunet-service-datastore.c:684
 #, c-format
 msgid ""
 "The requested amount (%llu bytes) is larger than the cache size (%llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:684
+#: src/datastore/gnunet-service-datastore.c:688
 msgid ""
 "Insufficient space to satisfy request and requested amount is larger than "
 "cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:690
+#: src/datastore/gnunet-service-datastore.c:694
 msgid "Insufficient space to satisfy request"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:695
-#: src/datastore/gnunet-service-datastore.c:747
-#: src/datastore/gnunet-service-datastore.c:960
-#: src/datastore/gnunet-service-datastore.c:1417
+#: src/datastore/gnunet-service-datastore.c:699
+#: src/datastore/gnunet-service-datastore.c:751
+#: src/datastore/gnunet-service-datastore.c:964
+#: src/datastore/gnunet-service-datastore.c:1421
 msgid "# reserved"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:760
+#: src/datastore/gnunet-service-datastore.c:764
 msgid "Could not find matching reservation"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:846
+#: src/datastore/gnunet-service-datastore.c:850
 #, c-format
 msgid "Need %llu bytes more space (%llu allowed, using %llu)\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1006
+#: src/datastore/gnunet-service-datastore.c:1010
 msgid "# GET requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1018
+#: src/datastore/gnunet-service-datastore.c:1022
 msgid "# requests filtered by bloomfilter"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1046
+#: src/datastore/gnunet-service-datastore.c:1050
 msgid "# UPDATE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1076
+#: src/datastore/gnunet-service-datastore.c:1080
 msgid "# GET REPLICATION requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1109
+#: src/datastore/gnunet-service-datastore.c:1113
 msgid "# GET ZERO ANONYMITY requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1134
+#: src/datastore/gnunet-service-datastore.c:1138
 msgid "Content not found"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1142
+#: src/datastore/gnunet-service-datastore.c:1146
 msgid "# bytes removed (explicit request)"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1174
+#: src/datastore/gnunet-service-datastore.c:1178
 msgid "# REMOVE requests received"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1216
+#: src/datastore/gnunet-service-datastore.c:1220
 #, c-format
 msgid "Datastore payload inaccurate (%lld < %lld).  Trying to fix.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1277
+#: src/datastore/gnunet-service-datastore.c:1281
 #, c-format
 msgid "Loading `%s' datastore plugin\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1286
+#: src/datastore/gnunet-service-datastore.c:1290
 #, fuzzy, c-format
 msgid "Failed to load datastore plugin for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1488
+#: src/datastore/gnunet-service-datastore.c:1492
 #, c-format
 msgid "# bytes used in file-sharing datastore `%s'"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1499
+#: src/datastore/gnunet-service-datastore.c:1503
 msgid "# quota"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1501
+#: src/datastore/gnunet-service-datastore.c:1505
 msgid "# cache size"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1514
+#: src/datastore/gnunet-service-datastore.c:1518
 #, c-format
 msgid "Could not use specified filename `%s' for bloomfilter.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1532
-#: src/datastore/gnunet-service-datastore.c:1548
+#: src/datastore/gnunet-service-datastore.c:1536
+#: src/datastore/gnunet-service-datastore.c:1552
 #, fuzzy, c-format
 msgid "Failed to remove bogus bloomfilter file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/gnunet-service-datastore.c:1578
+#: src/datastore/gnunet-service-datastore.c:1582
 #, fuzzy
 msgid "Failed to initialize bloomfilter.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/datastore/gnunet-service-datastore.c:1607
+#: src/datastore/gnunet-service-datastore.c:1611
 msgid "Rebuilding bloomfilter.  Please be patient.\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1612
+#: src/datastore/gnunet-service-datastore.c:1616
 msgid "Plugin does not support get_keys function. Please fix!\n"
 msgstr ""
 
-#: src/datastore/gnunet-service-datastore.c:1615
+#: src/datastore/gnunet-service-datastore.c:1619
 msgid "Bloomfilter construction complete.\n"
 msgstr ""
 
@@ -1156,17 +1162,17 @@
 msgid "Heap database running\n"
 msgstr "sqlite 数据仓库"
 
-#: src/datastore/plugin_datastore_mysql.c:780
+#: src/datastore/plugin_datastore_mysql.c:783
 #, fuzzy, c-format
 msgid "Failed to prepare statement `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/datastore/plugin_datastore_mysql.c:788
+#: src/datastore/plugin_datastore_mysql.c:791
 #, fuzzy, c-format
 msgid "`%s' for `%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
-#: src/datastore/plugin_datastore_mysql.c:1019
+#: src/datastore/plugin_datastore_mysql.c:1022
 msgid "Mysql database running\n"
 msgstr ""
 
@@ -1176,7 +1182,7 @@
 msgstr "发送消息失败。\n"
 
 #: src/datastore/plugin_datastore_postgres.c:860
-#: src/namestore/plugin_namestore_postgres.c:652
+#: src/namestore/plugin_namestore_postgres.c:735
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1186,29 +1192,30 @@
 msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
 
 #: src/datastore/plugin_datastore_sqlite.c:253
-#: src/namestore/plugin_namestore_sqlite.c:223
+#: src/namestore/plugin_namestore_sqlite.c:220
+#: src/psycstore/plugin_psycstore_sqlite.c:319
 #, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite:%s。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:648
+#: src/datastore/plugin_datastore_sqlite.c:649
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1134
+#: src/datastore/plugin_datastore_sqlite.c:1135
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1153
+#: src/datastore/plugin_datastore_sqlite.c:1154
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1193
-#: src/namestore/plugin_namestore_sqlite.c:829
+#: src/datastore/plugin_datastore_sqlite.c:1194
+#: src/namestore/plugin_namestore_sqlite.c:893
 #, fuzzy
 msgid "Sqlite database running\n"
 msgstr "sqlite 数据仓库"
@@ -1265,9 +1272,9 @@
 
 #: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
 #: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:753
-#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:861
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:864
 #: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
-#: src/nse/gnunet-nse-profiler.c:899
+#: src/nse/gnunet-nse-profiler.c:904
 msgid "be verbose (print progress information)"
 msgstr ""
 
@@ -1478,43 +1485,43 @@
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1575
+#: src/dht/gnunet-service-dht_neighbours.c:1573
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1578
+#: src/dht/gnunet-service-dht_neighbours.c:1576
 msgid "# P2P PUT bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1733
+#: src/dht/gnunet-service-dht_neighbours.c:1731
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1741
+#: src/dht/gnunet-service-dht_neighbours.c:1739
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1832
+#: src/dht/gnunet-service-dht_neighbours.c:1830
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1835
+#: src/dht/gnunet-service-dht_neighbours.c:1833
 msgid "# P2P GET bytes received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1888
+#: src/dht/gnunet-service-dht_neighbours.c:1886
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1902
+#: src/dht/gnunet-service-dht_neighbours.c:1900
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1979
+#: src/dht/gnunet-service-dht_neighbours.c:1977
 msgid "# P2P RESULTS received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1982
+#: src/dht/gnunet-service-dht_neighbours.c:1980
 msgid "# P2P RESULT bytes received"
 msgstr ""
 
@@ -1546,11 +1553,11 @@
 msgid "# Entries removed from routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:400
+#: src/dht/gnunet-service-dht_routing.c:399
 msgid "# Entries added to routing table"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_routing.c:418
+#: src/dht/gnunet-service-dht_routing.c:417
 msgid "# DHT requests combined"
 msgstr ""
 
@@ -1568,12 +1575,12 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
-#: src/dns/dnsparser.c:152
+#: src/dns/dnsparser.c:233
 #, fuzzy, c-format
 msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/dns/dnsparser.c:626
+#: src/dns/dnsparser.c:751
 #, fuzzy, c-format
 msgid "Failed to convert UTF-8 name `%s' to DNS IDNA format: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -1584,7 +1591,6 @@
 msgstr "找不到主机“%s”的 IP:%s\n"
 
 #: src/dns/dnsstub.c:296 src/dns/dnsstub.c:384
-#: src/gns/gnunet-service-gns_resolver.c:1651
 #, fuzzy, c-format
 msgid "Failed to send DNS request to %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
@@ -1694,14 +1700,14 @@
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:924 src/exit/gnunet-daemon-exit.c:2349
-#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1453
-#: src/vpn/gnunet-service-vpn.c:1852 src/vpn/gnunet-service-vpn.c:2015
+#: src/exit/gnunet-daemon-exit.c:2606 src/vpn/gnunet-service-vpn.c:1451
+#: src/vpn/gnunet-service-vpn.c:1850 src/vpn/gnunet-service-vpn.c:2013
 msgid "# ICMPv4 packets dropped (type not allowed)"
 msgstr ""
 
 #: src/exit/gnunet-daemon-exit.c:961 src/exit/gnunet-daemon-exit.c:2408
-#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1509
-#: src/vpn/gnunet-service-vpn.c:1911 src/vpn/gnunet-service-vpn.c:2048
+#: src/exit/gnunet-daemon-exit.c:2665 src/vpn/gnunet-service-vpn.c:1507
+#: src/vpn/gnunet-service-vpn.c:1909 src/vpn/gnunet-service-vpn.c:2046
 msgid "# ICMPv6 packets dropped (type not allowed)"
 msgstr ""
 
@@ -1796,13 +1802,13 @@
 msgid "# ICMP service requests received via mesh"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1443
-#: src/vpn/gnunet-service-vpn.c:2009
+#: src/exit/gnunet-daemon-exit.c:2591 src/vpn/gnunet-service-vpn.c:1441
+#: src/vpn/gnunet-service-vpn.c:2007
 msgid "# ICMPv4 packets dropped (impossible PT to v6)"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1479
-#: src/vpn/gnunet-service-vpn.c:1491 src/vpn/gnunet-service-vpn.c:1899
+#: src/exit/gnunet-daemon-exit.c:2650 src/vpn/gnunet-service-vpn.c:1477
+#: src/vpn/gnunet-service-vpn.c:1489 src/vpn/gnunet-service-vpn.c:1897
 msgid "# ICMPv6 packets dropped (impossible PT to v4)"
 msgstr ""
 
@@ -1932,69 +1938,69 @@
 msgid "Experiment `%s': Required capabilities invalid \n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:393
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:392
 #, fuzzy, c-format
 msgid "Failed to parse file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:419
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:444
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:418
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:443
 msgid ""
 "No valid experiment issuers configured! Set value to peer id of issuer! "
 "Exit...\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:429
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:428
 #, fuzzy, c-format
 msgid "Invalid value `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:453
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:452
 #, fuzzy, c-format
 msgid "Invalid public key `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:460
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:459
 #, fuzzy, c-format
 msgid "Found issuer for public key `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:463
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:462
 #, fuzzy, c-format
 msgid "No issuer for public key `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_experiments.c:480
+#: src/experimentation/gnunet-daemon-experimentation_experiments.c:479
 #, fuzzy, c-format
 msgid "Cannot read experiments file `%s'\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:220
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:221
 #, c-format
 msgid "Cannot send message to peer `%s' for experiment `%s'\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:290
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:291
 #, c-format
 msgid "Sending experimentation request to peer %s\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:421
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:422
 #, c-format
 msgid "Added peer `%s' as active node\n"
 msgstr ""
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:848
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:849
 #, fuzzy, c-format
 msgid "Connected to peer %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:877
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:878
 #, fuzzy, c-format
 msgid "Disconnected from peer %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1057
+#: src/experimentation/gnunet-daemon-experimentation_nodes.c:1058
 #, fuzzy
 msgid "Failed to connect to CORE service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -2082,56 +2088,56 @@
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1061
+#: src/fs/fs_api.c:1062
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:1557
+#: src/fs/fs_api.c:1565
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1571
+#: src/fs/fs_api.c:1579
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2228
+#: src/fs/fs_api.c:2236
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2238
+#: src/fs/fs_api.c:2246
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2364 src/fs/fs_api.c:2604
+#: src/fs/fs_api.c:2372 src/fs/fs_api.c:2612
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2381
+#: src/fs/fs_api.c:2389
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_api.c:2394 src/fs/fs_api.c:2413 src/fs/fs_api.c:2896
+#: src/fs/fs_api.c:2402 src/fs/fs_api.c:2421 src/fs/fs_api.c:2904
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2595
+#: src/fs/fs_api.c:2603
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_api.c:2840
+#: src/fs/fs_api.c:2848
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2934
+#: src/fs/fs_api.c:2942
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2242,73 +2248,63 @@
 msgid "Failed to connect to datastore."
 msgstr ""
 
-#: src/fs/fs_pseudonym.c:327 src/fs/fs_pseudonym.c:631
-#, fuzzy, c-format
-msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
-
-#: src/fs/fs_pseudonym.c:463 src/fs/fs_pseudonym.c:489
-#: src/fs/fs_pseudonym.c:627
-msgid "no-name"
-msgstr "无名称"
-
-#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:399
+#: src/fs/fs_publish.c:125 src/fs/fs_publish.c:414
 #, c-format
 msgid "Publishing failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:624 src/fs/fs_publish.c:641 src/fs/fs_publish.c:680
-#: src/fs/fs_publish.c:700 src/fs/fs_publish.c:725 src/fs/fs_publish.c:865
+#: src/fs/fs_publish.c:642 src/fs/fs_publish.c:659 src/fs/fs_publish.c:698
+#: src/fs/fs_publish.c:719 src/fs/fs_publish.c:743 src/fs/fs_publish.c:889
 #, c-format
 msgid "Can not index file `%s': %s.  Will try to insert instead.\n"
 msgstr ""
 
-#: src/fs/fs_publish.c:626
+#: src/fs/fs_publish.c:644
 msgid "timeout on index-start request to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:638
+#: src/fs/fs_publish.c:656
 #, fuzzy
 msgid "unknown error"
 msgstr "未知错误"
 
-#: src/fs/fs_publish.c:681
+#: src/fs/fs_publish.c:700
 msgid "failed to compute hash"
 msgstr ""
 
-#: src/fs/fs_publish.c:701
+#: src/fs/fs_publish.c:720
 msgid "filename too long"
 msgstr ""
 
-#: src/fs/fs_publish.c:726
+#: src/fs/fs_publish.c:745
 msgid "could not connect to `fs' service"
 msgstr ""
 
-#: src/fs/fs_publish.c:749
+#: src/fs/fs_publish.c:768
 #, fuzzy, c-format
 msgid "Failed to get file identifiers for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_publish.c:814
+#: src/fs/fs_publish.c:837
 #, c-format
 msgid "Recursive upload failed at `%s': %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:820
+#: src/fs/fs_publish.c:843
 #, c-format
 msgid "Recursive upload failed: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:866
+#: src/fs/fs_publish.c:890
 msgid "needs to be an actual file"
 msgstr ""
 
-#: src/fs/fs_publish.c:1092
+#: src/fs/fs_publish.c:1126
 #, c-format
 msgid "Insufficient space for publishing: %s"
 msgstr ""
 
-#: src/fs/fs_publish.c:1164
+#: src/fs/fs_publish.c:1198
 #, c-format
 msgid "Reserving space for %u entries and %llu bytes for publication\n"
 msgstr ""
@@ -2317,6 +2313,11 @@
 msgid "Could not connect to datastore."
 msgstr ""
 
+#: src/fs/fs_publish_ublock.c:219
+#, fuzzy
+msgid "Internal error."
+msgstr "未知错误。\n"
+
 #: src/fs/fs_search.c:815
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s': %s\n"
@@ -2327,58 +2328,58 @@
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_unindex.c:58
+#: src/fs/fs_unindex.c:59
 msgid "Failed to find given position in file"
 msgstr ""
 
-#: src/fs/fs_unindex.c:63
+#: src/fs/fs_unindex.c:64
 #, fuzzy
 msgid "Failed to read file"
 msgstr "发送消息失败。\n"
 
-#: src/fs/fs_unindex.c:233
+#: src/fs/fs_unindex.c:234
 msgid "Unexpected time for a response from `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:241
+#: src/fs/fs_unindex.c:242
 msgid "Timeout waiting for `fs' service."
 msgstr ""
 
-#: src/fs/fs_unindex.c:249
+#: src/fs/fs_unindex.c:250
 #, fuzzy
 msgid "Invalid response from `fs' service."
 msgstr "“%s”的参数无效。\n"
 
-#: src/fs/fs_unindex.c:293
+#: src/fs/fs_unindex.c:291
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:349 src/fs/fs_unindex.c:361
+#: src/fs/fs_unindex.c:347 src/fs/fs_unindex.c:359
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_unindex.c:357
+#: src/fs/fs_unindex.c:355
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_unindex.c:416
+#: src/fs/fs_unindex.c:414
 #, fuzzy, c-format
 msgid "Failed to remove UBlock: %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_unindex.c:565 src/fs/fs_unindex.c:628
+#: src/fs/fs_unindex.c:562 src/fs/fs_unindex.c:626
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_unindex.c:641
+#: src/fs/fs_unindex.c:639
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/fs_unindex.c:675
+#: src/fs/fs_unindex.c:673
 msgid "Failed to compute hash of file."
 msgstr ""
 
@@ -2407,13 +2408,16 @@
 msgid "Malformed CHK URI"
 msgstr ""
 
-#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
-#: src/fs/fs_uri.c:629
+#: src/fs/fs_uri.c:576 src/fs/fs_uri.c:629
 msgid "SKS URI malformed"
 msgstr ""
 
+#: src/fs/fs_uri.c:591 src/fs/fs_uri.c:601
+msgid "LOC URI malformed"
+msgstr ""
+
 #: src/fs/fs_uri.c:611
-msgid "SKS URI malformed (could not decode public key)"
+msgid "LOC URI malformed (could not decode public key)"
 msgstr ""
 
 #: src/fs/fs_uri.c:617
@@ -2436,21 +2440,21 @@
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:911
+#: src/fs/fs_uri.c:912
 #, fuzzy
 msgid "Lacking key configuration settings.\n"
 msgstr "立即保存配置?"
 
-#: src/fs/fs_uri.c:917
+#: src/fs/fs_uri.c:918
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/fs/fs_uri.c:1099 src/fs/fs_uri.c:1126
+#: src/fs/fs_uri.c:1102 src/fs/fs_uri.c:1129
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1132
+#: src/fs/fs_uri.c:1135
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2486,25 +2490,23 @@
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-pseudonym.c:310
-#: src/fs/gnunet-publish.c:808
+#: src/fs/gnunet-auto-share.c:737 src/fs/gnunet-publish.c:811
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:812
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:815
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:815
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:818
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:839
+#: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-publish.c:842
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-pseudonym.c:329
-#: src/fs/gnunet-publish.c:846
+#: src/fs/gnunet-auto-share.c:750 src/fs/gnunet-publish.c:849
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2512,7 +2514,7 @@
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-daemon-fsprofiler.c:656
+#: src/fs/gnunet-daemon-fsprofiler.c:657
 msgid "Daemon to use file-sharing to measure its performance."
 msgstr ""
 
@@ -2602,7 +2604,7 @@
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:781
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:784
 #: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
@@ -2650,66 +2652,22 @@
 msgid "Special file-sharing operations"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:190
+#: src/fs/gnunet-fs-profiler.c:193
 msgid "run the experiment with COUNT peers"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:193
+#: src/fs/gnunet-fs-profiler.c:196
 msgid "specifies name of a file with the HOSTS the testbed should use"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:196
+#: src/fs/gnunet-fs-profiler.c:199
 msgid "automatically terminate experiment after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-fs-profiler.c:205
+#: src/fs/gnunet-fs-profiler.c:208
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:227 src/fs/gnunet-pseudonym.c:229
-#, fuzzy, c-format
-msgid "Option `%s' ignored\n"
-msgstr "%s:选项“%s”有歧义\n"
-
-#: src/fs/gnunet-pseudonym.c:265 src/statistics/gnunet-statistics.c:305
-#, fuzzy, c-format
-msgid "Invalid argument `%s'\n"
-msgstr "“%s”的参数无效。\n"
-
-#: src/fs/gnunet-pseudonym.c:313
-msgid "advertise namespace NAME"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:316
-msgid ""
-"add an additional keyword for the advertisment (this option can be specified "
-"multiple times)"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:320 src/fs/gnunet-publish.c:827
-msgid "set the meta-data for the given TYPE to the given VALUE"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:323
-msgid "use the given PRIORITY for the advertisments"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:326
-msgid "do not print names of remote namespaces"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:332
-msgid "specify ID of the root of the namespace"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:335
-msgid "change rating of namespace ID by VALUE"
-msgstr ""
-
-#: src/fs/gnunet-pseudonym.c:347
-msgid "Manage GNUnet pseudonyms."
-msgstr ""
-
 #: src/fs/gnunet-publish.c:230
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -2796,84 +2754,88 @@
 msgid "Failed to access `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/fs/gnunet-publish.c:681
+#: src/fs/gnunet-publish.c:682
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:731
+#: src/fs/gnunet-publish.c:734
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:738
+#: src/fs/gnunet-publish.c:741
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:744
+#: src/fs/gnunet-publish.c:747
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:752 src/vpn/gnunet-vpn.c:213
+#: src/fs/gnunet-publish.c:755 src/vpn/gnunet-vpn.c:213
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:762 src/fs/gnunet-publish.c:769
+#: src/fs/gnunet-publish.c:765 src/fs/gnunet-publish.c:772
 #: src/transport/gnunet-transport.c:843 src/transport/gnunet-transport.c:873
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:819
+#: src/fs/gnunet-publish.c:822
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:823
+#: src/fs/gnunet-publish.c:826
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
 msgstr ""
 
 #: src/fs/gnunet-publish.c:830
+msgid "set the meta-data for the given TYPE to the given VALUE"
+msgstr ""
+
+#: src/fs/gnunet-publish.c:833
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:835
+#: src/fs/gnunet-publish.c:838
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:843
+#: src/fs/gnunet-publish.c:846
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:849
+#: src/fs/gnunet-publish.c:852
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:853
+#: src/fs/gnunet-publish.c:856
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:857
+#: src/fs/gnunet-publish.c:860
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:873
+#: src/fs/gnunet-publish.c:876
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
@@ -2919,9 +2881,9 @@
 msgid "# Loopback routes suppressed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:640 src/hostlist/gnunet-daemon-hostlist.c:291
-#: src/topology/gnunet-daemon-topology.c:1314
-#: src/topology/gnunet-daemon-topology.c:1321
+#: src/fs/gnunet-service-fs.c:639 src/hostlist/gnunet-daemon-hostlist.c:293
+#: src/topology/gnunet-daemon-topology.c:1315
+#: src/topology/gnunet-daemon-topology.c:1322
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -3112,24 +3074,24 @@
 msgid "# query messages sent to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:482
-msgid "# delay heap timeout"
+#: src/fs/gnunet-service-fs_pe.c:484
+msgid "# delay heap timeout (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:490
+#: src/fs/gnunet-service-fs_pe.c:492
 msgid "# query plans executed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:550
+#: src/fs/gnunet-service-fs_pe.c:552
 msgid "# requests merged"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:558
+#: src/fs/gnunet-service-fs_pe.c:560
 msgid "# requests refreshed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pe.c:612 src/fs/gnunet-service-fs_pe.c:696
-#: src/fs/gnunet-service-fs_pe.c:767
+#: src/fs/gnunet-service-fs_pe.c:614 src/fs/gnunet-service-fs_pe.c:698
+#: src/fs/gnunet-service-fs_pe.c:769
 msgid "# query plan entries"
 msgstr ""
 
@@ -3268,190 +3230,223 @@
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
-#: src/gns/gns_api.c:598
+#: src/gns/gns_api.c:385
 #, fuzzy
 msgid "Failed to serialize lookup reply from GNS service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-dns2gns.c:192
+#: src/gns/gnunet-dns2gns.c:228
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/gns/gnunet-dns2gns.c:367
+#: src/gns/gnunet-dns2gns.c:400
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:383
+#: src/gns/gnunet-dns2gns.c:416
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:391
+#: src/gns/gnunet-dns2gns.c:424
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:681
-msgid "IP of recursive DNS resolver to use (required)"
+#: src/gns/gnunet-dns2gns.c:703
+msgid "No ego configured for `dns2gns` subsystem\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:684
-msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+#: src/gns/gnunet-dns2gns.c:729
+msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:687
+#: src/gns/gnunet-dns2gns.c:751
+msgid "No valid GNS zone specified!\n"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:772
+msgid "IP of recursive DNS resolver to use (required)"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:775
 msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:690
+#: src/gns/gnunet-dns2gns.c:778
+msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:781
 msgid "UDP port to listen on for inbound DNS requests; default: 53"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:703
+#: src/gns/gnunet-dns2gns.c:784
+msgid "Public key of the GNS zone to use (overrides default)"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:797
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:221
+#: src/gns/gnunet-gns.c:205
+#, c-format
+msgid "Please specify name to lookup!\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:285
+#, c-format
+msgid "Ego for `%s' not found, cannot perform lookup.\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:323
+#, c-format
+msgid ""
+"Ego for `master-zone' not found, cannot perform lookup.  Did you run gnunet-"
+"gns-import.sh?\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:352
 #, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns.c:335
+#: src/gns/gnunet-gns.c:365
 #, c-format
-msgid "Please specify lookup, shorten or authority operation!\n"
+msgid "Public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:356
-#, fuzzy
-msgid "try to shorten a given name"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/gns/gnunet-gns.c:359
+#: src/gns/gnunet-gns.c:414
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:362
-msgid "Get the authority of a particular name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:365
+#: src/gns/gnunet-gns.c:417
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:368
+#: src/gns/gnunet-gns.c:420
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:381
-msgid "GNUnet GNS access tool"
+#: src/gns/gnunet-gns.c:423
+msgid "Specify the public key of the zone to lookup the record in"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:451
-#, fuzzy, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "未知的命令“%s”。\n"
+#: src/gns/gnunet-gns.c:426
+msgid "Specify the name of the ego of the zone to lookup the record in"
+msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:480
-#, fuzzy, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr "解析配置文件“%s”失败\n"
+#: src/gns/gnunet-gns.c:439
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "GNUnet 错误日志"
 
-#: src/gns/gnunet-gns-fcfsd.c:524
+#: src/gns/gnunet-gns-proxy.c:60 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:960
+#: src/hostlist/hostlist-client.c:965
+#: src/transport/plugin_transport_http_client.c:1068
+#: src/transport/plugin_transport_http_client.c:1083
 #, c-format
-msgid "Found existing name `%s' for the given key\n"
+msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:587
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-fcfsd.c:649
+#: src/gns/gnunet-gns-proxy.c:2344
 #, fuzzy, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr "发送消息失败。\n"
+msgid "Unable to import private key from file `%s'\n"
+msgstr "无法创建用户账户:"
 
-#: src/gns/gnunet-gns-fcfsd.c:665
+#: src/gns/gnunet-gns-proxy.c:2372
 #, fuzzy, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
+msgid "Unable to import certificate %s\n"
+msgstr "无法保存配置文件“%s”:"
 
-#: src/gns/gnunet-gns-fcfsd.c:701
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-fcfsd.c:709
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns-fcfsd.c:913 src/namestore/gnunet-namestore.c:492
+#: src/gns/gnunet-gns-proxy.c:2637 src/namestore/gnunet-namestore-fcfsd.c:958
 #, fuzzy
-msgid "Failed to read or create private zone key\n"
-msgstr "无法为守护程序创建用户账户。"
-
-#: src/gns/gnunet-gns-fcfsd.c:923 src/namestore/gnunet-namestore.c:503
-#, fuzzy
-msgid "Failed to connect to namestore\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/gns/gnunet-gns-fcfsd.c:939 src/gns/gnunet-gns-proxy.c:2857
-#, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:973
-msgid "GNUnet GNS first come first serve registration service"
+#: src/gns/gnunet-gns-proxy.c:3020
+msgid "No ego configured for `shorten-zone`\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2494
-#, fuzzy, c-format
-msgid "Unable to import private key from file `%s'\n"
-msgstr "无法创建用户账户:"
+#: src/gns/gnunet-gns-proxy.c:3060
+msgid "No ego configured for `master-zone`\n"
+msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2522
+#: src/gns/gnunet-gns-proxy.c:3120
 #, fuzzy, c-format
-msgid "Unable to import certificate %s\n"
-msgstr "无法保存配置文件“%s”:"
+msgid "Failed to load SSL/TLS key and certificate from `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3510
+#: src/gns/gnunet-gns-proxy.c:3156
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3513
+#: src/gns/gnunet-gns-proxy.c:3159
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3525
+#: src/gns/gnunet-gns-proxy.c:3178
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-service-gns.c:497
-#, c-format
-msgid "Records for name `%s' in zone %s too large to fit into DHT"
-msgstr ""
-
-#: src/gns/gnunet-service-gns.c:1225
+#: src/gns/gnunet-service-gns.c:649
 #, fuzzy
 msgid "Failed to connect to the namestore!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-service-gns.c:1286
+#: src/gns/gnunet-service-gns.c:692
 #, fuzzy
 msgid "Could not connect to DHT!\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/gns/gnunet-service-gns.c:1297
+#: src/gns/gnunet-service-gns.c:708
 #, fuzzy
-msgid "Unable to initialize resolver!\n"
-msgstr "无法初始化 SQLite:%s。\n"
+msgid "valid public key required"
+msgstr "“%s”的参数无效。\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:3446
+#: src/gns/gnunet-service-gns_interceptor.c:201
+msgid "Error converting GNS response to DNS response!\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_interceptor.c:307
+#, fuzzy
+msgid "Failed to connect to the DNS service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:717
+#, fuzzy
+msgid "Failed to parse DNS response\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:843
 #, c-format
-msgid "Not a GADS TLD: `%s'\n"
+msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
+#: src/gns/gnunet-service-gns_resolver.c:1475
+#, c-format
+msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1499
+msgid "GNS lookup recursion failed (no delegation record found)\n"
+msgstr ""
+
+#: src/gns/gnunet-service-gns_resolver.c:1523
+#, fuzzy, c-format
+msgid "Failed to cache GNS resolution: %s\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/gns/gnunet-service-gns_resolver.c:1782
+#, c-format
+msgid "Hostname `%s' is not well-formed, resolution fails\n"
+msgstr ""
+
 #: src/hello/gnunet-hello.c:123
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3491,65 +3486,65 @@
 msgid "Modified %u addresses \n"
 msgstr ""
 
-#: src/hello/hello.c:945
+#: src/hello/hello.c:947
 #, fuzzy
 msgid "Failed to parse HELLO message: missing expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:954
+#: src/hello/hello.c:956
 #, fuzzy
 msgid "Failed to parse HELLO message: invalid expiration time\n"
 msgstr "保存配置失败。"
 
-#: src/hello/hello.c:964
+#: src/hello/hello.c:966
 #, fuzzy
 msgid "Failed to parse HELLO message: malformed\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/hello/hello.c:974
+#: src/hello/hello.c:976
 msgid "Failed to parse HELLO message: missing transport plugin\n"
 msgstr ""
 
-#: src/hello/hello.c:991
+#: src/hello/hello.c:993
 #, c-format
 msgid "Plugin `%s' not found\n"
 msgstr ""
 
-#: src/hello/hello.c:1000
+#: src/hello/hello.c:1002
 #, c-format
 msgid "Plugin `%s' does not support URIs yet\n"
 msgstr ""
 
-#: src/hello/hello.c:1019
+#: src/hello/hello.c:1021
 #, fuzzy, c-format
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:258
+#: src/hostlist/gnunet-daemon-hostlist.c:260
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:311
+#: src/hostlist/gnunet-daemon-hostlist.c:313
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:318
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:319
+#: src/hostlist/gnunet-daemon-hostlist.c:321
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:323
+#: src/hostlist/gnunet-daemon-hostlist.c:325
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:338
+#: src/hostlist/gnunet-daemon-hostlist.c:340
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -3570,17 +3565,7 @@
 msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
-#: 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:960 src/hostlist/hostlist-client.c:965
-#: src/transport/plugin_transport_http_client.c:1063
-#: src/transport/plugin_transport_http_client.c:1078
-#, c-format
-msgid "%s failed at %s:%d: `%s'\n"
-msgstr ""
-
-#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1319
+#: src/hostlist/hostlist-client.c:589 src/hostlist/hostlist-client.c:1330
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -3630,77 +3615,77 @@
 msgid "# hostlist downloads initiated"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1492
+#: src/hostlist/hostlist-client.c:1037 src/hostlist/hostlist-client.c:1503
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1045
+#: src/hostlist/hostlist-client.c:1046
 #, c-format
 msgid "Have %u/%u connections.  Will consider downloading hostlist in %s\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1105 src/hostlist/hostlist-client.c:1121
+#: src/hostlist/hostlist-client.c:1106 src/hostlist/hostlist-client.c:1122
 msgid "# active connections"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1267
+#: src/hostlist/hostlist-client.c:1278
 #, c-format
 msgid "Loading saved hostlist entries from file `%s' \n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1271
+#: src/hostlist/hostlist-client.c:1282
 #, c-format
 msgid "Hostlist file `%s' does not exist\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1282
+#: src/hostlist/hostlist-client.c:1293
 #, 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:1315
+#: src/hostlist/hostlist-client.c:1326
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1317
+#: src/hostlist/hostlist-client.c:1328
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1362
+#: src/hostlist/hostlist-client.c:1373
 #, 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:1367
+#: src/hostlist/hostlist-client.c:1378
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1391 src/hostlist/hostlist-client.c:1408
+#: src/hostlist/hostlist-client.c:1402 src/hostlist/hostlist-client.c:1419
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1403
+#: src/hostlist/hostlist-client.c:1414
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1457
+#: src/hostlist/hostlist-client.c:1468
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1469
+#: src/hostlist/hostlist-client.c:1480
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1481
+#: src/hostlist/hostlist-client.c:1492
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/hostlist-client.c:1485
+#: src/hostlist/hostlist-client.c:1496
 #, c-format
 msgid "Hostlist file `%s' could not be removed\n"
 msgstr ""
@@ -3773,7 +3758,7 @@
 msgstr ""
 
 #: src/hostlist/hostlist-server.c:560 src/peerinfo-tool/gnunet-peerinfo.c:659
-#: src/transport/gnunet-service-transport.c:785
+#: src/transport/gnunet-service-transport.c:806
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -3797,99 +3782,114 @@
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/hostlist-server.c:675
+#: src/hostlist/hostlist-server.c:676
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:135
+#: src/identity/gnunet-identity.c:165
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/identity/gnunet-identity.c:237
+#: src/identity/gnunet-identity.c:184
+#, fuzzy, c-format
+msgid "Failed to set default ego: %s\n"
+msgstr "发送消息失败。\n"
+
+#: src/identity/gnunet-identity.c:327
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:240
+#: src/identity/gnunet-identity.c:330
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:243
+#: src/identity/gnunet-identity.c:333
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:246
+#: src/identity/gnunet-identity.c:336
+msgid ""
+"set default identity to EGO for a subsystem SUBSYSTEM (use together with -s)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:339
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:255
+#: src/identity/gnunet-identity.c:342
+msgid ""
+"set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:351
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:336
+#: src/identity/gnunet-service-identity.c:337
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:357
+#: src/identity/gnunet-service-identity.c:360
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:434
-#: src/identity/gnunet-service-identity.c:665
-#: src/identity/gnunet-service-identity.c:773
+#: src/identity/gnunet-service-identity.c:437
+#: src/identity/gnunet-service-identity.c:668
+#: src/identity/gnunet-service-identity.c:776
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:441
+#: src/identity/gnunet-service-identity.c:444
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:511
+#: src/identity/gnunet-service-identity.c:514
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:642
+#: src/identity/gnunet-service-identity.c:645
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:681
-#: src/identity/gnunet-service-identity.c:790
+#: src/identity/gnunet-service-identity.c:684
+#: src/identity/gnunet-service-identity.c:793
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:824
+#: src/identity/gnunet-service-identity.c:827
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:897
+#: src/identity/gnunet-service-identity.c:900
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/identity/gnunet-service-identity.c:909
+#: src/identity/gnunet-service-identity.c:912
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/integration-tests/connection_watchdog.c:990
+#: src/integration-tests/connection_watchdog.c:998
 #, c-format
 msgid "Transport plugin: `%s' port %llu\n"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1023
+#: src/integration-tests/connection_watchdog.c:1031
 #, fuzzy, c-format
 msgid "Found %u transport plugins: `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/integration-tests/connection_watchdog.c:1082
+#: src/integration-tests/connection_watchdog.c:1091
 msgid "Send ping messages to test connectivity (default == NO)"
 msgstr ""
 
-#: src/integration-tests/connection_watchdog.c:1091
-#: src/template/gnunet-template.c:70
+#: src/integration-tests/connection_watchdog.c:1100
+#: src/multicast/gnunet-multicast.c:70 src/template/gnunet-template.c:70
 msgid "help text"
 msgstr ""
 
@@ -3907,25 +3907,22 @@
 msgid "Print information about mesh tunnels and peers."
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/mesh/gnunet-service-mesh.c:5640
+#: src/mesh/gnunet-service-mesh.c:5634 src/mesh/gnunet-service-mesh-enc.c:7060
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:5780 src/mesh/gnunet-service-mesh.c:5792
-#: src/mesh/gnunet-service-mesh.c:5804 src/mesh/gnunet-service-mesh.c:5816
-#: src/mesh/gnunet-service-mesh.c:5828 src/mesh/gnunet-service-mesh.c:5840
-#: src/nse/gnunet-service-nse.c:1425 src/nse/gnunet-service-nse.c:1443
+#: src/mesh/gnunet-service-mesh.c:5774 src/mesh/gnunet-service-mesh.c:5786
+#: src/mesh/gnunet-service-mesh.c:5798 src/mesh/gnunet-service-mesh.c:5810
+#: src/mesh/gnunet-service-mesh.c:5822 src/mesh/gnunet-service-mesh.c:5834
+#: src/nse/gnunet-service-nse.c:1440 src/nse/gnunet-service-nse.c:1458
 #: src/regex/gnunet-daemon-regexprofiler.c:270
-#: src/regex/gnunet-daemon-regexprofiler.c:282
-#: src/regex/gnunet-daemon-regexprofiler.c:294
-#: src/regex/gnunet-daemon-regexprofiler.c:307
 #: src/regex/gnunet-regex-simulation-profiler.c:659
 #, fuzzy, c-format
 msgid "%s service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "立即保存配置?"
 
-#: src/mesh/gnunet-service-mesh.c:5852 src/mesh/gnunet-service-mesh.c:5862
-#: src/mesh/gnunet-service-mesh.c:5887
+#: src/mesh/gnunet-service-mesh.c:5846 src/mesh/gnunet-service-mesh.c:5856
+#: src/mesh/gnunet-service-mesh.c:5881
 #, fuzzy, c-format
 msgid ""
 "%s service is lacking key configuration settings (%s). Using default (%u).\n"
@@ -3941,199 +3938,231 @@
 msgid "Could not access file `%s': %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/namestore/gnunet-namestore.c:250
+#: src/namestore/gnunet-namestore.c:258
 #, c-format
 msgid "Adding record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:281
+#: src/namestore/gnunet-namestore.c:289
 #, c-format
 msgid "Deleting record failed: %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:342
+#: src/namestore/gnunet-namestore.c:338
 #, c-format
 msgid "\tCorrupt or unsupported record of type %u\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:358
-msgid "for at least"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:359
-msgid "until"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:475
-#, fuzzy, c-format
-msgid "Using default zone file `%s'\n"
-msgstr "卸载 GNUnet 服务"
-
-#: src/namestore/gnunet-namestore.c:484
+#: src/namestore/gnunet-namestore.c:446
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:513 src/namestore/gnunet-namestore.c:522
-#: src/namestore/gnunet-namestore.c:539 src/namestore/gnunet-namestore.c:561
-#: src/namestore/gnunet-namestore.c:605
+#: src/namestore/gnunet-namestore.c:456
+#: src/namestore/gnunet-namestore-fcfsd.c:992
+#, fuzzy
+msgid "Failed to connect to namestore\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/namestore/gnunet-namestore.c:464 src/namestore/gnunet-namestore.c:473
+#: src/namestore/gnunet-namestore.c:490 src/namestore/gnunet-namestore.c:512
+#: src/namestore/gnunet-namestore.c:554
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore.c:514 src/namestore/gnunet-namestore.c:523
-#: src/namestore/gnunet-namestore.c:540 src/namestore/gnunet-namestore.c:562
+#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:474
+#: src/namestore/gnunet-namestore.c:491 src/namestore/gnunet-namestore.c:513
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:531
+#: src/namestore/gnunet-namestore.c:482
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:551
+#: src/namestore/gnunet-namestore.c:502
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:587
+#: src/namestore/gnunet-namestore.c:538
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效:“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:606
+#: src/namestore/gnunet-namestore.c:555
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:649
+#: src/namestore/gnunet-namestore.c:588
 #: src/peerinfo-tool/gnunet-peerinfo.c:711
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:727
+#: src/namestore/gnunet-namestore.c:645
+#, c-format
+msgid "Ego `%s' not known to identity service\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:674
+#, fuzzy, c-format
+msgid "You must specify which zone should be accessed\n"
+msgstr "您必须指定一个昵称\n"
+
+#: src/namestore/gnunet-namestore.c:702
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:730
+#: src/namestore/gnunet-namestore.c:705
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:733
+#: src/namestore/gnunet-namestore.c:708
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:736
+#: src/namestore/gnunet-namestore.c:711
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:739
+#: src/namestore/gnunet-namestore.c:714
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:742
+#: src/namestore/gnunet-namestore.c:717
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:745
+#: src/namestore/gnunet-namestore.c:720
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:748
+#: src/namestore/gnunet-namestore.c:723
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:751
+#: src/namestore/gnunet-namestore.c:726
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:754
+#: src/namestore/gnunet-namestore.c:729
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:757
-msgid "create or list non-authority record"
+#: src/namestore/gnunet-namestore.c:732
+msgid ""
+"create shadow record (only valid if all other records of the same type have "
+"expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:760
-msgid "filename with the zone key"
+#: src/namestore/gnunet-namestore.c:735
+msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:771
+#: src/namestore/gnunet-namestore.c:746
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
 
-#: src/namestore/gnunet-service-namestore.c:300
-#: src/namestore/gnunet-service-namestore.c:318
+#: src/namestore/gnunet-namestore-fcfsd.c:456
 #, fuzzy, c-format
-msgid "Failed to write zone key to file `%s': %s\n"
-msgstr "打开日志文件“%s”失败:%s\n"
+msgid "Unsupported form value `%s'\n"
+msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-service-namestore.c:302
-msgid "file exists but reading key failed"
+#: src/namestore/gnunet-namestore-fcfsd.c:485
+#, fuzzy, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:520
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:320
-msgid "file exists with different key"
+#: src/namestore/gnunet-namestore-fcfsd.c:560
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:2127
-msgid "No directory to load zonefiles specified in configuration\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:670
+#, fuzzy, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "发送消息失败。\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:686
+#, fuzzy, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:722
+msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:2137
-#, c-format
-msgid "Creating directory `%s' for zone files failed!\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:730
+msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:346
-msgid "Namestore failed to add record"
+#: src/namestore/gnunet-namestore-fcfsd.c:932
+msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/namestore_api.c:372
-msgid "Namestore failed to add record\n"
+#: src/namestore/gnunet-namestore-fcfsd.c:1027
+msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
-#: src/namestore/namestore_api_common.c:532
-#: src/namestore/namestore_api_common.c:672
+#: src/namestore/gnunet-service-namestore.c:674
+msgid "Failed to cache encrypted block of my own zone!\n"
+msgstr ""
+
+#: src/namestore/namestore_api.c:319
+msgid "Namestore failed to cache block"
+msgstr ""
+
+#: src/namestore/namestore_api.c:345
+msgid "Namestore failed to store record\n"
+msgstr ""
+
+#: src/namestore/namestore_api_common.c:691
+#: src/namestore/namestore_api_common.c:831
 #, fuzzy, c-format
 msgid "Unsupported record type %d\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/namestore_api_common.c:539
+#: src/namestore/namestore_api_common.c:698
 #, fuzzy, c-format
 msgid "Unable to parse IPv4 address `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/namestore/namestore_api_common.c:562
+#: src/namestore/namestore_api_common.c:721
 #, fuzzy, c-format
 msgid "Unable to parse SOA record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/namestore_api_common.c:585
+#: src/namestore/namestore_api_common.c:744
 #, fuzzy, c-format
 msgid "Unable to parse MX record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/namestore_api_common.c:603
+#: src/namestore/namestore_api_common.c:762
 #, fuzzy, c-format
 msgid "Unable to parse IPv6 address `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/namestore/namestore_api_common.c:616
+#: src/namestore/namestore_api_common.c:775
 #, fuzzy, c-format
 msgid "Unable to parse PKEY record `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/namestore_api_common.c:637
+#: src/namestore/namestore_api_common.c:796
 #, fuzzy, c-format
 msgid "Unable to parse VPN record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/namestore/namestore_api_common.c:663
+#: src/namestore/namestore_api_common.c:822
 #, fuzzy, c-format
 msgid "Unable to parse TLSA record string `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -4253,40 +4282,40 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:884
+#: src/nse/gnunet-nse-profiler.c:889
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:887
+#: src/nse/gnunet-nse-profiler.c:892
 msgid "name of the file for writing connection information and statistics"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:890 src/testbed/gnunet-testbed-profiler.c:284
+#: src/nse/gnunet-nse-profiler.c:895 src/testbed/gnunet-testbed-profiler.c:287
 msgid "name of the file with the login information for the testbed"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:893
+#: src/nse/gnunet-nse-profiler.c:898
 msgid "name of the file for writing the main results"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:896
+#: src/nse/gnunet-nse-profiler.c:901
 msgid "Number of peers to run in each round, separated by commas"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:902
+#: src/nse/gnunet-nse-profiler.c:907
 msgid "delay between rounds"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:911
+#: src/nse/gnunet-nse-profiler.c:916
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-service-nse.c:1433
+#: src/nse/gnunet-service-nse.c:1448
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1472
+#: src/nse/gnunet-service-nse.c:1487
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -4295,42 +4324,42 @@
 msgid "Removing expired address of transport `%s'\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:355
+#: src/peerinfo/gnunet-service-peerinfo.c:353
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:372
+#: src/peerinfo/gnunet-service-peerinfo.c:370
 #, fuzzy, c-format
 msgid "Failed to parse HELLO in file `%s': %s %u \n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:450
+#: src/peerinfo/gnunet-service-peerinfo.c:448
 msgid "# peers known"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:486
+#: src/peerinfo/gnunet-service-peerinfo.c:484
 #, c-format
 msgid ""
 "File `%s' in directory `%s' does not match naming convention. Removed.\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:639
+#: src/peerinfo/gnunet-service-peerinfo.c:637
 #, fuzzy, c-format
 msgid "Scanning directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:644
+#: src/peerinfo/gnunet-service-peerinfo.c:642
 #, c-format
 msgid "Still no peers found in `%s'!\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:979
+#: src/peerinfo/gnunet-service-peerinfo.c:975
 #, fuzzy, c-format
 msgid "Cleaning up directory `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:1269
+#: src/peerinfo/gnunet-service-peerinfo.c:1265
 #, c-format
 msgid "Importing HELLOs from `%s'\n"
 msgstr ""
@@ -4481,6 +4510,117 @@
 msgid "Unable to initialize Postgres: %s"
 msgstr "无法初始化 SQLite:%s。\n"
 
+#: src/psycstore/gnunet-service-psycstore.c:203
+#, fuzzy
+msgid "Failed to store membership information!\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:227
+#, fuzzy
+msgid "Failed to test membership!\n"
+msgstr "发送消息失败。\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:249
+#, fuzzy
+msgid "Failed to store fragment!\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:275
+#, fuzzy
+msgid "Failed to get fragment!\n"
+msgstr "发送消息失败。\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:302
+#, fuzzy
+msgid "Failed to get message!\n"
+msgstr "发送消息失败。\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:331
+#, fuzzy
+msgid "Failed to get message fragment!\n"
+msgstr "打开日志文件“%s”失败:%s\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:357
+#, fuzzy
+msgid "Failed to get master counters!\n"
+msgstr "发送消息失败。\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:395
+#, fuzzy
+msgid "Failed to get slave counters!\n"
+msgstr "发送消息失败。\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:429
+#: src/psycstore/gnunet-service-psycstore.c:502
+msgid "Tried to set invalid state variable name!\n"
+msgstr ""
+
+#: src/psycstore/gnunet-service-psycstore.c:445
+#, fuzzy
+msgid "Failed to begin modifying state!\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:468
+#, fuzzy, c-format
+msgid "Unknown operator: %c\n"
+msgstr "未知错误"
+
+#: src/psycstore/gnunet-service-psycstore.c:478
+#, fuzzy
+msgid "Failed to end modifying state!\n"
+msgstr "运行 %s失败:%s %d\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:516
+#, fuzzy
+msgid "Failed to begin synchronizing state!\n"
+msgstr "发送消息失败。\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:532
+#, fuzzy
+msgid "Failed to end synchronizing state!\n"
+msgstr "发送消息失败。\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:552
+#: src/psycstore/gnunet-service-psycstore.c:571
+#, fuzzy
+msgid "Failed to reset state!\n"
+msgstr "发送消息失败。\n"
+
+#: src/psycstore/gnunet-service-psycstore.c:594
+#: src/psycstore/gnunet-service-psycstore.c:645
+msgid "Tried to get invalid state variable name!\n"
+msgstr ""
+
+#: src/psycstore/gnunet-service-psycstore.c:621
+#: src/psycstore/gnunet-service-psycstore.c:660
+#, fuzzy
+msgid "Failed to get state variable!\n"
+msgstr "发送消息失败。\n"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:60
+#, fuzzy, c-format
+msgid "`%s' failed at %s:%d with error: %s (%d)\n"
+msgstr "“%s”于 %s:%d 处失败,错误为:%s\n"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:253
+#, fuzzy, c-format
+msgid ""
+"Error preparing SQL query: %s\n"
+"  %s\n"
+msgstr "创建用户出错"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:276
+#, fuzzy, c-format
+msgid ""
+"Error executing SQL query: %s\n"
+"  %s\n"
+msgstr "创建用户出错"
+
+#: src/psycstore/plugin_psycstore_sqlite.c:1796
+#, fuzzy
+msgid "SQLite database running\n"
+msgstr "sqlite 数据仓库"
+
 #: src/pt/gnunet-daemon-pt.c:266
 msgid "Failed to pack DNS request.  Dropping.\n"
 msgstr ""
@@ -4539,69 +4679,69 @@
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/regex/gnunet-daemon-regexprofiler.c:384
+#: src/regex/gnunet-daemon-regexprofiler.c:380
 msgid "Daemon to announce regular expressions for the peer using mesh."
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1279
+#: src/regex/gnunet-regex-profiler.c:1281
 msgid "No configuration file given. Exiting\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1290
+#: src/regex/gnunet-regex-profiler.c:1292
 #, fuzzy
 msgid "Configuration option \"regex_prefix\" missing. Exiting\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1319
+#: src/regex/gnunet-regex-profiler.c:1321
 #: 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:1325
+#: src/regex/gnunet-regex-profiler.c:1327
 #: 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:1332
+#: src/regex/gnunet-regex-profiler.c:1334
 #, fuzzy, c-format
 msgid "No files found in `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/regex/gnunet-regex-profiler.c:1341
+#: src/regex/gnunet-regex-profiler.c:1343
 msgid "No search strings file given. Exiting.\n"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1361
+#: src/regex/gnunet-regex-profiler.c:1363
 #, fuzzy
 msgid "Error loading search strings. Exiting.\n"
 msgstr "创建用户出错"
 
-#: src/regex/gnunet-regex-profiler.c:1443
+#: src/regex/gnunet-regex-profiler.c:1445
 #, fuzzy
 msgid "name of the file for writing statistics"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1446
+#: src/regex/gnunet-regex-profiler.c:1448
 msgid "wait TIMEOUT before ending the experiment"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1449
+#: src/regex/gnunet-regex-profiler.c:1451
 msgid "directory with policy files"
 msgstr ""
 
-#: src/regex/gnunet-regex-profiler.c:1452
+#: src/regex/gnunet-regex-profiler.c:1454
 #, fuzzy
 msgid "name of file with input strings"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1455
+#: src/regex/gnunet-regex-profiler.c:1457
 #, fuzzy
 msgid "name of file with hosts' names"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/regex/gnunet-regex-profiler.c:1467
+#: src/regex/gnunet-regex-profiler.c:1469
 msgid "Profiler for regex"
 msgstr ""
 
@@ -4617,6 +4757,233 @@
 msgid "Profiler for regex library"
 msgstr ""
 
+#: src/scalarproduct/gnunet-scalarproduct.c:195
+#, fuzzy
+msgid "You must specify at least one message ID to check!\n"
+msgstr "您必须指定一个昵称\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:201
+msgid "This program needs a session identifier for comparing vectors.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:207
+msgid "Please give a session key for --input_key!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:216
+#, c-format
+msgid ""
+"Tried to set initiator mode, as peer ID was given. However, `%s' is not a "
+"valid peer identifier.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:240
+#: src/scalarproduct/gnunet-scalarproduct.c:298
+#, fuzzy, c-format
+msgid "Could not convert `%s' to int32_t.\n"
+msgstr "无法连接到 %s:%u:%s\n"
+
+#: src/scalarproduct/gnunet-scalarproduct.c:247
+msgid "Need elements to compute the vectorproduct, got none.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:348
+msgid ""
+"A comma separated list of elements to compare as vector with our remote peer."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:351
+msgid ""
+"A comma separated mask to select which elements should actually be compared."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:354
+msgid ""
+"[Optional] peer to calculate our scalarproduct with. If this parameter is "
+"not given, the service will wait for a remote peer to compute the request."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:357
+msgid "Transaction ID shared with peer."
+msgstr ""
+
+#: src/scalarproduct/gnunet-scalarproduct.c:366
+msgid "Calculate the Vectorproduct with a GNUnet peer."
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:381
+#, c-format
+msgid "Generated key set with key length %d bits.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:691
+#, fuzzy, c-format
+msgid "Client (%p) disconnected from us.\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:762
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1696
+#, fuzzy, c-format
+msgid "Could not send message to client (%p)!\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:768
+#, c-format
+msgid "Sending session-end notification to client (%p) for session %s\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:891
+msgid "Message too large, fragmentation is currently not supported!)\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:896
+msgid "Could not send service-response message via mesh!)\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1092
+#, c-format
+msgid "Failed to communicate with `%s', scalar product calculation aborted.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1145
+#, fuzzy, c-format
+msgid "Successfully created new tunnel to peer (%s)!\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1157
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1873
+msgid "Message too large, fragmentation is currently not supported!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1223
+msgid "Transmitting service request.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1233
+#, fuzzy
+msgid "Could not send mutlicast message to tunnel!\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1283
+msgid "Too short message received from client!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1297
+msgid "Invalid message received from client, session information incorrect!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1309
+#, c-format
+msgid ""
+"Duplicate session information received, cannot create new session with key `"
+"%s'\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1330
+#, c-format
+msgid ""
+"Got client-request-session with key %s, preparing tunnel to remote service.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1369
+#, c-format
+msgid "Creating new tunnel to for session with key %s.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1417
+#, c-format
+msgid ""
+"Got client-responder-session with key %s and a matching service-request-"
+"session set, processing.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1425
+#, c-format
+msgid ""
+"Got client-responder-session with key %s but NO matching service-request-"
+"session set, queuing element for later use.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1481
+#, c-format
+msgid "Peer disconnected, terminating session %s with peer (%s)\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1706
+#, c-format
+msgid "Sent result to client (%p), this session (%s) has ended!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1790
+#, c-format
+msgid ""
+"Got message with duplicate session key (`%s'), ignoring service request.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1813
+msgid "Could not translate remote public key to sexpression!\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1849
+#, fuzzy, c-format
+msgid ""
+"Could not translate E[a%d] to MPI!\n"
+"%s/%s\n"
+msgstr "无法利用“%2$s”获取接口“%1$s”的 IP。\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1857
+#, c-format
+msgid "Got session with key %s and a matching element set, processing.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:1866
+#, c-format
+msgid "Got session with key %s without a matching element set, queueing.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2039
+msgid "Shutting down, initiating cleanup.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2100
+msgid "Generating Paillier-Keyset.\n"
+msgstr ""
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2116
+#, fuzzy
+msgid "Connect to MESH failed\n"
+msgstr "“%s”已连接到“%s”。\n"
+
+#: src/scalarproduct/gnunet-service-scalarproduct.c:2120
+msgid "Mesh initialized\n"
+msgstr ""
+
+#: src/scalarproduct/scalarproduct_api.c:243
+msgid "# SUC responder result messages received"
+msgstr ""
+
+#: src/scalarproduct/scalarproduct_api.c:297
+msgid "# bytes sent to scalarproduct"
+msgstr ""
+
+#: src/scalarproduct/scalarproduct_api.c:340
+#: src/scalarproduct/scalarproduct_api.c:433
+#, fuzzy
+msgid "Failed to connect to the scalarproduct service\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/scalarproduct/scalarproduct_api.c:348
+#: src/scalarproduct/scalarproduct_api.c:441
+#, fuzzy
+msgid "Failed to send a message to the statistics service\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/scalarproduct/scalarproduct_api.c:382
+#: src/scalarproduct/scalarproduct_api.c:478
+#, fuzzy
+msgid "Failed to send a message to the scalarproduct service\n"
+msgstr "初始化“%s”服务失败。\n"
+
 #: src/set/gnunet-set-ibf-profiler.c:224
 #, fuzzy
 msgid "number of element in set A-B"
@@ -4653,78 +5020,83 @@
 msgid "Wrote %llu bytes of statistics to `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:141
+#: src/statistics/gnunet-statistics.c:142
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:143
+#: src/statistics/gnunet-statistics.c:144
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:186
+#: src/statistics/gnunet-statistics.c:191
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:192
+#: src/statistics/gnunet-statistics.c:197
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:223
+#: src/statistics/gnunet-statistics.c:228
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:231
+#: src/statistics/gnunet-statistics.c:236
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:258
+#: src/statistics/gnunet-statistics.c:263
 #, fuzzy, c-format
 msgid "Trying to connect to remote host, but service `%s' is not running\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:266
+#: src/statistics/gnunet-statistics.c:271
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/statistics/gnunet-statistics.c:273
+#: src/statistics/gnunet-statistics.c:278
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:331
+#: src/statistics/gnunet-statistics.c:310
+#, fuzzy, c-format
+msgid "Invalid argument `%s'\n"
+msgstr "“%s”的参数无效。\n"
+
+#: src/statistics/gnunet-statistics.c:336
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:334
+#: src/statistics/gnunet-statistics.c:339
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:337
+#: src/statistics/gnunet-statistics.c:342
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:340
+#: src/statistics/gnunet-statistics.c:345
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:343
+#: src/statistics/gnunet-statistics.c:348
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:346
+#: src/statistics/gnunet-statistics.c:351
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:349
+#: src/statistics/gnunet-statistics.c:354
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:361
+#: src/statistics/gnunet-statistics.c:366
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
@@ -4739,27 +5111,22 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/sysmon/gnunet-service-sysmon.c:546
-#, c-format
-msgid "Could not parse execution interval for `%s', set to default 60 sec.\n"
-msgstr ""
-
 #: src/testbed/gnunet-service-testbed_cpustatus.c:727
 #, c-format
 msgid ""
 "Cannot open %s for writing load statistics.  Not logging load statistics\n"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:964
+#: src/testbed/gnunet-service-testbed_peers.c:973
 #, fuzzy
 msgid "Misconfiguration (can't connect to the ARM service)"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testbed/gnunet-service-testbed_peers.c:970
+#: src/testbed/gnunet-service-testbed_peers.c:979
 msgid "Request doesn't fit into a message"
 msgstr ""
 
-#: src/testbed/gnunet-service-testbed_peers.c:1008
+#: src/testbed/gnunet-service-testbed_peers.c:1017
 #, c-format
 msgid "%s service can't be started because ARM is shutting down"
 msgstr ""
@@ -4778,230 +5145,243 @@
 msgid "Spawning process `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/testbed/gnunet-testbed-profiler.c:251
+#: src/testbed/gnunet-testbed-profiler.c:254
 #, fuzzy, c-format
 msgid "Exiting as the number of peers is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/testbed/gnunet-testbed-profiler.c:277
+#: src/testbed/gnunet-testbed-profiler.c:280
 msgid "create COUNT number of peers"
 msgstr ""
 
-#: src/testbed/gnunet-testbed-profiler.c:280
+#: src/testbed/gnunet-testbed-profiler.c:283
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:459
+#: src/testbed/testbed_api_hosts.c:415
 #, c-format
 msgid "Hosts file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:467
+#: src/testbed/testbed_api_hosts.c:423
 #, c-format
 msgid "Hosts file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:474
+#: src/testbed/testbed_api_hosts.c:430
 #, c-format
 msgid "Hosts file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:595
+#: src/testbed/testbed_api_hosts.c:570
 #, c-format
 msgid "The function %s is only available when compiled with (--with-ll)\n"
 msgstr ""
 
-#: src/testbed/testbed_api_hosts.c:1878
+#: src/testbed/testbed_api_hosts.c:1572
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "“%s”以错误码 %d 失败:%s\n"
 
-#: src/testbed/testbed_api_testbed.c:802
+#: src/testbed/testbed_api_testbed.c:820
 msgid "Linking controllers failed. Exiting"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:944
+#: src/testbed/testbed_api_testbed.c:989
 #, c-format
 msgid "Host registration failed for a host. Error: %s\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1009
+#: src/testbed/testbed_api_testbed.c:1055
 msgid "Controller crash detected. Shutting down.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1111
+#: src/testbed/testbed_api_testbed.c:1144
 #, c-format
 msgid "Host %s cannot start testbed\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1115
+#: src/testbed/testbed_api_testbed.c:1148
 msgid "Testbed cannot be started on localhost\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1153
+#: src/testbed/testbed_api_testbed.c:1186
 msgid "Cannot start the master controller"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1171
+#: src/testbed/testbed_api_testbed.c:1204
 msgid "Shutting down testbed due to timeout while setup.\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1231
+#: src/testbed/testbed_api_testbed.c:1264
 msgid "No hosts loaded from LoadLeveler. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1243
+#: src/testbed/testbed_api_testbed.c:1276
 msgid "No hosts loaded. Need at least one host\n"
 msgstr ""
 
-#: src/testbed/testbed_api_testbed.c:1267
+#: src/testbed/testbed_api_testbed.c:1300
 msgid "Specified topology must be supported by testbed"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:670
+#: src/testbed/testbed_api_testbed.c:1350
 #, c-format
+msgid ""
+"Maximum number of edges a peer can have in a scale free topology cannot be "
+"more than %u.  Given `%s = %llu'"
+msgstr ""
+
+#: src/testbed/testbed_api_testbed.c:1366
+#, c-format
+msgid ""
+"The number of edges that can established when adding a new node to scale "
+"free topology cannot be more than %u.  Given `%s = %llu'"
+msgstr ""
+
+#: src/testbed/testbed_api_topology.c:716
+#, c-format
 msgid "Topology file %s not found\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:676
+#: src/testbed/testbed_api_topology.c:722
 #, c-format
 msgid "Topology file %s has no data\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:683
+#: src/testbed/testbed_api_topology.c:729
 #, c-format
 msgid "Topology file %s cannot be read\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:706
+#: src/testbed/testbed_api_topology.c:751
 #, fuzzy, c-format
 msgid "Failed to read peer index from toology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testbed/testbed_api_topology.c:715
-#: src/testbed/testbed_api_topology.c:739
+#: src/testbed/testbed_api_topology.c:760
+#: src/testbed/testbed_api_topology.c:784
 #, c-format
 msgid "Value in given topology file: %s out of range\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:721
-#: src/testbed/testbed_api_topology.c:745
+#: src/testbed/testbed_api_topology.c:766
+#: src/testbed/testbed_api_topology.c:790
 #, fuzzy, c-format
 msgid "Failed to read peer index from topology file: %s"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testbed/testbed_api_topology.c:727
-#: src/testbed/testbed_api_topology.c:751
+#: src/testbed/testbed_api_topology.c:772
+#: src/testbed/testbed_api_topology.c:796
 msgid "Topology file needs more peers than given ones\n"
 msgstr ""
 
-#: src/testbed/testbed_api_topology.c:766
+#: src/testbed/testbed_api_topology.c:811
 #, fuzzy, c-format
 msgid "Ignoring to connect peer %u to peer %u\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/testing/gnunet-testing.c:130
+#: src/testing/gnunet-testing.c:173
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/gnunet-testing.c:199
+#: src/testing/gnunet-testing.c:258
+#, c-format
+msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+msgstr ""
+
+#: src/testing/gnunet-testing.c:355
 #, fuzzy
 msgid "create unique configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/testing/gnunet-testing.c:201
+#: src/testing/gnunet-testing.c:357
 msgid "extract hostkey file from pre-computed hostkey list"
 msgstr ""
 
-#: src/testing/gnunet-testing.c:203
+#: src/testing/gnunet-testing.c:359
 #, fuzzy
 msgid ""
 "number of unique configuration files to create, or number of the hostkey to "
 "extract"
 msgstr "打印配置文件中的一个值到标准输出"
 
-#: src/testing/gnunet-testing.c:205
+#: src/testing/gnunet-testing.c:361
 #, fuzzy
 msgid "configuration template"
 msgstr "配置已保存"
 
-#: src/testing/gnunet-testing.c:214
-msgid "Command line tool to access the testing library"
+#: src/testing/gnunet-testing.c:363
+msgid "run the given service, wait on stdin for 'r' (restart) or 'q' (quit)"
 msgstr ""
 
-#: src/testing/gnunet-testing-run-service.c:129
-#, c-format
-msgid "Unknown command, use 'q' to quit or 'r' to restart peer\n"
+#: src/testing/gnunet-testing.c:376
+msgid "Command line tool to access the testing library"
 msgstr ""
 
-#: src/testing/gnunet-testing-run-service.c:186
-#, fuzzy
-msgid "name of the template configuration file to use (optional)"
-msgstr "打印配置文件中的一个值到标准输出"
-
-#: src/testing/gnunet-testing-run-service.c:189
-msgid "name of the service to run"
-msgstr ""
-
-#: src/testing/testing.c:288
+#: src/testing/testing.c:276
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:304
+#: src/testing/testing.c:292
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:722
+#: src/testing/testing.c:711
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:733
+#: src/testing/testing.c:722
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/testing/testing.c:1177
-#, fuzzy
-msgid "Failed to create configuration for peer (not enough free ports?)\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/testing/testing.c:1184
+#: src/testing/testing.c:1158
 #, 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:1193
+#: src/testing/testing.c:1167
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:1209
+#: src/testing/testing.c:1177
+msgid "PRIVATE_KEY option in PEER section missing in configuration\n"
+msgstr ""
+
+#: src/testing/testing.c:1190
+#, fuzzy
+msgid "Failed to create configuration for peer (not enough free ports?)\n"
+msgstr "解析配置文件“%s”失败\n"
+
+#: src/testing/testing.c:1204
 #, fuzzy, c-format
-msgid "Cannot open hostkey file: %s\n"
+msgid "Cannot open hostkey file `%s': %s\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/testing/testing.c:1219
+#: src/testing/testing.c:1216
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:1241
+#: src/testing/testing.c:1238
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:1341
+#: src/testing/testing.c:1338
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/testing/testing.c:1707
+#: src/testing/testing.c:1702
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -5019,81 +5399,81 @@
 msgid "# friends connected"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:987
+#: src/topology/gnunet-daemon-topology.c:986
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1030
+#: src/topology/gnunet-daemon-topology.c:1031
 #, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1036
+#: src/topology/gnunet-daemon-topology.c:1037
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1045
+#: src/topology/gnunet-daemon-topology.c:1046
 #, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1053
+#: src/topology/gnunet-daemon-topology.c:1054
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1073
+#: src/topology/gnunet-daemon-topology.c:1074
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1086
+#: src/topology/gnunet-daemon-topology.c:1087
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1096
+#: src/topology/gnunet-daemon-topology.c:1097
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1102
+#: src/topology/gnunet-daemon-topology.c:1103
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1112
+#: src/topology/gnunet-daemon-topology.c:1113
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1118
+#: src/topology/gnunet-daemon-topology.c:1119
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1125
+#: src/topology/gnunet-daemon-topology.c:1126
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1156
+#: src/topology/gnunet-daemon-topology.c:1157
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1211
+#: src/topology/gnunet-daemon-topology.c:1212
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1350
+#: src/topology/gnunet-daemon-topology.c:1351
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
@@ -5108,19 +5488,19 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_blacklist.c:453
-#: src/transport/gnunet-service-transport_blacklist.c:718
+#: src/transport/gnunet-service-transport_blacklist.c:717
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:169
+#: src/transport/gnunet-service-transport.c:168
 msgid "# bytes payload discarded due to not connected peer "
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:235
+#: src/transport/gnunet-service-transport.c:234
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:282
+#: src/transport/gnunet-service-transport.c:281
 msgid "# bytes payload received"
 msgstr ""
 
@@ -5136,7 +5516,7 @@
 "`%s' address `%s' session %p\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:754
+#: src/transport/gnunet-service-transport.c:775
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
@@ -5171,7 +5551,7 @@
 msgstr ""
 
 #: src/transport/gnunet-service-transport_neighbours.c:1346
-#: src/transport/gnunet-service-transport_neighbours.c:1678
+#: src/transport/gnunet-service-transport_neighbours.c:1681
 msgid "# bytes in message queue for other peers"
 msgstr ""
 
@@ -5207,60 +5587,60 @@
 msgid "# KEEPALIVE_RESPONSE messages discarded (not expected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1584
+#: src/transport/gnunet-service-transport_neighbours.c:1586
 msgid "# messages discarded due to lack of neighbour record"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1618
+#: src/transport/gnunet-service-transport_neighbours.c:1620
 msgid "# bandwidth quota violations by other peers"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:1634
+#: src/transport/gnunet-service-transport_neighbours.c:1636
 msgid "# ms throttling suggested"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2769
+#: src/transport/gnunet-service-transport_neighbours.c:2775
 msgid "# unexpected CONNECT_ACK messages (no peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2784
-#: src/transport/gnunet-service-transport_neighbours.c:2815
+#: src/transport/gnunet-service-transport_neighbours.c:2790
+#: src/transport/gnunet-service-transport_neighbours.c:2821
 msgid "# unexpected CONNECT_ACK messages (not ready)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2828
+#: src/transport/gnunet-service-transport_neighbours.c:2834
 msgid "# unexpected CONNECT_ACK messages (waiting on ATS)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:2859
+#: src/transport/gnunet-service-transport_neighbours.c:2865
 msgid "# unexpected CONNECT_ACK messages (disconnecting)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3040
+#: src/transport/gnunet-service-transport_neighbours.c:3046
 msgid "# unexpected SESSION ACK messages"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3093
+#: src/transport/gnunet-service-transport_neighbours.c:3099
 msgid "# SET QUOTA messages ignored (no such peer)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3107
+#: src/transport/gnunet-service-transport_neighbours.c:3113
 msgid "# disconnects due to quota of 0"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3138
+#: src/transport/gnunet-service-transport_neighbours.c:3144
 msgid "# disconnect messages ignored (old format)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3149
+#: src/transport/gnunet-service-transport_neighbours.c:3155
 msgid "# disconnect messages ignored (timestamp)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3188
+#: src/transport/gnunet-service-transport_neighbours.c:3194
 msgid "# other peer asked to disconnect from us"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_neighbours.c:3283
+#: src/transport/gnunet-service-transport_neighbours.c:3289
 msgid "# disconnected from peer upon explicit request"
 msgstr ""
 
@@ -5300,49 +5680,49 @@
 msgid "# PING without HELLO messages sent"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:664
+#: src/transport/gnunet-service-transport_validation.c:660
 msgid "# address revalidations started"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:930
+#: src/transport/gnunet-service-transport_validation.c:928
 msgid "# PING message for different peer received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:989
+#: src/transport/gnunet-service-transport_validation.c:987
 msgid "# failed address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:999
+#: src/transport/gnunet-service-transport_validation.c:997
 msgid "# successful address checks during validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1018
+#: src/transport/gnunet-service-transport_validation.c:1016
 #, c-format
 msgid "Received a PING message with validation bug from `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1072
+#: src/transport/gnunet-service-transport_validation.c:1070
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1117
+#: src/transport/gnunet-service-transport_validation.c:1115
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1126
+#: src/transport/gnunet-service-transport_validation.c:1124
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1253
+#: src/transport/gnunet-service-transport_validation.c:1251
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1268
+#: src/transport/gnunet-service-transport_validation.c:1266
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1374
+#: src/transport/gnunet-service-transport_validation.c:1372
 #, c-format
 msgid "Adding `%s' without addresses for peer `%s'\n"
 msgstr ""
@@ -5563,41 +5943,41 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:815
-#: src/transport/plugin_transport_http_server.c:2585
+#: src/transport/plugin_transport_http_server.c:2614
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:864
-#: src/transport/plugin_transport_http_server.c:2353
+#: src/transport/plugin_transport_http_server.c:2382
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
 #: src/transport/plugin_transport_http.c:896
-#: src/transport/plugin_transport_http_server.c:2385 src/util/service.c:1062
+#: src/transport/plugin_transport_http_server.c:2414 src/util/service.c:1062
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
 #: src/transport/plugin_transport_http.c:913
-#: src/transport/plugin_transport_http_server.c:2402 src/util/service.c:1079
+#: src/transport/plugin_transport_http_server.c:2431 src/util/service.c:1079
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
 #: src/transport/plugin_transport_http.c:1018
-#: src/transport/plugin_transport_http_server.c:2513
+#: src/transport/plugin_transport_http_server.c:2542
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1131
-#: src/transport/plugin_transport_http_server.c:2693
+#: src/transport/plugin_transport_http_server.c:2722
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1144
-#: src/transport/plugin_transport_http_server.c:2704
+#: src/transport/plugin_transport_http_server.c:2733
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
@@ -5623,7 +6003,7 @@
 msgstr ""
 
 #: src/transport/plugin_transport_http.c:1221
-#: src/transport/plugin_transport_http_server.c:2819
+#: src/transport/plugin_transport_http_server.c:2848
 #, fuzzy, c-format
 msgid "Using external hostname `%s'\n"
 msgstr "卸载 GNUnet 服务"
@@ -5632,93 +6012,93 @@
 msgid "No external hostname configured\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1582
+#: src/transport/plugin_transport_http_client.c:1587
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1713
-#: src/transport/plugin_transport_http_server.c:2943
+#: src/transport/plugin_transport_http_client.c:1724
+#: src/transport/plugin_transport_http_server.c:2978
 #, fuzzy, c-format
 msgid "Shutting down plugin `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/transport/plugin_transport_http_client.c:1738
-#: src/transport/plugin_transport_http_server.c:3003
+#: src/transport/plugin_transport_http_client.c:1749
+#: src/transport/plugin_transport_http_server.c:3038
 #, c-format
 msgid "Shutdown for plugin `%s' complete\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:1766
-#: src/transport/plugin_transport_http_server.c:2849
+#: src/transport/plugin_transport_http_client.c:1777
+#: src/transport/plugin_transport_http_server.c:2878
 #, fuzzy, c-format
 msgid "Maximum number of connections is %u\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/plugin_transport_http_server.c:1368
+#: src/transport/plugin_transport_http_server.c:1379
 #, c-format
 msgid ""
 "Access from connection %p (%u of %u) for `%s' `%s' url `%s' with upload data "
 "size %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1632
+#: src/transport/plugin_transport_http_server.c:1644
 #, c-format
 msgid "Accepting connection (%u of %u) from `%s'\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1640
+#: src/transport/plugin_transport_http_server.c:1652
 #, c-format
 msgid ""
 "Server reached maximum number connections (%u), rejecting new connection\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1941
+#: src/transport/plugin_transport_http_server.c:1953
 msgid ""
 "Could not create a new TLS certificate, program `gnunet-transport-"
 "certificate-creation' could not be started!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:1965
+#: src/transport/plugin_transport_http_server.c:1977
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2672
+#: src/transport/plugin_transport_http_server.c:2701
 #, c-format
 msgid "IPv4 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2686
+#: src/transport/plugin_transport_http_server.c:2715
 #, c-format
 msgid "IPv6 support is %s\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2711
+#: src/transport/plugin_transport_http_server.c:2740
 #, c-format
 msgid "Using port %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2726
+#: src/transport/plugin_transport_http_server.c:2755
 #, c-format
 msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2736
+#: src/transport/plugin_transport_http_server.c:2765
 #, fuzzy, c-format
 msgid "Binding to IPv4 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2757
+#: src/transport/plugin_transport_http_server.c:2786
 #, c-format
 msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:2767
+#: src/transport/plugin_transport_http_server.c:2796
 #, fuzzy, c-format
 msgid "Binding to IPv6 address %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_http_server.c:2835
+#: src/transport/plugin_transport_http_server.c:2864
 #, c-format
 msgid "Notifying transport only about hostname `%s'\n"
 msgstr ""
@@ -5765,86 +6145,86 @@
 msgid "# bytes dropped by SMTP (outgoing)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:627
+#: src/transport/plugin_transport_tcp.c:626
 #, c-format
 msgid "Unexpected address length: %u bytes\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:836
-#: src/transport/plugin_transport_tcp.c:925
-#: src/transport/plugin_transport_tcp.c:975
-#: src/transport/plugin_transport_tcp.c:1061
-#: src/transport/plugin_transport_tcp.c:1204
-#: src/transport/plugin_transport_tcp.c:1221
+#: src/transport/plugin_transport_tcp.c:834
+#: src/transport/plugin_transport_tcp.c:923
+#: src/transport/plugin_transport_tcp.c:973
+#: src/transport/plugin_transport_tcp.c:1059
+#: src/transport/plugin_transport_tcp.c:1202
+#: src/transport/plugin_transport_tcp.c:1219
 msgid "# bytes currently in TCP buffers"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:843
-#: src/transport/plugin_transport_tcp.c:1032
-#: src/transport/plugin_transport_tcp.c:2013
-#: src/transport/plugin_transport_tcp.c:2688
+#: src/transport/plugin_transport_tcp.c:841
+#: src/transport/plugin_transport_tcp.c:1030
+#: src/transport/plugin_transport_tcp.c:2009
+#: src/transport/plugin_transport_tcp.c:2690
 msgid "# TCP sessions active"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:929
+#: src/transport/plugin_transport_tcp.c:927
 msgid "# bytes discarded by TCP (timeout)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:978
+#: src/transport/plugin_transport_tcp.c:976
 msgid "# bytes transmitted via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1065
+#: src/transport/plugin_transport_tcp.c:1063
 msgid "# bytes discarded by TCP (disconnect)"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1178
+#: src/transport/plugin_transport_tcp.c:1176
 #, c-format
 msgid "Trying to send with invalid session %p\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1415
-#: src/transport/plugin_transport_udp.c:1454
+#: src/transport/plugin_transport_tcp.c:1413
+#: src/transport/plugin_transport_udp.c:1449
 msgid "# requests to create session with invalid address"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:1532
+#: src/transport/plugin_transport_tcp.c:1530
 msgid "# transport-service disconnect requests for TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2063
+#: src/transport/plugin_transport_tcp.c:2059
 msgid "# TCP WELCOME messages received"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2246
+#: src/transport/plugin_transport_tcp.c:2242
 msgid "# bytes received via TCP"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2326
+#: src/transport/plugin_transport_tcp.c:2322
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2568 src/util/service.c:957
+#: src/transport/plugin_transport_tcp.c:2570 src/util/service.c:957
 #: src/util/service.c:963
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2582
+#: src/transport/plugin_transport_tcp.c:2584
 #, fuzzy
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2675
+#: src/transport/plugin_transport_tcp.c:2677
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2679
+#: src/transport/plugin_transport_tcp.c:2681
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2683
+#: src/transport/plugin_transport_tcp.c:2685
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5857,31 +6237,31 @@
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:403
+#: src/transport/plugin_transport_udp_broadcasting.c:402
 msgid ""
 "Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:420
+#: src/transport/plugin_transport_udp_broadcasting.c:419
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1556
+#: src/transport/plugin_transport_udp.c:1555
 #, c-format
 msgid ""
 "Trying to create session for address of unexpected length %u (should be %u "
 "or %u)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2587
+#: src/transport/plugin_transport_udp.c:2590
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Network seems down, please check "
 "your network configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2601
+#: src/transport/plugin_transport_udp.c:2604
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5889,92 +6269,92 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2901
+#: src/transport/plugin_transport_udp.c:2905
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_udp.c:2999
+#: src/transport/plugin_transport_udp.c:3003
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:3042
+#: src/transport/plugin_transport_udp.c:3046
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_udp.c:3101
+#: src/transport/plugin_transport_udp.c:3105
 #, fuzzy
 msgid "Failed to create network sockets, plugin failed\n"
 msgstr "发送消息失败。\n"
 
-#: src/transport/plugin_transport_unix.c:1641
+#: src/transport/plugin_transport_unix.c:1640
 #, fuzzy
 msgid "Failed to open UNIX listen socket\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/transport/plugin_transport_wlan.c:610
+#: src/transport/plugin_transport_wlan.c:623
 msgid "# WLAN ACKs sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:629
+#: src/transport/plugin_transport_wlan.c:642
 msgid "# WLAN messages defragmented"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:675
-#: src/transport/plugin_transport_wlan.c:742
-#: src/transport/plugin_transport_wlan.c:1874
+#: src/transport/plugin_transport_wlan.c:688
+#: src/transport/plugin_transport_wlan.c:756
+#: src/transport/plugin_transport_wlan.c:1899
 msgid "# WLAN sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:835
+#: src/transport/plugin_transport_wlan.c:860
 msgid "# WLAN message fragments sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:859
+#: src/transport/plugin_transport_wlan.c:884
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:967
-#: src/transport/plugin_transport_wlan.c:1052
-#: src/transport/plugin_transport_wlan.c:1876
+#: src/transport/plugin_transport_wlan.c:992
+#: src/transport/plugin_transport_wlan.c:1077
+#: src/transport/plugin_transport_wlan.c:1901
 msgid "# WLAN MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1247
+#: src/transport/plugin_transport_wlan.c:1272
 msgid "# HELLO messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1273
+#: src/transport/plugin_transport_wlan.c:1298
 msgid "# fragments received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1283
+#: src/transport/plugin_transport_wlan.c:1308
 msgid "# ACKs received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1340
+#: src/transport/plugin_transport_wlan.c:1365
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1460
+#: src/transport/plugin_transport_wlan.c:1485
 msgid "# DATA messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1495
+#: src/transport/plugin_transport_wlan.c:1520
 msgid "# WLAN DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1558
+#: src/transport/plugin_transport_wlan.c:1583
 msgid "# HELLO beacons sent via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1671
+#: src/transport/plugin_transport_wlan.c:1696
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1855
+#: src/transport/plugin_transport_wlan.c:1880
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
@@ -5989,31 +6369,31 @@
 msgid "Failed to initialize testing library!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/util/bio.c:136 src/util/bio.c:142
+#: src/util/bio.c:137 src/util/bio.c:145
 #, fuzzy, c-format
 msgid "Error reading `%s': %s"
 msgstr "创建用户出错"
 
-#: src/util/bio.c:143
+#: src/util/bio.c:147
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:195
+#: src/util/bio.c:199
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:205
+#: src/util/bio.c:209
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:250
+#: src/util/bio.c:254
 #, c-format
 msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
 msgstr ""
 
-#: src/util/bio.c:264
+#: src/util/bio.c:268
 #, c-format
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
@@ -6054,54 +6434,54 @@
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1034
+#: src/util/common_logging.c:256 src/util/common_logging.c:1033
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1032
+#: src/util/common_logging.c:258 src/util/common_logging.c:1031
 msgid "INFO"
 msgstr "信息"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1030
+#: src/util/common_logging.c:260 src/util/common_logging.c:1029
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1028
+#: src/util/common_logging.c:262 src/util/common_logging.c:1027
 msgid "ERROR"
 msgstr "错误"
 
-#: src/util/common_logging.c:266 src/util/common_logging.c:1036
+#: src/util/common_logging.c:264 src/util/common_logging.c:1035
 msgid "NONE"
 msgstr ""
 
-#: src/util/common_logging.c:395
+#: src/util/common_logging.c:393
 #, fuzzy, c-format
 msgid "Failed to create or access directory for log file `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/util/common_logging.c:819
+#: src/util/common_logging.c:817
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次,在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:1037
+#: src/util/common_logging.c:1036
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1176
+#: src/util/common_logging.c:1138
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1215
+#: src/util/common_logging.c:1177
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1233
+#: src/util/common_logging.c:1195
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "配置不满足配置规范文件“%s”的约束!\n"
 
-#: src/util/common_logging.c:1254
+#: src/util/common_logging.c:1216
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -6119,28 +6499,28 @@
 "choices\n"
 msgstr ""
 
-#: src/util/connection.c:427
+#: src/util/connection.c:424
 #, fuzzy, c-format
 msgid "Access denied to `%s'\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/util/connection.c:442
+#: src/util/connection.c:439
 #, c-format
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/util/connection.c:557
+#: src/util/connection.c:554
 #, c-format
 msgid ""
 "Failed to establish TCP connection to `%s:%u', no further addresses to try.\n"
 msgstr ""
 
-#: src/util/connection.c:755 src/util/connection.c:922
+#: src/util/connection.c:752 src/util/connection.c:919
 #, fuzzy, c-format
 msgid "Trying to connect to `%s' (%p)\n"
 msgstr "无法连接到 %s:%u:%s\n"
 
-#: src/util/connection.c:913
+#: src/util/connection.c:910
 #, c-format
 msgid "Attempt to connect to `%s' failed\n"
 msgstr ""
@@ -6152,41 +6532,41 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:534 src/util/crypto_ecc.c:572
+#: src/util/crypto_ecc.c:580 src/util/crypto_ecc.c:618
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/crypto_ecc.c:539
+#: src/util/crypto_ecc.c:585
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_ecc.c:576
+#: src/util/crypto_ecc.c:622
 msgid "This may be ok if someone is currently generating a private key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:607
+#: src/util/crypto_ecc.c:653
 #, 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:612
+#: src/util/crypto_ecc.c:658
 msgid "This may be ok if someone is currently generating a key.\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:694
+#: src/util/crypto_ecc.c:741
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/crypto_ecc.c:756
+#: src/util/crypto_ecc.c:803
 #, 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:836
+#: src/util/crypto_ecc.c:883
 #, c-format
 msgid "ECC signature verification failed at %s:%d: %s\n"
 msgstr ""
@@ -6201,17 +6581,17 @@
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/util/disk.c:1149
+#: src/util/disk.c:1150
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录!\n"
 
-#: src/util/disk.c:1506 src/util/service.c:1679
+#: src/util/disk.c:1507 src/util/service.c:1674
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息:%s\n"
 
-#: src/util/disk.c:1953
+#: src/util/disk.c:1954
 #, c-format
 msgid "No `%s' specified for service `%s' in configuration.\n"
 msgstr ""
@@ -6323,59 +6703,55 @@
 msgid "Manipulate GNUnet configuration files"
 msgstr "更改配置文件中的一个值"
 
-#: src/util/gnunet-ecc.c:65
+#: src/util/gnunet-ecc.c:60
 #, fuzzy, c-format
 msgid "Failed to open `%s': %s\n"
 msgstr "打开日志文件“%s”失败:%s\n"
 
-#: src/util/gnunet-ecc.c:71
+#: src/util/gnunet-ecc.c:66
 #, c-format
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:87
+#: src/util/gnunet-ecc.c:82
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Failed to write to `%s': %s\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/util/gnunet-ecc.c:97
+#: src/util/gnunet-ecc.c:92
 #, c-format
 msgid ""
 "\n"
 "Finished!\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:100
+#: src/util/gnunet-ecc.c:95
 #, c-format
 msgid ""
 "\n"
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:123
+#: src/util/gnunet-ecc.c:118
 #, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:178
+#: src/util/gnunet-ecc.c:163
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:181
+#: src/util/gnunet-ecc.c:166
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:184
+#: src/util/gnunet-ecc.c:169
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:187
-msgid "print the short hash of the public key in ASCII format"
-msgstr ""
-
-#: src/util/gnunet-ecc.c:198
+#: src/util/gnunet-ecc.c:180
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改配置文件中的一个值"
@@ -6438,12 +6814,12 @@
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/network.c:127
+#: src/util/network.c:132
 #, c-format
 msgid "Unable to shorten unix path `%s' while keeping name unique\n"
 msgstr ""
 
-#: src/util/network.c:1344
+#: src/util/network.c:1370
 #, c-format
 msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
@@ -6491,62 +6867,62 @@
 msgid "Could not determine plugin installation path.\n"
 msgstr "无法确定用户界面定义文件。"
 
-#: src/util/program.c:254 src/util/service.c:1801
+#: src/util/program.c:254 src/util/service.c:1796
 #, fuzzy, c-format
 msgid "Could not access configuration file `%s'\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/util/resolver_api.c:202
+#: src/util/resolver_api.c:198
 #, c-format
 msgid "Must specify `%s' for `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:221
+#: src/util/resolver_api.c:217
 #, c-format
 msgid ""
 "Must specify `%s' or numeric IP address for `%s' of `%s' in configuration!\n"
 msgstr ""
 
-#: src/util/resolver_api.c:347
+#: src/util/resolver_api.c:343
 #, fuzzy, c-format
 msgid "Timeout trying to resolve IP address `%s'.\n"
 msgstr "GNUnet 现在使用 IP 地址 %s。\n"
 
-#: src/util/resolver_api.c:351
+#: src/util/resolver_api.c:347
 #, c-format
 msgid "Timeout trying to resolve hostname `%s'.\n"
 msgstr ""
 
-#: src/util/resolver_api.c:890
+#: src/util/resolver_api.c:886
 #, fuzzy, c-format
 msgid "Could not resolve our FQDN : %s\n"
 msgstr "无法解析“%s”(%s):%s\n"
 
-#: src/util/scheduler.c:782
+#: src/util/scheduler.c:802
 msgid "Looks like we're busy waiting...\n"
 msgstr ""
 
-#: src/util/scheduler.c:912
+#: src/util/scheduler.c:933
 #, c-format
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:476
+#: src/util/server.c:482
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/server.c:485
+#: src/util/server.c:491
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/server.c:496
+#: src/util/server.c:502
 #, fuzzy, c-format
 msgid "`%s' failed for `%.*s': address already in use\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
-#: src/util/server.c:888
+#: src/util/server.c:894
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -6626,48 +7002,48 @@
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1318 src/util/service.c:1336
+#: src/util/service.c:1316 src/util/service.c:1334
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1363
+#: src/util/service.c:1359
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1535
+#: src/util/service.c:1530
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败:%s %d\n"
 
-#: src/util/service.c:1568
+#: src/util/service.c:1563
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1617
+#: src/util/service.c:1612
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1621
+#: src/util/service.c:1616
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1625
+#: src/util/service.c:1620
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1680
+#: src/util/service.c:1675
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/util/service.c:1693
+#: src/util/service.c:1688
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”:%s\n"
 
-#: src/util/service.c:1759
+#: src/util/service.c:1754
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6680,75 +7056,79 @@
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:425
+#: src/util/strings.c:429
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:540
+#: src/util/strings.c:544
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败:没有设置环境变量“HOME”"
 
-#: src/util/strings.c:637
-msgid "ms"
-msgstr "毫秒"
+#: src/util/strings.c:641
+msgid "µs"
+msgstr ""
 
-#: src/util/strings.c:641
+#: src/util/strings.c:645
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:643
+#: src/util/strings.c:647
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:649
+#: src/util/strings.c:653
+msgid "ms"
+msgstr "毫秒"
+
+#: src/util/strings.c:659
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:655
+#: src/util/strings.c:665
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:661
+#: src/util/strings.c:671
 msgid "h"
 msgstr "时"
 
-#: src/util/strings.c:668
+#: src/util/strings.c:678
 #, fuzzy
 msgid "day"
 msgstr " 天"
 
-#: src/util/strings.c:670
+#: src/util/strings.c:680
 #, fuzzy
 msgid "days"
 msgstr " 天"
 
-#: src/util/strings.c:697
+#: src/util/strings.c:708
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1098
+#: src/util/strings.c:1109
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1106
+#: src/util/strings.c:1117
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1112
+#: src/util/strings.c:1123
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1119
+#: src/util/strings.c:1130
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1128
+#: src/util/strings.c:1139
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1130
+#: src/vpn/gnunet-service-vpn.c:523 src/vpn/gnunet-service-vpn.c:1128
 msgid "# Active tunnels"
 msgstr ""
 
@@ -6781,65 +7161,83 @@
 msgid "Protocol %u not supported, dropping\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1350
+#: src/vpn/gnunet-service-vpn.c:1348
 msgid "# ICMPv4 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1371
+#: src/vpn/gnunet-service-vpn.c:1369
 msgid "# ICMPv6 packets dropped (not allowed)"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1576
+#: src/vpn/gnunet-service-vpn.c:1574
 msgid "# Packets received from TUN interface"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1614 src/vpn/gnunet-service-vpn.c:1655
+#: src/vpn/gnunet-service-vpn.c:1612 src/vpn/gnunet-service-vpn.c:1653
 #, c-format
 msgid "Packet received for unmapped destination `%s' (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1665
+#: src/vpn/gnunet-service-vpn.c:1663
 msgid "Received IPv4 packet with options (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1679
+#: src/vpn/gnunet-service-vpn.c:1677
 #, c-format
 msgid "Received packet of unknown protocol %d from TUN (dropping it)\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:1761
+#: src/vpn/gnunet-service-vpn.c:1759
 msgid "# ICMP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2100
+#: src/vpn/gnunet-service-vpn.c:2098
 msgid "# UDP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2255
+#: src/vpn/gnunet-service-vpn.c:2253
 msgid "# TCP packets received from mesh"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2406
+#: src/vpn/gnunet-service-vpn.c:2404
 msgid "Failed to find unallocated IPv4 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2461
+#: src/vpn/gnunet-service-vpn.c:2459
 msgid "Failed to find unallocated IPv6 address in VPN's range\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2500 src/vpn/gnunet-service-vpn.c:2713
+#: src/vpn/gnunet-service-vpn.c:2498 src/vpn/gnunet-service-vpn.c:2711
 msgid "# Active destinations"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:2786
+#: src/vpn/gnunet-service-vpn.c:2784
 msgid "Failed to allocate IP address for new destination\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3143
+#: src/vpn/gnunet-service-vpn.c:3112
+#, fuzzy
+msgid "Must specify valid IPv6 address"
+msgstr "“%s”不可用。\n"
+
+#: src/vpn/gnunet-service-vpn.c:3133
+msgid "Must specify valid IPv6 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3141
 msgid "IPv6 support disabled as this system does not support IPv6\n"
 msgstr ""
 
-#: src/vpn/gnunet-service-vpn.c:3175
+#: src/vpn/gnunet-service-vpn.c:3153
+#, fuzzy
+msgid "Must specify valid IPv4 address"
+msgstr "“%s”不可用。\n"
+
+#: src/vpn/gnunet-service-vpn.c:3164
+msgid "Must specify valid IPv4 mask"
+msgstr ""
+
+#: src/vpn/gnunet-service-vpn.c:3173
 msgid "IPv4 support disabled as this system does not support IPv4\n"
 msgstr ""
 
@@ -6913,23 +7311,58 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:588 src/include/gnunet_common.h:593
-#: src/include/gnunet_common.h:599
+#: src/include/gnunet_common.h:618 src/include/gnunet_common.h:625
+#: src/include/gnunet_common.h:633
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:609
+#: src/include/gnunet_common.h:645
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:630 src/include/gnunet_common.h:637
+#: src/include/gnunet_common.h:672 src/include/gnunet_common.h:681
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Failed to parse metadata about pseudonym from file `%s': %s\n"
+#~ msgstr "打开日志文件“%s”失败:%s\n"
+
+#~ msgid "no-name"
+#~ msgstr "无名称"
+
+#, fuzzy
+#~ msgid "Option `%s' ignored\n"
+#~ msgstr "%s:选项“%s”有歧义\n"
+
+#, fuzzy
+#~ msgid "try to shorten a given name"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to read or create private zone key\n"
+#~ msgstr "无法为守护程序创建用户账户。"
+
+#, fuzzy
+#~ msgid "Unable to initialize resolver!\n"
+#~ msgstr "无法初始化 SQLite:%s。\n"
+
+#, fuzzy
+#~ msgid "Using default zone file `%s'\n"
+#~ msgstr "卸载 GNUnet 服务"
+
+#, fuzzy
+#~ msgid "Failed to write zone key to file `%s': %s\n"
+#~ msgstr "打开日志文件“%s”失败:%s\n"
+
+#, fuzzy
+#~ msgid "name of the template configuration file to use (optional)"
+#~ msgstr "打印配置文件中的一个值到标准输出"
+
+#, fuzzy
 #~ msgid "number of peers to start"
 #~ msgstr "迭代次数"
 
@@ -6946,10 +7379,6 @@
 #~ msgstr "发送消息失败。\n"
 
 #, fuzzy
-#~ msgid "Internal error."
-#~ msgstr "未知错误。\n"
-
-#, fuzzy
 #~ msgid "ECDSA signature verification failed at %s:%d: %s\n"
 #~ msgstr "对驱动器“%2$s”的“%1$s”操作失败:%3$u\n"
 
@@ -7053,10 +7482,6 @@
 #~ msgstr "运行 %s失败:%s %d\n"
 
 #, fuzzy
-#~ msgid "Unknown error"
-#~ msgstr "未知错误"
-
-#, fuzzy
 #~ msgid "Failed to serialize meta data"
 #~ msgstr "发送消息失败。\n"
 
@@ -7116,10 +7541,6 @@
 #~ msgid "Failed to create/open key in file `%s'\n"
 #~ msgstr "打开日志文件“%s”失败:%s\n"
 
-#, fuzzy
-#~ msgid "Failed to connect to the chat service\n"
-#~ msgstr "初始化“%s”服务失败。\n"
-
 #~ msgid "anonymous"
 #~ msgstr "匿名"
 
@@ -7170,9 +7591,6 @@
 #~ msgid "Unknown command `%s'\n"
 #~ msgstr "未知的命令“%s”。\n"
 
-#~ msgid "You must specify a nickname\n"
-#~ msgstr "您必须指定一个昵称\n"
-
 #~ msgid "set the chat room to join"
 #~ msgstr "设置要加入的聊天室"
 
@@ -7193,18 +7611,10 @@
 #~ msgstr "保存配置失败。"
 
 #, fuzzy
-#~ msgid "Connected to %s service!\n"
-#~ msgstr "“%s”已连接到“%s”。\n"
-
-#, fuzzy
 #~ msgid "Configuration fails to specify `%s' in section `%s'\n"
 #~ msgstr "配置文件“%s”已写入。\n"
 
 #, fuzzy
-#~ msgid "Failed to start daemon: %s\n"
-#~ msgstr "运行 %s失败:%s %d\n"
-
-#, fuzzy
 #~ msgid "Configuration fails to specify `%s', assuming default value."
 #~ msgstr "配置文件“%s”已写入。\n"
 
@@ -7237,10 +7647,6 @@
 #~ msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
-#~ msgid "Failed to get hostkey!\n"
-#~ msgstr "发送消息失败。\n"
-
-#, fuzzy
 #~ msgid "Could not start `%s' process to start GNUnet.\n"
 #~ msgstr "初始化“%s”服务失败。\n"
 
@@ -7357,10 +7763,6 @@
 #~ msgstr "解析配置文件“%s”失败\n"
 
 #, fuzzy
-#~ msgid "Failed to connect to statistics service!\n"
-#~ msgstr "初始化“%s”服务失败。\n"
-
-#, fuzzy
 #~ msgid "Could not access file: %s\n"
 #~ msgstr "错误:无法访问服务:%s\n"
 
@@ -7931,9 +8333,6 @@
 #~ msgid "Deadlock due to `%s'.\n"
 #~ msgstr "“%s”造成了死锁。\n"
 
-#~ msgid "GNUnet error log"
-#~ msgstr "GNUnet 错误日志"
-
 #, fuzzy
 #~ msgid "Out of memory (for logging)\n"
 #~ msgstr "(用于日志的)内存耗尽\n"

Modified: gnunet/src/consensus/gnunet-consensus-profiler.c
===================================================================
--- gnunet/src/consensus/gnunet-consensus-profiler.c    2013-09-16 13:23:12 UTC 
(rev 29317)
+++ gnunet/src/consensus/gnunet-consensus-profiler.c    2013-09-16 13:33:53 UTC 
(rev 29318)
@@ -347,6 +347,7 @@
 {
   static char *session_str = "gnunet-consensus/test";
   char *topology;
+  int topology_cmp_result;
 
   if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string (cfg, "testbed", 
"OVERLAY_TOPOLOGY", &topology))
   {
@@ -355,15 +356,16 @@
     return;
   }
 
-  if (0 == strcasecmp (topology, "NONE"))
+  topology_cmp_result = strcasecmp (topology, "NONE");
+  GNUNET_free (topology);
+
+  if (0 == topology_cmp_result)
   {
     fprintf (stderr, "'OVERLAY_TOPOLOGY' set to 'NONE', "
                      "seems like you passed the wrong configuration file\n");
     return;
   }
 
-  GNUNET_free (topology);
-
   if (num_peers < replication)
   {
     fprintf (stderr, "k must be <=n\n");




reply via email to

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