[GNUnet-SVN] r24063 - in gnunet: contrib po src/util

gnunet-svn
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24063 - in gnunet: contrib po src/util

From:	gnunet
Subject:	[GNUnet-SVN] r24063 - in gnunet: contrib po src/util
Date:	Thu, 27 Sep 2012 21:40:20 +0200
Author: grothoff
Date: 2012-09-27 21:40:20 +0200 (Thu, 27 Sep 2012)
New Revision: 24063

Modified:
   gnunet/contrib/pogen.sh
   gnunet/po/POTFILES.in
   gnunet/po/es.po
   gnunet/po/sv.po
   gnunet/po/vi.po
   gnunet/po/zh_CN.po
   gnunet/src/util/helper.c
Log:
improving PO set

Modified: gnunet/contrib/pogen.sh
===================================================================
--- gnunet/contrib/pogen.sh     2012-09-27 19:36:14 UTC (rev 24062)
+++ gnunet/contrib/pogen.sh     2012-09-27 19:40:20 UTC (rev 24063)
@@ -1,3 +1,3 @@
 #!/bin/sh
-find src -name "*.c" | grep -v \# | grep -v /test_ | grep -v /perf_  | grep -v 
_old | sort  > po/POTFILES.in
-grep -l _\( `find src -name "*.h"` | grep -v "platform.h" | grep -v _old | 
sort >> po/POTFILES.in
+find src -name "*.c" | grep -v \# | grep -v /test_ | grep -v /perf_  | grep -v 
_old | grep -v chat | sort  > po/POTFILES.in
+grep -l _\( `find src -name "*.h"` | grep -v "platform.h" | grep -v _old | 
grep -v chat | sort >> po/POTFILES.in

Modified: gnunet/po/POTFILES.in
===================================================================
--- gnunet/po/POTFILES.in       2012-09-27 19:36:14 UTC (rev 24062)
+++ gnunet/po/POTFILES.in       2012-09-27 19:40:20 UTC (rev 24063)
@@ -16,9 +16,6 @@
 src/block/block.c
 src/block/plugin_block_template.c
 src/block/plugin_block_test.c
-src/chat/chat.c
-src/chat/gnunet-chat.c
-src/chat/gnunet-service-chat.c
 src/core/core_api.c
 src/core/core_api_is_connected.c
 src/core/core_api_iterate_peers.c
@@ -54,6 +51,7 @@
 src/dht/plugin_block_dht.c
 src/dns/dns_api.c
 src/dns/dnsparser.c
+src/dns/dnsstub.c
 src/dns/gnunet-dns-monitor.c
 src/dns/gnunet-dns-redirector.c
 src/dns/gnunet-helper-dns.c
@@ -103,8 +101,11 @@
 src/fs/gnunet-unindex.c
 src/fs/plugin_block_fs.c
 src/gns/gns_api.c
+src/gns/gns_common.c
+src/gns/gnunet-dns2gns.c
 src/gns/gnunet-gns.c
 src/gns/gnunet-gns-fcfsd.c
+src/gns/gnunet-gns-helper-service-w32.c
 src/gns/gnunet-gns-proxy.c
 src/gns/gnunet-service-gns.c
 src/gns/gnunet-service-gns_interceptor.c
@@ -112,6 +113,10 @@
 src/gns/nss/nss_gns.c
 src/gns/nss/nss_gns_query.c
 src/gns/plugin_block_gns.c
+src/gns/w32nsp.c
+src/gns/w32nsp-install.c
+src/gns/w32nsp-resolve.c
+src/gns/w32nsp-uninstall.c
 src/hello/address.c
 src/hello/gnunet-hello.c
 src/hello/hello.c
@@ -123,6 +128,8 @@
 src/lockmanager/lockmanager_api.c
 src/mesh/gnunet-service-mesh.c
 src/mesh/mesh_api.c
+src/mesh/mesh_block_lib.c
+src/mesh/mesh_common.c
 src/mesh/mesh_tunnel_tree.c
 src/mesh/plugin_block_mesh.c
 src/mysql/mysql.c
@@ -151,27 +158,27 @@
 src/postgres/postgres.c
 src/pt/gnunet-daemon-pt.c
 src/regex/regex.c
+src/regex/regex_graph.c
+src/regex/regex_random.c
 src/statistics/gnunet-service-statistics.c
 src/statistics/gnunet-statistics.c
 src/statistics/statistics_api.c
 src/stream/stream_api.c
 src/template/gnunet-service-template.c
 src/template/gnunet-template.c
+src/testbed/gnunet-helper-testbed.c
 src/testbed/gnunet-service-testbed.c
 src/testbed/testbed_api.c
 src/testbed/testbed_api_hosts.c
 src/testbed/testbed_api_operations.c
 src/testbed/testbed_api_peers.c
 src/testbed/testbed_api_services.c
+src/testbed/testbed_api_statistics.c
 src/testbed/testbed_api_testbed.c
 src/testbed/testbed_api_test.c
 src/testbed/testbed_api_topology.c
 src/testing/gnunet-testing.c
 src/testing/gnunet-testing-run-service.c
-src/testing_old/helper.c
-src/testing_old/testing.c
-src/testing_old/testing_group.c
-src/testing_old/testing_peergroup.c
 src/testing/testing.c
 src/topology/gnunet-daemon-topology.c
 src/transport/gnunet-helper-transport-wlan.c
@@ -188,6 +195,7 @@
 src/transport/gnunet-transport-wlan-sender.c
 src/transport/plugin_transport_http.c
 src/transport/plugin_transport_http_client.c
+src/transport/plugin_transport_http_common.c
 src/transport/plugin_transport_http_server.c
 src/transport/plugin_transport_smtp.c
 src/transport/plugin_transport_tcp.c
@@ -226,10 +234,12 @@
 src/util/disk.c
 src/util/getopt.c
 src/util/getopt_helpers.c
+src/util/gnunet-config.c
 src/util/gnunet-config-diff.c
 src/util/gnunet-resolver.c
 src/util/gnunet-rsa.c
 src/util/gnunet-service-resolver.c
+src/util/gnunet-uri.c
 src/util/helper.c
 src/util/load.c
 src/util/network.c
@@ -261,3 +271,5 @@
 src/include/gnunet_common.h
 src/include/gnunet_postgres_lib.h
 src/include/gnunet_time_lib.h
+src/testbed/testbed_api.h
+src/testbed/testbed_api_operations.h

Modified: gnunet/po/es.po
===================================================================
--- gnunet/po/es.po     2012-09-27 19:36:14 UTC (rev 24062)
+++ gnunet/po/es.po     2012-09-27 19:40:20 UTC (rev 24063)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-08-17 00:17+0200\n"
+"POT-Creation-Date: 2012-09-27 21:17+0200\n"
 "PO-Revision-Date: 2006-06-29 12:05+0200\n"
 "Last-Translator: Miguel Angel Arruga <address@hidden>\n"
 "Language-Team: Spanish\n"
@@ -21,55 +21,6 @@
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:354
-#, fuzzy, c-format
-msgid "Configuration failes to specify option `%s' in section `%s'!\n"
-msgstr ""
-"El fichero de configuración debe especificar el directorio para almacenar "
-"los datos FS en la sección '%s' bajo '%s'.\n"
-
-#: src/arm/arm_api.c:368
-#, fuzzy, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
-msgstr ""
-"El fichero de configuración debe especificar el directorio para almacenar "
-"los datos FS en la sección '%s' bajo '%s'.\n"
-
-#: src/arm/arm_api.c:437
-#, fuzzy, c-format
-msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
-msgstr "Recibida respuesta anómala a'%s' del par '%s'.\n"
-
-#: src/arm/arm_api.c:490
-#, c-format
-msgid "Requesting start of service `%s'.\n"
-msgstr ""
-
-#: src/arm/arm_api.c:491
-#, c-format
-msgid "Requesting termination of service `%s'.\n"
-msgstr ""
-
-#: src/arm/arm_api.c:512
-#, c-format
-msgid "Error while trying to transmit request to start `%s' to ARM\n"
-msgstr ""
-
-#: src/arm/arm_api.c:513
-#, c-format
-msgid "Error while trying to transmit request to stop `%s' to ARM\n"
-msgstr ""
-
-#: src/arm/arm_api.c:547
-#, fuzzy, c-format
-msgid "Asked to start service `%s' within %llu ms\n"
-msgstr "'%s': No se recibió el mensaje en %llu ms.\n"
-
-#: src/arm/arm_api.c:620
-#, fuzzy, c-format
-msgid "Stopping service `%s' within %llu ms\n"
-msgstr "No se ha recibido una respuesta en %llums.\n"
-
 #: src/arm/gnunet-arm.c:166
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
@@ -124,22 +75,17 @@
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:229
+#: src/arm/gnunet-arm.c:230
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/arm/gnunet-arm.c:232
+#: src/arm/gnunet-arm.c:233
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-arm.c:256
-#, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:264 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:384
+#: src/arm/gnunet-arm.c:263 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:385
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
@@ -153,52 +99,52 @@
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/arm/gnunet-arm.c:418
+#: src/arm/gnunet-arm.c:416
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:420
+#: src/arm/gnunet-arm.c:418
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:422
+#: src/arm/gnunet-arm.c:420
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:424
+#: src/arm/gnunet-arm.c:422
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:427
+#: src/arm/gnunet-arm.c:425
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:430
+#: src/arm/gnunet-arm.c:428
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:432
+#: src/arm/gnunet-arm.c:430
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:435
+#: src/arm/gnunet-arm.c:433
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "tiempo para esperar hasta completar una iteración (en ms)"
 
-#: src/arm/gnunet-arm.c:437
+#: src/arm/gnunet-arm.c:435
 msgid "List currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:439
+#: src/arm/gnunet-arm.c:437
 msgid "Don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:441
+#: src/arm/gnunet-arm.c:439
 msgid "Don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:455
+#: src/arm/gnunet-arm.c:450
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -261,7 +207,7 @@
 
 #: src/arm/gnunet-service-arm.c:986
 #, fuzzy, c-format
-msgid "Service `%s' took %llu ms to terminate\n"
+msgid "Service `%s' took %s to terminate\n"
 msgstr "Servicio eliminado.\n"
 
 #: src/arm/gnunet-service-arm.c:1021
@@ -269,26 +215,17 @@
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1127
+#: src/arm/gnunet-service-arm.c:1214
 #, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not valid: %s\n"
-msgstr "Fichero de configuración '%s' creado.\n"
-
-#: src/arm/gnunet-service-arm.c:1129
-msgid "option missing"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:1213
-#, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/arm/gnunet-service-arm.c:1224
+#: src/arm/gnunet-service-arm.c:1225
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1238
+#: src/arm/gnunet-service-arm.c:1239
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -317,272 +254,6 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Probando transporte(s) %s\n"
 
-#: src/chat/chat.c:175
-#, fuzzy
-msgid "Could not transmit confirmation receipt\n"
-msgstr "Imposible acceder a la información del espacio.\n"
-
-#: src/chat/chat.c:283
-msgid "The current user must be the the first one joined\n"
-msgstr ""
-
-#: src/chat/chat.c:412
-#, fuzzy, c-format
-msgid "Unknown message type: '%u'\n"
-msgstr "Operación desconocida '%s'\n"
-
-#: src/chat/chat.c:472
-#, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing\n"
-msgstr "Fichero de configuración '%s' creado.\n"
-
-#: src/chat/chat.c:480
-#, fuzzy, c-format
-msgid "Failed to access chat home directory `%s'\n"
-msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
-
-#: src/chat/chat.c:498
-#, fuzzy, c-format
-msgid "Failed to create/open key in file `%s'\n"
-msgstr "Fichero almacenado en '%s'.\n"
-
-#: src/chat/chat.c:559
-#, fuzzy
-msgid "Could not serialize metadata\n"
-msgstr "¡Imposible inicializar libgnunetutil!\n"
-
-#: src/chat/chat.c:674
-#, fuzzy
-msgid "Failed to connect to the chat service\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/chat/chat.c:680
-msgid "Undefined mandatory parameter: joinCallback\n"
-msgstr ""
-
-#: src/chat/chat.c:686
-msgid "Undefined mandatory parameter: messageCallback\n"
-msgstr ""
-
-#: src/chat/chat.c:692
-msgid "Undefined mandatory parameter: memberCallback\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:93
-msgid "Joined\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:125 src/chat/gnunet-chat.c:133
-#: src/chat/gnunet-chat.c:213 src/chat/gnunet-chat.c:253
-#: src/chat/gnunet-chat.c:329 src/chat/gnunet-chat.c:371
-#: src/chat/gnunet-chat.c:400 src/chat/gnunet-chat.c:700
-msgid "anonymous"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:144
-#, fuzzy, c-format
-msgid "(%s) `%s' said: %s\n"
-msgstr "'%s' %s falló: %s\n"
-
-#: src/chat/gnunet-chat.c:147 src/chat/gnunet-chat.c:150
-#, fuzzy, c-format
-msgid "(%s) `%s' said to you: %s\n"
-msgstr "'%s' %s falló: %s\n"
-
-#: src/chat/gnunet-chat.c:153
-#, fuzzy, c-format
-msgid "(%s) `%s' said for sure: %s\n"
-msgstr "'%s' %s falló: %s\n"
-
-#: src/chat/gnunet-chat.c:156
-#, fuzzy, c-format
-msgid "(%s) `%s' said to you for sure: %s\n"
-msgstr "'%s' falló con el código de error %s: %s"
-
-#: src/chat/gnunet-chat.c:159
-#, fuzzy, c-format
-msgid "(%s) `%s' was confirmed that you received: %s\n"
-msgstr "'%s' falló con el código de error %d: %s"
-
-#: src/chat/gnunet-chat.c:162
-#, fuzzy, c-format
-msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
-msgstr "'%s' falló con el código de error %d: %s"
-
-#: src/chat/gnunet-chat.c:165
-#, fuzzy, c-format
-msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
-msgstr "'%s' falló con el código de error %d: %s"
-
-#: src/chat/gnunet-chat.c:170
-#, fuzzy, c-format
-msgid ""
-"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
-msgstr "'%s' falló con el código de error %d: %s"
-
-#: src/chat/gnunet-chat.c:173
-#, fuzzy, c-format
-msgid "(%s) `%s' said off the record: %s\n"
-msgstr "'%s' falló con el código de error %s: %s"
-
-#: src/chat/gnunet-chat.c:176
-#, c-format
-msgid "(%s) <%s> said using an unknown message type: %s\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:217
-#, c-format
-msgid "'%s' acknowledged message #%d\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:260
-#, c-format
-msgid "`%s' entered the room\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:260
-#, c-format
-msgid "`%s' left the room\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:321 src/chat/gnunet-chat.c:363
-#, fuzzy
-msgid "Could not change username\n"
-msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
-
-#: src/chat/gnunet-chat.c:334 src/chat/gnunet-chat.c:702
-#, fuzzy, c-format
-msgid "Joining room `%s' as user `%s'...\n"
-msgstr "Respuesta inválida a '%s' del par '%s'.\n"
-
-#: src/chat/gnunet-chat.c:373
-#, fuzzy, c-format
-msgid "Changed username to `%s'\n"
-msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
-
-#: src/chat/gnunet-chat.c:388
-#, fuzzy, c-format
-msgid "Users in room `%s': "
-msgstr "Fichero almacenado en '%s'.\n"
-
-#: src/chat/gnunet-chat.c:434
-msgid "Syntax: /msg USERNAME MESSAGE"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:443
-#, c-format
-msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:460
-#, c-format
-msgid "User `%s' is currently not in the room!\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:513
-#, fuzzy, c-format
-msgid "Unknown command `%s'\n"
-msgstr "Operación desconocida '%s'\n"
-
-#: src/chat/gnunet-chat.c:524
-msgid ""
-"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
-"leave the current room"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:528
-msgid ""
-"Use `/nick nickname' to change your nickname.  This will cause you to leave "
-"the current room and immediately rejoin it with the new name."
-msgstr ""
-
-#: src/chat/gnunet-chat.c:532
-msgid ""
-"Use `/msg nickname message' to send a private message to the specified user"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:535
-msgid "The `/notice' command is an alias for `/msg'"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:537
-msgid "The `/query' command is an alias for `/msg'"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:539
-msgid "Use `/sig message' to send a signed public message"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:542
-msgid "Use `/ack message' to require signed acknowledgment of the message"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:545
-msgid "Use `/anonymous message' to send a public anonymous message"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:547
-msgid "The `/anon' command is an alias for `/anonymous'"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:549
-msgid "Use `/quit' to terminate gnunet-chat"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:551
-msgid "The `/leave' command is an alias for `/quit'"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:554
-msgid "Use `/names' to list all of the current members in the chat room"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:556
-msgid "Use `/help command' to get help for a specific command"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:672
-#, fuzzy
-msgid "You must specify a nickname\n"
-msgstr "¡Debes especificar un receptor!\n"
-
-#: src/chat/gnunet-chat.c:688
-#, fuzzy, c-format
-msgid "Failed to join room `%s'\n"
-msgstr "Fichero almacenado en '%s'.\n"
-
-#: src/chat/gnunet-chat.c:727
-msgid "set the nickname to use (required)"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:730
-msgid "set the chat room to join"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:746
-msgid "Join a chat on GNUnet."
-msgstr ""
-
-#: src/chat/gnunet-service-chat.c:266
-#, fuzzy
-msgid "Failed to queue a message notification\n"
-msgstr "Imposible guardar la configuración"
-
-#: src/chat/gnunet-service-chat.c:545
-#, fuzzy
-msgid "Failed to queue a join notification\n"
-msgstr "Imposible guardar la configuración"
-
-#: src/chat/gnunet-service-chat.c:728
-#, fuzzy
-msgid "Failed to queue a confirmation receipt\n"
-msgstr "Imposible guardar la configuración"
-
-#: src/chat/gnunet-service-chat.c:906
-#, fuzzy
-msgid "Failed to queue a leave notification\n"
-msgstr "Imposible guardar la configuración"
-
 #: src/core/core_api.c:757
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
@@ -592,42 +263,58 @@
 msgid "Peer `%s'\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/core/gnunet-core.c:118 src/core/gnunet-core.c:149
-#: src/transport/gnunet-transport.c:451 src/transport/gnunet-transport.c:477
+#: src/core/gnunet-core.c:119 src/core/gnunet-core.c:147
+#: src/transport/gnunet-transport.c:453 src/transport/gnunet-transport.c:477
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:120 src/transport/gnunet-transport.c:453
+#: src/core/gnunet-core.c:121 src/transport/gnunet-transport.c:455
 #, fuzzy
 msgid "Connected to"
 msgstr "'%s' conectado a '%s'.\n"
 
-#: src/core/gnunet-core.c:151 src/transport/gnunet-transport.c:479
+#: src/core/gnunet-core.c:149 src/transport/gnunet-transport.c:479
 #, fuzzy
 msgid "Disconnected from"
 msgstr "'%s' conectado a '%s'.\n"
 
-#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:817
+#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:818
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Argumentos en la linea de comandos inválidos:\n"
 
-#: src/core/gnunet-core.c:216 src/transport/gnunet-transport.c:725
+#: src/core/gnunet-core.c:211 src/transport/gnunet-transport.c:724
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/core/gnunet-core.c:227
+#: src/core/gnunet-core.c:222
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/core/gnunet-service-core.c:97
+#: src/core/gnunet-service-core.c:109
+#, fuzzy, c-format
+msgid "Failed to read hostkey: %s\n"
+msgstr "Falló al comenzar la recolección.\n"
+
+#: src/core/gnunet-service-core.c:123
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
+#: src/core/gnunet-service-core.c:149
+#, fuzzy
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr "Configuración de GNUnet"
+
+#: src/core/gnunet-service-core.c:163
+#: src/transport/gnunet-service-transport.c:685
+#, fuzzy
+msgid "Transport service is unable to access hostkey. Exiting.\n"
+msgstr "Imposible acceder a la información del espacio.\n"
+
 #: src/core/gnunet-service-core_clients.c:370
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
@@ -759,7 +446,7 @@
 
 #: src/core/gnunet-service-core_kx.c:1628
 #, fuzzy, c-format
-msgid "Message received far too old (%llu ms). Content ignored.\n"
+msgid "Message received far too old (%s). Content ignored.\n"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
 #: src/core/gnunet-service-core_kx.c:1632
@@ -772,19 +459,10 @@
 msgid "# bytes of payload decrypted"
 msgstr "# bytes desencriptados"
 
-#: src/core/gnunet-service-core_kx.c:1702
+#: src/core/gnunet-service-core_kx.c:1703 src/hostlist/hostlist-server.c:552
+#: src/peerinfo-tool/gnunet-peerinfo.c:824
+#: src/transport/gnunet-service-transport.c:627
 #, fuzzy
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
-msgstr "Configuración de GNUnet"
-
-#: src/core/gnunet-service-core_kx.c:1710
-msgid "Core service could not access hostkey.  Exiting.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:1720 src/hostlist/hostlist-server.c:551
-#: src/peerinfo-tool/gnunet-peerinfo.c:823
-#: src/transport/gnunet-service-transport.c:619
-#, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
@@ -809,9 +487,9 @@
 
 #: src/core/gnunet-service-core_sessions.c:206
 #: src/core/gnunet-service-core_sessions.c:269
-#: src/dht/gnunet-service-dht_neighbours.c:629
-#: src/dht/gnunet-service-dht_neighbours.c:687
-#: src/fs/gnunet-service-fs_cp.c:622 src/fs/gnunet-service-fs_cp.c:1530
+#: src/dht/gnunet-service-dht_neighbours.c:634
+#: src/dht/gnunet-service-dht_neighbours.c:692
+#: src/fs/gnunet-service-fs_cp.c:623 src/fs/gnunet-service-fs_cp.c:1532
 #: src/topology/gnunet-daemon-topology.c:709
 #: src/topology/gnunet-daemon-topology.c:810
 #: src/transport/gnunet-service-transport_neighbours.c:873
@@ -884,8 +562,8 @@
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:543
-#: src/include/gnunet_common.h:550
+#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:608
+#: src/include/gnunet_common.h:615
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
@@ -903,8 +581,8 @@
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:443
-#: src/datastore/plugin_datastore_sqlite.c:408
-#: src/namestore/plugin_namestore_sqlite.c:370
+#: src/datastore/plugin_datastore_sqlite.c:406
+#: src/namestore/plugin_namestore_sqlite.c:369
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1036,10 +714,12 @@
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:480
+#: src/gns/gnunet-gns-helper-service-w32.c:159
 msgid "Transmission to client failed!\n"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:511
+#: src/gns/gnunet-gns-helper-service-w32.c:189
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
@@ -1212,35 +892,29 @@
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "'%s' falló en %s: %d con el error: %s\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:233
-#: src/namestore/plugin_namestore_sqlite.c:204
+#: src/datastore/plugin_datastore_sqlite.c:258
+#: src/namestore/plugin_namestore_sqlite.c:228
 #, fuzzy, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
-msgstr "¡Ninguna aplicación definida en la configuración!\n"
-
-#: src/datastore/plugin_datastore_sqlite.c:260
-#: src/namestore/plugin_namestore_sqlite.c:229
-#, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:655
+#: src/datastore/plugin_datastore_sqlite.c:653
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "Datos no válidos en %s.  Intentando fijar (por borrado).\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1139
+#: src/datastore/plugin_datastore_sqlite.c:1137
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1158
+#: src/datastore/plugin_datastore_sqlite.c:1156
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1198
+#: src/datastore/plugin_datastore_sqlite.c:1196
 #: src/namestore/plugin_namestore_sqlite.c:834
 #, fuzzy
 msgid "Sqlite database running\n"
@@ -1255,97 +929,116 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:293
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-get.c:132
+#, c-format
+msgid ""
+"Result %d, type %d:\n"
+"%.*s\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:156
+msgid "Must provide key for DHT GET!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:162 src/dht/gnunet-dht-monitor.c:225
+#, fuzzy
+msgid "Failed to connect to DHT service!\n"
+msgstr "Fallo al conectar a gnunetd.\n"
+
+#: src/dht/gnunet-dht-get.c:170
+msgid "Issueing DHT GET with key"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:186 src/dht/gnunet-dht-monitor.c:262
+#: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204
+#: src/dht/gnunet-dht-get.c:189
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296
+#: src/dht/gnunet-dht-get.c:192 src/dht/gnunet-dht-monitor.c:265
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-put.c:210
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:204 src/fs/gnunet-auto-share.c:750
-#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:732
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
-#: src/nse/gnunet-nse-profiler.c:897
+#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:201
+msgid "use DHT's demultiplex everywhere option"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
+#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:750
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:733
+#: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
+#: src/nse/gnunet-nse-profiler.c:1033
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:236
+#: src/dht/gnunet-dht-get.c:222
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:299
-msgid "how long to execute? 0 = forever"
+#: src/dht/gnunet-dht-monitor.c:268
+msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:324
+#: src/dht/gnunet-dht-monitor.c:293
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:108
-msgid "PUT request sent!\n"
-msgstr ""
+#: src/dht/gnunet-dht-put.c:118
+#, fuzzy
+msgid "PUT request sent with key"
+msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-dht-put.c:111
+#: src/dht/gnunet-dht-put.c:121
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:114
+#: src/dht/gnunet-dht-put.c:124
 #, fuzzy
 msgid "PUT request not confirmed!\n"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-dht-put.c:144
+#: src/dht/gnunet-dht-put.c:153
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:152
+#: src/dht/gnunet-dht-put.c:160
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Imposible conectar con gnunetd.\n"
 
-#: src/dht/gnunet-dht-put.c:157
-#, fuzzy, c-format
-msgid "Connected to %s service!\n"
-msgstr "'%s' conectado a '%s'.\n"
-
-#: src/dht/gnunet-dht-put.c:172
+#: src/dht/gnunet-dht-put.c:176
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:186
+#: src/dht/gnunet-dht-put.c:192
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:189
+#: src/dht/gnunet-dht-put.c:195
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:204
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-put.c:207
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:226
+#: src/dht/gnunet-dht-put.c:235
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing_old/testing.c:544
-#: src/testing_old/testing.c:1968 src/testing_old/testing.c:1998
+#: src/dht/gnunet-service-dht.c:163
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Fallo al conectar a gnunetd.\n"
@@ -1438,101 +1131,101 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:485
+#: src/dht/gnunet-service-dht_neighbours.c:490
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:575
+#: src/dht/gnunet-service-dht_neighbours.c:580
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# mensajes fragmentados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:721
+#: src/dht/gnunet-service-dht_neighbours.c:726
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# mensajes defragmentados"
 
-#: src/dht/gnunet-service-dht_neighbours.c:776
+#: src/dht/gnunet-service-dht_neighbours.c:781
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# bytes recibidos por TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:814
+#: src/dht/gnunet-service-dht_neighbours.c:819
 #, fuzzy
 msgid "# Bytes of bandwdith requested from core"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1036
-#: src/dht/gnunet-service-dht_neighbours.c:1064
+#: src/dht/gnunet-service-dht_neighbours.c:1041
+#: src/dht/gnunet-service-dht_neighbours.c:1069
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1045
-#: src/dht/gnunet-service-dht_neighbours.c:1079
+#: src/dht/gnunet-service-dht_neighbours.c:1050
+#: src/dht/gnunet-service-dht_neighbours.c:1084
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr "Conexión fallida\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1211
+#: src/dht/gnunet-service-dht_neighbours.c:1216
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1240
+#: src/dht/gnunet-service-dht_neighbours.c:1245
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1247
-#: src/dht/gnunet-service-dht_neighbours.c:1360
-#: src/dht/gnunet-service-dht_neighbours.c:1460
+#: src/dht/gnunet-service-dht_neighbours.c:1252
+#: src/dht/gnunet-service-dht_neighbours.c:1365
+#: src/dht/gnunet-service-dht_neighbours.c:1465
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1325
+#: src/dht/gnunet-service-dht_neighbours.c:1330
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1352
+#: src/dht/gnunet-service-dht_neighbours.c:1357
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# bytes de mensajes salientes omitidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1467
+#: src/dht/gnunet-service-dht_neighbours.c:1472
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1555
+#: src/dht/gnunet-service-dht_neighbours.c:1560
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1671
+#: src/dht/gnunet-service-dht_neighbours.c:1676
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1679
+#: src/dht/gnunet-service-dht_neighbours.c:1684
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1770
+#: src/dht/gnunet-service-dht_neighbours.c:1775
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1812
+#: src/dht/gnunet-service-dht_neighbours.c:1817
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1826
+#: src/dht/gnunet-service-dht_neighbours.c:1831
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1905
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# bytes recibidos por TCP"
@@ -1585,6 +1278,27 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
+#: src/dns/dnsstub.c:175
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "Imposible encontrar la IP del host '%s': %s\n"
+
+#: src/dns/dnsstub.c:291 src/dns/dnsstub.c:375
+#: src/gns/gnunet-service-gns_resolver.c:1673
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s\n"
+msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
+
+#: src/dns/dnsstub.c:360
+#, c-format
+msgid "Configured DNS exit `%s' is not working / valid.\n"
+msgstr ""
+
+#: src/dns/dnsstub.c:430
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
+
 #: src/dns/gnunet-dns-monitor.c:355
 msgid "only monitor DNS queries"
 msgstr ""
@@ -1609,69 +1323,54 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:485
-#, fuzzy, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr "Imposible encontrar la IP del host '%s': %s\n"
-
-#: src/dns/gnunet-service-dns.c:639
+#: src/dns/gnunet-service-dns.c:499
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:822
+#: src/dns/gnunet-service-dns.c:639
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1005
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1050
+#: src/dns/gnunet-service-dns.c:821
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1168
+#: src/dns/gnunet-service-dns.c:892
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1281
+#: src/dns/gnunet-service-dns.c:1005
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1297
+#: src/dns/gnunet-service-dns.c:1021
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1306
+#: src/dns/gnunet-service-dns.c:1030
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1315
+#: src/dns/gnunet-service-dns.c:1039
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1380
+#: src/dns/gnunet-service-dns.c:1104
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "El mensaje recibido del cliente es inválido\n"
 
-#: src/dns/gnunet-service-dns.c:1465
-#, c-format
-msgid "Configured DNS exit `%s' is not working / valid.\n"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1497 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1180 src/exit/gnunet-daemon-exit.c:2673
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1561 src/exit/gnunet-daemon-exit.c:3032
+#: src/dns/gnunet-service-dns.c:1245 src/exit/gnunet-daemon-exit.c:3032
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1581
+#: src/dns/gnunet-service-dns.c:1266
 msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
@@ -1883,7 +1582,7 @@
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3240
+#: src/exit/gnunet-daemon-exit.c:3241
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2121,39 +1820,32 @@
 msgid "Failed to connect to datastore service"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/fs_namespace.c:57 src/fs/fs_namespace.c:83
+#: src/fs/fs_namespace.c:110
 #, fuzzy, c-format
-msgid "Configuration fails to specify `%s' in section `%s'\n"
-msgstr ""
-"El fichero de configuración debe especificar el directorio para almacenar "
-"los datos FS en la sección '%s' bajo '%s'.\n"
-
-#: src/fs/fs_namespace.c:112
-#, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_namespace.c:134 src/fs/fs_namespace.c:222
+#: src/fs/fs_namespace.c:132 src/fs/fs_namespace.c:220
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/fs_namespace.c:254
+#: src/fs/fs_namespace.c:252
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/fs/fs_namespace.c:369
+#: src/fs/fs_namespace.c:367
 #, fuzzy, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr "Fallo al añadir la entrada al espacio '%s' (¿existe?)\n"
 
-#: src/fs/fs_namespace.c:586 src/fs/fs_publish_ksk.c:295
+#: src/fs/fs_namespace.c:584 src/fs/fs_publish_ksk.c:295
 #, fuzzy
 msgid "Internal error."
 msgstr "Error desconocido.\n"
 
-#: src/fs/fs_namespace.c:629
+#: src/fs/fs_namespace.c:627
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Fallo al conectarse a gnunetd"
@@ -2235,11 +1927,6 @@
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_test_lib.c:269
-#, fuzzy, c-format
-msgid "Failed to start daemon: %s\n"
-msgstr "Falló al comenzar la recolección.\n"
-
 #: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
@@ -2267,37 +1954,37 @@
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/fs/fs_unindex.c:344
+#: src/fs/fs_unindex.c:349 src/fs/fs_unindex.c:361
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/fs_unindex.c:356
+#: src/fs/fs_unindex.c:357
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "=\tError leyendo el directorio.\n"
 
-#: src/fs/fs_unindex.c:411
+#: src/fs/fs_unindex.c:416
 #, fuzzy, c-format
 msgid "Failed to remove KBlock: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/fs_unindex.c:501
+#: src/fs/fs_unindex.c:506
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s' from KBlock!\n"
 msgstr "El fichero '%s' tiene la URI: '%s'\n"
 
-#: src/fs/fs_unindex.c:553 src/fs/fs_unindex.c:618
+#: src/fs/fs_unindex.c:558 src/fs/fs_unindex.c:623
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/fs/fs_unindex.c:631
+#: src/fs/fs_unindex.c:636
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/fs/fs_unindex.c:665
+#: src/fs/fs_unindex.c:670
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Fallo al conectarse a gnunetd"
@@ -2362,16 +2049,16 @@
 msgid "Lacking key configuration settings.\n"
 msgstr "Configuración de GNUnet"
 
-#: src/fs/fs_uri.c:910
+#: src/fs/fs_uri.c:909
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/fs/fs_uri.c:1115 src/fs/fs_uri.c:1142
+#: src/fs/fs_uri.c:1114 src/fs/fs_uri.c:1141
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna clave especificada!\n"
 
-#: src/fs/fs_uri.c:1148
+#: src/fs/fs_uri.c:1147
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2410,24 +2097,24 @@
 msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
 
 #: src/fs/gnunet-auto-share.c:734 src/fs/gnunet-pseudonym.c:279
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:680
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "seleccione el NIVEL deseado de anonimato al enviar"
 
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:684
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:686
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:687
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:711
 msgid "specify the priority of the content"
 msgstr "especifica la prioridad del contenido"
 
 #: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-pseudonym.c:304
-#: src/fs/gnunet-publish.c:717
+#: src/fs/gnunet-publish.c:718
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2475,87 +2162,87 @@
 msgid "Starting download `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/fs/gnunet-download.c:146
+#: src/fs/gnunet-download.c:147
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Error desconocido"
 
-#: src/fs/gnunet-download.c:155
+#: src/fs/gnunet-download.c:157
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:178
+#: src/fs/gnunet-download.c:179
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Error descargando: %s\n"
 
-#: src/fs/gnunet-download.c:193
+#: src/fs/gnunet-download.c:194
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "¡Subida rechazada!"
 
-#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:191
-#: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:192
+#: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Estado de descarga inesperado."
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:234
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:625
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:626
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "El fichero '%s' tiene la URI: '%s'\n"
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:247
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:254
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:603
-#: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:604
+#: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Falló al inicializar el servicio '%s'.\n"
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:282
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr "seleccione el NIVEL deseado de anonimidad-del-receptor"
 
-#: src/fs/gnunet-download.c:307
+#: src/fs/gnunet-download.c:308
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:288
+#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:285
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:313
+#: src/fs/gnunet-download.c:314
 msgid "write the file to FILENAME"
 msgstr "escribe el fichero al FICHERO"
 
-#: src/fs/gnunet-download.c:317
+#: src/fs/gnunet-download.c:318
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:321
+#: src/fs/gnunet-download.c:322
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:325
 msgid "download a GNUnet directory recursively"
 msgstr "descarga un directorio de GNUnet recursivamente"
 
-#: src/fs/gnunet-download.c:338
+#: src/fs/gnunet-download.c:339
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2597,7 +2284,7 @@
 "añade una clave adicional para todos los ficheros y directorios (esta opción "
 "puede ser especificada varias veces)"
 
-#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:698
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:699
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr "cambia el meta-dato para el TIPO dado al VALOR dado"
 
@@ -2628,128 +2315,128 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:147
+#: src/fs/gnunet-publish.c:149
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:155
+#: src/fs/gnunet-publish.c:156
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Error descargando: %s\n"
 
-#: src/fs/gnunet-publish.c:165
+#: src/fs/gnunet-publish.c:166
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:169
+#: src/fs/gnunet-publish.c:170
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/fs/gnunet-publish.c:188
+#: src/fs/gnunet-publish.c:189
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "'%s' comienzo completo.\n"
 
-#: src/fs/gnunet-publish.c:306
+#: src/fs/gnunet-publish.c:307
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Actualizando los datos del módulo '%s'\n"
 
-#: src/fs/gnunet-publish.c:308
+#: src/fs/gnunet-publish.c:309
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Claves para los ficheros '%s':\n"
 
-#: src/fs/gnunet-publish.c:359 src/fs/gnunet-publish.c:613
+#: src/fs/gnunet-publish.c:360 src/fs/gnunet-publish.c:614
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s' (illegal filename?)\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-publish.c:434
+#: src/fs/gnunet-publish.c:435
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Imposible ejecutar '%s': %s\n"
 
-#: src/fs/gnunet-publish.c:461
+#: src/fs/gnunet-publish.c:462
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:493
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/fs/gnunet-publish.c:494
+#: src/fs/gnunet-publish.c:495
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/fs/gnunet-publish.c:499
+#: src/fs/gnunet-publish.c:500
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:504
+#: src/fs/gnunet-publish.c:505
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "Cierre completado.\n"
 
-#: src/fs/gnunet-publish.c:508
+#: src/fs/gnunet-publish.c:509
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Actualizando los datos del módulo '%s'\n"
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:513
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:519
+#: src/fs/gnunet-publish.c:520
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tError leyendo el directorio.\n"
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:554
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:560
+#: src/fs/gnunet-publish.c:561
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
 
-#: src/fs/gnunet-publish.c:566
+#: src/fs/gnunet-publish.c:567
 #, fuzzy, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/fs/gnunet-publish.c:574 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:575 src/vpn/gnunet-vpn.c:214
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "La opción '%s' no tiene sentido sin la opción '%s'.\n"
 
-#: src/fs/gnunet-publish.c:584 src/fs/gnunet-publish.c:591
-#: src/transport/gnunet-transport.c:624
+#: src/fs/gnunet-publish.c:585 src/fs/gnunet-publish.c:592
+#: src/transport/gnunet-transport.c:623
 #, 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:646
+#: src/fs/gnunet-publish.c:647
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:659
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:690
+#: src/fs/gnunet-publish.c:691
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2757,7 +2444,7 @@
 "imprime la lista de las claves extraidas que podrían ser usadas, pero no "
 "realiza la subida"
 
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:695
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2765,7 +2452,7 @@
 "añade una clave adicional para el fichero del nivel más alto o el directorio "
 "(esta opción puede ser especificada varias veces)"
 
-#: src/fs/gnunet-publish.c:701
+#: src/fs/gnunet-publish.c:702
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2773,7 +2460,7 @@
 "no indexar, hacer inserciones totales (almacena el fichero entero de forma "
 "encriptada en la base de datos de GNUnet)"
 
-#: src/fs/gnunet-publish.c:706
+#: src/fs/gnunet-publish.c:707
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2781,68 +2468,68 @@
 "especifica la ID de una versión actualizada para ser publicada en el futuro "
 "(para inserciones en el espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:714
+#: src/fs/gnunet-publish.c:715
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 "publica los ficheros bajo el pseudónimo NOMBRE (coloca el fichero en el "
 "espacio)"
 
-#: src/fs/gnunet-publish.c:720
+#: src/fs/gnunet-publish.c:721
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:724
+#: src/fs/gnunet-publish.c:725
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 "cambia la ID de esta versión de la publicación (para inserciones en el "
 "espacio únicamente)"
 
-#: src/fs/gnunet-publish.c:728
+#: src/fs/gnunet-publish.c:729
 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:747
+#: src/fs/gnunet-publish.c:748
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:111
+#: src/fs/gnunet-search.c:114
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:181
+#: src/fs/gnunet-search.c:184
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Error abandonando DHT.\n"
 
-#: src/fs/gnunet-search.c:231
+#: src/fs/gnunet-search.c:233
 #, fuzzy
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-search.c:255
+#: src/fs/gnunet-search.c:257
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/fs/gnunet-search.c:291
+#: src/fs/gnunet-search.c:288
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:294
-msgid "automatically terminate search after VALUE ms"
+#: src/fs/gnunet-search.c:291
+msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:301
+#: src/fs/gnunet-search.c:298
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:312
+#: src/fs/gnunet-search.c:309
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
@@ -2855,152 +2542,146 @@
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1330
-#: src/topology/gnunet-daemon-topology.c:1337
+#: src/topology/gnunet-daemon-topology.c:1329
+#: src/topology/gnunet-daemon-topology.c:1336
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/fs/gnunet-service-fs_cp.c:703
+#: src/fs/gnunet-service-fs_cp.c:704
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:707
+#: src/fs/gnunet-service-fs_cp.c:708
 #, c-format
-msgid "Migration of content to peer `%s' blocked for %llu ms\n"
+msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:742
+#: src/fs/gnunet-service-fs_cp.c:744
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:748
+#: src/fs/gnunet-service-fs_cp.c:750
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:773 src/fs/gnunet-service-fs_cp.c:1331
+#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:1333
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:865
+#: src/fs/gnunet-service-fs_cp.c:867
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:920
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:926
+#: src/fs/gnunet-service-fs_cp.c:928
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:940
+#: src/fs/gnunet-service-fs_cp.c:942
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:978
+#: src/fs/gnunet-service-fs_cp.c:980
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1045
+#: src/fs/gnunet-service-fs_cp.c:1047
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1069
+#: src/fs/gnunet-service-fs_cp.c:1071
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1079
+#: src/fs/gnunet-service-fs_cp.c:1081
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1158
+#: src/fs/gnunet-service-fs_cp.c:1160
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1192
+#: src/fs/gnunet-service-fs_cp.c:1194
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1214
+#: src/fs/gnunet-service-fs_cp.c:1216
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1274
+#: src/fs/gnunet-service-fs_cp.c:1276
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1300
+#: src/fs/gnunet-service-fs_cp.c:1302
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1329
+#: src/fs/gnunet-service-fs_cp.c:1331
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_cp.c:1685
+#: src/fs/gnunet-service-fs_cp.c:1687
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_indexing.c:113
-#: src/fs/gnunet-service-fs_indexing.c:163
+#: src/fs/gnunet-service-fs_indexing.c:120
+#: src/fs/gnunet-service-fs_indexing.c:175
 #, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing.\n"
-msgstr "Fichero de configuración '%s' creado.\n"
-
-#: src/fs/gnunet-service-fs_indexing.c:121
-#: src/fs/gnunet-service-fs_indexing.c:177
-#, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:137
+#: src/fs/gnunet-service-fs_indexing.c:136
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Error creando usuario"
 
-#: src/fs/gnunet-service-fs_indexing.c:228
+#: src/fs/gnunet-service-fs_indexing.c:226
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:266
+#: src/fs/gnunet-service-fs_indexing.c:264
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:481
+#: src/fs/gnunet-service-fs_indexing.c:479
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:539
+#: src/fs/gnunet-service-fs_indexing.c:537
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:554
+#: src/fs/gnunet-service-fs_indexing.c:552
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Imposible resolver '%s': %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:556
+#: src/fs/gnunet-service-fs_indexing.c:554
 #, fuzzy
 msgid "not indexed"
 msgstr "El desindexado falló"
 
-#: src/fs/gnunet-service-fs_indexing.c:571
+#: src/fs/gnunet-service-fs_indexing.c:569
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "La indexación de los datos falló en la posición %i.\n"
@@ -3106,74 +2787,66 @@
 
 #: src/fs/gnunet-service-fs_pr.c:1108
 #, c-format
-msgid "Datastore lookup already took %llu ms!\n"
+msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1129
+#: src/fs/gnunet-service-fs_pr.c:1128
 #, c-format
-msgid "On-demand lookup already took %llu ms!\n"
+msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1176
+#: src/fs/gnunet-service-fs_pr.c:1174
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1190
+#: src/fs/gnunet-service-fs_pr.c:1188
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1199
+#: src/fs/gnunet-service-fs_pr.c:1197
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1213
+#: src/fs/gnunet-service-fs_pr.c:1211
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1226
+#: src/fs/gnunet-service-fs_pr.c:1224
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1239
+#: src/fs/gnunet-service-fs_pr.c:1237
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1242
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1271 src/fs/gnunet-service-fs_pr.c:1311
-#: src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1269 src/fs/gnunet-service-fs_pr.c:1309
+#: src/fs/gnunet-service-fs_pr.c:1447
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1329
+#: src/fs/gnunet-service-fs_pr.c:1327
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1340
+#: src/fs/gnunet-service-fs_pr.c:1338
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1426
+#: src/fs/gnunet-service-fs_pr.c:1424
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1510
+#: src/fs/gnunet-service-fs_pr.c:1508
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/fs/gnunet-service-fs_pr.c:1603 src/fs/gnunet-service-fs_pr.c:1612
-#, fuzzy, c-format
-msgid "Configuration fails to specify `%s', assuming default value."
-msgstr "Fichero de configuración '%s' creado.\n"
-
 #: src/fs/gnunet-service-fs_push.c:629
-#, c-format
-msgid ""
-"Invalid value specified for option `%s' in section `%s', content pushing "
-"disabled\n"
+msgid "time required, content pushing disabled"
 msgstr ""
 
 #: src/fs/gnunet-unindex.c:89
@@ -3181,29 +2854,29 @@
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:96
+#: src/fs/gnunet-unindex.c:95
 #, fuzzy, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 "\n"
 "Error desindexando el fichero: %s\n"
 
-#: src/fs/gnunet-unindex.c:101
+#: src/fs/gnunet-unindex.c:100
 #, fuzzy
 msgid "Unindexing done.\n"
 msgstr "Desindexar los ficheros."
 
-#: src/fs/gnunet-unindex.c:131
+#: src/fs/gnunet-unindex.c:130
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr "Debes especificar uno y solo un fichero para desindexar.\n"
 
-#: src/fs/gnunet-unindex.c:148
+#: src/fs/gnunet-unindex.c:147
 #, fuzzy
 msgid "Could not start unindex operation.\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/fs/gnunet-unindex.c:180
+#: src/fs/gnunet-unindex.c:179
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
@@ -3211,126 +2884,172 @@
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:267
+#: src/gns/gns_api.c:575
+#, fuzzy
+msgid "Failed to serialize lookup reply from GNS service!\n"
+msgstr "Falló al recibir la respuesta al mensaje '%s' de gnunetd\n"
+
+#: src/gns/gnunet-dns2gns.c:186
+#, fuzzy
+msgid "Failed to pack DNS response into UDP packet!\n"
+msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
+
+#: src/gns/gnunet-dns2gns.c:361
 #, fuzzy, c-format
-msgid "Key file `%s' for private zone does not exist!\n"
-msgstr "número de mensajes a usar por iteración"
+msgid "Cannot parse DNS request from %s\n"
+msgstr "Falló al mandar la petición HTTP al host '%s': %s\n"
 
-#: src/gns/gnunet-gns.c:289
-#, fuzzy
+#: src/gns/gnunet-dns2gns.c:377
+#, fuzzy, c-format
+msgid "Received malformed DNS request from %s\n"
+msgstr "GAP recibido contenido no válido de '%s'\n"
+
+#: src/gns/gnunet-dns2gns.c:385
+#, fuzzy, c-format
+msgid "Received unsupported DNS request from %s\n"
+msgstr "GAP recibido contenido no válido de '%s'\n"
+
+#: src/gns/gnunet-dns2gns.c:673
+msgid "IP of recursive dns resolver to use (required)"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:676
+msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:679
+msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:692
+msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:182
+#, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:358
+#: src/gns/gnunet-gns.c:293
+#, c-format
+msgid "Please specify lookup, shorten or authority operation!\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:315
 #, fuzzy
 msgid "try to shorten a given name"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:361
+#: src/gns/gnunet-gns.c:318
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:364
+#: src/gns/gnunet-gns.c:321
 msgid "Get the authority of a particular name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:367
+#: src/gns/gnunet-gns.c:324
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "especifica la prioridad del contenido"
 
-#: src/gns/gnunet-gns.c:370
+#: src/gns/gnunet-gns.c:327
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:384
+#: src/gns/gnunet-gns.c:341
 msgid "GNUnet GNS access tool"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:280
+#: src/gns/gnunet-gns-fcfsd.c:449
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Comando inesperado '%s'.   Abortando.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:333
+#: src/gns/gnunet-gns-fcfsd.c:478
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Imposible pasar el fichero de configuración '%s'.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:377
+#: src/gns/gnunet-gns-fcfsd.c:522
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:439
+#: src/gns/gnunet-gns-fcfsd.c:584
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:498
+#: src/gns/gnunet-gns-fcfsd.c:646
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:514
+#: src/gns/gnunet-gns-fcfsd.c:662
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:550
+#: src/gns/gnunet-gns-fcfsd.c:698
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:558
+#: src/gns/gnunet-gns-fcfsd.c:706
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:741 src/gns/gnunet-gns-fcfsd.c:753
-#, fuzzy, c-format
-msgid "Option `%s' not specified in configuration section `%s'\n"
-msgstr "¡Ninguna aplicación definida en la configuración!\n"
-
-#: src/gns/gnunet-gns-fcfsd.c:763 src/namestore/gnunet-namestore.c:365
+#: src/gns/gnunet-gns-fcfsd.c:910 src/namestore/gnunet-namestore.c:364
 #, fuzzy
 msgid "Failed to read or create private zone key\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:773 src/namestore/gnunet-namestore.c:376
+#: src/gns/gnunet-gns-fcfsd.c:920 src/namestore/gnunet-namestore.c:375
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Fallo al conectarse a gnunetd"
 
-#: src/gns/gnunet-gns-fcfsd.c:789 src/gns/gnunet-gns-proxy.c:2901
+#: src/gns/gnunet-gns-fcfsd.c:936 src/gns/gnunet-gns-proxy.c:2887
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:823
+#: src/gns/gnunet-gns-fcfsd.c:970
 msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2532
+#: src/gns/gnunet-gns-proxy.c:2528
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "Imposible crear la cuenta de usuario:"
 
-#: src/gns/gnunet-gns-proxy.c:2561
+#: src/gns/gnunet-gns-proxy.c:2556
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/gns/gnunet-gns-proxy.c:3578
-msgid "listen on specified port"
+#: src/gns/gnunet-gns-proxy.c:3564
+msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3581
+#: src/gns/gnunet-gns-proxy.c:3567
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3596
+#: src/gns/gnunet-gns-proxy.c:3582
 msgid "GNUnet GNS proxy"
 msgstr ""
 
+#: src/gns/gnunet-service-gns.c:401
+#, c-format
+msgid "Records for name `%s' in zone %s too large to fit into DHT"
+msgstr ""
+
+#: src/gns/gnunet-service-gns.c:1197
+#, fuzzy
+msgid "Failed to connect to the namestore!\n"
+msgstr "Fallo al conectarse a gnunetd"
+
 #: src/hello/gnunet-hello.c:122
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3421,8 +3140,8 @@
 #: src/hostlist/hostlist-client.c:689 src/hostlist/hostlist-client.c:741
 #: src/hostlist/hostlist-client.c:750 src/hostlist/hostlist-client.c:871
 #: src/hostlist/hostlist-client.c:961 src/hostlist/hostlist-client.c:966
-#: src/transport/plugin_transport_http_client.c:110
-#: src/transport/plugin_transport_http_client.c:125
+#: src/transport/plugin_transport_http_client.c:994
+#: src/transport/plugin_transport_http_client.c:1009
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "'%s' falló en %s: %d con error: '%s'.\n"
@@ -3664,27 +3383,27 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:561
+#: src/hostlist/hostlist-server.c:562
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Argumentos no válidos. Saliendo.\n"
 
-#: src/hostlist/hostlist-server.c:570
+#: src/hostlist/hostlist-server.c:571
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:584
+#: src/hostlist/hostlist-server.c:585
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:624
+#: src/hostlist/hostlist-server.c:625
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "'%s' no esta disponible."
 
-#: src/hostlist/hostlist-server.c:666
+#: src/hostlist/hostlist-server.c:667
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -3709,30 +3428,30 @@
 msgid "help text"
 msgstr "texto de ayuda para -t"
 
-#: src/mesh/gnunet-service-mesh.c:7110
+#: src/mesh/gnunet-service-mesh.c:7703
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:7328 src/mesh/gnunet-service-mesh.c:7340
-#: src/mesh/gnunet-service-mesh.c:7352 src/mesh/gnunet-service-mesh.c:7364
-#: src/mesh/gnunet-service-mesh.c:7376 src/mesh/gnunet-service-mesh.c:7388
-#: src/mesh/gnunet-service-mesh.c:7400 src/mesh/gnunet-service-mesh.c:7412
+#: src/mesh/gnunet-service-mesh.c:7908
+#, fuzzy
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "Imposible acceder a la información del espacio.\n"
+
+#: src/mesh/gnunet-service-mesh.c:7997 src/mesh/gnunet-service-mesh.c:8009
+#: src/mesh/gnunet-service-mesh.c:8021 src/mesh/gnunet-service-mesh.c:8033
+#: src/mesh/gnunet-service-mesh.c:8045 src/mesh/gnunet-service-mesh.c:8057
+#: src/mesh/gnunet-service-mesh.c:8069 src/mesh/gnunet-service-mesh.c:8081
 #, fuzzy, c-format
 msgid "Mesh service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "Configuración de GNUnet"
 
-#: src/mesh/gnunet-service-mesh.c:7424 src/mesh/gnunet-service-mesh.c:7435
+#: src/mesh/gnunet-service-mesh.c:8093 src/mesh/gnunet-service-mesh.c:8104
 #, fuzzy, c-format
 msgid ""
 "Mesh service is lacking key configuration settings (%s). Using default "
 "(%u).\n"
 msgstr "Configuración de GNUnet"
 
-#: src/mesh/gnunet-service-mesh.c:7446
-#, fuzzy
-msgid "Mesh service could not access hostkey.  Exiting.\n"
-msgstr "Imposible acceder a la información del espacio.\n"
-
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -3770,125 +3489,120 @@
 msgid "until"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:357
+#: src/namestore/gnunet-namestore.c:356
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:387
+#: src/namestore/gnunet-namestore.c:386
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Mensaje no válido del tipo %u recibido.  Omitiendo.\n"
 
-#: src/namestore/gnunet-namestore.c:395 src/namestore/gnunet-namestore.c:419
-#: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
-#: src/namestore/gnunet-namestore.c:519
+#: src/namestore/gnunet-namestore.c:394 src/namestore/gnunet-namestore.c:418
+#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:477
+#: src/namestore/gnunet-namestore.c:518
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/namestore/gnunet-namestore.c:396 src/namestore/gnunet-namestore.c:420
+#: src/namestore/gnunet-namestore.c:395 src/namestore/gnunet-namestore.c:419
 msgid "add/del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:409
+#: src/namestore/gnunet-namestore.c:408
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: valor del símbolo '%s' no válido para %s\n"
 
-#: src/namestore/gnunet-namestore.c:447
+#: src/namestore/gnunet-namestore.c:446
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/namestore/gnunet-namestore.c:456
+#: src/namestore/gnunet-namestore.c:455
 #, c-format
 msgid ""
 "Deletion requires either absolute time, or no time at all. Got relative time "
 "`%s' instead.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:467 src/namestore/gnunet-namestore.c:479
-#: src/namestore/gnunet-namestore.c:498
+#: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
+#: src/namestore/gnunet-namestore.c:497
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:497
+#: src/namestore/gnunet-namestore.c:496
 #, fuzzy, c-format
 msgid "No valid expiration time for operation `%s'\n"
 msgstr "Fichero de configuración '%s' creado.\n"
 
-#: src/namestore/gnunet-namestore.c:520
+#: src/namestore/gnunet-namestore.c:519
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:570
+#: src/namestore/gnunet-namestore.c:569
 #: src/peerinfo-tool/gnunet-peerinfo.c:875
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/namestore/gnunet-namestore.c:611 src/transport/gnunet-transport.c:618
+#: src/namestore/gnunet-namestore.c:610 src/transport/gnunet-transport.c:617
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "'%s' no es un fichero.\n"
 
-#: src/namestore/gnunet-namestore.c:622
-#, c-format
-msgid "Option `%s' not given, but I need a zone key file!\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:627
+#: src/namestore/gnunet-namestore.c:625
 #, fuzzy, c-format
 msgid "Using default zone file `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/namestore/gnunet-namestore.c:679
+#: src/namestore/gnunet-namestore.c:677
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:682
+#: src/namestore/gnunet-namestore.c:680
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:685
+#: src/namestore/gnunet-namestore.c:683
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:688
+#: src/namestore/gnunet-namestore.c:686
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:691
+#: src/namestore/gnunet-namestore.c:689
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:694
+#: src/namestore/gnunet-namestore.c:692
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:697
+#: src/namestore/gnunet-namestore.c:695
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:700
+#: src/namestore/gnunet-namestore.c:698
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:703
+#: src/namestore/gnunet-namestore.c:701
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:706
+#: src/namestore/gnunet-namestore.c:704
 msgid "create or list non-authority record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:709
+#: src/namestore/gnunet-namestore.c:707
 msgid "filename with the zone key"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:720
+#: src/namestore/gnunet-namestore.c:718
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Configuración de GNUnet"
@@ -4021,31 +3735,68 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:915
+#: src/nse/gnunet-nse-profiler.c:1009
 #, fuzzy
+msgid "limit to the number of connections to NSE services, 0 for none"
+msgstr "Fallo al conectarse a gnunetd"
+
+#: src/nse/gnunet-nse-profiler.c:1012
+msgid "name of the file for writing connection information and statistics"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1015
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1018
+msgid "IP address of this system as seen by the rest of the testbed"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1021
+msgid "delay between queries to statistics during a round"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1024
+msgid "prefix of the filenames we use for writing the topology for each round"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1027
+msgid "name of the file for writing the main results"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1030
+msgid "Number of peers to run in each round, separated by commas"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1036
+msgid "delay between rounds"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1046
+#, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Imposible acceder al servicio"
 
-#: src/nse/gnunet-service-nse.c:925
+#: src/nse/gnunet-service-nse.c:938
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1381 src/nse/gnunet-service-nse.c:1400
-#: src/nse/gnunet-service-nse.c:1421
+#: src/nse/gnunet-service-nse.c:1389
+#, fuzzy, c-format
+msgid "NSE service could not access hostkey: %s\n"
+msgstr "Imposible acceder a la información del espacio.\n"
+
+#: src/nse/gnunet-service-nse.c:1403 src/nse/gnunet-service-nse.c:1478
+#: src/nse/gnunet-service-nse.c:1495
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1388
+#: src/nse/gnunet-service-nse.c:1485
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Argumentos no válidos. Saliendo.\n"
 
-#: src/nse/gnunet-service-nse.c:1409
-#, fuzzy
-msgid "NSE service could not access hostkey.  Exiting.\n"
-msgstr "Imposible acceder a la información del espacio.\n"
-
 #: src/peerinfo/gnunet-service-peerinfo.c:134
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
@@ -4149,7 +3900,7 @@
 msgid "Failure adding HELLO: %s\n"
 msgstr "Fallo en %s:%d.\n"
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:833
+#: src/peerinfo-tool/gnunet-peerinfo.c:834
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
@@ -4348,11 +4099,15 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/testbed_api.c:246
+#: src/testbed/testbed_api.c:252
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "'%s' falló con el código de error %d: %s"
 
+#: src/testbed/testbed_api_testbed.c:271
+msgid "Some operations are still pending. Cancelling them\n"
+msgstr ""
+
 #: src/testing/gnunet-testing.c:131
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
@@ -4397,258 +4152,59 @@
 msgid "name of the service to run"
 msgstr ""
 
-#: src/testing_old/helper.c:56
-#, fuzzy
-msgid "Peer is lacking HOSTKEY configuration setting.\n"
-msgstr "Configuración de GNUnet"
-
-#: src/testing_old/helper.c:64
-#, fuzzy
-msgid "Could not access hostkey.\n"
-msgstr "Imposible pasar el fichero de configuración '%s'.\n"
-
-#: src/testing_old/testing.c:200
-msgid "`scp' does not seem to terminate (timeout copying config).\n"
-msgstr ""
-
-#: src/testing_old/testing.c:214 src/testing_old/testing.c:798
-#, fuzzy
-msgid "`scp' did not complete cleanly.\n"
-msgstr "'%s' no esta conectado a ningún par.\n"
-
-#: src/testing_old/testing.c:237
-#, fuzzy
-msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
-msgstr "Falló al comenzar la recolección.\n"
-
-#: src/testing_old/testing.c:238
-#, fuzzy
-msgid "Failed to create pipe for `ssh' process.\n"
-msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
-
-#: src/testing_old/testing.c:286
-#, fuzzy, c-format
-msgid "Could not start `%s' process to create hostkey.\n"
-msgstr "Imposible mandar el mensaje a gnunetd\n"
-
-#: src/testing_old/testing.c:293
-#, fuzzy
-msgid "Failed to start `gnunet-peerinfo' process.\n"
-msgstr "Falló al comenzar la recolección.\n"
-
-#: src/testing_old/testing.c:294 src/testing_old/testing.c:471
-#, fuzzy
-msgid "Failed to start `ssh' process.\n"
-msgstr "Falló al comenzar la recolección.\n"
-
-#: src/testing_old/testing.c:354
-#, fuzzy, c-format
-msgid "Error reading from gnunet-peerinfo: %s\n"
-msgstr "Se produjo un error leyendo información de gnunetd.\n"
-
-#: src/testing_old/testing.c:358
-#, fuzzy
-msgid "Malformed output from gnunet-peerinfo!\n"
-msgstr "Se produjo un error leyendo información de gnunetd.\n"
-
-#: src/testing_old/testing.c:368
-#, fuzzy
-msgid "Failed to get hostkey!\n"
-msgstr "Fallo en las estadísticas del tráfico.\n"
-
-#: src/testing_old/testing.c:400
-msgid "`Failed while waiting for topology setup!\n"
-msgstr ""
-
-#: src/testing_old/testing.c:463
-#, fuzzy, c-format
-msgid "Could not start `%s' process to start GNUnet.\n"
-msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
-
-#: src/testing_old/testing.c:470
-#, fuzzy
-msgid "Failed to start `gnunet-arm' process.\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/testing_old/testing.c:493 src/testing_old/testing.c:600
-msgid "`gnunet-arm' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:494 src/testing_old/testing.c:601
-#: src/testing_old/testing.c:621
-msgid "`ssh' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:570
-msgid "Unable to get HELLO for peer!\n"
-msgstr ""
-
-#: src/testing_old/testing.c:620
-msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
-msgstr ""
-
-#: src/testing_old/testing.c:643 src/testing_old/testing.c:675
-msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:658 src/testing_old/testing.c:713
-#, fuzzy
-msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
-msgstr "'%s' no esta conectado a ningún par.\n"
-
-#: src/testing_old/testing.c:786
-msgid "`scp' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:948
-#, fuzzy, c-format
-msgid "Starting service %s for peer `%4s'\n"
-msgstr "Iniciada colección '%s'.\n"
-
-#: src/testing_old/testing.c:1207 src/testing_old/testing_group.c:6172
-#, fuzzy, c-format
-msgid "Could not start `%s' process to copy configuration directory.\n"
-msgstr "Imposible acceder a la información del espacio.\n"
-
-#: src/testing_old/testing.c:1292 src/testing_old/testing.c:1359
-#, fuzzy, c-format
-msgid "Terminating peer `%4s'\n"
-msgstr "Permiso denegado para '%s' en %s:%d.\n"
-
-#: src/testing_old/testing.c:1448
-#, fuzzy, c-format
-msgid "Setting d->dead on peer `%4s'\n"
-msgstr "Iniciada colección '%s'.\n"
-
-#: src/testing_old/testing.c:1601
-msgid "Peer not yet running, can not change configuration at this point."
-msgstr ""
-
-#: src/testing_old/testing.c:1609
-#, fuzzy
-msgid "Failed to write new configuration to disk."
-msgstr "Imposible guardar la configuración"
-
-#: src/testing_old/testing.c:1636
-#, fuzzy, c-format
-msgid "Could not start `%s' process to copy configuration file.\n"
-msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
-
-#: src/testing_old/testing.c:1639
-#, fuzzy
-msgid "Failed to copy new configuration to remote machine."
-msgstr "Imposible guardar la configuración"
-
-#: src/testing_old/testing.c:1794
-#, fuzzy
-msgid "Peers failed to connect"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/testing_old/testing.c:1922
-#, fuzzy
-msgid "Failed to connect to core service of first peer!\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/testing_old/testing.c:2145
-msgid "Peers are not fully running yet, can not connect!\n"
-msgstr ""
-
-#: src/testing_old/testing_group.c:1895 src/testing_old/testing_group.c:1907
-#: src/testing_old/testing_group.c:2009 src/testing_old/testing_group.c:2066
-#: src/testing_old/testing_group.c:2153 src/testing_old/testing_group.c:2173
-#: src/testing_old/testing_group.c:2303
-#: src/testing_old/testing_peergroup.c:950
-#, fuzzy, c-format
-msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
-msgstr ""
-"El fichero de configuración debe especificar el directorio para almacenar "
-"los datos FS en la sección '%s' bajo '%s'.\n"
-
-#: src/testing_old/testing_group.c:2161
+#: src/testing/testing.c:198
 #, c-format
-msgid ""
-"Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
-"greater than 0\n"
-msgstr ""
-
-#: src/testing_old/testing_group.c:2878 src/testing_old/testing_group.c:3064
-#, c-format
-msgid ""
-"No `%s' specified in peer configuration in section `%s', cannot copy friends "
-"file!\n"
-msgstr ""
-
-#: src/testing_old/testing_group.c:3958
-msgid "Creating no allowed topology (all peers can connect at core level)\n"
-msgstr ""
-
-#: src/testing_old/testing_group.c:5227
-msgid "Unknown topology specification, can't connect peers!\n"
-msgstr ""
-
-#: src/testing_old/testing_group.c:5962
-#, fuzzy, c-format
-msgid "Could not read hostkeys file `%s'!\n"
-msgstr "Imposible inicializar la aplicación '%s'\n"
-
-#: src/testing_old/testing_group.c:6029
-#, fuzzy, c-format
-msgid "Could not create configuration for peer number %u on `%s'!\n"
-msgstr "Imposible acceder a la información del espacio.\n"
-
-#: src/testing/testing.c:188
-#, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:204
+#: src/testing/testing.c:214
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:468
+#: src/testing/testing.c:509
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "número de mensajes a usar por iteración"
 
-#: src/testing/testing.c:477
+#: src/testing/testing.c:518
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Error descargando: %s\n"
 
-#: src/testing/testing.c:788
+#: src/testing/testing.c:829
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Imposible acceder a la información del espacio.\n"
 
-#: src/testing/testing.c:799
+#: src/testing/testing.c:840
 #, 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:813
+#: src/testing/testing.c:854
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Imposible inicializar SQLite.\n"
 
-#: src/testing/testing.c:846
+#: src/testing/testing.c:887
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
 
-#: src/testing/testing.c:864
+#: src/testing/testing.c:905
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s':"
 
-#: src/testing/testing.c:925
+#: src/testing/testing.c:966
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/testing/testing.c:1088
+#: src/testing/testing.c:1129
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s':"
@@ -4672,150 +4228,146 @@
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1026
-#, c-format
-msgid "Option `%s' in section `%s' not specified!\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1038
 #, fuzzy, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1045
+#: src/topology/gnunet-daemon-topology.c:1044
 #, fuzzy, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr "El formato del fichero '%s' no es válido.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1054
+#: src/topology/gnunet-daemon-topology.c:1053
 #, fuzzy, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/topology/gnunet-daemon-topology.c:1062
+#: src/topology/gnunet-daemon-topology.c:1061
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1082
+#: src/topology/gnunet-daemon-topology.c:1081
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1095
+#: src/topology/gnunet-daemon-topology.c:1094
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1105
+#: src/topology/gnunet-daemon-topology.c:1104
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/topology/gnunet-daemon-topology.c:1111
+#: src/topology/gnunet-daemon-topology.c:1110
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1121
+#: src/topology/gnunet-daemon-topology.c:1120
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/topology/gnunet-daemon-topology.c:1127
+#: src/topology/gnunet-daemon-topology.c:1126
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1134
+#: src/topology/gnunet-daemon-topology.c:1133
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1169
+#: src/topology/gnunet-daemon-topology.c:1168
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/topology/gnunet-daemon-topology.c:1224
+#: src/topology/gnunet-daemon-topology.c:1223
 #, fuzzy
 msgid "# HELLO messages gossipped"
 msgstr "# mensajes salientes omitidos"
 
-#: src/topology/gnunet-daemon-topology.c:1366
+#: src/topology/gnunet-daemon-topology.c:1365
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:246
+#: src/transport/gnunet-service-transport_blacklist.c:245
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
 msgstr "Imposible inicializar la aplicación '%s'\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:252
+#: src/transport/gnunet-service-transport_blacklist.c:251
 #, c-format
 msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:263
+#: src/transport/gnunet-service-transport_blacklist.c:262
 #, fuzzy, c-format
 msgid "Failed to read blacklist from `%s'\n"
 msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:284
-#: src/transport/gnunet-service-transport_blacklist.c:308
+#: src/transport/gnunet-service-transport_blacklist.c:283
+#: src/transport/gnunet-service-transport_blacklist.c:307
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr ""
 "Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:295
-#: src/transport/gnunet-service-transport_blacklist.c:331
+#: src/transport/gnunet-service-transport_blacklist.c:294
+#: src/transport/gnunet-service-transport_blacklist.c:330
 #, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:345
+#: src/transport/gnunet-service-transport_blacklist.c:344
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 "Error de sintaxis en el fichero de configuración '%s' en la linea %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:359
+#: src/transport/gnunet-service-transport_blacklist.c:358
 #, c-format
 msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:514
-#: src/transport/gnunet-service-transport_blacklist.c:751
+#: src/transport/gnunet-service-transport_blacklist.c:513
+#: src/transport/gnunet-service-transport_blacklist.c:750
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:167
+#: src/transport/gnunet-service-transport.c:177
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "# Anuncios de los pares recibidos"
 
-#: src/transport/gnunet-service-transport.c:242
+#: src/transport/gnunet-service-transport.c:252
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# bytes en la base de datos"
 
-#: src/transport/gnunet-service-transport.c:289
+#: src/transport/gnunet-service-transport.c:299
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# bytes desencriptados"
 
-#: src/transport/gnunet-service-transport.c:590
+#: src/transport/gnunet-service-transport.c:604
+#, fuzzy, c-format
+msgid "Transport service could not access hostkey: %s. Exiting.\n"
+msgstr "Imposible acceder a la información del espacio.\n"
+
+#: src/transport/gnunet-service-transport.c:674
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:599
-msgid "Transport service could not access hostkey.  Exiting.\n"
-msgstr ""
-
 #: src/transport/gnunet-service-transport_clients.c:352
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
@@ -5023,153 +4575,252 @@
 msgstr ""
 
 #: src/transport/gnunet-transport.c:328
-#, c-format
-msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Received %llu bytes/s (%llu bytes in %s)\n"
+msgstr "GAP recibido contenido no válido de '%s'\n"
 
-#: src/transport/gnunet-transport.c:335
+#: src/transport/gnunet-transport.c:336
 #, c-format
-msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
+msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:374
+#: src/transport/gnunet-transport.c:375
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:394
+#: src/transport/gnunet-transport.c:395
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "'%s' conectado a '%s'.\n"
 
-#: src/transport/gnunet-transport.c:426
+#: src/transport/gnunet-transport.c:427
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "'%s' conectado a '%s'.\n"
 
-#: src/transport/gnunet-transport.c:506
+#: src/transport/gnunet-transport.c:505
 #, fuzzy, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "GAP recibido contenido no válido de '%s'\n"
 
-#: src/transport/gnunet-transport.c:529
+#: src/transport/gnunet-transport.c:528
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Yo soy el par '%s'.\n"
 
-#: src/transport/gnunet-transport.c:536
+#: src/transport/gnunet-transport.c:535
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:564
+#: src/transport/gnunet-transport.c:563
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# de pares conectados"
 
-#: src/transport/gnunet-transport.c:633
+#: src/transport/gnunet-transport.c:632
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Falló al actualizar los datos del módulo '%s'\n"
 
-#: src/transport/gnunet-transport.c:716
+#: src/transport/gnunet-transport.c:715
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:719
+#: src/transport/gnunet-transport.c:718
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:722
+#: src/transport/gnunet-transport.c:721
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Imprime información de los pares de GNUnet."
 
-#: src/transport/gnunet-transport.c:728
+#: src/transport/gnunet-transport.c:727
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:732
+#: src/transport/gnunet-transport.c:731
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:735
+#: src/transport/gnunet-transport.c:734
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:746
+#: src/transport/gnunet-transport.c:745
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/plugin_transport_http.c:1119
+#: src/transport/plugin_transport_http.c:817
+#: src/transport/plugin_transport_http_server.c:2513
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1168
+#: src/transport/plugin_transport_http.c:866
+#: src/transport/plugin_transport_http_server.c:2281
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "¡Ninguna aplicación definida en la configuración!\n"
 
-#: src/transport/plugin_transport_http.c:1200 src/util/service.c:1051
+#: src/transport/plugin_transport_http.c:898
+#: src/transport/plugin_transport_http_server.c:2313 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/transport/plugin_transport_http.c:1217 src/util/service.c:1068
+#: src/transport/plugin_transport_http.c:915
+#: src/transport/plugin_transport_http_server.c:2330 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/transport/plugin_transport_http.c:1322
+#: src/transport/plugin_transport_http.c:1020
+#: src/transport/plugin_transport_http_server.c:2441
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1407
+#: src/transport/plugin_transport_http.c:1133
+#: src/transport/plugin_transport_http_server.c:2609
 #, fuzzy
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr "¡Advertencias de la red desconectadas por configuración!\n"
 
-#: src/transport/plugin_transport_http.c:1420
+#: src/transport/plugin_transport_http.c:1146
+#: src/transport/plugin_transport_http_server.c:2620
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tConfiguración GTK\n"
 
-#: src/transport/plugin_transport_http.c:1431
+#: src/transport/plugin_transport_http.c:1157
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1451
+#: src/transport/plugin_transport_http.c:1177
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1481
+#: src/transport/plugin_transport_http.c:1206
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:621
+#: src/transport/plugin_transport_http.c:1223
+#: src/transport/plugin_transport_http_server.c:2702
+#, fuzzy, c-format
+msgid "Using external hostname `%s'\n"
+msgstr "Iniciada colección '%s'.\n"
+
+#: src/transport/plugin_transport_http.c:1228
+msgid "No external hostname configured\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_client.c:1419
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:178
+#: src/transport/plugin_transport_http_client.c:1550
+#: src/transport/plugin_transport_http_server.c:2826
+#, fuzzy, c-format
+msgid "Shutting down plugin `%s'\n"
+msgstr "Probando transporte(s) %s\n"
+
+#: src/transport/plugin_transport_http_client.c:1575
+#: src/transport/plugin_transport_http_server.c:2885
+#, fuzzy, c-format
+msgid "Shutdown for plugin `%s' complete\n"
+msgstr ""
+"Subida de '%s' completada, la velocidad media de subida actual es %8.3f "
+"kbps.\n"
+
+#: src/transport/plugin_transport_http_client.c:1603
+#: src/transport/plugin_transport_http_server.c:2732
+#, fuzzy, c-format
+msgid "Maximum number of connections is %u\n"
+msgstr "Número máximo de clientes en el chat alcanzado.\n"
+
+#: src/transport/plugin_transport_http_server.c:1302
+#, 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:1560
+#, c-format
+msgid "Accepting connection (%u of %u) from `%s'\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:1568
+#, c-format
+msgid ""
+"Server reached maximum number connections (%u), rejecting new connection\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:1869
+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:202
+#: src/transport/plugin_transport_http_server.c:1893
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
+#: src/transport/plugin_transport_http_server.c:2588
+#, c-format
+msgid "IPv4 support is %s\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2602
+#, c-format
+msgid "IPv6 support is %s\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2627
+#, fuzzy, c-format
+msgid "Using port %u\n"
+msgstr "Probando transporte(s) %s\n"
+
+#: src/transport/plugin_transport_http_server.c:2642
+#, fuzzy, c-format
+msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
+msgstr ""
+"Debes especificar un número positivo para '%s' en la configuración en la "
+"sección '%s'.\n"
+
+#: src/transport/plugin_transport_http_server.c:2652
+#, fuzzy, c-format
+msgid "Binding to IPv4 address %s\n"
+msgstr "Argumento no válido: '%s'\n"
+
+#: src/transport/plugin_transport_http_server.c:2673
+#, fuzzy, c-format
+msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
+msgstr ""
+"Debes especificar un número positivo para '%s' en la configuración en la "
+"sección '%s'.\n"
+
+#: src/transport/plugin_transport_http_server.c:2683
+#, fuzzy, c-format
+msgid "Binding to IPv6 address %s\n"
+msgstr "Argumento no válido: '%s'\n"
+
+#: src/transport/plugin_transport_http_server.c:2718
+#, fuzzy, c-format
+msgid "Notifying transport only about hostname `%s'\n"
+msgstr "Probando transporte(s) %s\n"
+
 #: src/transport/plugin_transport_smtp.c:370
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -5233,7 +4884,7 @@
 #: src/transport/plugin_transport_tcp.c:774
 #: src/transport/plugin_transport_tcp.c:963
 #: src/transport/plugin_transport_tcp.c:1807
-#: src/transport/plugin_transport_tcp.c:2424
+#: src/transport/plugin_transport_tcp.c:2423
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# claves de la sesión aceptadas"
@@ -5275,8 +4926,8 @@
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2313 src/util/service.c:946
-#: src/util/service.c:952
+#: src/transport/plugin_transport_tcp.c:2313 src/util/service.c:948
+#: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -5286,21 +4937,16 @@
 msgid "Failed to start service.\n"
 msgstr "Falló al comenzar la recolección.\n"
 
-#: src/transport/plugin_transport_tcp.c:2389
-#, fuzzy, c-format
-msgid "Failed to find option %s in section %s!\n"
-msgstr "Fallo al conectar a gnunetd.\n"
-
-#: src/transport/plugin_transport_tcp.c:2412
+#: src/transport/plugin_transport_tcp.c:2411
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2416
+#: src/transport/plugin_transport_tcp.c:2415
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2420
+#: src/transport/plugin_transport_tcp.c:2419
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5315,19 +4961,19 @@
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:392
+#: src/transport/plugin_transport_udp_broadcasting.c:394
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1903
+#: src/transport/plugin_transport_udp.c:1965
 #, 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:1917
+#: src/transport/plugin_transport_udp.c:1979
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5335,22 +4981,22 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2162
+#: src/transport/plugin_transport_udp.c:2192
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Fichero almacenado en '%s'.\n"
 
-#: src/transport/plugin_transport_udp.c:2328
+#: src/transport/plugin_transport_udp.c:2268
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2371
+#: src/transport/plugin_transport_udp.c:2311
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Argumento no válido: '%s'\n"
 
-#: src/transport/plugin_transport_unix.c:1346
+#: src/transport/plugin_transport_unix.c:1355
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Fichero almacenado en '%s'.\n"
@@ -5366,87 +5012,77 @@
 
 #: src/transport/plugin_transport_wlan.c:625
 #: src/transport/plugin_transport_wlan.c:675
-#: src/transport/plugin_transport_wlan.c:1695
+#: src/transport/plugin_transport_wlan.c:1720
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# claves de la sesión aceptadas"
 
-#: src/transport/plugin_transport_wlan.c:748
+#: src/transport/plugin_transport_wlan.c:749
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# mensajes fragmentados"
 
-#: src/transport/plugin_transport_wlan.c:766
+#: src/transport/plugin_transport_wlan.c:773
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:866
-#: src/transport/plugin_transport_wlan.c:947
-#: src/transport/plugin_transport_wlan.c:1697
+#: src/transport/plugin_transport_wlan.c:873
+#: src/transport/plugin_transport_wlan.c:954
+#: src/transport/plugin_transport_wlan.c:1722
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1118
+#: src/transport/plugin_transport_wlan.c:1135
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1139
+#: src/transport/plugin_transport_wlan.c:1156
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# fragmentos descartados"
 
-#: src/transport/plugin_transport_wlan.c:1149
+#: src/transport/plugin_transport_wlan.c:1166
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# bytes recibidos por TCP"
 
-#: src/transport/plugin_transport_wlan.c:1206
+#: src/transport/plugin_transport_wlan.c:1223
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "# mensajes defragmentados"
 
-#: src/transport/plugin_transport_wlan.c:1305
+#: src/transport/plugin_transport_wlan.c:1324
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1340
+#: src/transport/plugin_transport_wlan.c:1359
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# mensajes PONG encriptados recibidos"
 
-#: src/transport/plugin_transport_wlan.c:1401
+#: src/transport/plugin_transport_wlan.c:1420
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# bytes enviados vía UDP"
 
-#: src/transport/plugin_transport_wlan.c:1510
+#: src/transport/plugin_transport_wlan.c:1529
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1667
-#, fuzzy, c-format
-msgid "Invalid configuration option `%s' in section `%s'\n"
-msgstr "Fichero de configuración '%s' creado.\n"
-
-#: src/transport/plugin_transport_wlan.c:1676
+#: src/transport/plugin_transport_wlan.c:1703
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1686
-#, fuzzy, c-format
-msgid "Missing configuration option `%s' in section `%s'\n"
-msgstr "Fichero de configuración '%s' creado.\n"
-
 #: src/transport/transport_api.c:575
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Recibido mensaje corrupto del par '%s' en %s:%d.\n"
 
-#: src/transport/transport-testing.c:589
+#: src/transport/transport-testing.c:590
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "Imposible inicializar SQLite.\n"
@@ -5481,12 +5117,12 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:982
+#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:984
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:278 src/util/client.c:754 src/util/service.c:986
+#: src/util/client.c:278 src/util/client.c:754 src/util/service.c:988
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: la opción '%s' es ambigua\n"
@@ -5521,23 +5157,23 @@
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1008
+#: src/util/common_logging.c:258 src/util/common_logging.c:1007
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1006
+#: src/util/common_logging.c:260 src/util/common_logging.c:1005
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1004
+#: src/util/common_logging.c:262 src/util/common_logging.c:1003
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1002
+#: src/util/common_logging.c:264 src/util/common_logging.c:1001
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/common_logging.c:266 src/util/common_logging.c:1010
+#: src/util/common_logging.c:266 src/util/common_logging.c:1009
 msgid "NONE"
 msgstr ""
 
@@ -5551,20 +5187,35 @@
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1011
+#: src/util/common_logging.c:1010
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1113
+#: src/util/common_logging.c:1149
 #, fuzzy
 msgid "unknown address"
 msgstr "desconocido"
 
-#: src/util/common_logging.c:1151
+#: src/util/common_logging.c:1187
 #, fuzzy
 msgid "invalid address"
 msgstr "Argumentos inválidos: "
 
+#: src/util/common_logging.c:1205
+#, fuzzy, c-format
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr ""
+"El fichero de configuración debe especificar el directorio para almacenar "
+"los datos FS en la sección '%s' bajo '%s'.\n"
+
+#: src/util/common_logging.c:1226
+#, fuzzy, c-format
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
+msgstr ""
+"El fichero de configuración debe especificar el directorio para almacenar "
+"los datos FS en la sección '%s' bajo '%s'.\n"
+
 #: src/util/configuration.c:259
 #, fuzzy, c-format
 msgid "Syntax error while deserializing operation at line %u\n"
@@ -5616,69 +5267,77 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_random.c:284
+#: src/util/crypto_random.c:313
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:313
+#: src/util/crypto_random.c:342
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 "libgcrypt no está en la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/crypto_rsa.c:635 src/util/crypto_rsa.c:651
-#: src/util/crypto_rsa.c:833
+#: src/util/crypto_rsa.c:640
 #, fuzzy, c-format
-msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgid ""
+"File `%s' does not contain a valid private key (too long, %llu bytes).  "
+"Deleting it.\n"
 msgstr "El fichero '%s' no contiene un pseudónimo.\n"
 
-#: src/util/crypto_rsa.c:731 src/util/crypto_rsa.c:778
+#: src/util/crypto_rsa.c:657
 #, fuzzy, c-format
+msgid ""
+"File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
+"Deleting it.\n"
+msgstr "El fichero '%s' no contiene un pseudónimo.\n"
+
+#: src/util/crypto_rsa.c:755 src/util/crypto_rsa.c:802
+#, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "Imposible escribir PID al fichero '%s': %s.\n"
 
-#: src/util/crypto_rsa.c:736
+#: src/util/crypto_rsa.c:760
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "Creando nueva clave local (esto puede llevar un tiempo).\n"
 
-#: src/util/crypto_rsa.c:754
+#: src/util/crypto_rsa.c:778
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:782 src/util/crypto_rsa.c:818
+#: src/util/crypto_rsa.c:806 src/util/crypto_rsa.c:842
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:813
+#: src/util/crypto_rsa.c:837
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:851
+#: src/util/crypto_rsa.c:857
 #, fuzzy, c-format
+msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgstr "El fichero '%s' no contiene un pseudónimo.\n"
+
+#: src/util/crypto_rsa.c:875
+#, fuzzy, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr "Llamada a '%s' con la clave '%s'.\n"
 
-#: src/util/crypto_rsa.c:926
+#: src/util/crypto_rsa.c:948
 msgid "interrupted by shutdown"
 msgstr ""
 
-#: src/util/crypto_rsa.c:935
+#: src/util/crypto_rsa.c:959
 #, fuzzy
-msgid "internal error"
-msgstr "Error desconocido.\n"
-
-#: src/util/crypto_rsa.c:944 src/util/crypto_rsa.c:951
-#, fuzzy
 msgid "gnunet-rsa failed"
 msgstr "gnunet-setup"
 
-#: src/util/crypto_rsa.c:1332
+#: src/util/crypto_rsa.c:1347
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
@@ -5693,7 +5352,7 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡'%s' se esperaba que '%s' fuera un directorio!\n"
 
-#: src/util/disk.c:1494 src/util/service.c:1665
+#: src/util/disk.c:1494 src/util/service.c:1667
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Imposible guardar el fichero de configuración '%s': %s.\n"
@@ -5769,11 +5428,47 @@
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:286
+#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:316
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Tienes que introducir un número en la opción '%s'.\n"
 
+#: src/util/getopt_helpers.c:288
+#, fuzzy, c-format
+msgid "You must pass relative time to the `%s' option.\n"
+msgstr "Debes pasar un número positivo a la opción '%s'.\n"
+
+#: src/util/gnunet-config.c:90
+#, c-format
+msgid "--section argument is required\n"
+msgstr ""
+
+#: src/util/gnunet-config.c:133
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr ""
+
+#: src/util/gnunet-config.c:160
+msgid "obtain option of value as a filename (with $-expansion)"
+msgstr ""
+
+#: src/util/gnunet-config.c:163
+msgid "name of the section to access"
+msgstr ""
+
+#: src/util/gnunet-config.c:166
+msgid "name of the option to access"
+msgstr ""
+
+#: src/util/gnunet-config.c:169
+msgid "value to set"
+msgstr ""
+
+#: src/util/gnunet-config.c:179
+#, fuzzy
+msgid "Manipulate GNUnet configuration files"
+msgstr "Imposible guardar el fichero de configuración '%s':"
+
 #: src/util/gnunet-resolver.c:148
 msgid "perform a reverse lookup"
 msgstr ""
@@ -5782,24 +5477,56 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:104
+#: src/util/gnunet-rsa.c:114
+#, fuzzy, c-format
+msgid "Failed to open `%s': %s\n"
+msgstr "Fichero almacenado en '%s'.\n"
+
+#: src/util/gnunet-rsa.c:120
 #, c-format
+msgid "Generating %u keys, please wait"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:138
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Failed to write to `%s': %s\n"
+msgstr "Fallo al conectar a gnunetd.\n"
+
+#: src/util/gnunet-rsa.c:150
+#, fuzzy, c-format
+msgid "Finished!\n"
+msgstr "Finalizar"
+
+#: src/util/gnunet-rsa.c:173
+#, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:154
+#: src/util/gnunet-rsa.c:230
+msgid "create COUNT public-private key pairs (for testing)"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:233
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:157
+#: src/util/gnunet-rsa.c:236
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:160
+#: src/util/gnunet-rsa.c:239
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:170
+#: src/util/gnunet-rsa.c:242
+msgid ""
+"use insecure, weak random number generator for key generation (for testing "
+"only)"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:252
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -5814,32 +5541,56 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Imposible encontrar la IP del host '%s': %s\n"
 
-#: src/util/helper.c:254
+#: src/util/gnunet-uri.c:90
+#, c-format
+msgid "No URI specified on command line\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:95
 #, fuzzy, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "Respuesta inválida a '%s'.\n"
+
+#: src/util/gnunet-uri.c:102
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:112
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:174
+msgid "Perform default-actions for GNUnet URIs"
+msgstr ""
+
+#: src/util/helper.c:260
+#, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Error creando usuario"
 
-#: src/util/helper.c:274
+#: src/util/helper.c:280
 #, c-format
 msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/util/helper.c:290
+#: src/util/helper.c:296
 #, fuzzy, c-format
 msgid "Got %u bytes from helper `%s'\n"
 msgstr "GAP recibido contenido no válido de '%s'\n"
 
-#: src/util/helper.c:299
+#: src/util/helper.c:305
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Falló al pasar los datos de la interfaz de '%s' de %s:%d.\n"
 
-#: src/util/helper.c:337
+#: src/util/helper.c:343
 #, fuzzy, c-format
 msgid "Starting HELPER process `%s'\n"
 msgstr "Iniciada colección '%s'.\n"
 
-#: src/util/helper.c:476
+#: src/util/helper.c:496
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Error creando usuario"
@@ -5944,24 +5695,24 @@
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:468
+#: src/util/server.c:431
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "'%s' falló para la unidad %s: %u\n"
 
-#: src/util/server.c:477
+#: src/util/server.c:440
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/util/server.c:488
+#: src/util/server.c:451
 #, fuzzy, c-format
 msgid "`%s' failed for `%.*s': address already in use\n"
 msgstr ""
 "'%s' falló para el puerto %d: %s. ¿Está gnunet ejecutandose actualmente?\n"
 
-#: src/util/server.c:819
+#: src/util/server.c:836
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -5994,95 +5745,95 @@
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato '%s' erróneo para la red: %s\n"
 
-#: src/util/service.c:705
+#: src/util/service.c:707
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:710
+#: src/util/service.c:712
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Operación desconocida '%s'\n"
 
-#: src/util/service.c:717
+#: src/util/service.c:719
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:772
+#: src/util/service.c:774
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:809
+#: src/util/service.c:811
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:927
+#: src/util/service.c:929
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1005
+#: src/util/service.c:1007
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1022
+#: src/util/service.c:1024
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1256
+#: src/util/service.c:1258
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1307 src/util/service.c:1325
+#: src/util/service.c:1309 src/util/service.c:1327
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1352
+#: src/util/service.c:1354
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1521
+#: src/util/service.c:1523
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
-#: src/util/service.c:1554
+#: src/util/service.c:1556
 #, fuzzy, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr "Par '%s' con credibilidad %8u y dirección '%s'\n"
 
-#: src/util/service.c:1603
+#: src/util/service.c:1605
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1607
+#: src/util/service.c:1609
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1611
+#: src/util/service.c:1613
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1666
+#: src/util/service.c:1668
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1679
+#: src/util/service.c:1681
 #, 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:1744
+#: src/util/service.c:1746
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6104,57 +5855,57 @@
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:626
+#: src/util/strings.c:631
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:631
+#: src/util/strings.c:635
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:635
+#: src/util/strings.c:641
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:639
+#: src/util/strings.c:647
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:643
+#: src/util/strings.c:653
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:648
+#: src/util/strings.c:660
 #, fuzzy
 msgid "day"
 msgstr " días"
 
-#: src/util/strings.c:650
+#: src/util/strings.c:662
 #, fuzzy
 msgid "days"
 msgstr " días"
 
-#: src/util/strings.c:674
+#: src/util/strings.c:689
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1063
+#: src/util/strings.c:1078
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1071
+#: src/util/strings.c:1086
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1077
+#: src/util/strings.c:1092
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1084
+#: src/util/strings.c:1099
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1093
+#: src/util/strings.c:1108
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Argumento no válido: '%s'\n"
@@ -6334,23 +6085,305 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:515 src/include/gnunet_common.h:520
-#: src/include/gnunet_common.h:526
+#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
+#: src/include/gnunet_common.h:591
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/include/gnunet_common.h:536
+#: src/include/gnunet_common.h:601
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "La verificación de la firma RSA fallo en %s: %d: %s\n"
 
-#: src/include/gnunet_common.h:557 src/include/gnunet_common.h:564
+#: src/include/gnunet_common.h:622 src/include/gnunet_common.h:629
 #, fuzzy, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "'%s' falló en el fichero '%s' en %s: %d con el error: %s\n"
 
 #, fuzzy
+#~ msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
+#~ msgstr "Recibida respuesta anómala a'%s' del par '%s'.\n"
+
+#, fuzzy
+#~ msgid "Asked to start service `%s' within %llu ms\n"
+#~ msgstr "'%s': No se recibió el mensaje en %llu ms.\n"
+
+#, fuzzy
+#~ msgid "Stopping service `%s' within %llu ms\n"
+#~ msgstr "No se ha recibido una respuesta en %llums.\n"
+
+#, fuzzy
+#~ msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+#~ msgstr "Fichero de configuración '%s' creado.\n"
+
+#, fuzzy
+#~ msgid "Could not transmit confirmation receipt\n"
+#~ msgstr "Imposible acceder a la información del espacio.\n"
+
+#, fuzzy
+#~ msgid "Unknown message type: '%u'\n"
+#~ msgstr "Operación desconocida '%s'\n"
+
+#, fuzzy
+#~ msgid "Configuration option `%s' in section `%s' missing\n"
+#~ msgstr "Fichero de configuración '%s' creado.\n"
+
+#, fuzzy
+#~ msgid "Failed to access chat home directory `%s'\n"
+#~ msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#, fuzzy
+#~ msgid "Failed to create/open key in file `%s'\n"
+#~ msgstr "Fichero almacenado en '%s'.\n"
+
+#, fuzzy
+#~ msgid "Could not serialize metadata\n"
+#~ msgstr "¡Imposible inicializar libgnunetutil!\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to the chat service\n"
+#~ msgstr "Fallo al conectar a gnunetd.\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said: %s\n"
+#~ msgstr "'%s' %s falló: %s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said to you: %s\n"
+#~ msgstr "'%s' %s falló: %s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said for sure: %s\n"
+#~ msgstr "'%s' %s falló: %s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said to you for sure: %s\n"
+#~ msgstr "'%s' falló con el código de error %s: %s"
+
+#, fuzzy
+#~ msgid "(%s) `%s' was confirmed that you received: %s\n"
+#~ msgstr "'%s' falló con el código de error %d: %s"
+
+#, fuzzy
+#~ msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
+#~ msgstr "'%s' falló con el código de error %d: %s"
+
+#, fuzzy
+#~ msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
+#~ msgstr "'%s' falló con el código de error %d: %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "(%s) `%s' was confirmed that you and only you received from him or her: "
+#~ "%s\n"
+#~ msgstr "'%s' falló con el código de error %d: %s"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said off the record: %s\n"
+#~ msgstr "'%s' falló con el código de error %s: %s"
+
+#, fuzzy
+#~ msgid "Could not change username\n"
+#~ msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
+
+#, fuzzy
+#~ msgid "Joining room `%s' as user `%s'...\n"
+#~ msgstr "Respuesta inválida a '%s' del par '%s'.\n"
+
+#, fuzzy
+#~ msgid "Changed username to `%s'\n"
+#~ msgstr "Imposible cambiar el usuario/grupo a '%s': %s\n"
+
+#, fuzzy
+#~ msgid "Users in room `%s': "
+#~ msgstr "Fichero almacenado en '%s'.\n"
+
+#, fuzzy
+#~ msgid "Unknown command `%s'\n"
+#~ msgstr "Operación desconocida '%s'\n"
+
+#, fuzzy
+#~ msgid "You must specify a nickname\n"
+#~ msgstr "¡Debes especificar un receptor!\n"
+
+#, fuzzy
+#~ msgid "Failed to join room `%s'\n"
+#~ msgstr "Fichero almacenado en '%s'.\n"
+
+#, fuzzy
+#~ msgid "Failed to queue a message notification\n"
+#~ msgstr "Imposible guardar la configuración"
+
+#, fuzzy
+#~ msgid "Failed to queue a join notification\n"
+#~ msgstr "Imposible guardar la configuración"
+
+#, fuzzy
+#~ msgid "Failed to queue a confirmation receipt\n"
+#~ msgstr "Imposible guardar la configuración"
+
+#, fuzzy
+#~ msgid "Failed to queue a leave notification\n"
+#~ msgstr "Imposible guardar la configuración"
+
+#, fuzzy
+#~ msgid "Option `%s' in section `%s' missing in configuration!\n"
+#~ msgstr "¡Ninguna aplicación definida en la configuración!\n"
+
+#, fuzzy
+#~ msgid "Connected to %s service!\n"
+#~ msgstr "'%s' conectado a '%s'.\n"
+
+#, fuzzy
+#~ msgid "Configuration fails to specify `%s' in section `%s'\n"
+#~ msgstr ""
+#~ "El fichero de configuración debe especificar el directorio para almacenar "
+#~ "los datos FS en la sección '%s' bajo '%s'.\n"
+
+#, fuzzy
+#~ msgid "Failed to start daemon: %s\n"
+#~ msgstr "Falló al comenzar la recolección.\n"
+
+#, fuzzy
+#~ msgid "Configuration option `%s' in section `%s' missing.\n"
+#~ msgstr "Fichero de configuración '%s' creado.\n"
+
+#, fuzzy
+#~ msgid "Configuration fails to specify `%s', assuming default value."
+#~ msgstr "Fichero de configuración '%s' creado.\n"
+
+#, fuzzy
+#~ msgid "Key file `%s' for private zone does not exist!\n"
+#~ msgstr "número de mensajes a usar por iteración"
+
+#, fuzzy
+#~ msgid "Option `%s' not specified in configuration section `%s'\n"
+#~ msgstr "¡Ninguna aplicación definida en la configuración!\n"
+
+#, fuzzy
+#~ msgid "Peer is lacking HOSTKEY configuration setting.\n"
+#~ msgstr "Configuración de GNUnet"
+
+#, fuzzy
+#~ msgid "Could not access hostkey.\n"
+#~ msgstr "Imposible pasar el fichero de configuración '%s'.\n"
+
+#, fuzzy
+#~ msgid "`scp' did not complete cleanly.\n"
+#~ msgstr "'%s' no esta conectado a ningún par.\n"
+
+#, fuzzy
+#~ msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
+#~ msgstr "Falló al comenzar la recolección.\n"
+
+#, fuzzy
+#~ msgid "Failed to create pipe for `ssh' process.\n"
+#~ msgstr "Error en el formato del fichero (¿no es un directorio de GNUnet?)\n"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to create hostkey.\n"
+#~ msgstr "Imposible mandar el mensaje a gnunetd\n"
+
+#, fuzzy
+#~ msgid "Failed to start `gnunet-peerinfo' process.\n"
+#~ msgstr "Falló al comenzar la recolección.\n"
+
+#, fuzzy
+#~ msgid "Failed to start `ssh' process.\n"
+#~ msgstr "Falló al comenzar la recolección.\n"
+
+#, fuzzy
+#~ msgid "Error reading from gnunet-peerinfo: %s\n"
+#~ msgstr "Se produjo un error leyendo información de gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Malformed output from gnunet-peerinfo!\n"
+#~ msgstr "Se produjo un error leyendo información de gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to get hostkey!\n"
+#~ msgstr "Fallo en las estadísticas del tráfico.\n"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to start GNUnet.\n"
+#~ msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
+
+#, fuzzy
+#~ msgid "Failed to start `gnunet-arm' process.\n"
+#~ msgstr "Fallo al conectar a gnunetd.\n"
+
+#, fuzzy
+#~ msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
+#~ msgstr "'%s' no esta conectado a ningún par.\n"
+
+#, fuzzy
+#~ msgid "Starting service %s for peer `%4s'\n"
+#~ msgstr "Iniciada colección '%s'.\n"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to copy configuration directory.\n"
+#~ msgstr "Imposible acceder a la información del espacio.\n"
+
+#, fuzzy
+#~ msgid "Terminating peer `%4s'\n"
+#~ msgstr "Permiso denegado para '%s' en %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Setting d->dead on peer `%4s'\n"
+#~ msgstr "Iniciada colección '%s'.\n"
+
+#, fuzzy
+#~ msgid "Failed to write new configuration to disk."
+#~ msgstr "Imposible guardar la configuración"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to copy configuration file.\n"
+#~ msgstr "¡Imposible encontrar el par '%s' en la tabla de enrutado!\n"
+
+#, fuzzy
+#~ msgid "Failed to copy new configuration to remote machine."
+#~ msgstr "Imposible guardar la configuración"
+
+#, fuzzy
+#~ msgid "Peers failed to connect"
+#~ msgstr "Fallo al conectar a gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to core service of first peer!\n"
+#~ msgstr "Fallo al conectar a gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
+#~ msgstr ""
+#~ "El fichero de configuración debe especificar el directorio para almacenar "
+#~ "los datos FS en la sección '%s' bajo '%s'.\n"
+
+#, fuzzy
+#~ msgid "Could not read hostkeys file `%s'!\n"
+#~ msgstr "Imposible inicializar la aplicación '%s'\n"
+
+#, fuzzy
+#~ msgid "Could not create configuration for peer number %u on `%s'!\n"
+#~ msgstr "Imposible acceder a la información del espacio.\n"
+
+#, fuzzy
+#~ msgid "Failed to find option %s in section %s!\n"
+#~ msgstr "Fallo al conectar a gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Invalid configuration option `%s' in section `%s'\n"
+#~ msgstr "Fichero de configuración '%s' creado.\n"
+
+#, fuzzy
+#~ msgid "Missing configuration option `%s' in section `%s'\n"
+#~ msgstr "Fichero de configuración '%s' creado.\n"
+
+#, fuzzy
+#~ msgid "internal error"
+#~ msgstr "Error desconocido.\n"
+
+#, fuzzy
 #~ msgid "Could not create namespace `%s'\n"
 #~ msgstr "Imposible crear el espacio '%s' (¿existe?).\n"
 
@@ -7149,10 +7182,6 @@
 #~ msgid "Command `%s' failed with error code %u\n"
 #~ msgstr "'%s' falló con el código de error %s: %s"
 
-#, fuzzy
-#~ msgid "Invalid process priority `%s'\n"
-#~ msgstr "Respuesta inválida a '%s'.\n"
-
 #~ msgid "Availability test failed for `%s' at %s:%d.\n"
 #~ msgstr "Test de disponibilidad fallido para '%s' en %s:%d.\n"
 
@@ -7994,9 +8023,6 @@
 #~ msgid "send messages with SIZE bytes payload"
 #~ msgstr "manda mensajes con SIZE bytes payload"
 
-#~ msgid "Testing transport(s) %s\n"
-#~ msgstr "Probando transporte(s) %s\n"
-
 #~ msgid "Available transport(s): %s\n"
 #~ msgstr "Transporte(s) disponible(s): %s\n"
 
@@ -8389,9 +8415,6 @@
 #~ msgid "Other settings"
 #~ msgstr "Otras configuraciones"
 
-#~ msgid "Finish"
-#~ msgstr "Finalizar"
-
 #~ msgid ""
 #~ "Define the user and the group owning the GNUnet service here.\n"
 #~ "\n"
@@ -8466,9 +8489,6 @@
 #~ msgid "Download failed (no reason given)"
 #~ msgstr "La descarga del ERCS falló (vea los logs)."
 
-#~ msgid "Maximum number of chat clients reached.\n"
-#~ msgstr "Número máximo de clientes en el chat alcanzado.\n"
-
 #~ msgid "Now %d of %d chat clients at this node.\n"
 #~ msgstr "Ahora hay %d de %d clientes de chat en este nodo.\n"
 
@@ -9080,9 +9100,6 @@
 #~ msgid "process directories recursively"
 #~ msgstr "procesa los directorios recursivamente"
 
-#~ msgid "You must pass a positive number to the `%s' option.\n"
-#~ msgstr "Debes pasar un número positivo a la opción '%s'.\n"
-
 #~ msgid "Only one file or directory can be specified at a time.\n"
 #~ msgstr "Solo un fichero o un directorio puede ser especificado cada vez.\n"
 

Modified: gnunet/po/sv.po
===================================================================
--- gnunet/po/sv.po     2012-09-27 19:36:14 UTC (rev 24062)
+++ gnunet/po/sv.po     2012-09-27 19:40:20 UTC (rev 24063)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-08-17 00:17+0200\n"
+"POT-Creation-Date: 2012-09-27 21:17+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"
@@ -20,51 +20,6 @@
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:354
-#, fuzzy, c-format
-msgid "Configuration failes to specify option `%s' in section `%s'!\n"
-msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
-
-#: src/arm/arm_api.c:368
-#, fuzzy, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/arm/arm_api.c:437
-#, c-format
-msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
-msgstr ""
-
-#: src/arm/arm_api.c:490
-#, c-format
-msgid "Requesting start of service `%s'.\n"
-msgstr ""
-
-#: src/arm/arm_api.c:491
-#, c-format
-msgid "Requesting termination of service `%s'.\n"
-msgstr ""
-
-#: src/arm/arm_api.c:512
-#, c-format
-msgid "Error while trying to transmit request to start `%s' to ARM\n"
-msgstr ""
-
-#: src/arm/arm_api.c:513
-#, c-format
-msgid "Error while trying to transmit request to stop `%s' to ARM\n"
-msgstr ""
-
-#: src/arm/arm_api.c:547
-#, fuzzy, c-format
-msgid "Asked to start service `%s' within %llu ms\n"
-msgstr "\"%s\": Mottog inte meddelande inom %llu ms.\n"
-
-#: src/arm/arm_api.c:620
-#, fuzzy, c-format
-msgid "Stopping service `%s' within %llu ms\n"
-msgstr "Inget svar mottaget inom %llums.\n"
-
 #: src/arm/gnunet-arm.c:166
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
@@ -118,22 +73,17 @@
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:229
+#: src/arm/gnunet-arm.c:230
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/arm/gnunet-arm.c:232
+#: src/arm/gnunet-arm.c:233
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-arm.c:256
-#, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:264 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:384
+#: src/arm/gnunet-arm.c:263 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:385
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
@@ -147,51 +97,51 @@
 msgid "Failed to remove servicehome directory %s\n"
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/arm/gnunet-arm.c:418
+#: src/arm/gnunet-arm.c:416
 msgid "stop all GNUnet services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:420
+#: src/arm/gnunet-arm.c:418
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:422
+#: src/arm/gnunet-arm.c:420
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:424
+#: src/arm/gnunet-arm.c:422
 msgid "start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:427
+#: src/arm/gnunet-arm.c:425
 msgid "stop and start all GNUnet default services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:430
+#: src/arm/gnunet-arm.c:428
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:432
+#: src/arm/gnunet-arm.c:430
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:435
+#: src/arm/gnunet-arm.c:433
 msgid "timeout for completing current operation"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:437
+#: src/arm/gnunet-arm.c:435
 msgid "List currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:439
+#: src/arm/gnunet-arm.c:437
 msgid "Don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:441
+#: src/arm/gnunet-arm.c:439
 msgid "Don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:455
+#: src/arm/gnunet-arm.c:450
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -255,7 +205,7 @@
 
 #: src/arm/gnunet-service-arm.c:986
 #, fuzzy, c-format
-msgid "Service `%s' took %llu ms to terminate\n"
+msgid "Service `%s' took %s to terminate\n"
 msgstr "Tjänst borttagen.\n"
 
 #: src/arm/gnunet-service-arm.c:1021
@@ -263,26 +213,17 @@
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1127
+#: src/arm/gnunet-service-arm.c:1214
 #, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not valid: %s\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/arm/gnunet-service-arm.c:1129
-msgid "option missing"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:1213
-#, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/arm/gnunet-service-arm.c:1224
+#: src/arm/gnunet-service-arm.c:1225
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1238
+#: src/arm/gnunet-service-arm.c:1239
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -311,274 +252,6 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Testar transport(er) %s\n"
 
-#: src/chat/chat.c:175
-#, fuzzy
-msgid "Could not transmit confirmation receipt\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
-
-#: src/chat/chat.c:283
-msgid "The current user must be the the first one joined\n"
-msgstr ""
-
-#: src/chat/chat.c:412
-#, fuzzy, c-format
-msgid "Unknown message type: '%u'\n"
-msgstr "Okänd operation \"%s\"\n"
-
-#: src/chat/chat.c:472
-#, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/chat/chat.c:480
-#, fuzzy, c-format
-msgid "Failed to access chat home directory `%s'\n"
-msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
-
-#: src/chat/chat.c:498
-#, fuzzy, c-format
-msgid "Failed to create/open key in file `%s'\n"
-msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#: src/chat/chat.c:559
-#, fuzzy
-msgid "Could not serialize metadata\n"
-msgstr "Kunde inte initiera libgnunetutil!\n"
-
-#: src/chat/chat.c:674
-#, fuzzy
-msgid "Failed to connect to the chat service\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/chat/chat.c:680
-msgid "Undefined mandatory parameter: joinCallback\n"
-msgstr ""
-
-#: src/chat/chat.c:686
-msgid "Undefined mandatory parameter: messageCallback\n"
-msgstr ""
-
-#: src/chat/chat.c:692
-msgid "Undefined mandatory parameter: memberCallback\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:93
-msgid "Joined\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:125 src/chat/gnunet-chat.c:133
-#: src/chat/gnunet-chat.c:213 src/chat/gnunet-chat.c:253
-#: src/chat/gnunet-chat.c:329 src/chat/gnunet-chat.c:371
-#: src/chat/gnunet-chat.c:400 src/chat/gnunet-chat.c:700
-msgid "anonymous"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:144
-#, fuzzy, c-format
-msgid "(%s) `%s' said: %s\n"
-msgstr "\"%s\" %s misslyckades: %s\n"
-
-#: src/chat/gnunet-chat.c:147 src/chat/gnunet-chat.c:150
-#, fuzzy, c-format
-msgid "(%s) `%s' said to you: %s\n"
-msgstr "\"%s\" %s misslyckades: %s\n"
-
-# drive = hard drive ?
-#: src/chat/gnunet-chat.c:153
-#, fuzzy, c-format
-msgid "(%s) `%s' said for sure: %s\n"
-msgstr "\"%s\" misslyckades för enhet %s: %u\n"
-
-# drive = hard drive ?
-#: src/chat/gnunet-chat.c:156
-#, fuzzy, c-format
-msgid "(%s) `%s' said to you for sure: %s\n"
-msgstr "\"%s\" misslyckades för enhet %s: %u\n"
-
-#: src/chat/gnunet-chat.c:159
-#, c-format
-msgid "(%s) `%s' was confirmed that you received: %s\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:162
-#, c-format
-msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:165
-#, c-format
-msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:170
-#, c-format
-msgid ""
-"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:173
-#, fuzzy, c-format
-msgid "(%s) `%s' said off the record: %s\n"
-msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
-
-#: src/chat/gnunet-chat.c:176
-#, c-format
-msgid "(%s) <%s> said using an unknown message type: %s\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:217
-#, c-format
-msgid "'%s' acknowledged message #%d\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:260
-#, c-format
-msgid "`%s' entered the room\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:260
-#, c-format
-msgid "`%s' left the room\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:321 src/chat/gnunet-chat.c:363
-#, fuzzy
-msgid "Could not change username\n"
-msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
-
-#: src/chat/gnunet-chat.c:334 src/chat/gnunet-chat.c:702
-#, fuzzy, c-format
-msgid "Joining room `%s' as user `%s'...\n"
-msgstr "Ogiltigt svar till \"%s\" från motpart \"%s\".\n"
-
-#: src/chat/gnunet-chat.c:373
-#, fuzzy, c-format
-msgid "Changed username to `%s'\n"
-msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
-
-#: src/chat/gnunet-chat.c:388
-#, c-format
-msgid "Users in room `%s': "
-msgstr ""
-
-#: src/chat/gnunet-chat.c:434
-msgid "Syntax: /msg USERNAME MESSAGE"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:443
-#, c-format
-msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:460
-#, c-format
-msgid "User `%s' is currently not in the room!\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:513
-#, fuzzy, c-format
-msgid "Unknown command `%s'\n"
-msgstr "Okänd operation \"%s\"\n"
-
-#: src/chat/gnunet-chat.c:524
-msgid ""
-"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
-"leave the current room"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:528
-msgid ""
-"Use `/nick nickname' to change your nickname.  This will cause you to leave "
-"the current room and immediately rejoin it with the new name."
-msgstr ""
-
-#: src/chat/gnunet-chat.c:532
-msgid ""
-"Use `/msg nickname message' to send a private message to the specified user"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:535
-msgid "The `/notice' command is an alias for `/msg'"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:537
-msgid "The `/query' command is an alias for `/msg'"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:539
-msgid "Use `/sig message' to send a signed public message"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:542
-msgid "Use `/ack message' to require signed acknowledgment of the message"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:545
-msgid "Use `/anonymous message' to send a public anonymous message"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:547
-msgid "The `/anon' command is an alias for `/anonymous'"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:549
-msgid "Use `/quit' to terminate gnunet-chat"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:551
-msgid "The `/leave' command is an alias for `/quit'"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:554
-msgid "Use `/names' to list all of the current members in the chat room"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:556
-msgid "Use `/help command' to get help for a specific command"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:672
-#, fuzzy
-msgid "You must specify a nickname\n"
-msgstr "Du måste ange en mottagare!\n"
-
-#: src/chat/gnunet-chat.c:688
-#, fuzzy, c-format
-msgid "Failed to join room `%s'\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/chat/gnunet-chat.c:727
-msgid "set the nickname to use (required)"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:730
-msgid "set the chat room to join"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:746
-msgid "Join a chat on GNUnet."
-msgstr ""
-
-#: src/chat/gnunet-service-chat.c:266
-#, fuzzy
-msgid "Failed to queue a message notification\n"
-msgstr "Kunde inte spara konfiguration!"
-
-#: src/chat/gnunet-service-chat.c:545
-#, fuzzy
-msgid "Failed to queue a join notification\n"
-msgstr "Kunde inte spara konfiguration!"
-
-#: src/chat/gnunet-service-chat.c:728
-#, fuzzy
-msgid "Failed to queue a confirmation receipt\n"
-msgstr "Kunde inte spara konfiguration!"
-
-#: src/chat/gnunet-service-chat.c:906
-#, fuzzy
-msgid "Failed to queue a leave notification\n"
-msgstr "Kunde inte spara konfiguration!"
-
 #: src/core/core_api.c:757
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
@@ -588,42 +261,58 @@
 msgid "Peer `%s'\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/core/gnunet-core.c:118 src/core/gnunet-core.c:149
-#: src/transport/gnunet-transport.c:451 src/transport/gnunet-transport.c:477
+#: src/core/gnunet-core.c:119 src/core/gnunet-core.c:147
+#: src/transport/gnunet-transport.c:453 src/transport/gnunet-transport.c:477
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:120 src/transport/gnunet-transport.c:453
+#: src/core/gnunet-core.c:121 src/transport/gnunet-transport.c:455
 #, fuzzy
 msgid "Connected to"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:151 src/transport/gnunet-transport.c:479
+#: src/core/gnunet-core.c:149 src/transport/gnunet-transport.c:479
 #, fuzzy
 msgid "Disconnected from"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:817
+#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:818
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "Ogiltiga kommandoradsargument:\n"
 
-#: src/core/gnunet-core.c:216 src/transport/gnunet-transport.c:725
+#: src/core/gnunet-core.c:211 src/transport/gnunet-transport.c:724
 #, fuzzy
 msgid "provide information about all current connections (continuously)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-core.c:227
+#: src/core/gnunet-core.c:222
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/core/gnunet-service-core.c:97
+#: src/core/gnunet-service-core.c:109
+#, fuzzy, c-format
+msgid "Failed to read hostkey: %s\n"
+msgstr "Misslyckades att starta samling.\n"
+
+#: src/core/gnunet-service-core.c:123
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
+#: src/core/gnunet-service-core.c:149
+#, fuzzy
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr "GNUnet-konfiguration"
+
+#: src/core/gnunet-service-core.c:163
+#: src/transport/gnunet-service-transport.c:685
+#, fuzzy
+msgid "Transport service is unable to access hostkey. Exiting.\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
 #: src/core/gnunet-service-core_clients.c:370
 msgid "# send requests dropped (disconnected)"
 msgstr ""
@@ -754,7 +443,7 @@
 
 #: src/core/gnunet-service-core_kx.c:1628
 #, fuzzy, c-format
-msgid "Message received far too old (%llu ms). Content ignored.\n"
+msgid "Message received far too old (%s). Content ignored.\n"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
 #: src/core/gnunet-service-core_kx.c:1632
@@ -767,19 +456,10 @@
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
 
-#: src/core/gnunet-service-core_kx.c:1702
+#: src/core/gnunet-service-core_kx.c:1703 src/hostlist/hostlist-server.c:552
+#: src/peerinfo-tool/gnunet-peerinfo.c:824
+#: src/transport/gnunet-service-transport.c:627
 #, fuzzy
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
-msgstr "GNUnet-konfiguration"
-
-#: src/core/gnunet-service-core_kx.c:1710
-msgid "Core service could not access hostkey.  Exiting.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:1720 src/hostlist/hostlist-server.c:551
-#: src/peerinfo-tool/gnunet-peerinfo.c:823
-#: src/transport/gnunet-service-transport.c:619
-#, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
@@ -804,9 +484,9 @@
 
 #: src/core/gnunet-service-core_sessions.c:206
 #: src/core/gnunet-service-core_sessions.c:269
-#: src/dht/gnunet-service-dht_neighbours.c:629
-#: src/dht/gnunet-service-dht_neighbours.c:687
-#: src/fs/gnunet-service-fs_cp.c:622 src/fs/gnunet-service-fs_cp.c:1530
+#: src/dht/gnunet-service-dht_neighbours.c:634
+#: src/dht/gnunet-service-dht_neighbours.c:692
+#: src/fs/gnunet-service-fs_cp.c:623 src/fs/gnunet-service-fs_cp.c:1532
 #: src/topology/gnunet-daemon-topology.c:709
 #: src/topology/gnunet-daemon-topology.c:810
 #: src/transport/gnunet-service-transport_neighbours.c:873
@@ -879,8 +559,8 @@
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:543
-#: src/include/gnunet_common.h:550
+#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:608
+#: src/include/gnunet_common.h:615
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
@@ -898,8 +578,8 @@
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:443
-#: src/datastore/plugin_datastore_sqlite.c:408
-#: src/namestore/plugin_namestore_sqlite.c:370
+#: src/datastore/plugin_datastore_sqlite.c:406
+#: src/namestore/plugin_namestore_sqlite.c:369
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1024,10 +704,12 @@
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:480
+#: src/gns/gnunet-gns-helper-service-w32.c:159
 msgid "Transmission to client failed!\n"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:511
+#: src/gns/gnunet-gns-helper-service-w32.c:189
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
@@ -1196,34 +878,28 @@
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:233
-#: src/namestore/plugin_namestore_sqlite.c:204
+#: src/datastore/plugin_datastore_sqlite.c:258
+#: src/namestore/plugin_namestore_sqlite.c:228
 #, fuzzy, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
-
-#: src/datastore/plugin_datastore_sqlite.c:260
-#: src/namestore/plugin_namestore_sqlite.c:229
-#, fuzzy, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:655
+#: src/datastore/plugin_datastore_sqlite.c:653
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1139
+#: src/datastore/plugin_datastore_sqlite.c:1137
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1158
+#: src/datastore/plugin_datastore_sqlite.c:1156
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1198
+#: src/datastore/plugin_datastore_sqlite.c:1196
 #: src/namestore/plugin_namestore_sqlite.c:834
 msgid "Sqlite database running\n"
 msgstr ""
@@ -1237,97 +913,116 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:293
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-get.c:132
+#, c-format
+msgid ""
+"Result %d, type %d:\n"
+"%.*s\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:156
+msgid "Must provide key for DHT GET!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:162 src/dht/gnunet-dht-monitor.c:225
+#, fuzzy
+msgid "Failed to connect to DHT service!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/dht/gnunet-dht-get.c:170
+msgid "Issueing DHT GET with key"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:186 src/dht/gnunet-dht-monitor.c:262
+#: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204
+#: src/dht/gnunet-dht-get.c:189
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296
+#: src/dht/gnunet-dht-get.c:192 src/dht/gnunet-dht-monitor.c:265
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-put.c:210
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:204 src/fs/gnunet-auto-share.c:750
-#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:732
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
-#: src/nse/gnunet-nse-profiler.c:897
+#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:201
+msgid "use DHT's demultiplex everywhere option"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
+#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:750
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:733
+#: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
+#: src/nse/gnunet-nse-profiler.c:1033
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:236
+#: src/dht/gnunet-dht-get.c:222
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:299
-msgid "how long to execute? 0 = forever"
+#: src/dht/gnunet-dht-monitor.c:268
+msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:324
+#: src/dht/gnunet-dht-monitor.c:293
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:108
-msgid "PUT request sent!\n"
-msgstr ""
+#: src/dht/gnunet-dht-put.c:118
+#, fuzzy
+msgid "PUT request sent with key"
+msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-dht-put.c:111
+#: src/dht/gnunet-dht-put.c:121
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:114
+#: src/dht/gnunet-dht-put.c:124
 #, fuzzy
 msgid "PUT request not confirmed!\n"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-dht-put.c:144
+#: src/dht/gnunet-dht-put.c:153
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:152
+#: src/dht/gnunet-dht-put.c:160
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/dht/gnunet-dht-put.c:157
-#, fuzzy, c-format
-msgid "Connected to %s service!\n"
-msgstr "\"%s\" ansluten till \"%s\".\n"
-
-#: src/dht/gnunet-dht-put.c:172
+#: src/dht/gnunet-dht-put.c:176
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:186
+#: src/dht/gnunet-dht-put.c:192
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:189
+#: src/dht/gnunet-dht-put.c:195
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:204
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-put.c:207
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:226
+#: src/dht/gnunet-dht-put.c:235
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing_old/testing.c:544
-#: src/testing_old/testing.c:1968 src/testing_old/testing.c:1998
+#: src/dht/gnunet-service-dht.c:163
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -1420,100 +1115,100 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:485
+#: src/dht/gnunet-service-dht_neighbours.c:490
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:575
+#: src/dht/gnunet-service-dht_neighbours.c:580
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:721
+#: src/dht/gnunet-service-dht_neighbours.c:726
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:776
+#: src/dht/gnunet-service-dht_neighbours.c:781
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/dht/gnunet-service-dht_neighbours.c:814
+#: src/dht/gnunet-service-dht_neighbours.c:819
 msgid "# Bytes of bandwdith requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1036
-#: src/dht/gnunet-service-dht_neighbours.c:1064
+#: src/dht/gnunet-service-dht_neighbours.c:1041
+#: src/dht/gnunet-service-dht_neighbours.c:1069
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1045
-#: src/dht/gnunet-service-dht_neighbours.c:1079
+#: src/dht/gnunet-service-dht_neighbours.c:1050
+#: src/dht/gnunet-service-dht_neighbours.c:1084
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1211
+#: src/dht/gnunet-service-dht_neighbours.c:1216
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1240
+#: src/dht/gnunet-service-dht_neighbours.c:1245
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1247
-#: src/dht/gnunet-service-dht_neighbours.c:1360
-#: src/dht/gnunet-service-dht_neighbours.c:1460
+#: src/dht/gnunet-service-dht_neighbours.c:1252
+#: src/dht/gnunet-service-dht_neighbours.c:1365
+#: src/dht/gnunet-service-dht_neighbours.c:1465
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1325
+#: src/dht/gnunet-service-dht_neighbours.c:1330
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1352
+#: src/dht/gnunet-service-dht_neighbours.c:1357
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1467
+#: src/dht/gnunet-service-dht_neighbours.c:1472
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# PING-meddelanden skapade"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1555
+#: src/dht/gnunet-service-dht_neighbours.c:1560
 #, fuzzy
 msgid "# P2P PUT requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1671
+#: src/dht/gnunet-service-dht_neighbours.c:1676
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1679
+#: src/dht/gnunet-service-dht_neighbours.c:1684
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1770
+#: src/dht/gnunet-service-dht_neighbours.c:1775
 #, fuzzy
 msgid "# P2P GET requests received"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1812
+#: src/dht/gnunet-service-dht_neighbours.c:1817
 #, fuzzy
 msgid "# P2P FIND PEER requests processed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1826
+#: src/dht/gnunet-service-dht_neighbours.c:1831
 #, fuzzy
 msgid "# P2P GET requests ONLY routed"
 msgstr "# byte mottogs via TCP"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1905
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# krypterade PONG-meddelanden mottagna"
@@ -1566,6 +1261,27 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
+#: src/dns/dnsstub.c:175
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "Kunde inte köra \"%s\": %s\n"
+
+#: src/dns/dnsstub.c:291 src/dns/dnsstub.c:375
+#: src/gns/gnunet-service-gns_resolver.c:1673
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
+
+#: src/dns/dnsstub.c:360
+#, c-format
+msgid "Configured DNS exit `%s' is not working / valid.\n"
+msgstr ""
+
+#: src/dns/dnsstub.c:430
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
+
 #: src/dns/gnunet-dns-monitor.c:355
 msgid "only monitor DNS queries"
 msgstr ""
@@ -1590,69 +1306,54 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:485
-#, fuzzy, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr "Kunde inte köra \"%s\": %s\n"
-
-#: src/dns/gnunet-service-dns.c:639
+#: src/dns/gnunet-service-dns.c:499
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:822
+#: src/dns/gnunet-service-dns.c:639
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1005
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1050
+#: src/dns/gnunet-service-dns.c:821
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1168
+#: src/dns/gnunet-service-dns.c:892
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1281
+#: src/dns/gnunet-service-dns.c:1005
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1297
+#: src/dns/gnunet-service-dns.c:1021
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1306
+#: src/dns/gnunet-service-dns.c:1030
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1315
+#: src/dns/gnunet-service-dns.c:1039
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1380
+#: src/dns/gnunet-service-dns.c:1104
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
 
-#: src/dns/gnunet-service-dns.c:1465
-#, c-format
-msgid "Configured DNS exit `%s' is not working / valid.\n"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1497 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1180 src/exit/gnunet-daemon-exit.c:2673
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1561 src/exit/gnunet-daemon-exit.c:3032
+#: src/dns/gnunet-service-dns.c:1245 src/exit/gnunet-daemon-exit.c:3032
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1581
+#: src/dns/gnunet-service-dns.c:1266
 msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
@@ -1863,7 +1564,7 @@
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3240
+#: src/exit/gnunet-daemon-exit.c:3241
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2098,37 +1799,32 @@
 msgid "Failed to connect to datastore service"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_namespace.c:57 src/fs/fs_namespace.c:83
+#: src/fs/fs_namespace.c:110
 #, fuzzy, c-format
-msgid "Configuration fails to specify `%s' in section `%s'\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/fs/fs_namespace.c:112
-#, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_namespace.c:134 src/fs/fs_namespace.c:222
+#: src/fs/fs_namespace.c:132 src/fs/fs_namespace.c:220
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:254
+#: src/fs/fs_namespace.c:252
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/fs_namespace.c:369
+#: src/fs/fs_namespace.c:367
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:586 src/fs/fs_publish_ksk.c:295
+#: src/fs/fs_namespace.c:584 src/fs/fs_publish_ksk.c:295
 #, fuzzy
 msgid "Internal error."
 msgstr "Okänt fel.\n"
 
-#: src/fs/fs_namespace.c:629
+#: src/fs/fs_namespace.c:627
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -2209,11 +1905,6 @@
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_test_lib.c:269
-#, fuzzy, c-format
-msgid "Failed to start daemon: %s\n"
-msgstr "Misslyckades att starta samling.\n"
-
 #: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
@@ -2241,37 +1932,37 @@
 msgid "Failed to connect to FS service for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:344
+#: src/fs/fs_unindex.c:349 src/fs/fs_unindex.c:361
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
 
-#: src/fs/fs_unindex.c:356
+#: src/fs/fs_unindex.c:357
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/fs_unindex.c:411
+#: src/fs/fs_unindex.c:416
 #, fuzzy, c-format
 msgid "Failed to remove KBlock: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_unindex.c:501
+#: src/fs/fs_unindex.c:506
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s' from KBlock!\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/fs_unindex.c:553 src/fs/fs_unindex.c:618
+#: src/fs/fs_unindex.c:558 src/fs/fs_unindex.c:623
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/fs_unindex.c:631
+#: src/fs/fs_unindex.c:636
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/fs/fs_unindex.c:665
+#: src/fs/fs_unindex.c:670
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -2336,16 +2027,16 @@
 msgid "Lacking key configuration settings.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/fs/fs_uri.c:910
+#: src/fs/fs_uri.c:909
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/fs/fs_uri.c:1115 src/fs/fs_uri.c:1142
+#: src/fs/fs_uri.c:1114 src/fs/fs_uri.c:1141
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1148
+#: src/fs/fs_uri.c:1147
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2384,24 +2075,24 @@
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
 #: src/fs/gnunet-auto-share.c:734 src/fs/gnunet-pseudonym.c:279
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:680
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:684
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:686
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:687
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:711
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
 #: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-pseudonym.c:304
-#: src/fs/gnunet-publish.c:717
+#: src/fs/gnunet-publish.c:718
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2449,87 +2140,87 @@
 msgid "Starting download `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-download.c:146
+#: src/fs/gnunet-download.c:147
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Okänt fel"
 
-#: src/fs/gnunet-download.c:155
+#: src/fs/gnunet-download.c:157
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:178
+#: src/fs/gnunet-download.c:179
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-download.c:193
+#: src/fs/gnunet-download.c:194
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Uppladdning vägrades!"
 
-#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:191
-#: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:192
+#: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:234
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:625
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:626
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Fil \"%s\" har URI: %s\n"
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:247
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:254
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:603
-#: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:604
+#: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:282
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:307
+#: src/fs/gnunet-download.c:308
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:288
+#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:285
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:313
+#: src/fs/gnunet-download.c:314
 msgid "write the file to FILENAME"
 msgstr "skriv filen till FILNAMN"
 
-#: src/fs/gnunet-download.c:317
+#: src/fs/gnunet-download.c:318
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:321
+#: src/fs/gnunet-download.c:322
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:325
 msgid "download a GNUnet directory recursively"
 msgstr "hämta en GNUnet-katalog rekursivt"
 
-#: src/fs/gnunet-download.c:338
+#: src/fs/gnunet-download.c:339
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2569,7 +2260,7 @@
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:698
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:699
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
@@ -2598,209 +2289,209 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:147
+#: src/fs/gnunet-publish.c:149
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:155
+#: src/fs/gnunet-publish.c:156
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/fs/gnunet-publish.c:165
+#: src/fs/gnunet-publish.c:166
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:169
+#: src/fs/gnunet-publish.c:170
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:188
+#: src/fs/gnunet-publish.c:189
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "\"%s\" uppstart klar.\n"
 
-#: src/fs/gnunet-publish.c:306
+#: src/fs/gnunet-publish.c:307
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:308
+#: src/fs/gnunet-publish.c:309
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Nyckelord för fil \"%s\":\n"
 
-#: src/fs/gnunet-publish.c:359 src/fs/gnunet-publish.c:613
+#: src/fs/gnunet-publish.c:360 src/fs/gnunet-publish.c:614
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s' (illegal filename?)\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-publish.c:434
+#: src/fs/gnunet-publish.c:435
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:461
+#: src/fs/gnunet-publish.c:462
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:493
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:494
+#: src/fs/gnunet-publish.c:495
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/fs/gnunet-publish.c:499
+#: src/fs/gnunet-publish.c:500
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:504
+#: src/fs/gnunet-publish.c:505
 #, fuzzy
 msgid "Preprocessing complete.\n"
 msgstr "Nedstängning klar.\n"
 
-#: src/fs/gnunet-publish.c:508
+#: src/fs/gnunet-publish.c:509
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Uppdaterar data för modul \"%s\"\n"
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:513
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:519
+#: src/fs/gnunet-publish.c:520
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tFel vid läsning av katalog.\n"
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:554
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:560
+#: src/fs/gnunet-publish.c:561
 #, 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:566
+#: src/fs/gnunet-publish.c:567
 #, 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:574 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:575 src/vpn/gnunet-vpn.c:214
 #, fuzzy, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Kommando \"%s\" kräver ett argument (\"%s\").\n"
 
-#: src/fs/gnunet-publish.c:584 src/fs/gnunet-publish.c:591
-#: src/transport/gnunet-transport.c:624
+#: src/fs/gnunet-publish.c:585 src/fs/gnunet-publish.c:592
+#: src/transport/gnunet-transport.c:623
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:646
+#: src/fs/gnunet-publish.c:647
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:659
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:690
+#: src/fs/gnunet-publish.c:691
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:695
 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:701
+#: src/fs/gnunet-publish.c:702
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:706
+#: src/fs/gnunet-publish.c:707
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:714
+#: src/fs/gnunet-publish.c:715
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:720
+#: src/fs/gnunet-publish.c:721
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:724
+#: src/fs/gnunet-publish.c:725
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:728
+#: src/fs/gnunet-publish.c:729
 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:747
+#: src/fs/gnunet-publish.c:748
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:111
+#: src/fs/gnunet-search.c:114
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:181
+#: src/fs/gnunet-search.c:184
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Fel vid lämning av DHT.\n"
 
-#: src/fs/gnunet-search.c:231
+#: src/fs/gnunet-search.c:233
 #, fuzzy
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-search.c:255
+#: src/fs/gnunet-search.c:257
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/fs/gnunet-search.c:291
+#: src/fs/gnunet-search.c:288
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:294
-msgid "automatically terminate search after VALUE ms"
+#: src/fs/gnunet-search.c:291
+msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:301
+#: src/fs/gnunet-search.c:298
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:312
+#: src/fs/gnunet-search.c:309
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
@@ -2813,148 +2504,142 @@
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1330
-#: src/topology/gnunet-daemon-topology.c:1337
+#: src/topology/gnunet-daemon-topology.c:1329
+#: src/topology/gnunet-daemon-topology.c:1336
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/fs/gnunet-service-fs_cp.c:703
+#: src/fs/gnunet-service-fs_cp.c:704
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:707
+#: src/fs/gnunet-service-fs_cp.c:708
 #, c-format
-msgid "Migration of content to peer `%s' blocked for %llu ms\n"
+msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:742
+#: src/fs/gnunet-service-fs_cp.c:744
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# byte skickade av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:748
+#: src/fs/gnunet-service-fs_cp.c:750
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:773 src/fs/gnunet-service-fs_cp.c:1331
+#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:1333
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:865
+#: src/fs/gnunet-service-fs_cp.c:867
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:920
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:926
+#: src/fs/gnunet-service-fs_cp.c:928
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# byte mottagna av typen %d"
 
-#: src/fs/gnunet-service-fs_cp.c:940
+#: src/fs/gnunet-service-fs_cp.c:942
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:978
+#: src/fs/gnunet-service-fs_cp.c:980
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1045
+#: src/fs/gnunet-service-fs_cp.c:1047
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1069
+#: src/fs/gnunet-service-fs_cp.c:1071
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1079
+#: src/fs/gnunet-service-fs_cp.c:1081
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1158
+#: src/fs/gnunet-service-fs_cp.c:1160
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1192
+#: src/fs/gnunet-service-fs_cp.c:1194
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1214
+#: src/fs/gnunet-service-fs_cp.c:1216
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1274
+#: src/fs/gnunet-service-fs_cp.c:1276
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1300
+#: src/fs/gnunet-service-fs_cp.c:1302
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1329
+#: src/fs/gnunet-service-fs_cp.c:1331
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_cp.c:1685
+#: src/fs/gnunet-service-fs_cp.c:1687
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_indexing.c:113
-#: src/fs/gnunet-service-fs_indexing.c:163
+#: src/fs/gnunet-service-fs_indexing.c:120
+#: src/fs/gnunet-service-fs_indexing.c:175
 #, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing.\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/fs/gnunet-service-fs_indexing.c:121
-#: src/fs/gnunet-service-fs_indexing.c:177
-#, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:137
+#: src/fs/gnunet-service-fs_indexing.c:136
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/fs/gnunet-service-fs_indexing.c:228
+#: src/fs/gnunet-service-fs_indexing.c:226
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:266
+#: src/fs/gnunet-service-fs_indexing.c:264
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:481
+#: src/fs/gnunet-service-fs_indexing.c:479
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:539
+#: src/fs/gnunet-service-fs_indexing.c:537
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:554
+#: src/fs/gnunet-service-fs_indexing.c:552
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:556
+#: src/fs/gnunet-service-fs_indexing.c:554
 #, fuzzy
 msgid "not indexed"
 msgstr "Avindexering misslyckades."
 
-#: src/fs/gnunet-service-fs_indexing.c:571
+#: src/fs/gnunet-service-fs_indexing.c:569
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
@@ -3059,74 +2744,66 @@
 
 #: src/fs/gnunet-service-fs_pr.c:1108
 #, c-format
-msgid "Datastore lookup already took %llu ms!\n"
+msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1129
+#: src/fs/gnunet-service-fs_pr.c:1128
 #, c-format
-msgid "On-demand lookup already took %llu ms!\n"
+msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1176
+#: src/fs/gnunet-service-fs_pr.c:1174
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1190
+#: src/fs/gnunet-service-fs_pr.c:1188
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1199
+#: src/fs/gnunet-service-fs_pr.c:1197
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1213
+#: src/fs/gnunet-service-fs_pr.c:1211
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1226
+#: src/fs/gnunet-service-fs_pr.c:1224
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1239
+#: src/fs/gnunet-service-fs_pr.c:1237
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1242
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1271 src/fs/gnunet-service-fs_pr.c:1311
-#: src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1269 src/fs/gnunet-service-fs_pr.c:1309
+#: src/fs/gnunet-service-fs_pr.c:1447
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1329
+#: src/fs/gnunet-service-fs_pr.c:1327
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1340
+#: src/fs/gnunet-service-fs_pr.c:1338
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1426
+#: src/fs/gnunet-service-fs_pr.c:1424
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1510
+#: src/fs/gnunet-service-fs_pr.c:1508
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/fs/gnunet-service-fs_pr.c:1603 src/fs/gnunet-service-fs_pr.c:1612
-#, fuzzy, c-format
-msgid "Configuration fails to specify `%s', assuming default value."
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
 #: src/fs/gnunet-service-fs_push.c:629
-#, c-format
-msgid ""
-"Invalid value specified for option `%s' in section `%s', content pushing "
-"disabled\n"
+msgid "time required, content pushing disabled"
 msgstr ""
 
 #: src/fs/gnunet-unindex.c:89
@@ -3134,29 +2811,29 @@
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:96
+#: src/fs/gnunet-unindex.c:95
 #, fuzzy, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 "\n"
 "Fel vid avindexering av fil: %s\n"
 
-#: src/fs/gnunet-unindex.c:101
+#: src/fs/gnunet-unindex.c:100
 #, fuzzy
 msgid "Unindexing done.\n"
 msgstr "Avindexera filer."
 
-#: src/fs/gnunet-unindex.c:131
+#: src/fs/gnunet-unindex.c:130
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-unindex.c:148
+#: src/fs/gnunet-unindex.c:147
 #, fuzzy
 msgid "Could not start unindex operation.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/fs/gnunet-unindex.c:180
+#: src/fs/gnunet-unindex.c:179
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
@@ -3164,126 +2841,172 @@
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:267
+#: src/gns/gns_api.c:575
+#, 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:186
+#, 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:361
 #, fuzzy, c-format
-msgid "Key file `%s' for private zone does not exist!\n"
-msgstr "antal meddelanden att använda per iteration"
+msgid "Cannot parse DNS request from %s\n"
+msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-gns.c:289
-#, fuzzy
+#: src/gns/gnunet-dns2gns.c:377
+#, 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:385
+#, 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:673
+msgid "IP of recursive dns resolver to use (required)"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:676
+msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:679
+msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:692
+msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:182
+#, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:358
+#: src/gns/gnunet-gns.c:293
+#, c-format
+msgid "Please specify lookup, shorten or authority operation!\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:315
 #, fuzzy
 msgid "try to shorten a given name"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:361
+#: src/gns/gnunet-gns.c:318
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:364
+#: src/gns/gnunet-gns.c:321
 msgid "Get the authority of a particular name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:367
+#: src/gns/gnunet-gns.c:324
 #, fuzzy
 msgid "Specify the type of the record to lookup"
 msgstr "ange prioritet för innehållet"
 
-#: src/gns/gnunet-gns.c:370
+#: src/gns/gnunet-gns.c:327
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:384
+#: src/gns/gnunet-gns.c:341
 msgid "GNUnet GNS access tool"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:280
+#: src/gns/gnunet-gns-fcfsd.c:449
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:333
+#: src/gns/gnunet-gns-fcfsd.c:478
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:377
+#: src/gns/gnunet-gns-fcfsd.c:522
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:439
+#: src/gns/gnunet-gns-fcfsd.c:584
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:498
+#: src/gns/gnunet-gns-fcfsd.c:646
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:514
+#: src/gns/gnunet-gns-fcfsd.c:662
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:550
+#: src/gns/gnunet-gns-fcfsd.c:698
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:558
+#: src/gns/gnunet-gns-fcfsd.c:706
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:741 src/gns/gnunet-gns-fcfsd.c:753
-#, fuzzy, c-format
-msgid "Option `%s' not specified in configuration section `%s'\n"
-msgstr "Inga applikationer definierade i konfiguration!\n"
-
-#: src/gns/gnunet-gns-fcfsd.c:763 src/namestore/gnunet-namestore.c:365
+#: src/gns/gnunet-gns-fcfsd.c:910 src/namestore/gnunet-namestore.c:364
 #, 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:773 src/namestore/gnunet-namestore.c:376
+#: src/gns/gnunet-gns-fcfsd.c:920 src/namestore/gnunet-namestore.c:375
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:789 src/gns/gnunet-gns-proxy.c:2901
+#: src/gns/gnunet-gns-fcfsd.c:936 src/gns/gnunet-gns-proxy.c:2887
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:823
+#: src/gns/gnunet-gns-fcfsd.c:970
 msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2532
+#: src/gns/gnunet-gns-proxy.c:2528
 #, 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:2561
+#: src/gns/gnunet-gns-proxy.c:2556
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/gns/gnunet-gns-proxy.c:3578
-msgid "listen on specified port"
+#: src/gns/gnunet-gns-proxy.c:3564
+msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3581
+#: src/gns/gnunet-gns-proxy.c:3567
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3596
+#: src/gns/gnunet-gns-proxy.c:3582
 msgid "GNUnet GNS proxy"
 msgstr ""
 
+#: src/gns/gnunet-service-gns.c:401
+#, c-format
+msgid "Records for name `%s' in zone %s too large to fit into DHT"
+msgstr ""
+
+#: src/gns/gnunet-service-gns.c:1197
+#, fuzzy
+msgid "Failed to connect to the namestore!\n"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
 #: src/hello/gnunet-hello.c:122
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3372,8 +3095,8 @@
 #: src/hostlist/hostlist-client.c:689 src/hostlist/hostlist-client.c:741
 #: src/hostlist/hostlist-client.c:750 src/hostlist/hostlist-client.c:871
 #: src/hostlist/hostlist-client.c:961 src/hostlist/hostlist-client.c:966
-#: src/transport/plugin_transport_http_client.c:110
-#: src/transport/plugin_transport_http_client.c:125
+#: src/transport/plugin_transport_http_client.c:994
+#: src/transport/plugin_transport_http_client.c:1009
 #, fuzzy, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
@@ -3608,27 +3331,27 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:561
+#: src/hostlist/hostlist-server.c:562
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/hostlist/hostlist-server.c:570
+#: src/hostlist/hostlist-server.c:571
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:584
+#: src/hostlist/hostlist-server.c:585
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/hostlist-server.c:624
+#: src/hostlist/hostlist-server.c:625
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/hostlist-server.c:666
+#: src/hostlist/hostlist-server.c:667
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -3653,30 +3376,30 @@
 msgid "help text"
 msgstr "hjälptext för -t"
 
-#: src/mesh/gnunet-service-mesh.c:7110
+#: src/mesh/gnunet-service-mesh.c:7703
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:7328 src/mesh/gnunet-service-mesh.c:7340
-#: src/mesh/gnunet-service-mesh.c:7352 src/mesh/gnunet-service-mesh.c:7364
-#: src/mesh/gnunet-service-mesh.c:7376 src/mesh/gnunet-service-mesh.c:7388
-#: src/mesh/gnunet-service-mesh.c:7400 src/mesh/gnunet-service-mesh.c:7412
+#: src/mesh/gnunet-service-mesh.c:7908
+#, fuzzy
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#: src/mesh/gnunet-service-mesh.c:7997 src/mesh/gnunet-service-mesh.c:8009
+#: src/mesh/gnunet-service-mesh.c:8021 src/mesh/gnunet-service-mesh.c:8033
+#: src/mesh/gnunet-service-mesh.c:8045 src/mesh/gnunet-service-mesh.c:8057
+#: src/mesh/gnunet-service-mesh.c:8069 src/mesh/gnunet-service-mesh.c:8081
 #, fuzzy, c-format
 msgid "Mesh service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:7424 src/mesh/gnunet-service-mesh.c:7435
+#: src/mesh/gnunet-service-mesh.c:8093 src/mesh/gnunet-service-mesh.c:8104
 #, fuzzy, c-format
 msgid ""
 "Mesh service is lacking key configuration settings (%s). Using default "
 "(%u).\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/mesh/gnunet-service-mesh.c:7446
-#, fuzzy
-msgid "Mesh service could not access hostkey.  Exiting.\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
-
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -3714,125 +3437,120 @@
 msgid "until"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:357
+#: src/namestore/gnunet-namestore.c:356
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:387
+#: src/namestore/gnunet-namestore.c:386
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore.c:395 src/namestore/gnunet-namestore.c:419
-#: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
-#: src/namestore/gnunet-namestore.c:519
+#: src/namestore/gnunet-namestore.c:394 src/namestore/gnunet-namestore.c:418
+#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:477
+#: src/namestore/gnunet-namestore.c:518
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore.c:396 src/namestore/gnunet-namestore.c:420
+#: src/namestore/gnunet-namestore.c:395 src/namestore/gnunet-namestore.c:419
 msgid "add/del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:409
+#: src/namestore/gnunet-namestore.c:408
 #, 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:447
+#: src/namestore/gnunet-namestore.c:446
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:456
+#: src/namestore/gnunet-namestore.c:455
 #, c-format
 msgid ""
 "Deletion requires either absolute time, or no time at all. Got relative time "
 "`%s' instead.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:467 src/namestore/gnunet-namestore.c:479
-#: src/namestore/gnunet-namestore.c:498
+#: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
+#: src/namestore/gnunet-namestore.c:497
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:497
+#: src/namestore/gnunet-namestore.c:496
 #, fuzzy, c-format
 msgid "No valid expiration time for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/namestore/gnunet-namestore.c:520
+#: src/namestore/gnunet-namestore.c:519
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:570
+#: src/namestore/gnunet-namestore.c:569
 #: src/peerinfo-tool/gnunet-peerinfo.c:875
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:611 src/transport/gnunet-transport.c:618
+#: src/namestore/gnunet-namestore.c:610 src/transport/gnunet-transport.c:617
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/namestore/gnunet-namestore.c:622
-#, c-format
-msgid "Option `%s' not given, but I need a zone key file!\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:627
+#: src/namestore/gnunet-namestore.c:625
 #, fuzzy, c-format
 msgid "Using default zone file `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/namestore/gnunet-namestore.c:679
+#: src/namestore/gnunet-namestore.c:677
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:682
+#: src/namestore/gnunet-namestore.c:680
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:685
+#: src/namestore/gnunet-namestore.c:683
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:688
+#: src/namestore/gnunet-namestore.c:686
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:691
+#: src/namestore/gnunet-namestore.c:689
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:694
+#: src/namestore/gnunet-namestore.c:692
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:697
+#: src/namestore/gnunet-namestore.c:695
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:700
+#: src/namestore/gnunet-namestore.c:698
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:703
+#: src/namestore/gnunet-namestore.c:701
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:706
+#: src/namestore/gnunet-namestore.c:704
 msgid "create or list non-authority record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:709
+#: src/namestore/gnunet-namestore.c:707
 msgid "filename with the zone key"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:720
+#: src/namestore/gnunet-namestore.c:718
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
@@ -3963,31 +3681,68 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:915
+#: src/nse/gnunet-nse-profiler.c:1009
 #, fuzzy
+msgid "limit to the number of connections to NSE services, 0 for none"
+msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#: src/nse/gnunet-nse-profiler.c:1012
+msgid "name of the file for writing connection information and statistics"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1015
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1018
+msgid "IP address of this system as seen by the rest of the testbed"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1021
+msgid "delay between queries to statistics during a round"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1024
+msgid "prefix of the filenames we use for writing the topology for each round"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1027
+msgid "name of the file for writing the main results"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1030
+msgid "Number of peers to run in each round, separated by commas"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1036
+msgid "delay between rounds"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1046
+#, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:925
+#: src/nse/gnunet-service-nse.c:938
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1381 src/nse/gnunet-service-nse.c:1400
-#: src/nse/gnunet-service-nse.c:1421
+#: src/nse/gnunet-service-nse.c:1389
+#, fuzzy, c-format
+msgid "NSE service could not access hostkey: %s\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#: src/nse/gnunet-service-nse.c:1403 src/nse/gnunet-service-nse.c:1478
+#: src/nse/gnunet-service-nse.c:1495
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1388
+#: src/nse/gnunet-service-nse.c:1485
 #, fuzzy
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/nse/gnunet-service-nse.c:1409
-#, fuzzy
-msgid "NSE service could not access hostkey.  Exiting.\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
-
 #: src/peerinfo/gnunet-service-peerinfo.c:134
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
@@ -4089,7 +3844,7 @@
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:833
+#: src/peerinfo-tool/gnunet-peerinfo.c:834
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
@@ -4287,11 +4042,15 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/testbed_api.c:246
+#: src/testbed/testbed_api.c:252
 #, 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:271
+msgid "Some operations are still pending. Cancelling them\n"
+msgstr ""
+
 #: src/testing/gnunet-testing.c:131
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
@@ -4336,256 +4095,59 @@
 msgid "name of the service to run"
 msgstr ""
 
-#: src/testing_old/helper.c:56
-#, fuzzy
-msgid "Peer is lacking HOSTKEY configuration setting.\n"
-msgstr "GNUnet-konfiguration"
-
-#: src/testing_old/helper.c:64
-#, fuzzy
-msgid "Could not access hostkey.\n"
-msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
-
-#: src/testing_old/testing.c:200
-msgid "`scp' does not seem to terminate (timeout copying config).\n"
-msgstr ""
-
-#: src/testing_old/testing.c:214 src/testing_old/testing.c:798
-#, fuzzy
-msgid "`scp' did not complete cleanly.\n"
-msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
-
-#: src/testing_old/testing.c:237
-#, fuzzy
-msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/testing_old/testing.c:238
-#, fuzzy
-msgid "Failed to create pipe for `ssh' process.\n"
-msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
-
-#: src/testing_old/testing.c:286
-#, fuzzy, c-format
-msgid "Could not start `%s' process to create hostkey.\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/testing_old/testing.c:293
-#, fuzzy
-msgid "Failed to start `gnunet-peerinfo' process.\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/testing_old/testing.c:294 src/testing_old/testing.c:471
-#, fuzzy
-msgid "Failed to start `ssh' process.\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/testing_old/testing.c:354
+#: src/testing/testing.c:198
 #, c-format
-msgid "Error reading from gnunet-peerinfo: %s\n"
-msgstr ""
-
-#: src/testing_old/testing.c:358
-#, fuzzy
-msgid "Malformed output from gnunet-peerinfo!\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/testing_old/testing.c:368
-#, fuzzy
-msgid "Failed to get hostkey!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/testing_old/testing.c:400
-msgid "`Failed while waiting for topology setup!\n"
-msgstr ""
-
-#: src/testing_old/testing.c:463
-#, fuzzy, c-format
-msgid "Could not start `%s' process to start GNUnet.\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/testing_old/testing.c:470
-#, fuzzy
-msgid "Failed to start `gnunet-arm' process.\n"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/testing_old/testing.c:493 src/testing_old/testing.c:600
-msgid "`gnunet-arm' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:494 src/testing_old/testing.c:601
-#: src/testing_old/testing.c:621
-msgid "`ssh' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:570
-msgid "Unable to get HELLO for peer!\n"
-msgstr ""
-
-#: src/testing_old/testing.c:620
-msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
-msgstr ""
-
-#: src/testing_old/testing.c:643 src/testing_old/testing.c:675
-msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:658 src/testing_old/testing.c:713
-#, fuzzy
-msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
-msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
-
-#: src/testing_old/testing.c:786
-msgid "`scp' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:948
-#, fuzzy, c-format
-msgid "Starting service %s for peer `%4s'\n"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/testing_old/testing.c:1207 src/testing_old/testing_group.c:6172
-#, fuzzy, c-format
-msgid "Could not start `%s' process to copy configuration directory.\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/testing_old/testing.c:1292 src/testing_old/testing.c:1359
-#, fuzzy, c-format
-msgid "Terminating peer `%4s'\n"
-msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
-
-#: src/testing_old/testing.c:1448
-#, fuzzy, c-format
-msgid "Setting d->dead on peer `%4s'\n"
-msgstr "Startade samling \"%s\".\n"
-
-#: src/testing_old/testing.c:1601
-msgid "Peer not yet running, can not change configuration at this point."
-msgstr ""
-
-#: src/testing_old/testing.c:1609
-#, fuzzy
-msgid "Failed to write new configuration to disk."
-msgstr "Kunde inte spara konfiguration!"
-
-#: src/testing_old/testing.c:1636
-#, fuzzy, c-format
-msgid "Could not start `%s' process to copy configuration file.\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/testing_old/testing.c:1639
-#, fuzzy
-msgid "Failed to copy new configuration to remote machine."
-msgstr "Kunde inte spara konfiguration!"
-
-#: src/testing_old/testing.c:1794
-#, fuzzy
-msgid "Peers failed to connect"
-msgstr "Misslyckades att ansluta till gnunetd.\n"
-
-#: src/testing_old/testing.c:1922
-#, fuzzy
-msgid "Failed to connect to core service of first peer!\n"
-msgstr "Misslyckades att starta samling.\n"
-
-#: src/testing_old/testing.c:2145
-msgid "Peers are not fully running yet, can not connect!\n"
-msgstr ""
-
-#: src/testing_old/testing_group.c:1895 src/testing_old/testing_group.c:1907
-#: src/testing_old/testing_group.c:2009 src/testing_old/testing_group.c:2066
-#: src/testing_old/testing_group.c:2153 src/testing_old/testing_group.c:2173
-#: src/testing_old/testing_group.c:2303
-#: src/testing_old/testing_peergroup.c:950
-#, fuzzy, c-format
-msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
-msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
-
-#: src/testing_old/testing_group.c:2161
-#, c-format
-msgid ""
-"Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
-"greater than 0\n"
-msgstr ""
-
-#: src/testing_old/testing_group.c:2878 src/testing_old/testing_group.c:3064
-#, c-format
-msgid ""
-"No `%s' specified in peer configuration in section `%s', cannot copy friends "
-"file!\n"
-msgstr ""
-
-#: src/testing_old/testing_group.c:3958
-msgid "Creating no allowed topology (all peers can connect at core level)\n"
-msgstr ""
-
-#: src/testing_old/testing_group.c:5227
-msgid "Unknown topology specification, can't connect peers!\n"
-msgstr ""
-
-#: src/testing_old/testing_group.c:5962
-#, fuzzy, c-format
-msgid "Could not read hostkeys file `%s'!\n"
-msgstr "Kunde inte skapa värdnyckel!\n"
-
-#: src/testing_old/testing_group.c:6029
-#, fuzzy, c-format
-msgid "Could not create configuration for peer number %u on `%s'!\n"
-msgstr "Kunde inte komma åt namnrymdsinformation.\n"
-
-#: src/testing/testing.c:188
-#, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:204
+#: src/testing/testing.c:214
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:468
+#: src/testing/testing.c:509
 #, fuzzy, c-format
 msgid "Key number %u does not exist\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/testing/testing.c:477
+#: src/testing/testing.c:518
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "Fel vid nedladdning: %s\n"
 
-#: src/testing/testing.c:788
+#: src/testing/testing.c:829
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/testing/testing.c:799
+#: src/testing/testing.c:840
 #, 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:813
+#: src/testing/testing.c:854
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/testing/testing.c:846
+#: src/testing/testing.c:887
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "Kunde inte skapa användarkonto:"
 
-#: src/testing/testing.c:864
+#: src/testing/testing.c:905
 #, 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:925
+#: src/testing/testing.c:966
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/testing/testing.c:1088
+#: src/testing/testing.c:1129
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -4609,147 +4171,143 @@
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1026
-#, c-format
-msgid "Option `%s' in section `%s' not specified!\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1038
 #, 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:1045
+#: src/topology/gnunet-daemon-topology.c:1044
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1054
+#: src/topology/gnunet-daemon-topology.c:1053
 #, 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:1062
+#: src/topology/gnunet-daemon-topology.c:1061
 #, 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:1082
+#: src/topology/gnunet-daemon-topology.c:1081
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1095
+#: src/topology/gnunet-daemon-topology.c:1094
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1105
+#: src/topology/gnunet-daemon-topology.c:1104
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1111
+#: src/topology/gnunet-daemon-topology.c:1110
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1121
+#: src/topology/gnunet-daemon-topology.c:1120
 #, fuzzy
 msgid "# friends in configuration"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/topology/gnunet-daemon-topology.c:1127
+#: src/topology/gnunet-daemon-topology.c:1126
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1134
+#: src/topology/gnunet-daemon-topology.c:1133
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1169
+#: src/topology/gnunet-daemon-topology.c:1168
 #, fuzzy
 msgid "# HELLO messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/topology/gnunet-daemon-topology.c:1224
+#: src/topology/gnunet-daemon-topology.c:1223
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1366
+#: src/topology/gnunet-daemon-topology.c:1365
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:246
+#: src/transport/gnunet-service-transport_blacklist.c:245
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:252
+#: src/transport/gnunet-service-transport_blacklist.c:251
 #, c-format
 msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:263
+#: src/transport/gnunet-service-transport_blacklist.c:262
 #, fuzzy, c-format
 msgid "Failed to read blacklist from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:284
-#: src/transport/gnunet-service-transport_blacklist.c:308
+#: src/transport/gnunet-service-transport_blacklist.c:283
+#: src/transport/gnunet-service-transport_blacklist.c:307
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:295
-#: src/transport/gnunet-service-transport_blacklist.c:331
+#: src/transport/gnunet-service-transport_blacklist.c:294
+#: src/transport/gnunet-service-transport_blacklist.c:330
 #, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:345
+#: src/transport/gnunet-service-transport_blacklist.c:344
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr "Syntaxfel i konfigurationsfil \"%s\" på rad %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:359
+#: src/transport/gnunet-service-transport_blacklist.c:358
 #, c-format
 msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:514
-#: src/transport/gnunet-service-transport_blacklist.c:751
+#: src/transport/gnunet-service-transport_blacklist.c:513
+#: src/transport/gnunet-service-transport_blacklist.c:750
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:167
+#: src/transport/gnunet-service-transport.c:177
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer "
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport.c:242
+#: src/transport/gnunet-service-transport.c:252
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# byte krypterade"
 
-#: src/transport/gnunet-service-transport.c:289
+#: src/transport/gnunet-service-transport.c:299
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
 
-#: src/transport/gnunet-service-transport.c:590
+#: src/transport/gnunet-service-transport.c:604
+#, fuzzy, c-format
+msgid "Transport service could not access hostkey: %s. Exiting.\n"
+msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#: src/transport/gnunet-service-transport.c:674
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:599
-msgid "Transport service could not access hostkey.  Exiting.\n"
-msgstr ""
-
 #: src/transport/gnunet-service-transport_clients.c:352
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
@@ -4956,152 +4514,250 @@
 
 #: src/transport/gnunet-transport.c:328
 #, c-format
-msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
+msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:335
-#, c-format
-msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
-msgstr ""
+#: src/transport/gnunet-transport.c:336
+#, fuzzy, c-format
+msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:374
+#: src/transport/gnunet-transport.c:375
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:394
+#: src/transport/gnunet-transport.c:395
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:426
+#: src/transport/gnunet-transport.c:427
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "\"%s\" ansluten till \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:506
+#: src/transport/gnunet-transport.c:505
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:529
+#: src/transport/gnunet-transport.c:528
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Jag är ändpunkt \"%s\".\n"
 
-#: src/transport/gnunet-transport.c:536
+#: src/transport/gnunet-transport.c:535
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:564
+#: src/transport/gnunet-transport.c:563
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# av anslutna parter"
 
-#: src/transport/gnunet-transport.c:633
+#: src/transport/gnunet-transport.c:632
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:716
+#: src/transport/gnunet-transport.c:715
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:719
+#: src/transport/gnunet-transport.c:718
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:722
+#: src/transport/gnunet-transport.c:721
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/transport/gnunet-transport.c:728
+#: src/transport/gnunet-transport.c:727
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/transport/gnunet-transport.c:732
+#: src/transport/gnunet-transport.c:731
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:735
+#: src/transport/gnunet-transport.c:734
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:746
+#: src/transport/gnunet-transport.c:745
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/transport/plugin_transport_http.c:1119
+#: src/transport/plugin_transport_http.c:817
+#: src/transport/plugin_transport_http_server.c:2513
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1168
+#: src/transport/plugin_transport_http.c:866
+#: src/transport/plugin_transport_http_server.c:2281
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "Inga applikationer definierade i konfiguration!\n"
 
-#: src/transport/plugin_transport_http.c:1200 src/util/service.c:1051
+#: src/transport/plugin_transport_http.c:898
+#: src/transport/plugin_transport_http_server.c:2313 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/transport/plugin_transport_http.c:1217 src/util/service.c:1068
+#: src/transport/plugin_transport_http.c:915
+#: src/transport/plugin_transport_http_server.c:2330 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/transport/plugin_transport_http.c:1322
+#: src/transport/plugin_transport_http.c:1020
+#: src/transport/plugin_transport_http_server.c:2441
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1407
+#: src/transport/plugin_transport_http.c:1133
+#: src/transport/plugin_transport_http_server.c:2609
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1420
+#: src/transport/plugin_transport_http.c:1146
+#: src/transport/plugin_transport_http_server.c:2620
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr " gconfig\tGTK-konfiguration\n"
 
-#: src/transport/plugin_transport_http.c:1431
+#: src/transport/plugin_transport_http.c:1157
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1451
+#: src/transport/plugin_transport_http.c:1177
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1481
+#: src/transport/plugin_transport_http.c:1206
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:621
+#: src/transport/plugin_transport_http.c:1223
+#: src/transport/plugin_transport_http_server.c:2702
+#, fuzzy, c-format
+msgid "Using external hostname `%s'\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/transport/plugin_transport_http.c:1228
+msgid "No external hostname configured\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_client.c:1419
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:178
+#: src/transport/plugin_transport_http_client.c:1550
+#: src/transport/plugin_transport_http_server.c:2826
+#, fuzzy, c-format
+msgid "Shutting down plugin `%s'\n"
+msgstr "Testar transport(er) %s\n"
+
+#: src/transport/plugin_transport_http_client.c:1575
+#: src/transport/plugin_transport_http_server.c:2885
+#, 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:1603
+#: src/transport/plugin_transport_http_server.c:2732
+#, 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:1302
+#, 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:1560
+#, c-format
+msgid "Accepting connection (%u of %u) from `%s'\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:1568
+#, c-format
+msgid ""
+"Server reached maximum number connections (%u), rejecting new connection\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:1869
+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:202
+#: src/transport/plugin_transport_http_server.c:1893
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
+#: src/transport/plugin_transport_http_server.c:2588
+#, c-format
+msgid "IPv4 support is %s\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2602
+#, c-format
+msgid "IPv6 support is %s\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2627
+#, fuzzy, c-format
+msgid "Using port %u\n"
+msgstr "Testar transport(er) %s\n"
+
+#: src/transport/plugin_transport_http_server.c:2642
+#, 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:2652
+#, fuzzy, c-format
+msgid "Binding to IPv4 address %s\n"
+msgstr "Ogiltigt svar på \"%s\".\n"
+
+#: src/transport/plugin_transport_http_server.c:2673
+#, 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:2683
+#, fuzzy, c-format
+msgid "Binding to IPv6 address %s\n"
+msgstr "Ogiltigt svar på \"%s\".\n"
+
+#: src/transport/plugin_transport_http_server.c:2718
+#, fuzzy, c-format
+msgid "Notifying transport only about hostname `%s'\n"
+msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
 #: src/transport/plugin_transport_smtp.c:370
 #, fuzzy, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -5168,7 +4824,7 @@
 #: src/transport/plugin_transport_tcp.c:774
 #: src/transport/plugin_transport_tcp.c:963
 #: src/transport/plugin_transport_tcp.c:1807
-#: src/transport/plugin_transport_tcp.c:2424
+#: src/transport/plugin_transport_tcp.c:2423
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# sessionsnycklar accepterade"
@@ -5210,8 +4866,8 @@
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2313 src/util/service.c:946
-#: src/util/service.c:952
+#: src/transport/plugin_transport_tcp.c:2313 src/util/service.c:948
+#: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -5221,21 +4877,16 @@
 msgid "Failed to start service.\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/transport/plugin_transport_tcp.c:2389
-#, fuzzy, c-format
-msgid "Failed to find option %s in section %s!\n"
-msgstr "Misslyckades att binda till UDP-port %d.\n"
-
-#: src/transport/plugin_transport_tcp.c:2412
+#: src/transport/plugin_transport_tcp.c:2411
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2416
+#: src/transport/plugin_transport_tcp.c:2415
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2420
+#: src/transport/plugin_transport_tcp.c:2419
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5250,19 +4901,19 @@
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:392
+#: src/transport/plugin_transport_udp_broadcasting.c:394
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1903
+#: src/transport/plugin_transport_udp.c:1965
 #, 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:1917
+#: src/transport/plugin_transport_udp.c:1979
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5270,22 +4921,22 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2162
+#: src/transport/plugin_transport_udp.c:2192
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "Misslyckades att binda till UDP6-port %d.\n"
 
-#: src/transport/plugin_transport_udp.c:2328
+#: src/transport/plugin_transport_udp.c:2268
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2371
+#: src/transport/plugin_transport_udp.c:2311
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/transport/plugin_transport_unix.c:1346
+#: src/transport/plugin_transport_unix.c:1355
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -5301,87 +4952,77 @@
 
 #: src/transport/plugin_transport_wlan.c:625
 #: src/transport/plugin_transport_wlan.c:675
-#: src/transport/plugin_transport_wlan.c:1695
+#: src/transport/plugin_transport_wlan.c:1720
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/transport/plugin_transport_wlan.c:748
+#: src/transport/plugin_transport_wlan.c:749
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:766
+#: src/transport/plugin_transport_wlan.c:773
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:866
-#: src/transport/plugin_transport_wlan.c:947
-#: src/transport/plugin_transport_wlan.c:1697
+#: src/transport/plugin_transport_wlan.c:873
+#: src/transport/plugin_transport_wlan.c:954
+#: src/transport/plugin_transport_wlan.c:1722
 #, fuzzy
 msgid "# WLAN MAC endpoints allocated"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1118
+#: src/transport/plugin_transport_wlan.c:1135
 #, fuzzy
 msgid "# HELLO messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1139
+#: src/transport/plugin_transport_wlan.c:1156
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1149
+#: src/transport/plugin_transport_wlan.c:1166
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# byte mottogs via TCP"
 
-#: src/transport/plugin_transport_wlan.c:1206
+#: src/transport/plugin_transport_wlan.c:1223
 #, fuzzy
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/plugin_transport_wlan.c:1305
+#: src/transport/plugin_transport_wlan.c:1324
 #, fuzzy
 msgid "# DATA messages received via WLAN"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1340
+#: src/transport/plugin_transport_wlan.c:1359
 #, fuzzy
 msgid "# WLAN DATA messages processed"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/transport/plugin_transport_wlan.c:1401
+#: src/transport/plugin_transport_wlan.c:1420
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# byte skickade via UDP"
 
-#: src/transport/plugin_transport_wlan.c:1510
+#: src/transport/plugin_transport_wlan.c:1529
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1667
-#, fuzzy, c-format
-msgid "Invalid configuration option `%s' in section `%s'\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
-#: src/transport/plugin_transport_wlan.c:1676
+#: src/transport/plugin_transport_wlan.c:1703
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1686
-#, fuzzy, c-format
-msgid "Missing configuration option `%s' in section `%s'\n"
-msgstr "Konfigurationsfil \"%s\" skapad.\n"
-
 #: src/transport/transport_api.c:575
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Mottog skadat meddelande från motpart \"%s\"i %s:%d.\n"
 
-#: src/transport/transport-testing.c:589
+#: src/transport/transport-testing.c:590
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
@@ -5416,12 +5057,12 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:982
+#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:984
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:278 src/util/client.c:754 src/util/service.c:986
+#: src/util/client.c:278 src/util/client.c:754 src/util/service.c:988
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
@@ -5456,23 +5097,23 @@
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1008
+#: src/util/common_logging.c:258 src/util/common_logging.c:1007
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1006
+#: src/util/common_logging.c:260 src/util/common_logging.c:1005
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1004
+#: src/util/common_logging.c:262 src/util/common_logging.c:1003
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1002
+#: src/util/common_logging.c:264 src/util/common_logging.c:1001
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/common_logging.c:266 src/util/common_logging.c:1010
+#: src/util/common_logging.c:266 src/util/common_logging.c:1009
 msgid "NONE"
 msgstr ""
 
@@ -5486,18 +5127,29 @@
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1011
+#: src/util/common_logging.c:1010
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1113
+#: src/util/common_logging.c:1149
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1151
+#: src/util/common_logging.c:1187
 msgid "invalid address"
 msgstr ""
 
+#: src/util/common_logging.c:1205
+#, fuzzy, c-format
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#: src/util/common_logging.c:1226
+#, fuzzy, c-format
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
+msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
+
 #: src/util/configuration.c:259
 #, fuzzy, c-format
 msgid "Syntax error while deserializing operation at line %u\n"
@@ -5548,68 +5200,76 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_random.c:284
+#: src/util/crypto_random.c:313
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:313
+#: src/util/crypto_random.c:342
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 
-#: src/util/crypto_rsa.c:635 src/util/crypto_rsa.c:651
-#: src/util/crypto_rsa.c:833
+#: src/util/crypto_rsa.c:640
 #, fuzzy, c-format
-msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgid ""
+"File `%s' does not contain a valid private key (too long, %llu bytes).  "
+"Deleting it.\n"
 msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
 
-#: src/util/crypto_rsa.c:731 src/util/crypto_rsa.c:778
+#: src/util/crypto_rsa.c:657
 #, fuzzy, c-format
+msgid ""
+"File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
+"Deleting it.\n"
+msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
+
+#: src/util/crypto_rsa.c:755 src/util/crypto_rsa.c:802
+#, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/crypto_rsa.c:736
+#: src/util/crypto_rsa.c:760
 #, 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_rsa.c:754
+#: src/util/crypto_rsa.c:778
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:782 src/util/crypto_rsa.c:818
+#: src/util/crypto_rsa.c:806 src/util/crypto_rsa.c:842
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:813
+#: src/util/crypto_rsa.c:837
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:851
+#: src/util/crypto_rsa.c:857
 #, fuzzy, c-format
+msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgstr "Filen \"%s\" innehåller ingen pseudonym.\n"
+
+#: src/util/crypto_rsa.c:875
+#, fuzzy, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr "Anrop till \"%s\" med nyckel \"%s\".\n"
 
-#: src/util/crypto_rsa.c:926
+#: src/util/crypto_rsa.c:948
 msgid "interrupted by shutdown"
 msgstr ""
 
-#: src/util/crypto_rsa.c:935
+#: src/util/crypto_rsa.c:959
 #, fuzzy
-msgid "internal error"
-msgstr "Okänt fel.\n"
-
-#: src/util/crypto_rsa.c:944 src/util/crypto_rsa.c:951
-#, fuzzy
 msgid "gnunet-rsa failed"
 msgstr "gnunet-update misslyckades!"
 
-#: src/util/crypto_rsa.c:1332
+#: src/util/crypto_rsa.c:1347
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
@@ -5625,7 +5285,7 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
 
-#: src/util/disk.c:1494 src/util/service.c:1665
+#: src/util/disk.c:1494 src/util/service.c:1667
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
@@ -5703,11 +5363,48 @@
 "Argument som är obligatoriska för långa flaggor är också obligatoriska för "
 "korta flaggor.\n"
 
-#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:286
+#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:316
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
+#: src/util/getopt_helpers.c:288
+#, fuzzy, c-format
+msgid "You must pass relative time to the `%s' option.\n"
+msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
+
+#: src/util/gnunet-config.c:90
+#, c-format
+msgid "--section argument is required\n"
+msgstr ""
+
+#: src/util/gnunet-config.c:133
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr ""
+
+#: src/util/gnunet-config.c:160
+msgid "obtain option of value as a filename (with $-expansion)"
+msgstr ""
+
+#: src/util/gnunet-config.c:163
+msgid "name of the section to access"
+msgstr ""
+
+#: src/util/gnunet-config.c:166
+#, fuzzy
+msgid "name of the option to access"
+msgstr "Visa värde av alternativet"
+
+#: src/util/gnunet-config.c:169
+msgid "value to set"
+msgstr ""
+
+#: src/util/gnunet-config.c:179
+#, fuzzy
+msgid "Manipulate GNUnet configuration files"
+msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
+
 #: src/util/gnunet-resolver.c:148
 msgid "perform a reverse lookup"
 msgstr ""
@@ -5716,24 +5413,56 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:104
+#: src/util/gnunet-rsa.c:114
+#, fuzzy, c-format
+msgid "Failed to open `%s': %s\n"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/util/gnunet-rsa.c:120
 #, c-format
+msgid "Generating %u keys, please wait"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:138
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Failed to write to `%s': %s\n"
+msgstr "Fel vid %s:%d.\n"
+
+#: src/util/gnunet-rsa.c:150
+#, fuzzy, c-format
+msgid "Finished!\n"
+msgstr "Slutför"
+
+#: src/util/gnunet-rsa.c:173
+#, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:154
+#: src/util/gnunet-rsa.c:230
+msgid "create COUNT public-private key pairs (for testing)"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:233
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:157
+#: src/util/gnunet-rsa.c:236
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:160
+#: src/util/gnunet-rsa.c:239
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:170
+#: src/util/gnunet-rsa.c:242
+msgid ""
+"use insecure, weak random number generator for key generation (for testing "
+"only)"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:252
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -5748,32 +5477,56 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr ""
 
-#: src/util/helper.c:254
+#: src/util/gnunet-uri.c:90
+#, c-format
+msgid "No URI specified on command line\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:95
 #, fuzzy, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
+
+#: src/util/gnunet-uri.c:102
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:112
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:174
+msgid "Perform default-actions for GNUnet URIs"
+msgstr ""
+
+#: src/util/helper.c:260
+#, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/helper.c:274
+#: src/util/helper.c:280
 #, c-format
 msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/util/helper.c:290
+#: src/util/helper.c:296
 #, c-format
 msgid "Got %u bytes from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:299
+#: src/util/helper.c:305
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/util/helper.c:337
+#: src/util/helper.c:343
 #, fuzzy, c-format
 msgid "Starting HELPER process `%s'\n"
 msgstr "Startade samling \"%s\".\n"
 
-#: src/util/helper.c:476
+#: src/util/helper.c:496
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Fel vid skapandet av användare"
@@ -5879,22 +5632,22 @@
 msgstr ""
 
 # drive = hard drive ?
-#: src/util/server.c:468
+#: src/util/server.c:431
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/util/server.c:477
+#: src/util/server.c:440
 #, 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:488
+#: src/util/server.c:451
 #, 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:819
+#: src/util/server.c:836
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -5927,95 +5680,95 @@
 msgid "Wrong format `%s' for network\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
 
-#: src/util/service.c:705
+#: src/util/service.c:707
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:710
+#: src/util/service.c:712
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/util/service.c:717
+#: src/util/service.c:719
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:772
+#: src/util/service.c:774
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:809
+#: src/util/service.c:811
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:927
+#: src/util/service.c:929
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1005
+#: src/util/service.c:1007
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1022
+#: src/util/service.c:1024
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1256
+#: src/util/service.c:1258
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1307 src/util/service.c:1325
+#: src/util/service.c:1309 src/util/service.c:1327
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1352
+#: src/util/service.c:1354
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1521
+#: src/util/service.c:1523
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/util/service.c:1554
+#: src/util/service.c:1556
 #, 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:1603
+#: src/util/service.c:1605
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1607
+#: src/util/service.c:1609
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1611
+#: src/util/service.c:1613
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1666
+#: src/util/service.c:1668
 msgid "No such user"
 msgstr ""
 
-#: src/util/service.c:1679
+#: src/util/service.c:1681
 #, 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:1744
+#: src/util/service.c:1746
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6037,57 +5790,57 @@
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:626
+#: src/util/strings.c:631
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:631
+#: src/util/strings.c:635
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:635
+#: src/util/strings.c:641
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:639
+#: src/util/strings.c:647
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:643
+#: src/util/strings.c:653
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:648
+#: src/util/strings.c:660
 #, fuzzy
 msgid "day"
 msgstr " dagar"
 
-#: src/util/strings.c:650
+#: src/util/strings.c:662
 #, fuzzy
 msgid "days"
 msgstr " dagar"
 
-#: src/util/strings.c:674
+#: src/util/strings.c:689
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1063
+#: src/util/strings.c:1078
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1071
+#: src/util/strings.c:1086
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1077
+#: src/util/strings.c:1092
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1084
+#: src/util/strings.c:1099
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1093
+#: src/util/strings.c:1108
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
@@ -6266,23 +6019,273 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:515 src/include/gnunet_common.h:520
-#: src/include/gnunet_common.h:526
+#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
+#: src/include/gnunet_common.h:591
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/include/gnunet_common.h:536
+#: src/include/gnunet_common.h:601
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:557 src/include/gnunet_common.h:564
+#: src/include/gnunet_common.h:622 src/include/gnunet_common.h:629
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "\"%s\" misslyckades för fil \"%s\" vid %s:%d med fel: %s\n"
 
 #, fuzzy
+#~ msgid "Asked to start service `%s' within %llu ms\n"
+#~ msgstr "\"%s\": Mottog inte meddelande inom %llu ms.\n"
+
+#, fuzzy
+#~ msgid "Stopping service `%s' within %llu ms\n"
+#~ msgstr "Inget svar mottaget inom %llums.\n"
+
+#, fuzzy
+#~ msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#, fuzzy
+#~ msgid "Could not transmit confirmation receipt\n"
+#~ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#, fuzzy
+#~ msgid "Unknown message type: '%u'\n"
+#~ msgstr "Okänd operation \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Configuration option `%s' in section `%s' missing\n"
+#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#, fuzzy
+#~ msgid "Failed to access chat home directory `%s'\n"
+#~ msgstr "Filformatsfel (inte en GNUnet-katalog?)\n"
+
+#, fuzzy
+#~ msgid "Failed to create/open key in file `%s'\n"
+#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#, fuzzy
+#~ msgid "Could not serialize metadata\n"
+#~ 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"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said to you: %s\n"
+#~ msgstr "\"%s\" %s misslyckades: %s\n"
+
+# drive = hard drive ?
+#, fuzzy
+#~ msgid "(%s) `%s' said for sure: %s\n"
+#~ msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+
+# drive = hard drive ?
+#, fuzzy
+#~ msgid "(%s) `%s' said to you for sure: %s\n"
+#~ msgstr "\"%s\" misslyckades för enhet %s: %u\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said off the record: %s\n"
+#~ msgstr "\"%s\" misslyckades vid %s:%d med fel: %s\n"
+
+#, fuzzy
+#~ msgid "Could not change username\n"
+#~ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
+
+#, fuzzy
+#~ msgid "Joining room `%s' as user `%s'...\n"
+#~ msgstr "Ogiltigt svar till \"%s\" från motpart \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Changed username to `%s'\n"
+#~ msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
+
+#, fuzzy
+#~ msgid "Unknown command `%s'\n"
+#~ msgstr "Okänd operation \"%s\"\n"
+
+#, fuzzy
+#~ msgid "You must specify a nickname\n"
+#~ msgstr "Du måste ange en mottagare!\n"
+
+#, fuzzy
+#~ msgid "Failed to join room `%s'\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Failed to queue a message notification\n"
+#~ msgstr "Kunde inte spara konfiguration!"
+
+#, fuzzy
+#~ msgid "Failed to queue a join notification\n"
+#~ msgstr "Kunde inte spara konfiguration!"
+
+#, fuzzy
+#~ msgid "Failed to queue a confirmation receipt\n"
+#~ msgstr "Kunde inte spara konfiguration!"
+
+#, fuzzy
+#~ msgid "Failed to queue a leave notification\n"
+#~ 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"
+
+#, fuzzy
+#~ msgid "Configuration fails to specify `%s' in section `%s'\n"
+#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#, fuzzy
+#~ msgid "Failed to start daemon: %s\n"
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy
+#~ msgid "Configuration option `%s' in section `%s' missing.\n"
+#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#, fuzzy
+#~ msgid "Configuration fails to specify `%s', assuming default value."
+#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#, fuzzy
+#~ msgid "Key file `%s' for private zone does not exist!\n"
+#~ msgstr "antal meddelanden att använda per iteration"
+
+#, fuzzy
+#~ msgid "Option `%s' not specified in configuration section `%s'\n"
+#~ msgstr "Inga applikationer definierade i konfiguration!\n"
+
+#, fuzzy
+#~ msgid "Peer is lacking HOSTKEY configuration setting.\n"
+#~ msgstr "GNUnet-konfiguration"
+
+#, fuzzy
+#~ msgid "Could not access hostkey.\n"
+#~ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
+
+#, fuzzy
+#~ msgid "`scp' did not complete cleanly.\n"
+#~ msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
+
+#, fuzzy
+#~ msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy
+#~ msgid "Failed to create pipe for `ssh' process.\n"
+#~ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to create hostkey.\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy
+#~ msgid "Failed to start `gnunet-peerinfo' process.\n"
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy
+#~ msgid "Failed to start `ssh' process.\n"
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy
+#~ msgid "Malformed output from gnunet-peerinfo!\n"
+#~ 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"
+
+#, fuzzy
+#~ msgid "Failed to start `gnunet-arm' process.\n"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
+#~ msgstr "\"%s\" är inte ansluten till någon ändpunkt.\n"
+
+#, fuzzy
+#~ msgid "Starting service %s for peer `%4s'\n"
+#~ msgstr "Startade samling \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to copy configuration directory.\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy
+#~ msgid "Terminating peer `%4s'\n"
+#~ msgstr "Åtkomst nekad för \"%s\" vid %s:%d.\n"
+
+#, fuzzy
+#~ msgid "Setting d->dead on peer `%4s'\n"
+#~ msgstr "Startade samling \"%s\".\n"
+
+#, fuzzy
+#~ msgid "Failed to write new configuration to disk."
+#~ msgstr "Kunde inte spara konfiguration!"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to copy configuration file.\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy
+#~ msgid "Failed to copy new configuration to remote machine."
+#~ msgstr "Kunde inte spara konfiguration!"
+
+#, fuzzy
+#~ msgid "Peers failed to connect"
+#~ msgstr "Misslyckades att ansluta till gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to core service of first peer!\n"
+#~ msgstr "Misslyckades att starta samling.\n"
+
+#, fuzzy
+#~ msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
+#~ msgstr "Konfigurationsfil \"%s\" hittades inte.  Kör \"gnunet-setup -d\"!\n"
+
+#, fuzzy
+#~ msgid "Could not read hostkeys file `%s'!\n"
+#~ msgstr "Kunde inte skapa värdnyckel!\n"
+
+#, fuzzy
+#~ msgid "Could not create configuration for peer number %u on `%s'!\n"
+#~ msgstr "Kunde inte komma åt namnrymdsinformation.\n"
+
+#, fuzzy
+#~ msgid "Failed to find option %s in section %s!\n"
+#~ msgstr "Misslyckades att binda till UDP-port %d.\n"
+
+#, fuzzy
+#~ msgid "Invalid configuration option `%s' in section `%s'\n"
+#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#, fuzzy
+#~ msgid "Missing configuration option `%s' in section `%s'\n"
+#~ msgstr "Konfigurationsfil \"%s\" skapad.\n"
+
+#, fuzzy
+#~ msgid "internal error"
+#~ msgstr "Okänt fel.\n"
+
+#, fuzzy
 #~ msgid "Could not create namespace `%s'\n"
 #~ msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
@@ -7322,9 +7325,6 @@
 #~ msgid "specifies after how many MS to time-out"
 #~ msgstr "anger timeout efter antal MS"
 
-#~ msgid "Testing transport(s) %s\n"
-#~ msgstr "Testar transport(er) %s\n"
-
 #~ msgid "Available transport(s): %s\n"
 #~ msgstr "Tillgängliga transport(er): %s\n"
 
@@ -7408,9 +7408,6 @@
 #~ msgstr ""
 #~ "Kunde inte slå upp namn för HTTP-proxy \"%s\". Försöker utan proxy.\n"
 
-#~ msgid "Maximum number of chat clients reached.\n"
-#~ msgstr "Maximalt antal chattklienter uppnått.\n"
-
 #~ msgid "Now %d of %d chat clients at this node.\n"
 #~ msgstr "Nu är det %d av %d chattklienter på den här noden.\n"
 
@@ -7462,15 +7459,9 @@
 #~ msgid "Failed to send `%s'.  Closing connection.\n"
 #~ msgstr "Misslyckades att skicka \"%s\".  Stänger anslutning.\n"
 
-#~ msgid "Received invalid `%s' request (size %d)\n"
-#~ msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
-
 #~ msgid "Received invalid `%s' request (wrong table)\n"
 #~ msgstr "Mottog ogiltig \"%s\" begäran (fel tabell)\n"
 
-#~ msgid "Received unknown request type %d at %s:%d\n"
-#~ msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
-
 #~ msgid "gnunetd signaled error in response to `%s' message\n"
 #~ msgstr "gnunetd signalerade fel i svar till \"%s\" meddelande\n"
 
@@ -7605,9 +7596,6 @@
 #~ msgid "Show _data"
 #~ msgstr "Visa _data"
 
-#~ msgid "Show value of the option"
-#~ msgstr "Visa värde av alternativet"
-
 #~ msgid "Show all _options"
 #~ msgstr "Visa alla a_lternativ"
 
@@ -7748,9 +7736,6 @@
 #~ msgid "CPU usage"
 #~ msgstr "CPU-användning"
 
-#~ msgid "Finish"
-#~ msgstr "Slutför"
-
 #~ msgid "Question"
 #~ msgstr "Fråga"
 

Modified: gnunet/po/vi.po
===================================================================
--- gnunet/po/vi.po     2012-09-27 19:36:14 UTC (rev 24062)
+++ gnunet/po/vi.po     2012-09-27 19:40:20 UTC (rev 24063)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-08-17 00:17+0200\n"
+"POT-Creation-Date: 2012-09-27 21:17+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"
@@ -23,53 +23,6 @@
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:354
-#, fuzzy, c-format
-msgid "Configuration failes 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/arm/arm_api.c:368
-#, 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/arm/arm_api.c:437
-#, c-format
-msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
-msgstr ""
-
-#: src/arm/arm_api.c:490
-#, c-format
-msgid "Requesting start of service `%s'.\n"
-msgstr ""
-
-#: src/arm/arm_api.c:491
-#, c-format
-msgid "Requesting termination of service `%s'.\n"
-msgstr ""
-
-#: src/arm/arm_api.c:512
-#, c-format
-msgid "Error while trying to transmit request to start `%s' to ARM\n"
-msgstr ""
-
-#: src/arm/arm_api.c:513
-#, c-format
-msgid "Error while trying to transmit request to stop `%s' to ARM\n"
-msgstr ""
-
-#: src/arm/arm_api.c:547
-#, fuzzy, c-format
-msgid "Asked to start service `%s' within %llu ms\n"
-msgstr "« %s »: Chưa nhận thông báo sau %llu miligiây.\n"
-
-#: src/arm/arm_api.c:620
-#, c-format
-msgid "Stopping service `%s' within %llu ms\n"
-msgstr ""
-
 #: src/arm/gnunet-arm.c:166
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
@@ -124,22 +77,17 @@
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:229
+#: src/arm/gnunet-arm.c:230
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "Cổng để liên lạc với giao diện người dùng GNUnet"
 
-#: src/arm/gnunet-arm.c:232
+#: src/arm/gnunet-arm.c:233
 #, fuzzy
 msgid "Running services:\n"
 msgstr "Đang nạp và khởi động dùng « %s ».\n"
 
-#: src/arm/gnunet-arm.c:256
-#, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:264 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:384
+#: src/arm/gnunet-arm.c:263 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:385
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
@@ -153,55 +101,55 @@
 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:418
+#: src/arm/gnunet-arm.c:416
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:420
+#: src/arm/gnunet-arm.c:418
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:422
+#: src/arm/gnunet-arm.c:420
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:424
+#: src/arm/gnunet-arm.c:422
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:427
+#: src/arm/gnunet-arm.c:425
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "hủy cài đặt dịch vụ GNUnet"
 
-#: src/arm/gnunet-arm.c:430
+#: src/arm/gnunet-arm.c:428
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:432
+#: src/arm/gnunet-arm.c:430
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:435
+#: src/arm/gnunet-arm.c:433
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "thời gian chờ sự hoàn thành của một lần lặp (theo miligiây)"
 
-#: src/arm/gnunet-arm.c:437
+#: src/arm/gnunet-arm.c:435
 msgid "List currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:439
+#: src/arm/gnunet-arm.c:437
 msgid "Don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:441
+#: src/arm/gnunet-arm.c:439
 msgid "Don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:455
+#: src/arm/gnunet-arm.c:450
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -264,7 +212,7 @@
 
 #: src/arm/gnunet-service-arm.c:986
 #, fuzzy, c-format
-msgid "Service `%s' took %llu ms to terminate\n"
+msgid "Service `%s' took %s to terminate\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
 #: src/arm/gnunet-service-arm.c:1021
@@ -272,26 +220,17 @@
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1127
+#: src/arm/gnunet-service-arm.c:1214
 #, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not valid: %s\n"
-msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
-
-#: src/arm/gnunet-service-arm.c:1129
-msgid "option missing"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:1213
-#, 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:1224
+#: src/arm/gnunet-service-arm.c:1225
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1238
+#: src/arm/gnunet-service-arm.c:1239
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -320,283 +259,6 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "Đang nạp các truyền tải « %s »\n"
 
-#: src/chat/chat.c:175
-#, fuzzy
-msgid "Could not transmit confirmation receipt\n"
-msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
-
-#: src/chat/chat.c:283
-msgid "The current user must be the the first one joined\n"
-msgstr ""
-
-#: src/chat/chat.c:412
-#, fuzzy, c-format
-msgid "Unknown message type: '%u'\n"
-msgstr "\tKhông rõ miền tên « %s »\n"
-
-#: src/chat/chat.c:472
-#, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing\n"
-msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
-
-#: src/chat/chat.c:480
-#, fuzzy, c-format
-msgid "Failed to access chat home directory `%s'\n"
-msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
-
-#: src/chat/chat.c:498
-#, fuzzy, c-format
-msgid "Failed to create/open key in file `%s'\n"
-msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#: src/chat/chat.c:559
-#, fuzzy
-msgid "Could not serialize metadata\n"
-msgstr "Không thể tạo miền tên.\n"
-
-#: src/chat/chat.c:674
-#, fuzzy
-msgid "Failed to connect to the chat service\n"
-msgstr "Lỗi kết nối đến gnunetd.\n"
-
-#: src/chat/chat.c:680
-msgid "Undefined mandatory parameter: joinCallback\n"
-msgstr ""
-
-#: src/chat/chat.c:686
-msgid "Undefined mandatory parameter: messageCallback\n"
-msgstr ""
-
-#: src/chat/chat.c:692
-msgid "Undefined mandatory parameter: memberCallback\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:93
-msgid "Joined\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:125 src/chat/gnunet-chat.c:133
-#: src/chat/gnunet-chat.c:213 src/chat/gnunet-chat.c:253
-#: src/chat/gnunet-chat.c:329 src/chat/gnunet-chat.c:371
-#: src/chat/gnunet-chat.c:400 src/chat/gnunet-chat.c:700
-msgid "anonymous"
-msgstr "nặc danh"
-
-#: src/chat/gnunet-chat.c:144
-#, fuzzy, c-format
-msgid "(%s) `%s' said: %s\n"
-msgstr "« %s » nói: %s\n"
-
-#: src/chat/gnunet-chat.c:147 src/chat/gnunet-chat.c:150
-#, fuzzy, c-format
-msgid "(%s) `%s' said to you: %s\n"
-msgstr "« %s » nói cho bạn: %s\n"
-
-#: src/chat/gnunet-chat.c:153
-#, fuzzy, c-format
-msgid "(%s) `%s' said for sure: %s\n"
-msgstr "« %s » nói thật: %s\n"
-
-#: src/chat/gnunet-chat.c:156
-#, fuzzy, c-format
-msgid "(%s) `%s' said to you for sure: %s\n"
-msgstr "« %s » nói thật cho bạn: %s\n"
-
-#: src/chat/gnunet-chat.c:159
-#, fuzzy, c-format
-msgid "(%s) `%s' was confirmed that you received: %s\n"
-msgstr "« %s » xác nhận bạn đã nhận được: %s\n"
-
-#: src/chat/gnunet-chat.c:162
-#, fuzzy, c-format
-msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
-msgstr "« %s » xác nhận mà chỉ bạn đã nhận được: %s\n"
-
-#: src/chat/gnunet-chat.c:165
-#, fuzzy, c-format
-msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
-msgstr "« %s » xác nhận mà bạn đã nhận được từ họ : %s\n"
-
-#: src/chat/gnunet-chat.c:170
-#, fuzzy, c-format
-msgid ""
-"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
-msgstr "« %s » xác nhận mà chỉ bạn đa nhận được từ họ : %s\n"
-
-#: src/chat/gnunet-chat.c:173
-#, fuzzy, c-format
-msgid "(%s) `%s' said off the record: %s\n"
-msgstr "« %s » nói không chính thức: %s\n"
-
-#: src/chat/gnunet-chat.c:176
-#, fuzzy, c-format
-msgid "(%s) <%s> said using an unknown message type: %s\n"
-msgstr "<%s> đã nói bằng một kiểu tin nhẳn không rõ : %s\n"
-
-#: src/chat/gnunet-chat.c:217
-#, c-format
-msgid "'%s' acknowledged message #%d\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:260
-#, c-format
-msgid "`%s' entered the room\n"
-msgstr "« %s » vào phòng\n"
-
-#: src/chat/gnunet-chat.c:260
-#, c-format
-msgid "`%s' left the room\n"
-msgstr "« %s » rời phòng\n"
-
-#: src/chat/gnunet-chat.c:321 src/chat/gnunet-chat.c:363
-#, fuzzy
-msgid "Could not change username\n"
-msgstr "Không thể tạo miền tên.\n"
-
-#: src/chat/gnunet-chat.c:334 src/chat/gnunet-chat.c:702
-#, fuzzy, c-format
-msgid "Joining room `%s' as user `%s'...\n"
-msgstr "Đã vào phòng « %s » là người dùng « %s ».\n"
-
-#: src/chat/gnunet-chat.c:373
-#, fuzzy, c-format
-msgid "Changed username to `%s'\n"
-msgstr "Đã thay đổi tên người dùng thành « %s ».\n"
-
-#: src/chat/gnunet-chat.c:388
-#, c-format
-msgid "Users in room `%s': "
-msgstr "Người dùng trong phòng « %s »:"
-
-#: src/chat/gnunet-chat.c:434
-msgid "Syntax: /msg USERNAME MESSAGE"
-msgstr "Cú pháp: /msg TÊN_NGƯỜI_DÙNG TIN_NHẲN"
-
-#: src/chat/gnunet-chat.c:443
-#, c-format
-msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:460
-#, c-format
-msgid "User `%s' is currently not in the room!\n"
-msgstr "Người dùng « %s » hiện thời không có trong phòng này.\n"
-
-#: src/chat/gnunet-chat.c:513
-#, fuzzy, c-format
-msgid "Unknown command `%s'\n"
-msgstr "Không rõ câu lệnh « %s ».\n"
-
-#: src/chat/gnunet-chat.c:524
-msgid ""
-"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
-"leave the current room"
-msgstr ""
-"Gõ chuỗi « /join #tên_phòng » để vào một phòng trò chuyện nào đó (việc này "
-"cũng gây ra bạn ra khỏi phòng hiện tại)"
-
-#: src/chat/gnunet-chat.c:528
-msgid ""
-"Use `/nick nickname' to change your nickname.  This will cause you to leave "
-"the current room and immediately rejoin it with the new name."
-msgstr ""
-"Gõ chuỗi « /nick tên_hiệu » để thay đổi tên hiệu của mình (việc này cũng gây "
-"ra bạn ra khỏi phòng hiện tại, sau đó vào lại ngay với tên mới)"
-
-#: src/chat/gnunet-chat.c:532
-msgid ""
-"Use `/msg nickname message' to send a private message to the specified user"
-msgstr ""
-"Gõ chuỗi « /msg tên_hiệu tin_nhẳn » để gửi một tin nhẳn riêng cho người dùng "
-"có tên đó"
-
-#: src/chat/gnunet-chat.c:535
-msgid "The `/notice' command is an alias for `/msg'"
-msgstr "Lệnh « /notice » là một biệt hiệu cho « /msg »"
-
-#: src/chat/gnunet-chat.c:537
-msgid "The `/query' command is an alias for `/msg'"
-msgstr "Lệnh « /query » là một biệt hiệu cho « /msg »"
-
-#: src/chat/gnunet-chat.c:539
-#, fuzzy
-msgid "Use `/sig message' to send a signed public message"
-msgstr ""
-"Gõ chuỗi « /msg tên_hiệu tin_nhẳn » để gửi một tin nhẳn riêng cho người dùng "
-"có tên đó"
-
-#: src/chat/gnunet-chat.c:542
-msgid "Use `/ack message' to require signed acknowledgment of the message"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:545
-msgid "Use `/anonymous message' to send a public anonymous message"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:547
-#, fuzzy
-msgid "The `/anon' command is an alias for `/anonymous'"
-msgstr "Lệnh « /notice » là một biệt hiệu cho « /msg »"
-
-#: src/chat/gnunet-chat.c:549
-msgid "Use `/quit' to terminate gnunet-chat"
-msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat"
-
-#: src/chat/gnunet-chat.c:551
-msgid "The `/leave' command is an alias for `/quit'"
-msgstr "Lệnh « /leave » là một biệt hiệu cho « /quit »"
-
-#: src/chat/gnunet-chat.c:554
-msgid "Use `/names' to list all of the current members in the chat room"
-msgstr ""
-"Gõ chuỗi « /names » để liệt kê tất cả các thành viên hiện thời trong phòng "
-"trò chuyện đó"
-
-#: src/chat/gnunet-chat.c:556
-msgid "Use `/help command' to get help for a specific command"
-msgstr "Gõ chuỗi « /help LỆNH » để xem trợ giúp về lệnh đó"
-
-#: src/chat/gnunet-chat.c:672
-msgid "You must specify a nickname\n"
-msgstr "Phải ghi rõ tên hiệu\n"
-
-#: src/chat/gnunet-chat.c:688
-#, c-format
-msgid "Failed to join room `%s'\n"
-msgstr "Lỗi vào phòng « %s »\n"
-
-#: src/chat/gnunet-chat.c:727
-msgid "set the nickname to use (required)"
-msgstr "đặt tên hiệu cần dùng (cần thiết)"
-
-#: src/chat/gnunet-chat.c:730
-msgid "set the chat room to join"
-msgstr "đặt phòng trò chuyện cần vào"
-
-#: src/chat/gnunet-chat.c:746
-msgid "Join a chat on GNUnet."
-msgstr "Vào phòng trò chuyện trên GNUnet."
-
-#: src/chat/gnunet-service-chat.c:266
-#, fuzzy
-msgid "Failed to queue a message notification\n"
-msgstr "Lỗi lưu cấu hình."
-
-#: src/chat/gnunet-service-chat.c:545
-#, fuzzy
-msgid "Failed to queue a join notification\n"
-msgstr "Lỗi lưu cấu hình."
-
-#: src/chat/gnunet-service-chat.c:728
-#, fuzzy
-msgid "Failed to queue a confirmation receipt\n"
-msgstr "Lỗi lưu cấu hình."
-
-#: src/chat/gnunet-service-chat.c:906
-#, fuzzy
-msgid "Failed to queue a leave notification\n"
-msgstr "Lỗi lưu cấu hình."
-
 #: src/core/core_api.c:757
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
@@ -606,42 +268,58 @@
 msgid "Peer `%s'\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/core/gnunet-core.c:118 src/core/gnunet-core.c:149
-#: src/transport/gnunet-transport.c:451 src/transport/gnunet-transport.c:477
+#: src/core/gnunet-core.c:119 src/core/gnunet-core.c:147
+#: src/transport/gnunet-transport.c:453 src/transport/gnunet-transport.c:477
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:120 src/transport/gnunet-transport.c:453
+#: src/core/gnunet-core.c:121 src/transport/gnunet-transport.c:455
 #, fuzzy
 msgid "Connected to"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/core/gnunet-core.c:151 src/transport/gnunet-transport.c:479
+#: src/core/gnunet-core.c:149 src/transport/gnunet-transport.c:479
 #, fuzzy
 msgid "Disconnected from"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:817
+#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:818
 #, 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:216 src/transport/gnunet-transport.c:725
+#: src/core/gnunet-core.c:211 src/transport/gnunet-transport.c:724
 #, 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:227
+#: src/core/gnunet-core.c:222
 #, fuzzy
 msgid "Print information about connected peers."
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/core/gnunet-service-core.c:97
+#: src/core/gnunet-service-core.c:109
+#, fuzzy, c-format
+msgid "Failed to read hostkey: %s\n"
+msgstr "Lỗi bắt đầu thu thập.\n"
+
+#: src/core/gnunet-service-core.c:123
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
+#: src/core/gnunet-service-core.c:149
+#, fuzzy
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr "Lưu cấu hình ngay bây giờ không?"
+
+#: src/core/gnunet-service-core.c:163
+#: src/transport/gnunet-service-transport.c:685
+#, fuzzy
+msgid "Transport service is unable to access hostkey. Exiting.\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
 #: src/core/gnunet-service-core_clients.c:370
 #, fuzzy
 msgid "# send requests dropped (disconnected)"
@@ -773,7 +451,7 @@
 
 #: src/core/gnunet-service-core_kx.c:1628
 #, fuzzy, c-format
-msgid "Message received far too old (%llu ms). Content ignored.\n"
+msgid "Message received far too old (%s). Content ignored.\n"
 msgstr "Thông báo nhận được cũ hơn một ngày. Đã loại bỏ.\n"
 
 #: src/core/gnunet-service-core_kx.c:1632
@@ -786,19 +464,10 @@
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
 
-#: src/core/gnunet-service-core_kx.c:1702
+#: src/core/gnunet-service-core_kx.c:1703 src/hostlist/hostlist-server.c:552
+#: src/peerinfo-tool/gnunet-peerinfo.c:824
+#: src/transport/gnunet-service-transport.c:627
 #, fuzzy
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
-msgstr "Lưu cấu hình ngay bây giờ không?"
-
-#: src/core/gnunet-service-core_kx.c:1710
-msgid "Core service could not access hostkey.  Exiting.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:1720 src/hostlist/hostlist-server.c:551
-#: src/peerinfo-tool/gnunet-peerinfo.c:823
-#: src/transport/gnunet-service-transport.c:619
-#, 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"
 
@@ -823,9 +492,9 @@
 
 #: src/core/gnunet-service-core_sessions.c:206
 #: src/core/gnunet-service-core_sessions.c:269
-#: src/dht/gnunet-service-dht_neighbours.c:629
-#: src/dht/gnunet-service-dht_neighbours.c:687
-#: src/fs/gnunet-service-fs_cp.c:622 src/fs/gnunet-service-fs_cp.c:1530
+#: src/dht/gnunet-service-dht_neighbours.c:634
+#: src/dht/gnunet-service-dht_neighbours.c:692
+#: src/fs/gnunet-service-fs_cp.c:623 src/fs/gnunet-service-fs_cp.c:1532
 #: src/topology/gnunet-daemon-topology.c:709
 #: src/topology/gnunet-daemon-topology.c:810
 #: src/transport/gnunet-service-transport_neighbours.c:873
@@ -899,8 +568,8 @@
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:543
-#: src/include/gnunet_common.h:550
+#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:608
+#: src/include/gnunet_common.h:615
 #, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s\n"
@@ -918,8 +587,8 @@
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:443
-#: src/datastore/plugin_datastore_sqlite.c:408
-#: src/namestore/plugin_namestore_sqlite.c:370
+#: src/datastore/plugin_datastore_sqlite.c:406
+#: src/namestore/plugin_namestore_sqlite.c:369
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -1053,10 +722,12 @@
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:480
+#: src/gns/gnunet-gns-helper-service-w32.c:159
 msgid "Transmission to client failed!\n"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:511
+#: src/gns/gnunet-gns-helper-service-w32.c:189
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
@@ -1229,35 +900,29 @@
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "« %s » bị lỗi tại %s:%d với lỗi: %s"
 
-#: src/datastore/plugin_datastore_sqlite.c:233
-#: src/namestore/plugin_namestore_sqlite.c:204
+#: src/datastore/plugin_datastore_sqlite.c:258
+#: src/namestore/plugin_namestore_sqlite.c:228
 #, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
-msgstr ""
-
-#: src/datastore/plugin_datastore_sqlite.c:260
-#: src/namestore/plugin_namestore_sqlite.c:229
-#, 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:655
+#: src/datastore/plugin_datastore_sqlite.c:653
 #, 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:1139
+#: src/datastore/plugin_datastore_sqlite.c:1137
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1158
+#: src/datastore/plugin_datastore_sqlite.c:1156
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1198
+#: src/datastore/plugin_datastore_sqlite.c:1196
 #: src/namestore/plugin_namestore_sqlite.c:834
 #, fuzzy
 msgid "Sqlite database running\n"
@@ -1272,98 +937,116 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:293
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-get.c:132
+#, c-format
+msgid ""
+"Result %d, type %d:\n"
+"%.*s\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:156
+msgid "Must provide key for DHT GET!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:162 src/dht/gnunet-dht-monitor.c:225
+#, fuzzy
+msgid "Failed to connect to DHT service!\n"
+msgstr "Lỗi kết nối đến gnunetd.\n"
+
+#: src/dht/gnunet-dht-get.c:170
+msgid "Issueing DHT GET with key"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:186 src/dht/gnunet-dht-monitor.c:262
+#: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204
+#: src/dht/gnunet-dht-get.c:189
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296
+#: src/dht/gnunet-dht-get.c:192 src/dht/gnunet-dht-monitor.c:265
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-put.c:210
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:204 src/fs/gnunet-auto-share.c:750
-#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:732
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
-#: src/nse/gnunet-nse-profiler.c:897
+#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:201
+msgid "use DHT's demultiplex everywhere option"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
+#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:750
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:733
+#: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
+#: src/nse/gnunet-nse-profiler.c:1033
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:236
+#: src/dht/gnunet-dht-get.c:222
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:299
-msgid "how long to execute? 0 = forever"
+#: src/dht/gnunet-dht-monitor.c:268
+msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:324
+#: src/dht/gnunet-dht-monitor.c:293
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:108
+#: src/dht/gnunet-dht-put.c:118
 #, fuzzy
-msgid "PUT request sent!\n"
+msgid "PUT request sent with key"
 msgstr "# độ tin cậy được tiêu phí"
 
-#: src/dht/gnunet-dht-put.c:111
+#: src/dht/gnunet-dht-put.c:121
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:114
+#: src/dht/gnunet-dht-put.c:124
 #, fuzzy
 msgid "PUT request not confirmed!\n"
 msgstr "# độ tin cậy được tiêu phí"
 
-#: src/dht/gnunet-dht-put.c:144
+#: src/dht/gnunet-dht-put.c:153
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:152
+#: src/dht/gnunet-dht-put.c:160
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/dht/gnunet-dht-put.c:157
-#, fuzzy, c-format
-msgid "Connected to %s service!\n"
-msgstr "« %s » được kết nối tới « %s ».\n"
-
-#: src/dht/gnunet-dht-put.c:172
+#: src/dht/gnunet-dht-put.c:176
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:186
+#: src/dht/gnunet-dht-put.c:192
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:189
+#: src/dht/gnunet-dht-put.c:195
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:204
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-put.c:207
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:226
+#: src/dht/gnunet-dht-put.c:235
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing_old/testing.c:544
-#: src/testing_old/testing.c:1968 src/testing_old/testing.c:1998
+#: src/dht/gnunet-service-dht.c:163
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
@@ -1454,103 +1137,103 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
 
-#: src/dht/gnunet-service-dht_neighbours.c:485
+#: src/dht/gnunet-service-dht_neighbours.c:490
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:575
+#: src/dht/gnunet-service-dht_neighbours.c:580
 #, fuzzy
 msgid "# FIND PEER messages initiated"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:721
+#: src/dht/gnunet-service-dht_neighbours.c:726
 #, fuzzy
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr "# các thông báo được chắp liền"
 
-#: src/dht/gnunet-service-dht_neighbours.c:776
+#: src/dht/gnunet-service-dht_neighbours.c:781
 #, fuzzy
 msgid "# Bytes transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/dht/gnunet-service-dht_neighbours.c:814
+#: src/dht/gnunet-service-dht_neighbours.c:819
 #, fuzzy
 msgid "# Bytes of bandwdith requested from core"
 msgstr "# các yêu cầu máy/trình khách lỗ hổng được phun vào"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1036
-#: src/dht/gnunet-service-dht_neighbours.c:1064
+#: src/dht/gnunet-service-dht_neighbours.c:1041
+#: src/dht/gnunet-service-dht_neighbours.c:1069
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1045
-#: src/dht/gnunet-service-dht_neighbours.c:1079
+#: src/dht/gnunet-service-dht_neighbours.c:1050
+#: src/dht/gnunet-service-dht_neighbours.c:1084
 #, fuzzy
 msgid "# Peer selection failed"
 msgstr "# các cuộc gọi HTTP select (lựa chọn)"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1211
+#: src/dht/gnunet-service-dht_neighbours.c:1216
 #, fuzzy
 msgid "# PUT requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1240
+#: src/dht/gnunet-service-dht_neighbours.c:1245
 #, fuzzy
 msgid "# PUT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1247
-#: src/dht/gnunet-service-dht_neighbours.c:1360
-#: src/dht/gnunet-service-dht_neighbours.c:1460
+#: src/dht/gnunet-service-dht_neighbours.c:1252
+#: src/dht/gnunet-service-dht_neighbours.c:1365
+#: src/dht/gnunet-service-dht_neighbours.c:1465
 #, fuzzy
 msgid "# P2P messages dropped due to full queue"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1325
+#: src/dht/gnunet-service-dht_neighbours.c:1330
 #, fuzzy
 msgid "# GET requests routed"
 msgstr "# các yêu cầu dht được định tuyến"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1352
+#: src/dht/gnunet-service-dht_neighbours.c:1357
 #, fuzzy
 msgid "# GET messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1467
+#: src/dht/gnunet-service-dht_neighbours.c:1472
 #, fuzzy
 msgid "# RESULT messages queued for transmission"
 msgstr "# các thông báo PING được tạo"
 
-#: src/dht/gnunet-service-dht_neighbours.c:1555
+#: src/dht/gnunet-service-dht_neighbours.c:1560
 #, 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:1671
+#: src/dht/gnunet-service-dht_neighbours.c:1676
 #, 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:1679
+#: src/dht/gnunet-service-dht_neighbours.c:1684
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1770
+#: src/dht/gnunet-service-dht_neighbours.c:1775
 #, 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:1812
+#: src/dht/gnunet-service-dht_neighbours.c:1817
 #, 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:1826
+#: src/dht/gnunet-service-dht_neighbours.c:1831
 #, 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:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1905
 #, fuzzy
 msgid "# P2P RESULTS received"
 msgstr "# Tín hiệu HTTP PUT được nhận"
@@ -1603,6 +1286,27 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
+#: src/dns/dnsstub.c:175
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
+
+#: src/dns/dnsstub.c:291 src/dns/dnsstub.c:375
+#: src/gns/gnunet-service-gns_resolver.c:1673
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s\n"
+msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#: src/dns/dnsstub.c:360
+#, c-format
+msgid "Configured DNS exit `%s' is not working / valid.\n"
+msgstr ""
+
+#: src/dns/dnsstub.c:430
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
+
 #: src/dns/gnunet-dns-monitor.c:355
 msgid "only monitor DNS queries"
 msgstr ""
@@ -1627,69 +1331,54 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:485
-#, fuzzy, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
-
-#: src/dns/gnunet-service-dns.c:639
+#: src/dns/gnunet-service-dns.c:499
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:822
+#: src/dns/gnunet-service-dns.c:639
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1005
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1050
+#: src/dns/gnunet-service-dns.c:821
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1168
+#: src/dns/gnunet-service-dns.c:892
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1281
+#: src/dns/gnunet-service-dns.c:1005
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1297
+#: src/dns/gnunet-service-dns.c:1021
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1306
+#: src/dns/gnunet-service-dns.c:1030
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1315
+#: src/dns/gnunet-service-dns.c:1039
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1380
+#: src/dns/gnunet-service-dns.c:1104
 #, fuzzy
 msgid "# DNS requests received via TUN interface"
 msgstr "# các đáp ứng lỗ hổng được gửi cho trình/máy khách"
 
-#: src/dns/gnunet-service-dns.c:1465
-#, c-format
-msgid "Configured DNS exit `%s' is not working / valid.\n"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1497 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1180 src/exit/gnunet-daemon-exit.c:2673
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1561 src/exit/gnunet-daemon-exit.c:3032
+#: src/dns/gnunet-service-dns.c:1245 src/exit/gnunet-daemon-exit.c:3032
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1581
+#: src/dns/gnunet-service-dns.c:1266
 msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
@@ -1901,7 +1590,7 @@
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3240
+#: src/exit/gnunet-daemon-exit.c:3241
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2139,37 +1828,32 @@
 msgid "Failed to connect to datastore service"
 msgstr "Không kết nối được đến trình nền gnunetd."
 
-#: src/fs/fs_namespace.c:57 src/fs/fs_namespace.c:83
+#: src/fs/fs_namespace.c:110
 #, fuzzy, c-format
-msgid "Configuration fails to specify `%s' in section `%s'\n"
-msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
-
-#: src/fs/fs_namespace.c:112
-#, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_namespace.c:134 src/fs/fs_namespace.c:222
+#: src/fs/fs_namespace.c:132 src/fs/fs_namespace.c:220
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:254
+#: src/fs/fs_namespace.c:252
 #, fuzzy, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/fs_namespace.c:369
+#: src/fs/fs_namespace.c:367
 #, fuzzy, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr "Lỗi thêm mục nhập vào không gian tên « %s » (có chưa ?)\n"
 
-#: src/fs/fs_namespace.c:586 src/fs/fs_publish_ksk.c:295
+#: src/fs/fs_namespace.c:584 src/fs/fs_publish_ksk.c:295
 #, fuzzy
 msgid "Internal error."
 msgstr "Lỗi VR."
 
-#: src/fs/fs_namespace.c:629
+#: src/fs/fs_namespace.c:627
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -2246,11 +1930,6 @@
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_test_lib.c:269
-#, fuzzy, c-format
-msgid "Failed to start daemon: %s\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
 #: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
@@ -2278,37 +1957,37 @@
 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:344
+#: src/fs/fs_unindex.c:349 src/fs/fs_unindex.c:361
 #, 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:356
+#: src/fs/fs_unindex.c:357
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/fs_unindex.c:411
+#: src/fs/fs_unindex.c:416
 #, fuzzy, c-format
 msgid "Failed to remove KBlock: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_unindex.c:501
+#: src/fs/fs_unindex.c:506
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s' from KBlock!\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/fs/fs_unindex.c:553 src/fs/fs_unindex.c:618
+#: src/fs/fs_unindex.c:558 src/fs/fs_unindex.c:623
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/fs_unindex.c:631
+#: src/fs/fs_unindex.c:636
 #, 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:665
+#: src/fs/fs_unindex.c:670
 #, fuzzy
 msgid "Failed to compute hash of file."
 msgstr "Không kết nối được đến trình nền gnunetd."
@@ -2372,16 +2051,16 @@
 msgid "Lacking key configuration settings.\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/fs/fs_uri.c:910
+#: src/fs/fs_uri.c:909
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/fs/fs_uri.c:1115 src/fs/fs_uri.c:1142
+#: src/fs/fs_uri.c:1114 src/fs/fs_uri.c:1141
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1148
+#: src/fs/fs_uri.c:1147
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
@@ -2418,24 +2097,24 @@
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
 #: src/fs/gnunet-auto-share.c:734 src/fs/gnunet-pseudonym.c:279
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:680
 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:738 src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:684
 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:741 src/fs/gnunet-publish.c:686
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:687
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:711
 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:747 src/fs/gnunet-pseudonym.c:304
-#: src/fs/gnunet-publish.c:717
+#: src/fs/gnunet-publish.c:718
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2484,90 +2163,90 @@
 msgid "Starting download `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-download.c:146
+#: src/fs/gnunet-download.c:147
 #, fuzzy
 msgid "<unknown time>"
 msgstr "Lỗi không rõ"
 
-#: src/fs/gnunet-download.c:155
+#: src/fs/gnunet-download.c:157
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:178
+#: src/fs/gnunet-download.c:179
 #, fuzzy, c-format
 msgid "Error downloading: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-download.c:193
+#: src/fs/gnunet-download.c:194
 #, fuzzy, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr "Tiến trình tải lên « %s » đã tiếp tục lại.\n"
 
-#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:191
-#: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:192
+#: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, fuzzy, c-format
 msgid "Unexpected status: %d\n"
 msgstr "Gặp sự kiện bất thường: %d\n"
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:234
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "KHÔNG cho phép ghi rõ cả hai địa chỉ URI và tên tập tin.\n"
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:625
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:626
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "Tập tin « %s » có URI: %s\n"
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:247
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:254
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:603
-#: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:604
+#: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:282
 #, fuzzy
 msgid "set the desired LEVEL of receiver-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-download.c:307
+#: src/fs/gnunet-download.c:308
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr "xoá việc tải về không hoàn thành (khi hủy bở dùng CTRL-C)"
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:288
+#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:285
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:313
+#: src/fs/gnunet-download.c:314
 msgid "write the file to FILENAME"
 msgstr "ghi tập tin vào TÊN_TẬP_TIN"
 
-#: src/fs/gnunet-download.c:317
+#: src/fs/gnunet-download.c:318
 #, fuzzy
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
 
-#: src/fs/gnunet-download.c:321
+#: src/fs/gnunet-download.c:322
 #, fuzzy
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr "đặt số tối đa các việc tải xuống đồng thời được phép"
 
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:325
 msgid "download a GNUnet directory recursively"
 msgstr "tải xuống đệ quy một thư mục GNUnet"
 
-#: src/fs/gnunet-download.c:338
+#: src/fs/gnunet-download.c:339
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2610,7 +2289,7 @@
 "thêm một từ khóa bổ sung cho tất cả tập tin và thư mục (có thể chỉ ra tùy "
 "chọn này nhiều lần)"
 
-#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:698
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:699
 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"
 
@@ -2641,127 +2320,127 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:147
+#: src/fs/gnunet-publish.c:149
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:155
+#: src/fs/gnunet-publish.c:156
 #, fuzzy, c-format
 msgid "Error publishing: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-publish.c:165
+#: src/fs/gnunet-publish.c:166
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:169
+#: src/fs/gnunet-publish.c:170
 #, fuzzy, c-format
 msgid "URI is `%s'.\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/fs/gnunet-publish.c:188
+#: src/fs/gnunet-publish.c:189
 #, fuzzy
 msgid "Cleanup after abort complete.\n"
 msgstr "Hoàn thành khởi chạy « %s ».\n"
 
-#: src/fs/gnunet-publish.c:306
+#: src/fs/gnunet-publish.c:307
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:308
+#: src/fs/gnunet-publish.c:309
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "Từ khoá cho tập tin « %s »:\n"
 
-#: src/fs/gnunet-publish.c:359 src/fs/gnunet-publish.c:613
+#: src/fs/gnunet-publish.c:360 src/fs/gnunet-publish.c:614
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s' (illegal filename?)\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-publish.c:434
+#: src/fs/gnunet-publish.c:435
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "Không thể truy cập đến « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:461
+#: src/fs/gnunet-publish.c:462
 #, fuzzy
 msgid "Could not start publishing.\n"
 msgstr "Không thể nạp phần bổ sung truyền tải « %s »\n"
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:493
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/fs/gnunet-publish.c:494
+#: src/fs/gnunet-publish.c:495
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/fs/gnunet-publish.c:499
+#: src/fs/gnunet-publish.c:500
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:504
+#: src/fs/gnunet-publish.c:505
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:508
+#: src/fs/gnunet-publish.c:509
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "Đang cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:513
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:519
+#: src/fs/gnunet-publish.c:520
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "=\tLỗi đọc thư mục.\n"
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:554
 #, 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:560
+#: src/fs/gnunet-publish.c:561
 #, 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:566
+#: src/fs/gnunet-publish.c:567
 #, 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:574 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:575 src/vpn/gnunet-vpn.c:214
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr "Tùy chọn « %s » cần thiết khi dùng tùy chọn « %s ».\n"
 
-#: src/fs/gnunet-publish.c:584 src/fs/gnunet-publish.c:591
-#: src/transport/gnunet-transport.c:624
+#: src/fs/gnunet-publish.c:585 src/fs/gnunet-publish.c:592
+#: src/transport/gnunet-transport.c:623
 #, 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:646
+#: src/fs/gnunet-publish.c:647
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:659
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:690
+#: src/fs/gnunet-publish.c:691
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
@@ -2769,7 +2448,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:694
+#: src/fs/gnunet-publish.c:695
 msgid ""
 "add an additional keyword for the top-level file or directory (this option "
 "can be specified multiple times)"
@@ -2777,7 +2456,7 @@
 "thêm một từ khoá bổ sung cho tập tin hoặc thư mục ở cấp đầu (có thể chỉ ra "
 "tùy chọn này nhiều lần)"
 
-#: src/fs/gnunet-publish.c:701
+#: src/fs/gnunet-publish.c:702
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
@@ -2785,7 +2464,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:706
+#: src/fs/gnunet-publish.c:707
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
@@ -2793,12 +2472,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:714
+#: src/fs/gnunet-publish.c:715
 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:720
+#: src/fs/gnunet-publish.c:721
 #, fuzzy
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
@@ -2806,13 +2485,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:724
+#: src/fs/gnunet-publish.c:725
 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:728
+#: src/fs/gnunet-publish.c:729
 msgid ""
 "URI to be published (can be used instead of passing a file to add keywords "
 "to the file with the respective URI)"
@@ -2820,43 +2499,43 @@
 "Đị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:747
+#: src/fs/gnunet-publish.c:748
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:111
+#: src/fs/gnunet-search.c:114
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:181
+#: src/fs/gnunet-search.c:184
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "Gặp lỗi khi tải xuống: %s\n"
 
-#: src/fs/gnunet-search.c:231
+#: src/fs/gnunet-search.c:233
 #, fuzzy
 msgid "Could not create keyword URI from arguments.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-search.c:255
+#: src/fs/gnunet-search.c:257
 #, fuzzy
 msgid "Could not start searching.\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/fs/gnunet-search.c:291
+#: src/fs/gnunet-search.c:288
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:294
-msgid "automatically terminate search after VALUE ms"
+#: src/fs/gnunet-search.c:291
+msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:301
+#: src/fs/gnunet-search.c:298
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:312
+#: src/fs/gnunet-search.c:309
 #, fuzzy
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr "Không hiển thị kết quả tìm kiếm cho tập tin được chúng ta tải lên"
@@ -2871,154 +2550,148 @@
 msgstr "# tổng số định tuyến lỗ hổng thành công"
 
 #: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1330
-#: src/topology/gnunet-daemon-topology.c:1337
+#: src/topology/gnunet-daemon-topology.c:1329
+#: src/topology/gnunet-daemon-topology.c:1336
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/fs/gnunet-service-fs_cp.c:703
+#: src/fs/gnunet-service-fs_cp.c:704
 #, fuzzy
 msgid "# migration stop messages received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:707
+#: src/fs/gnunet-service-fs_cp.c:708
 #, c-format
-msgid "Migration of content to peer `%s' blocked for %llu ms\n"
+msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:742
+#: src/fs/gnunet-service-fs_cp.c:744
 #, fuzzy
 msgid "# replies transmitted to other peers"
 msgstr "# các byte kiểu %d được gửi "
 
-#: src/fs/gnunet-service-fs_cp.c:748
+#: src/fs/gnunet-service-fs_cp.c:750
 #, fuzzy
 msgid "# replies dropped"
 msgstr "# các đáp ứng dht được định tuyến"
 
-#: src/fs/gnunet-service-fs_cp.c:773 src/fs/gnunet-service-fs_cp.c:1331
+#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:1333
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:865
+#: src/fs/gnunet-service-fs_cp.c:867
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:920
 #, fuzzy
 msgid "# replies dropped due to type mismatch"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:926
+#: src/fs/gnunet-service-fs_cp.c:928
 #, fuzzy
 msgid "# replies received for other peers"
 msgstr "# các byte kiểu %d được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:940
+#: src/fs/gnunet-service-fs_cp.c:942
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:978
+#: src/fs/gnunet-service-fs_cp.c:980
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1045
+#: src/fs/gnunet-service-fs_cp.c:1047
 #, fuzzy
 msgid "# requests done for free (low load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1069
+#: src/fs/gnunet-service-fs_cp.c:1071
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1079
+#: src/fs/gnunet-service-fs_cp.c:1081
 #, fuzzy
 msgid "# requests done for a price (normal load)"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1158
+#: src/fs/gnunet-service-fs_cp.c:1160
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1192
+#: src/fs/gnunet-service-fs_cp.c:1194
 #, fuzzy
 msgid "# requests dropped due to initiator not being connected"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1214
+#: src/fs/gnunet-service-fs_cp.c:1216
 #, fuzzy
 msgid "# requests dropped due to missing reverse route"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1274
+#: src/fs/gnunet-service-fs_cp.c:1276
 #, fuzzy
 msgid "# requests dropped due TTL underflow"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1300
+#: src/fs/gnunet-service-fs_cp.c:1302
 #, fuzzy
 msgid "# requests dropped due to higher-TTL request"
 msgstr "# các yêu cầu lỗ hổng bị bỏ do trọng tải"
 
-#: src/fs/gnunet-service-fs_cp.c:1329
+#: src/fs/gnunet-service-fs_cp.c:1331
 #, fuzzy
 msgid "# P2P query messages received and processed"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_cp.c:1685
+#: src/fs/gnunet-service-fs_cp.c:1687
 #, fuzzy
 msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/fs/gnunet-service-fs_indexing.c:113
-#: src/fs/gnunet-service-fs_indexing.c:163
+#: src/fs/gnunet-service-fs_indexing.c:120
+#: src/fs/gnunet-service-fs_indexing.c:175
 #, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing.\n"
-msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
-
-#: src/fs/gnunet-service-fs_indexing.c:121
-#: src/fs/gnunet-service-fs_indexing.c:177
-#, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:137
+#: src/fs/gnunet-service-fs_indexing.c:136
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/fs/gnunet-service-fs_indexing.c:228
+#: src/fs/gnunet-service-fs_indexing.c:226
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:266
+#: src/fs/gnunet-service-fs_indexing.c:264
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:481
+#: src/fs/gnunet-service-fs_indexing.c:479
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:539
+#: src/fs/gnunet-service-fs_indexing.c:537
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:554
+#: src/fs/gnunet-service-fs_indexing.c:552
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:556
+#: src/fs/gnunet-service-fs_indexing.c:554
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:571
+#: src/fs/gnunet-service-fs_indexing.c:569
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Đánh chỉ mục dữ liệu của tập tin « %s » bị lỗi tại vị tri %llu.\n"
@@ -3127,74 +2800,66 @@
 
 #: src/fs/gnunet-service-fs_pr.c:1108
 #, c-format
-msgid "Datastore lookup already took %llu ms!\n"
+msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1129
+#: src/fs/gnunet-service-fs_pr.c:1128
 #, c-format
-msgid "On-demand lookup already took %llu ms!\n"
+msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1176
+#: src/fs/gnunet-service-fs_pr.c:1174
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1190
+#: src/fs/gnunet-service-fs_pr.c:1188
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1199
+#: src/fs/gnunet-service-fs_pr.c:1197
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1213
+#: src/fs/gnunet-service-fs_pr.c:1211
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1226
+#: src/fs/gnunet-service-fs_pr.c:1224
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1239
+#: src/fs/gnunet-service-fs_pr.c:1237
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1242
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1271 src/fs/gnunet-service-fs_pr.c:1311
-#: src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1269 src/fs/gnunet-service-fs_pr.c:1309
+#: src/fs/gnunet-service-fs_pr.c:1447
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1329
+#: src/fs/gnunet-service-fs_pr.c:1327
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1340
+#: src/fs/gnunet-service-fs_pr.c:1338
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1426
+#: src/fs/gnunet-service-fs_pr.c:1424
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1510
+#: src/fs/gnunet-service-fs_pr.c:1508
 #, fuzzy
 msgid "# GAP PUT messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/fs/gnunet-service-fs_pr.c:1603 src/fs/gnunet-service-fs_pr.c:1612
-#, fuzzy, c-format
-msgid "Configuration fails to specify `%s', assuming default value."
-msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
-
 #: src/fs/gnunet-service-fs_push.c:629
-#, c-format
-msgid ""
-"Invalid value specified for option `%s' in section `%s', content pushing "
-"disabled\n"
+msgid "time required, content pushing disabled"
 msgstr ""
 
 #: src/fs/gnunet-unindex.c:89
@@ -3202,29 +2867,29 @@
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr "Lỗi bỏ chỉ mục (không đưa ra lý do)."
 
-#: src/fs/gnunet-unindex.c:96
+#: src/fs/gnunet-unindex.c:95
 #, fuzzy, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 "\n"
 "Gặp lỗi khi bỏ chỉ mục tập tin: %s\n"
 
-#: src/fs/gnunet-unindex.c:101
+#: src/fs/gnunet-unindex.c:100
 #, fuzzy
 msgid "Unindexing done.\n"
 msgstr "Bỏ chỉ mục tập tin."
 
-#: src/fs/gnunet-unindex.c:131
+#: src/fs/gnunet-unindex.c:130
 #, fuzzy, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-unindex.c:148
+#: src/fs/gnunet-unindex.c:147
 #, fuzzy
 msgid "Could not start unindex operation.\n"
 msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
 
-#: src/fs/gnunet-unindex.c:180
+#: src/fs/gnunet-unindex.c:179
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
@@ -3232,127 +2897,174 @@
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:267
+#: src/gns/gns_api.c:575
+#, 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:186
+#, 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:361
+#, c-format
+msgid "Cannot parse DNS request from %s\n"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:377
 #, fuzzy, c-format
-msgid "Key file `%s' for private zone does not exist!\n"
-msgstr "đặt số trình nền cần khởi chạy"
+msgid "Received malformed DNS request from %s\n"
+msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-gns.c:289
-#, fuzzy
+#: src/gns/gnunet-dns2gns.c:385
+#, 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:673
+msgid "IP of recursive dns resolver to use (required)"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:676
+msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:679
+msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:692
+msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:182
+#, 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:358
+#: src/gns/gnunet-gns.c:293
+#, c-format
+msgid "Please specify lookup, shorten or authority operation!\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:315
 #, fuzzy
 msgid "try to shorten a given name"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns.c:361
+#: src/gns/gnunet-gns.c:318
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:364
+#: src/gns/gnunet-gns.c:321
 msgid "Get the authority of a particular name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:367
+#: src/gns/gnunet-gns.c:324
 #, 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:370
+#: src/gns/gnunet-gns.c:327
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:384
+#: src/gns/gnunet-gns.c:341
 msgid "GNUnet GNS access tool"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:280
+#: src/gns/gnunet-gns-fcfsd.c:449
 #, 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-fcfsd.c:333
+#: src/gns/gnunet-gns-fcfsd.c:478
 #, 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-fcfsd.c:377
+#: src/gns/gnunet-gns-fcfsd.c:522
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:439
+#: src/gns/gnunet-gns-fcfsd.c:584
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:498
+#: src/gns/gnunet-gns-fcfsd.c:646
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Không thể tạo miền tên.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:514
+#: src/gns/gnunet-gns-fcfsd.c:662
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:550
+#: src/gns/gnunet-gns-fcfsd.c:698
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:558
+#: src/gns/gnunet-gns-fcfsd.c:706
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:741 src/gns/gnunet-gns-fcfsd.c:753
-#, fuzzy, c-format
-msgid "Option `%s' not specified in configuration section `%s'\n"
-msgstr ""
-"Đặc tả mạng dạng sai trong cấu hình phần « %s » cho mục nhập « %s »: %s\n"
-
-#: src/gns/gnunet-gns-fcfsd.c:763 src/namestore/gnunet-namestore.c:365
+#: src/gns/gnunet-gns-fcfsd.c:910 src/namestore/gnunet-namestore.c:364
 #, 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:773 src/namestore/gnunet-namestore.c:376
+#: src/gns/gnunet-gns-fcfsd.c:920 src/namestore/gnunet-namestore.c:375
 #, 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:789 src/gns/gnunet-gns-proxy.c:2901
+#: src/gns/gnunet-gns-fcfsd.c:936 src/gns/gnunet-gns-proxy.c:2887
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:823
+#: src/gns/gnunet-gns-fcfsd.c:970
 msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2532
+#: src/gns/gnunet-gns-proxy.c:2528
 #, 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:2561
+#: src/gns/gnunet-gns-proxy.c:2556
 #, fuzzy, c-format
 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-proxy.c:3578
-msgid "listen on specified port"
+#: src/gns/gnunet-gns-proxy.c:3564
+msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3581
+#: src/gns/gnunet-gns-proxy.c:3567
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3596
+#: src/gns/gnunet-gns-proxy.c:3582
 msgid "GNUnet GNS proxy"
 msgstr ""
 
+#: src/gns/gnunet-service-gns.c:401
+#, c-format
+msgid "Records for name `%s' in zone %s too large to fit into DHT"
+msgstr ""
+
+#: src/gns/gnunet-service-gns.c:1197
+#, fuzzy
+msgid "Failed to connect to the namestore!\n"
+msgstr "Không kết nối được đến trình nền gnunetd."
+
 #: src/hello/gnunet-hello.c:122
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3448,8 +3160,8 @@
 #: src/hostlist/hostlist-client.c:689 src/hostlist/hostlist-client.c:741
 #: src/hostlist/hostlist-client.c:750 src/hostlist/hostlist-client.c:871
 #: src/hostlist/hostlist-client.c:961 src/hostlist/hostlist-client.c:966
-#: src/transport/plugin_transport_http_client.c:110
-#: src/transport/plugin_transport_http_client.c:125
+#: src/transport/plugin_transport_http_client.c:994
+#: src/transport/plugin_transport_http_client.c:1009
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
@@ -3692,27 +3404,27 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:561
+#: src/hostlist/hostlist-server.c:562
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:570
+#: src/hostlist/hostlist-server.c:571
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:584
+#: src/hostlist/hostlist-server.c:585
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/hostlist-server.c:624
+#: src/hostlist/hostlist-server.c:625
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/hostlist-server.c:666
+#: src/hostlist/hostlist-server.c:667
 #, 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"
@@ -3736,30 +3448,30 @@
 msgid "help text"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:7110
+#: src/mesh/gnunet-service-mesh.c:7703
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:7328 src/mesh/gnunet-service-mesh.c:7340
-#: src/mesh/gnunet-service-mesh.c:7352 src/mesh/gnunet-service-mesh.c:7364
-#: src/mesh/gnunet-service-mesh.c:7376 src/mesh/gnunet-service-mesh.c:7388
-#: src/mesh/gnunet-service-mesh.c:7400 src/mesh/gnunet-service-mesh.c:7412
+#: src/mesh/gnunet-service-mesh.c:7908
+#, fuzzy
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
+#: src/mesh/gnunet-service-mesh.c:7997 src/mesh/gnunet-service-mesh.c:8009
+#: src/mesh/gnunet-service-mesh.c:8021 src/mesh/gnunet-service-mesh.c:8033
+#: src/mesh/gnunet-service-mesh.c:8045 src/mesh/gnunet-service-mesh.c:8057
+#: src/mesh/gnunet-service-mesh.c:8069 src/mesh/gnunet-service-mesh.c:8081
 #, fuzzy, c-format
 msgid "Mesh 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:7424 src/mesh/gnunet-service-mesh.c:7435
+#: src/mesh/gnunet-service-mesh.c:8093 src/mesh/gnunet-service-mesh.c:8104
 #, fuzzy, c-format
 msgid ""
 "Mesh service is lacking key configuration settings (%s). Using default "
 "(%u).\n"
 msgstr "Lưu cấu hình ngay bây giờ không?"
 
-#: src/mesh/gnunet-service-mesh.c:7446
-#, fuzzy
-msgid "Mesh service could not access hostkey.  Exiting.\n"
-msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
-
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -3793,126 +3505,121 @@
 msgid "until"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:357
+#: src/namestore/gnunet-namestore.c:356
 #, fuzzy, c-format
 msgid "No options given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/namestore/gnunet-namestore.c:387
+#: src/namestore/gnunet-namestore.c:386
 #, 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:395 src/namestore/gnunet-namestore.c:419
-#: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
-#: src/namestore/gnunet-namestore.c:519
+#: src/namestore/gnunet-namestore.c:394 src/namestore/gnunet-namestore.c:418
+#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:477
+#: src/namestore/gnunet-namestore.c:518
 #, 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:396 src/namestore/gnunet-namestore.c:420
+#: src/namestore/gnunet-namestore.c:395 src/namestore/gnunet-namestore.c:419
 msgid "add/del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:409
+#: src/namestore/gnunet-namestore.c:408
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:447
+#: src/namestore/gnunet-namestore.c:446
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Địa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:456
+#: src/namestore/gnunet-namestore.c:455
 #, c-format
 msgid ""
 "Deletion requires either absolute time, or no time at all. Got relative time "
 "`%s' instead.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:467 src/namestore/gnunet-namestore.c:479
-#: src/namestore/gnunet-namestore.c:498
+#: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
+#: src/namestore/gnunet-namestore.c:497
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:497
+#: src/namestore/gnunet-namestore.c:496
 #, fuzzy, c-format
 msgid "No valid expiration time for operation `%s'\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
 
-#: src/namestore/gnunet-namestore.c:520
+#: src/namestore/gnunet-namestore.c:519
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:570
+#: src/namestore/gnunet-namestore.c:569
 #: src/peerinfo-tool/gnunet-peerinfo.c:875
 #, 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:611 src/transport/gnunet-transport.c:618
+#: src/namestore/gnunet-namestore.c:610 src/transport/gnunet-transport.c:617
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/namestore/gnunet-namestore.c:622
-#, c-format
-msgid "Option `%s' not given, but I need a zone key file!\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:627
+#: src/namestore/gnunet-namestore.c:625
 #, fuzzy, c-format
 msgid "Using default zone file `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:679
+#: src/namestore/gnunet-namestore.c:677
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:682
+#: src/namestore/gnunet-namestore.c:680
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:685
+#: src/namestore/gnunet-namestore.c:683
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:688
+#: src/namestore/gnunet-namestore.c:686
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:691
+#: src/namestore/gnunet-namestore.c:689
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:694
+#: src/namestore/gnunet-namestore.c:692
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:697
+#: src/namestore/gnunet-namestore.c:695
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:700
+#: src/namestore/gnunet-namestore.c:698
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:703
+#: src/namestore/gnunet-namestore.c:701
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:706
+#: src/namestore/gnunet-namestore.c:704
 msgid "create or list non-authority record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:709
+#: src/namestore/gnunet-namestore.c:707
 #, fuzzy
 msgid "filename with the zone key"
 msgstr "tên tập tin"
 
-#: src/namestore/gnunet-namestore.c:720
+#: src/namestore/gnunet-namestore.c:718
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
@@ -4047,30 +3754,67 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:915
+#: src/nse/gnunet-nse-profiler.c:1009
 #, fuzzy
+msgid "limit to the number of connections to NSE services, 0 for none"
+msgstr "Không kết nối được đến trình nền gnunetd."
+
+#: src/nse/gnunet-nse-profiler.c:1012
+msgid "name of the file for writing connection information and statistics"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1015
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1018
+msgid "IP address of this system as seen by the rest of the testbed"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1021
+msgid "delay between queries to statistics during a round"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1024
+msgid "prefix of the filenames we use for writing the topology for each round"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1027
+msgid "name of the file for writing the main results"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1030
+msgid "Number of peers to run in each round, separated by commas"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1036
+msgid "delay between rounds"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1046
+#, 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:925
+#: src/nse/gnunet-service-nse.c:938
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1381 src/nse/gnunet-service-nse.c:1400
-#: src/nse/gnunet-service-nse.c:1421
+#: src/nse/gnunet-service-nse.c:1389
+#, fuzzy, c-format
+msgid "NSE service could not access hostkey: %s\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
+#: src/nse/gnunet-service-nse.c:1403 src/nse/gnunet-service-nse.c:1478
+#: src/nse/gnunet-service-nse.c:1495
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1388
+#: src/nse/gnunet-service-nse.c:1485
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1409
-#, fuzzy
-msgid "NSE service could not access hostkey.  Exiting.\n"
-msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
-
 #: src/peerinfo/gnunet-service-peerinfo.c:134
 #, fuzzy, c-format
 msgid "Removing expired address of transport `%s'\n"
@@ -4178,7 +3922,7 @@
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:833
+#: src/peerinfo-tool/gnunet-peerinfo.c:834
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
@@ -4377,11 +4121,15 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/testbed_api.c:246
+#: src/testbed/testbed_api.c:252
 #, 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:271
+msgid "Some operations are still pending. Cancelling them\n"
+msgstr ""
+
 #: src/testing/gnunet-testing.c:131
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
@@ -4426,258 +4174,59 @@
 msgid "name of the service to run"
 msgstr ""
 
-#: src/testing_old/helper.c:56
-#, fuzzy
-msgid "Peer is lacking HOSTKEY configuration setting.\n"
-msgstr "Lưu cấu hình ngay bây giờ không?"
-
-#: src/testing_old/helper.c:64
-#, fuzzy
-msgid "Could not access hostkey.\n"
-msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
-
-#: src/testing_old/testing.c:200
-msgid "`scp' does not seem to terminate (timeout copying config).\n"
-msgstr ""
-
-#: src/testing_old/testing.c:214 src/testing_old/testing.c:798
-#, fuzzy
-msgid "`scp' did not complete cleanly.\n"
-msgstr "« %s » không phải được kết nối tới đồng đẳng nào.\n"
-
-#: src/testing_old/testing.c:237
-#, fuzzy
-msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/testing_old/testing.c:238
-#, fuzzy
-msgid "Failed to create pipe for `ssh' process.\n"
-msgstr "Lỗi tạo thư mục tạm thời."
-
-#: src/testing_old/testing.c:286
-#, fuzzy, c-format
-msgid "Could not start `%s' process to create hostkey.\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/testing_old/testing.c:293
-#, fuzzy
-msgid "Failed to start `gnunet-peerinfo' process.\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/testing_old/testing.c:294 src/testing_old/testing.c:471
-#, fuzzy
-msgid "Failed to start `ssh' process.\n"
-msgstr "Lỗi bắt đầu thu thập.\n"
-
-#: src/testing_old/testing.c:354
-#, fuzzy, c-format
-msgid "Error reading from gnunet-peerinfo: %s\n"
-msgstr "Gặp lỗi khi đọc thông tin từ gnunetd.\n"
-
-#: src/testing_old/testing.c:358
-#, fuzzy
-msgid "Malformed output from gnunet-peerinfo!\n"
-msgstr "Gặp lỗi khi đọc thông tin từ gnunetd.\n"
-
-#: src/testing_old/testing.c:368
-#, fuzzy
-msgid "Failed to get hostkey!\n"
-msgstr "Lỗi lấy thông kê về truyền tải.\n"
-
-#: src/testing_old/testing.c:400
-msgid "`Failed while waiting for topology setup!\n"
-msgstr ""
-
-#: src/testing_old/testing.c:463
-#, fuzzy, c-format
-msgid "Could not start `%s' process to start GNUnet.\n"
-msgstr "Không thể tạo miền tên.\n"
-
-#: src/testing_old/testing.c:470
-#, fuzzy
-msgid "Failed to start `gnunet-arm' process.\n"
-msgstr "Lỗi dừng chạy gnunet-auto-share.\n"
-
-#: src/testing_old/testing.c:493 src/testing_old/testing.c:600
-msgid "`gnunet-arm' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:494 src/testing_old/testing.c:601
-#: src/testing_old/testing.c:621
-msgid "`ssh' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:570
-msgid "Unable to get HELLO for peer!\n"
-msgstr ""
-
-#: src/testing_old/testing.c:620
-msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
-msgstr ""
-
-#: src/testing_old/testing.c:643 src/testing_old/testing.c:675
-msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:658 src/testing_old/testing.c:713
-#, fuzzy
-msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
-msgstr "« %s » không phải được kết nối tới đồng đẳng nào.\n"
-
-#: src/testing_old/testing.c:786
-msgid "`scp' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:948
-#, fuzzy, c-format
-msgid "Starting service %s for peer `%4s'\n"
-msgstr "Đang bắt đầu tài về « %s »\n"
-
-#: src/testing_old/testing.c:1207 src/testing_old/testing_group.c:6172
-#, fuzzy, c-format
-msgid "Could not start `%s' process to copy configuration directory.\n"
-msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
-
-#: src/testing_old/testing.c:1292 src/testing_old/testing.c:1359
-#, fuzzy, c-format
-msgid "Terminating peer `%4s'\n"
-msgstr "Không đủ quyền cho « %s ».\n"
-
-#: src/testing_old/testing.c:1448
-#, fuzzy, c-format
-msgid "Setting d->dead on peer `%4s'\n"
-msgstr "Đang bắt đầu tài lên « %s ».\n"
-
-#: src/testing_old/testing.c:1601
-msgid "Peer not yet running, can not change configuration at this point."
-msgstr ""
-
-#: src/testing_old/testing.c:1609
-#, fuzzy
-msgid "Failed to write new configuration to disk."
-msgstr "Lỗi lưu cấu hình."
-
-#: src/testing_old/testing.c:1636
-#, fuzzy, c-format
-msgid "Could not start `%s' process to copy configuration file.\n"
-msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
-
-#: src/testing_old/testing.c:1639
-#, fuzzy
-msgid "Failed to copy new configuration to remote machine."
-msgstr "Lỗi lưu cấu hình."
-
-#: src/testing_old/testing.c:1794
-#, fuzzy
-msgid "Peers failed to connect"
-msgstr "Không kết nối được đến trình nền gnunetd."
-
-#: src/testing_old/testing.c:1922
-#, fuzzy
-msgid "Failed to connect to core service of first peer!\n"
-msgstr "Lỗi nạp dịch vụ sqstore. Hãy kiểm tra lại cấu hình.\n"
-
-#: src/testing_old/testing.c:2145
-msgid "Peers are not fully running yet, can not connect!\n"
-msgstr ""
-
-#: src/testing_old/testing_group.c:1895 src/testing_old/testing_group.c:1907
-#: src/testing_old/testing_group.c:2009 src/testing_old/testing_group.c:2066
-#: src/testing_old/testing_group.c:2153 src/testing_old/testing_group.c:2173
-#: src/testing_old/testing_group.c:2303
-#: src/testing_old/testing_peergroup.c:950
-#, fuzzy, c-format
-msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
-msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
-
-#: src/testing_old/testing_group.c:2161
-#, fuzzy, c-format
-msgid ""
-"Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
-"greater than 0\n"
-msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
-
-#: src/testing_old/testing_group.c:2878 src/testing_old/testing_group.c:3064
-#, fuzzy, c-format
-msgid ""
-"No `%s' specified in peer configuration in section `%s', cannot copy friends "
-"file!\n"
-msgstr ""
-"Đặc tả mạng dạng sai trong cấu hình phần « %s » cho mục nhập « %s »: %s\n"
-
-#: src/testing_old/testing_group.c:3958
-msgid "Creating no allowed topology (all peers can connect at core level)\n"
-msgstr ""
-
-#: src/testing_old/testing_group.c:5227
-#, fuzzy
-msgid "Unknown topology specification, can't connect peers!\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/testing_old/testing_group.c:5962
-#, fuzzy, c-format
-msgid "Could not read hostkeys file `%s'!\n"
-msgstr "Không thể đọc danh sách bạn bè « %s »\n"
-
-#: src/testing_old/testing_group.c:6029
-#, fuzzy, c-format
-msgid "Could not create configuration for peer number %u on `%s'!\n"
-msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
-
-#: src/testing/testing.c:188
+#: src/testing/testing.c:198
 #, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:204
+#: src/testing/testing.c:214
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:468
+#: src/testing/testing.c:509
 #, 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:477
+#: src/testing/testing.c:518
 #, 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:788
+#: src/testing/testing.c:829
 #, 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:799
+#: src/testing/testing.c:840
 #, 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:813
+#: src/testing/testing.c:854
 #, 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:846
+#: src/testing/testing.c:887
 #, 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:864
+#: src/testing/testing.c:905
 #, 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:925
+#: src/testing/testing.c:966
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/testing/testing.c:1088
+#: src/testing/testing.c:1129
 #, 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 »:"
@@ -4701,155 +4250,151 @@
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1026
-#, fuzzy, c-format
-msgid "Option `%s' in section `%s' not specified!\n"
-msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
-
-#: src/topology/gnunet-daemon-topology.c:1039
+#: src/topology/gnunet-daemon-topology.c:1038
 #, 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:1045
+#: src/topology/gnunet-daemon-topology.c:1044
 #, 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:1054
+#: src/topology/gnunet-daemon-topology.c:1053
 #, 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:1062
+#: src/topology/gnunet-daemon-topology.c:1061
 #, 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:1082
+#: src/topology/gnunet-daemon-topology.c:1081
 #, 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:1095
+#: src/topology/gnunet-daemon-topology.c:1094
 #, 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:1105
+#: src/topology/gnunet-daemon-topology.c:1104
 #, 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:1111
+#: src/topology/gnunet-daemon-topology.c:1110
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1121
+#: src/topology/gnunet-daemon-topology.c:1120
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/topology/gnunet-daemon-topology.c:1127
+#: src/topology/gnunet-daemon-topology.c:1126
 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:1134
+#: src/topology/gnunet-daemon-topology.c:1133
 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:1169
+#: src/topology/gnunet-daemon-topology.c:1168
 #, 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:1224
+#: src/topology/gnunet-daemon-topology.c:1223
 #, 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:1366
+#: src/topology/gnunet-daemon-topology.c:1365
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:246
+#: src/transport/gnunet-service-transport_blacklist.c:245
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
 msgstr "Không thể đọc danh sách bạn bè « %s »\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:252
+#: src/transport/gnunet-service-transport_blacklist.c:251
 #, c-format
 msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:263
+#: src/transport/gnunet-service-transport_blacklist.c:262
 #, fuzzy, c-format
 msgid "Failed to read blacklist from `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:284
-#: src/transport/gnunet-service-transport_blacklist.c:308
+#: src/transport/gnunet-service-transport_blacklist.c:283
+#: src/transport/gnunet-service-transport_blacklist.c:307
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr "Gặp lỗi cú pháp trong tập tin cấu hình « %s » tại dòng %d.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:295
-#: src/transport/gnunet-service-transport_blacklist.c:331
+#: src/transport/gnunet-service-transport_blacklist.c:294
+#: src/transport/gnunet-service-transport_blacklist.c:330
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:345
+#: src/transport/gnunet-service-transport_blacklist.c:344
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte « %s ».\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:359
+#: src/transport/gnunet-service-transport_blacklist.c:358
 #, c-format
 msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:514
-#: src/transport/gnunet-service-transport_blacklist.c:751
+#: src/transport/gnunet-service-transport_blacklist.c:513
+#: src/transport/gnunet-service-transport_blacklist.c:750
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:167
+#: src/transport/gnunet-service-transport.c:177
 #, 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:242
+#: src/transport/gnunet-service-transport.c:252
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# tổng số nội dung lỗ hổng được nhận"
 
-#: src/transport/gnunet-service-transport.c:289
+#: src/transport/gnunet-service-transport.c:299
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# các byte đã giải mã"
 
-#: src/transport/gnunet-service-transport.c:590
+#: src/transport/gnunet-service-transport.c:604
+#, fuzzy, c-format
+msgid "Transport service could not access hostkey: %s. Exiting.\n"
+msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
+#: src/transport/gnunet-service-transport.c:674
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:599
-msgid "Transport service could not access hostkey.  Exiting.\n"
-msgstr ""
-
 #: src/transport/gnunet-service-transport_clients.c:352
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
@@ -5058,155 +4603,248 @@
 msgstr ""
 
 #: src/transport/gnunet-transport.c:328
-#, c-format
-msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "Received %llu bytes/s (%llu bytes in %s)\n"
+msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:335
-#, c-format
-msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
-msgstr ""
+#: src/transport/gnunet-transport.c:336
+#, fuzzy, c-format
+msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
+msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/gnunet-transport.c:374
+#: src/transport/gnunet-transport.c:375
 #, fuzzy, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr "Đang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/transport/gnunet-transport.c:394
+#: src/transport/gnunet-transport.c:395
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "« %s » được kết nối tới « %s ».\n"
 
-#: src/transport/gnunet-transport.c:426
+#: src/transport/gnunet-transport.c:427
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "« %.*s » được kết nối tới « %.*s ».\n"
 
-#: src/transport/gnunet-transport.c:506
+#: src/transport/gnunet-transport.c:505
 #, fuzzy, c-format
 msgid "Received %u bytes from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/transport/gnunet-transport.c:529
+#: src/transport/gnunet-transport.c:528
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "Tôi là đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-transport.c:536
+#: src/transport/gnunet-transport.c:535
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:564
+#: src/transport/gnunet-transport.c:563
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr "# của các đồng đẳng đã kết nối"
 
-#: src/transport/gnunet-transport.c:633
+#: src/transport/gnunet-transport.c:632
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/transport/gnunet-transport.c:716
+#: src/transport/gnunet-transport.c:715
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:719
+#: src/transport/gnunet-transport.c:718
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/gnunet-transport.c:722
+#: src/transport/gnunet-transport.c:721
 #, fuzzy
 msgid "provide information about all current connections (once)"
 msgstr "In ra thông tin về các đồng đẳng GNUnet."
 
-#: src/transport/gnunet-transport.c:728
+#: src/transport/gnunet-transport.c:727
 #, fuzzy
 msgid "do not resolve hostnames"
 msgstr "không quyết định các tên máy"
 
-#: src/transport/gnunet-transport.c:732
+#: src/transport/gnunet-transport.c:731
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:735
+#: src/transport/gnunet-transport.c:734
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:746
+#: src/transport/gnunet-transport.c:745
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/transport/plugin_transport_http.c:1119
+#: src/transport/plugin_transport_http.c:817
+#: src/transport/plugin_transport_http_server.c:2513
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1168
+#: src/transport/plugin_transport_http.c:866
+#: src/transport/plugin_transport_http_server.c:2281
 #, 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:1200 src/util/service.c:1051
+#: src/transport/plugin_transport_http.c:898
+#: src/transport/plugin_transport_http_server.c:2313 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/transport/plugin_transport_http.c:1217 src/util/service.c:1068
+#: src/transport/plugin_transport_http.c:915
+#: src/transport/plugin_transport_http_server.c:2330 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/transport/plugin_transport_http.c:1322
+#: src/transport/plugin_transport_http.c:1020
+#: src/transport/plugin_transport_http_server.c:2441
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1407
+#: src/transport/plugin_transport_http.c:1133
+#: src/transport/plugin_transport_http_server.c:2609
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1420
+#: src/transport/plugin_transport_http.c:1146
+#: src/transport/plugin_transport_http_server.c:2620
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "Kết thúc cấu hình.\n"
 
-#: src/transport/plugin_transport_http.c:1431
+#: src/transport/plugin_transport_http.c:1157
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1451
+#: src/transport/plugin_transport_http.c:1177
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1481
+#: src/transport/plugin_transport_http.c:1206
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:621
+#: src/transport/plugin_transport_http.c:1223
+#: src/transport/plugin_transport_http_server.c:2702
+#, fuzzy, c-format
+msgid "Using external hostname `%s'\n"
+msgstr "Đang bắt đầu tài về « %s »\n"
+
+#: src/transport/plugin_transport_http.c:1228
+msgid "No external hostname configured\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_client.c:1419
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:178
+#: src/transport/plugin_transport_http_client.c:1550
+#: src/transport/plugin_transport_http_server.c:2826
+#, 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:1575
+#: src/transport/plugin_transport_http_server.c:2885
+#, 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:1603
+#: src/transport/plugin_transport_http_server.c:2732
+#, 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:1302
+#, 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:1560
+#, c-format
+msgid "Accepting connection (%u of %u) from `%s'\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:1568
+#, c-format
+msgid ""
+"Server reached maximum number connections (%u), rejecting new connection\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:1869
+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:202
+#: src/transport/plugin_transport_http_server.c:1893
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
+#: src/transport/plugin_transport_http_server.c:2588
+#, c-format
+msgid "IPv4 support is %s\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2602
+#, c-format
+msgid "IPv6 support is %s\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2627
+#, 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:2642
+#, 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:2652
+#, 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:2673
+#, 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:2683
+#, 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:2718
+#, fuzzy, c-format
+msgid "Notifying transport only about hostname `%s'\n"
+msgstr "không quyết định các tên máy"
+
 #: src/transport/plugin_transport_smtp.c:370
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -5267,7 +4905,7 @@
 #: src/transport/plugin_transport_tcp.c:774
 #: src/transport/plugin_transport_tcp.c:963
 #: src/transport/plugin_transport_tcp.c:1807
-#: src/transport/plugin_transport_tcp.c:2424
+#: src/transport/plugin_transport_tcp.c:2423
 #, fuzzy
 msgid "# TCP sessions active"
 msgstr "# các khoá phiên chạy được chấp nhận"
@@ -5309,8 +4947,8 @@
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2313 src/util/service.c:946
-#: src/util/service.c:952
+#: src/transport/plugin_transport_tcp.c:2313 src/util/service.c:948
+#: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -5320,21 +4958,16 @@
 msgid "Failed to start service.\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/transport/plugin_transport_tcp.c:2389
-#, fuzzy, c-format
-msgid "Failed to find option %s in section %s!\n"
-msgstr "Lỗi đóng kết đến cổng %s %d.\n"
-
-#: src/transport/plugin_transport_tcp.c:2412
+#: src/transport/plugin_transport_tcp.c:2411
 #, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2416
+#: src/transport/plugin_transport_tcp.c:2415
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2420
+#: src/transport/plugin_transport_tcp.c:2419
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5349,19 +4982,19 @@
 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:392
+#: src/transport/plugin_transport_udp_broadcasting.c:394
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1903
+#: src/transport/plugin_transport_udp.c:1965
 #, 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:1917
+#: src/transport/plugin_transport_udp.c:1979
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5369,22 +5002,22 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2162
+#: src/transport/plugin_transport_udp.c:2192
 #, 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:2328
+#: src/transport/plugin_transport_udp.c:2268
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2371
+#: src/transport/plugin_transport_udp.c:2311
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/transport/plugin_transport_unix.c:1346
+#: src/transport/plugin_transport_unix.c:1355
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -5400,87 +5033,77 @@
 
 #: src/transport/plugin_transport_wlan.c:625
 #: src/transport/plugin_transport_wlan.c:675
-#: src/transport/plugin_transport_wlan.c:1695
+#: src/transport/plugin_transport_wlan.c:1720
 #, fuzzy
 msgid "# WLAN sessions allocated"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/transport/plugin_transport_wlan.c:748
+#: src/transport/plugin_transport_wlan.c:749
 #, fuzzy
 msgid "# WLAN message fragments sent"
 msgstr "# các thông báo bị tế phân"
 
-#: src/transport/plugin_transport_wlan.c:766
+#: src/transport/plugin_transport_wlan.c:773
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:866
-#: src/transport/plugin_transport_wlan.c:947
-#: src/transport/plugin_transport_wlan.c:1697
+#: src/transport/plugin_transport_wlan.c:873
+#: src/transport/plugin_transport_wlan.c:954
+#: src/transport/plugin_transport_wlan.c:1722
 #, 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:1118
+#: src/transport/plugin_transport_wlan.c:1135
 #, 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:1139
+#: src/transport/plugin_transport_wlan.c:1156
 #, fuzzy
 msgid "# fragments received via WLAN"
 msgstr "# các mảnh bị loại bỏ"
 
-#: src/transport/plugin_transport_wlan.c:1149
+#: src/transport/plugin_transport_wlan.c:1166
 #, fuzzy
 msgid "# ACKs received via WLAN"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/transport/plugin_transport_wlan.c:1206
+#: src/transport/plugin_transport_wlan.c:1223
 #, 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:1305
+#: src/transport/plugin_transport_wlan.c:1324
 #, 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:1340
+#: src/transport/plugin_transport_wlan.c:1359
 #, 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:1401
+#: src/transport/plugin_transport_wlan.c:1420
 #, fuzzy
 msgid "# HELLO beacons sent via WLAN"
 msgstr "# các byte đã gửi qua UDP"
 
-#: src/transport/plugin_transport_wlan.c:1510
+#: src/transport/plugin_transport_wlan.c:1529
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1667
-#, fuzzy, c-format
-msgid "Invalid configuration option `%s' in section `%s'\n"
-msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
-
-#: src/transport/plugin_transport_wlan.c:1676
+#: src/transport/plugin_transport_wlan.c:1703
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1686
-#, fuzzy, c-format
-msgid "Missing configuration option `%s' in section `%s'\n"
-msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
-
 #: src/transport/transport_api.c:575
 #, fuzzy, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr "Nhận được thông báo bị hỏng từ đồng đẳng « %s » trong %s:%d.\n"
 
-#: src/transport/transport-testing.c:589
+#: src/transport/transport-testing.c:590
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
@@ -5514,12 +5137,12 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:982
+#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:984
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:278 src/util/client.c:754 src/util/service.c:986
+#: src/util/client.c:278 src/util/client.c:754 src/util/service.c:988
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: tùy chọn « %s » là mơ hồ\n"
@@ -5554,23 +5177,23 @@
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1008
+#: src/util/common_logging.c:258 src/util/common_logging.c:1007
 msgid "DEBUG"
 msgstr "GỠ LỖI"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1006
+#: src/util/common_logging.c:260 src/util/common_logging.c:1005
 msgid "INFO"
 msgstr "TIN"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1004
+#: src/util/common_logging.c:262 src/util/common_logging.c:1003
 msgid "WARNING"
 msgstr "CẢNH BÁO"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1002
+#: src/util/common_logging.c:264 src/util/common_logging.c:1001
 msgid "ERROR"
 msgstr "LỖI"
 
-#: src/util/common_logging.c:266 src/util/common_logging.c:1010
+#: src/util/common_logging.c:266 src/util/common_logging.c:1009
 msgid "NONE"
 msgstr ""
 
@@ -5584,18 +5207,31 @@
 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:1011
+#: src/util/common_logging.c:1010
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1113
+#: src/util/common_logging.c:1149
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1151
+#: src/util/common_logging.c:1187
 msgid "invalid address"
 msgstr ""
 
+#: src/util/common_logging.c:1205
+#, fuzzy, c-format
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr ""
+"Cấu hình không thỏa mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
+
+#: src/util/common_logging.c:1226
+#, fuzzy, c-format
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %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/configuration.c:259
 #, fuzzy, c-format
 msgid "Syntax error while deserializing operation at line %u\n"
@@ -5648,67 +5284,75 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_random.c:284
+#: src/util/crypto_random.c:313
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:313
+#: src/util/crypto_random.c:342
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/util/crypto_rsa.c:635 src/util/crypto_rsa.c:651
-#: src/util/crypto_rsa.c:833
+#: src/util/crypto_rsa.c:640
 #, fuzzy, c-format
-msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgid ""
+"File `%s' does not contain a valid private key (too long, %llu bytes).  "
+"Deleting it.\n"
 msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
 
-#: src/util/crypto_rsa.c:731 src/util/crypto_rsa.c:778
+#: src/util/crypto_rsa.c:657
 #, fuzzy, c-format
+msgid ""
+"File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
+"Deleting it.\n"
+msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
+
+#: src/util/crypto_rsa.c:755 src/util/crypto_rsa.c:802
+#, 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_rsa.c:736
+#: src/util/crypto_rsa.c:760
 #, 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_rsa.c:754
+#: src/util/crypto_rsa.c:778
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:782 src/util/crypto_rsa.c:818
+#: src/util/crypto_rsa.c:806 src/util/crypto_rsa.c:842
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:813
+#: src/util/crypto_rsa.c:837
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:851
+#: src/util/crypto_rsa.c:857
+#, fuzzy, c-format
+msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgstr "Tập tin « %s » không chứa biệt hiệu nên thử gỡ bỏ.\n"
+
+#: src/util/crypto_rsa.c:875
 #, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:926
+#: src/util/crypto_rsa.c:948
 msgid "interrupted by shutdown"
 msgstr ""
 
-#: src/util/crypto_rsa.c:935
-#, fuzzy
-msgid "internal error"
-msgstr "Lỗi VR."
-
-#: src/util/crypto_rsa.c:944 src/util/crypto_rsa.c:951
+#: src/util/crypto_rsa.c:959
 msgid "gnunet-rsa failed"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1332
+#: src/util/crypto_rsa.c:1347
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
@@ -5723,7 +5367,7 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Mong đợi « %s » là một thư mục.\n"
 
-#: src/util/disk.c:1494 src/util/service.c:1665
+#: src/util/disk.c:1494 src/util/service.c:1667
 #, 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"
@@ -5802,11 +5446,47 @@
 "Mọi đối số bắt buộc phải sử dụng với tùy chọn dài cũng bắt buộc với tùy chọn "
 "ngắn.\n"
 
-#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:286
+#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:316
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
 
+#: src/util/getopt_helpers.c:288
+#, fuzzy, c-format
+msgid "You must pass relative time to the `%s' option.\n"
+msgstr "Phải gửi một con số cho tùy chọn « %s ».\n"
+
+#: src/util/gnunet-config.c:90
+#, fuzzy, c-format
+msgid "--section argument is required\n"
+msgstr "đặt tên hiệu cần dùng (cần thiết)"
+
+#: src/util/gnunet-config.c:133
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr ""
+
+#: src/util/gnunet-config.c:160
+msgid "obtain option of value as a filename (with $-expansion)"
+msgstr ""
+
+#: src/util/gnunet-config.c:163
+msgid "name of the section to access"
+msgstr ""
+
+#: src/util/gnunet-config.c:166
+msgid "name of the option to access"
+msgstr ""
+
+#: src/util/gnunet-config.c:169
+msgid "value to set"
+msgstr ""
+
+#: src/util/gnunet-config.c:179
+#, fuzzy
+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-resolver.c:148
 msgid "perform a reverse lookup"
 msgstr ""
@@ -5815,24 +5495,56 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:104
+#: src/util/gnunet-rsa.c:114
+#, 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-rsa.c:120
 #, c-format
+msgid "Generating %u keys, please wait"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:138
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Failed to write to `%s': %s\n"
+msgstr "Lỗi chạy %s: %s %d\n"
+
+#: src/util/gnunet-rsa.c:150
+#, c-format
+msgid "Finished!\n"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:173
+#, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:154
+#: src/util/gnunet-rsa.c:230
+msgid "create COUNT public-private key pairs (for testing)"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:233
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:157
+#: src/util/gnunet-rsa.c:236
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:160
+#: src/util/gnunet-rsa.c:239
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:170
+#: src/util/gnunet-rsa.c:242
+msgid ""
+"use insecure, weak random number generator for key generation (for testing "
+"only)"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:252
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -5847,32 +5559,56 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "Không tìm thấy địa chỉ IP của máy « %s »: %s\n"
 
-#: src/util/helper.c:254
+#: src/util/gnunet-uri.c:90
+#, c-format
+msgid "No URI specified on command line\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:95
 #, fuzzy, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
+
+#: src/util/gnunet-uri.c:102
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:112
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:174
+msgid "Perform default-actions for GNUnet URIs"
+msgstr ""
+
+#: src/util/helper.c:260
+#, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
 
-#: src/util/helper.c:274
+#: src/util/helper.c:280
 #, c-format
 msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/util/helper.c:290
+#: src/util/helper.c:296
 #, fuzzy, c-format
 msgid "Got %u bytes from helper `%s'\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/util/helper.c:299
+#: src/util/helper.c:305
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "Lỗi đọc danh sách bạn bè từ « %s »\n"
 
-#: src/util/helper.c:337
+#: src/util/helper.c:343
 #, fuzzy, c-format
 msgid "Starting HELPER process `%s'\n"
 msgstr "Đang bắt đầu tài về « %s »\n"
 
-#: src/util/helper.c:476
+#: src/util/helper.c:496
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "Gặp lỗi khi tạo người dùng"
@@ -5974,22 +5710,22 @@
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:468
+#: src/util/server.c:431
 #, 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:477
+#: src/util/server.c:440
 #, 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:488
+#: src/util/server.c:451
 #, 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:819
+#: src/util/server.c:836
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -6022,95 +5758,95 @@
 msgid "Wrong format `%s' for network\n"
 msgstr "Mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/service.c:705
+#: src/util/service.c:707
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:710
+#: src/util/service.c:712
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "\tKhông rõ miền tên « %s »\n"
 
-#: src/util/service.c:717
+#: src/util/service.c:719
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:772
+#: src/util/service.c:774
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:809
+#: src/util/service.c:811
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:927
+#: src/util/service.c:929
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1005
+#: src/util/service.c:1007
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1022
+#: src/util/service.c:1024
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1256
+#: src/util/service.c:1258
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1307 src/util/service.c:1325
+#: src/util/service.c:1309 src/util/service.c:1327
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1352
+#: src/util/service.c:1354
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1521
+#: src/util/service.c:1523
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/util/service.c:1554
+#: src/util/service.c:1556
 #, 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:1603
+#: src/util/service.c:1605
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1607
+#: src/util/service.c:1609
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1611
+#: src/util/service.c:1613
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1666
+#: src/util/service.c:1668
 msgid "No such user"
 msgstr "Không có người dùng như vậy"
 
-#: src/util/service.c:1679
+#: src/util/service.c:1681
 #, 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:1744
+#: src/util/service.c:1746
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -6133,57 +5869,57 @@
 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:626
+#: src/util/strings.c:631
 msgid "ms"
 msgstr "mg"
 
-#: src/util/strings.c:631
+#: src/util/strings.c:635
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:635
+#: src/util/strings.c:641
 msgid "s"
 msgstr "g"
 
-#: src/util/strings.c:639
+#: src/util/strings.c:647
 msgid "m"
 msgstr "p"
 
-#: src/util/strings.c:643
+#: src/util/strings.c:653
 msgid "h"
 msgstr "g"
 
-#: src/util/strings.c:648
+#: src/util/strings.c:660
 #, fuzzy
 msgid "day"
 msgstr " ngày"
 
-#: src/util/strings.c:650
+#: src/util/strings.c:662
 #, fuzzy
 msgid "days"
 msgstr " ngày"
 
-#: src/util/strings.c:674
+#: src/util/strings.c:689
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1063
+#: src/util/strings.c:1078
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1071
+#: src/util/strings.c:1086
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1077
+#: src/util/strings.c:1092
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1084
+#: src/util/strings.c:1099
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1093
+#: src/util/strings.c:1108
 #, 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"
@@ -6362,23 +6098,390 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:515 src/include/gnunet_common.h:520
-#: src/include/gnunet_common.h:526
+#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
+#: src/include/gnunet_common.h:591
 #, fuzzy, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:536
+#: src/include/gnunet_common.h:601
 #, fuzzy, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/include/gnunet_common.h:557 src/include/gnunet_common.h:564
+#: src/include/gnunet_common.h:622 src/include/gnunet_common.h:629
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr "« %s » thất bại ở tập tin « %s » tại %s:%d với lỗi: %s\n"
 
 #, fuzzy
+#~ msgid "Asked to start service `%s' within %llu ms\n"
+#~ msgstr "« %s »: Chưa nhận thông báo sau %llu miligiây.\n"
+
+#, fuzzy
+#~ msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+#~ msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
+
+#, fuzzy
+#~ msgid "Could not transmit confirmation receipt\n"
+#~ msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
+#, fuzzy
+#~ msgid "Unknown message type: '%u'\n"
+#~ msgstr "\tKhông rõ miền tên « %s »\n"
+
+#, fuzzy
+#~ msgid "Configuration option `%s' in section `%s' missing\n"
+#~ msgstr ""
+#~ "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+
+#, fuzzy
+#~ msgid "Failed to access chat home directory `%s'\n"
+#~ msgstr "Lỗi truy cập đến thư mục nhà GNUnet « %s »\n"
+
+#, fuzzy
+#~ msgid "Failed to create/open key in file `%s'\n"
+#~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
+
+#, fuzzy
+#~ 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"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said: %s\n"
+#~ msgstr "« %s » nói: %s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said to you: %s\n"
+#~ msgstr "« %s » nói cho bạn: %s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said for sure: %s\n"
+#~ msgstr "« %s » nói thật: %s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said to you for sure: %s\n"
+#~ msgstr "« %s » nói thật cho bạn: %s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' was confirmed that you received: %s\n"
+#~ msgstr "« %s » xác nhận bạn đã nhận được: %s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
+#~ msgstr "« %s » xác nhận mà chỉ bạn đã nhận được: %s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
+#~ msgstr "« %s » xác nhận mà bạn đã nhận được từ họ : %s\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "(%s) `%s' was confirmed that you and only you received from him or her: "
+#~ "%s\n"
+#~ msgstr "« %s » xác nhận mà chỉ bạn đa nhận được từ họ : %s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said off the record: %s\n"
+#~ msgstr "« %s » nói không chính thức: %s\n"
+
+#, fuzzy
+#~ msgid "(%s) <%s> said using an unknown message type: %s\n"
+#~ msgstr "<%s> đã nói bằng một kiểu tin nhẳn không rõ : %s\n"
+
+#~ msgid "`%s' entered the room\n"
+#~ msgstr "« %s » vào phòng\n"
+
+#~ msgid "`%s' left the room\n"
+#~ msgstr "« %s » rời phòng\n"
+
+#, fuzzy
+#~ msgid "Could not change username\n"
+#~ msgstr "Không thể tạo miền tên.\n"
+
+#, fuzzy
+#~ msgid "Joining room `%s' as user `%s'...\n"
+#~ msgstr "Đã vào phòng « %s » là người dùng « %s ».\n"
+
+#, fuzzy
+#~ msgid "Changed username to `%s'\n"
+#~ msgstr "Đã thay đổi tên người dùng thành « %s ».\n"
+
+#~ msgid "Users in room `%s': "
+#~ msgstr "Người dùng trong phòng « %s »:"
+
+#~ msgid "Syntax: /msg USERNAME MESSAGE"
+#~ msgstr "Cú pháp: /msg TÊN_NGƯỜI_DÙNG TIN_NHẲN"
+
+#~ msgid "User `%s' is currently not in the room!\n"
+#~ msgstr "Người dùng « %s » hiện thời không có trong phòng này.\n"
+
+#, fuzzy
+#~ msgid "Unknown command `%s'\n"
+#~ msgstr "Không rõ câu lệnh « %s ».\n"
+
+#~ msgid ""
+#~ "Use `/join #roomname' to join a chat room. Joining a room will cause you "
+#~ "to leave the current room"
+#~ msgstr ""
+#~ "Gõ chuỗi « /join #tên_phòng » để vào một phòng trò chuyện nào đó (việc "
+#~ "này cũng gây ra bạn ra khỏi phòng hiện tại)"
+
+#~ msgid ""
+#~ "Use `/nick nickname' to change your nickname.  This will cause you to "
+#~ "leave the current room and immediately rejoin it with the new name."
+#~ msgstr ""
+#~ "Gõ chuỗi « /nick tên_hiệu » để thay đổi tên hiệu của mình (việc này cũng "
+#~ "gây ra bạn ra khỏi phòng hiện tại, sau đó vào lại ngay với tên mới)"
+
+#~ msgid ""
+#~ "Use `/msg nickname message' to send a private message to the specified "
+#~ "user"
+#~ msgstr ""
+#~ "Gõ chuỗi « /msg tên_hiệu tin_nhẳn » để gửi một tin nhẳn riêng cho người "
+#~ "dùng có tên đó"
+
+#~ msgid "The `/notice' command is an alias for `/msg'"
+#~ msgstr "Lệnh « /notice » là một biệt hiệu cho « /msg »"
+
+#~ msgid "The `/query' command is an alias for `/msg'"
+#~ msgstr "Lệnh « /query » là một biệt hiệu cho « /msg »"
+
+#, fuzzy
+#~ msgid "Use `/sig message' to send a signed public message"
+#~ msgstr ""
+#~ "Gõ chuỗi « /msg tên_hiệu tin_nhẳn » để gửi một tin nhẳn riêng cho người "
+#~ "dùng có tên đó"
+
+#, fuzzy
+#~ msgid "The `/anon' command is an alias for `/anonymous'"
+#~ msgstr "Lệnh « /notice » là một biệt hiệu cho « /msg »"
+
+#~ msgid "Use `/quit' to terminate gnunet-chat"
+#~ msgstr "Gõ chuỗi « /quit » để thoát khỏi trình gnunet-chat"
+
+#~ msgid "The `/leave' command is an alias for `/quit'"
+#~ msgstr "Lệnh « /leave » là một biệt hiệu cho « /quit »"
+
+#~ msgid "Use `/names' to list all of the current members in the chat room"
+#~ msgstr ""
+#~ "Gõ chuỗi « /names » để liệt kê tất cả các thành viên hiện thời trong "
+#~ "phòng trò chuyện đó"
+
+#~ msgid "Use `/help command' to get help for a specific command"
+#~ msgstr "Gõ chuỗi « /help LỆNH » để xem trợ giúp về lệnh đó"
+
+#~ msgid "You must specify a nickname\n"
+#~ msgstr "Phải ghi rõ tên hiệu\n"
+
+#~ msgid "Failed to join room `%s'\n"
+#~ msgstr "Lỗi vào phòng « %s »\n"
+
+#~ msgid "set the chat room to join"
+#~ msgstr "đặt phòng trò chuyện cần vào"
+
+#~ msgid "Join a chat on GNUnet."
+#~ msgstr "Vào phòng trò chuyện trên GNUnet."
+
+#, fuzzy
+#~ msgid "Failed to queue a message notification\n"
+#~ msgstr "Lỗi lưu cấu hình."
+
+#, fuzzy
+#~ msgid "Failed to queue a join notification\n"
+#~ msgstr "Lỗi lưu cấu hình."
+
+#, fuzzy
+#~ msgid "Failed to queue a confirmation receipt\n"
+#~ msgstr "Lỗi lưu cấu hình."
+
+#, fuzzy
+#~ msgid "Failed to queue a leave notification\n"
+#~ msgstr "Lỗi lưu cấu hình."
+
+#, fuzzy
+#~ msgid "Connected to %s service!\n"
+#~ msgstr "« %s » được kết nối tới « %s ».\n"
+
+#, fuzzy
+#~ msgid "Configuration fails to specify `%s' in section `%s'\n"
+#~ 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 option `%s' in section `%s' missing.\n"
+#~ msgstr ""
+#~ "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+
+#, fuzzy
+#~ msgid "Configuration fails to specify `%s', assuming default value."
+#~ msgstr "Tập tin cấu hình « %s » đã được ghi.\n"
+
+#, fuzzy
+#~ msgid "Key file `%s' for private zone does not exist!\n"
+#~ msgstr "đặt số trình nền cần khởi chạy"
+
+#, fuzzy
+#~ msgid "Option `%s' not specified in configuration section `%s'\n"
+#~ msgstr ""
+#~ "Đặc tả mạng dạng sai trong cấu hình phần « %s » cho mục nhập « %s »: %s\n"
+
+#, fuzzy
+#~ msgid "Peer is lacking HOSTKEY configuration setting.\n"
+#~ msgstr "Lưu cấu hình ngay bây giờ không?"
+
+#, fuzzy
+#~ msgid "Could not access hostkey.\n"
+#~ msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
+
+#, fuzzy
+#~ msgid "`scp' did not complete cleanly.\n"
+#~ msgstr "« %s » không phải được kết nối tới đồng đẳng nào.\n"
+
+#, fuzzy
+#~ msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
+#~ msgstr "Lỗi bắt đầu thu thập.\n"
+
+#, fuzzy
+#~ msgid "Failed to create pipe for `ssh' process.\n"
+#~ msgstr "Lỗi tạo thư mục tạm thời."
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to create hostkey.\n"
+#~ msgstr "Lỗi bắt đầu thu thập.\n"
+
+#, fuzzy
+#~ msgid "Failed to start `gnunet-peerinfo' process.\n"
+#~ msgstr "Lỗi bắt đầu thu thập.\n"
+
+#, fuzzy
+#~ msgid "Failed to start `ssh' process.\n"
+#~ msgstr "Lỗi bắt đầu thu thập.\n"
+
+#, fuzzy
+#~ msgid "Error reading from gnunet-peerinfo: %s\n"
+#~ msgstr "Gặp lỗi khi đọc thông tin từ gnunetd.\n"
+
+#, fuzzy
+#~ msgid "Malformed output from gnunet-peerinfo!\n"
+#~ 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"
+
+#, fuzzy
+#~ msgid "Failed to start `gnunet-arm' process.\n"
+#~ msgstr "Lỗi dừng chạy gnunet-auto-share.\n"
+
+#, fuzzy
+#~ msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
+#~ msgstr "« %s » không phải được kết nối tới đồng đẳng nào.\n"
+
+#, fuzzy
+#~ msgid "Starting service %s for peer `%4s'\n"
+#~ msgstr "Đang bắt đầu tài về « %s »\n"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to copy configuration directory.\n"
+#~ msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
+#, fuzzy
+#~ msgid "Terminating peer `%4s'\n"
+#~ msgstr "Không đủ quyền cho « %s ».\n"
+
+#, fuzzy
+#~ msgid "Setting d->dead on peer `%4s'\n"
+#~ msgstr "Đang bắt đầu tài lên « %s ».\n"
+
+#, fuzzy
+#~ msgid "Failed to write new configuration to disk."
+#~ msgstr "Lỗi lưu cấu hình."
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to copy configuration file.\n"
+#~ msgstr "Không tìm thấy phương pháp « %s%s » trong thư viện « %s ».\n"
+
+#, fuzzy
+#~ msgid "Failed to copy new configuration to remote machine."
+#~ msgstr "Lỗi lưu cấu hình."
+
+#, fuzzy
+#~ msgid "Peers failed to connect"
+#~ msgstr "Không kết nối được đến trình nền gnunetd."
+
+#, fuzzy
+#~ msgid "Failed to connect to core service of first peer!\n"
+#~ msgstr "Lỗi nạp dịch vụ sqstore. Hãy kiểm tra lại cấu hình.\n"
+
+#, fuzzy
+#~ msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
+#~ msgstr ""
+#~ "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
+#~ "greater than 0\n"
+#~ msgstr ""
+#~ "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "No `%s' specified in peer configuration in section `%s', cannot copy "
+#~ "friends file!\n"
+#~ msgstr ""
+#~ "Đặc tả mạng dạng sai trong cấu hình phần « %s » cho mục nhập « %s »: %s\n"
+
+#, fuzzy
+#~ msgid "Unknown topology specification, can't connect peers!\n"
+#~ msgstr "Lỗi cú pháp trong sự xác định địa hình học, đang bỏ qua các byte.\n"
+
+#, fuzzy
+#~ msgid "Could not read hostkeys file `%s'!\n"
+#~ msgstr "Không thể đọc danh sách bạn bè « %s »\n"
+
+#, fuzzy
+#~ msgid "Could not create configuration for peer number %u on `%s'!\n"
+#~ msgstr "Không thể truy cập đến thông tin về không gian tên.\n"
+
+#, fuzzy
+#~ msgid "Option `%s' in section `%s' not specified!\n"
+#~ msgstr "Bị từ chối đặt tùy chọn « %s » trong phần « %s » thành « %s ».\n"
+
+#, fuzzy
+#~ msgid "Failed to find option %s in section %s!\n"
+#~ msgstr "Lỗi đóng kết đến cổng %s %d.\n"
+
+#, fuzzy
+#~ msgid "Invalid configuration option `%s' in section `%s'\n"
+#~ msgstr ""
+#~ "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+
+#, fuzzy
+#~ msgid "Missing configuration option `%s' in section `%s'\n"
+#~ msgstr ""
+#~ "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
+
+#, fuzzy
+#~ msgid "internal error"
+#~ msgstr "Lỗi VR."
+
+#, fuzzy
 #~ msgid "Could not create namespace `%s'\n"
 #~ msgstr "Không thể tạo miền tên.\n"
 
@@ -6531,10 +6634,6 @@
 #~ msgstr "Lỗi kết nối đến gnunetd.\n"
 
 #, fuzzy
-#~ msgid "Failed to send to `%s': %s\n"
-#~ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
-
-#, fuzzy
 #~ msgid "Could not access file: %s\n"
 #~ msgstr "Không thể truy cập đến « %s »: %s\n"
 
@@ -6987,9 +7086,6 @@
 #~ msgid "install GNUnet as Windows service"
 #~ msgstr "cài đặt GNUnet như là một dịch vụ Windows"
 
-#~ msgid "increase the maximum number of TCP/IP connections"
-#~ msgstr "tăng sổ tối đa các kết nối TCP/IP"
-
 #~ msgid "display a file's hash value"
 #~ msgstr "hiển thị giá trị tổng kiểm của tập tin"
 
@@ -8571,9 +8667,6 @@
 #~ msgid "repeat each test X times"
 #~ msgstr "lặp lại mỗi hàm thử X lần"
 
-#~ msgid "Testing transport(s) %s\n"
-#~ msgstr "Đang thử nghiệm (các) truyền tải %s\n"
-
 #~ msgid "Available transport(s): %s\n"
 #~ msgstr "Các truyền tải sẵn sàng: %s\n"
 

Modified: gnunet/po/zh_CN.po
===================================================================
--- gnunet/po/zh_CN.po  2012-09-27 19:36:14 UTC (rev 24062)
+++ gnunet/po/zh_CN.po  2012-09-27 19:40:20 UTC (rev 24063)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-08-17 00:17+0200\n"
+"POT-Creation-Date: 2012-09-27 21:17+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"
@@ -20,51 +20,6 @@
 msgid "Failed to transmit shutdown request to client.\n"
 msgstr ""
 
-#: src/arm/arm_api.c:354
-#, fuzzy, c-format
-msgid "Configuration failes to specify option `%s' in section `%s'!\n"
-msgstr "配置不满足配置规范文件“%s”的约束！\n"
-
-#: src/arm/arm_api.c:368
-#, fuzzy, c-format
-msgid "Configuration fails to specify option `%s' in section `%s'!\n"
-msgstr "配置不满足配置规范文件“%s”的约束！\n"
-
-#: src/arm/arm_api.c:437
-#, c-format
-msgid "Error receiving response to `%s' request from ARM for service `%s'\n"
-msgstr ""
-
-#: src/arm/arm_api.c:490
-#, c-format
-msgid "Requesting start of service `%s'.\n"
-msgstr ""
-
-#: src/arm/arm_api.c:491
-#, c-format
-msgid "Requesting termination of service `%s'.\n"
-msgstr ""
-
-#: src/arm/arm_api.c:512
-#, c-format
-msgid "Error while trying to transmit request to start `%s' to ARM\n"
-msgstr ""
-
-#: src/arm/arm_api.c:513
-#, c-format
-msgid "Error while trying to transmit request to stop `%s' to ARM\n"
-msgstr ""
-
-#: src/arm/arm_api.c:547
-#, c-format
-msgid "Asked to start service `%s' within %llu ms\n"
-msgstr ""
-
-#: src/arm/arm_api.c:620
-#, c-format
-msgid "Stopping service `%s' within %llu ms\n"
-msgstr ""
-
 #: src/arm/gnunet-arm.c:166
 #, fuzzy, c-format
 msgid "Service `%s' is unknown to ARM.\n"
@@ -115,21 +70,16 @@
 msgid "Unknown response code from ARM.\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:229
+#: src/arm/gnunet-arm.c:230
 #, fuzzy
 msgid "Error communicating with ARM. ARM not running?\n"
 msgstr "连接 %s:%u 出错。守护程序在运行吗？\n"
 
-#: src/arm/gnunet-arm.c:232
+#: src/arm/gnunet-arm.c:233
 msgid "Running services:\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:256
-#, c-format
-msgid "Fatal configuration error: `%s' option in section `%s' missing.\n"
-msgstr ""
-
-#: src/arm/gnunet-arm.c:264 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:384
+#: src/arm/gnunet-arm.c:263 src/arm/gnunet-arm.c:368 src/arm/gnunet-arm.c:385
 msgid "Fatal error initializing ARM API.\n"
 msgstr ""
 
@@ -143,55 +93,55 @@
 msgid "Failed to remove servicehome directory %s\n"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:418
+#: src/arm/gnunet-arm.c:416
 #, fuzzy
 msgid "stop all GNUnet services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:420
+#: src/arm/gnunet-arm.c:418
 msgid "start a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:422
+#: src/arm/gnunet-arm.c:420
 msgid "stop a particular service"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:424
+#: src/arm/gnunet-arm.c:422
 #, fuzzy
 msgid "start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:427
+#: src/arm/gnunet-arm.c:425
 #, fuzzy
 msgid "stop and start all GNUnet default services"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-arm.c:430
+#: src/arm/gnunet-arm.c:428
 msgid "delete config file and directory on exit"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:432
+#: src/arm/gnunet-arm.c:430
 msgid "don't print status messages"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:435
+#: src/arm/gnunet-arm.c:433
 #, fuzzy
 msgid "timeout for completing current operation"
 msgstr "等待一次迭代完成的时间(毫秒)"
 
-#: src/arm/gnunet-arm.c:437
+#: src/arm/gnunet-arm.c:435
 msgid "List currently running services"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:439
+#: src/arm/gnunet-arm.c:437
 msgid "Don't let gnunet-service-arm inherit standard output"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:441
+#: src/arm/gnunet-arm.c:439
 msgid "Don't let gnunet-service-arm inherit standard error"
 msgstr ""
 
-#: src/arm/gnunet-arm.c:455
+#: src/arm/gnunet-arm.c:450
 msgid "Control services and the Automated Restart Manager (ARM)"
 msgstr ""
 
@@ -254,7 +204,7 @@
 
 #: src/arm/gnunet-service-arm.c:986
 #, fuzzy, c-format
-msgid "Service `%s' took %llu ms to terminate\n"
+msgid "Service `%s' took %s to terminate\n"
 msgstr "服务已删除。\n"
 
 #: src/arm/gnunet-service-arm.c:1021
@@ -262,26 +212,17 @@
 msgid "Service `%s' terminated with status %s/%d, will restart in %llu ms\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1127
+#: src/arm/gnunet-service-arm.c:1214
 #, fuzzy, c-format
-msgid "Configuration file `%s' for service `%s' not valid: %s\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/arm/gnunet-service-arm.c:1129
-msgid "option missing"
-msgstr ""
-
-#: src/arm/gnunet-service-arm.c:1213
-#, fuzzy, c-format
 msgid "Starting default services `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/arm/gnunet-service-arm.c:1224
+#: src/arm/gnunet-service-arm.c:1225
 #, c-format
 msgid "Default service `%s' not configured correctly!\n"
 msgstr ""
 
-#: src/arm/gnunet-service-arm.c:1238
+#: src/arm/gnunet-service-arm.c:1239
 msgid ""
 "No default services configured, GNUnet will not really start right now.\n"
 msgstr ""
@@ -310,269 +251,6 @@
 msgid "Loading block plugin `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/chat/chat.c:175
-msgid "Could not transmit confirmation receipt\n"
-msgstr ""
-
-#: src/chat/chat.c:283
-msgid "The current user must be the the first one joined\n"
-msgstr ""
-
-#: src/chat/chat.c:412
-#, fuzzy, c-format
-msgid "Unknown message type: '%u'\n"
-msgstr "未知操作“%s”。\n"
-
-#: src/chat/chat.c:472
-#, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/chat/chat.c:480
-#, fuzzy, c-format
-msgid "Failed to access chat home directory `%s'\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/chat/chat.c:498
-#, fuzzy, c-format
-msgid "Failed to create/open key in file `%s'\n"
-msgstr "打开日志文件“%s”失败：%s\n"
-
-#: src/chat/chat.c:559
-msgid "Could not serialize metadata\n"
-msgstr ""
-
-#: src/chat/chat.c:674
-#, fuzzy
-msgid "Failed to connect to the chat service\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/chat/chat.c:680
-msgid "Undefined mandatory parameter: joinCallback\n"
-msgstr ""
-
-#: src/chat/chat.c:686
-msgid "Undefined mandatory parameter: messageCallback\n"
-msgstr ""
-
-#: src/chat/chat.c:692
-msgid "Undefined mandatory parameter: memberCallback\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:93
-msgid "Joined\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:125 src/chat/gnunet-chat.c:133
-#: src/chat/gnunet-chat.c:213 src/chat/gnunet-chat.c:253
-#: src/chat/gnunet-chat.c:329 src/chat/gnunet-chat.c:371
-#: src/chat/gnunet-chat.c:400 src/chat/gnunet-chat.c:700
-msgid "anonymous"
-msgstr "匿名"
-
-#: src/chat/gnunet-chat.c:144
-#, fuzzy, c-format
-msgid "(%s) `%s' said: %s\n"
-msgstr "“%s”说：%s\n"
-
-#: src/chat/gnunet-chat.c:147 src/chat/gnunet-chat.c:150
-#, fuzzy, c-format
-msgid "(%s) `%s' said to you: %s\n"
-msgstr "“%s”对您说：%s\n"
-
-#: src/chat/gnunet-chat.c:153
-#, fuzzy, c-format
-msgid "(%s) `%s' said for sure: %s\n"
-msgstr "“%s”对您说：%s\n"
-
-#: src/chat/gnunet-chat.c:156
-#, fuzzy, c-format
-msgid "(%s) `%s' said to you for sure: %s\n"
-msgstr "“%s”对您说：%s\n"
-
-#: src/chat/gnunet-chat.c:159
-#, c-format
-msgid "(%s) `%s' was confirmed that you received: %s\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:162
-#, c-format
-msgid "(%s) `%s' was confirmed that you and only you received: %s\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:165
-#, c-format
-msgid "(%s) `%s' was confirmed that you received from him or her: %s\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:170
-#, c-format
-msgid ""
-"(%s) `%s' was confirmed that you and only you received from him or her: %s\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:173
-#, fuzzy, c-format
-msgid "(%s) `%s' said off the record: %s\n"
-msgstr "“%s”对您说：%s\n"
-
-#: src/chat/gnunet-chat.c:176
-#, c-format
-msgid "(%s) <%s> said using an unknown message type: %s\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:217
-#, c-format
-msgid "'%s' acknowledged message #%d\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:260
-#, c-format
-msgid "`%s' entered the room\n"
-msgstr "“%s”进入了房间\n"
-
-#: src/chat/gnunet-chat.c:260
-#, c-format
-msgid "`%s' left the room\n"
-msgstr "“%s”离开了房间\n"
-
-#: src/chat/gnunet-chat.c:321 src/chat/gnunet-chat.c:363
-#, fuzzy
-msgid "Could not change username\n"
-msgstr "已将用户名改为“%s”。\n"
-
-#: src/chat/gnunet-chat.c:334 src/chat/gnunet-chat.c:702
-#, c-format
-msgid "Joining room `%s' as user `%s'...\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:373
-#, fuzzy, c-format
-msgid "Changed username to `%s'\n"
-msgstr "已将用户名改为“%s”。\n"
-
-#: src/chat/gnunet-chat.c:388
-#, c-format
-msgid "Users in room `%s': "
-msgstr "房间“%s”中的用户："
-
-#: src/chat/gnunet-chat.c:434
-msgid "Syntax: /msg USERNAME MESSAGE"
-msgstr "语法：/msg 用户名 消息"
-
-#: src/chat/gnunet-chat.c:443
-#, c-format
-msgid "Unknown user `%s'. Make sure you specify its numeric suffix, if any.\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:460
-#, c-format
-msgid "User `%s' is currently not in the room!\n"
-msgstr "用户“%s”当前不在房间里！\n"
-
-#: src/chat/gnunet-chat.c:513
-#, fuzzy, c-format
-msgid "Unknown command `%s'\n"
-msgstr "未知的命令“%s”。\n"
-
-#: src/chat/gnunet-chat.c:524
-msgid ""
-"Use `/join #roomname' to join a chat room. Joining a room will cause you to "
-"leave the current room"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:528
-msgid ""
-"Use `/nick nickname' to change your nickname.  This will cause you to leave "
-"the current room and immediately rejoin it with the new name."
-msgstr ""
-
-#: src/chat/gnunet-chat.c:532
-msgid ""
-"Use `/msg nickname message' to send a private message to the specified user"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:535
-msgid "The `/notice' command is an alias for `/msg'"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:537
-msgid "The `/query' command is an alias for `/msg'"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:539
-msgid "Use `/sig message' to send a signed public message"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:542
-msgid "Use `/ack message' to require signed acknowledgment of the message"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:545
-msgid "Use `/anonymous message' to send a public anonymous message"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:547
-msgid "The `/anon' command is an alias for `/anonymous'"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:549
-msgid "Use `/quit' to terminate gnunet-chat"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:551
-msgid "The `/leave' command is an alias for `/quit'"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:554
-msgid "Use `/names' to list all of the current members in the chat room"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:556
-msgid "Use `/help command' to get help for a specific command"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:672
-msgid "You must specify a nickname\n"
-msgstr "您必须指定一个昵称\n"
-
-#: src/chat/gnunet-chat.c:688
-#, c-format
-msgid "Failed to join room `%s'\n"
-msgstr ""
-
-#: src/chat/gnunet-chat.c:727
-msgid "set the nickname to use (required)"
-msgstr "设置要使用的昵称(必须)"
-
-#: src/chat/gnunet-chat.c:730
-msgid "set the chat room to join"
-msgstr "设置要加入的聊天室"
-
-#: src/chat/gnunet-chat.c:746
-msgid "Join a chat on GNUnet."
-msgstr ""
-
-#: src/chat/gnunet-service-chat.c:266
-#, fuzzy
-msgid "Failed to queue a message notification\n"
-msgstr "保存配置失败。"
-
-#: src/chat/gnunet-service-chat.c:545
-#, fuzzy
-msgid "Failed to queue a join notification\n"
-msgstr "保存配置失败。"
-
-#: src/chat/gnunet-service-chat.c:728
-#, fuzzy
-msgid "Failed to queue a confirmation receipt\n"
-msgstr "保存配置失败。"
-
-#: src/chat/gnunet-service-chat.c:906
-#, fuzzy
-msgid "Failed to queue a leave notification\n"
-msgstr "保存配置失败。"
-
 #: src/core/core_api.c:757
 msgid "Client was disconnected from core service, trying to reconnect.\n"
 msgstr ""
@@ -582,40 +260,56 @@
 msgid "Peer `%s'\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:118 src/core/gnunet-core.c:149
-#: src/transport/gnunet-transport.c:451 src/transport/gnunet-transport.c:477
+#: src/core/gnunet-core.c:119 src/core/gnunet-core.c:147
+#: src/transport/gnunet-transport.c:453 src/transport/gnunet-transport.c:477
 #, c-format
 msgid "%24s: %-17s %4s   (%u connections in total)\n"
 msgstr ""
 
-#: src/core/gnunet-core.c:120 src/transport/gnunet-transport.c:453
+#: src/core/gnunet-core.c:121 src/transport/gnunet-transport.c:455
 #, fuzzy
 msgid "Connected to"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:151 src/transport/gnunet-transport.c:479
+#: src/core/gnunet-core.c:149 src/transport/gnunet-transport.c:479
 #, fuzzy
 msgid "Disconnected from"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:817
+#: src/core/gnunet-core.c:174 src/peerinfo-tool/gnunet-peerinfo.c:818
 #, fuzzy, c-format
 msgid "Invalid command line argument `%s'\n"
 msgstr "“%s”的参数无效。\n"
 
-#: src/core/gnunet-core.c:216 src/transport/gnunet-transport.c:725
+#: src/core/gnunet-core.c:211 src/transport/gnunet-transport.c:724
 msgid "provide information about all current connections (continuously)"
 msgstr ""
 
-#: src/core/gnunet-core.c:227
+#: src/core/gnunet-core.c:222
 msgid "Print information about connected peers."
 msgstr ""
 
-#: src/core/gnunet-service-core.c:97
+#: src/core/gnunet-service-core.c:109
+#, fuzzy, c-format
+msgid "Failed to read hostkey: %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/core/gnunet-service-core.c:123
 #, c-format
 msgid "Core service of `%4s' ready.\n"
 msgstr ""
 
+#: src/core/gnunet-service-core.c:149
+#, fuzzy
+msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
+msgstr "立即保存配置？"
+
+#: src/core/gnunet-service-core.c:163
+#: src/transport/gnunet-service-transport.c:685
+#, fuzzy
+msgid "Transport service is unable to access hostkey. Exiting.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
 #: src/core/gnunet-service-core_clients.c:370
 msgid "# send requests dropped (disconnected)"
 msgstr ""
@@ -731,7 +425,7 @@
 
 #: src/core/gnunet-service-core_kx.c:1628
 #, c-format
-msgid "Message received far too old (%llu ms). Content ignored.\n"
+msgid "Message received far too old (%s). Content ignored.\n"
 msgstr ""
 
 #: src/core/gnunet-service-core_kx.c:1632
@@ -742,18 +436,9 @@
 msgid "# bytes of payload decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1702
-#, fuzzy
-msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
-msgstr "立即保存配置？"
-
-#: src/core/gnunet-service-core_kx.c:1710
-msgid "Core service could not access hostkey.  Exiting.\n"
-msgstr ""
-
-#: src/core/gnunet-service-core_kx.c:1720 src/hostlist/hostlist-server.c:551
-#: src/peerinfo-tool/gnunet-peerinfo.c:823
-#: src/transport/gnunet-service-transport.c:619
+#: src/core/gnunet-service-core_kx.c:1703 src/hostlist/hostlist-server.c:552
+#: src/peerinfo-tool/gnunet-peerinfo.c:824
+#: src/transport/gnunet-service-transport.c:627
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
@@ -777,9 +462,9 @@
 
 #: src/core/gnunet-service-core_sessions.c:206
 #: src/core/gnunet-service-core_sessions.c:269
-#: src/dht/gnunet-service-dht_neighbours.c:629
-#: src/dht/gnunet-service-dht_neighbours.c:687
-#: src/fs/gnunet-service-fs_cp.c:622 src/fs/gnunet-service-fs_cp.c:1530
+#: src/dht/gnunet-service-dht_neighbours.c:634
+#: src/dht/gnunet-service-dht_neighbours.c:692
+#: src/fs/gnunet-service-fs_cp.c:623 src/fs/gnunet-service-fs_cp.c:1532
 #: src/topology/gnunet-daemon-topology.c:709
 #: src/topology/gnunet-daemon-topology.c:810
 #: src/transport/gnunet-service-transport_neighbours.c:873
@@ -848,8 +533,8 @@
 #: src/mysql/mysql.c:591 src/mysql/mysql.c:607
 #: src/namestore/plugin_namestore_postgres.c:52
 #: src/namestore/plugin_namestore_sqlite.c:51 src/util/crypto_ksk.c:49
-#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:543
-#: src/include/gnunet_common.h:550
+#: src/util/crypto_rsa.c:66 src/include/gnunet_common.h:608
+#: src/include/gnunet_common.h:615
 #, fuzzy, c-format
 msgid "`%s' failed at %s:%d with error: %s\n"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
@@ -867,8 +552,8 @@
 msgstr ""
 
 #: src/datacache/plugin_datacache_sqlite.c:443
-#: src/datastore/plugin_datastore_sqlite.c:408
-#: src/namestore/plugin_namestore_sqlite.c:370
+#: src/datastore/plugin_datastore_sqlite.c:406
+#: src/namestore/plugin_namestore_sqlite.c:369
 msgid "Tried to close sqlite without finalizing all prepared statements.\n"
 msgstr ""
 
@@ -982,10 +667,12 @@
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:480
+#: src/gns/gnunet-gns-helper-service-w32.c:159
 msgid "Transmission to client failed!\n"
 msgstr ""
 
 #: src/datastore/gnunet-service-datastore.c:511
+#: src/gns/gnunet-gns-helper-service-w32.c:189
 msgid "Shutdown in progress, aborting transmission.\n"
 msgstr ""
 
@@ -1150,35 +837,29 @@
 msgid "`%s' failed at %s:%u with error: %s"
 msgstr "“%s”于 %s:%d 处失败，错误为：%s\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:233
-#: src/namestore/plugin_namestore_sqlite.c:204
+#: src/datastore/plugin_datastore_sqlite.c:258
+#: src/namestore/plugin_namestore_sqlite.c:228
 #, c-format
-msgid "Option `%s' in section `%s' missing in configuration!\n"
-msgstr ""
-
-#: src/datastore/plugin_datastore_sqlite.c:260
-#: src/namestore/plugin_namestore_sqlite.c:229
-#, c-format
 msgid "Unable to initialize SQLite: %s.\n"
 msgstr "无法初始化 SQLite：%s。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:655
+#: src/datastore/plugin_datastore_sqlite.c:653
 #, fuzzy
 msgid "Invalid data in database.  Trying to fix (by deletion).\n"
 msgstr "%s 中有无效数据。请尝试修复(删除之)。\n"
 
-#: src/datastore/plugin_datastore_sqlite.c:1139
+#: src/datastore/plugin_datastore_sqlite.c:1137
 msgid "sqlite version to old to determine size, assuming zero\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1158
+#: src/datastore/plugin_datastore_sqlite.c:1156
 #, c-format
 msgid ""
 "Using sqlite page utilization to estimate payload (%llu pages of size %llu "
 "bytes)\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_sqlite.c:1198
+#: src/datastore/plugin_datastore_sqlite.c:1196
 #: src/namestore/plugin_namestore_sqlite.c:834
 #, fuzzy
 msgid "Sqlite database running\n"
@@ -1193,96 +874,114 @@
 msgid "Failed to connect to the DHT service!\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:293
-#: src/dht/gnunet-dht-put.c:192
+#: src/dht/gnunet-dht-get.c:132
+#, c-format
+msgid ""
+"Result %d, type %d:\n"
+"%.*s\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:156
+msgid "Must provide key for DHT GET!\n"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:162 src/dht/gnunet-dht-monitor.c:225
+#, fuzzy
+msgid "Failed to connect to DHT service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/dht/gnunet-dht-get.c:170
+msgid "Issueing DHT GET with key"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:186 src/dht/gnunet-dht-monitor.c:262
+#: src/dht/gnunet-dht-put.c:198
 msgid "the query key"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:204
+#: src/dht/gnunet-dht-get.c:189
 msgid "how many parallel requests (replicas) to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:207 src/dht/gnunet-dht-monitor.c:296
+#: src/dht/gnunet-dht-get.c:192 src/dht/gnunet-dht-monitor.c:265
 msgid "the type of data to look for"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:210 src/dht/gnunet-dht-put.c:201
+#: src/dht/gnunet-dht-get.c:195 src/dht/gnunet-dht-put.c:210
 msgid "how long to execute this query before giving up?"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:213 src/dht/gnunet-dht-monitor.c:302
-#: src/dht/gnunet-dht-put.c:204 src/fs/gnunet-auto-share.c:750
-#: src/fs/gnunet-download.c:327 src/fs/gnunet-publish.c:732
-#: src/fs/gnunet-search.c:297 src/fs/gnunet-unindex.c:169
-#: src/nse/gnunet-nse-profiler.c:897
+#: src/dht/gnunet-dht-get.c:198 src/dht/gnunet-dht-put.c:201
+msgid "use DHT's demultiplex everywhere option"
+msgstr ""
+
+#: src/dht/gnunet-dht-get.c:201 src/dht/gnunet-dht-monitor.c:271
+#: src/dht/gnunet-dht-put.c:213 src/fs/gnunet-auto-share.c:750
+#: src/fs/gnunet-download.c:328 src/fs/gnunet-publish.c:733
+#: src/fs/gnunet-search.c:294 src/fs/gnunet-unindex.c:168
+#: src/nse/gnunet-nse-profiler.c:1033
 msgid "be verbose (print progress information)"
 msgstr ""
 
-#: src/dht/gnunet-dht-get.c:236
+#: src/dht/gnunet-dht-get.c:222
 msgid "Issue a GET request to the GNUnet DHT, prints results."
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:299
-msgid "how long to execute? 0 = forever"
+#: src/dht/gnunet-dht-monitor.c:268
+msgid "how long should the monitor command run"
 msgstr ""
 
-#: src/dht/gnunet-dht-monitor.c:324
+#: src/dht/gnunet-dht-monitor.c:293
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:108
-msgid "PUT request sent!\n"
+#: src/dht/gnunet-dht-put.c:118
+msgid "PUT request sent with key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:111
+#: src/dht/gnunet-dht-put.c:121
 msgid "Timeout sending PUT request!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:114
+#: src/dht/gnunet-dht-put.c:124
 msgid "PUT request not confirmed!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:144
+#: src/dht/gnunet-dht-put.c:153
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:152
+#: src/dht/gnunet-dht-put.c:160
 #, fuzzy, c-format
 msgid "Could not connect to %s service!\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/dht/gnunet-dht-put.c:157
-#, fuzzy, c-format
-msgid "Connected to %s service!\n"
-msgstr "“%s”已连接到“%s”。\n"
-
-#: src/dht/gnunet-dht-put.c:172
+#: src/dht/gnunet-dht-put.c:176
 #, c-format
 msgid "Issuing put request for `%s' with data `%s'!\n"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:186
+#: src/dht/gnunet-dht-put.c:192
 msgid "the data to insert under the key"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:189
+#: src/dht/gnunet-dht-put.c:195
 msgid "how long to store this entry in the dht (in seconds)"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:195
+#: src/dht/gnunet-dht-put.c:204
 msgid "how many replicas to create"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:198
+#: src/dht/gnunet-dht-put.c:207
 msgid "the type to insert data as"
 msgstr ""
 
-#: src/dht/gnunet-dht-put.c:226
+#: src/dht/gnunet-dht-put.c:235
 msgid "Issue a PUT request to the GNUnet DHT insert DATA under KEY."
 msgstr ""
 
-#: src/dht/gnunet-service-dht.c:163 src/testing_old/testing.c:544
-#: src/testing_old/testing.c:1968 src/testing_old/testing.c:1998
+#: src/dht/gnunet-service-dht.c:163
 #, fuzzy
 msgid "Failed to connect to transport service!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -1367,87 +1066,87 @@
 msgid "# HELLOs obtained from peerinfo"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:485
+#: src/dht/gnunet-service-dht_neighbours.c:490
 msgid "# Preference updates given to core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:575
+#: src/dht/gnunet-service-dht_neighbours.c:580
 msgid "# FIND PEER messages initiated"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:721
+#: src/dht/gnunet-service-dht_neighbours.c:726
 msgid "# Queued messages discarded (peer disconnected)"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:776
+#: src/dht/gnunet-service-dht_neighbours.c:781
 msgid "# Bytes transmitted to other peers"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:814
+#: src/dht/gnunet-service-dht_neighbours.c:819
 msgid "# Bytes of bandwdith requested from core"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1036
-#: src/dht/gnunet-service-dht_neighbours.c:1064
+#: src/dht/gnunet-service-dht_neighbours.c:1041
+#: src/dht/gnunet-service-dht_neighbours.c:1069
 msgid "# Peers excluded from routing due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1045
-#: src/dht/gnunet-service-dht_neighbours.c:1079
+#: src/dht/gnunet-service-dht_neighbours.c:1050
+#: src/dht/gnunet-service-dht_neighbours.c:1084
 msgid "# Peer selection failed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1211
+#: src/dht/gnunet-service-dht_neighbours.c:1216
 msgid "# PUT requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1240
+#: src/dht/gnunet-service-dht_neighbours.c:1245
 msgid "# PUT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1247
-#: src/dht/gnunet-service-dht_neighbours.c:1360
-#: src/dht/gnunet-service-dht_neighbours.c:1460
+#: src/dht/gnunet-service-dht_neighbours.c:1252
+#: src/dht/gnunet-service-dht_neighbours.c:1365
+#: src/dht/gnunet-service-dht_neighbours.c:1465
 msgid "# P2P messages dropped due to full queue"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1325
+#: src/dht/gnunet-service-dht_neighbours.c:1330
 msgid "# GET requests routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1352
+#: src/dht/gnunet-service-dht_neighbours.c:1357
 msgid "# GET messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1467
+#: src/dht/gnunet-service-dht_neighbours.c:1472
 msgid "# RESULT messages queued for transmission"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1555
+#: src/dht/gnunet-service-dht_neighbours.c:1560
 msgid "# P2P PUT requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1671
+#: src/dht/gnunet-service-dht_neighbours.c:1676
 msgid "# FIND PEER requests ignored due to Bloomfilter"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1679
+#: src/dht/gnunet-service-dht_neighbours.c:1684
 msgid "# FIND PEER requests ignored due to lack of HELLO"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1770
+#: src/dht/gnunet-service-dht_neighbours.c:1775
 msgid "# P2P GET requests received"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1812
+#: src/dht/gnunet-service-dht_neighbours.c:1817
 msgid "# P2P FIND PEER requests processed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1826
+#: src/dht/gnunet-service-dht_neighbours.c:1831
 msgid "# P2P GET requests ONLY routed"
 msgstr ""
 
-#: src/dht/gnunet-service-dht_neighbours.c:1900
+#: src/dht/gnunet-service-dht_neighbours.c:1905
 msgid "# P2P RESULTS received"
 msgstr ""
 
@@ -1497,6 +1196,27 @@
 msgid "Block of type %u is malformed\n"
 msgstr ""
 
+#: src/dns/dnsstub.c:175
+#, fuzzy, c-format
+msgid "Could not bind to any port: %s\n"
+msgstr "找不到主机“%s”的 IP：%s\n"
+
+#: src/dns/dnsstub.c:291 src/dns/dnsstub.c:375
+#: src/gns/gnunet-service-gns_resolver.c:1673
+#, fuzzy, c-format
+msgid "Failed to send DNS request to %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/dns/dnsstub.c:360
+#, c-format
+msgid "Configured DNS exit `%s' is not working / valid.\n"
+msgstr ""
+
+#: src/dns/dnsstub.c:430
+#, c-format
+msgid "Received DNS response that is too small (%u bytes)"
+msgstr ""
+
 #: src/dns/gnunet-dns-monitor.c:355
 msgid "only monitor DNS queries"
 msgstr ""
@@ -1521,68 +1241,53 @@
 msgid "Change DNS replies to point elsewhere."
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:485
-#, fuzzy, c-format
-msgid "Could not bind to any port: %s\n"
-msgstr "找不到主机“%s”的 IP：%s\n"
-
-#: src/dns/gnunet-service-dns.c:639
+#: src/dns/gnunet-service-dns.c:499
 msgid "# DNS requests answered via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:822
+#: src/dns/gnunet-service-dns.c:639
 msgid "# DNS exit failed (failed to open socket)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1005
-#, c-format
-msgid "Received DNS response that is too small (%u bytes)"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1050
+#: src/dns/gnunet-service-dns.c:821
 msgid "# External DNS response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1168
+#: src/dns/gnunet-service-dns.c:892
 msgid "# Client response discarded (no matching request)"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1281
+#: src/dns/gnunet-service-dns.c:1005
 msgid "Received malformed IPv4-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1297
+#: src/dns/gnunet-service-dns.c:1021
 msgid "Received malformed IPv6-UDP packet on TUN interface.\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1306
+#: src/dns/gnunet-service-dns.c:1030
 #, c-format
 msgid "Got non-IP packet with %u bytes and protocol %u from TUN\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1315
+#: src/dns/gnunet-service-dns.c:1039
 msgid "# Non-DNS UDP packet received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1380
+#: src/dns/gnunet-service-dns.c:1104
 msgid "# DNS requests received via TUN interface"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1465
-#, c-format
-msgid "Configured DNS exit `%s' is not working / valid.\n"
-msgstr ""
-
-#: src/dns/gnunet-service-dns.c:1497 src/exit/gnunet-daemon-exit.c:2673
+#: src/dns/gnunet-service-dns.c:1180 src/exit/gnunet-daemon-exit.c:2673
 msgid "# Inbound MESH tunnels created"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1561 src/exit/gnunet-daemon-exit.c:3032
+#: src/dns/gnunet-service-dns.c:1245 src/exit/gnunet-daemon-exit.c:3032
 #, c-format
 msgid "`%s' must be installed SUID, refusing to run\n"
 msgstr ""
 
-#: src/dns/gnunet-service-dns.c:1581
+#: src/dns/gnunet-service-dns.c:1266
 msgid "Configured to provide DNS exit, but no valid DNS server configured!\n"
 msgstr ""
 
@@ -1777,7 +1482,7 @@
 msgid "No useful service enabled.  Exiting.\n"
 msgstr ""
 
-#: src/exit/gnunet-daemon-exit.c:3240
+#: src/exit/gnunet-daemon-exit.c:3241
 msgid "Daemon to run to provide an IP exit node for the VPN"
 msgstr ""
 
@@ -2005,37 +1710,32 @@
 msgid "Failed to connect to datastore service"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_namespace.c:57 src/fs/fs_namespace.c:83
+#: src/fs/fs_namespace.c:110
 #, fuzzy, c-format
-msgid "Configuration fails to specify `%s' in section `%s'\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/fs/fs_namespace.c:112
-#, fuzzy, c-format
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_namespace.c:134 src/fs/fs_namespace.c:222
+#: src/fs/fs_namespace.c:132 src/fs/fs_namespace.c:220
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_namespace.c:254
+#: src/fs/fs_namespace.c:252
 #, c-format
 msgid "Failed to create or read private key for namespace `%s'\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:369
+#: src/fs/fs_namespace.c:367
 #, c-format
 msgid "Failed to read namespace private key file `%s', deleting it!\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:586 src/fs/fs_publish_ksk.c:295
+#: src/fs/fs_namespace.c:584 src/fs/fs_publish_ksk.c:295
 #, fuzzy
 msgid "Internal error."
 msgstr "未知错误。\n"
 
-#: src/fs/fs_namespace.c:629
+#: src/fs/fs_namespace.c:627
 msgid "Failed to connect to datastore."
 msgstr ""
 
@@ -2109,11 +1809,6 @@
 msgid "Got result with unknown block type `%d', ignoring"
 msgstr ""
 
-#: src/fs/fs_test_lib.c:269
-#, fuzzy, c-format
-msgid "Failed to start daemon: %s\n"
-msgstr "运行 %s失败：%s %d\n"
-
 #: src/fs/fs_unindex.c:58
 msgid "Failed to find given position in file"
 msgstr ""
@@ -2140,37 +1835,37 @@
 msgid "Failed to connect to FS service for unindexing."
 msgstr ""
 
-#: src/fs/fs_unindex.c:344
+#: src/fs/fs_unindex.c:349 src/fs/fs_unindex.c:361
 #, fuzzy
 msgid "Failed to get KSKs from directory scan."
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/fs_unindex.c:356
+#: src/fs/fs_unindex.c:357
 #, fuzzy, c-format
 msgid "Internal error scanning `%s'.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/fs_unindex.c:411
+#: src/fs/fs_unindex.c:416
 #, fuzzy, c-format
 msgid "Failed to remove KBlock: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_unindex.c:501
+#: src/fs/fs_unindex.c:506
 #, fuzzy, c-format
 msgid "Failed to parse URI `%s' from KBlock!\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/fs_unindex.c:553 src/fs/fs_unindex.c:618
+#: src/fs/fs_unindex.c:558 src/fs/fs_unindex.c:623
 #, fuzzy
 msgid "Failed to connect to `datastore' service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/fs_unindex.c:631
+#: src/fs/fs_unindex.c:636
 #, fuzzy
 msgid "Failed to open file for unindexing."
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/fs_unindex.c:665
+#: src/fs/fs_unindex.c:670
 msgid "Failed to compute hash of file."
 msgstr ""
 
@@ -2233,16 +1928,16 @@
 msgid "Lacking key configuration settings.\n"
 msgstr "立即保存配置？"
 
-#: src/fs/fs_uri.c:910
+#: src/fs/fs_uri.c:909
 #, fuzzy, c-format
 msgid "Could not access hostkey file `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/fs/fs_uri.c:1115 src/fs/fs_uri.c:1142
+#: src/fs/fs_uri.c:1114 src/fs/fs_uri.c:1141
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1148
+#: src/fs/fs_uri.c:1147
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
@@ -2279,24 +1974,24 @@
 msgstr ""
 
 #: src/fs/gnunet-auto-share.c:734 src/fs/gnunet-pseudonym.c:279
-#: src/fs/gnunet-publish.c:679
+#: src/fs/gnunet-publish.c:680
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:683
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:684
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:686
+#: src/fs/gnunet-auto-share.c:741 src/fs/gnunet-publish.c:687
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:710
+#: src/fs/gnunet-auto-share.c:744 src/fs/gnunet-publish.c:711
 msgid "specify the priority of the content"
 msgstr ""
 
 #: src/fs/gnunet-auto-share.c:747 src/fs/gnunet-pseudonym.c:304
-#: src/fs/gnunet-publish.c:717
+#: src/fs/gnunet-publish.c:718
 msgid "set the desired replication LEVEL"
 msgstr ""
 
@@ -2344,87 +2039,87 @@
 msgid "Starting download `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-download.c:146
+#: src/fs/gnunet-download.c:147
 #, fuzzy
 msgid "<unknown time>"
 msgstr "未知错误"
 
-#: src/fs/gnunet-download.c:155
+#: src/fs/gnunet-download.c:157
 #, c-format
 msgid ""
 "Downloading `%s' at %llu/%llu (%s remaining, %s/s). Block took %s to "
 "download\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:178
+#: src/fs/gnunet-download.c:179
 #, c-format
 msgid "Error downloading: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:193
+#: src/fs/gnunet-download.c:194
 #, c-format
 msgid "Downloading `%s' done (%s/s).\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:208 src/fs/gnunet-publish.c:191
-#: src/fs/gnunet-search.c:190 src/fs/gnunet-unindex.c:109
+#: src/fs/gnunet-download.c:209 src/fs/gnunet-publish.c:192
+#: src/fs/gnunet-search.c:193 src/fs/gnunet-unindex.c:108
 #, c-format
 msgid "Unexpected status: %d\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:233
+#: src/fs/gnunet-download.c:234
 #, fuzzy
 msgid "You need to specify a URI argument.\n"
 msgstr "您必须指定一个昵称\n"
 
-#: src/fs/gnunet-download.c:239 src/fs/gnunet-publish.c:625
+#: src/fs/gnunet-download.c:240 src/fs/gnunet-publish.c:626
 #, fuzzy, c-format
 msgid "Failed to parse URI: %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/fs/gnunet-download.c:246
+#: src/fs/gnunet-download.c:247
 msgid "Only CHK or LOC URIs supported.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:253
+#: src/fs/gnunet-download.c:254
 msgid "Target filename must be specified.\n"
 msgstr ""
 
-#: src/fs/gnunet-download.c:267 src/fs/gnunet-publish.c:603
-#: src/fs/gnunet-search.c:241 src/fs/gnunet-unindex.c:141
+#: src/fs/gnunet-download.c:268 src/fs/gnunet-publish.c:604
+#: src/fs/gnunet-search.c:243 src/fs/gnunet-unindex.c:140
 #, fuzzy, c-format
 msgid "Could not initialize `%s' subsystem.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-download.c:304 src/fs/gnunet-search.c:285
+#: src/fs/gnunet-download.c:305 src/fs/gnunet-search.c:282
 msgid "set the desired LEVEL of receiver-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-download.c:307
+#: src/fs/gnunet-download.c:308
 msgid "delete incomplete downloads (when aborted with CTRL-C)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:310 src/fs/gnunet-search.c:288
+#: src/fs/gnunet-download.c:311 src/fs/gnunet-search.c:285
 msgid "only search the local peer (no P2P network search)"
 msgstr ""
 
-#: src/fs/gnunet-download.c:313
+#: src/fs/gnunet-download.c:314
 msgid "write the file to FILENAME"
 msgstr ""
 
-#: src/fs/gnunet-download.c:317
+#: src/fs/gnunet-download.c:318
 msgid "set the maximum number of parallel downloads that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:321
+#: src/fs/gnunet-download.c:322
 msgid "set the maximum number of parallel requests for blocks that is allowed"
 msgstr ""
 
-#: src/fs/gnunet-download.c:324
+#: src/fs/gnunet-download.c:325
 msgid "download a GNUnet directory recursively"
 msgstr ""
 
-#: src/fs/gnunet-download.c:338
+#: src/fs/gnunet-download.c:339
 msgid ""
 "Download files from GNUnet using a GNUnet CHK or LOC URI (gnunet://fs/"
 "chk/...)"
@@ -2463,7 +2158,7 @@
 "multiple times)"
 msgstr ""
 
-#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:698
+#: src/fs/gnunet-pseudonym.c:292 src/fs/gnunet-publish.c:699
 msgid "set the meta-data for the given TYPE to the given VALUE"
 msgstr ""
 
@@ -2491,204 +2186,204 @@
 msgid "Manage GNUnet pseudonyms."
 msgstr ""
 
-#: src/fs/gnunet-publish.c:147
+#: src/fs/gnunet-publish.c:149
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:155
+#: src/fs/gnunet-publish.c:156
 #, c-format
 msgid "Error publishing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:165
+#: src/fs/gnunet-publish.c:166
 #, c-format
 msgid "Publishing `%s' done.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:169
+#: src/fs/gnunet-publish.c:170
 #, c-format
 msgid "URI is `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:188
+#: src/fs/gnunet-publish.c:189
 msgid "Cleanup after abort complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:306
+#: src/fs/gnunet-publish.c:307
 #, fuzzy, c-format
 msgid "Meta data for file `%s' (%s)\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:308
+#: src/fs/gnunet-publish.c:309
 #, fuzzy, c-format
 msgid "Keywords for file `%s' (%s)\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:359 src/fs/gnunet-publish.c:613
+#: src/fs/gnunet-publish.c:360 src/fs/gnunet-publish.c:614
 #, fuzzy, c-format
 msgid "Failed to create namespace `%s' (illegal filename?)\n"
 msgstr "发送消息失败。\n"
 
-#: src/fs/gnunet-publish.c:434
+#: src/fs/gnunet-publish.c:435
 #, fuzzy
 msgid "Could not publish\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-publish.c:461
+#: src/fs/gnunet-publish.c:462
 msgid "Could not start publishing.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:492
+#: src/fs/gnunet-publish.c:493
 #, fuzzy, c-format
 msgid "Scanning directory `%s'.\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/fs/gnunet-publish.c:494
+#: src/fs/gnunet-publish.c:495
 #, fuzzy, c-format
 msgid "Scanning file `%s'.\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/fs/gnunet-publish.c:499
+#: src/fs/gnunet-publish.c:500
 #, c-format
 msgid "There was trouble processing file `%s', skipping it.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:504
+#: src/fs/gnunet-publish.c:505
 msgid "Preprocessing complete.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:508
+#: src/fs/gnunet-publish.c:509
 #, fuzzy, c-format
 msgid "Extracting meta data from file `%s' complete.\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:512
+#: src/fs/gnunet-publish.c:513
 msgid "Meta data extraction has finished.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:519
+#: src/fs/gnunet-publish.c:520
 #, fuzzy
 msgid "Internal error scanning directory.\n"
 msgstr "未知错误。\n"
 
-#: src/fs/gnunet-publish.c:553
+#: src/fs/gnunet-publish.c:554
 #, c-format
 msgid "Cannot extract metadata from a URI!\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:560
+#: src/fs/gnunet-publish.c:561
 #, c-format
 msgid "You must specify one and only one filename for insertion.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:566
+#: src/fs/gnunet-publish.c:567
 #, c-format
 msgid "You must NOT specify an URI and a filename.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:574 src/vpn/gnunet-vpn.c:214
+#: src/fs/gnunet-publish.c:575 src/vpn/gnunet-vpn.c:214
 #, c-format
 msgid "Option `%s' is required when using option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:584 src/fs/gnunet-publish.c:591
-#: src/transport/gnunet-transport.c:624
+#: src/fs/gnunet-publish.c:585 src/fs/gnunet-publish.c:592
+#: src/transport/gnunet-transport.c:623
 #, c-format
 msgid "Option `%s' makes no sense without option `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:646
+#: src/fs/gnunet-publish.c:647
 #, fuzzy, c-format
 msgid "Failed to access `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-publish.c:658
+#: src/fs/gnunet-publish.c:659
 msgid ""
 "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs "
 "installed?\n"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:690
+#: src/fs/gnunet-publish.c:691
 msgid ""
 "print list of extracted keywords that would be used, but do not perform "
 "upload"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:694
+#: src/fs/gnunet-publish.c:695
 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:701
+#: src/fs/gnunet-publish.c:702
 msgid ""
 "do not index, perform full insertion (stores entire file in encrypted form "
 "in GNUnet database)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:706
+#: src/fs/gnunet-publish.c:707
 msgid ""
 "specify ID of an updated version to be published in the future (for "
 "namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:714
+#: src/fs/gnunet-publish.c:715
 msgid "publish the files under the pseudonym NAME (place file into namespace)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:720
+#: src/fs/gnunet-publish.c:721
 msgid ""
 "only simulate the process but do not do any actual publishing (useful to "
 "compute URIs)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:724
+#: src/fs/gnunet-publish.c:725
 msgid ""
 "set the ID of this version of the publication (for namespace insertions only)"
 msgstr ""
 
-#: src/fs/gnunet-publish.c:728
+#: src/fs/gnunet-publish.c:729
 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:747
+#: src/fs/gnunet-publish.c:748
 msgid "Publish a file or directory on GNUnet"
 msgstr ""
 
-#: src/fs/gnunet-search.c:111
+#: src/fs/gnunet-search.c:114
 #, c-format
 msgid "Failed to write directory with search results to `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:181
+#: src/fs/gnunet-search.c:184
 #, fuzzy, c-format
 msgid "Error searching: %s.\n"
 msgstr "创建用户出错"
 
-#: src/fs/gnunet-search.c:231
+#: src/fs/gnunet-search.c:233
 msgid "Could not create keyword URI from arguments.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:255
+#: src/fs/gnunet-search.c:257
 msgid "Could not start searching.\n"
 msgstr ""
 
-#: src/fs/gnunet-search.c:291
+#: src/fs/gnunet-search.c:288
 msgid "write search results to file starting with PREFIX"
 msgstr ""
 
-#: src/fs/gnunet-search.c:294
-msgid "automatically terminate search after VALUE ms"
+#: src/fs/gnunet-search.c:291
+msgid "automatically terminate search after DELAY"
 msgstr ""
 
-#: src/fs/gnunet-search.c:301
+#: src/fs/gnunet-search.c:298
 msgid "automatically terminate search after VALUE results are found"
 msgstr ""
 
-#: src/fs/gnunet-search.c:312
+#: src/fs/gnunet-search.c:309
 msgid "Search GNUnet for files that were published on GNUnet"
 msgstr ""
 
@@ -2701,141 +2396,135 @@
 msgstr ""
 
 #: src/fs/gnunet-service-fs.c:581 src/hostlist/gnunet-daemon-hostlist.c:297
-#: src/topology/gnunet-daemon-topology.c:1330
-#: src/topology/gnunet-daemon-topology.c:1337
+#: src/topology/gnunet-daemon-topology.c:1329
+#: src/topology/gnunet-daemon-topology.c:1336
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/fs/gnunet-service-fs_cp.c:703
+#: src/fs/gnunet-service-fs_cp.c:704
 msgid "# migration stop messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:707
+#: src/fs/gnunet-service-fs_cp.c:708
 #, c-format
-msgid "Migration of content to peer `%s' blocked for %llu ms\n"
+msgid "Migration of content to peer `%s' blocked for %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:742
+#: src/fs/gnunet-service-fs_cp.c:744
 msgid "# replies transmitted to other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:748
+#: src/fs/gnunet-service-fs_cp.c:750
 msgid "# replies dropped"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:773 src/fs/gnunet-service-fs_cp.c:1331
+#: src/fs/gnunet-service-fs_cp.c:775 src/fs/gnunet-service-fs_cp.c:1333
 msgid "# P2P searches active"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:865
+#: src/fs/gnunet-service-fs_cp.c:867
 msgid "# artificial delays introduced (ms)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:918
+#: src/fs/gnunet-service-fs_cp.c:920
 msgid "# replies dropped due to type mismatch"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:926
+#: src/fs/gnunet-service-fs_cp.c:928
 msgid "# replies received for other peers"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:940
+#: src/fs/gnunet-service-fs_cp.c:942
 msgid "# replies dropped due to insufficient cover traffic"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:978
+#: src/fs/gnunet-service-fs_cp.c:980
 msgid "# P2P searches destroyed due to ultimate reply"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1045
+#: src/fs/gnunet-service-fs_cp.c:1047
 msgid "# requests done for free (low load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1069
+#: src/fs/gnunet-service-fs_cp.c:1071
 msgid "# request dropped, priority insufficient"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1079
+#: src/fs/gnunet-service-fs_cp.c:1081
 msgid "# requests done for a price (normal load)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1158
+#: src/fs/gnunet-service-fs_cp.c:1160
 msgid "# GET requests received (from other peers)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1192
+#: src/fs/gnunet-service-fs_cp.c:1194
 msgid "# requests dropped due to initiator not being connected"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1214
+#: src/fs/gnunet-service-fs_cp.c:1216
 msgid "# requests dropped due to missing reverse route"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1274
+#: src/fs/gnunet-service-fs_cp.c:1276
 msgid "# requests dropped due TTL underflow"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1300
+#: src/fs/gnunet-service-fs_cp.c:1302
 msgid "# requests dropped due to higher-TTL request"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1329
+#: src/fs/gnunet-service-fs_cp.c:1331
 msgid "# P2P query messages received and processed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_cp.c:1685
+#: src/fs/gnunet-service-fs_cp.c:1687
 msgid "# migration stop messages sent"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:113
-#: src/fs/gnunet-service-fs_indexing.c:163
+#: src/fs/gnunet-service-fs_indexing.c:120
+#: src/fs/gnunet-service-fs_indexing.c:175
 #, fuzzy, c-format
-msgid "Configuration option `%s' in section `%s' missing.\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/fs/gnunet-service-fs_indexing.c:121
-#: src/fs/gnunet-service-fs_indexing.c:177
-#, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:137
+#: src/fs/gnunet-service-fs_indexing.c:136
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "创建用户出错"
 
-#: src/fs/gnunet-service-fs_indexing.c:228
+#: src/fs/gnunet-service-fs_indexing.c:226
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
 "anyway.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:266
+#: src/fs/gnunet-service-fs_indexing.c:264
 #, c-format
 msgid "Hash mismatch trying to index file `%s' which has hash `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:481
+#: src/fs/gnunet-service-fs_indexing.c:479
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:539
+#: src/fs/gnunet-service-fs_indexing.c:537
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:554
+#: src/fs/gnunet-service-fs_indexing.c:552
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:556
+#: src/fs/gnunet-service-fs_indexing.c:554
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:571
+#: src/fs/gnunet-service-fs_indexing.c:569
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
@@ -2929,73 +2618,65 @@
 
 #: src/fs/gnunet-service-fs_pr.c:1108
 #, c-format
-msgid "Datastore lookup already took %llu ms!\n"
+msgid "Datastore lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1129
+#: src/fs/gnunet-service-fs_pr.c:1128
 #, c-format
-msgid "On-demand lookup already took %llu ms!\n"
+msgid "On-demand lookup already took %s!\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1176
+#: src/fs/gnunet-service-fs_pr.c:1174
 msgid "# Datastore lookups concluded (no results)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1190
+#: src/fs/gnunet-service-fs_pr.c:1188
 msgid "# Datastore lookups concluded (seen all)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1199
+#: src/fs/gnunet-service-fs_pr.c:1197
 msgid "# Datastore lookups aborted (more than MAX_RESULTS)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1213
+#: src/fs/gnunet-service-fs_pr.c:1211
 msgid "# requested DBLOCK or IBLOCK not found"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1226
+#: src/fs/gnunet-service-fs_pr.c:1224
 msgid "# on-demand blocks matched requests"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1239
+#: src/fs/gnunet-service-fs_pr.c:1237
 msgid "# on-demand lookups performed successfully"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1244
+#: src/fs/gnunet-service-fs_pr.c:1242
 msgid "# on-demand lookups failed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1271 src/fs/gnunet-service-fs_pr.c:1311
-#: src/fs/gnunet-service-fs_pr.c:1449
+#: src/fs/gnunet-service-fs_pr.c:1269 src/fs/gnunet-service-fs_pr.c:1309
+#: src/fs/gnunet-service-fs_pr.c:1447
 msgid "# Datastore lookups concluded (error queueing)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1329
+#: src/fs/gnunet-service-fs_pr.c:1327
 msgid "# Datastore lookups concluded (found last result)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1340
+#: src/fs/gnunet-service-fs_pr.c:1338
 msgid "# Datastore lookups concluded (load too high)"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1426
+#: src/fs/gnunet-service-fs_pr.c:1424
 msgid "# Datastore lookups initiated"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1510
+#: src/fs/gnunet-service-fs_pr.c:1508
 msgid "# GAP PUT messages received"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_pr.c:1603 src/fs/gnunet-service-fs_pr.c:1612
-#, fuzzy, c-format
-msgid "Configuration fails to specify `%s', assuming default value."
-msgstr "配置文件“%s”已写入。\n"
-
 #: src/fs/gnunet-service-fs_push.c:629
-#, c-format
-msgid ""
-"Invalid value specified for option `%s' in section `%s', content pushing "
-"disabled\n"
+msgid "time required, content pushing disabled"
 msgstr ""
 
 #: src/fs/gnunet-unindex.c:89
@@ -3003,25 +2684,25 @@
 msgid "Unindexing at %llu/%llu (%s remaining)\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:96
+#: src/fs/gnunet-unindex.c:95
 #, c-format
 msgid "Error unindexing: %s.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:101
+#: src/fs/gnunet-unindex.c:100
 msgid "Unindexing done.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:131
+#: src/fs/gnunet-unindex.c:130
 #, c-format
 msgid "You must specify one and only one filename for unindexing.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:148
+#: src/fs/gnunet-unindex.c:147
 msgid "Could not start unindex operation.\n"
 msgstr ""
 
-#: src/fs/gnunet-unindex.c:180
+#: src/fs/gnunet-unindex.c:179
 msgid "Unindex a file that was previously indexed with gnunet-publish."
 msgstr ""
 
@@ -3029,125 +2710,171 @@
 msgid "Reply mismatched in terms of namespace.  Discarded.\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:267
+#: src/gns/gns_api.c:575
+#, fuzzy
+msgid "Failed to serialize lookup reply from GNS service!\n"
+msgstr "初始化“%s”服务失败。\n"
+
+#: src/gns/gnunet-dns2gns.c:186
+#, fuzzy
+msgid "Failed to pack DNS response into UDP packet!\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/gns/gnunet-dns2gns.c:361
 #, c-format
-msgid "Key file `%s' for private zone does not exist!\n"
+msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:289
-#, fuzzy
+#: src/gns/gnunet-dns2gns.c:377
+#, c-format
+msgid "Received malformed DNS request from %s\n"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:385
+#, c-format
+msgid "Received unsupported DNS request from %s\n"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:673
+msgid "IP of recursive dns resolver to use (required)"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:676
+msgid "Authoritative DNS suffix to use (optional); default: zkey.eu"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:679
+msgid "Authoritative FCFS suffix to use (optional); default: fcfs.zkey.eu"
+msgstr ""
+
+#: src/gns/gnunet-dns2gns.c:692
+msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:182
+#, fuzzy, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns.c:358
+#: src/gns/gnunet-gns.c:293
+#, c-format
+msgid "Please specify lookup, shorten or authority operation!\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:315
 #, fuzzy
 msgid "try to shorten a given name"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns.c:361
+#: src/gns/gnunet-gns.c:318
 msgid "Lookup a record for the given name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:364
+#: src/gns/gnunet-gns.c:321
 msgid "Get the authority of a particular name"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:367
+#: src/gns/gnunet-gns.c:324
 msgid "Specify the type of the record to lookup"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:370
+#: src/gns/gnunet-gns.c:327
 msgid "No unneeded output"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:384
+#: src/gns/gnunet-gns.c:341
 msgid "GNUnet GNS access tool"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:280
+#: src/gns/gnunet-gns-fcfsd.c:449
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:333
+#: src/gns/gnunet-gns-fcfsd.c:478
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:377
+#: src/gns/gnunet-gns-fcfsd.c:522
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:439
+#: src/gns/gnunet-gns-fcfsd.c:584
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:498
+#: src/gns/gnunet-gns-fcfsd.c:646
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "发送消息失败。\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:514
+#: src/gns/gnunet-gns-fcfsd.c:662
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:550
+#: src/gns/gnunet-gns-fcfsd.c:698
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:558
+#: src/gns/gnunet-gns-fcfsd.c:706
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-fcfsd.c:741 src/gns/gnunet-gns-fcfsd.c:753
-#, fuzzy, c-format
-msgid "Option `%s' not specified in configuration section `%s'\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/gns/gnunet-gns-fcfsd.c:763 src/namestore/gnunet-namestore.c:365
+#: src/gns/gnunet-gns-fcfsd.c:910 src/namestore/gnunet-namestore.c:364
 #, fuzzy
 msgid "Failed to read or create private zone key\n"
 msgstr "无法为守护程序创建用户账户。"
 
-#: src/gns/gnunet-gns-fcfsd.c:773 src/namestore/gnunet-namestore.c:376
+#: src/gns/gnunet-gns-fcfsd.c:920 src/namestore/gnunet-namestore.c:375
 #, fuzzy
 msgid "Failed to connect to namestore\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:789 src/gns/gnunet-gns-proxy.c:2901
+#: src/gns/gnunet-gns-fcfsd.c:936 src/gns/gnunet-gns-proxy.c:2887
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/gns/gnunet-gns-fcfsd.c:823
+#: src/gns/gnunet-gns-fcfsd.c:970
 msgid "GNUnet GNS first come first serve registration service"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2532
+#: src/gns/gnunet-gns-proxy.c:2528
 #, fuzzy, c-format
 msgid "Unable to import private key from file `%s'\n"
 msgstr "无法创建用户账户："
 
-#: src/gns/gnunet-gns-proxy.c:2561
+#: src/gns/gnunet-gns-proxy.c:2556
 #, fuzzy, c-format
 msgid "Unable to import certificate %s\n"
 msgstr "无法保存配置文件“%s”："
 
-#: src/gns/gnunet-gns-proxy.c:3578
-msgid "listen on specified port"
+#: src/gns/gnunet-gns-proxy.c:3564
+msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3581
+#: src/gns/gnunet-gns-proxy.c:3567
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3596
+#: src/gns/gnunet-gns-proxy.c:3582
 msgid "GNUnet GNS proxy"
 msgstr ""
 
+#: src/gns/gnunet-service-gns.c:401
+#, c-format
+msgid "Records for name `%s' in zone %s too large to fit into DHT"
+msgstr ""
+
+#: src/gns/gnunet-service-gns.c:1197
+#, fuzzy
+msgid "Failed to connect to the namestore!\n"
+msgstr "初始化“%s”服务失败。\n"
+
 #: src/hello/gnunet-hello.c:122
 msgid "Call with name of HELLO file to modify.\n"
 msgstr ""
@@ -3236,8 +2963,8 @@
 #: src/hostlist/hostlist-client.c:689 src/hostlist/hostlist-client.c:741
 #: src/hostlist/hostlist-client.c:750 src/hostlist/hostlist-client.c:871
 #: src/hostlist/hostlist-client.c:961 src/hostlist/hostlist-client.c:966
-#: src/transport/plugin_transport_http_client.c:110
-#: src/transport/plugin_transport_http_client.c:125
+#: src/transport/plugin_transport_http_client.c:994
+#: src/transport/plugin_transport_http_client.c:1009
 #, c-format
 msgid "%s failed at %s:%d: `%s'\n"
 msgstr ""
@@ -3468,27 +3195,27 @@
 msgid "Advertisement message could not be queued by core\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:561
+#: src/hostlist/hostlist-server.c:562
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:570
+#: src/hostlist/hostlist-server.c:571
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:584
+#: src/hostlist/hostlist-server.c:585
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/hostlist-server.c:624
+#: src/hostlist/hostlist-server.c:625
 #, fuzzy, c-format
 msgid "`%s' is not a valid IP address! Ignoring BINDTOIP.\n"
 msgstr "“%s”不可用。\n"
 
-#: src/hostlist/hostlist-server.c:666
+#: src/hostlist/hostlist-server.c:667
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
@@ -3512,30 +3239,30 @@
 msgid "help text"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:7110
+#: src/mesh/gnunet-service-mesh.c:7703
 msgid "Wrong CORE service\n"
 msgstr ""
 
-#: src/mesh/gnunet-service-mesh.c:7328 src/mesh/gnunet-service-mesh.c:7340
-#: src/mesh/gnunet-service-mesh.c:7352 src/mesh/gnunet-service-mesh.c:7364
-#: src/mesh/gnunet-service-mesh.c:7376 src/mesh/gnunet-service-mesh.c:7388
-#: src/mesh/gnunet-service-mesh.c:7400 src/mesh/gnunet-service-mesh.c:7412
+#: src/mesh/gnunet-service-mesh.c:7908
+#, fuzzy
+msgid "Mesh service could not access hostkey.  Exiting.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/mesh/gnunet-service-mesh.c:7997 src/mesh/gnunet-service-mesh.c:8009
+#: src/mesh/gnunet-service-mesh.c:8021 src/mesh/gnunet-service-mesh.c:8033
+#: src/mesh/gnunet-service-mesh.c:8045 src/mesh/gnunet-service-mesh.c:8057
+#: src/mesh/gnunet-service-mesh.c:8069 src/mesh/gnunet-service-mesh.c:8081
 #, fuzzy, c-format
 msgid "Mesh service is lacking key configuration settings (%s).  Exiting.\n"
 msgstr "立即保存配置？"
 
-#: src/mesh/gnunet-service-mesh.c:7424 src/mesh/gnunet-service-mesh.c:7435
+#: src/mesh/gnunet-service-mesh.c:8093 src/mesh/gnunet-service-mesh.c:8104
 #, fuzzy, c-format
 msgid ""
 "Mesh service is lacking key configuration settings (%s). Using default "
 "(%u).\n"
 msgstr "立即保存配置？"
 
-#: src/mesh/gnunet-service-mesh.c:7446
-#, fuzzy
-msgid "Mesh service could not access hostkey.  Exiting.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
 #: src/mysql/mysql.c:174
 #, c-format
 msgid "Trying to use file `%s' for MySQL configuration.\n"
@@ -3569,125 +3296,120 @@
 msgid "until"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:357
+#: src/namestore/gnunet-namestore.c:356
 #, c-format
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:387
+#: src/namestore/gnunet-namestore.c:386
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s”。\n"
 
-#: src/namestore/gnunet-namestore.c:395 src/namestore/gnunet-namestore.c:419
-#: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
-#: src/namestore/gnunet-namestore.c:519
+#: src/namestore/gnunet-namestore.c:394 src/namestore/gnunet-namestore.c:418
+#: src/namestore/gnunet-namestore.c:465 src/namestore/gnunet-namestore.c:477
+#: src/namestore/gnunet-namestore.c:518
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore.c:396 src/namestore/gnunet-namestore.c:420
+#: src/namestore/gnunet-namestore.c:395 src/namestore/gnunet-namestore.c:419
 msgid "add/del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:409
+#: src/namestore/gnunet-namestore.c:408
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:447
+#: src/namestore/gnunet-namestore.c:446
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格式无效：“%s”\n"
 
-#: src/namestore/gnunet-namestore.c:456
+#: src/namestore/gnunet-namestore.c:455
 #, c-format
 msgid ""
 "Deletion requires either absolute time, or no time at all. Got relative time "
 "`%s' instead.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:467 src/namestore/gnunet-namestore.c:479
-#: src/namestore/gnunet-namestore.c:498
+#: src/namestore/gnunet-namestore.c:466 src/namestore/gnunet-namestore.c:478
+#: src/namestore/gnunet-namestore.c:497
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:497
+#: src/namestore/gnunet-namestore.c:496
 #, fuzzy, c-format
 msgid "No valid expiration time for operation `%s'\n"
 msgstr "配置文件“%s”已写入。\n"
 
-#: src/namestore/gnunet-namestore.c:520
+#: src/namestore/gnunet-namestore.c:519
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:570
+#: src/namestore/gnunet-namestore.c:569
 #: src/peerinfo-tool/gnunet-peerinfo.c:875
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效条目。\n"
 
-#: src/namestore/gnunet-namestore.c:611 src/transport/gnunet-transport.c:618
+#: src/namestore/gnunet-namestore.c:610 src/transport/gnunet-transport.c:617
 #, fuzzy, c-format
 msgid "Service `%s' is not running\n"
 msgstr "服务已删除。\n"
 
-#: src/namestore/gnunet-namestore.c:622
-#, c-format
-msgid "Option `%s' not given, but I need a zone key file!\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:627
+#: src/namestore/gnunet-namestore.c:625
 #, fuzzy, c-format
 msgid "Using default zone file `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/namestore/gnunet-namestore.c:679
+#: src/namestore/gnunet-namestore.c:677
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:682
+#: src/namestore/gnunet-namestore.c:680
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:685
+#: src/namestore/gnunet-namestore.c:683
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:688
+#: src/namestore/gnunet-namestore.c:686
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:691
+#: src/namestore/gnunet-namestore.c:689
 msgid "name of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:694
+#: src/namestore/gnunet-namestore.c:692
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:697
+#: src/namestore/gnunet-namestore.c:695
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:700
+#: src/namestore/gnunet-namestore.c:698
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:703
+#: src/namestore/gnunet-namestore.c:701
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:706
+#: src/namestore/gnunet-namestore.c:704
 msgid "create or list non-authority record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:709
+#: src/namestore/gnunet-namestore.c:707
 msgid "filename with the zone key"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:720
+#: src/namestore/gnunet-namestore.c:718
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet 配置"
@@ -3815,30 +3537,66 @@
 msgid "Failed to create listen socket bound to `%s' for NAT test: %s\n"
 msgstr ""
 
-#: src/nse/gnunet-nse-profiler.c:915
+#: src/nse/gnunet-nse-profiler.c:1009
+msgid "limit to the number of connections to NSE services, 0 for none"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1012
+msgid "name of the file for writing connection information and statistics"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1015
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1018
+msgid "IP address of this system as seen by the rest of the testbed"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1021
+msgid "delay between queries to statistics during a round"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1024
+msgid "prefix of the filenames we use for writing the topology for each round"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1027
+msgid "name of the file for writing the main results"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1030
+msgid "Number of peers to run in each round, separated by commas"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1036
+msgid "delay between rounds"
+msgstr ""
+
+#: src/nse/gnunet-nse-profiler.c:1046
 #, fuzzy
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该服务"
 
-#: src/nse/gnunet-service-nse.c:925
+#: src/nse/gnunet-service-nse.c:938
 #, c-format
 msgid "Proof of work invalid: %llu!\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1381 src/nse/gnunet-service-nse.c:1400
-#: src/nse/gnunet-service-nse.c:1421
+#: src/nse/gnunet-service-nse.c:1389
+#, fuzzy, c-format
+msgid "NSE service could not access hostkey: %s\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/nse/gnunet-service-nse.c:1403 src/nse/gnunet-service-nse.c:1478
+#: src/nse/gnunet-service-nse.c:1495
 msgid "NSE service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1388
+#: src/nse/gnunet-service-nse.c:1485
 msgid "Invalid work requirement for NSE service. Exiting.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1409
-#, fuzzy
-msgid "NSE service could not access hostkey.  Exiting.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
 #: src/peerinfo/gnunet-service-peerinfo.c:134
 #, c-format
 msgid "Removing expired address of transport `%s'\n"
@@ -3938,7 +3696,7 @@
 msgid "Failure adding HELLO: %s\n"
 msgstr ""
 
-#: src/peerinfo-tool/gnunet-peerinfo.c:833
+#: src/peerinfo-tool/gnunet-peerinfo.c:834
 #, fuzzy, c-format
 msgid "Could not find option `%s:%s' in configuration.\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
@@ -4129,11 +3887,15 @@
 "might have been lost!\n"
 msgstr ""
 
-#: src/testbed/testbed_api.c:246
+#: src/testbed/testbed_api.c:252
 #, fuzzy, c-format
 msgid "Adding host %u failed with error: %s\n"
 msgstr "“%s”以错误码 %d 失败：%s\n"
 
+#: src/testbed/testbed_api_testbed.c:271
+msgid "Some operations are still pending. Cancelling them\n"
+msgstr ""
+
 #: src/testing/gnunet-testing.c:131
 #, fuzzy, c-format
 msgid "Could not extract hostkey %u (offset too large?)\n"
@@ -4178,255 +3940,59 @@
 msgid "name of the service to run"
 msgstr ""
 
-#: src/testing_old/helper.c:56
-#, fuzzy
-msgid "Peer is lacking HOSTKEY configuration setting.\n"
-msgstr "立即保存配置？"
-
-#: src/testing_old/helper.c:64
-#, fuzzy
-msgid "Could not access hostkey.\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/testing_old/testing.c:200
-msgid "`scp' does not seem to terminate (timeout copying config).\n"
-msgstr ""
-
-#: src/testing_old/testing.c:214 src/testing_old/testing.c:798
-msgid "`scp' did not complete cleanly.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:237
-#, fuzzy
-msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/testing_old/testing.c:238
-#, fuzzy
-msgid "Failed to create pipe for `ssh' process.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/testing_old/testing.c:286
-#, fuzzy, c-format
-msgid "Could not start `%s' process to create hostkey.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/testing_old/testing.c:293
-#, fuzzy
-msgid "Failed to start `gnunet-peerinfo' process.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/testing_old/testing.c:294 src/testing_old/testing.c:471
-#, fuzzy
-msgid "Failed to start `ssh' process.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/testing_old/testing.c:354
+#: src/testing/testing.c:198
 #, c-format
-msgid "Error reading from gnunet-peerinfo: %s\n"
-msgstr ""
-
-#: src/testing_old/testing.c:358
-msgid "Malformed output from gnunet-peerinfo!\n"
-msgstr ""
-
-#: src/testing_old/testing.c:368
-#, fuzzy
-msgid "Failed to get hostkey!\n"
-msgstr "发送消息失败。\n"
-
-#: src/testing_old/testing.c:400
-msgid "`Failed while waiting for topology setup!\n"
-msgstr ""
-
-#: src/testing_old/testing.c:463
-#, fuzzy, c-format
-msgid "Could not start `%s' process to start GNUnet.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/testing_old/testing.c:470
-#, fuzzy
-msgid "Failed to start `gnunet-arm' process.\n"
-msgstr "初始化“%s”服务失败。\n"
-
-#: src/testing_old/testing.c:493 src/testing_old/testing.c:600
-msgid "`gnunet-arm' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:494 src/testing_old/testing.c:601
-#: src/testing_old/testing.c:621
-msgid "`ssh' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:570
-msgid "Unable to get HELLO for peer!\n"
-msgstr ""
-
-#: src/testing_old/testing.c:620
-msgid "`gnunet-arm' terminated with non-zero exit status (or timed out)!\n"
-msgstr ""
-
-#: src/testing_old/testing.c:643 src/testing_old/testing.c:675
-msgid "either `gnunet-arm' or `ssh' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:658 src/testing_old/testing.c:713
-msgid "shutdown (either `gnunet-arm' or `ssh') did not complete cleanly.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:786
-msgid "`scp' does not seem to terminate.\n"
-msgstr ""
-
-#: src/testing_old/testing.c:948
-#, fuzzy, c-format
-msgid "Starting service %s for peer `%4s'\n"
-msgstr "卸载 GNUnet 服务"
-
-#: src/testing_old/testing.c:1207 src/testing_old/testing_group.c:6172
-#, fuzzy, c-format
-msgid "Could not start `%s' process to copy configuration directory.\n"
-msgstr "找不到主机“%s”的 IP：%s\n"
-
-#: src/testing_old/testing.c:1292 src/testing_old/testing.c:1359
-#, fuzzy, c-format
-msgid "Terminating peer `%4s'\n"
-msgstr "未知的用户“%s”\n"
-
-#: src/testing_old/testing.c:1448
-#, fuzzy, c-format
-msgid "Setting d->dead on peer `%4s'\n"
-msgstr "卸载 GNUnet 服务"
-
-#: src/testing_old/testing.c:1601
-msgid "Peer not yet running, can not change configuration at this point."
-msgstr ""
-
-#: src/testing_old/testing.c:1609
-#, fuzzy
-msgid "Failed to write new configuration to disk."
-msgstr "保存配置失败。"
-
-#: src/testing_old/testing.c:1636
-#, fuzzy, c-format
-msgid "Could not start `%s' process to copy configuration file.\n"
-msgstr "找不到主机“%s”的 IP：%s\n"
-
-#: src/testing_old/testing.c:1639
-#, fuzzy
-msgid "Failed to copy new configuration to remote machine."
-msgstr "保存配置失败。"
-
-#: src/testing_old/testing.c:1794
-#, fuzzy
-msgid "Peers failed to connect"
-msgstr ""
-"\n"
-"按任意键继续\n"
-
-#: src/testing_old/testing.c:1922
-#, fuzzy
-msgid "Failed to connect to core service of first peer!\n"
-msgstr "加载 sqstore 服务失败。检查您的配置！\n"
-
-#: src/testing_old/testing.c:2145
-msgid "Peers are not fully running yet, can not connect!\n"
-msgstr ""
-
-#: src/testing_old/testing_group.c:1895 src/testing_old/testing_group.c:1907
-#: src/testing_old/testing_group.c:2009 src/testing_old/testing_group.c:2066
-#: src/testing_old/testing_group.c:2153 src/testing_old/testing_group.c:2173
-#: src/testing_old/testing_group.c:2303
-#: src/testing_old/testing_peergroup.c:950
-#, fuzzy, c-format
-msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
-msgstr "配置不满足配置规范文件“%s”的约束！\n"
-
-#: src/testing_old/testing_group.c:2161
-#, c-format
-msgid ""
-"Invalid value `%s' for option `%s' in section `%s': got %f, needed value "
-"greater than 0\n"
-msgstr ""
-
-#: src/testing_old/testing_group.c:2878 src/testing_old/testing_group.c:3064
-#, c-format
-msgid ""
-"No `%s' specified in peer configuration in section `%s', cannot copy friends "
-"file!\n"
-msgstr ""
-
-#: src/testing_old/testing_group.c:3958
-msgid "Creating no allowed topology (all peers can connect at core level)\n"
-msgstr ""
-
-#: src/testing_old/testing_group.c:5227
-msgid "Unknown topology specification, can't connect peers!\n"
-msgstr ""
-
-#: src/testing_old/testing_group.c:5962
-#, fuzzy, c-format
-msgid "Could not read hostkeys file `%s'!\n"
-msgstr "找不到接口“%s”的一个 IP 地址。\n"
-
-#: src/testing_old/testing_group.c:6029
-#, fuzzy, c-format
-msgid "Could not create configuration for peer number %u on `%s'!\n"
-msgstr "解析配置文件“%s”失败\n"
-
-#: src/testing/testing.c:188
-#, c-format
 msgid "Hostkeys file not found: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:204
+#: src/testing/testing.c:214
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
 
-#: src/testing/testing.c:468
+#: src/testing/testing.c:509
 #, c-format
 msgid "Key number %u does not exist\n"
 msgstr ""
 
-#: src/testing/testing.c:477
+#: src/testing/testing.c:518
 #, fuzzy, c-format
 msgid "Error while decoding key %u\n"
 msgstr "解析 dscl 输出时出错。\n"
 
-#: src/testing/testing.c:788
+#: src/testing/testing.c:829
 #, fuzzy
 msgid "Failed to create configuration for peer (not enough free ports?)\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:799
+#: src/testing/testing.c:840
 #, 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:813
+#: src/testing/testing.c:854
 #, fuzzy, c-format
 msgid "Failed to initialize hostkey for peer %u\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/testing/testing.c:846
+#: src/testing/testing.c:887
 #, fuzzy, c-format
 msgid "Failed to write hostkey file for peer %u: %s\n"
 msgstr "发送消息失败。\n"
 
-#: src/testing/testing.c:864
+#: src/testing/testing.c:905
 #, fuzzy, c-format
 msgid "Failed to write configuration file `%s' for peer %u: %s\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/testing/testing.c:925
+#: src/testing/testing.c:966
 #, fuzzy, c-format
 msgid "Failed to start `%s': %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/testing/testing.c:1088
+#: src/testing/testing.c:1129
 #, fuzzy, c-format
 msgid "Failed to load configuration from %s\n"
 msgstr "解析配置文件“%s”失败\n"
@@ -4448,147 +4014,143 @@
 msgid "Failed to connect to core service, can not manage topology!\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1026
+#: src/topology/gnunet-daemon-topology.c:1038
 #, c-format
-msgid "Option `%s' in section `%s' not specified!\n"
-msgstr ""
-
-#: src/topology/gnunet-daemon-topology.c:1039
-#, c-format
 msgid "Could not read friends list `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1045
+#: src/topology/gnunet-daemon-topology.c:1044
 #, c-format
 msgid "Friends file `%s' is empty.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1054
+#: src/topology/gnunet-daemon-topology.c:1053
 #, c-format
 msgid "Failed to read friends list from `%s': out of memory\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1062
+#: src/topology/gnunet-daemon-topology.c:1061
 #, c-format
 msgid "Failed to read friends list from `%s'\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1082
+#: src/topology/gnunet-daemon-topology.c:1081
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1095
+#: src/topology/gnunet-daemon-topology.c:1094
 #, c-format
 msgid ""
 "Syntax error in topology specification at offset %llu, skipping bytes `%s'.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1105
+#: src/topology/gnunet-daemon-topology.c:1104
 #, fuzzy, c-format
 msgid "Found friend `%s' in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1111
+#: src/topology/gnunet-daemon-topology.c:1110
 #, c-format
 msgid "Found myself `%s' in friend list (useless, ignored)\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1121
+#: src/topology/gnunet-daemon-topology.c:1120
 #, fuzzy
 msgid "# friends in configuration"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/topology/gnunet-daemon-topology.c:1127
+#: src/topology/gnunet-daemon-topology.c:1126
 msgid ""
 "Fewer friends specified than required by minimum friend count. Will only "
 "connect to friends.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1134
+#: src/topology/gnunet-daemon-topology.c:1133
 msgid ""
 "More friendly connections required than target total number of connections.\n"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1169
+#: src/topology/gnunet-daemon-topology.c:1168
 msgid "# HELLO messages received"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1224
+#: src/topology/gnunet-daemon-topology.c:1223
 msgid "# HELLO messages gossipped"
 msgstr ""
 
-#: src/topology/gnunet-daemon-topology.c:1366
+#: src/topology/gnunet-daemon-topology.c:1365
 msgid "GNUnet topology control (maintaining P2P mesh and F2F constraints)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:246
+#: src/transport/gnunet-service-transport_blacklist.c:245
 #, fuzzy, c-format
 msgid "Could not read blacklist file `%s'\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:252
+#: src/transport/gnunet-service-transport_blacklist.c:251
 #, c-format
 msgid "Blacklist file `%s' is empty.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:263
+#: src/transport/gnunet-service-transport_blacklist.c:262
 #, fuzzy, c-format
 msgid "Failed to read blacklist from `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:284
-#: src/transport/gnunet-service-transport_blacklist.c:308
+#: src/transport/gnunet-service-transport_blacklist.c:283
+#: src/transport/gnunet-service-transport_blacklist.c:307
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, giving up!\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:295
-#: src/transport/gnunet-service-transport_blacklist.c:331
+#: src/transport/gnunet-service-transport_blacklist.c:294
+#: src/transport/gnunet-service-transport_blacklist.c:330
 #, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:345
+#: src/transport/gnunet-service-transport_blacklist.c:344
 #, fuzzy, c-format
 msgid "Syntax error in blacklist file at offset %llu, skipping bytes `%s'.\n"
 msgstr "配置文件“%s”第 %d 行有语法错误。\n"
 
-#: src/transport/gnunet-service-transport_blacklist.c:359
+#: src/transport/gnunet-service-transport_blacklist.c:358
 #, c-format
 msgid "Found myself `%s' in blacklist (useless, ignored)\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_blacklist.c:514
-#: src/transport/gnunet-service-transport_blacklist.c:751
+#: src/transport/gnunet-service-transport_blacklist.c:513
+#: src/transport/gnunet-service-transport_blacklist.c:750
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:167
+#: src/transport/gnunet-service-transport.c:177
 msgid "# bytes payload discarded due to not connected peer "
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:242
+#: src/transport/gnunet-service-transport.c:252
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:289
+#: src/transport/gnunet-service-transport.c:299
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:590
+#: src/transport/gnunet-service-transport.c:604
+#, fuzzy, c-format
+msgid "Transport service could not access hostkey: %s. Exiting.\n"
+msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#: src/transport/gnunet-service-transport.c:674
 msgid "Transport service is lacking key configuration settings.  Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:599
-msgid "Transport service could not access hostkey.  Exiting.\n"
-msgstr ""
-
 #: src/transport/gnunet-service-transport_clients.c:352
 #, c-format
 msgid "Dropping message of type %u and size %u, have %u/%u messages pending\n"
@@ -4777,154 +4339,247 @@
 
 #: src/transport/gnunet-transport.c:328
 #, c-format
-msgid "Received %llu bytes/s (%llu bytes in %llu ms)\n"
+msgid "Received %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:335
+#: src/transport/gnunet-transport.c:336
 #, c-format
-msgid "Transmitted %llu bytes/s (%llu bytes in %llu ms)\n"
+msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:374
+#: src/transport/gnunet-transport.c:375
 #, c-format
 msgid "Transmitting %u bytes to %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:394
+#: src/transport/gnunet-transport.c:395
 #, fuzzy, c-format
 msgid "Connected to %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:426
+#: src/transport/gnunet-transport.c:427
 #, fuzzy, c-format
 msgid "Disconnected from %s\n"
 msgstr "“%s”已连接到“%s”。\n"
 
-#: src/transport/gnunet-transport.c:506
+#: src/transport/gnunet-transport.c:505
 #, c-format
 msgid "Received %u bytes from %s\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:529
+#: src/transport/gnunet-transport.c:528
 #, fuzzy, c-format
 msgid "Peer `%s': %s %s\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/transport/gnunet-transport.c:536
+#: src/transport/gnunet-transport.c:535
 #, c-format
 msgid "Peer `%s': %s <unable to resolve address>\n"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:564
+#: src/transport/gnunet-transport.c:563
 #, fuzzy, c-format
 msgid "Peer `%s' disconnected\n"
 msgstr ""
 "\n"
 "按任意键继续\n"
 
-#: src/transport/gnunet-transport.c:633
+#: src/transport/gnunet-transport.c:632
 #, fuzzy, c-format
 msgid "Failed to parse peer identity `%s'\n"
 msgstr "解析配置文件“%s”失败\n"
 
-#: src/transport/gnunet-transport.c:716
+#: src/transport/gnunet-transport.c:715
 msgid "measure how fast we are receiving data (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:719
+#: src/transport/gnunet-transport.c:718
 #, fuzzy
 msgid "try to connect to the given peer"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/gnunet-transport.c:722
+#: src/transport/gnunet-transport.c:721
 msgid "provide information about all current connections (once)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:728
+#: src/transport/gnunet-transport.c:727
 msgid "do not resolve hostnames"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:732
+#: src/transport/gnunet-transport.c:731
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:735
+#: src/transport/gnunet-transport.c:734
 msgid "test transport configuration (involves external server)"
 msgstr ""
 
-#: src/transport/gnunet-transport.c:746
+#: src/transport/gnunet-transport.c:745
 #, fuzzy
 msgid "Direct access to transport service."
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_http.c:1119
+#: src/transport/plugin_transport_http.c:817
+#: src/transport/plugin_transport_http_server.c:2513
 msgid "Disabling IPv6 since it is not supported on this system!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1168
+#: src/transport/plugin_transport_http.c:866
+#: src/transport/plugin_transport_http_server.c:2281
 #, fuzzy
 msgid "Require valid port number for service in configuration!\n"
 msgstr "保存配置失败。"
 
-#: src/transport/plugin_transport_http.c:1200 src/util/service.c:1051
+#: src/transport/plugin_transport_http.c:898
+#: src/transport/plugin_transport_http_server.c:2313 src/util/service.c:1053
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_http.c:1217 src/util/service.c:1068
+#: src/transport/plugin_transport_http.c:915
+#: src/transport/plugin_transport_http_server.c:2330 src/util/service.c:1070
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找不到接口“%s”的一个 IP 地址。\n"
 
-#: src/transport/plugin_transport_http.c:1322
+#: src/transport/plugin_transport_http.c:1020
+#: src/transport/plugin_transport_http_server.c:2441
 #, c-format
 msgid "Found %u addresses to report to NAT service\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1407
+#: src/transport/plugin_transport_http.c:1133
+#: src/transport/plugin_transport_http_server.c:2609
 msgid "Neither IPv4 nor IPv6 are enabled! Fix in configuration\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1420
+#: src/transport/plugin_transport_http.c:1146
+#: src/transport/plugin_transport_http_server.c:2620
 #, fuzzy
 msgid "Port is required! Fix in configuration\n"
 msgstr ""
 "\n"
 "结束配置。\n"
 
-#: src/transport/plugin_transport_http.c:1431
+#: src/transport/plugin_transport_http.c:1157
 msgid "Port 0, client only mode\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1451
+#: src/transport/plugin_transport_http.c:1177
 #, c-format
 msgid ""
 "Specific IPv4 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http.c:1481
+#: src/transport/plugin_transport_http.c:1206
 #, c-format
 msgid ""
 "Specific IPv6 address `%s' for plugin %s in configuration file is invalid! "
 "Binding to all addresses!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_client.c:621
+#: src/transport/plugin_transport_http.c:1223
+#: src/transport/plugin_transport_http_server.c:2702
+#, fuzzy, c-format
+msgid "Using external hostname `%s'\n"
+msgstr "卸载 GNUnet 服务"
+
+#: src/transport/plugin_transport_http.c:1228
+msgid "No external hostname configured\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_client.c:1419
 #, c-format
 msgid "Could not initialize curl multi handle, failed to start %s plugin!\n"
 msgstr ""
 
-#: src/transport/plugin_transport_http_server.c:178
+#: src/transport/plugin_transport_http_client.c:1550
+#: src/transport/plugin_transport_http_server.c:2826
+#, fuzzy, c-format
+msgid "Shutting down plugin `%s'\n"
+msgstr "未知的命令“%s”。\n"
+
+#: src/transport/plugin_transport_http_client.c:1575
+#: src/transport/plugin_transport_http_server.c:2885
+#, c-format
+msgid "Shutdown for plugin `%s' complete\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_client.c:1603
+#: src/transport/plugin_transport_http_server.c:2732
+#, fuzzy, c-format
+msgid "Maximum number of connections is %u\n"
+msgstr "增加 TCP/IP 的最大连接数"
+
+#: src/transport/plugin_transport_http_server.c:1302
+#, 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:1560
+#, c-format
+msgid "Accepting connection (%u of %u) from `%s'\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:1568
+#, c-format
+msgid ""
+"Server reached maximum number connections (%u), rejecting new connection\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:1869
+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:202
+#: src/transport/plugin_transport_http_server.c:1893
 msgid "No usable TLS certificate found and creating one failed!\n"
 msgstr ""
 
+#: src/transport/plugin_transport_http_server.c:2588
+#, c-format
+msgid "IPv4 support is %s\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2602
+#, c-format
+msgid "IPv6 support is %s\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2627
+#, c-format
+msgid "Using port %u\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2642
+#, c-format
+msgid "Specific IPv4 address `%s' in configuration file is invalid!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2652
+#, fuzzy, c-format
+msgid "Binding to IPv4 address %s\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/transport/plugin_transport_http_server.c:2673
+#, c-format
+msgid "Specific IPv6 address `%s' in configuration file is invalid!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_http_server.c:2683
+#, fuzzy, c-format
+msgid "Binding to IPv6 address %s\n"
+msgstr "无效的进程优先级“%s”\n"
+
+#: src/transport/plugin_transport_http_server.c:2718
+#, c-format
+msgid "Notifying transport only about hostname `%s'\n"
+msgstr ""
+
 #: src/transport/plugin_transport_smtp.c:370
 #, c-format
 msgid "Received malformed message via %s. Ignored.\n"
@@ -4984,7 +4639,7 @@
 #: src/transport/plugin_transport_tcp.c:774
 #: src/transport/plugin_transport_tcp.c:963
 #: src/transport/plugin_transport_tcp.c:1807
-#: src/transport/plugin_transport_tcp.c:2424
+#: src/transport/plugin_transport_tcp.c:2423
 msgid "# TCP sessions active"
 msgstr ""
 
@@ -5021,8 +4676,8 @@
 msgid "# network-level TCP disconnect events"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2313 src/util/service.c:946
-#: src/util/service.c:952
+#: src/transport/plugin_transport_tcp.c:2313 src/util/service.c:948
+#: src/util/service.c:954
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -5032,21 +4687,16 @@
 msgid "Failed to start service.\n"
 msgstr "初始化“%s”服务失败。\n"
 
-#: src/transport/plugin_transport_tcp.c:2389
+#: src/transport/plugin_transport_tcp.c:2411
 #, c-format
-msgid "Failed to find option %s in section %s!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_tcp.c:2412
-#, c-format
 msgid "TCP transport listening on port %llu\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2416
+#: src/transport/plugin_transport_tcp.c:2415
 msgid "TCP transport not listening on any port (client only)\n"
 msgstr ""
 
-#: src/transport/plugin_transport_tcp.c:2420
+#: src/transport/plugin_transport_tcp.c:2419
 #, c-format
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
@@ -5059,19 +4709,19 @@
 msgid "# IPv4 broadcast HELLO beacons received via udp"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:392
+#: src/transport/plugin_transport_udp_broadcasting.c:394
 #, c-format
 msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:1903
+#: src/transport/plugin_transport_udp.c:1965
 #, 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:1917
+#: src/transport/plugin_transport_udp.c:1979
 #, c-format
 msgid ""
 "UDP could not transmit message to `%s': Please check your network "
@@ -5079,22 +4729,22 @@
 "IPv6 address\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2162
+#: src/transport/plugin_transport_udp.c:2192
 #, fuzzy
 msgid "Failed to open UDP sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/transport/plugin_transport_udp.c:2328
+#: src/transport/plugin_transport_udp.c:2268
 #, c-format
 msgid "Given `%s' option is out of range: %llu > %u\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp.c:2371
+#: src/transport/plugin_transport_udp.c:2311
 #, fuzzy, c-format
 msgid "Invalid IPv6 address: `%s'\n"
 msgstr "无效的进程优先级“%s”\n"
 
-#: src/transport/plugin_transport_unix.c:1346
+#: src/transport/plugin_transport_unix.c:1355
 #, fuzzy
 msgid "Failed to open UNIX sockets\n"
 msgstr "打开日志文件“%s”失败：%s\n"
@@ -5109,77 +4759,67 @@
 
 #: src/transport/plugin_transport_wlan.c:625
 #: src/transport/plugin_transport_wlan.c:675
-#: src/transport/plugin_transport_wlan.c:1695
+#: src/transport/plugin_transport_wlan.c:1720
 msgid "# WLAN sessions allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:748
+#: src/transport/plugin_transport_wlan.c:749
 msgid "# WLAN message fragments sent"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:766
+#: src/transport/plugin_transport_wlan.c:773
 msgid "# WLAN messages pending (with fragmentation)"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:866
-#: src/transport/plugin_transport_wlan.c:947
-#: src/transport/plugin_transport_wlan.c:1697
+#: src/transport/plugin_transport_wlan.c:873
+#: src/transport/plugin_transport_wlan.c:954
+#: src/transport/plugin_transport_wlan.c:1722
 msgid "# WLAN MAC endpoints allocated"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1118
+#: src/transport/plugin_transport_wlan.c:1135
 msgid "# HELLO messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1139
+#: src/transport/plugin_transport_wlan.c:1156
 msgid "# fragments received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1149
+#: src/transport/plugin_transport_wlan.c:1166
 msgid "# ACKs received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1206
+#: src/transport/plugin_transport_wlan.c:1223
 msgid "# WLAN DATA messages discarded due to CRC32 error"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1305
+#: src/transport/plugin_transport_wlan.c:1324
 msgid "# DATA messages received via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1340
+#: src/transport/plugin_transport_wlan.c:1359
 msgid "# WLAN DATA messages processed"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1401
+#: src/transport/plugin_transport_wlan.c:1420
 msgid "# HELLO beacons sent via WLAN"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1510
+#: src/transport/plugin_transport_wlan.c:1529
 msgid "WLAN address with invalid size encountered\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1667
-#, fuzzy, c-format
-msgid "Invalid configuration option `%s' in section `%s'\n"
-msgstr "配置文件“%s”已写入。\n"
-
-#: src/transport/plugin_transport_wlan.c:1676
+#: src/transport/plugin_transport_wlan.c:1703
 #, c-format
 msgid "Helper binary `%s' not SUID, cannot run WLAN transport\n"
 msgstr ""
 
-#: src/transport/plugin_transport_wlan.c:1686
-#, fuzzy, c-format
-msgid "Missing configuration option `%s' in section `%s'\n"
-msgstr "配置文件“%s”已写入。\n"
-
 #: src/transport/transport_api.c:575
 #, c-format
 msgid "Received unexpected message of type %u in %s:%u\n"
 msgstr ""
 
-#: src/transport/transport-testing.c:589
+#: src/transport/transport-testing.c:590
 #, fuzzy
 msgid "Failed to initialize testing library!\n"
 msgstr "初始化“%s”服务失败。\n"
@@ -5213,12 +4853,12 @@
 msgid "Metadata `%s' failed to deserialize"
 msgstr ""
 
-#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:982
+#: src/util/client.c:274 src/util/client.c:750 src/util/service.c:984
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
-#: src/util/client.c:278 src/util/client.c:754 src/util/service.c:986
+#: src/util/client.c:278 src/util/client.c:754 src/util/service.c:988
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s：选项“%s”有歧义\n"
@@ -5253,23 +4893,23 @@
 msgid "Could not submit request, not expecting to receive a response.\n"
 msgstr ""
 
-#: src/util/common_logging.c:258 src/util/common_logging.c:1008
+#: src/util/common_logging.c:258 src/util/common_logging.c:1007
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:260 src/util/common_logging.c:1006
+#: src/util/common_logging.c:260 src/util/common_logging.c:1005
 msgid "INFO"
 msgstr "信息"
 
-#: src/util/common_logging.c:262 src/util/common_logging.c:1004
+#: src/util/common_logging.c:262 src/util/common_logging.c:1003
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:264 src/util/common_logging.c:1002
+#: src/util/common_logging.c:264 src/util/common_logging.c:1001
 msgid "ERROR"
 msgstr "错误"
 
-#: src/util/common_logging.c:266 src/util/common_logging.c:1010
+#: src/util/common_logging.c:266 src/util/common_logging.c:1009
 msgid "NONE"
 msgstr ""
 
@@ -5283,18 +4923,29 @@
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消息“%.*s”重复了 %u 次，在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:1011
+#: src/util/common_logging.c:1010
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1113
+#: src/util/common_logging.c:1149
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1151
+#: src/util/common_logging.c:1187
 msgid "invalid address"
 msgstr ""
 
+#: src/util/common_logging.c:1205
+#, fuzzy, c-format
+msgid "Configuration fails to specify option `%s' in section `%s'!\n"
+msgstr "配置不满足配置规范文件“%s”的约束！\n"
+
+#: src/util/common_logging.c:1226
+#, fuzzy, c-format
+msgid ""
+"Configuration specifies invalid value for option `%s' in section `%s': %s\n"
+msgstr "配置不满足配置规范文件“%s”的约束！\n"
+
 #: src/util/configuration.c:259
 #, fuzzy, c-format
 msgid "Syntax error while deserializing operation at line %u\n"
@@ -5345,67 +4996,75 @@
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_random.c:284
+#: src/util/crypto_random.c:313
 #, c-format
 msgid "Starting `%s' process to generate entropy\n"
 msgstr ""
 
-#: src/util/crypto_random.c:313
+#: src/util/crypto_random.c:342
 #, c-format
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本不符合预期(要求版本 %s)。\n"
 
-#: src/util/crypto_rsa.c:635 src/util/crypto_rsa.c:651
-#: src/util/crypto_rsa.c:833
+#: src/util/crypto_rsa.c:640
 #, c-format
-msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgid ""
+"File `%s' does not contain a valid private key (too long, %llu bytes).  "
+"Deleting it.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:731 src/util/crypto_rsa.c:778
+#: src/util/crypto_rsa.c:657
+#, c-format
+msgid ""
+"File `%s' does not contain a valid private key (failed decode, %llu bytes).  "
+"Deleting it.\n"
+msgstr ""
+
+#: src/util/crypto_rsa.c:755 src/util/crypto_rsa.c:802
 #, fuzzy, c-format
 msgid "Could not acquire lock on file `%s': %s...\n"
 msgstr "无法解析“%s”(%s)：%s\n"
 
-#: src/util/crypto_rsa.c:736
+#: src/util/crypto_rsa.c:760
 #, fuzzy
 msgid "Creating a new private key.  This may take a while.\n"
 msgstr "正在启动数据仓库转换(可能需要一段时间)。\n"
 
-#: src/util/crypto_rsa.c:754
+#: src/util/crypto_rsa.c:778
 #, c-format
 msgid "I am host `%s'.  Stored new private key in `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:782 src/util/crypto_rsa.c:818
+#: src/util/crypto_rsa.c:806 src/util/crypto_rsa.c:842
 msgid "This may be ok if someone is currently generating a hostkey.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:813
+#: src/util/crypto_rsa.c:837
 #, c-format
 msgid ""
 "When trying to read hostkey file `%s' I found %u bytes but I need at least "
 "%u.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:851
+#: src/util/crypto_rsa.c:857
 #, c-format
+msgid "File `%s' does not contain a valid private key.  Deleting it.\n"
+msgstr ""
+
+#: src/util/crypto_rsa.c:875
+#, c-format
 msgid "I am host `%s'.  Read private key from `%s'.\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:926
+#: src/util/crypto_rsa.c:948
 msgid "interrupted by shutdown"
 msgstr ""
 
-#: src/util/crypto_rsa.c:935
-#, fuzzy
-msgid "internal error"
-msgstr "未知错误。\n"
-
-#: src/util/crypto_rsa.c:944 src/util/crypto_rsa.c:951
+#: src/util/crypto_rsa.c:959
 msgid "gnunet-rsa failed"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1332
+#: src/util/crypto_rsa.c:1347
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
@@ -5420,7 +5079,7 @@
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s”应为目录！\n"
 
-#: src/util/disk.c:1494 src/util/service.c:1665
+#: src/util/disk.c:1494 src/util/service.c:1667
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获取有关用户“%s”的信息：%s\n"
@@ -5496,11 +5155,47 @@
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr "长选项的必选参数对短选项也是必选的。\n"
 
-#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:286
+#: src/util/getopt_helpers.c:258 src/util/getopt_helpers.c:316
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "您必须向“%s”选项传递一个数字。\n"
 
+#: src/util/getopt_helpers.c:288
+#, fuzzy, c-format
+msgid "You must pass relative time to the `%s' option.\n"
+msgstr "您必须向“%s”选项传递一个数字。\n"
+
+#: src/util/gnunet-config.c:90
+#, fuzzy, c-format
+msgid "--section argument is required\n"
+msgstr "设置要使用的昵称(必须)"
+
+#: src/util/gnunet-config.c:133
+#, c-format
+msgid "--option argument required to set value\n"
+msgstr ""
+
+#: src/util/gnunet-config.c:160
+msgid "obtain option of value as a filename (with $-expansion)"
+msgstr ""
+
+#: src/util/gnunet-config.c:163
+msgid "name of the section to access"
+msgstr ""
+
+#: src/util/gnunet-config.c:166
+msgid "name of the option to access"
+msgstr ""
+
+#: src/util/gnunet-config.c:169
+msgid "value to set"
+msgstr ""
+
+#: src/util/gnunet-config.c:179
+#, fuzzy
+msgid "Manipulate GNUnet configuration files"
+msgstr "更改配置文件中的一个值"
+
 #: src/util/gnunet-resolver.c:148
 msgid "perform a reverse lookup"
 msgstr ""
@@ -5509,24 +5204,56 @@
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:104
+#: src/util/gnunet-rsa.c:114
+#, fuzzy, c-format
+msgid "Failed to open `%s': %s\n"
+msgstr "打开日志文件“%s”失败：%s\n"
+
+#: src/util/gnunet-rsa.c:120
 #, c-format
+msgid "Generating %u keys, please wait"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:138
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Failed to write to `%s': %s\n"
+msgstr "运行 %s失败：%s %d\n"
+
+#: src/util/gnunet-rsa.c:150
+#, c-format
+msgid "Finished!\n"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:173
+#, c-format
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:154
+#: src/util/gnunet-rsa.c:230
+msgid "create COUNT public-private key pairs (for testing)"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:233
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:157
+#: src/util/gnunet-rsa.c:236
 msgid "print the hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:160
+#: src/util/gnunet-rsa.c:239
 msgid "print the short hash of the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-rsa.c:170
+#: src/util/gnunet-rsa.c:242
+msgid ""
+"use insecure, weak random number generator for key generation (for testing "
+"only)"
+msgstr ""
+
+#: src/util/gnunet-rsa.c:252
 msgid "Manipulate GNUnet private RSA key files"
 msgstr ""
 
@@ -5541,32 +5268,56 @@
 msgid "Could not find IP of host `%s': %s\n"
 msgstr "找不到主机“%s”的 IP：%s\n"
 
-#: src/util/helper.c:254
+#: src/util/gnunet-uri.c:90
+#, c-format
+msgid "No URI specified on command line\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:95
 #, fuzzy, c-format
+msgid "Invalid URI: does not start with `%s'\n"
+msgstr "无效的网络表示法(没有以“;”结尾：“%s”)\n"
+
+#: src/util/gnunet-uri.c:102
+#, c-format
+msgid "Invalid URI: fails to specify subsystem\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:112
+#, c-format
+msgid "No handler known for subsystem `%s'\n"
+msgstr ""
+
+#: src/util/gnunet-uri.c:174
+msgid "Perform default-actions for GNUnet URIs"
+msgstr ""
+
+#: src/util/helper.c:260
+#, fuzzy, c-format
 msgid "Error reading from `%s': %s\n"
 msgstr "创建用户出错"
 
-#: src/util/helper.c:274
+#: src/util/helper.c:280
 #, c-format
 msgid "Got 0 bytes from helper `%s' (EOF)\n"
 msgstr ""
 
-#: src/util/helper.c:290
+#: src/util/helper.c:296
 #, c-format
 msgid "Got %u bytes from helper `%s'\n"
 msgstr ""
 
-#: src/util/helper.c:299
+#: src/util/helper.c:305
 #, fuzzy, c-format
 msgid "Failed to parse inbound message from helper `%s'\n"
 msgstr "打开日志文件“%s”失败：%s\n"
 
-#: src/util/helper.c:337
+#: src/util/helper.c:343
 #, fuzzy, c-format
 msgid "Starting HELPER process `%s'\n"
 msgstr "卸载 GNUnet 服务"
 
-#: src/util/helper.c:476
+#: src/util/helper.c:496
 #, fuzzy, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "创建用户出错"
@@ -5668,22 +5419,22 @@
 msgid "Attempt to cancel dead task %llu!\n"
 msgstr ""
 
-#: src/util/server.c:468
+#: src/util/server.c:431
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "对驱动器“%2$s”的“%1$s”操作失败：%3$u\n"
 
-#: src/util/server.c:477
+#: src/util/server.c:440
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/util/server.c:488
+#: src/util/server.c:451
 #, 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:819
+#: src/util/server.c:836
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -5716,95 +5467,95 @@
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格式“%s”错误\n"
 
-#: src/util/service.c:705
+#: src/util/service.c:707
 #, c-format
 msgid "Access denied to UID %d / GID %d\n"
 msgstr ""
 
-#: src/util/service.c:710
+#: src/util/service.c:712
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
 
-#: src/util/service.c:717
+#: src/util/service.c:719
 #, c-format
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/util/service.c:772
+#: src/util/service.c:774
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:809
+#: src/util/service.c:811
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/util/service.c:927
+#: src/util/service.c:929
 #, c-format
 msgid ""
 "Disabling IPv6 support for service `%s', failed to create IPv6 socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1005
+#: src/util/service.c:1007
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
 "domain socket: %s\n"
 msgstr ""
 
-#: src/util/service.c:1022
+#: src/util/service.c:1024
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
 
-#: src/util/service.c:1256
+#: src/util/service.c:1258
 msgid "Could not access a pre-bound socket, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1307 src/util/service.c:1325
+#: src/util/service.c:1309 src/util/service.c:1327
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/util/service.c:1352
+#: src/util/service.c:1354
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
 
-#: src/util/service.c:1521
+#: src/util/service.c:1523
 #, fuzzy, c-format
 msgid "Failed to start `%s' at `%s'\n"
 msgstr "运行 %s失败：%s %d\n"
 
-#: src/util/service.c:1554
+#: src/util/service.c:1556
 #, c-format
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/util/service.c:1603
+#: src/util/service.c:1605
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/util/service.c:1607
+#: src/util/service.c:1609
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/util/service.c:1611
+#: src/util/service.c:1613
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/util/service.c:1666
+#: src/util/service.c:1668
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/util/service.c:1679
+#: src/util/service.c:1681
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s”：%s\n"
 
-#: src/util/service.c:1744
+#: src/util/service.c:1746
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
@@ -5826,57 +5577,57 @@
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME”失败：没有设置环境变量“HOME”"
 
-#: src/util/strings.c:626
+#: src/util/strings.c:631
 msgid "ms"
 msgstr "毫秒"
 
-#: src/util/strings.c:631
+#: src/util/strings.c:635
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:635
+#: src/util/strings.c:641
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:639
+#: src/util/strings.c:647
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:643
+#: src/util/strings.c:653
 msgid "h"
 msgstr "时"
 
-#: src/util/strings.c:648
+#: src/util/strings.c:660
 #, fuzzy
 msgid "day"
 msgstr " 天"
 
-#: src/util/strings.c:650
+#: src/util/strings.c:662
 #, fuzzy
 msgid "days"
 msgstr " 天"
 
-#: src/util/strings.c:674
+#: src/util/strings.c:689
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1063
+#: src/util/strings.c:1078
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1071
+#: src/util/strings.c:1086
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1077
+#: src/util/strings.c:1092
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1084
+#: src/util/strings.c:1099
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1093
+#: src/util/strings.c:1108
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s”\n"
@@ -6046,23 +5797,245 @@
 msgid "Setup tunnels via VPN."
 msgstr ""
 
-#: src/include/gnunet_common.h:515 src/include/gnunet_common.h:520
-#: src/include/gnunet_common.h:526
+#: src/include/gnunet_common.h:580 src/include/gnunet_common.h:585
+#: src/include/gnunet_common.h:591
 #, c-format
 msgid "Assertion failed at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:536
+#: src/include/gnunet_common.h:601
 #, c-format
 msgid "External protocol violation detected at %s:%d.\n"
 msgstr ""
 
-#: src/include/gnunet_common.h:557 src/include/gnunet_common.h:564
+#: src/include/gnunet_common.h:622 src/include/gnunet_common.h:629
 #, c-format
 msgid "`%s' failed on file `%s' at %s:%d with error: %s\n"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Configuration file `%s' for service `%s' not valid: %s\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Unknown message type: '%u'\n"
+#~ msgstr "未知操作“%s”。\n"
+
+#, fuzzy
+#~ msgid "Configuration option `%s' in section `%s' missing\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Failed to access chat home directory `%s'\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ 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 "匿名"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said: %s\n"
+#~ msgstr "“%s”说：%s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said to you: %s\n"
+#~ msgstr "“%s”对您说：%s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said for sure: %s\n"
+#~ msgstr "“%s”对您说：%s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said to you for sure: %s\n"
+#~ msgstr "“%s”对您说：%s\n"
+
+#, fuzzy
+#~ msgid "(%s) `%s' said off the record: %s\n"
+#~ msgstr "“%s”对您说：%s\n"
+
+#~ msgid "`%s' entered the room\n"
+#~ msgstr "“%s”进入了房间\n"
+
+#~ msgid "`%s' left the room\n"
+#~ msgstr "“%s”离开了房间\n"
+
+#, fuzzy
+#~ msgid "Could not change username\n"
+#~ msgstr "已将用户名改为“%s”。\n"
+
+#, fuzzy
+#~ msgid "Changed username to `%s'\n"
+#~ msgstr "已将用户名改为“%s”。\n"
+
+#~ msgid "Users in room `%s': "
+#~ msgstr "房间“%s”中的用户："
+
+#~ msgid "Syntax: /msg USERNAME MESSAGE"
+#~ msgstr "语法：/msg 用户名 消息"
+
+#~ msgid "User `%s' is currently not in the room!\n"
+#~ msgstr "用户“%s”当前不在房间里！\n"
+
+#, fuzzy
+#~ 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 "设置要加入的聊天室"
+
+#, fuzzy
+#~ msgid "Failed to queue a message notification\n"
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Failed to queue a join notification\n"
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Failed to queue a confirmation receipt\n"
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Failed to queue a leave notification\n"
+#~ 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 option `%s' in section `%s' missing.\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Configuration fails to specify `%s', assuming default value."
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Option `%s' not specified in configuration section `%s'\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Peer is lacking HOSTKEY configuration setting.\n"
+#~ msgstr "立即保存配置？"
+
+#, fuzzy
+#~ msgid "Could not access hostkey.\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Failed to create pipe for `gnunet-peerinfo' process.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to create pipe for `ssh' process.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to create hostkey.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to start `gnunet-peerinfo' process.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Failed to start `ssh' process.\n"
+#~ 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"
+
+#, fuzzy
+#~ msgid "Failed to start `gnunet-arm' process.\n"
+#~ msgstr "初始化“%s”服务失败。\n"
+
+#, fuzzy
+#~ msgid "Starting service %s for peer `%4s'\n"
+#~ msgstr "卸载 GNUnet 服务"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to copy configuration directory.\n"
+#~ msgstr "找不到主机“%s”的 IP：%s\n"
+
+#, fuzzy
+#~ msgid "Terminating peer `%4s'\n"
+#~ msgstr "未知的用户“%s”\n"
+
+#, fuzzy
+#~ msgid "Setting d->dead on peer `%4s'\n"
+#~ msgstr "卸载 GNUnet 服务"
+
+#, fuzzy
+#~ msgid "Failed to write new configuration to disk."
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Could not start `%s' process to copy configuration file.\n"
+#~ msgstr "找不到主机“%s”的 IP：%s\n"
+
+#, fuzzy
+#~ msgid "Failed to copy new configuration to remote machine."
+#~ msgstr "保存配置失败。"
+
+#, fuzzy
+#~ msgid "Peers failed to connect"
+#~ msgstr ""
+#~ "\n"
+#~ "按任意键继续\n"
+
+#, fuzzy
+#~ msgid "Failed to connect to core service of first peer!\n"
+#~ msgstr "加载 sqstore 服务失败。检查您的配置！\n"
+
+#, fuzzy
+#~ msgid "Invalid value `%s' for option `%s' in section `%s': expected float\n"
+#~ msgstr "配置不满足配置规范文件“%s”的约束！\n"
+
+#, fuzzy
+#~ msgid "Could not read hostkeys file `%s'!\n"
+#~ msgstr "找不到接口“%s”的一个 IP 地址。\n"
+
+#, fuzzy
+#~ msgid "Could not create configuration for peer number %u on `%s'!\n"
+#~ msgstr "解析配置文件“%s”失败\n"
+
+#, fuzzy
+#~ msgid "Invalid configuration option `%s' in section `%s'\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "Missing configuration option `%s' in section `%s'\n"
+#~ msgstr "配置文件“%s”已写入。\n"
+
+#, fuzzy
+#~ msgid "internal error"
+#~ msgstr "未知错误。\n"
+
+#, fuzzy
 #~ msgid "Could not create namespace `%s'\n"
 #~ msgstr "无法解析“%s”(%s)：%s\n"
 
@@ -6134,10 +6107,6 @@
 #~ msgstr "初始化“%s”服务失败。\n"
 
 #, fuzzy
-#~ msgid "Failed to send to `%s': %s\n"
-#~ msgstr "打开日志文件“%s”失败：%s\n"
-
-#, fuzzy
 #~ msgid "Could not access file: %s\n"
 #~ msgstr "错误：无法访问服务：%s\n"
 
@@ -6447,9 +6416,6 @@
 #~ msgid "install GNUnet as Windows service"
 #~ msgstr "以 Windows 服务方式安装 GNUnet"
 
-#~ msgid "increase the maximum number of TCP/IP connections"
-#~ msgstr "增加 TCP/IP 的最大连接数"
-
 #~ msgid "display a file's hash value"
 #~ msgstr "显示一个文件的散列值"
 

Modified: gnunet/src/util/helper.c
===================================================================
--- gnunet/src/util/helper.c    2012-09-27 19:36:14 UTC (rev 24062)
+++ gnunet/src/util/helper.c    2012-09-27 19:40:20 UTC (rev 24063)
@@ -276,8 +276,8 @@
   {
     /* this happens if the helper is shut down via a 
        signal, so it is not a "hard" error */
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
-               _("Got 0 bytes from helper `%s' (EOF)\n"),
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+               "Got 0 bytes from helper `%s' (EOF)\n",
                h->binary_name);
     if (NULL != h->exp_cb)
     {
@@ -292,8 +292,8 @@
                                    &restart_task, h);
     return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO, 
-             _("Got %u bytes from helper `%s'\n"),
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 
+             "Got %u bytes from helper `%s'\n",
              (unsigned int) t,
              h->binary_name);
   h->read_task = GNUNET_SCHEDULER_add_read_file (GNUNET_TIME_UNIT_FOREVER_REL,
@@ -339,8 +339,8 @@
                                    &restart_task, h);    
     return;
   }
-  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-             _("Starting HELPER process `%s'\n"),
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+             "Starting HELPER process `%s'\n",
              h->binary_name);
   h->fh_from_helper =
       GNUNET_DISK_pipe_handle (h->helper_out, GNUNET_DISK_PIPE_END_READ);
[Prev in Thread]
Current Thread
[Next in Thread]
[GNUnet-SVN] r24063 - in gnunet: contrib po src/util, gnunet <=
Prev by Date: [GNUnet-SVN] r24062 - in gnunet/src: arm datacache hostlist nat util
Next by Date: [GNUnet-SVN] r24064 - gnunet/src/util
Previous by thread: [GNUnet-SVN] r24062 - in gnunet/src: arm datacache hostlist nat util
Next by thread: [GNUnet-SVN] r24064 - gnunet/src/util
Index(es):
- Date
- Thread